chore: add icons

Author: Scott Dover

client/src/components/ContentNavigator/ContentDataProvider.ts

@@ -45,6 +45,8 @@ import {
   FAVORITES_FOLDER_TYPE,
   Messages,
   ROOT_FOLDER_TYPE,
+  SERVER_HOME_FOLDER_TYPE,
+  SERVER_ROOT_FOLDER_TYPE,
   TRASH_FOLDER_TYPE,
 } from "./const";
 import {
@@ -642,6 +644,12 @@ class ContentDataProvider
         case FAVORITES_FOLDER_TYPE:
           icon = "favoritesFolder";
           break;
+        case SERVER_HOME_FOLDER_TYPE:
+          icon = "userWorkspace";
+          break;
+        case SERVER_ROOT_FOLDER_TYPE:
+          icon = "server";
+          break;
         default:
           icon = "folder";
           break;
@@ -652,6 +660,7 @@ class ContentDataProvider
         icon = "sasProgramFile";
       }
     }
+
     return icon !== ""
       ? {
           dark: Uri.joinPath(this.extensionUri, `icons/dark/${icon}Dark.svg`),

client/src/components/ContentNavigator/const.ts

@@ -16,10 +16,12 @@ export const ROOT_FOLDER = createStaticFolder(
 );
 
 export const SERVER_FOLDER_ID = "SERVER_FOLDER_ID";
+export const SERVER_ROOT_FOLDER_TYPE = "ServerRootFolder";
+export const SERVER_HOME_FOLDER_TYPE = "ServerHomeFolder";
 export const SAS_SERVER_ROOT_FOLDER = createStaticFolder(
   SERVER_FOLDER_ID,
   "SAS Server",
-  ROOT_FOLDER_TYPE,
+  SERVER_ROOT_FOLDER_TYPE,
   "/",
   "getDirectoryMembers",
 );

client/src/connection/rest/RestSASServerAdapter.ts

@@ -10,6 +10,7 @@ import {
   SAS_SERVER_ROOT_FOLDER,
   SAS_SERVER_ROOT_FOLDERS,
   SERVER_FOLDER_ID,
+  SERVER_HOME_FOLDER_TYPE,
 } from "../../components/ContentNavigator/const";
 import {
   AddChildItemProperties,
@@ -169,7 +170,7 @@ class RestSASServerAdapter implements ContentAdapter {
           createStaticFolder(
             SAS_SERVER_HOME_DIRECTORY,
             "Home",
-            "userRoot",
+            SERVER_HOME_FOLDER_TYPE,
             `/compute/sessions/${this.sessionId}/files/~fs~/members`,
             "getDirectoryMembers",
           ),
@@ -278,8 +279,6 @@ class RestSASServerAdapter implements ContentAdapter {
   }
 
   public getRootFolder(): ContentItem | undefined {
-    // TODO (sas-server) Re-implement this if SAS server supports
-    // recycle bin
     return undefined;
   }
 
@@ -394,7 +393,7 @@ class RestSASServerAdapter implements ContentAdapter {
   }
 
   private filePropertiesToContentItem(
-    fileProperties: FileProperties,
+    fileProperties: FileProperties & { type?: string },
     flags?: ContentItem["flags"],
   ): ContentItem {
     const links = fileProperties.links.map((link) => ({
@@ -405,10 +404,6 @@ class RestSASServerAdapter implements ContentAdapter {
       uri: link.uri,
     }));
 
-    if (!getLink(links, "GET", "self")) {
-      console.log("OH NBO");
-    }
-
     const id = getLink(links, "GET", "self").uri;
     const isRootFolder = [SERVER_FOLDER_ID, SAS_SERVER_HOME_DIRECTORY].includes(
       id,
@@ -428,6 +423,7 @@ class RestSASServerAdapter implements ContentAdapter {
           !!getLink(links, "POST", "createFile"),
       },
       flags,
+      type: fileProperties.type || "",
     };
 
     const typeName = getTypeName(item);