Merge pull request #355 from fairdataihub/fix-compare-local-and-remote-btn

fix : comparison btn appearing when no local dataset selected

Author: aaronm-2112

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) <year> <copyright holders>
+Copyright (c) 2024 FAIR Data Innovations Hub
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

src/renderer/src/components/renderers/ReactComponentRenderer.jsx

@@ -35,7 +35,7 @@ const componentTypeRenderers = {
   },
   "external-link": (componentSlot) => {
     const props = {
-      url: componentSlot.getAttribute("data-url"),
+      href: componentSlot.getAttribute("data-href"),
       buttonText: componentSlot.getAttribute("data-button-text"),
       buttonType: componentSlot.getAttribute("data-button-type"),
     };

src/renderer/src/scripts/advanced-features/compare-local-remote-dataset.js

@@ -31,16 +31,28 @@ document
     let nextQuestion = document.querySelector("#compare-local-remote-confirm-local-dataset-btn")
       .dataset.next;
     document.querySelector(`#${nextQuestion}`).style.display = "flex";
+
+    // if a Pennsieve dataset has already been selected then show question 3 as well
+    if ($("#bf_dataset_load_compare_local_remote").text().trim() !== "None") {
+      showQuestion3();
+    }
   });
 
+const showQuestion3 = () => {
+  let nextQuestion = document.querySelector("#compare-local-remote-dataset-question-3");
+  nextQuestion.style.display = "flex";
+  nextQuestion.scrollIntoView({ behavior: "smooth", block: "start" });
+  document.querySelector("#comparison-results-container").style.display = "none";
+};
+
 // observer for the selected dataset label in the dataset selection card in question 2
 const datasetChangedObserver = new MutationObserver(() => {
   // once a dataset has been selected show the run validator button if the current question is active
-  if ($("#bf_dataset_load_compare_local_remote").text().trim() !== "None") {
-    let nextQuestion = document.querySelector("#compare-local-remote-dataset-question-3");
-    nextQuestion.style.display = "flex";
-    nextQuestion.scrollIntoView({ behavior: "smooth", block: "start" });
-    document.querySelector("#comparison-results-container").style.display = "none";
+  if (
+    $("#bf_dataset_load_compare_local_remote").text().trim() !== "None" &&
+    $("#compare-local-remote-dataset-local-path").val() !== ""
+  ) {
+    showQuestion3();
   } else {
     $("#compare-local-remote-dataset-question-3").css("display", "none");
   }

src/renderer/src/sections/advanced-features/advanced_features.html

@@ -1550,7 +1550,7 @@ <h2>Compare Local and Pennsieve Dataset</h2>
                 >
                 <p class="about-text">
                   This tool compare your local dataset with a dataset you have uploaded on to
-                  Pennsieve and show you the differences between the two datasets that exist, if
+                  Pennsieve and shows you the differences between the two datasets that exist, if
                   any.
                 </p>
               </div>

src/renderer/src/sections/documentation/documentation.html

@@ -24,7 +24,7 @@ <h2 class="document_text">
             >
               <div
                 data-component-type="external-link"
-                data-url="https://docs.sodaforsparc.io/docs/getting-started/organize-and-submit-sparc-datasets-with-soda"
+                data-href="https://docs.sodaforsparc.io/docs/getting-started/organize-and-submit-sparc-datasets-with-soda"
                 data-button-text="View Documentation"
                 data-button-type="button"
               ></div>