From 24eb79085c7f03a5e432b3267c913d75ceef37c7 Mon Sep 17 00:00:00 2001
From: aydawka <aydan.gasimova2@gmail.com>
Date: Mon, 14 Apr 2025 13:20:09 -0700
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E2=9C=A8=20modify=20dataset=20work?=
 =?UTF-8?q?flow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/sidebar/DatasetSidebar.vue     |   3 +-
 src/router/index.ts                           |   6 +
 .../metadata/about/DatasetMetadataOther.vue   |  32 ++++-
 .../DatasetMetadataAccessRights.vue           |  30 ++++-
 .../DatasetMetadataDataManagement.vue         |  31 ++++-
 .../DatasetMetadataGeneralInformation.vue     |  41 +++++--
 .../DatasetMetadataIdentifiers.vue            |  31 ++++-
 .../informative-page/InformativePage.vue      | 111 ++++++++++++++++++
 .../DatasetMetadataRelatedIdentifiers.vue     |  31 ++++-
 .../metadata/team/DatasetMetadataTeam.vue     |  32 ++++-
 src/views/study/dataset/new/NewDataset.vue    |  40 ++++++-
 .../dataset/overview/DatasetOverview.vue      |  51 ++++++--
 src/views/study/datasets/AllDatasets.vue      |   2 +-
 13 files changed, 390 insertions(+), 51 deletions(-)
 create mode 100644 src/views/study/dataset/metadata/informative-page/InformativePage.vue

diff --git a/src/components/sidebar/DatasetSidebar.vue b/src/components/sidebar/DatasetSidebar.vue
index d69495ec..2e3f55b9 100644
--- a/src/components/sidebar/DatasetSidebar.vue
+++ b/src/components/sidebar/DatasetSidebar.vue
@@ -37,6 +37,7 @@ const dynamicUpperMenuOptions: MenuOption[] = [
   {
     children: [
       {
+        disabled: false,
         icon: renderIcon("material-symbols:description-outline"),
         key: "dataset:metadata:general-information",
         label: "General information",
@@ -64,7 +65,7 @@ const dynamicUpperMenuOptions: MenuOption[] = [
       {
         icon: renderIcon("fluent-mdl2:relationship"),
         key: "dataset:metadata:related-identifiers",
-        label: "Related Identifiers",
+        label: "Related identifiers",
       },
       {
         // language, managing organization, size goes in here
diff --git a/src/router/index.ts b/src/router/index.ts
index 37451e52..4e96490d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -34,6 +34,7 @@ import DatasetMetadataAccessRights from "@/views/study/dataset/metadata/access-r
 import DatasetMetadataDataManagement from "@/views/study/dataset/metadata/data-management/DatasetMetadataDataManagement.vue";
 import DatasetMetadataGeneralInformation from "@/views/study/dataset/metadata/general-information/DatasetMetadataGeneralInformation.vue";
 import DatasetMetadataIdentifiers from "@/views/study/dataset/metadata/identifiers/DatasetMetadataIdentifiers.vue";
+import InformativePage from "@/views/study/dataset/metadata/informative-page/InformativePage.vue";
 import DatasetMetadataRelatedIdentifiers from "@/views/study/dataset/metadata/related/DatasetMetadataRelatedIdentifiers.vue";
 import DatasetMetadataTeam from "@/views/study/dataset/metadata/team/DatasetMetadataTeam.vue";
 import NewDataset from "@/views/study/dataset/new/NewDataset.vue";
@@ -272,6 +273,11 @@ const router = createRouter({
                       path: "identifiers",
                       component: DatasetMetadataIdentifiers,
                     },
+                    {
+                      name: "dataset:metadata:informative",
+                      path: "informative",
+                      component: InformativePage,
+                    },
                     {
                       name: "dataset:metadata:general-information",
                       path: "general-information",
diff --git a/src/views/study/dataset/metadata/about/DatasetMetadataOther.vue b/src/views/study/dataset/metadata/about/DatasetMetadataOther.vue
index 88654130..b1f1e0d3 100644
--- a/src/views/study/dataset/metadata/about/DatasetMetadataOther.vue
+++ b/src/views/study/dataset/metadata/about/DatasetMetadataOther.vue
@@ -10,6 +10,7 @@ const route = useRoute();
 const push = usePush();
 
 const studyStore = useStudyStore();
+const router = useRouter();
 
 const routeParams = {
   datasetId: route.params.datasetId as string,
@@ -123,7 +124,10 @@ const saveMetadata = (e: MouseEvent) => {
       }
 
       push.success("Metadata saved successfully");
-
+      router.push({
+        name: "dataset:metadata:informative",
+        params: { datasetId: datasetId, studyId },
+      });
       console.log("success");
     } else {
       console.log("error");
@@ -146,6 +150,13 @@ const scrollToSection = (key: string) => {
   const section = document.querySelector(`.${key}`) as HTMLElement;
   scrollbarRef.value?.scrollTo({ behavior: "smooth", top: section.offsetTop });
 };
+
+const previousPage = () => {
+  router.push({
+    name: "dataset:metadata:related-identifiers",
+    params: { datasetId: datasetId, studyId },
+  });
+};
 </script>
 
 <template>
@@ -325,7 +336,20 @@ const scrollToSection = (key: string) => {
 
             <n-divider />
 
-            <div class="flex justify-start">
+            <div class="flex justify-between gap-4">
+              <n-button
+                size="large"
+                type="primary"
+                @click="previousPage"
+                :disabled="studyStore.currentStudyRole === 'viewer'"
+              >
+                <template #icon>
+                  <f-icon icon="ic:round-arrow-back-ios" />
+                </template>
+
+                Back
+              </n-button>
+
               <n-button
                 size="large"
                 type="primary"
@@ -334,10 +358,10 @@ const scrollToSection = (key: string) => {
                 :disabled="studyStore.currentStudyRole === 'viewer'"
               >
                 <template #icon>
-                  <f-icon icon="material-symbols:save" />
+                  <f-icon icon="ic:round-arrow-forward-ios" />
                 </template>
 
-                Save Metadata
+                Next
               </n-button>
             </div>
           </n-form>
diff --git a/src/views/study/dataset/metadata/access-rights/DatasetMetadataAccessRights.vue b/src/views/study/dataset/metadata/access-rights/DatasetMetadataAccessRights.vue
index b4a91433..63b4552e 100644
--- a/src/views/study/dataset/metadata/access-rights/DatasetMetadataAccessRights.vue
+++ b/src/views/study/dataset/metadata/access-rights/DatasetMetadataAccessRights.vue
@@ -14,6 +14,7 @@ const route = useRoute();
 const push = usePush();
 
 const studyStore = useStudyStore();
+const router = useRouter();
 
 const routeParams = {
   datasetId: route.params.datasetId as string,
@@ -134,6 +135,10 @@ const saveMetadata = (e: MouseEvent) => {
       }
 
       push.success("Access details were saved successfully");
+      router.push({
+        name: "dataset:metadata:related-identifiers",
+        params: { datasetId: datasetId, studyId },
+      });
 
       console.log("success");
     } else {
@@ -208,6 +213,13 @@ const scrollToSection = (key: string) => {
   const section = document.querySelector(`.${key}`) as HTMLElement;
   scrollbarRef.value?.scrollTo({ behavior: "smooth", top: section.offsetTop });
 };
+
+const previousPage = () => {
+  router.push({
+    name: "dataset:metadata:data-management",
+    params: { datasetId: datasetId, studyId },
+  });
+};
 </script>
 
 <template>
@@ -347,7 +359,19 @@ const scrollToSection = (key: string) => {
 
             <n-divider />
 
-            <div class="flex justify-start pt-4">
+            <div class="flex justify-between gap-4">
+              <n-button
+                size="large"
+                type="primary"
+                @click="previousPage"
+                :disabled="studyStore.currentStudyRole === 'viewer'"
+              >
+                <template #icon>
+                  <f-icon icon="ic:round-arrow-back-ios" />
+                </template>
+                Back
+              </n-button>
+
               <n-button
                 size="large"
                 type="primary"
@@ -356,9 +380,9 @@ const scrollToSection = (key: string) => {
                 :disabled="studyStore.currentStudyRole === 'viewer'"
               >
                 <template #icon>
-                  <f-icon icon="material-symbols:save" />
+                  <f-icon icon="ic:round-arrow-forward-ios" />
                 </template>
-                Save Metadata
+                Next
               </n-button>
             </div>
           </n-form>
diff --git a/src/views/study/dataset/metadata/data-management/DatasetMetadataDataManagement.vue b/src/views/study/dataset/metadata/data-management/DatasetMetadataDataManagement.vue
index 1622ba8b..96b9239f 100644
--- a/src/views/study/dataset/metadata/data-management/DatasetMetadataDataManagement.vue
+++ b/src/views/study/dataset/metadata/data-management/DatasetMetadataDataManagement.vue
@@ -11,6 +11,7 @@ const route = useRoute();
 const push = usePush();
 
 const studyStore = useStudyStore();
+const router = useRouter();
 
 const routeParams = {
   datasetId: route.params.datasetId as string,
@@ -153,6 +154,10 @@ const saveMetadata = (e: MouseEvent) => {
       }
 
       push.success("Status saved successfully");
+      router.push({
+        name: "dataset:metadata:access-rights",
+        params: { datasetId: datasetId, studyId },
+      });
 
       console.log("success");
     } else {
@@ -208,6 +213,13 @@ const scrollToSection = (key: string) => {
   const section = document.querySelector(`.${key}`) as HTMLElement;
   scrollbarRef.value?.scrollTo({ behavior: "smooth", top: section.offsetTop });
 };
+
+const previousPage = () => {
+  router.push({
+    name: "dataset:metadata:team",
+    params: { datasetId: datasetId, studyId },
+  });
+};
 </script>
 
 <template>
@@ -578,7 +590,20 @@ const scrollToSection = (key: string) => {
 
             <n-divider />
 
-            <div class="flex justify-start pt-4">
+            <div class="flex justify-between gap-4">
+              <n-button
+                size="large"
+                type="primary"
+                @click="previousPage"
+                :disabled="studyStore.currentStudyRole === 'viewer'"
+              >
+                <template #icon>
+                  <f-icon icon="ic:round-arrow-back-ios" />
+                </template>
+
+                Back
+              </n-button>
+
               <n-button
                 size="large"
                 type="primary"
@@ -587,10 +612,10 @@ const scrollToSection = (key: string) => {
                 :disabled="studyStore.currentStudyRole === 'viewer'"
               >
                 <template #icon>
-                  <f-icon icon="material-symbols:save" />
+                  <f-icon icon="ic:round-arrow-forward-ios" />
                 </template>
 
-                Save Metadata
+                Next
               </n-button>
             </div>
           </n-form>
diff --git a/src/views/study/dataset/metadata/general-information/DatasetMetadataGeneralInformation.vue b/src/views/study/dataset/metadata/general-information/DatasetMetadataGeneralInformation.vue
index 790e7fd1..ea424fec 100644
--- a/src/views/study/dataset/metadata/general-information/DatasetMetadataGeneralInformation.vue
+++ b/src/views/study/dataset/metadata/general-information/DatasetMetadataGeneralInformation.vue
@@ -244,8 +244,10 @@ const saveMetadata = (e: MouseEvent) => {
 
       push.success("Dataset titles updated successfully");
 
-      // refresh page
-      router.go(0);
+      router.push({
+        name: "dataset:metadata:identifiers",
+        params: { datasetId: datasetId, studyId },
+      });
 
       console.log("success");
     } else {
@@ -266,15 +268,22 @@ const scrollToSection = (key: string) => {
   const section = document.querySelector(`.${key}`) as HTMLElement;
   scrollbarRef.value?.scrollTo({ behavior: "smooth", top: section.offsetTop });
 };
+
+const previousPage = () => {
+  router.push({
+    name: "study:all-datasets",
+    params: { studyId },
+  });
+};
 </script>
 
 <template>
   <main class="flex h-full w-full flex-col pr-6">
     <PageBackNavigationHeader
-      title="General information"
+      title="Dataset collection"
       description=""
-      linkName="dataset:overview"
-      :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
+      linkName="study:all-datasets"
+      :linkParams="{ studyId: routeParams.studyId }"
     />
 
     <n-divider />
@@ -308,6 +317,10 @@ const scrollToSection = (key: string) => {
             label-placement="top"
             :disabled="studyStore.currentStudyRole === 'viewer'"
           >
+            <h1 class="py-4">General information</h1>
+
+            <p>Let’s start with some high-level questions so we can understand your dataset.</p>
+
             <h2 class="titles py-4">Titles</h2>
 
             <n-card class="bg-gray-50">
@@ -560,7 +573,19 @@ const scrollToSection = (key: string) => {
 
             <n-divider />
 
-            <div class="flex justify-start pt-4">
+            <div class="flex justify-between gap-4 pt-4">
+              <n-button
+                size="large"
+                type="primary"
+                @click="previousPage"
+                :disabled="studyStore.currentStudyRole === 'viewer'"
+              >
+                <template #icon>
+                  <f-icon icon="ic:round-arrow-back-ios" />
+                </template>
+                Back
+              </n-button>
+
               <n-button
                 size="large"
                 type="primary"
@@ -569,9 +594,9 @@ const scrollToSection = (key: string) => {
                 :disabled="studyStore.currentStudyRole === 'viewer'"
               >
                 <template #icon>
-                  <f-icon icon="material-symbols:save" />
+                  <f-icon icon="ic:round-arrow-forward-ios" />
                 </template>
-                Save changes
+                Next
               </n-button>
             </div>
           </n-form>
diff --git a/src/views/study/dataset/metadata/identifiers/DatasetMetadataIdentifiers.vue b/src/views/study/dataset/metadata/identifiers/DatasetMetadataIdentifiers.vue
index df1f0efa..c754a6b6 100644
--- a/src/views/study/dataset/metadata/identifiers/DatasetMetadataIdentifiers.vue
+++ b/src/views/study/dataset/metadata/identifiers/DatasetMetadataIdentifiers.vue
@@ -141,8 +141,10 @@ const saveMetadata = (e: MouseEvent) => {
 
       push.success("Dataset alternative identifiers updated successfully");
 
-      // refresh page
-      router.go(0);
+      router.push({
+        name: "dataset:metadata:team",
+        params: { datasetId: datasetId, studyId },
+      });
 
       console.log("success");
     } else {
@@ -163,6 +165,13 @@ const scrollToSection = (key: string) => {
   const section = document.querySelector(`.${key}`) as HTMLElement;
   scrollbarRef.value?.scrollTo({ behavior: "smooth", top: section.offsetTop });
 };
+
+const previousPage = () => {
+  router.push({
+    name: "dataset:metadata:general-information",
+    params: { datasetId: datasetId, studyId },
+  });
+};
 </script>
 
 <template>
@@ -308,7 +317,19 @@ const scrollToSection = (key: string) => {
 
           <n-divider />
 
-          <div class="flex justify-start">
+          <div class="flex justify-between gap-4">
+            <n-button
+              size="large"
+              type="primary"
+              @click="previousPage"
+              :disabled="studyStore.currentStudyRole === 'viewer'"
+            >
+              <template #icon>
+                <f-icon icon="ic:round-arrow-back-ios" />
+              </template>
+              Back
+            </n-button>
+
             <n-button
               size="large"
               type="primary"
@@ -317,9 +338,9 @@ const scrollToSection = (key: string) => {
               :disabled="studyStore.currentStudyRole === 'viewer'"
             >
               <template #icon>
-                <f-icon icon="material-symbols:save" />
+                <f-icon icon="ic:round-arrow-forward-ios" />
               </template>
-              Save changes
+              Next
             </n-button>
           </div>
         </div>
diff --git a/src/views/study/dataset/metadata/informative-page/InformativePage.vue b/src/views/study/dataset/metadata/informative-page/InformativePage.vue
new file mode 100644
index 00000000..6240ce77
--- /dev/null
+++ b/src/views/study/dataset/metadata/informative-page/InformativePage.vue
@@ -0,0 +1,111 @@
+<script setup lang="ts">
+import FadeTransition from "@/components/transitions/FadeTransition.vue";
+import { useSidebarStore } from "@/stores/sidebar";
+import type { Dataset } from "@/types/Dataset";
+import { baseURL } from "@/utils/constants";
+// const baseURL = "http://localhost:3001/api";
+
+const route = useRoute();
+const push = usePush();
+
+const sidebarStore = useSidebarStore();
+const router = useRouter();
+
+const dataset = ref<Dataset>({
+  id: "",
+  title: "",
+  created_at: 0,
+  description: "",
+  updated_at: 0,
+});
+
+const routeParams = {
+  datasetId: route.params.datasetId as string,
+  studyId: route.params.studyId as string,
+};
+
+const studyId = routeParams.studyId;
+const datasetId = routeParams.datasetId;
+
+const loading = ref(false);
+
+onBeforeMount(async () => {
+  sidebarStore.setAppSidebarCollapsed(true);
+
+  loading.value = true;
+
+  const response = await fetch(`${baseURL}/study/${studyId}/dataset/${datasetId}`, {
+    method: "GET",
+  });
+
+  loading.value = false;
+
+  if (!response.ok) {
+    push.error("Something went wrong.");
+
+    throw new Error("Something went wrong.");
+  }
+
+  const data = await response.json();
+
+  dataset.value = data;
+});
+
+const navigateHealthsheet = () => {
+  router.push({
+    name: "dataset:healthsheet:motivation",
+    params: { datasetId: datasetId, studyId },
+  });
+};
+const navigatePublish = () => {
+  router.push({
+    name: "dataset:publish:versions",
+    params: { datasetId: datasetId, studyId },
+  });
+};
+const previousPage = () => {
+  router.push({
+    name: "dataset:metadata:about",
+    params: { datasetId: datasetId, studyId },
+  });
+};
+</script>
+
+<template>
+  <main class="flex h-full w-full flex-col space-y-8 pr-6">
+    <PageBackNavigationHeader
+      title="Data collection"
+      description="View an overview of your dataset"
+      linkName="study:all-datasets"
+      :linkParams="{ studyId: routeParams.studyId }"
+    />
+
+    <n-divider />
+
+    <FadeTransition>
+      <n-card class="flex max-w-screen-2xl items-center rounded-lg p-8">
+        <h1>Select the task you would like to perform below:</h1>
+
+        <div class="flex flex-row justify-between gap-8 pt-16">
+          <n-button @click="navigateHealthsheet" type="default" class="my-8 h-16"
+            >Fill out the healthsheet information</n-button
+          >
+
+          <n-button @click="navigatePublish" type="default" class="my-8 h-16"
+            >Start to publish a new version</n-button
+          >
+        </div>
+      </n-card>
+    </FadeTransition>
+
+    <div class="flex justify-between gap-4">
+      <n-button @click="previousPage" size="large" type="primary">
+        <template #icon>
+          <f-icon icon="ic:round-arrow-back-ios" />
+        </template>
+
+        Back
+      </n-button>
+    </div>
+  </main>
+</template>
diff --git a/src/views/study/dataset/metadata/related/DatasetMetadataRelatedIdentifiers.vue b/src/views/study/dataset/metadata/related/DatasetMetadataRelatedIdentifiers.vue
index a749eb2a..05bb9914 100644
--- a/src/views/study/dataset/metadata/related/DatasetMetadataRelatedIdentifiers.vue
+++ b/src/views/study/dataset/metadata/related/DatasetMetadataRelatedIdentifiers.vue
@@ -143,7 +143,10 @@ const saveMetadata = (e: MouseEvent) => {
         push.success("Identifiers saved successfully.");
 
         // refresh page
-        router.go(0);
+        router.push({
+          name: "dataset:metadata:about",
+          params: { datasetId: datasetId, studyId },
+        });
       }
 
       console.log("success");
@@ -153,6 +156,13 @@ const saveMetadata = (e: MouseEvent) => {
     }
   });
 };
+
+const previousPage = () => {
+  router.push({
+    name: "dataset:metadata:access-rights",
+    params: { datasetId: datasetId, studyId },
+  });
+};
 </script>
 
 <template>
@@ -341,7 +351,20 @@ const saveMetadata = (e: MouseEvent) => {
 
         <n-divider />
 
-        <div class="flex justify-start">
+        <div class="flex justify-between gap-4">
+          <n-button
+            size="large"
+            type="primary"
+            @click="previousPage"
+            :disabled="studyStore.currentStudyRole === 'viewer'"
+          >
+            <template #icon>
+              <f-icon icon="ic:round-arrow-back-ios" />
+            </template>
+
+            Back
+          </n-button>
+
           <n-button
             size="large"
             type="primary"
@@ -350,10 +373,10 @@ const saveMetadata = (e: MouseEvent) => {
             :disabled="studyStore.currentStudyRole === 'viewer'"
           >
             <template #icon>
-              <f-icon icon="material-symbols:save" />
+              <f-icon icon="ic:round-arrow-forward-ios" />
             </template>
 
-            Save Metadata
+            Next
           </n-button>
         </div>
       </n-form>
diff --git a/src/views/study/dataset/metadata/team/DatasetMetadataTeam.vue b/src/views/study/dataset/metadata/team/DatasetMetadataTeam.vue
index fa654414..3c3f09db 100644
--- a/src/views/study/dataset/metadata/team/DatasetMetadataTeam.vue
+++ b/src/views/study/dataset/metadata/team/DatasetMetadataTeam.vue
@@ -309,7 +309,10 @@ const saveMetadata = (e: MouseEvent) => {
         push.success("Creators saved successfully.");
 
         // refresh page
-        router.go(0);
+        router.push({
+          name: "dataset:metadata:data-management",
+          params: { datasetId: datasetId, studyId },
+        });
       }
 
       console.log("success");
@@ -333,13 +336,19 @@ const scrollToSection = (key: string) => {
   const section = document.querySelector(`.${key}`) as HTMLElement;
   scrollbarRef.value?.scrollTo({ behavior: "smooth", top: section.offsetTop });
 };
+const previousPage = () => {
+  router.push({
+    name: "dataset:metadata:identifiers",
+    params: { datasetId: datasetId, studyId },
+  });
+};
 </script>
 
 <template>
   <main class="flex h-full w-full flex-col pr-6">
     <PageBackNavigationHeader
       title="Team"
-      description="Lorem ipsum dolor sit amet, consectetur adipiscing elit."
+      description=""
       linkName="dataset:overview"
       :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
     />
@@ -1075,7 +1084,20 @@ const scrollToSection = (key: string) => {
 
             <n-divider />
 
-            <div class="flex justify-start pt-4">
+            <div class="flex justify-between gap-4">
+              <n-button
+                size="large"
+                @click="previousPage"
+                type="primary"
+                :disabled="studyStore.currentStudyRole === 'viewer'"
+              >
+                <template #icon>
+                  <f-icon icon="ic:round-arrow-back-ios" />
+                </template>
+
+                Back
+              </n-button>
+
               <n-button
                 size="large"
                 type="primary"
@@ -1084,10 +1106,10 @@ const scrollToSection = (key: string) => {
                 :disabled="studyStore.currentStudyRole === 'viewer'"
               >
                 <template #icon>
-                  <f-icon icon="material-symbols:save" />
+                  <f-icon icon="ic:round-arrow-forward-ios" />
                 </template>
 
-                Save Metadata
+                Next
               </n-button>
             </div>
           </n-form>
diff --git a/src/views/study/dataset/new/NewDataset.vue b/src/views/study/dataset/new/NewDataset.vue
index 8ba751e5..4b57ba10 100644
--- a/src/views/study/dataset/new/NewDataset.vue
+++ b/src/views/study/dataset/new/NewDataset.vue
@@ -80,19 +80,33 @@ const createDataset = (e: MouseEvent) => {
 
       console.log(data);
 
-      router.push({ name: "dataset:overview", params: { datasetId: data.id, studyId } });
-      push.success("Dataset created successfully.");
+      router.push({
+        name: "dataset:metadata:general-information",
+        params: { datasetId: data.id, studyId },
+      });
+      // push.success("Dataset created successfully.");
     } else {
       console.log("error");
       console.log(errors);
     }
   });
 };
+const previousPage = () => {
+  router.push({
+    name: "study:all-datasets",
+    params: { studyId },
+  });
+};
 </script>
 
 <template>
   <main class="flex h-full w-full flex-col">
-    <h1>Create a new dataset</h1>
+    <h1 class="pb-4">Prepare dataset</h1>
+
+    <p>
+      You will be guided through all the steps of the publishing process before submitting your
+      final version.
+    </p>
 
     <n-divider />
 
@@ -122,7 +136,21 @@ const createDataset = (e: MouseEvent) => {
 
       <n-divider />
 
-      <div class="flex justify-start">
+      <div class="flex justify-between gap-4">
+        <n-button
+          size="large"
+          type="primary"
+          @click="previousPage"
+          :disabled="
+            studyStore.currentStudyRole === 'viewer' || studyStore.currentStudyRole === 'editor'
+          "
+        >
+          <template #icon>
+            <f-icon icon="ic:round-arrow-back-ios" />
+          </template>
+          Back
+        </n-button>
+
         <n-button
           size="large"
           type="primary"
@@ -133,9 +161,9 @@ const createDataset = (e: MouseEvent) => {
           "
         >
           <template #icon>
-            <f-icon icon="gridicons:create" />
+            <f-icon icon="solar:round-arrow-right-bold" />
           </template>
-          Create Dataset
+          Start publish process
         </n-button>
       </div>
     </n-form>
diff --git a/src/views/study/dataset/overview/DatasetOverview.vue b/src/views/study/dataset/overview/DatasetOverview.vue
index aa0d5b2f..652fdc97 100644
--- a/src/views/study/dataset/overview/DatasetOverview.vue
+++ b/src/views/study/dataset/overview/DatasetOverview.vue
@@ -22,6 +22,8 @@ const routeParams = {
   studyId: route.params.studyId as string,
 };
 
+const router = useRouter();
+
 const studyId = routeParams.studyId;
 const datasetId = routeParams.datasetId;
 
@@ -48,29 +50,56 @@ onBeforeMount(async () => {
 
   dataset.value = data;
 });
+
+const previousPhase = (e: MouseEvent) => {
+  router.push({
+    name: "study:all-datasets",
+    params: { studyId },
+  });
+};
+const nextPhase = (e: MouseEvent) => {
+  router.push({
+    name: "dataset:metadata:general-information",
+    params: { datasetId: datasetId, studyId },
+  });
+};
 </script>
 
 <template>
   <main class="flex h-full w-full flex-col space-y-8 pr-6">
     <PageBackNavigationHeader
       title="Data collection"
-      description="View an overview of your dataset"
+      description=""
       linkName="study:all-datasets"
       :linkParams="{ studyId: routeParams.studyId }"
     />
 
     <n-divider />
 
-    <FadeTransition>
-      <LottieLoader v-if="loading" />
-
-      <div class="flex w-full justify-between" v-else>
-        <div class="pr-8">
-          <h2>{{ dataset.title || "Untitled Dataset" }}</h2>
-
-          <p class="py-4">{{ dataset.description || "No description provided" }}</p>
-        </div>
+    <n-card class="flex items-center justify-center rounded-md bg-gray-50 py-8">
+      <h1 class="flex justify-center">Dataset preparation introduction</h1>
+
+      <p class="max-w-screen-xl pt-8">
+        Several information are required to share a dataset. You will be guided through all the
+        steps for achieving that before uploading the resulting dataset. Once completed, you will
+        upload the final dataset.
+      </p>
+
+      <div class="flex justify-between gap-4 pt-32">
+        <n-button @click="previousPhase" size="large" type="primary">
+          <template #icon>
+            <f-icon icon="ic:round-arrow-back-ios" />
+          </template>
+          Back
+        </n-button>
+
+        <n-button size="large" @click="nextPhase" type="primary">
+          <template #icon>
+            <f-icon icon="ic:round-arrow-forward-ios" />
+          </template>
+          Next
+        </n-button>
       </div>
-    </FadeTransition>
+    </n-card>
   </main>
 </template>
diff --git a/src/views/study/datasets/AllDatasets.vue b/src/views/study/datasets/AllDatasets.vue
index 99dbda03..e2a73a1f 100644
--- a/src/views/study/datasets/AllDatasets.vue
+++ b/src/views/study/datasets/AllDatasets.vue
@@ -72,7 +72,7 @@ const navigateToDataset = (datasetId: string) => {
             <f-icon icon="ion:add-circle-outline" />
           </template>
 
-          Create a new dataset
+          Share a new dataset
         </n-button>
       </RouterLink>
     </n-space>

From ec0c8cdc8bcd77dea6db341a1a98a165f351bb40 Mon Sep 17 00:00:00 2001
From: aydawka <aydan.gasimova2@gmail.com>
Date: Wed, 16 Apr 2025 12:33:08 -0700
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E2=9C=A8=20modify=20dataset=20rout?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/overview/DatasetOverview.vue      | 51 ++++---------------
 src/views/study/datasets/AllDatasets.vue      |  2 +-
 2 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/src/views/study/dataset/overview/DatasetOverview.vue b/src/views/study/dataset/overview/DatasetOverview.vue
index 652fdc97..aa0d5b2f 100644
--- a/src/views/study/dataset/overview/DatasetOverview.vue
+++ b/src/views/study/dataset/overview/DatasetOverview.vue
@@ -22,8 +22,6 @@ const routeParams = {
   studyId: route.params.studyId as string,
 };
 
-const router = useRouter();
-
 const studyId = routeParams.studyId;
 const datasetId = routeParams.datasetId;
 
@@ -50,56 +48,29 @@ onBeforeMount(async () => {
 
   dataset.value = data;
 });
-
-const previousPhase = (e: MouseEvent) => {
-  router.push({
-    name: "study:all-datasets",
-    params: { studyId },
-  });
-};
-const nextPhase = (e: MouseEvent) => {
-  router.push({
-    name: "dataset:metadata:general-information",
-    params: { datasetId: datasetId, studyId },
-  });
-};
 </script>
 
 <template>
   <main class="flex h-full w-full flex-col space-y-8 pr-6">
     <PageBackNavigationHeader
       title="Data collection"
-      description=""
+      description="View an overview of your dataset"
       linkName="study:all-datasets"
       :linkParams="{ studyId: routeParams.studyId }"
     />
 
     <n-divider />
 
-    <n-card class="flex items-center justify-center rounded-md bg-gray-50 py-8">
-      <h1 class="flex justify-center">Dataset preparation introduction</h1>
-
-      <p class="max-w-screen-xl pt-8">
-        Several information are required to share a dataset. You will be guided through all the
-        steps for achieving that before uploading the resulting dataset. Once completed, you will
-        upload the final dataset.
-      </p>
-
-      <div class="flex justify-between gap-4 pt-32">
-        <n-button @click="previousPhase" size="large" type="primary">
-          <template #icon>
-            <f-icon icon="ic:round-arrow-back-ios" />
-          </template>
-          Back
-        </n-button>
-
-        <n-button size="large" @click="nextPhase" type="primary">
-          <template #icon>
-            <f-icon icon="ic:round-arrow-forward-ios" />
-          </template>
-          Next
-        </n-button>
+    <FadeTransition>
+      <LottieLoader v-if="loading" />
+
+      <div class="flex w-full justify-between" v-else>
+        <div class="pr-8">
+          <h2>{{ dataset.title || "Untitled Dataset" }}</h2>
+
+          <p class="py-4">{{ dataset.description || "No description provided" }}</p>
+        </div>
       </div>
-    </n-card>
+    </FadeTransition>
   </main>
 </template>
diff --git a/src/views/study/datasets/AllDatasets.vue b/src/views/study/datasets/AllDatasets.vue
index e2a73a1f..0a758440 100644
--- a/src/views/study/datasets/AllDatasets.vue
+++ b/src/views/study/datasets/AllDatasets.vue
@@ -47,7 +47,7 @@ onBeforeMount(async () => {
 const navigateToDataset = (datasetId: string) => {
   sidebarStore.setAppSidebarCollapsed(true);
 
-  router.push({ name: "dataset:overview", params: { datasetId } });
+  router.push({ name: "dataset:metadata:general-information", params: { datasetId } });
 };
 </script>
 

From 1522b9566342561332d89643cc118dbf236087d4 Mon Sep 17 00:00:00 2001
From: aydawka <aydan.gasimova2@gmail.com>
Date: Mon, 28 Apr 2025 13:06:00 -0700
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E2=9C=A8=20add=20text=20to=20descr?=
 =?UTF-8?q?iption=20for=20creating=20study?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/study/new/NewStudy.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/study/new/NewStudy.vue b/src/views/study/new/NewStudy.vue
index cc06268f..2485ae4c 100644
--- a/src/views/study/new/NewStudy.vue
+++ b/src/views/study/new/NewStudy.vue
@@ -32,7 +32,7 @@ const routeParams = {
 const study = reactive({
   title: faker.commerce.productName(),
   image: "",
-  short_description: "",
+  short_description: faker.commerce.productDescription(),
 });
 
 // const keywordOptions = FormJSON.keywordOptions;

From 801f8597a11571b161c73f559ebd0ed2ae152758 Mon Sep 17 00:00:00 2001
From: aydawka <aydan.gasimova2@gmail.com>
Date: Wed, 30 Apr 2025 00:26:17 -0700
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=F0=9F=90=9B=20align=20style=20in=20?=
 =?UTF-8?q?eligibility?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/study/metadata/eligibility/StudyEligibility.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/study/metadata/eligibility/StudyEligibility.vue b/src/views/study/metadata/eligibility/StudyEligibility.vue
index 1a2d6f11..398bf46d 100644
--- a/src/views/study/metadata/eligibility/StudyEligibility.vue
+++ b/src/views/study/metadata/eligibility/StudyEligibility.vue
@@ -203,7 +203,7 @@ const scrollToSection = (key: string) => {
     <n-scrollbar ref="scrollbarRef" class="max-h-[80vh]">
       <LottieLoader v-if="responseLoading" />
 
-      <div v-else class="flex flex-row-reverse max-lg:flex-col">
+      <div v-else class="flex flex-row-reverse justify-end max-lg:flex-col">
         <div class="max-2xl:w-[500px] max-lg:hidden lg:block 2xl:w-[250px]">
           <n-menu
             :options="menuOptions"