SUKU profileCloudUrl as persistent setting

intechstudio · Nov 6, 2023 · 0ca6413 · 0ca6413
1 parent 0e22358
commit 0ca6413
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 18 deletions.
diff --git a/src/renderer/main/panels/preferences/Preferences.svelte b/src/renderer/main/panels/preferences/Preferences.svelte
@@ -296,9 +296,9 @@
 
       <BlockTitle>Profile cloud URL</BlockTitle>
       <BlockBody>Change the url used in the Profile Cloud Iframe.</BlockBody>
-      <MoltenInput bind:target={$appSettings.profileCloudUrl} />
+      <MoltenInput bind:target={$appSettings.persistent.profileCloudUrl} />
       <MeltRadio
-        bind:target={$appSettings.profileCloudUrl}
+        bind:target={$appSettings.persistent.profileCloudUrl}
         options={[
           {
             title: "Development (localhost)",

diff --git a/src/renderer/main/panels/profileCloud/ProfileCloud.svelte b/src/renderer/main/panels/profileCloud/ProfileCloud.svelte
@@ -299,17 +299,29 @@
     }
   }
 
-  onMount(async () => {
-    // get to know the user
-    await userStore.known;
+  let listenerRegistered = false;
+  let profileCloudUrl = "";
 
-    $appSettings.profileCloudUrl = buildVariables.PROFILE_CLOUD_URL;
+  $: if (
+    listenerRegistered === true &&
+    profileCloudUrl !== $appSettings.persistent.profileCloudUrl
+  ) {
+    // listenerRegistered variable makes sure that the iframe loading is after registering the listener.
+    // otherwise handleProfileCloudMounted is missed and offline fallback is displayed
+    profileCloudUrl = $appSettings.persistent.profileCloudUrl;
 
-    $appSettings.profileCloudUrlEnabled = true;
+    console.log("Profile Cloud url", profileCloudUrl);
+    profileCloudIsMounted = false;
+  }
 
+  onMount(async () => {
+    // get to know the user
+    await userStore.known;
     console.log("profile cloud is mounted status", profileCloudIsMounted);
-
+    console.log("Profile Cloud url", $appSettings.persistent.profileCloudUrl);
     window.addEventListener("message", initChannelCommunication);
+    profileCloudUrl = $appSettings.persistent.profileCloudUrl;
+    listenerRegistered = true;
   });
 
   onDestroy(() => {
@@ -323,13 +335,13 @@
   async function loadOfflineProfileCloud() {
     const serverAddress = await window.electron.startOfflineProfileCloud();
     const url = `http://${serverAddress.address}:${serverAddress.port}`;
-    $appSettings.profileCloudUrl = url;
+    profileCloudUrl = url;
   }
 </script>
 
-<div class="flex flex-col bg-primary w-full h-full">
-  {#if profileCloudIsMounted == false}
-    <div class="flex items-center justify-center h-full">
+<div class="flex flex-col bg-primary w-full h-full relative">
+  <div class="flex items-center justify-center h-full absolute">
+    {#if !profileCloudIsMounted}
       <div class="p-4">
         <h1 class="text-white text-xl">Sorry, can't load Profile Cloud</h1>
         <div class="text-white text-opacity-80">
@@ -343,13 +355,14 @@
           Load Offline
         </button>
       </div>
-    </div>
-  {/if}
+    {/if}
+  </div>
+
   <iframe
     bind:this={iframe_element}
-    class="w-full h-full {profileCloudIsMounted == false ? 'hidden' : ''}"
+    class="w-full h-full {profileCloudIsMounted ? '' : ' hidden'}"
     title="Test"
     allow="clipboard-read; clipboard-write;}"
-    src={$appSettings.profileCloudUrl}
+    src={profileCloudUrl}
   />
 </div>
diff --git a/src/renderer/runtime/app-helper.store.js b/src/renderer/runtime/app-helper.store.js
@@ -30,6 +30,7 @@ const persistentDefaultValues = {
   analyticsEnabled: false,
   firstLaunch: true,
   fontSize: 12,
+  profileCloudUrl: configuration.PROFILE_CLOUD_URL_PROD,
 };
 
 function checkOS() {
@@ -114,7 +115,6 @@ function createAppSettingsStore(persistent) {
       title: undefined,
       owner: { neme: undefined },
     },
-    profileCloudUrl: undefined,
     pluginList: [],
     persistent: structuredClone(persistent),
   });
@@ -205,7 +205,7 @@ async function init_appsettings() {
         get(appSettings).persistent.welcomeOnStartup === true ||
         get(appSettings).persistent.lastVersion === undefined ||
         get(appSettings).persistent.lastVersion !=
-          configuration["EDITOR_VERSION"]
+        configuration["EDITOR_VERSION"]
       ) {
         appSettings.update((s) => {
           s.persistent.lastVersion = configuration["EDITOR_VERSION"];