fix: dépôt vecteur - échec à la vérification standard et vecteur #579

assets/@types/app.ts

@@ -282,6 +282,13 @@ export type StoredDataReport = {
     processing_executions: StoredDataReportProcessingExecution[];
 };
 
+export type UploadReport = {
+    input_upload: Upload & {
+        file_tree: UploadTree;
+        checks: CheckDetailed[];
+    };
+};
+
 export type StoredDataReportProcessingExecution = ProcessingExecution & {
     output: ProcessingExecutionOutputStoredDataDto;
     logs?: CheckOrProcessingExecutionLogs;

assets/entrepot/api/upload.ts

@@ -1,5 +1,6 @@
 import SymfonyRouting from "../../modules/Routing";
 import { jsonFetch } from "../../modules/jsonFetch";
+import { UploadReport } from "../../@types/app";
 import { Upload, UploadTree, UploadTypeEnum } from "../../@types/app";
 
 const getList = (datastoreId: string, type?: UploadTypeEnum, otherOptions: RequestInit = {}) => {
@@ -61,6 +62,13 @@ const remove = (datastoreId: string, uploadId: string) => {
     return jsonFetch<null>(url, { method: "DELETE" });
 };
 
+const getUploadReport = (datastoreId: string, uploadId: string, otherOptions: RequestInit = {}) => {
+    const url = SymfonyRouting.generate("cartesgouvfr_api_upload_get_upload_report", { datastoreId, uploadId });
+    return jsonFetch<UploadReport>(url, {
+        ...otherOptions,
+    });
+};
+
 const upload = {
     getList,
     add,
@@ -69,6 +77,7 @@ const upload = {
     pingIntegrationProgress,
     getFileTree,
     remove,
+    getUploadReport,
 };
 
 export default upload;

assets/entrepot/pages/stored_data/StoredDataDetails/PreviewTab/PreviewTab.tsx → assets/entrepot/pages/data_details/PreviewTab/StoredDataPreviewTab.tsx

@@ -4,12 +4,12 @@ import Table from "@codegouvfr/react-dsfr/Table";
 import { UseQueryResult, useQuery } from "@tanstack/react-query";
 import { FC, Fragment, useMemo } from "react";
 
-import { PyramidVector, StoredDataTypeEnum, VectorDb } from "../../../../../@types/app";
-import ExtentMap from "../../../../../components/Utils/ExtentMap";
-import RQKeys from "../../../../../modules/entrepot/RQKeys";
-import { CartesApiException } from "../../../../../modules/jsonFetch";
-import { niceBytes } from "../../../../../utils";
-import api from "../../../../api";
+import { PyramidVector, StoredDataTypeEnum, VectorDb } from "../../../../@types/app";
+import ExtentMap from "../../../../components/Utils/ExtentMap";
+import RQKeys from "../../../../modules/entrepot/RQKeys";
+import { CartesApiException } from "../../../../modules/jsonFetch";
+import { niceBytes } from "../../../../utils";
+import api from "../../../api";
 import ReportStatusBadge from "../ReportTab/ReportStatusBadge";
 import ReportTab from "../ReportTab/ReportTab";
 

assets/entrepot/pages/data_details/PreviewTab/UploadPreviewTab.tsx

@@ -0,0 +1,42 @@
+import { fr } from "@codegouvfr/react-dsfr";
+import Accordion from "@codegouvfr/react-dsfr/Accordion";
+import { FC } from "react";
+
+import { UploadReport } from "../../../../@types/app";
+import { niceBytes } from "../../../../utils";
+import ReportStatusBadge from "../ReportTab/ReportStatusBadge";
+
+type UploadPreviewTabProps = {
+    reportData: UploadReport;
+};
+
+const UploadPreviewTab: FC<UploadPreviewTabProps> = ({ reportData }) => {
+    const uploadData = reportData.input_upload;
+
+    return (
+        <Accordion titleAs="h2" label="Informations générales" defaultExpanded={true}>
+            <ul className={fr.cx("fr-raw-list")}>
+                <li>
+                    <strong>Nom :</strong> {uploadData.name}
+                </li>
+                <li>
+                    <strong>Identifiant technique :</strong> {uploadData._id}
+                </li>
+                <li>
+                    <strong>Projection :</strong> {uploadData.srs}
+                </li>
+                <li>
+                    <strong>Statut :</strong> {<ReportStatusBadge status="FAILURE" />}
+                </li>
+                <li>
+                    <strong>Taille :</strong> {uploadData.size && niceBytes(uploadData.size.toString())}
+                </li>
+                <li>
+                    <strong>Type :</strong> {uploadData.type}
+                </li>
+            </ul>
+        </Accordion>
+    );
+};
+
+export default UploadPreviewTab;

assets/entrepot/pages/stored_data/StoredDataDetails/ReportTab/Logs.tsx → assets/entrepot/pages/data_details/ReportTab/Logs.tsx

@@ -1,5 +1,5 @@
 import { FC } from "react";
-import { CheckOrProcessingExecutionLogs } from "../../../../../@types/app";
+import { CheckOrProcessingExecutionLogs } from "../../../../@types/app";
 
 type LogsProps = {
     logs?: CheckOrProcessingExecutionLogs;

assets/entrepot/pages/stored_data/StoredDataDetails/ReportTab/ProcessingExecutionReport.tsx → assets/entrepot/pages/data_details/ReportTab/ProcessingExecutionReport.tsx

@@ -1,7 +1,7 @@
 import { fr } from "@codegouvfr/react-dsfr";
 import { FC } from "react";
 
-import type { StoredDataReportProcessingExecution } from "../../../../../@types/app";
+import type { StoredDataReportProcessingExecution } from "../../../../@types/app";
 import Logs from "./Logs";
 
 type ProcessingExecutionReportProps = {

assets/entrepot/pages/stored_data/StoredDataDetails/ReportTab/ReportTab.tsx → assets/entrepot/pages/data_details/ReportTab/ReportTab.tsx

@@ -3,18 +3,18 @@ import Accordion from "@codegouvfr/react-dsfr/Accordion";
 import { UseQueryResult } from "@tanstack/react-query";
 import { FC } from "react";
 
-import { StoredDataReport as ReportTab } from "../../../../../@types/app";
-import { CheckingExecutionDetailResponseDtoStatusEnum, ProcessingExecutionDetailResponseDtoStatusEnum } from "../../../../../@types/entrepot";
-import { CartesApiException } from "../../../../../modules/jsonFetch";
-import { niceBytes } from "../../../../../utils";
+import { UploadReport, StoredDataReport as ReportTab } from "../../../../@types/app";
+import { CheckingExecutionDetailResponseDtoStatusEnum, ProcessingExecutionDetailResponseDtoStatusEnum } from "../../../../@types/entrepot";
+import { CartesApiException } from "../../../../modules/jsonFetch";
+import { niceBytes } from "../../../../utils";
 import ProcessingExecutionReport from "./ProcessingExecutionReport";
 import ReportStatusBadge from "./ReportStatusBadge";
 import UploadCheckExecutionReport from "./UploadCheckExecutionReport";
 import UploadFileTree from "./UploadFileTree";
 
 type ReportTabProps = {
     datastoreName?: string;
-    reportQuery: UseQueryResult<ReportTab, CartesApiException>;
+    reportQuery: UseQueryResult<ReportTab | UploadReport, CartesApiException>;
 };
 
 const ReportTab: FC<ReportTabProps> = ({ datastoreName, reportQuery }) => {
@@ -65,25 +65,25 @@ const ReportTab: FC<ReportTabProps> = ({ datastoreName, reportQuery }) => {
                     ))}
                 </Accordion>
 
-                {reportQuery?.data.processing_executions.map((procExec) => (
-                    <Accordion
-                        key={procExec._id}
-                        titleAs="h3"
-                        label={
-                            <>
-                                <p>{`${step++}. Traitement : ${procExec.processing.name}`}</p>
-                                <ReportStatusBadge status={procExec.status} className={fr.cx("fr-ml-2w")} />
-                            </>
-                        }
-                        defaultExpanded={[
-                            ProcessingExecutionDetailResponseDtoStatusEnum.FAILURE,
-                            ProcessingExecutionDetailResponseDtoStatusEnum.ABORTED,
-                            ProcessingExecutionDetailResponseDtoStatusEnum.PROGRESS,
-                        ].includes(procExec.status)}
-                    >
-                        <ProcessingExecutionReport datastoreName={datastoreName} processingExecution={procExec} />
-                    </Accordion>
-                ))}
+                {"processing_executions" in reportQuery.data &&
+                    reportQuery?.data.processing_executions.map((procExec) => (
+                        <Accordion
+                            key={procExec._id}
+                            titleAs="h3"
+                            label={
+                                <>
+                                    <p>{`${step++}. Traitement : ${procExec.processing.name}`}</p>
+                                    <ReportStatusBadge status={procExec.status} className={fr.cx("fr-ml-2w")} />
+                                </>
+                            }
+                            defaultExpanded={[
+                                ProcessingExecutionDetailResponseDtoStatusEnum.FAILURE,
+                                ProcessingExecutionDetailResponseDtoStatusEnum.ABORTED,
+                            ].includes(procExec.status)}
+                        >
+                            <ProcessingExecutionReport datastoreName={datastoreName} processingExecution={procExec} />
+                        </Accordion>
+                    ))}
             </>
         )
     );

assets/entrepot/pages/stored_data/StoredDataDetails/ReportTab/UploadCheckExecutionReport.tsx → assets/entrepot/pages/data_details/ReportTab/UploadCheckExecutionReport.tsx

@@ -1,7 +1,7 @@
 import { fr } from "@codegouvfr/react-dsfr";
 import { FC } from "react";
 
-import { CheckDetailed } from "../../../../../@types/app";
+import { CheckDetailed } from "../../../../@types/app";
 import Logs from "./Logs";
 
 type UploadCheckExecutionReportProps = {

assets/entrepot/pages/stored_data/StoredDataDetails/ReportTab/UploadFileTree.tsx → assets/entrepot/pages/data_details/ReportTab/UploadFileTree.tsx

@@ -1,7 +1,7 @@
 import { fr } from "@codegouvfr/react-dsfr";
 import { FC } from "react";
 
-import { UploadTree } from "../../../../../@types/app";
+import { UploadTree } from "../../../../@types/app";
 
 type UploadFileTreeProps = {
     fileTree: UploadTree;

assets/entrepot/pages/stored_data/StoredDataDetails/StoredDataDetails.tsx → assets/entrepot/pages/data_details/StoredDataDetails.tsx

@@ -5,14 +5,14 @@ import Tabs from "@codegouvfr/react-dsfr/Tabs";
 import { useQuery } from "@tanstack/react-query";
 import { FC, useEffect, useMemo, useState } from "react";
 
-import { Datastore, StoredDataStatusEnum } from "../../../../@types/app";
-import DatastoreLayout from "../../../../components/Layout/DatastoreLayout";
-import LoadingIcon from "../../../../components/Utils/LoadingIcon";
-import RQKeys from "../../../../modules/entrepot/RQKeys";
-import { CartesApiException } from "../../../../modules/jsonFetch";
-import { routes } from "../../../../router/router";
-import api from "../../../api";
-import PreviewTab from "./PreviewTab/PreviewTab";
+import { Datastore, StoredDataStatusEnum } from "../../../@types/app";
+import DatastoreLayout from "../../../components/Layout/DatastoreLayout";
+import LoadingIcon from "../../../components/Utils/LoadingIcon";
+import RQKeys from "../../../modules/entrepot/RQKeys";
+import { CartesApiException } from "../../../modules/jsonFetch";
+import { routes } from "../../../router/router";
+import api from "../../api";
+import PreviewTab from "./PreviewTab/StoredDataPreviewTab";
 import ReportTab from "./ReportTab/ReportTab";
 
 type StoredDataDetailsProps = {

assets/entrepot/pages/data_details/UploadDetails.tsx

@@ -0,0 +1,95 @@
+import { fr } from "@codegouvfr/react-dsfr";
+import Alert from "@codegouvfr/react-dsfr/Alert";
+import Button from "@codegouvfr/react-dsfr/Button";
+import Tabs from "@codegouvfr/react-dsfr/Tabs";
+import { useQuery } from "@tanstack/react-query";
+import { FC, useMemo } from "react";
+
+import { UploadReport } from "../../../@types/app";
+import DatastoreLayout from "../../../components/Layout/DatastoreLayout";
+import LoadingIcon from "../../../components/Utils/LoadingIcon";
+import RQKeys from "../../../modules/entrepot/RQKeys";
+import { CartesApiException } from "../../../modules/jsonFetch";
+import { routes } from "../../../router/router";
+import api from "../../api";
+import UploadPreviewTab from "./PreviewTab/UploadPreviewTab";
+import ReportTab from "./ReportTab/ReportTab";
+
+type UploadDetailsProps = {
+    datastoreId: string;
+    uploadId: string;
+};
+
+const UploadDetails: FC<UploadDetailsProps> = ({ datastoreId, uploadId }) => {
+    const datastoreQuery = useQuery({
+        queryKey: RQKeys.datastore(datastoreId),
+        queryFn: ({ signal }) => api.datastore.get(datastoreId, { signal }),
+        staleTime: 3600000,
+    });
+
+    const reportQuery = useQuery<UploadReport, CartesApiException>({
+        queryKey: RQKeys.datastore_upload_report(datastoreId, uploadId),
+        queryFn: ({ signal }) => api.upload.getUploadReport(datastoreId, uploadId, { signal }),
+        staleTime: 3600000,
+    });
+
+    const datasheetName = useMemo(() => reportQuery?.data?.input_upload?.tags?.datasheet_name, [reportQuery?.data?.input_upload?.tags?.datasheet_name]);
+
+    return (
+        <DatastoreLayout datastoreId={datastoreId} documentTitle={`Rapport de livraison ${reportQuery?.data?.input_upload?.name ?? ""}`}>
+            <div className={fr.cx("fr-grid-row", "fr-grid-row--middle")}>
+                {datasheetName ? (
+                    <Button
+                        iconId="fr-icon-arrow-left-s-line"
+                        priority="tertiary no outline"
+                        linkProps={routes.datastore_datasheet_view({ datastoreId, datasheetName, activeTab: "dataset" }).link}
+                        title="Retour à la fiche de donnée"
+                        size="large"
+                    />
+                ) : (
+                    <Button
+                        iconId="fr-icon-arrow-left-s-line"
+                        priority="tertiary no outline"
+                        linkProps={routes.datasheet_list({ datastoreId }).link}
+                        title="Retour à mes données"
+                        size="large"
+                    />
+                )}
+                <h1 className={fr.cx("fr-m-0")}>
+                    {"Rapport de livraison"}
+                    {reportQuery.isLoading && <LoadingIcon className={fr.cx("fr-ml-2v")} largeIcon={true} />}
+                </h1>
+            </div>
+            {reportQuery?.data?.input_upload?.name && (
+                <div className={fr.cx("fr-grid-row", "fr-grid-row--middle", "fr-mb-4w")}>
+                    <h2>{reportQuery?.data?.input_upload?.name}</h2>
+                </div>
+            )}
+
+            <div className={fr.cx("fr-grid-row", "fr-grid-row--middle", "fr-mb-4w")}>
+                {reportQuery.isError && <Alert severity="error" closable title={reportQuery.error.message} onClose={reportQuery.refetch} />}
+            </div>
+
+            {reportQuery.data && (
+                <div className={fr.cx("fr-grid-row")}>
+                    <div className={fr.cx("fr-col")}>
+                        <Tabs
+                            tabs={[
+                                {
+                                    label: "Aperçu de la donnée",
+                                    content: <UploadPreviewTab reportData={reportQuery.data} />,
+                                },
+                                {
+                                    label: "Rapport de génération",
+                                    content: <ReportTab datastoreName={datastoreQuery.data?.name} reportQuery={reportQuery} />,
+                                },
+                            ]}
+                        />
+                    </div>
+                </div>
+            )}
+        </DatastoreLayout>
+    );
+};
+
+export default UploadDetails;

assets/entrepot/pages/datasheet/DatasheetNew/DatasheetUploadIntegration/DatasheetUploadIntegrationDialog.tsx

@@ -205,6 +205,24 @@ const DatasheetUploadIntegrationDialog: FC<DatasheetUploadIntegrationDialogProps
                 </div>
             )}
 
+            {integrationStatus === "at_least_one_failure" && uploadQuery.data?.tags.datasheet_name !== undefined && (
+                <div className={fr.cx("fr-grid-row")}>
+                    <ButtonsGroup
+                        buttons={[
+                            {
+                                children: "Consulter la fiche de données",
+                                linkProps: routes.datastore_datasheet_view({
+                                    datastoreId,
+                                    datasheetName: uploadQuery.data?.tags.datasheet_name,
+                                    activeTab: DatasheetViewActiveTabEnum.Dataset,
+                                }).link,
+                            },
+                        ]}
+                        inlineLayoutWhen="always"
+                    />
+                </div>
+            )}
+
             {integrationStatus === "at_least_one_failure" && uploadQuery.data?.tags?.vectordb_id !== undefined && (
                 <div className={fr.cx("fr-grid-row")}>
                     <ButtonsGroup

assets/entrepot/pages/datasheet/DatasheetView/DatasetListTab/DatasetListTab.tsx

@@ -40,7 +40,7 @@ const DatasetListTab: FC<DataListTabProps> = ({ datastoreId, datasheet }) => {
             {unfinishedUploads && unfinishedUploads.length > 0 && (
                 <div className={fr.cx("fr-grid-row", "fr-grid-row--center", "fr-grid-row--middle")}>
                     <div className={fr.cx("fr-col")}>
-                        <UnfinishedUploadList datastoreId={datastoreId} uploadList={unfinishedUploads} />
+                        <UnfinishedUploadList datastoreId={datastoreId} uploadList={unfinishedUploads} nbPublications={datasheet.nb_publications} />
                     </div>
                 </div>
             )}