test

equinor · Sep 23, 2024 · 8201f9d · 8201f9d
1 parent 40f7da0
commit 8201f9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Src/WitsmlExplorer.Api/Workers/Delete/DeleteWellboreWorker.cs b/Src/WitsmlExplorer.Api/Workers/Delete/DeleteWellboreWorker.cs
@@ -28,7 +28,7 @@ public DeleteWellboreWorker(ILogger<DeleteWellboreJob> logger, IWitsmlClientProv
             string wellboreUid = job.ToDelete.WellboreUid;
 
             WitsmlWellbores witsmlWellbore = WellboreQueries.DeleteWitsmlWellbore(wellUid, wellboreUid);
-            QueryResult result = await GetTargetWitsmlClientOrThrow().DeleteFromStoreAsync(witsmlWellbore);
+            QueryResult result = cascadedDelete ? await GetTargetWitsmlClientOrThrow().DeleteFromStoreAsync(witsmlWellbore, new OptionsIn(CascadedDelete: true)) : await GetTargetWitsmlClientOrThrow().DeleteFromStoreAsync(witsmlWellbore);
             if (result.IsSuccessful)
             {
                 Logger.LogInformation("Deleted wellbore. WellUid: {WellUid}, WellboreUid: {WellboreUid}",

diff --git a/Src/WitsmlExplorer.Frontend/components/Modals/ConfirmDeletionModal.tsx b/Src/WitsmlExplorer.Frontend/components/Modals/ConfirmDeletionModal.tsx
@@ -41,7 +41,7 @@ const ConfirmDeletionModal = (
             </span>
 
             <Checkbox
-              label={`Delete cascade?`}
+              label={`Delete all objects under ` + props.componentType + ` ?`}
               onChange={(e: ChangeEvent<HTMLInputElement>) => {
                 setCascadedDelete(e.target.checked);
               }}
@@ -50,7 +50,12 @@ const ConfirmDeletionModal = (
 
             {cascadedDelete && (
               <WarningBar
-                message={"This will also delete all objects under well " + name}
+                message={
+                  "This will also delete all objects under " +
+                  props.componentType +
+                  " " +
+                  props.objectName
+                }
               />
             )}
           </ModalContentLayout>