Feature/current workspace in server side

CHANGELOG.md

@@ -75,6 +75,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [BUG] Remove duplicate sample data as id 90943e30-9a47-11e8-b64d-95841ca0b247 ([5668](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5668))
 - [BUG][Multiple Datasource] Fix datasource testing connection unexpectedly passed with wrong endpoint [#5663](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5663)
 - [Table Visualization] Fix filter action buttons for split table aggregations ([#5619](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5619))
+- [BUG][Discover] Allow saved sort from search embeddable to load in Dashboard ([#5934](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5934))
 
 ### 🚞 Infrastructure
 

package.json

@@ -329,6 +329,7 @@
     "@types/react-router-dom": "^5.3.2",
     "@types/react-virtualized": "^9.18.7",
     "@types/recompose": "^0.30.6",
+    "@types/redux-mock-store": "^1.0.6",
     "@types/selenium-webdriver": "^4.0.9",
     "@types/semver": "^7.5.0",
     "@types/sinon": "^7.0.13",
@@ -446,6 +447,7 @@
     "react-test-renderer": "^16.12.0",
     "reactcss": "1.2.3",
     "redux": "^4.0.5",
+    "redux-mock-store": "^1.5.4",
     "regenerate": "^1.4.0",
     "reselect": "^4.0.0",
     "resize-observer-polyfill": "^1.5.1",

src/core/public/saved_objects/saved_objects_client.ts

@@ -38,6 +38,7 @@ import {
   SavedObjectsClientContract as SavedObjectsApi,
   SavedObjectsFindOptions as SavedObjectFindOptionsServer,
   SavedObjectsMigrationVersion,
+  SavedObjectsBaseOptions,
 } from '../../server';
 
 import { SimpleSavedObject } from './simple_saved_object';
@@ -65,7 +66,7 @@ export interface SavedObjectsCreateOptions {
   /** {@inheritDoc SavedObjectsMigrationVersion} */
   migrationVersion?: SavedObjectsMigrationVersion;
   references?: SavedObjectReference[];
-  workspaces?: string[];
+  workspaces?: SavedObjectsBaseOptions['workspaces'];
 }
 
 /**
@@ -83,7 +84,7 @@ export interface SavedObjectsBulkCreateObject<T = unknown> extends SavedObjectsC
 export interface SavedObjectsBulkCreateOptions {
   /** If a document with the given `id` already exists, overwrite it's contents (default=false). */
   overwrite?: boolean;
-  workspaces?: string[];
+  workspaces?: SavedObjectsCreateOptions['workspaces'];
 }
 
 /** @public */

src/core/server/index.ts

@@ -321,12 +321,11 @@ export {
   exportSavedObjectsToStream,
   importSavedObjectsFromStream,
   resolveSavedObjectsImportErrors,
-  SavedObjectsDeleteByWorkspaceOptions,
   ACL,
   Principals,
-  TransformedPermission,
   PrincipalType,
   Permissions,
+  SavedObjectsDeleteByWorkspaceOptions,
 } from './saved_objects';
 
 export {

src/core/server/mocks.ts

@@ -89,6 +89,9 @@ export function pluginInitializerContextConfigMock<T>(config: T) {
     path: { data: '/tmp' },
     savedObjects: {
       maxImportPayloadBytes: new ByteSizeValue(26214400),
+      permission: {
+        enabled: true,
+      },
     },
   };
 

src/core/server/plugins/plugin_context.test.ts

@@ -108,7 +108,12 @@ describe('createPluginInitializerContext', () => {
         pingTimeout: duration(30, 's'),
       },
       path: { data: fromRoot('data') },
-      savedObjects: { maxImportPayloadBytes: new ByteSizeValue(26214400) },
+      savedObjects: {
+        maxImportPayloadBytes: new ByteSizeValue(26214400),
+        permission: {
+          enabled: false,
+        },
+      },
     });
   });
 

src/core/server/plugins/types.ts

@@ -295,7 +295,7 @@ export const SharedGlobalConfigKeys = {
   ] as const,
   opensearch: ['shardTimeout', 'requestTimeout', 'pingTimeout'] as const,
   path: ['data'] as const,
-  savedObjects: ['maxImportPayloadBytes'] as const,
+  savedObjects: ['maxImportPayloadBytes', 'permission'] as const,
 };
 
 /**

src/core/server/saved_objects/export/get_sorted_objects_for_export.ts

@@ -30,7 +30,7 @@
 
 import Boom from '@hapi/boom';
 import { createListStream } from '../../utils/streams';
-import { SavedObjectsClientContract, SavedObject } from '../types';
+import { SavedObjectsClientContract, SavedObject, SavedObjectsBaseOptions } from '../types';
 import { fetchNestedDependencies } from './inject_nested_depdendencies';
 import { sortObjects } from './sort_objects';
 
@@ -61,7 +61,7 @@ export interface SavedObjectsExportOptions {
   /** optional namespace to override the namespace used by the savedObjectsClient. */
   namespace?: string;
   /** optional workspaces to override the workspaces used by the savedObjectsClient. */
-  workspaces?: string[];
+  workspaces?: SavedObjectsBaseOptions['workspaces'];
 }
 
 /**
@@ -97,7 +97,7 @@ async function fetchObjectsToExport({
   exportSizeLimit: number;
   savedObjectsClient: SavedObjectsClientContract;
   namespace?: string;
-  workspaces?: string[];
+  workspaces?: SavedObjectsExportOptions['workspaces'];
 }) {
   if ((types?.length ?? 0) > 0 && (objects?.length ?? 0) > 0) {
     throw Boom.badRequest(`Can't specify both "types" and "objects" properties when exporting`);

src/core/server/saved_objects/import/check_conflicts.ts

@@ -35,6 +35,7 @@ import {
   SavedObjectsImportError,
   SavedObjectError,
   SavedObjectsImportRetry,
+  SavedObjectsBaseOptions,
 } from '../types';
 
 interface CheckConflictsParams {
@@ -44,7 +45,7 @@ interface CheckConflictsParams {
   ignoreRegularConflicts?: boolean;
   retries?: SavedObjectsImportRetry[];
   createNewCopies?: boolean;
-  workspaces?: string[];
+  workspaces?: SavedObjectsBaseOptions['workspaces'];
 }
 
 const isUnresolvableConflict = (error: SavedObjectError) =>
@@ -79,7 +80,7 @@ export async function checkConflicts({
   });
   const checkConflictsResult = await savedObjectsClient.checkConflicts(objectsToCheck, {
     namespace,
-    workspaces,
+    ...(workspaces ? { workspaces } : {}),
   });
   const errorMap = checkConflictsResult.errors.reduce(
     (acc, { type, id, error }) => acc.set(`${type}:${id}`, error),

src/core/server/saved_objects/import/create_saved_objects.ts

@@ -28,7 +28,12 @@
  * under the License.
  */
 
-import { SavedObject, SavedObjectsClientContract, SavedObjectsImportError } from '../types';
+import {
+  SavedObject,
+  SavedObjectsBaseOptions,
+  SavedObjectsClientContract,
+  SavedObjectsImportError,
+} from '../types';
 import { extractErrors } from './extract_errors';
 import { CreatedObject } from './types';
 
@@ -41,7 +46,7 @@ interface CreateSavedObjectsParams<T> {
   overwrite?: boolean;
   dataSourceId?: string;
   dataSourceTitle?: string;
-  workspaces?: string[];
+  workspaces?: SavedObjectsBaseOptions['workspaces'];
 }
 interface CreateSavedObjectsResult<T> {
   createdObjects: Array<CreatedObject<T>>;

src/core/server/saved_objects/import/import_saved_objects.test.ts

@@ -42,7 +42,7 @@ import { typeRegistryMock } from '../saved_objects_type_registry.mock';
 import { importSavedObjectsFromStream } from './import_saved_objects';
 
 import { collectSavedObjects } from './collect_saved_objects';
-import { regenerateIds, regenerateIdsWithReference } from './regenerate_ids';
+import { regenerateIds } from './regenerate_ids';
 import { validateReferences } from './validate_references';
 import { checkConflicts } from './check_conflicts';
 import { checkOriginConflicts } from './check_origin_conflicts';
@@ -70,7 +70,6 @@ describe('#importSavedObjectsFromStream', () => {
       importIdMap: new Map(),
     });
     getMockFn(regenerateIds).mockReturnValue(new Map());
-    getMockFn(regenerateIdsWithReference).mockReturnValue(Promise.resolve(new Map()));
     getMockFn(validateReferences).mockResolvedValue([]);
     getMockFn(checkConflicts).mockResolvedValue({
       errors: [],
@@ -279,15 +278,6 @@ describe('#importSavedObjectsFromStream', () => {
           ]),
         });
         getMockFn(validateReferences).mockResolvedValue([errors[1]]);
-        getMockFn(regenerateIdsWithReference).mockResolvedValue(
-          Promise.resolve(
-            new Map([
-              ['foo', {}],
-              ['bar', {}],
-              ['baz', {}],
-            ])
-          )
-        );
         getMockFn(checkConflicts).mockResolvedValue({
           errors: [errors[2]],
           filteredObjects,

src/core/server/saved_objects/import/import_saved_objects.ts

@@ -38,7 +38,7 @@ import { validateReferences } from './validate_references';
 import { checkOriginConflicts } from './check_origin_conflicts';
 import { createSavedObjects } from './create_saved_objects';
 import { checkConflicts } from './check_conflicts';
-import { regenerateIds, regenerateIdsWithReference } from './regenerate_ids';
+import { regenerateIds } from './regenerate_ids';
 import { checkConflictsForDataSource } from './check_conflict_for_data_source';
 
 /**
@@ -86,17 +86,6 @@ export async function importSavedObjectsFromStream({
     // randomly generated id
     importIdMap = regenerateIds(collectSavedObjectsResult.collectedObjects, dataSourceId);
   } else {
-    // in check conclict and override mode
-
-    if (workspaces) {
-      importIdMap = await regenerateIdsWithReference({
-        savedObjects: collectSavedObjectsResult.collectedObjects,
-        savedObjectsClient,
-        workspaces,
-        objectLimit,
-        importIdMap,
-      });
-    }
     // Check single-namespace objects for conflicts in this namespace, and check multi-namespace objects for conflicts across all namespaces
     const checkConflictsParams = {
       objects: collectSavedObjectsResult.collectedObjects,

src/core/server/saved_objects/import/regenerate_ids.test.ts

@@ -29,10 +29,8 @@
  */
 
 import { mockUuidv4 } from './__mocks__';
-import { regenerateIds, regenerateIdsWithReference } from './regenerate_ids';
+import { regenerateIds } from './regenerate_ids';
 import { SavedObject } from '../types';
-import { savedObjectsClientMock } from '../service/saved_objects_client.mock';
-import { SavedObjectsBulkResponse } from '../service';
 
 describe('#regenerateIds', () => {
   const objects = ([
@@ -70,70 +68,3 @@ describe('#regenerateIds', () => {
     `);
   });
 });
-
-describe('#regenerateIdsWithReference', () => {
-  const objects = ([
-    { type: 'foo', id: '1' },
-    { type: 'bar', id: '2' },
-    { type: 'baz', id: '3' },
-  ] as any) as SavedObject[];
-
-  test('returns expected values', async () => {
-    const mockedSavedObjectsClient = savedObjectsClientMock.create();
-    mockUuidv4.mockReturnValueOnce('uuidv4 #1');
-    const result: SavedObjectsBulkResponse<unknown> = {
-      saved_objects: [
-        {
-          error: {
-            statusCode: 404,
-            error: '',
-            message: '',
-          },
-          id: '1',
-          type: 'foo',
-          attributes: {},
-          references: [],
-        },
-        {
-          id: '2',
-          type: 'bar',
-          attributes: {},
-          references: [],
-          workspaces: ['bar'],
-        },
-        {
-          id: '3',
-          type: 'baz',
-          attributes: {},
-          references: [],
-          workspaces: ['foo'],
-        },
-      ],
-    };
-    mockedSavedObjectsClient.bulkGet.mockResolvedValue(result);
-    expect(
-      await regenerateIdsWithReference({
-        savedObjects: objects,
-        savedObjectsClient: mockedSavedObjectsClient,
-        workspaces: ['bar'],
-        objectLimit: 1000,
-        importIdMap: new Map(),
-      })
-    ).toMatchInlineSnapshot(`
-      Map {
-        "foo:1" => Object {
-          "id": "1",
-          "omitOriginId": true,
-        },
-        "bar:2" => Object {
-          "id": "2",
-          "omitOriginId": false,
-        },
-        "baz:3" => Object {
-          "id": "uuidv4 #1",
-          "omitOriginId": true,
-        },
-      }
-    `);
-  });
-});

src/core/server/saved_objects/import/regenerate_ids.ts

@@ -29,8 +29,7 @@
  */
 
 import { v4 as uuidv4 } from 'uuid';
-import { SavedObject, SavedObjectsClientContract } from '../types';
-import { SavedObjectsUtils } from '../service';
+import { SavedObject } from '../types';
 
 /**
  * Takes an array of saved objects and returns an importIdMap of randomly-generated new IDs.
@@ -48,35 +47,3 @@ export const regenerateIds = (objects: SavedObject[], dataSourceId: string | und
   }, new Map<string, { id: string; omitOriginId?: boolean }>());
   return importIdMap;
 };
-
-export const regenerateIdsWithReference = async (props: {
-  savedObjects: SavedObject[];
-  savedObjectsClient: SavedObjectsClientContract;
-  workspaces: string[];
-  objectLimit: number;
-  importIdMap: Map<string, { id?: string; omitOriginId?: boolean }>;
-}): Promise<Map<string, { id?: string; omitOriginId?: boolean }>> => {
-  const { savedObjects, savedObjectsClient, workspaces, importIdMap } = props;
-
-  const bulkGetResult = await savedObjectsClient.bulkGet(
-    savedObjects.map((item) => ({ type: item.type, id: item.id }))
-  );
-
-  return bulkGetResult.saved_objects.reduce((acc, object) => {
-    if (object.error?.statusCode === 404) {
-      acc.set(`${object.type}:${object.id}`, { id: object.id, omitOriginId: true });
-      return acc;
-    }
-
-    const filteredWorkspaces = SavedObjectsUtils.filterWorkspacesAccordingToBaseWorkspaces(
-      workspaces,
-      object.workspaces
-    );
-    if (filteredWorkspaces.length) {
-      acc.set(`${object.type}:${object.id}`, { id: uuidv4(), omitOriginId: true });
-    } else {
-      acc.set(`${object.type}:${object.id}`, { id: object.id, omitOriginId: false });
-    }
-    return acc;
-  }, importIdMap);
-};

src/core/server/saved_objects/import/types.ts

@@ -29,7 +29,7 @@
  */
 
 import { Readable } from 'stream';
-import { SavedObjectsClientContract, SavedObject } from '../types';
+import { SavedObjectsClientContract, SavedObject, SavedObjectsBaseOptions } from '../types';
 import { ISavedObjectTypeRegistry } from '..';
 
 /**
@@ -190,7 +190,7 @@ export interface SavedObjectsImportOptions {
   dataSourceId?: string;
   dataSourceTitle?: string;
   /** if specified, will import in given workspaces */
-  workspaces?: string[];
+  workspaces?: SavedObjectsBaseOptions['workspaces'];
 }
 
 /**
@@ -215,7 +215,7 @@ export interface SavedObjectsResolveImportErrorsOptions {
   dataSourceId?: string;
   dataSourceTitle?: string;
   /** if specified, will import in given workspaces */
-  workspaces?: string[];
+  workspaces?: SavedObjectsBaseOptions['workspaces'];
 }
 
 export type CreatedObject<T> = SavedObject<T> & { destinationId?: string };