feat(breadcrumb): ajout datasheetName dans les rapports détaillés (refs

#532)
IGNF · Oct 16, 2024 · b0a6f52 · b0a6f52
1 parent 60b671f
commit b0a6f52
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 8 deletions.
diff --git a/assets/entrepot/pages/datasheet/DatasheetNew/DatasheetUploadForm.tsx b/assets/entrepot/pages/datasheet/DatasheetNew/DatasheetUploadForm.tsx
@@ -342,7 +342,7 @@ const DatasheetUploadForm: FC<DatasheetUploadFormProps> = ({ datastoreId }) => {
 
             {addUploadMutation.isSuccess && addUploadMutation.data?._id !== undefined && (
                 <Wait>
-                    <DatasheetUploadIntegrationDialog datastoreId={datastoreId} uploadId={addUploadMutation.data?._id} />
+                    <DatasheetUploadIntegrationDialog datastoreId={datastoreId} uploadId={addUploadMutation.data?._id} datasheetName={datasheetName} />
                 </Wait>
             )}
         </DatastoreLayout>

diff --git a/...es/datasheet/DatasheetNew/DatasheetUploadIntegration/DatasheetUploadIntegrationDialog.tsx b/...es/datasheet/DatasheetNew/DatasheetUploadIntegration/DatasheetUploadIntegrationDialog.tsx
@@ -52,10 +52,11 @@ type IntegrationStatus = "at_lease_one_failure" | "proc_int_launched" | "all_suc
 
 type DatasheetUploadIntegrationDialogProps = {
     datastoreId: string;
+    datasheetName: string | undefined;
     uploadId: string;
 };
 
-const DatasheetUploadIntegrationDialog: FC<DatasheetUploadIntegrationDialogProps> = ({ datastoreId, uploadId }) => {
+const DatasheetUploadIntegrationDialog: FC<DatasheetUploadIntegrationDialogProps> = ({ datastoreId, datasheetName, uploadId }) => {
     const [shouldPingIntProg, setShouldPingIntProg] = useState<boolean>(true);
 
     const queryClient = useQueryClient();
@@ -210,7 +211,11 @@ const DatasheetUploadIntegrationDialog: FC<DatasheetUploadIntegrationDialogProps
                         buttons={[
                             {
                                 children: "Voir le rapport d’erreur",
-                                linkProps: routes.datastore_stored_data_details({ datastoreId, storedDataId: uploadQuery.data?.tags?.vectordb_id }).link,
+                                linkProps: routes.datastore_stored_data_details({
+                                    datastoreId,
+                                    storedDataId: uploadQuery.data?.tags?.vectordb_id,
+                                    datasheetName,
+                                }).link,
                             },
                             {
                                 children: "Revenir à mes données",

diff --git a/...ages/datasheet/DatasheetNew/DatasheetUploadIntegration/DatasheetUploadIntegrationPage.tsx b/...ages/datasheet/DatasheetNew/DatasheetUploadIntegration/DatasheetUploadIntegrationPage.tsx
@@ -7,15 +7,16 @@ import DatasheetUploadIntegrationDialog from "./DatasheetUploadIntegrationDialog
 type DatasheetUploadIntegrationPageProps = {
     datastoreId: string;
     uploadId: string;
+    datasheetName: string | undefined;
 };
-const DatasheetUploadIntegrationPage: FC<DatasheetUploadIntegrationPageProps> = ({ datastoreId, uploadId }) => {
+const DatasheetUploadIntegrationPage: FC<DatasheetUploadIntegrationPageProps> = ({ datastoreId, uploadId, datasheetName }) => {
     return (
         <DatastoreLayout datastoreId={datastoreId} documentTitle="Intégration des données">
             <div className={fr.cx("fr-grid-row")}>
                 <h1>Intégration des données</h1>
             </div>
             <div className={fr.cx("fr-grid-row", "fr-grid-row--middle", "fr-grid-row--center", "fr-mt-2v")}>
-                <DatasheetUploadIntegrationDialog datastoreId={datastoreId} uploadId={uploadId} />
+                <DatasheetUploadIntegrationDialog datastoreId={datastoreId} uploadId={uploadId} datasheetName={datasheetName} />
             </div>
         </DatastoreLayout>
     );

diff --git a/assets/entrepot/pages/datasheet/DatasheetView/DatasetListTab/PyramidList/PyramidListItem.tsx b/assets/entrepot/pages/datasheet/DatasheetView/DatasetListTab/PyramidList/PyramidListItem.tsx
@@ -105,7 +105,7 @@ const PyramidListItem: FC<PyramidListItemProps> = ({ datasheetName, datastoreId,
                                     {
                                         text: t("show_details"),
                                         iconId: "fr-icon-file-text-fill",
-                                        linkProps: routes.datastore_stored_data_details({ datastoreId, storedDataId: pyramid._id }).link,
+                                        linkProps: routes.datastore_stored_data_details({ datastoreId, datasheetName, storedDataId: pyramid._id }).link,
                                     },
                                     {
                                         text: tCommon("delete"),

diff --git a/...s/entrepot/pages/datasheet/DatasheetView/DatasetListTab/VectorDbList/VectorDbListItem.tsx b/...s/entrepot/pages/datasheet/DatasheetView/DatasetListTab/VectorDbList/VectorDbListItem.tsx
@@ -262,7 +262,7 @@ const VectorDbListItem: FC<VectorDbListItemProps> = ({ datasheetName, datastoreI
                                     {
                                         text: t("show_details"),
                                         iconId: "fr-icon-file-text-fill",
-                                        linkProps: routes.datastore_stored_data_details({ datastoreId, storedDataId: vectorDb._id }).link,
+                                        linkProps: routes.datastore_stored_data_details({ datastoreId, datasheetName, storedDataId: vectorDb._id }).link,
                                     },
                                     {
                                         text: tCommon("delete"),

diff --git a/assets/modules/entrepot/breadcrumbs.ts b/assets/modules/entrepot/breadcrumbs.ts
@@ -154,6 +154,12 @@ const getBreadcrumb = (route: Route<typeof routes>, datastore?: Datastore): Brea
                     { label: datastore?.name, linkProps: routes.datasheet_list({ datastoreId: route.params.datastoreId }).link },
                 ],
             ];
+            if ("datasheetName" in route.params && route.params.datasheetName) {
+                defaultProps.segments.push({
+                    label: route.params.datasheetName,
+                    linkProps: routes.datastore_datasheet_view({ datastoreId: route.params.datastoreId, datasheetName: route.params.datasheetName }).link,
+                });
+            }
             return { ...defaultProps, currentPageLabel: t("datastore_stored_data_details") };
 
         case "datastore_wfs_service_new":

diff --git a/assets/router/RouterRenderer.tsx b/assets/router/RouterRenderer.tsx
@@ -143,7 +143,13 @@ const RouterRenderer: FC = () => {
             case "datastore_datasheet_upload":
                 return <DatasheetUploadForm datastoreId={route.params.datastoreId} />;
             case "datastore_datasheet_upload_integration":
-                return <DatasheetUploadIntegrationPage datastoreId={route.params.datastoreId} uploadId={route.params.uploadId} />;
+                return (
+                    <DatasheetUploadIntegrationPage
+                        datastoreId={route.params.datastoreId}
+                        uploadId={route.params.uploadId}
+                        datasheetName={route.params.datasheetName}
+                    />
+                );
             case "datastore_datasheet_view":
                 return <DatasheetView datastoreId={route.params.datastoreId} datasheetName={route.params.datasheetName} />;
             case "datastore_stored_data_details":

diff --git a/assets/router/router.ts b/assets/router/router.ts
@@ -121,6 +121,7 @@ const routeDefs = {
         {
             datastoreId: param.path.string,
             uploadId: param.query.string,
+            datasheetName: param.query.optional.string,
         },
         (p) => `${appRoot}/entrepot/${p.datastoreId}/donnees/integration`
     ),
@@ -136,6 +137,7 @@ const routeDefs = {
         {
             datastoreId: param.path.string,
             storedDataId: param.path.string,
+            datasheetName: param.query.optional.string,
         },
         (p) => `${appRoot}/entrepot/${p.datastoreId}/donnees/${p.storedDataId}/details`
     ),