Improvement: Add a resolve value for promise function to confirm

Snapmaker · Dec 18, 2020 · 11bd20f · 11bd20f
1 parent 08345f2
commit 11bd20f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/app/containers/Settings/Settings.jsx b/src/app/containers/Settings/Settings.jsx
@@ -116,10 +116,13 @@ class Settings extends PureComponent {
         // Workspace
         config: {
             restoreDefaults: async () => {
-                await confirm({
+                const confirmed = await confirm({
                     title: i18n._('Reset All User Settings'),
                     body: i18n._('Are you sure you want to restore the default settings?')
                 });
+                if (!confirmed) {
+                    return;
+                }
                 await this.props.resetAllUserSettings();
                 window.location.reload();
             }

diff --git a/src/app/lib/confirm.jsx b/src/app/lib/confirm.jsx
@@ -59,9 +59,10 @@ export default (options) => new Promise((resolve) => {
     const props = {
         ...options,
         onConfirm: () => {
-            resolve();
+            resolve(true);
         },
         onCancel: () => {
+            resolve(false);
         },
         container: container
     };

diff --git a/src/app/views/PrintingManager/PrintingManager.jsx b/src/app/views/PrintingManager/PrintingManager.jsx
@@ -299,9 +299,12 @@ class PrintingManager extends PureComponent {
         onRemoveManagerDefinition: async (managerDisplayType) => {
             if (managerDisplayType === PRINTING_MANAGER_TYPE_MATERIAL) {
                 const definition = this.state.materialDefinitionForManager;
-                await confirm({
+                const confirmed = await confirm({
                     body: `Are you sure to remove profile "${definition.name}"?`
                 });
+                if (!confirmed) {
+                    return;
+                }
 
                 await this.props.removeMaterialDefinition(definition);
 
@@ -312,9 +315,12 @@ class PrintingManager extends PureComponent {
             } else if (managerDisplayType === PRINTING_MANAGER_TYPE_QUALITY) {
                 const definition = this.state.qualityDefinitionForManager;
 
-                await confirm({
+                const confirmed = await confirm({
                     body: `Are you sure to remove profile "${definition.name}"?`
                 });
+                if (!confirmed) {
+                    return;
+                }
 
                 await this.props.removeQualityDefinition(definition);