feat: ✨ merge in gm subject spreadsheet feature

assets/css/file_views.css

@@ -15,7 +15,8 @@
   display: flex;
   white-space: nowrap;
   width: 100%;
-  align-items: flex-start;
+  align-items: center;
+  justify-content: space-between;
   padding: 2px;
 }
 /* Add borders to swal file row in swal file list besides the top border for first element and bottom border for last element */

assets/css/guided.css

@@ -24,6 +24,11 @@
   width: 200px;
 }
 
+.guided--container-lottie-small {
+  height: 70px;
+  width: 70px;
+}
+
 .black-arrow-lottie-container {
   height: 150px;
   width: 150px;
@@ -48,6 +53,24 @@
   margin: 0px 10px 10px 10px;
 }
 
+.file-import-container {
+  display: flex;
+  border-radius: 10px;
+  border: 1px dashed #258193;
+}
+
+.file-import-container.horizontal {
+  width: 100%;
+  flex-direction: row;
+  align-items: center;
+  margin: 0px 10px 10px 10px;
+}
+
+.file-import-container.vertical {
+  flex-direction: column;
+  justify-content: center;
+}
+
 .guided--container {
   overflow-y: auto;
   display: flex;
@@ -748,6 +771,12 @@
   padding: 0px 3px;
 }
 
+.flex-center {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
 .guided--container-footer-buttons.flex-start {
   justify-content: flex-start;
 }
@@ -1053,3 +1082,43 @@
   -webkit-box-orient: vertical;
   overflow: hidden;
 }
+
+.guided--container-card {
+  display: flex;
+  width: 100%;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  overflow-x: auto;
+}
+
+.guided--card-item {
+  display: flex;
+  flex: 1;
+  margin: 5px;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid var(--color-teal);
+  border-radius: 5px;
+  padding: 10px;
+}
+
+.guided--card-item-text {
+  margin: 0px;
+  font-weight: 500;
+  font-size: 14px;
+  color: #000;
+}
+
+.guided--card-item-header-text {
+  margin: 0px;
+  margin-bottom: 5px;
+  font-weight: 700;
+  font-size: 16px;
+  color: #000;
+}
+
+.align-flex-center {
+  align-items: center;
+}

assets/css/helperClasses.css

@@ -310,8 +310,6 @@
   border-left: none !important;
 }
 
-////////////////////////// MARGIN AND PADDING CLASSES //////////////////////////
-
 .m-0 {
   margin: 0 !important;
 }

main-process/native-ui/dialogs/open-file.js

@@ -1,5 +1,45 @@
 const { ipcMain, dialog, BrowserWindow } = require("electron");
 
+ipcMain.on("open-create-dataset-structure-spreadsheet-path-selection-dialog", (event) => {
+  const mainWindow = BrowserWindow.getFocusedWindow();
+
+  // Get the path to the directory where the user wants to save the spreadsheet
+  const spreadsheetPath = dialog.showOpenDialogSync(mainWindow, {
+    properties: ["openDirectory"],
+    title: "Select a folder to save the spreadsheet to",
+  });
+
+  if (spreadsheetPath) {
+    event.sender.send("selected-create-dataset-structure-spreadsheet-path", spreadsheetPath[0]);
+  }
+});
+
+ipcMain.on("open-subject-multi-folder-import-dialog", (event) => {
+  const mainWindow = BrowserWindow.getFocusedWindow();
+
+  const files = dialog.showOpenDialogSync(mainWindow, {
+    properties: ["openDirectory", "multiSelections"],
+    title: "Select your subject folders",
+  });
+
+  if (files) {
+    mainWindow.webContents.send("selected-subject-names-from-dialog", files);
+  }
+});
+
+ipcMain.on("open-sample-multi-folder-import-dialog", (event) => {
+  const mainWindow = BrowserWindow.getFocusedWindow();
+
+  const folders = dialog.showOpenDialogSync(mainWindow, {
+    properties: ["openDirectory", "multiSelections"],
+    title: "Select your sample folders",
+  });
+
+  if (folders) {
+    mainWindow.webContents.send("selected-sample-names-from-dialog", folders);
+  }
+});
+
 ipcMain.on("open-file-dialog-dataset", (event) => {
   dialog.showOpenDialog(
     BrowserWindow.getFocusedWindow(),

main.js

@@ -570,3 +570,7 @@ ipcMain.on("get-port", (event) => {
   log.info("Renderer requested port: " + selectedPort);
   event.returnValue = selectedPort;
 });
+
+ipcMain.on("open-file-at-path", async (event, path) => {
+  shell.openPath(path);
+});

package.json

@@ -1,7 +1,7 @@
 {
   "name": "soda-for-sparc",
   "productName": "SODA for SPARC",
-  "version": "12.3.3",
+  "version": "12.4.5-beta",
   "description": "Keep Calm and Curate ",
   "main": "main.js",
   "scripts": {

pyflask/startup/minimumApiVersion.py

@@ -4,4 +4,4 @@ def get_api_version():
     """
     Returns the version of the API
     """
-    return {'version': os.getenv('API_VERSION', "12.3.3")}
+    return {'version': os.getenv('API_VERSION', "12.4.5-beta")}