feat: ✨ add support for updated managing organization (#44)

* chore: 🔨 update db * feat: ✨ add support for updated managing organization * fix: 🐛 managing organization name in steps --------- Co-authored-by: aydawka <[email protected]>
AI-READI · Mar 18, 2024 · 73aa2a1 · 73aa2a1
1 parent 91add6b
commit 73aa2a1
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 28 deletions.
diff --git a/mermaid/mmd/dataset-metadata-er.mmd b/mermaid/mmd/dataset-metadata-er.mmd
@@ -30,7 +30,6 @@ erDiagram
         timestamp created_at
     }
 
-
     DATASET_DATE {
         string id PK "UUIDv4"
         string dataset_id FK "DATASET.id"
@@ -114,12 +113,18 @@ erDiagram
         timestamp created_at
     }
 
+    DATASET_MANAGING_ORGANIZATION {
+        string dataset_id PK,FK "DATASET.id"
+        string name
+        string identifier
+        string identifier_scheme
+        string identifier_scheme_uri
+    }
+
      DATASET_OTHER {
         string dataset_id PK,FK "DATASET.id"
         string resource_type
         string language "NULLABLE"
-        string managing_organization_name
-        string managing_organization_ror_id
         string standards_followed "Used for the README file"
         string acknowledgement "Used for the README file"
         string[] size
@@ -165,5 +170,6 @@ erDiagram
     DATASET ||--o{ DATASET_FUNDER : "has funder"
     DATASET ||--o{ DATASET_RELATED_IDENTIFIER : "has related identifiers"
     DATASET ||--|| DATASET_OTHER : "has other details"
+    DATASET ||--|| DATASET_MANAGING_ORGANIZATION : "has managing organization"
 
     DATASET_HEALTHSHEET ||--|| DATASET : "has healthsheet"
diff --git a/mermaid/svg/dataset-metadata-er.svg b/mermaid/svg/dataset-metadata-er.svg
diff --git a/src/types/Dataset.d.ts b/src/types/Dataset.d.ts
@@ -112,8 +112,10 @@ export interface DatasetDates {
 }
 
 export interface DatasetManagingOrganization {
-  managing_organization_name: string;
-  managing_organization_ror_id: string;
+  name: string;
+  identifier: string;
+  identifier_scheme: string;
+  identifier_scheme_uri: string;
 }
 
 export interface DatasetDeIdentLevel {

diff --git a/src/types/Version.d.ts b/src/types/Version.d.ts
@@ -226,7 +226,7 @@ export interface VersionDatasetDate {
 }
 
 export interface VersionDatasetManagingOrganization {
-  managing_organization_name: string;
+  name: string;
 }
 
 export interface VersionDatasetRecordKeys {

diff --git a/...views/study/dataset/metadata/managingorganization/DatasetMetadataManagingOrganization.vue b/...views/study/dataset/metadata/managingorganization/DatasetMetadataManagingOrganization.vue
@@ -16,14 +16,16 @@ const studyId = routeParams.studyId;
 const datasetId = routeParams.datasetId;
 
 const moduleData = ref<DatasetManagingOrganization>({
-  managing_organization_name: "",
-  managing_organization_ror_id: "",
+  name: "",
+  identifier: "",
+  identifier_scheme: "",
+  identifier_scheme_uri: "",
 });
 
 const formRef = ref<FormInst | null>(null);
 
 const rules: FormRules = {
-  managing_organization_name: {
+  name: {
     message: "Please enter a name.",
     required: true,
     trigger: ["blur", "input"],
@@ -60,8 +62,10 @@ const saveMetadata = (e: MouseEvent) => {
       loading.value = true;
 
       const data = {
-        managing_organization_name: moduleData.value.managing_organization_name,
-        managing_organization_ror_id: moduleData.value.managing_organization_ror_id || "",
+        name: moduleData.value.name,
+        identifier: moduleData.value.identifier || "",
+        identifier_scheme: moduleData.value.identifier_scheme || "",
+        identifier_scheme_uri: moduleData.value.identifier_scheme_uri || "",
       };
 
       const response = await fetch(
@@ -98,7 +102,7 @@ const saveMetadata = (e: MouseEvent) => {
   <main class="flex h-full w-full flex-col pr-6">
     <PageBackNavigationHeader
       title="Managing Organization"
-      description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
+      description="Lorem ipsum dolor sit amet consectetur adipisicing elit."
       linkName="dataset:overview"
       :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
     />
@@ -117,25 +121,42 @@ const saveMetadata = (e: MouseEvent) => {
         class="pr-4"
         v-else
       >
-        <h3>Managing Organization</h3>
-
-        <p class="pb-8 pt-2">
-          Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus,
-          voluptatem, quibusdam, quos voluptas quae quas voluptatum
-        </p>
-
-        <n-form-item label="Name" path="managing_organization_name">
+        <n-form-item label="Name" path="name">
           <n-input
-            v-model:value="moduleData.managing_organization_name"
-            placeholder="World Data Center for Climate (WDCC)"
+            v-model:value="moduleData.name"
+            placeholder="California Medical Innovations Institute"
             clearable
           />
         </n-form-item>
 
-        <n-form-item label="ROR ID" path="managing_organization_ror_id">
+        <n-form-item
+          label="Identifier"
+          path="identifier"
+          :rule="{
+            message: 'Please enter a valid identifier.',
+            required: !!moduleData.identifier_scheme,
+            trigger: ['blur', 'input'],
+          }"
+        >
+          <n-input v-model:value="moduleData.identifier" placeholder="0156zyn36" clearable />
+        </n-form-item>
+
+        <n-form-item
+          label="Identifier Scheme"
+          path="identifier_scheme"
+          :rule="{
+            message: 'Please enter a valid identifier scheme.',
+            required: !!moduleData.identifier,
+            trigger: ['blur', 'input'],
+          }"
+        >
+          <n-input v-model:value="moduleData.identifier_scheme" placeholder="ROR" clearable />
+        </n-form-item>
+
+        <n-form-item label="Identifier Scheme URI" path="identifier_scheme_uri">
           <n-input
-            v-model:value="moduleData.managing_organization_ror_id"
-            placeholder="World Data Center for Climate (WDCC)"
+            v-model:value="moduleData.identifier_scheme_uri"
+            placeholder="https://ror.org/"
             clearable
           />
         </n-form-item>

diff --git a/src/views/study/dataset/publish/metadata/PublishDatasetMetadata.vue b/src/views/study/dataset/publish/metadata/PublishDatasetMetadata.vue
@@ -346,7 +346,7 @@ function handleNextButton() {
         </CollapsibleCard>
 
         <CollapsibleCard title="Managing Organization" bordered>
-          <div v-if="dataset_metadata.managing_organization.managing_organization_name">
+          <div v-if="dataset_metadata.managing_organization.name">
             <dl>
               <div class="flex flex-row flex-wrap">
                 <dt
@@ -356,7 +356,7 @@ function handleNextButton() {
                 </dt>
 
                 <dd class="grow basis-0 border border-gray-100 p-2.5">
-                  {{ dataset_metadata.managing_organization.managing_organization_name }}
+                  {{ dataset_metadata.managing_organization.name }}
                 </dd>
               </div>
             </dl>