Merge pull request #354 from fairdataihub/curation-steps-made-optional

feat: banner image and PI steps made optional

Author: aaronm-2112

src/renderer/src/scripts/guided-mode/guided-curate-dataset.js

@@ -1858,16 +1858,6 @@ const savePageChanges = async (pageBeingLeftID) => {
       window.sodaJSONObj["last-confirmed-pennsieve-workspace-details"] = userSelectedWorkSpace;
     }
 
-    if (pageBeingLeftID === "guided-banner-image-tab") {
-      if (window.sodaJSONObj["digital-metadata"]["banner-image-path"] == undefined) {
-        errorArray.push({
-          type: "notyf",
-          message: "Please add a banner image",
-        });
-        throw errorArray;
-      }
-    }
-
     if (pageBeingLeftID === "guided-assign-license-tab") {
       const licenseRadioButtonContainer = document.getElementById(
         "guided-license-radio-button-container"
@@ -1944,35 +1934,6 @@ const savePageChanges = async (pageBeingLeftID) => {
         throw errorArray;
       }
 
-      const PrincipalInvestigator = getContributorMarkedAsPrincipalInvestigator();
-      if (!PrincipalInvestigator) {
-        errorArray.push({
-          type: "swal",
-          message: `
-            You must specify a Principal Investigator (PI) for this dataset.
-            <br/><br/>
-            Please add the "PrincipalInvestigator" role for one of the contributors.
-          `,
-        });
-        throw errorArray;
-      }
-
-      /* UNCOMMENT THIS TO REQUIRE AT LEAST ONE CORRESPONDING AUTHOR
-      const correspondingAuthors = contributors.filter((contributor) =>
-        contributor["conRole"].includes("CorrespondingAuthor")
-      );
-      if (correspondingAuthors.length === 0) {
-        errorArray.push({
-          type: "swal",
-          message: `
-            You must specify at least one corresponding author for this dataset.
-            <br/><br/>
-            Please add the "CorrespondingAuthor" role for one of the contributors.
-          `,
-        });
-        throw errorArray;
-      }*/
-
       // Make sure that all contributors have a valid fields
       for (const contributor of contributors) {
         if (!window.contributorDataIsValid(contributor)) {
@@ -6170,6 +6131,7 @@ window.openPage = async (targetPageID) => {
           window.sodaJSONObj["digital-metadata"]["banner-image-path"],
           true
         );
+        document.querySelector("#guided--skip-banner-img-btn").style.display = "none";
       } else {
         //reset the banner image page
         $("#guided-button-add-banner-image").html("Add banner image");
@@ -6675,7 +6637,6 @@ window.openPage = async (targetPageID) => {
 
       const datsetName = window.sodaJSONObj["digital-metadata"]["name"];
       const datsetSubtitle = window.sodaJSONObj["digital-metadata"]["subtitle"];
-      const datasetPiOwner = window.sodaJSONObj["digital-metadata"]["pi-owner"]["userString"];
       const datasetUserPermissions = window.sodaJSONObj["digital-metadata"]["user-permissions"];
       const datasetTeamPermissions = window.sodaJSONObj["digital-metadata"]["team-permissions"];
       const datasetTags = window.sodaJSONObj["digital-metadata"]["dataset-tags"];
@@ -6687,7 +6648,6 @@ window.openPage = async (targetPageID) => {
       const datasetDescriptionReviewText = document.getElementById(
         "guided-review-dataset-description"
       );
-      const datasetPiOwnerReviewText = document.getElementById("guided-review-dataset-pi-owner");
       const datasetUserPermissionsReviewText = document.getElementById(
         "guided-review-dataset-user-permissions"
       );
@@ -6714,8 +6674,6 @@ window.openPage = async (targetPageID) => {
         })
         .join("\n");
 
-      datasetPiOwnerReviewText.innerHTML = datasetPiOwner;
-
       if (datasetUserPermissions.length > 0) {
         const datasetUserPermissionsString = datasetUserPermissions
           .map((permission) => permission.userString)
@@ -7967,6 +7925,15 @@ const guidedUploadStatusIcon = (elementID, status) => {
       autoplay: true,
     });
   }
+  if (status === "info") {
+    lottie.loadAnimation({
+      container: statusElement,
+      animationData: infoMark,
+      renderer: "svg",
+      loop: false,
+      autoplay: true,
+    });
+  }
 };
 
 //dataset description (first page) functions
@@ -13987,7 +13954,8 @@ const guidedAddDatasetDescription = async (
     throw new Error(userErrorMessage(error));
   }
 };
-const guidedAddDatasetBannerImage = async (bfAccount, datasetName, bannerImagePath) => {
+
+const uploadValidBannerImage = async (bfAccount, datasetName, bannerImagePath) => {
   document.getElementById("guided-dataset-banner-image-upload-tr").classList.remove("hidden");
   const datasetBannerImageUploadText = document.getElementById(
     "guided-dataset-banner-image-upload-text"
@@ -14075,6 +14043,24 @@ const guidedAddDatasetBannerImage = async (bfAccount, datasetName, bannerImagePa
     throw new Error(userErrorMessage(error));
   }
 };
+
+const skipBannerImageUpload = () => {
+  document.getElementById("guided-dataset-banner-image-upload-tr").classList.remove("hidden");
+  const datasetBannerImageUploadText = document.getElementById(
+    "guided-dataset-banner-image-upload-text"
+  );
+  datasetBannerImageUploadText.innerHTML = "Skipped optional banner image...";
+  guidedUploadStatusIcon("guided-dataset-banner-image-upload-status", "success");
+};
+
+const guidedAddDatasetBannerImage = async (bfAccount, datasetName, bannerImagePath) => {
+  if (!bannerImagePath) {
+    skipBannerImageUpload();
+    return;
+  }
+
+  await uploadValidBannerImage(bfAccount, datasetName, bannerImagePath);
+};
 const guidedAddDatasetLicense = async (bfAccount, datasetName, datasetLicense) => {
   document.getElementById("guided-dataset-license-upload-tr").classList.remove("hidden");
   const datasetLicenseUploadText = document.getElementById("guided-dataset-license-upload-text");
@@ -15349,7 +15335,8 @@ const guidedPennsieveDatasetUpload = async () => {
       window.sodaJSONObj["digital-metadata"]["description"]["primary-conclusion"];
     const guidedTags = window.sodaJSONObj["digital-metadata"]["dataset-tags"];
     const guidedLicense = window.sodaJSONObj["digital-metadata"]["license"];
-    const guidedBannerImagePath = window.sodaJSONObj["digital-metadata"]["banner-image-path"];
+    const guidedBannerImagePath = window.sodaJSONObj["digital-metadata"]?.["banner-image-path"];
+    console.log("Banner image path: ", guidedBannerImagePath);
 
     //Hide the upload tables
     document.querySelectorAll(".guided-upload-table").forEach((table) => {
@@ -16386,6 +16373,9 @@ const guidedSaveBannerImage = async () => {
       $("#guided-banner-image-modal").modal("hide");
       $("#guided-button-add-banner-image").text("Edit banner image");
     }
+
+    // hide the skip btn as it is no longer relvant
+    document.querySelector("#guided--skip-banner-img-btn").style.display = "none";
   });
 };
 // /**************************************/

src/renderer/src/sections/guided_mode/guided_curate_dataset.html

@@ -2792,11 +2792,14 @@ <h1 class="text-sub-step-title">Contributor information</h1>
               <i class="fas fa-chevron-right" style="transform: rotate(0deg)"></i>
             </div>
             <div class="info-container" style="margin-bottom: 1.5rem">
-              <p class="help-text">The minimum requirements for contributors are:</p>
+              <p class="help-text">
+                The minimum requirements for contributors before a dataset can be published are:
+              </p>
               <ul class="help-text">
                 <li class="help-text text-left mb-2">
-                  <b>Principal Investigator: </b>One and only one Principal Investigator is
-                  required.
+                  <b>Principal Investigator: </b>One and only one Principal Investigator is required
+                  before the dataset can be published. However, please note that you may upload your
+                  dataset before officially designating a Principal Investigator.
                 </li>
               </ul>
             </div>
@@ -4790,6 +4793,13 @@ <h1 class="text-sub-step-title">Banner image</h1>
             >
               Add banner image
             </button>
+            <button
+              class="ui primary basic button pass-button-click-to-next-button"
+              style="margin: 5px 7px !important"
+              id="guided--skip-banner-img-btn"
+            >
+              Skip and continue
+            </button>
             <div
               class="guided--container-data-display-contract hidden"
               id="guided-banner-image-preview-container"
@@ -5456,14 +5466,6 @@ <h5 class="guided--dataset-description">Dataset description:</h5>
                 <h5 class="guided--dataset-content" id="guided-review-dataset-description"></h5>
               </div>
             </div>
-            <div class="guided--card-dataset-info">
-              <div class="guided--dataset-description-container">
-                <h5 class="guided--dataset-description">Dataset PI:</h5>
-              </div>
-              <div class="guided--dataset-content-container">
-                <h5 class="guided--dataset-content" id="guided-review-dataset-pi-owner"></h5>
-              </div>
-            </div>
             <div class="guided--card-dataset-info">
               <div class="guided--dataset-description-container">
                 <h5 class="guided--dataset-description">Permissions to Pennsieve dataset:</h5>