switching undeploy domain to use the same prompting style as uninstall actions

Author: robertpatrick

electron/app/js/ipcRendererPreload.js

@@ -192,8 +192,7 @@ contextBridge.exposeInMainWorld(
           'k8s-delete-object',
           'openssl-generate-certs',
           'validate-k8s-namespaces-exist',
-          'validate-wko-domain-exist',
-          'domain-undeploy-scope-prompt'
+          'validate-wko-domain-exist'
         ];
         return new Promise((resolve, reject) => {
           if (validChannels.includes(channel)) {

electron/app/js/wktWindow.js

@@ -1032,36 +1032,6 @@ async function promptUserForYesNoOrCancelAnswer(targetWindow, title, question, d
   });
 }
 
-async function promptUserForK8sDomainRemovalScope(targetWindow, title, question, details) {
-  return new Promise(resolve => {
-    dialog.showMessageBox(targetWindow, {
-      title: title,
-      message: question,
-      detail: details,
-      type: 'question',
-      buttons: [ i18n.t('button-cancel'), i18n.t('button-domain-only'), i18n.t('button-domain-namespace') ],
-      defaultId: 1,
-      cancelId: 0
-    }).then(dialogResponse => {
-      let response;
-      switch (dialogResponse.response) {
-        case 2:
-          response = 'namespace';
-          break;
-
-        case 1:
-          response = 'domain';
-          break;
-
-        case 0:
-          response = 'cancel';
-          break;
-      }
-      resolve(response);
-    });
-  });
-}
-
 async function promptUserForOkOrCancelAnswer(targetWindow, title, message) {
   return new Promise(resolve => {
     dialog.showMessageBox(targetWindow, {
@@ -1118,7 +1088,6 @@ module.exports = {
   setHasOpenDialog,
   setTargetType,
   showErrorMessage,
-  promptUserForK8sDomainRemovalScope,
   promptUserForOkOrCancelAnswer,
   promptUserForYesOrNoAnswer,
   promptUserForYesNoOrCancelAnswer

electron/app/locales/en/electron.json

@@ -187,8 +187,6 @@
   "button-useExistingLocation": "Use Existing Location",
   "button-update-now": "Update and Restart Now",
   "button-update-on-exit": "Update when Application Exits",
-  "button-domain-only": "Remove Domain Only",
-  "button-domain-namespace": "Remove Entire Namespace",
 
   "tools-docker-hub": "Docker Hub",
 

electron/app/locales/en/webui.json

@@ -1045,10 +1045,9 @@
   "k8s-domain-script-generator-invalid-target-domain-location": "Unknown value for target domain location {{targetDomainLocation}}",
 
   "k8s-domain-undeployer-aborted-error-title": "Undeploying WebLogic Domain from Kubernetes Aborted",
-  "k8s-domain-undeployer-scope-prompt-title": "Undeploy WebLogic Domain from Kubernetes Scope",
-  "k8s-domain-undeployer-scope-prompt-question": "Would you like to undeploy the just WebLogic domain {{domainUid}} or the entire WebLogic domain's namespace {{domainNamespace}} (and all of its data) from Kubernetes?",
-  "k8s-domain-undeployer-scope-prompt-details": "Removing the WebLogic domain will remove the WebLogic Kubernetes Operator's domain custom resource {{domainUid}} and will cause any running pods associated with the domain to be shut down and removed.  Removing the WebLogic domain's namespace {{domainNamespace}} will, in addition to removing the WebLogic domain {{domainUid}}, remove all secrets, config maps, ingress routes, and other Kubernetes objects that exist in the Kubernetes namespace.",
-  "k8s-domain-undeployer-prompt-result-assertion-error-message": "Unexpected prompt action 'cancel' while undeploying the Kubernetes WebLogic domain.  Please report an issue on GitHub.",
+  "k8s-domain-undeployer-remove-namespace-prompt-title": "Undeploy WebLogic Domain from Kubernetes Scope",
+  "k8s-domain-undeployer-remove-namespace-prompt-question": "After undeploying the WebLogic domain {{name}}, would you like to also delete the Kubernetes namespace {{namespace}} (and all of its data)?",
+  "k8s-domain-undeployer-remove-namespace-prompt-details": "UUndeploying the WebLogic domain will remove the WebLogic Kubernetes Operator's domain custom resource {{domainUid}} and will cause any running pods associated with the domain to be shut down and removed.  Removing the WebLogic domain's namespace {{domainNamespace}} will remove all secrets, config maps, ingress routes, and other Kubernetes objects that exist in the Kubernetes namespace.",
   "k8s-domain-undeployer-kubectl-exe-invalid-error-message": "Unable to undeploy the domain because the Kubernetes client executable is invalid: {{error}}.",
   "k8s-domain-undeployer-project-not-saved-error-prefix": "Unable to undeploy the domain because project save failed",
   "k8s-domain-undeployer-set-context-error-message": "Unable to undeploy the domain because setting the Kubernetes client content failed: {{error}}.",

electron/app/main.js

@@ -14,8 +14,8 @@ const i18n = require('./js/i18next.config');
 const { initializeLoggingSystem, logRendererMessage } = require('./js/wktLogging');
 const userSettings = require('./js/userSettings');
 const { chooseFromFileSystem, createNetworkWindow, createWindow, initialize, setHasOpenDialog, setTargetType,
-  showErrorMessage, promptUserForOkOrCancelAnswer, promptUserForYesOrNoAnswer, promptUserForK8sDomainRemovalScope,
-  promptUserForYesNoOrCancelAnswer } = require('./js/wktWindow');
+  showErrorMessage, promptUserForOkOrCancelAnswer, promptUserForYesOrNoAnswer, promptUserForYesNoOrCancelAnswer } =
+  require('./js/wktWindow');
 const project = require('./js/project');
 const wktTools = require('./js/wktTools');
 const wdtArchive = require('./js/wdtArchive');
@@ -754,10 +754,6 @@ class Main {
       return kubectlUtils.deleteObjectIfExists(kubectlExe, namespace, object, kind, kubectlOptions);
     });
 
-    ipcMain.handle('domain-undeploy-scope-prompt', async (event, title, question, details) => {
-      return promptUserForK8sDomainRemovalScope(event.sender.getOwnerBrowserWindow(), title, question, details);
-    });
-
     ipcMain.handle('helm-add-wko-chart', async (event, helmExe, helmOptions) => {
       return helmUtils.addOrUpdateWkoHelmChart(helmExe, helmOptions);
     });

webui/src/js/utils/k8s-domain-undeployer.js

@@ -27,44 +27,27 @@ function (K8sDomainActionsBase, project, wktConsole, i18n, projectIo, dialogHelp
       let errTitle = i18n.t('k8s-domain-undeployer-aborted-error-title');
       const errPrefix = 'k8s-domain-undeployer';
 
-      // Prompt user to remove just the domain or the entire domain namespace.
-      const domainUid = this.project.k8sDomain.uid.value;
-      const domainNamespace = this.project.k8sDomain.kubernetesNamespace.value;
-
-      // Only prompt if the UID and namespace are provided.
-      // Otherwise, let it fall through for validation to detect
-      // and alert the user to all missing required fields.
-      //
-      let promptResult = 'cancel';
-      if (domainUid && domainNamespace) {
-        const promptTitle = i18n.t('k8s-domain-undeployer-scope-prompt-title');
-        const promptQuestion = i18n.t('k8s-domain-undeployer-scope-prompt-question',
-          { domainUid: domainUid, domainNamespace: domainNamespace });
-        const promptDetails = i18n.t('k8s-domain-undeployer-scope-prompt-details',
-          { domainUid: domainUid, domainNamespace: domainNamespace });
-
-        promptResult = await window.api.ipc.invoke('domain-undeploy-scope-prompt',
-          promptTitle, promptQuestion, promptDetails);
-
-        // If the user chose to cancel, then simply return.
-        if (promptResult === 'cancel') {
-          return Promise.resolve('false');
-        }
-      }
-
       const validatableObject = this.getValidatableObject('flow-undeploy-domain-name');
       if (validatableObject.hasValidationErrors()) {
         const validationErrorDialogConfig = validatableObject.getValidationErrorDialogConfig(errTitle);
         dialogHelper.openDialog('validation-error-dialog', validationErrorDialogConfig);
         return Promise.resolve(false);
       }
 
-      // This is a sanity check.  It should never be true!
-      if (promptResult === 'cancel') {
-        const errMessage = i18n.t('k8s-domain-undeployer-prompt-result-assertion-error-message');
-        await window.api.ipc.invoke('show-error-message', errTitle, errMessage);
+      // Prompt user to remove just the domain or the entire domain namespace.
+      const domainUid = this.project.k8sDomain.uid.value;
+      const domainNamespace = this.project.k8sDomain.kubernetesNamespace.value;
+
+      const promptTitle = i18n.t('k8s-domain-undeployer-remove-namespace-prompt-title');
+      const promptQuestion = i18n.t('k8s-domain-undeployer-remove-namespace-prompt-question',
+        { name: domainUid, namespace: domainNamespace });
+      const promptDetails = i18n.t('k8s-domain-undeployer-remove-namespace-prompt-details',
+        { name: domainUid, namespace: domainNamespace });
+      const removeNamespacePromptResult = await this.removeNamespacePrompt(promptTitle, promptQuestion, promptDetails);
+      if (removeNamespacePromptResult === 'cancel') {
         return Promise.resolve(false);
       }
+      const removeNamespace = removeNamespacePromptResult === 'yes';
 
       const totalSteps = 4.0;
       try {
@@ -101,28 +84,28 @@ function (K8sDomainActionsBase, project, wktConsole, i18n, projectIo, dialogHelp
         }
 
         let deleteResult;
-        if (promptResult === 'domain') {
-          busyDialogMessage = i18n.t('flow-undeploy-domain-in-progress', { domainUid: domainUid });
+        if (removeNamespace) {
+          busyDialogMessage = i18n.t('flow-undeploy-namespace-in-progress', { domainNamespace: domainNamespace });
           dialogHelper.updateBusyDialog(busyDialogMessage, 2 / totalSteps);
           deleteResult = await this.deleteKubernetesObjectIfExists(kubectlExe, kubectlOptions,
-            domainNamespace, 'domain', domainUid, errTitle, errPrefix);
+            null, 'namespace', domainNamespace, errTitle, errPrefix);
         } else {
-          busyDialogMessage = i18n.t('flow-undeploy-namespace-in-progress', { domainNamespace: domainNamespace });
+          busyDialogMessage = i18n.t('flow-undeploy-domain-in-progress', { domainUid: domainUid });
           dialogHelper.updateBusyDialog(busyDialogMessage, 2 / totalSteps);
           deleteResult = await this.deleteKubernetesObjectIfExists(kubectlExe, kubectlOptions,
-            null, 'namespace', domainNamespace, errTitle, errPrefix);
+            domainNamespace, 'domain', domainUid, errTitle, errPrefix);
         }
 
         wktLogger.debug('deleteResult = %s', deleteResult);
         if (deleteResult) {
           dialogHelper.closeBusyDialog();
           const title = i18n.t('k8s-domain-undeployer-undeploy-complete-title');
           let message;
-          if (promptResult === 'domain') {
-            message = i18n.t('k8s-domain-undeployer-undeploy-domain-complete-message',
+          if (removeNamespace) {
+            message = i18n.t('k8s-domain-undeployer-undeploy-namespace-complete-message',
               {domainName: domainUid, domainNamespace: domainNamespace});
           } else {
-            message = i18n.t('k8s-domain-undeployer-undeploy-namespace-complete-message',
+            message = i18n.t('k8s-domain-undeployer-undeploy-domain-complete-message',
               {domainName: domainUid, domainNamespace: domainNamespace});
           }
           await window.api.ipc.invoke('show-info-message', title, message);