chore: change clé react-query datastore_datasheet_metadata

IGNF · Jan 15, 2025 · 720918d · 720918d
1 parent 8f3d13c
commit 720918d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 21 deletions.
diff --git a/assets/entrepot/pages/datasheet/DatasheetView/DatasheetView/DatasheetView.tsx b/assets/entrepot/pages/datasheet/DatasheetView/DatasheetView/DatasheetView.tsx
@@ -65,6 +65,7 @@ const DatasheetView: FC<DatasheetViewProps> = ({ datastoreId, datasheetName }) =
             queryClient.setQueryData<Datasheet[]>(RQKeys.datastore_datasheet_list(datastoreId), (datasheetList = []) => {
                 return datasheetList.filter((datasheet) => datasheet.name !== datasheetName);
             });
+            queryClient.invalidateQueries({ queryKey: RQKeys.datastore_datasheet_list(datastoreId) });
 
             routes.datasheet_list({ datastoreId }).push();
         },
@@ -80,7 +81,7 @@ const DatasheetView: FC<DatasheetViewProps> = ({ datastoreId, datasheetName }) =
     });
 
     const metadataQuery = useQuery<Metadata, CartesApiException>({
-        queryKey: RQKeys.datastore_metadata_by_datasheet_name(datastoreId, datasheetName),
+        queryKey: RQKeys.datastore_datasheet_metadata(datastoreId, datasheetName),
         queryFn: ({ signal }) => api.metadata.getByDatasheetName(datastoreId, datasheetName, { signal }),
         enabled: !datasheetDeleteMutation.isPending,
         staleTime: 60000,

diff --git a/assets/entrepot/pages/datasheet/DatasheetView/ServiceListTab/ServicesListItem.tsx b/assets/entrepot/pages/datasheet/DatasheetView/ServiceListTab/ServicesListItem.tsx
@@ -44,7 +44,7 @@ const ServicesListItem: FC<ServicesListItemProps> = ({ service, datasheetName, d
         },
         onSettled() {
             queryClient.refetchQueries({ queryKey: RQKeys.datastore_datasheet(datastoreId, datasheetName) });
-            queryClient.refetchQueries({ queryKey: RQKeys.datastore_metadata_by_datasheet_name(datastoreId, datasheetName) });
+            queryClient.refetchQueries({ queryKey: RQKeys.datastore_datasheet_metadata(datastoreId, datasheetName) });
         },
     });
 

diff --git a/...ts/entrepot/pages/service/tms/PyramidVectorTmsServiceForm/PyramidVectorTmsServiceForm.tsx b/...ts/entrepot/pages/service/tms/PyramidVectorTmsServiceForm/PyramidVectorTmsServiceForm.tsx
@@ -92,7 +92,7 @@ const PyramidVectorTmsServiceForm: FC<PyramidVectorTmsServiceFormProps> = ({ dat
                     queryKey: RQKeys.datastore_datasheet(datastoreId, pyramidQuery.data?.tags.datasheet_name),
                 });
                 routes.datastore_datasheet_view({ datastoreId, datasheetName: pyramidQuery.data?.tags.datasheet_name, activeTab: "services" }).push();
-                queryClient.refetchQueries({ queryKey: RQKeys.datastore_metadata_by_datasheet_name(datastoreId, pyramidQuery.data?.tags?.datasheet_name) });
+                queryClient.refetchQueries({ queryKey: RQKeys.datastore_datasheet_metadata(datastoreId, pyramidQuery.data?.tags?.datasheet_name) });
             } else {
                 routes.datasheet_list({ datastoreId }).push();
             }
@@ -126,7 +126,7 @@ const PyramidVectorTmsServiceForm: FC<PyramidVectorTmsServiceFormProps> = ({ dat
     });
 
     const metadataQuery = useQuery({
-        queryKey: RQKeys.datastore_metadata_by_datasheet_name(datastoreId, pyramidQuery.data?.tags?.datasheet_name ?? "XX"),
+        queryKey: RQKeys.datastore_datasheet_metadata(datastoreId, pyramidQuery.data?.tags?.datasheet_name ?? "XX"),
         queryFn: ({ signal }) => api.metadata.getByDatasheetName(datastoreId, pyramidQuery.data?.tags?.datasheet_name ?? "XX", { signal }),
         enabled: !!pyramidQuery.data?.tags?.datasheet_name,
     });

diff --git a/assets/entrepot/pages/service/wfs/WfsServiceForm.tsx b/assets/entrepot/pages/service/wfs/WfsServiceForm.tsx
@@ -153,7 +153,7 @@ const WfsServiceForm: FC<WfsServiceFormProps> = ({ datastoreId, vectorDbId, offe
                     queryKey: RQKeys.datastore_datasheet(datastoreId, vectorDbQuery.data?.tags.datasheet_name),
                 });
                 routes.datastore_datasheet_view({ datastoreId, datasheetName: vectorDbQuery.data?.tags.datasheet_name, activeTab: "services" }).push();
-                queryClient.refetchQueries({ queryKey: RQKeys.datastore_metadata_by_datasheet_name(datastoreId, vectorDbQuery.data?.tags?.datasheet_name) });
+                queryClient.refetchQueries({ queryKey: RQKeys.datastore_datasheet_metadata(datastoreId, vectorDbQuery.data?.tags?.datasheet_name) });
             } else {
                 routes.datasheet_list({ datastoreId }).push();
             }
@@ -187,7 +187,7 @@ const WfsServiceForm: FC<WfsServiceFormProps> = ({ datastoreId, vectorDbId, offe
     });
 
     const metadataQuery = useQuery({
-        queryKey: RQKeys.datastore_metadata_by_datasheet_name(datastoreId, vectorDbQuery.data?.tags?.datasheet_name ?? "XX"),
+        queryKey: RQKeys.datastore_datasheet_metadata(datastoreId, vectorDbQuery.data?.tags?.datasheet_name ?? "XX"),
         queryFn: ({ signal }) => api.metadata.getByDatasheetName(datastoreId, vectorDbQuery.data?.tags?.datasheet_name ?? "XX", { signal }),
         enabled: !!vectorDbQuery.data?.tags?.datasheet_name,
     });

diff --git a/...e/wms-raster-wmts/PyramidRasterWmsRasterServiceForm/PyramidRasterWmsRasterServiceForm.tsx b/...e/wms-raster-wmts/PyramidRasterWmsRasterServiceForm/PyramidRasterWmsRasterServiceForm.tsx
@@ -79,7 +79,7 @@ const PyramidRasterWmsRasterServiceForm: FC<PyramidRasterWmsRasterServiceFormPro
 
             queryClient.invalidateQueries({ queryKey: RQKeys.datastore_datasheet(datastoreId, datasheetName) });
             routes.datastore_datasheet_view({ datastoreId, datasheetName: datasheetName, activeTab: "services" }).push();
-            queryClient.refetchQueries({ queryKey: RQKeys.datastore_metadata_by_datasheet_name(datastoreId, datasheetName) });
+            queryClient.refetchQueries({ queryKey: RQKeys.datastore_datasheet_metadata(datastoreId, datasheetName) });
         },
     });
 
@@ -110,7 +110,7 @@ const PyramidRasterWmsRasterServiceForm: FC<PyramidRasterWmsRasterServiceFormPro
     });
 
     const metadataQuery = useQuery({
-        queryKey: RQKeys.datastore_metadata_by_datasheet_name(datastoreId, datasheetName),
+        queryKey: RQKeys.datastore_datasheet_metadata(datastoreId, datasheetName),
         queryFn: ({ signal }) => api.metadata.getByDatasheetName(datastoreId, datasheetName, { signal }),
         enabled: !(createServiceMutation.isPending || editServiceMutation.isPending),
     });

diff --git a/...ges/service/wms-raster-wmts/PyramidRasterWmtsServiceForm/PyramidRasterWmtsServiceForm.tsx b/...ges/service/wms-raster-wmts/PyramidRasterWmtsServiceForm/PyramidRasterWmtsServiceForm.tsx
@@ -79,7 +79,7 @@ const PyramidRasterWmtsServiceForm: FC<PyramidRasterWmtsServiceFormProps> = ({ d
 
             queryClient.invalidateQueries({ queryKey: RQKeys.datastore_datasheet(datastoreId, datasheetName) });
             routes.datastore_datasheet_view({ datastoreId, datasheetName: datasheetName, activeTab: "services" }).push();
-            queryClient.refetchQueries({ queryKey: RQKeys.datastore_metadata_by_datasheet_name(datastoreId, datasheetName) });
+            queryClient.refetchQueries({ queryKey: RQKeys.datastore_datasheet_metadata(datastoreId, datasheetName) });
         },
     });
 
@@ -110,7 +110,7 @@ const PyramidRasterWmtsServiceForm: FC<PyramidRasterWmtsServiceFormProps> = ({ d
     });
 
     const metadataQuery = useQuery({
-        queryKey: RQKeys.datastore_metadata_by_datasheet_name(datastoreId, datasheetName),
+        queryKey: RQKeys.datastore_datasheet_metadata(datastoreId, datasheetName),
         queryFn: ({ signal }) => api.metadata.getByDatasheetName(datastoreId, datasheetName, { signal }),
         enabled: !(createServiceMutation.isPending || editServiceMutation.isPending),
     });

diff --git a/assets/entrepot/pages/service/wms-vector/WmsVectorServiceForm.tsx b/assets/entrepot/pages/service/wms-vector/WmsVectorServiceForm.tsx
@@ -169,7 +169,7 @@ const WmsVectorServiceForm: FC<WmsVectorServiceFormProps> = ({ datastoreId, vect
                     queryKey: RQKeys.datastore_datasheet(datastoreId, vectorDbQuery.data?.tags.datasheet_name),
                 });
                 routes.datastore_datasheet_view({ datastoreId, datasheetName: vectorDbQuery.data?.tags.datasheet_name, activeTab: "services" }).push();
-                queryClient.refetchQueries({ queryKey: RQKeys.datastore_metadata_by_datasheet_name(datastoreId, vectorDbQuery.data?.tags?.datasheet_name) });
+                queryClient.refetchQueries({ queryKey: RQKeys.datastore_datasheet_metadata(datastoreId, vectorDbQuery.data?.tags?.datasheet_name) });
             } else {
                 routes.datasheet_list({ datastoreId }).push();
             }
@@ -203,7 +203,7 @@ const WmsVectorServiceForm: FC<WmsVectorServiceFormProps> = ({ datastoreId, vect
     });
 
     const metadataQuery = useQuery({
-        queryKey: RQKeys.datastore_metadata_by_datasheet_name(datastoreId, vectorDbQuery.data?.tags?.datasheet_name ?? "XX"),
+        queryKey: RQKeys.datastore_datasheet_metadata(datastoreId, vectorDbQuery.data?.tags?.datasheet_name ?? "XX"),
         queryFn: ({ signal }) => api.metadata.getByDatasheetName(datastoreId, vectorDbQuery.data?.tags?.datasheet_name ?? "XX", { signal }),
         enabled: !!vectorDbQuery.data?.tags?.datasheet_name,
     });

diff --git a/assets/modules/entrepot/RQKeys.ts b/assets/modules/entrepot/RQKeys.ts
@@ -23,8 +23,9 @@ const RQKeys = {
     datastore_stored_data_report: (datastoreId: string, storedDataId: string): string[] => ["datastore", datastoreId, "stored_data", storedDataId, "report"],
 
     datastore_datasheet_list: (datastoreId: string): string[] => ["datastore", datastoreId, "datasheet"],
-    datastore_datasheet: (datastoreId: string, dataName: string): string[] => ["datastore", datastoreId, "datasheet", dataName],
-    datastore_datasheet_service_list: (datastoreId: string, dataName: string) => ["datastore", datastoreId, "datasheet", dataName, "services"],
+    datastore_datasheet: (datastoreId: string, datasheetName: string): string[] => ["datastore", datastoreId, "datasheet", datasheetName],
+    datastore_datasheet_metadata: (datastoreId: string, datasheetName: string): string[] => ["datastore", datastoreId, "datasheet", datasheetName, "metadata"],
+    datastore_datasheet_service_list: (datastoreId: string, datasheetName: string) => ["datastore", datastoreId, "datasheet", datasheetName, "services"],
 
     datastore_offering_list: (datastoreId: string): string[] => ["datastore", datastoreId, "offering"],
     datastore_layernames_list: (datastoreId: string, configurationType: ConfigurationTypeEnum | OfferingTypeEnum): string[] => [
@@ -41,13 +42,6 @@ const RQKeys = {
     datastore_annexe_list: (datastoreId: string): string[] => ["datastore", datastoreId, "annexe"],
 
     datastore_metadata_list: (datastoreId: string): string[] => ["datastore", datastoreId, "metadata"],
-    datastore_metadata_by_datasheet_name: (datastoreId: string, datasheetName: string): string[] => [
-        "datastore",
-        datastoreId,
-        "metadata",
-        "datasheet",
-        datasheetName,
-    ],
     datastore_metadata_by_id: (datastoreId: string, metadataId: string): string[] => ["datastore", datastoreId, "metadata", metadataId],
 
     datastore_statics_list: (datastoreId: string): string[] => ["datastore", datastoreId, "statics"],