implement better windows upload support

sassoftware · Oct 26, 2023 · 6c39b07 · 6c39b07
1 parent 22dadbd
commit 6c39b07
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 21 deletions.
diff --git a/client/src/components/ContentNavigator/index.ts b/client/src/components/ContentNavigator/index.ts
@@ -4,6 +4,7 @@ import {
   ConfigurationChangeEvent,
   Disposable,
   ExtensionContext,
+  OpenDialogOptions,
   ProgressLocation,
   Uri,
   commands,
@@ -337,28 +338,23 @@ class ContentNavigator implements SubscriptionProvider {
           );
         },
       ),
+      // Below, we have three commands to upload files. Mac is currently the only
+      // platform that supports uploading both files and folders. So, for any platform
+      // that isn't Mac, we list a distinct upload file(s) or upload folder(s) command.
+      // See the `OpenDialogOptions` interface for more information.
       commands.registerCommand(
         "SAS.uploadResource",
-        async (resource: ContentItem) => {
-          const uris: Uri[] = await window.showOpenDialog({
-            canSelectFolders: true,
-            canSelectMany: true,
-            canSelectFiles: true,
-          });
-          if (!uris) {
-            return;
-          }
-
-          await window.withProgress(
-            {
-              location: ProgressLocation.Notification,
-              title: l10n.t("Uploading files..."),
-            },
-            async () => {
-              await this.contentDataProvider.uploadUrisToTarget(uris, resource);
-            },
-          );
-        },
+        async (resource: ContentItem) => this.uploadResource(resource),
+      ),
+      commands.registerCommand(
+        "SAS.uploadFileResource",
+        async (resource: ContentItem) =>
+          this.uploadResource(resource, { canSelectFolders: false }),
+      ),
+      commands.registerCommand(
+        "SAS.uploadFolderResource",
+        async (resource: ContentItem) =>
+          this.uploadResource(resource, { canSelectFiles: false }),
       ),
       workspace.onDidChangeConfiguration(
         async (event: ConfigurationChangeEvent) => {
@@ -373,6 +369,31 @@ class ContentNavigator implements SubscriptionProvider {
     ];
   }
 
+  private async uploadResource(
+    resource: ContentItem,
+    openDialogOptions: Partial<OpenDialogOptions> = {},
+  ) {
+    const uris: Uri[] = await window.showOpenDialog({
+      canSelectFolders: true,
+      canSelectMany: true,
+      canSelectFiles: true,
+      ...openDialogOptions,
+    });
+    if (!uris) {
+      return;
+    }
+
+    await window.withProgress(
+      {
+        location: ProgressLocation.Notification,
+        title: l10n.t("Uploading files..."),
+      },
+      async () => {
+        await this.contentDataProvider.uploadUrisToTarget(uris, resource);
+      },
+    );
+  }
+
   private viyaEndpoint(): string {
     const activeProfile = profileConfig.getProfileByName(
       profileConfig.getActiveProfile(),

diff --git a/package.json b/package.json
@@ -588,6 +588,16 @@
         "title": "%commands.SAS.upload%",
         "category": "SAS"
       },
+      {
+        "command": "SAS.uploadFileResource",
+        "title": "%commands.SAS.uploadFiles%",
+        "category": "SAS"
+      },
+      {
+        "command": "SAS.uploadFolderResource",
+        "title": "%commands.SAS.uploadFolders%",
+        "category": "SAS"
+      },
       {
         "command": "SAS.saveHTML",
         "title": "%commands.SAS.download%",
@@ -705,7 +715,17 @@
         },
         {
           "command": "SAS.uploadResource",
-          "when": "(viewItem =~ /update/ || viewItem =~ /createChild/) && view == contentdataprovider && !listMultiSelection",
+          "when": "(viewItem =~ /update/ || viewItem =~ /createChild/) && view == contentdataprovider && !listMultiSelection && workspacePlatform == mac",
+          "group": "uploaddownloadgroup@1"
+        },
+        {
+          "command": "SAS.uploadFileResource",
+          "when": "(viewItem =~ /update/ || viewItem =~ /createChild/) && view == contentdataprovider && !listMultiSelection && workspacePlatform != mac",
+          "group": "uploaddownloadgroup@1"
+        },
+        {
+          "command": "SAS.uploadFolderResource",
+          "when": "(viewItem =~ /update/ || viewItem =~ /createChild/) && view == contentdataprovider && !listMultiSelection && workspacePlatform != mac",
           "group": "uploaddownloadgroup@1"
         }
       ],
@@ -816,6 +836,14 @@
           "when": "false",
           "command": "SAS.uploadResource"
         },
+        {
+          "when": "false",
+          "command": "SAS.uploadFileResource"
+        },
+        {
+          "when": "false",
+          "command": "SAS.uploadFolderResource"
+        },
         {
           "when": "false",
           "command": "SAS.saveHTML"

diff --git a/package.nls.json b/package.nls.json
@@ -24,6 +24,8 @@
   "commands.SAS.switchProfile": "Switch Current Connection Profile",
   "commands.SAS.updateProfile": "Update Connection Profile",
   "commands.SAS.upload": "Upload",
+  "commands.SAS.uploadFiles": "Upload File(s)",
+  "commands.SAS.uploadFolders": "Upload Folder(s)",
   "configuration.SAS.connectionProfiles": "Define the connection profiles to connect to SAS servers. If you define more than one profile, you can switch between them.",
   "configuration.SAS.connectionProfiles.activeProfile": "Active SAS Connection Profile",
   "configuration.SAS.connectionProfiles.profiles": "SAS Connection Profiles",