From b9a0c656d324492f2f2a709e6a67e579a3b00cd5 Mon Sep 17 00:00:00 2001
From: Elio Struyf <elio@struyfconsulting.be>
Date: Fri, 7 Oct 2022 13:32:49 +0200
Subject: [PATCH] async updates for settings

---
 src/commands/Project.ts                                     | 2 +-
 src/dashboardWebView/components/Steps/StepsToGetStarted.tsx | 6 +++---
 src/helpers/ContentType.ts                                  | 4 ++--
 src/helpers/Extension.ts                                    | 2 +-
 src/helpers/SettingsHelper.ts                               | 4 +++-
 src/listeners/dashboard/SettingsListener.ts                 | 6 +++---
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/commands/Project.ts b/src/commands/Project.ts
index a6303a8d..748bd0bf 100644
--- a/src/commands/Project.ts
+++ b/src/commands/Project.ts
@@ -37,7 +37,7 @@ categories: []
       await Settings.createTeamSettings();
 
       // Add the default content type
-      Settings.update(SETTING_TAXONOMY_CONTENT_TYPES, [DEFAULT_CONTENT_TYPE], true);
+      await Settings.update(SETTING_TAXONOMY_CONTENT_TYPES, [DEFAULT_CONTENT_TYPE], true);
 
       if (sampleTemplate !== undefined) {
         await Project.createSampleTemplate();
diff --git a/src/dashboardWebView/components/Steps/StepsToGetStarted.tsx b/src/dashboardWebView/components/Steps/StepsToGetStarted.tsx
index a3c48e6c..bb5f67c1 100644
--- a/src/dashboardWebView/components/Steps/StepsToGetStarted.tsx
+++ b/src/dashboardWebView/components/Steps/StepsToGetStarted.tsx
@@ -163,10 +163,10 @@ export const StepsToGetStarted: React.FunctionComponent<IStepsToGetStartedProps>
   ];
   
   React.useEffect(() => {
-    if (settings.crntFramework) {
-      setFramework(settings.crntFramework);
+    if (settings.crntFramework || settings.framework?.name) {
+      setFramework(settings.crntFramework || settings.framework?.name || null);
     }
-  }, [settings.crntFramework]);
+  }, [settings.crntFramework, settings.framework]);
 
   return (
     <nav aria-label="Progress">
diff --git a/src/helpers/ContentType.ts b/src/helpers/ContentType.ts
index 5308a92c..223b6c9a 100644
--- a/src/helpers/ContentType.ts
+++ b/src/helpers/ContentType.ts
@@ -194,7 +194,7 @@ export class ContentType {
       contentTypes.push(newContentType);
     }
 
-    Settings.update(SETTING_TAXONOMY_CONTENT_TYPES, contentTypes, true);
+    await Settings.update(SETTING_TAXONOMY_CONTENT_TYPES, contentTypes, true);
 
     const configPath = Settings.projectConfigPath;
     const notificationAction = await Notifications.info(`Content type ${contentTypeName} has been ${overrideBool ? `updated` : `generated`}.`, configPath && await existsAsync(configPath) ?  `Open settings` : undefined);
@@ -228,7 +228,7 @@ export class ContentType {
     const index = contentTypes.findIndex(ct => ct.name === contentType.name);
     contentTypes[index].fields = updatedFields;
 
-    Settings.update(SETTING_TAXONOMY_CONTENT_TYPES, contentTypes, true);
+    await Settings.update(SETTING_TAXONOMY_CONTENT_TYPES, contentTypes, true);
 
     const configPath = Settings.projectConfigPath;
     const notificationAction = await Notifications.info(`Content type ${contentType.name} has been updated.`, configPath && await existsAsync(configPath) ?  `Open settings` : undefined);
diff --git a/src/helpers/Extension.ts b/src/helpers/Extension.ts
index 6a01ad69..411cc21c 100644
--- a/src/helpers/Extension.ts
+++ b/src/helpers/Extension.ts
@@ -232,7 +232,7 @@ export class Extension {
           ignoreFocusOut: true
         });
 
-        Settings.update(SETTING_TEMPLATES_ENABLED, answer?.toLocaleLowerCase() === "yes", true);
+        await Settings.update(SETTING_TEMPLATES_ENABLED, answer?.toLocaleLowerCase() === "yes", true);
       }
     }
   }
diff --git a/src/helpers/SettingsHelper.ts b/src/helpers/SettingsHelper.ts
index 20aa8dee..6c3a6678 100644
--- a/src/helpers/SettingsHelper.ts
+++ b/src/helpers/SettingsHelper.ts
@@ -186,7 +186,9 @@ export class Settings {
         const localConfig = await readFileAsync(fmConfig, 'utf8');
         Settings.globalConfig = jsoncParser.parse(localConfig);
         Settings.globalConfig[`${CONFIG_KEY}.${name}`] = value;
-        await writeFileAsync(fmConfig, JSON.stringify(Settings.globalConfig, null, 2), 'utf8');
+
+        const content = JSON.stringify(Settings.globalConfig, null, 2);
+        await writeFileAsync(fmConfig, content, 'utf8');
         
         const workspaceSettingValue = Settings.hasWorkspaceSettings<ContentType[]>(name);
         if (workspaceSettingValue) {
diff --git a/src/listeners/dashboard/SettingsListener.ts b/src/listeners/dashboard/SettingsListener.ts
index ffce8394..d8c7402b 100644
--- a/src/listeners/dashboard/SettingsListener.ts
+++ b/src/listeners/dashboard/SettingsListener.ts
@@ -60,17 +60,17 @@ export class SettingsListener extends BaseListener {
    * @param frameworkId 
    */
   public static async setFramework(frameworkId: string | null) {
-    Settings.update(SETTING_FRAMEWORK_ID, frameworkId, true);
+    await Settings.update(SETTING_FRAMEWORK_ID, frameworkId, true);
 
     if (frameworkId) {
       const allFrameworks = FrameworkDetector.getAll();
       const framework = allFrameworks.find((f: Framework) => f.name === frameworkId);
       if (framework) {
-        Settings.update(SETTING_CONTENT_STATIC_FOLDER, framework.static, true);
+        await Settings.update(SETTING_CONTENT_STATIC_FOLDER, framework.static, true);
 
         await FrameworkDetector.checkDefaultSettings(framework);
       } else {
-        Settings.update(SETTING_CONTENT_STATIC_FOLDER, "", true);
+        await Settings.update(SETTING_CONTENT_STATIC_FOLDER, "", true);
       }
     }