feat: preserve all remote drives if no default drives config is passed

powerhouse-inc · Sep 4, 2024 · af45238 · af45238
1 parent ea5f9eb
commit af45238
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/utils/reactor.ts b/src/utils/reactor.ts
@@ -2,14 +2,16 @@ import { DocumentDriveServerOptions } from 'document-drive/server';
 
 const DEFAULT_DRIVES_URL =
     import.meta.env.PH_CONNECT_DEFAULT_DRIVES_URL || undefined;
-const defaultDrivesUrl = DEFAULT_DRIVES_URL?.split(',');
+const defaultDrivesUrl = DEFAULT_DRIVES_URL
+    ? DEFAULT_DRIVES_URL.split(',')
+    : [];
 
 export const getReactorDefaultDrivesConfig = (): Pick<
     DocumentDriveServerOptions,
     'defaultRemoteDrives' | 'removeOldRemoteDrives'
 > => {
     const defaultDrives: DocumentDriveServerOptions['defaultRemoteDrives'] =
-        defaultDrivesUrl?.map(driveUrl => ({
+        defaultDrivesUrl.map(driveUrl => ({
             url: driveUrl,
             options: {
                 sharingType: 'PUBLIC',
@@ -40,9 +42,12 @@ export const getReactorDefaultDrivesConfig = (): Pick<
 
     return {
         defaultRemoteDrives: defaultDrives,
-        removeOldRemoteDrives: {
-            strategy: 'preserve-by-url',
-            urls: defaultDrivesUrl || [],
-        },
+        removeOldRemoteDrives:
+            defaultDrivesUrl.length > 0
+                ? {
+                      strategy: 'preserve-by-url',
+                      urls: defaultDrivesUrl,
+                  }
+                : { strategy: 'preserve-all' },
     };
 };
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
@@ -18,7 +18,6 @@ type ImportMetaEnv = {
   SENTRY_ORG: string
   SENTRY_PROJECT: string
   PH_CONNECT_ROUTER_BASENAME: string
-  PH_CONNECT_DEFAULT_DRIVES_URL: string
   PH_CONNECT_ENABLED_EDITORS: string
   PH_CONNECT_DISABLE_ADD_PUBLIC_DRIVES: string
   PH_CONNECT_SEARCH_BAR_ENABLED: string
@@ -40,6 +39,7 @@ type ImportMetaEnv = {
   PH_CONNECT_SENTRY_DSN: string
   PH_CONNECT_SENTRY_PROJECT: string
   PH_CONNECT_SENTRY_ENV: string
+  PH_CONNECT_DEFAULT_DRIVES_URL?: string
   // @user-defined-start
   /*
    *  You can use this section to explicitly extend the type definition of `import.meta.env`