Merge pull request #1453 from SFDO-Community/feature/1452-class-sched…

…uler-toast-may-fail Move toast handling out of Modal
SFDO-Community · Apr 13, 2024 · 72769f1 · 72769f1
2 parents 1e2ade2 + fdb3e04
commit 72769f1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/dlrs/main/lwc/classSchedulerModal/classSchedulerModal.js b/dlrs/main/lwc/classSchedulerModal/classSchedulerModal.js
@@ -3,7 +3,6 @@ import LightningModal from "lightning/modal";
 // import dlrs from "@salesforce/resourceUrl/dlrs";
 // import { loadScript } from "lightning/platformResourceLoader";
 
-import { ShowToastEvent } from "lightning/platformShowToastEvent";
 import LightningConfirm from "lightning/confirm";
 
 import getCurrentJobs from "@salesforce/apex/SchedulerController.getCurrentJobs";
@@ -83,7 +82,6 @@ export default class ClassSchedulerModal extends LightningModal {
     // loadScript(this, dlrs + "/js/cronstrue/dist/cronstrue.js")
     //   .then(() => {
     // your code with calls to the JS library
-    console.log("construe loaded");
     this.cronStrings.forEach((v) => {
       v.humanReadable = this.cronstrue.toString(v.cronString, {
         verbose: true
@@ -163,12 +161,10 @@ export default class ClassSchedulerModal extends LightningModal {
         className: this.className,
         newSchedules: this.cronStrings.map((c) => c.cronString)
       });
-      const evt = new ShowToastEvent({
+      this.close({
         title: "Succesfully Added Jobs",
         variant: "success"
       });
-      this.dispatchEvent(evt);
-      this.close();
     } catch (error) {
       // TODO: handle the error better
       console.error(error);

diff --git a/dlrs/main/lwc/manageRollups/manageRollups.js b/dlrs/main/lwc/manageRollups/manageRollups.js
@@ -272,6 +272,16 @@ export default class ManageRollups extends NavigationMixin(LightningElement) {
           presets: { minutes: ["0", "15", "30", "45"] }
         }
       ]
+    }).then((results) => {
+      if (results) {
+        try {
+          const evt = new ShowToastEvent(results);
+          this.dispatchEvent(evt);
+        } catch (err) {
+          // known issue with Lighting Locker can cause this to fail
+          console.error("Failed to create toast with outcome", err);
+        }
+      }
     });
   }
 

diff --git a/dlrs/main/lwc/rollupEditor/rollupEditor.js b/dlrs/main/lwc/rollupEditor/rollupEditor.js
@@ -1,6 +1,7 @@
 import { api, track, wire } from "lwc";
 
 import LightningModal from "lightning/modal";
+import { ShowToastEvent } from "lightning/platformShowToastEvent";
 
 import { PATH_STATES } from "c/flexiblePath";
 
@@ -296,6 +297,16 @@ export default class RollupEditor extends LightningModal {
               presets: { minutes: ["0", "15", "30", "45"] }
             }
           ]
+        }).then((results) => {
+          if (results) {
+            try {
+              const evt = new ShowToastEvent(results);
+              this.dispatchEvent(evt);
+            } catch (err) {
+              // known issue with Lighting Locker can cause this to fail
+              console.error("Failed to create toast with outcome", err);
+            }
+          }
         });
         // recalculate Path after Schedule is created
         this.configureSteps();