feat: update public workspace

Signed-off-by: SuZhou-Joe <[email protected]>

src/core/public/saved_objects/saved_objects_client.ts

@@ -42,6 +42,7 @@ import {
 
 import { SimpleSavedObject } from './simple_saved_object';
 import { HttpFetchOptions, HttpSetup } from '../http';
+import { PUBLIC_WORKSPACE } from '../../utils';
 
 type SavedObjectsFindOptions = Omit<
   SavedObjectFindOptionsServer,
@@ -367,7 +368,7 @@ export class SavedObjectsClient {
 
     const workspaces = [
       ...(options.workspaces || [await this._getCurrentWorkspace()]),
-      'public',
+      PUBLIC_WORKSPACE,
     ].filter((item) => item);
 
     const renamedQuery = renameKeys<SavedObjectsFindOptions, any>(renameMap, {

src/core/public/utils/index.ts

@@ -32,4 +32,4 @@ export { shareWeakReplay } from './share_weak_replay';
 export { Sha256 } from './crypto';
 export { MountWrapper, mountReactNode } from './mount';
 export { getWorkspaceIdFromUrl, WORKSPACE_TYPE } from './workspace';
-export { WORKSPACE_PATH_PREFIX } from '../../utils';
+export { WORKSPACE_PATH_PREFIX, PUBLIC_WORKSPACE } from '../../utils';

src/core/server/saved_objects/service/lib/search_dsl/query_params.ts

@@ -34,6 +34,7 @@ type KueryNode = any;
 
 import { ISavedObjectTypeRegistry } from '../../../saved_objects_type_registry';
 import { ALL_NAMESPACES_STRING, DEFAULT_NAMESPACE_STRING } from '../utils';
+import { PUBLIC_WORKSPACE } from '../../../../../utils';
 
 /**
  * Gets the types based on the type. Uses mappings to support
@@ -142,7 +143,7 @@ function getClauseForWorkspace(workspace: string) {
     };
   }
 
-  if (workspace === 'public') {
+  if (workspace === PUBLIC_WORKSPACE) {
     return {
       bool: {
         must_not: [{ exists: { field: 'workspaces' } }],

src/core/server/workspaces/saved_objects/workspace_saved_objects_client_wrapper.ts

@@ -20,7 +20,7 @@ import {
 } from 'opensearch-dashboards/server';
 import { SavedObjectsPermissionControlContract } from '../../saved_objects/permission_control/client';
 import { WORKSPACE_TYPE } from '../constants';
-import { PermissionMode } from '../../../utils';
+import { PUBLIC_WORKSPACE, PermissionMode } from '../../../utils';
 
 // Can't throw unauthorized for now, the page will be refreshed if unauthorized
 const generateWorkspacePermissionError = () =>
@@ -186,7 +186,7 @@ export class WorkspaceSavedObjectsClientWrapper {
         );
       } else {
         options.workspaces = [
-          'public',
+          PUBLIC_WORKSPACE,
           ...(await this.permissionControl.getPermittedWorkspaceIds(wrapperOptions.request, [
             PermissionMode.Read,
           ])),

src/core/utils/constants.ts

@@ -12,3 +12,5 @@ export enum PermissionMode {
   LibraryRead = 'library_read',
   LibraryWrite = 'library_write',
 }
+
+export const PUBLIC_WORKSPACE = 'public';

src/core/utils/index.ts

@@ -38,4 +38,4 @@ export {
 } from './context';
 export { DEFAULT_APP_CATEGORIES } from './default_app_categories';
 export { DEFAULT_WORKSPACE_TEMPLATES } from './default_workspace_templates';
-export { WORKSPACE_PATH_PREFIX, PermissionMode } from './constants';
+export { WORKSPACE_PATH_PREFIX, PermissionMode, PUBLIC_WORKSPACE } from './constants';

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

@@ -94,6 +94,7 @@ import {
 import { Header, Table, Flyout, Relationships } from './components';
 import { DataPublicPluginStart } from '../../../../../plugins/data/public';
 import { SavedObjectsCopyModal } from './components/copy_modal';
+import { PUBLIC_WORKSPACE } from '../../../../../core/public/utils';
 
 interface ExportAllOption {
   id: string;
@@ -179,7 +180,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
   }
 
   private get workspaceIdQuery() {
-    return this.state.workspaceId ? ['public', this.state.workspaceId] : ['public'];
+    return this.state.workspaceId ? [PUBLIC_WORKSPACE, this.state.workspaceId] : [PUBLIC_WORKSPACE];
   }
 
   componentDidMount() {

src/plugins/workspace/public/components/utils/workspace_column.tsx

@@ -12,6 +12,7 @@ import {
   SavedObjectsManagementColumn,
   SavedObjectsManagementRecord,
 } from '../../../../saved_objects_management/public';
+import { PUBLIC_WORKSPACE } from '../../../../../core/public/utils';
 
 interface WorkspaceColumnProps {
   coreSetup: CoreSetup;
@@ -31,7 +32,7 @@ function WorkspaceColumn({ coreSetup, workspaces, record }: WorkspaceColumnProps
   });
   wsLookUp?.set('public', publicWsName);
 
-  if (!workspaces) {
+  if (!workspaces || workspaces?.includes(PUBLIC_WORKSPACE)) {
     return <EuiText>{publicWsName}</EuiText>;
   }