Merge branch 'update-ui-login-flow' into staging

Author: aaronm-2112

preload.js

@@ -1007,7 +1007,6 @@ const addBfAccount = async (ev, verifyingOrganization = False) => {
 
           api_button.innerText = "Connect with API key instead";
           // set length to 270
-          api_button.setAttribute("onclick", "showBFAddAccountSweetalert()");
           api_arrow.classList.add("fas");
           api_arrow.classList.add("fa-arrow-right");
           api_arrow.style.marginLeft = "10px";
@@ -1021,6 +1020,7 @@ const addBfAccount = async (ev, verifyingOrganization = False) => {
           api_button.appendChild(api_arrow);
           swal_actions.parentElement.insertBefore(api_button, div_footer);
           swal_actions.parentElement.insertBefore(helpText, div_footer);
+          api_button.addEventListener("click", (e) => showBFAddAccountSweetalert(e));
         } else {
           // hide the cancel button
           let cancel_button = document.getElementsByClassName("swal2-cancel")[0];

scripts/others/renderer.js

@@ -1793,7 +1793,7 @@ ipcRenderer.on("selected-generate-metadata-subjects", (event, dirpath, filename)
             didOpen: () => {
               Swal.showLoading();
             },
-          }).then((result) => {});
+          }).then((result) => { });
           generateSubjectsFileHelper(false);
         }
       });
@@ -1809,7 +1809,7 @@ ipcRenderer.on("selected-generate-metadata-subjects", (event, dirpath, filename)
         didOpen: () => {
           Swal.showLoading();
         },
-      }).then((result) => {});
+      }).then((result) => { });
       generateSubjectsFileHelper(false);
     }
   }
@@ -1892,7 +1892,7 @@ const generateSubjectsFileHelper = async (uploadBFBoolean) => {
     didOpen: () => {
       Swal.showLoading();
     },
-  }).then((result) => {});
+  }).then((result) => { });
 
   try {
     log.info(`Generating a subjects file.`);
@@ -2002,7 +2002,7 @@ ipcRenderer.on("selected-generate-metadata-samples", (event, dirpath, filename)
             didOpen: () => {
               Swal.showLoading();
             },
-          }).then((result) => {});
+          }).then((result) => { });
           generateSamplesFileHelper(uploadBFBoolean);
         }
       });
@@ -2018,7 +2018,7 @@ ipcRenderer.on("selected-generate-metadata-samples", (event, dirpath, filename)
         didOpen: () => {
           Swal.showLoading();
         },
-      }).then((result) => {});
+      }).then((result) => { });
       generateSamplesFileHelper(uploadBFBoolean);
     }
   }
@@ -2100,7 +2100,7 @@ const generateSamplesFileHelper = async (uploadBFBoolean) => {
     didOpen: () => {
       Swal.showLoading();
     },
-  }).then((result) => {});
+  }).then((result) => { });
 
   try {
     let samplesFileResponse = await client.post(
@@ -2620,7 +2620,7 @@ const loadTaxonomySpecies = async (commonName, destinationInput, curationMode) =
     didOpen: () => {
       Swal.showLoading();
     },
-  }).then((result) => {});
+  }).then((result) => { });
   try {
     let load_taxonomy_species = await client.get(`/taxonomy/species`, {
       params: {
@@ -4926,10 +4926,10 @@ const swalFileListSingleAction = async (fileList, title, helpText, postActionTex
       ${helpText ? `<p>${helpText}</p>` : ""}
       <div class="swal-file-list">
         ${fileList
-          .map(
-            (file) => `<div class="swal-file-row"><span class="swal-file-text">${file}</span></div>`
-          )
-          .join("")}
+        .map(
+          (file) => `<div class="swal-file-row"><span class="swal-file-text">${file}</span></div>`
+        )
+        .join("")}
       </div>
       ${postActionText ? `<b>${postActionText}</b>` : ""}
     `,
@@ -4959,10 +4959,10 @@ const swalFileListDoubleAction = async (
       ${helpText}
       <div class="swal-file-list">
         ${fileList
-          .map(
-            (file) => `<div class="swal-file-row"><span class="swal-file-text">${file}</span></div>`
-          )
-          .join("")}
+        .map(
+          (file) => `<div class="swal-file-row"><span class="swal-file-text">${file}</span></div>`
+        )
+        .join("")}
       </div>
       <b>${confirmationText}</b>
     `,
@@ -4994,10 +4994,10 @@ const swalFileListTripleAction = async (
       ${helpText}
       <div class="swal-file-list">
         ${fileList
-          .map(
-            (file) => `<div class="swal-file-row"><span class="swal-file-text">${file}</span></div>`
-          )
-          .join("")}
+        .map(
+          (file) => `<div class="swal-file-row"><span class="swal-file-text">${file}</span></div>`
+        )
+        .join("")}
       </div>
       <b>${confirmationText}</b>
     `,
@@ -6703,9 +6703,8 @@ const listItems = async (jsonObj, uiItem, amount_req, reset) => {
           ${dragDropInstructionsText}
         </p>
         <p class="text-center">
-          You may also <b>add</b> or <b>import</b> ${
-            folderType === undefined ? "folders or files" : folderType + " data"
-          } using the buttons in the upper right corner
+          You may also <b>add</b> or <b>import</b> ${folderType === undefined ? "folders or files" : folderType + " data"
+      } using the buttons in the upper right corner
         </p>
       </div>`
     );
@@ -7393,7 +7392,7 @@ const deleteTreeviewFiles = (sodaJSONObj) => {
     if (
       "manifest.xlsx" in sodaJSONObj["dataset-structure"]["folders"][highLevelFol]["files"] &&
       sodaJSONObj["dataset-structure"]["folders"][highLevelFol]["files"]["manifest.xlsx"][
-        "forTreeview"
+      "forTreeview"
       ]
     ) {
       delete sodaJSONObj["dataset-structure"]["folders"][highLevelFol]["files"]["manifest.xlsx"];
@@ -8468,7 +8467,9 @@ ipcRenderer.on("selected-manifest-folder", async (event, result) => {
   }
 });
 
-async function showBFAddAccountSweetalert() {
+async function showBFAddAccountSweetalert(ev) {
+  console.log("The ev: ", ev)
+  let target = ev.target
   await Swal.fire({
     title: bfaddaccountTitle,
     html: bfAddAccountBootboxMessage,
@@ -8518,7 +8519,7 @@ async function showBFAddAccountSweetalert() {
                       selected_account: name,
                     },
                   })
-                  .then((response) => {
+                  .then(async (response) => {
                     let user_email = response.data.email;
                     $("#current-bf-account").text(user_email);
                     $("#current-bf-account-generate").text(user_email);
@@ -8528,9 +8529,42 @@ async function showBFAddAccountSweetalert() {
                     $("#current-bf-dataset-generate").text("None");
                     $(".bf-dataset-span").html("None");
                     $("#para-continue-bf-dataset-getting-started").text("");
+                    // set the workspace field values to the user's current workspace
+                    let org = response.data.organization;
+                    $(".bf-organization-span").text(org);
                     showHideDropdownButtons("account", "show");
                     confirm_click_account_function();
                     updateBfAccountList();
+
+                    // If the clicked button has the data attribute "reset-guided-mode-page" and the value is "true"
+                    // then reset the guided mode page
+                    if (target?.getAttribute("data-reset-guided-mode-page") == "true") {
+                      // Get the current page that the user is on in the guided mode
+                      const currentPage = CURRENT_PAGE.id;
+                      if (currentPage) {
+                        await openPage(currentPage);
+                      }
+                    }
+
+                    // reset the selected dataset to None
+                    $(".bf-dataset-span").html("None");
+                    // reset the current owner span in the manage dataset make pi owner of a dataset tab
+                    $(".current-permissions").html("None");
+
+                    refreshOrganizationList();
+
+
+                    // If the button that triggered the organization has the class
+                    // guided-change-workspace (from guided mode), handle changes based on the ev id
+                    // otherwise, reset the FFM UI based on the ev class
+                    // NOTE: For API Key sign in flow it is more simple to just reset the UI as the new user may be in a separate workspace than the prior user.
+                    target?.classList.contains("data-reset-guided-mode-page")
+                      ? handleGuidedModeOrgSwitch(target)
+                      : resetFFMUI(target);
+
+                    datasetList = [];
+                    defaultBfDataset = null;
+                    clearDatasetDropdowns();
                   })
                   .catch((error) => {
                     Swal.showValidationMessage(userErrorMessage(error));