#1532 #1533 - only show concept dois and fix editing form

Need to get content from version DOI API is currently broken so need to wait for a fix for further testing
ral-facilities · Feb 2, 2024 · 84c9498 · 84c9498
1 parent bc8f4fc
commit 84c9498
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 6 deletions.
diff --git a/packages/datagateway-common/src/api/dataPublications.tsx b/packages/datagateway-common/src/api/dataPublications.tsx
@@ -154,7 +154,7 @@ export const useDataPublicationsInfinite = (
 };
 
 export const useDataPublication = (
-  dataPublicationId: number
+  dataPublicationId?: number
 ): UseQueryResult<DataPublication[], AxiosError> => {
   const apiUrl = useSelector((state: StateType) => state.dgcommon.urls.apiUrl);
 
@@ -164,7 +164,7 @@ export const useDataPublication = (
     DataPublication[],
     [string, number]
   >(
-    ['dataPublication', dataPublicationId],
+    ['dataPublication', dataPublicationId ?? -1],
     () => {
       return fetchDataPublications(apiUrl, { sort: {}, filters: {} }, [
         {
@@ -194,6 +194,30 @@ export const useDataPublication = (
         },
       ]);
     },
+    {
+      onError: (error) => {
+        handleICATError(error);
+      },
+      retry: retryICATErrors,
+      enabled: typeof dataPublicationId !== 'undefined',
+    }
+  );
+};
+
+export const useDataPublicationByFilters = (
+  additionalFilters: AdditionalFilters
+): UseQueryResult<DataPublication[], AxiosError> => {
+  const apiUrl = useSelector((state: StateType) => state.dgcommon.urls.apiUrl);
+
+  return useQuery(
+    ['dataPublication', additionalFilters],
+    () => {
+      return fetchDataPublications(
+        apiUrl,
+        { sort: {}, filters: {} },
+        additionalFilters
+      );
+    },
     {
       onError: (error) => {
         handleICATError(error);

diff --git a/packages/datagateway-dataview/src/views/landing/dls/dlsDataPublicationEditForm.component.tsx b/packages/datagateway-dataview/src/views/landing/dls/dlsDataPublicationEditForm.component.tsx
@@ -7,6 +7,7 @@ import {
   readSciGatewayToken,
   RelatedDOI,
   useDataPublication,
+  useDataPublicationByFilters,
   useUpdateDOI,
 } from 'datagateway-common';
 import React from 'react';
@@ -45,6 +46,38 @@ const DLSDataPublicationEditForm: React.FC<DLSDataPublicationEditFormProps> = (
   );
   const dataPublication = dataPublications?.[0];
 
+  const { data: versionDataPublications } = useDataPublicationByFilters([
+    {
+      filterType: 'where',
+      filterValue: JSON.stringify({
+        'relatedItems.relationType': { eq: 'IsVersionOf' },
+      }),
+    },
+    {
+      filterType: 'where',
+      filterValue: JSON.stringify({
+        'relatedItems.identifier': { eq: dataPublication?.pid },
+      }),
+    },
+    {
+      filterType: 'include',
+      filterValue: JSON.stringify([
+        {
+          content: {
+            dataCollectionInvestigations: {
+              investigation: {
+                investigationInstruments: 'instrument',
+              },
+            },
+            dataCollectionDatasets: 'dataset',
+            dataCollectionDatafiles: 'datafile',
+          },
+        },
+      ]),
+    },
+  ]);
+  const versionDataPublication = versionDataPublications?.[0];
+
   React.useEffect(() => {
     if (dataPublication) {
       setTitle(dataPublication.title);
@@ -129,7 +162,7 @@ const DLSDataPublicationEditForm: React.FC<DLSDataPublicationEditFormProps> = (
                   setRelatedDOIs={setRelatedDOIs}
                   disableMintButton={false}
                   onMintClick={() => {
-                    if (dataPublication) {
+                    if (dataPublication && versionDataPublication) {
                       setShowMintConfirmation(true);
                       const creatorsList = selectedUsers
                         .filter(
@@ -148,15 +181,15 @@ const DLSDataPublicationEditForm: React.FC<DLSDataPublicationEditFormProps> = (
                         // TODO: add ability for user to edit the content
                         content: {
                           investigation_ids:
-                            dataPublication.content?.dataCollectionInvestigations?.map(
+                            versionDataPublication.content?.dataCollectionInvestigations?.map(
                               (dci) => dci.investigation.id
                             ) ?? [],
                           dataset_ids:
-                            dataPublication.content?.dataCollectionDatasets?.map(
+                            versionDataPublication.content?.dataCollectionDatasets?.map(
                               (dcd) => dcd.dataset.id
                             ) ?? [],
                           datafile_ids:
-                            dataPublication.content?.dataCollectionDatafiles?.map(
+                            versionDataPublication.content?.dataCollectionDatafiles?.map(
                               (dcd) => dcd.datafile.id
                             ) ?? [],
                         },

diff --git a/packages/datagateway-dataview/src/views/table/dls/dlsMyDOIsTable.component.tsx b/packages/datagateway-dataview/src/views/table/dls/dlsMyDOIsTable.component.tsx
@@ -29,6 +29,9 @@ const DLSMyDOIsTable = (): React.ReactElement => {
     [location.search]
   );
 
+  /** TODO do we want to display concept dois instead of latest version DOIs (like Zenodo does iirc?)
+   * Is there a nicer way of checking for version vs concept? idk
+   */
   const { data: totalDataCount } = useDataPublicationCount([
     {
       filterType: 'where',
@@ -45,6 +48,12 @@ const DLSMyDOIsTable = (): React.ReactElement => {
         },
       }),
     },
+    {
+      filterType: 'where',
+      filterValue: JSON.stringify({
+        'relatedItems.relationType': { eq: 'HasVersion' },
+      }),
+    },
   ]);
 
   const { fetchNextPage, data } = useDataPublicationsInfinite([
@@ -63,6 +72,12 @@ const DLSMyDOIsTable = (): React.ReactElement => {
         },
       }),
     },
+    {
+      filterType: 'where',
+      filterValue: JSON.stringify({
+        'relatedItems.relationType': { eq: 'HasVersion' },
+      }),
+    },
   ]);
 
   /* istanbul ignore next */