From 4c51588270557d76573f1c9a99e296b9732aed5c Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sat, 24 Dec 2022 13:57:42 +0100
Subject: [PATCH] custom widget launchers should not be initialized in safe
 mode

---
 src/public/app/widgets/containers/launcher.js |  4 +++
 .../widgets/containers/launcher_container.js  | 27 +++++++++----------
 src/views/desktop.ejs                         |  3 ++-
 src/views/mobile.ejs                          |  3 ++-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/public/app/widgets/containers/launcher.js b/src/public/app/widgets/containers/launcher.js
index b093c60e9..bb85f8b84 100644
--- a/src/public/app/widgets/containers/launcher.js
+++ b/src/public/app/widgets/containers/launcher.js
@@ -37,6 +37,10 @@ export default class LauncherWidget extends BasicWidget {
 
         const launcherType = note.getLabelValue("launcherType");
 
+        if (glob.TRILIUM_SAFE_MODE && launcherType === 'customWidget') {
+            return false;
+        }
+
         if (launcherType === 'command') {
             this.innerWidget = this.initCommandLauncherWidget(note)
                 .class("launcher-button");
diff --git a/src/public/app/widgets/containers/launcher_container.js b/src/public/app/widgets/containers/launcher_container.js
index 6c7dd21dd..fe5e69dde 100644
--- a/src/public/app/widgets/containers/launcher_container.js
+++ b/src/public/app/widgets/containers/launcher_container.js
@@ -27,22 +27,19 @@ export default class LauncherContainer extends FlexContainer {
             return;
         }
 
-        await Promise.allSettled(
-            (await visibleLaunchersRoot.getChildNotes())
-                .map(async launcherNote => {
-                    try {
-                        const launcherWidget = new LauncherWidget();
-                        const success = await launcherWidget.initLauncher(launcherNote);
+        for (const launcherNote of await visibleLaunchersRoot.getChildNotes()) {
+            try {
+                const launcherWidget = new LauncherWidget();
+                const success = await launcherWidget.initLauncher(launcherNote);
 
-                        if (success) {
-                            this.child(launcherWidget);
-                        }
-                    }
-                    catch (e) {
-                        console.error(e);
-                    }
-                })
-        );
+                if (success) {
+                    this.child(launcherWidget);
+                }
+            }
+            catch (e) {
+                console.error(e);
+            }
+        }
 
         this.$widget.empty();
         this.renderChildren();
diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs
index 6f2af6228..684884722 100644
--- a/src/views/desktop.ejs
+++ b/src/views/desktop.ejs
@@ -35,7 +35,8 @@
         extraHoistedNoteId: '<%= extraHoistedNoteId %>',
         isProtectedSessionAvailable: <%= isProtectedSessionAvailable %>,
         triliumVersion: "<%= triliumVersion %>",
-        assetPath: "<%= assetPath %>"
+        assetPath: "<%= assetPath %>",
+        TRILIUM_SAFE_MODE: <%= !!process.env.TRILIUM_SAFE_MODE %>
     };
 </script>
 
diff --git a/src/views/mobile.ejs b/src/views/mobile.ejs
index c6ad8f887..4edb46a2f 100644
--- a/src/views/mobile.ejs
+++ b/src/views/mobile.ejs
@@ -117,7 +117,8 @@
         appCssNoteIds: <%- JSON.stringify(appCssNoteIds) %>,
         isProtectedSessionAvailable: <%= isProtectedSessionAvailable %>,
         assetPath: "<%= assetPath %>",
-        isMainWindow: true
+        isMainWindow: true,
+        TRILIUM_SAFE_MODE: <%= !!process.env.TRILIUM_SAFE_MODE %>
     };
 </script>