Merge pull request #82 from gjsjohnmurray/add-webapps

'Alt' commands on the Edit and View buttons, for accessing web application files

Author: gjsjohnmurray

package.json

@@ -314,6 +314,16 @@
         "command": "intersystems-community.servermanager.viewNamespace",
         "title": "View Code in Namespace",
         "icon": "$(eye)"
+      },
+      {
+        "command": "intersystems-community.servermanager.editNamespaceWebAppFiles",
+        "title": "Edit Web Application Files",
+        "icon": "$(file-code)"
+      },
+      {
+        "command": "intersystems-community.servermanager.viewNamespaceWebAppFiles",
+        "title": "View Web Application Files",
+        "icon": "$(telescope)"
       }
     ],
     "submenus": [
@@ -373,6 +383,54 @@
         {
           "command": "intersystems-community.servermanager.openPortalTab",
           "when": "false"
+        },
+        {
+          "command": "intersystems-community.servermanager.retryServer",
+          "when": "false"
+        },
+        {
+          "command": "intersystems-community.servermanager.setIconRed",
+          "when": "false"
+        },
+        {
+          "command": "intersystems-community.servermanager.setIconOrange",
+          "when": "false"
+        },
+        {
+          "command": "intersystems-community.servermanager.setIconYellow",
+          "when": "false"
+        },
+        {
+          "command": "intersystems-community.servermanager.setIconGreen",
+          "when": "false"
+        },
+        {
+          "command": "intersystems-community.servermanager.setIconBlue",
+          "when": "false"
+        },
+        {
+          "command": "intersystems-community.servermanager.setIconPurple",
+          "when": "false"
+        },
+        {
+          "command": "intersystems-community.servermanager.resetIconColor",
+          "when": "false"
+        },
+        {
+          "command": "intersystems-community.servermanager.editNamespace",
+          "when": "false"
+        },
+        {
+          "command": "intersystems-community.servermanager.viewNamespace",
+          "when": "false"
+        },
+        {
+          "command": "intersystems-community.servermanager.editNamespaceWebAppFiles",
+          "when": "false"
+        },
+        {
+          "command": "intersystems-community.servermanager.viewNamespaceWebAppFiles",
+          "when": "false"
         }
       ],
       "view/title": [
@@ -420,11 +478,13 @@
         },
         {
           "command": "intersystems-community.servermanager.editNamespace",
+          "alt": "intersystems-community.servermanager.editNamespaceWebAppFiles",
           "when": "view == intersystems-community_servermanager && viewItem =~ /namespace$/",
           "group": "inline@10"
         },
         {
           "command": "intersystems-community.servermanager.viewNamespace",
+          "alt": "intersystems-community.servermanager.viewNamespaceWebAppFiles",
           "when": "view == intersystems-community_servermanager && viewItem =~ /namespace$/",
           "group": "inline@20"
         },

src/extension.ts

@@ -205,7 +205,7 @@ export function activate(context: vscode.ExtensionContext) {
         })
     );
 
-    const addWorkspaceFolderAsync = async (readonly: boolean, namespaceTreeItem?: ServerTreeItem) => {
+    const addWorkspaceFolderAsync = async (readonly: boolean, csp: boolean, namespaceTreeItem?: ServerTreeItem) => {
         if (namespaceTreeItem) {
             const pathParts = namespaceTreeItem.id?.split(':');
             if (pathParts && pathParts.length === 4) {
@@ -229,9 +229,9 @@ export function activate(context: vscode.ExtensionContext) {
                         return;
                     }
 
-                    const uri = vscode.Uri.parse(`isfs${readonly ? "-readonly" : ""}://${serverName}:${namespace}/${serverSpec.webServer.pathPrefix || ''}`);
+                    const uri = vscode.Uri.parse(`isfs${readonly ? "-readonly" : ""}://${serverName}:${namespace}/${serverSpec.webServer.pathPrefix || ''}${csp ? '?csp' : ''}`);
                     if ((vscode.workspace.workspaceFolders || []).filter((workspaceFolder) => workspaceFolder.uri.toString() === uri.toString()).length === 0) {                       
-                        const label = `${serverName}:${namespace}${readonly ? " (read-only)" : ""}`;
+                        const label = `${serverName}:${namespace}${csp ? ' webfiles' : ''}${readonly ? " (read-only)" : ""}`;
                         const added = vscode.workspace.updateWorkspaceFolders(
                             vscode.workspace.workspaceFolders ? vscode.workspace.workspaceFolders.length : 0,
                             0,
@@ -253,11 +253,19 @@ export function activate(context: vscode.ExtensionContext) {
     }
 
     context.subscriptions.push(
-        vscode.commands.registerCommand(`${extensionId}.editNamespace`, async (namespaceTreeItem?: ServerTreeItem) => {await addWorkspaceFolderAsync(false, namespaceTreeItem)})
+        vscode.commands.registerCommand(`${extensionId}.editNamespace`, async (namespaceTreeItem?: ServerTreeItem) => {await addWorkspaceFolderAsync(false, false, namespaceTreeItem)})
     );
 
     context.subscriptions.push(
-        vscode.commands.registerCommand(`${extensionId}.viewNamespace`, async (namespaceTreeItem?: ServerTreeItem) => {await addWorkspaceFolderAsync(true, namespaceTreeItem)})
+        vscode.commands.registerCommand(`${extensionId}.viewNamespace`, async (namespaceTreeItem?: ServerTreeItem) => {await addWorkspaceFolderAsync(true, false, namespaceTreeItem)})
+    );
+    
+    context.subscriptions.push(
+        vscode.commands.registerCommand(`${extensionId}.editNamespaceWebAppFiles`, async (namespaceTreeItem?: ServerTreeItem) => {await addWorkspaceFolderAsync(false, true, namespaceTreeItem)})
+    );
+    
+    context.subscriptions.push(
+        vscode.commands.registerCommand(`${extensionId}.viewNamespaceWebAppFiles`, async (namespaceTreeItem?: ServerTreeItem) => {await addWorkspaceFolderAsync(true, true, namespaceTreeItem)})
     );
 
     // Listen for relevant configuration changes