Merge pull request #289 from Power-Maverick/copilot/fix-compare-option-bug

Fix: Context menu options not appearing after linking/initialization until VS Code restart

Author: Power-Maverick

src/helpers/templateHelper.ts

@@ -5,7 +5,7 @@ import fetch from "node-fetch";
 import { copyFolderOrFile, createFolder, pathExists, readFileSync, writeFileSync } from "../utils/FileSystem";
 import { Commands } from "../terminals/commands";
 import { Console } from "../terminals/console";
-import { extensionName, tsTemplateType } from "../utils/Constants";
+import { extensionName, extensionPrefix, tsTemplateType } from "../utils/Constants";
 import { Placeholders } from "../utils/Placeholders";
 import { ErrorMessages } from "../utils/ErrorMessages";
 import { pascalize } from "../utils/ExtensionMethods";
@@ -63,6 +63,9 @@ export class TemplateHelper {
         commands.push(Commands.LoadNpmPackages());
         Console.runCommand(commands);
 
+        // Update VS Code context to enable "Add Dataverse TS File" menu option
+        await vscode.commands.executeCommand("setContext", `${extensionPrefix}.isTSProject`, true);
+
         vscode.window.showInformationMessage(`${extensionName}: TypeScript project initialized.`);
     }
 
@@ -141,6 +144,9 @@ export class TemplateHelper {
         commands.push(Commands.LoadNpmPackages());
         Console.runCommand(commands);
 
+        // Update VS Code context to enable "Add Dataverse JS File" menu option
+        await vscode.commands.executeCommand("setContext", `${extensionPrefix}.isJSProject`, true);
+
         vscode.window.showInformationMessage(`${extensionName}: JavaScript project initialized.`);
     }
 

src/helpers/webResourceHelper.ts

@@ -2,7 +2,7 @@
 import { reduce } from "conditional-reduce";
 import * as path from "path";
 import * as vscode from "vscode";
-import { WebResourceType, wrDefinitionsStoreKey } from "../utils/Constants";
+import { extensionPrefix, WebResourceType, wrDefinitionsStoreKey } from "../utils/Constants";
 import { ErrorMessages } from "../utils/ErrorMessages";
 import { decodeFromBase64, encodeToBase64, extractGuid } from "../utils/ExtensionMethods";
 import { copyFolderOrFile, createTempDirectory, getFileExtension, getFileName, getRelativeFilePath, getWorkspaceFolder, readFileAsBase64Sync, readFileSync, writeFileSync } from "../utils/FileSystem";
@@ -360,6 +360,7 @@ export class WebResourceHelper {
             }
             writeFileSync(linkerFile.fsPath, jsonToXML(linkerFileDataJson));
             vscode.commands.executeCommand("dvdt.explorer.webresources.loadWebResources");
+            await this.updateLinkedResourcesContext();
             return resc;
         }
     }
@@ -379,6 +380,7 @@ export class WebResourceHelper {
             }
             writeFileSync(linkerFile.fsPath, jsonToXML(linkerFileDataJson));
             vscode.commands.executeCommand("dvdt.explorer.webresources.loadWebResources");
+            await this.updateLinkedResourcesContext();
             return newResc;
         }
     }
@@ -405,6 +407,7 @@ export class WebResourceHelper {
             }
             writeFileSync(linkerFile.fsPath, jsonToXML(linkerFileDataJson));
             vscode.commands.executeCommand("dvdt.explorer.webresources.loadWebResources");
+            await this.updateLinkedResourcesContext();
         }
     }
 
@@ -577,15 +580,17 @@ export class WebResourceHelper {
                 return { displayname: wrDisplayNameUR, name: `${prefix}_${wrNameUR}`, webresourcetype: wrType, content: wrContent, solutionid: solId, description: solName };
             }
         }
+    }
 
-        //#endregion Private
-
-        // Ask for
-        //  Display Name
-        //  Name
-        //  Web Resource Type (infer it from file extension)
-        //  Content (get it from the file & convert it to base64)
+    /**
+     * Update the VS Code context for linked resources to enable/disable context menu items
+     */
+    private async updateLinkedResourcesContext(): Promise<void> {
+        const linkedFileNames = await this.getLinkedResourceStrings("@_localFileName");
+        await vscode.commands.executeCommand("setContext", `${extensionPrefix}.linkedResources`, linkedFileNames);
     }
+
+    //#endregion Private
 }
 
 /**