Correct where message marks have to be stored

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

src/api/configuration/storage/CodeForIStorage.ts

@@ -5,7 +5,6 @@ const SERVER_SETTINGS_CACHE_PREFIX = `serverSettingsCache_`;
 const SERVER_SETTINGS_CACHE_KEY = (name: string) => SERVER_SETTINGS_CACHE_PREFIX + name;
 const PREVIOUS_SEARCH_TERMS_KEY = `prevSearchTerms`;
 const PREVIOUS_FIND_TERMS_KEY = `prevFindTerms`;
-const MESSAGE_SHOWN_KEY = `messageShown`;
 
 export type PathContent = Record<string, string[]>;
 export type DeploymentPath = Record<string, string>;
@@ -138,17 +137,4 @@ export class CodeForIStorage {
   async clearPreviousFindTerms(){
     await this.internalStorage.set(PREVIOUS_FIND_TERMS_KEY, undefined);
   }
-
-  hasMessageBeenShown(messageId: string): boolean {
-    const shownMessages = this.internalStorage.get<string[]>(MESSAGE_SHOWN_KEY) || [];
-    return shownMessages.includes(messageId);
-  }
-
-  async markMessageAsShown(messageId: string): Promise<void> {
-    const shownMessages = this.internalStorage.get<string[]>(MESSAGE_SHOWN_KEY) || [];
-    if (!shownMessages.includes(messageId)) {
-      shownMessages.push(messageId);
-      await this.internalStorage.set(MESSAGE_SHOWN_KEY, shownMessages);
-    }
-  }
 }

src/api/configuration/storage/ConnectionStorage.ts

@@ -6,6 +6,7 @@ const LAST_PROFILE_KEY = `currentProfile`;
 const SOURCE_LIST_KEY = `sourceList`;
 const DEPLOYMENT_KEY = `deployment`;
 const DEBUG_KEY = `debug`;
+const MESSAGE_SHOWN_KEY = `messageShown`;
 
 const RECENTLY_OPENED_FILES_KEY = `recentlyOpenedFiles`;
 const AUTHORISED_EXTENSIONS_KEY = `authorisedExtensions`
@@ -128,4 +129,17 @@ export class ConnectionStorage {
     const newExtensions = this.getAuthorisedExtensions().filter(ext => !extensions.includes(ext));
     return this.internalStorage.set(AUTHORISED_EXTENSIONS_KEY, newExtensions);
   }
+
+  hasMessageBeenShown(messageId: string): boolean {
+    const shownMessages = this.internalStorage.get<string[]>(MESSAGE_SHOWN_KEY) || [];
+    return shownMessages.includes(messageId);
+  }
+
+  async markMessageAsShown(messageId: string): Promise<void> {
+    const shownMessages = this.internalStorage.get<string[]>(MESSAGE_SHOWN_KEY) || [];
+    if (!shownMessages.includes(messageId)) {
+      shownMessages.push(messageId);
+      await this.internalStorage.set(MESSAGE_SHOWN_KEY, shownMessages);
+    }
+  }
 }

src/debug/index.ts

@@ -323,10 +323,10 @@ export async function initialize(context: ExtensionContext) {
 
           } else {
             const version = (await getDebugServiceDetails(connection)).semanticVersion();
-            // if (version.major < server.MIN_DEBUG_VERSION) {
-            if (true) {
+            const storage = instance.getStorage();
+            if (storage && version.major < server.MIN_DEBUG_VERSION) {
               const debugUpdateMessageId = `debugUpdateRequired-${version.major}`;
-              const showMessage = !IBMi.GlobalStorage.hasMessageBeenShown(debugUpdateMessageId);
+              const showMessage = !storage.hasMessageBeenShown(debugUpdateMessageId);
 
               if (showMessage) {
                 vscode.window.showWarningMessage(`Debug service version ${version} is below the minimum required version ${server.MIN_DEBUG_VERSION}. Please update the debug service PTF.`, `Open docs`, `Dismiss`).then(selected => {
@@ -335,7 +335,7 @@ export async function initialize(context: ExtensionContext) {
                       env.openExternal(Uri.parse(`https://codefori.github.io/docs/developing/debug/`));
                       break;
                     case `Dismiss`:
-                      IBMi.GlobalStorage.markMessageAsShown(debugUpdateMessageId);
+                      storage.markMessageAsShown(debugUpdateMessageId);
                       break;
                   }
                 });