gestion de certaines actions si donnée vector-db supprimée (closes #78)

IGNF · Jun 1, 2022 · 3d24843 · 3d24843
1 parent 03bc6c3
commit 3d24843
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 4 deletions.
diff --git a/assets/js/components/stored-data-actions.js b/assets/js/components/stored-data-actions.js
@@ -11,6 +11,10 @@ export class StoredDataAction {
         this.title = null;
         this.message = null;
         this.failMessage = null;
+        this.successMessage = null;
+
+        this.successCallback = null;
+        this.failCallback = null;
 
         this.datastoreId = datastoreId;
         this.storedData = storedData;
@@ -30,9 +34,23 @@ export class StoredDataAction {
             callback: (result => {
                 if (!result) return;
 
-                $.post(_self.url, () => { }).fail(() => {
-                    flash.flashAdd(_self.failMessage, 'danger');
-                });
+                $.post(_self.url, () => { })
+                    .then(() => {
+                        if (_self.successMessage) {
+                            flash.flashAdd(_self.successMessage, 'success');
+                        }
+
+                        if (_self.successCallback) {
+                            _self.successCallback();
+                        }
+                    })
+                    .fail(() => {
+                        flash.flashAdd(_self.failMessage, 'danger');
+
+                        if (_self.failCallback) {
+                            _self.failCallback();
+                        }
+                    });
             })
         });
     }
@@ -58,8 +76,15 @@ export class RemoveAction extends StoredDataAction {
         }
         this.message += `Voulez-vous continuer ?</p>`;
 
+        this.successMessage = `La donnée ${storedData._id} a été supprimée.`;
         this.failMessage = `La suppression de la donnée ${storedData._id} a échoué.`;
 
+        this.successCallback = function () {
+            if (location.pathname.endsWith('/integration')) {
+                location.href = Routing.generate('plage_datastore_view', { datastoreId: this.datastoreId })
+            }
+        }
+
         switch (storedData.status) {
             // Suppression d'une donnee de type base Postgres ou de type pyramide
             case 'GENERATED':

diff --git a/src/Controller/DatastoreController.php b/src/Controller/DatastoreController.php
@@ -88,7 +88,7 @@ public function createSandbox()
     /**
      * Tableau de bord d'un espace de travail.
      *
-     * @Route("/{datastoreId}", name="view", methods={"GET"})
+     * @Route("/{datastoreId}", name="view", methods={"GET"}, options={"expose"=true})
      */
     public function view($datastoreId): Response
     {

diff --git a/src/Controller/UploadController.php b/src/Controller/UploadController.php
@@ -5,6 +5,7 @@
 use App\Components\Workflow\AbstractWorkflow;
 use App\Components\Workflow\IntegrationWorkflow;
 use App\Components\Workflow\WorkflowRunner;
+use App\Constants\StoredDataStatuses;
 use App\Constants\UploadTypes;
 use App\Exception\AppException;
 use App\Exception\PlageApiException;
@@ -116,6 +117,17 @@ public function getById($datastoreId, $uploadId): Response
     public function integration($datastoreId, $uploadId)
     {
         $upload = $this->plageApi->upload->get($datastoreId, $uploadId);
+
+        // rediriger vers le tableau de bord si vectordb est supprimé
+        if (array_key_exists('vectordb_id', $upload['tags'])) {
+            $vectordb = $this->plageApi->storedData->get($datastoreId, $upload['tags']['vectordb_id']);
+            if (StoredDataStatuses::DELETED == $vectordb['status']) {
+                $this->addFlash('notice', sprintf('La donnée %s a été supprimée', $vectordb['_id']));
+
+                return $this->redirectToRoute('plage_datastore_view', ['datastoreId' => $datastoreId]);
+            }
+        }
+
         $upload['tags']['workflow_integration_progress'] = json_decode($upload['tags']['workflow_integration_progress'], true);
 
         $workflowClassName = $upload['tags']['workflow_class_name'];

diff --git a/templates/pages/stored_data/report.html.twig b/templates/pages/stored_data/report.html.twig
@@ -43,6 +43,10 @@
     {% set pageHelp = 'stored_data.report.generation_failure_help' | trans %}
 {% endif %}
 
+{% if stored_data.status == 'DELETED' %}
+    {% set pageHelp = 'stored_data.report.stored_data_deleted_help' | trans %}
+{% endif %}
+
 {% block title %} {{ pageTitle ~ ' - ' ~ parent() }} {% endblock %}
 
 {% set checkTypes = constant('App\\Constants\\UploadCheckTypes::TYPES_LIST') %}

diff --git a/translations/PlageWebClient.fr.yml b/translations/PlageWebClient.fr.yml
@@ -188,6 +188,7 @@ stored_data:
         generation_title: "Rapport de génération de la pyramide de tuiles vectorielles %stored_data_name%"
         generation_help: "Vos tuiles vectorielles ont été générées avec succès à partir de vos données."
         generation_failure_help: "Les tuiles vectorielles n'ont pas pu être générées correctement. Vous trouverez ci-dessous des informations techniques concernant les processus exécutés et les problèmes rencontrés."
+        stored_data_deleted_help: "Cette donnée a été supprimée. Vous ne pouvez plus l'utiliser mais cette page conserve la trace des actions qui l'ont concerné."
         step_upload: "Téléversement du fichier"
         details: "Détails techniques :"
         upload_name: "Nom :"