default workspace

Signed-off-by: Hailong Cui <[email protected]>

src/core/public/index.ts

@@ -354,4 +354,4 @@ export { __osdBootstrap__ } from './osd_bootstrap';
 
 export { WorkspacesStart, WorkspacesSetup, WorkspacesService } from './workspace';
 
-export { WORKSPACE_TYPE } from '../utils';
+export { WORKSPACE_TYPE, DEFAULT_WORKSPACE_ID } from '../utils';

src/core/server/index.ts

@@ -360,6 +360,7 @@ export {
   MANAGEMENT_WORKSPACE_ID,
   WORKSPACE_TYPE,
   PERSONAL_WORKSPACE_ID_PREFIX,
+  DEFAULT_WORKSPACE_ID,
 } from '../utils';
 
 export {

src/core/utils/constants.ts

@@ -9,6 +9,12 @@ export const WORKSPACE_PATH_PREFIX = '/w';
 
 export const PUBLIC_WORKSPACE_ID = 'public';
 
+/**
+ * default workspace is virtual workspace,
+ * saved objects that don't have workspaces/permissions field are belongs to default workspace
+ */
+export const DEFAULT_WORKSPACE_ID = 'default';
+
 export const MANAGEMENT_WORKSPACE_ID = 'management';
 
 export const PERSONAL_WORKSPACE_ID_PREFIX = 'personal';

src/core/utils/index.ts

@@ -44,4 +44,5 @@ export {
   MANAGEMENT_WORKSPACE_ID,
   WORKSPACE_TYPE,
   PERSONAL_WORKSPACE_ID_PREFIX,
+  DEFAULT_WORKSPACE_ID,
 } from './constants';

src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx

@@ -69,6 +69,7 @@ import {
   WorkspaceAttribute,
 } from 'src/core/public';
 import { Subscription } from 'rxjs';
+import { DEFAULT_WORKSPACE_ID } from '../../../../../core/public';
 import { RedirectAppLinks } from '../../../../opensearch_dashboards_react/public';
 import { IndexPatternsContract } from '../../../../data/public';
 import {
@@ -192,7 +193,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
     } else {
       // application home
       if (!currentWorkspaceId) {
-        return availableWorkspaces?.map((ws) => ws.id);
+        return availableWorkspaces?.map((ws) => ws.id).concat(DEFAULT_WORKSPACE_ID);
       } else {
         return [currentWorkspaceId];
       }
@@ -201,10 +202,13 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
 
   private get wsNameIdLookup() {
     const { availableWorkspaces } = this.state;
+    const workspaceNameIdMap = new Map<string, string>();
+    workspaceNameIdMap.set(DEFAULT_WORKSPACE_ID, DEFAULT_WORKSPACE_ID);
     // Assumption: workspace name is unique across the system
-    return availableWorkspaces?.reduce((map, ws) => {
+    availableWorkspaces?.reduce((map, ws) => {
       return map.set(ws.name, ws.id);
-    }, new Map<string, string>());
+    }, workspaceNameIdMap);
+    return workspaceNameIdMap;
   }
 
   private formatWorkspaceIdParams<T extends { workspaces?: string[] }>(
@@ -352,6 +356,13 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
       findOptions.workspaces = workspaceIds;
     }
 
+    if (findOptions.workspaces) {
+      if (findOptions.workspaces.indexOf(DEFAULT_WORKSPACE_ID) !== -1) {
+        // search both saved objects with workspace and without workspace
+        findOptions.workspacesSearchOperator = 'OR';
+      }
+    }
+
     if (findOptions.type.length > 1) {
       findOptions.sortField = 'type';
     }
@@ -962,6 +973,14 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
           };
         });
 
+      if (!currentWorkspaceId) {
+        wsFilterOptions.push({
+          name: DEFAULT_WORKSPACE_ID,
+          value: DEFAULT_WORKSPACE_ID,
+          view: `Default (${wsCounts[DEFAULT_WORKSPACE_ID] || 0})`,
+        });
+      }
+
       filters.push({
         type: 'field_value_selection',
         field: 'workspaces',

src/plugins/saved_objects_management/server/routes/find.ts

@@ -67,6 +67,7 @@ export const registerFindRoute = (
           workspaces: schema.maybe(
             schema.oneOf([schema.string(), schema.arrayOf(schema.string())])
           ),
+          workspacesSearchOperator: schema.maybe(schema.string()),
         }),
       },
     },

src/plugins/saved_objects_management/server/routes/scroll_count.ts

@@ -30,6 +30,7 @@
 
 import { schema } from '@osd/config-schema';
 import { IRouter, SavedObjectsFindOptions } from 'src/core/server';
+import { DEFAULT_WORKSPACE_ID } from '../../../../core/server';
 import { findAll } from '../lib';
 
 export const registerScrollForCountRoute = (router: IRouter) => {
@@ -69,6 +70,10 @@ export const registerScrollForCountRoute = (router: IRouter) => {
       if (requestHasWorkspaces) {
         counts.workspaces = {};
         findOptions.workspaces = req.body.workspaces;
+        if (findOptions.workspaces.indexOf(DEFAULT_WORKSPACE_ID) !== -1) {
+          // search both saved objects with workspace and without workspace
+          findOptions.workspacesSearchOperator = 'OR';
+        }
       }
 
       if (req.body.searchString) {
@@ -91,7 +96,7 @@ export const registerScrollForCountRoute = (router: IRouter) => {
           });
         }
         if (requestHasWorkspaces) {
-          const resultWorkspaces = result.workspaces || [];
+          const resultWorkspaces = result.workspaces || [DEFAULT_WORKSPACE_ID];
           resultWorkspaces.forEach((ws) => {
             counts.workspaces[ws] = counts.workspaces[ws] || 0;
             counts.workspaces[ws]++;