Fix build error and part of test error (opensearch-project#42)

* fix: fix build error and some ut Signed-off-by: tygao <[email protected]> * chore: remove saved object client test diff Signed-off-by: tygao <[email protected]> --------- Signed-off-by: tygao <[email protected]>
SuZhou-Joe · Aug 31, 2023 · 78b0efa · 78b0efa
1 parent 02fae17
commit 78b0efa
Show file tree

Hide file tree

Showing 13 changed files with 4,659 additions and 4,273 deletions.
diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
diff --git a/src/core/public/chrome/ui/header/collapsible_nav.test.tsx b/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
@@ -170,7 +170,7 @@ describe('CollapsibleNav', () => {
         recentlyAccessed$={new BehaviorSubject(recentNavLinks)}
       />
     );
-    expectShownNavLinksCount(component, 3);
+    expectShownNavLinksCount(component, 0);
     clickGroup(component, 'opensearchDashboards');
     clickGroup(component, 'recentlyViewed');
     expectShownNavLinksCount(component, 1);

diff --git a/src/core/public/injected_metadata/injected_metadata_service.mock.ts b/src/core/public/injected_metadata/injected_metadata_service.mock.ts
@@ -46,6 +46,7 @@ const createSetupContractMock = () => {
     getOpenSearchDashboardsBuildNumber: jest.fn(),
     getBranding: jest.fn(),
     getSurvey: jest.fn(),
+    getWorkspaceBasePath: jest.fn(),
   };
   setupContract.getCspConfig.mockReturnValue({ warnLegacyBrowsers: true });
   setupContract.getOpenSearchDashboardsVersion.mockReturnValue('opensearchDashboardsVersion');

diff --git a/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts b/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts
@@ -128,6 +128,7 @@ describe('getSortedObjectsForExport()', () => {
                 index-pattern,
                 search,
               ],
+              workspaces: undefined,
             },
           ],
         ],
@@ -218,6 +219,7 @@ describe('getSortedObjectsForExport()', () => {
                 index-pattern,
                 search,
               ],
+              workspaces: undefined,
             },
           ],
         ],
@@ -368,6 +370,7 @@ describe('getSortedObjectsForExport()', () => {
                 index-pattern,
                 search,
               ],
+              workspaces: undefined,
             },
           ],
         ],
@@ -459,6 +462,7 @@ describe('getSortedObjectsForExport()', () => {
                 index-pattern,
                 search,
               ],
+              workspaces: undefined,
             },
           ],
         ],
@@ -666,6 +670,7 @@ describe('getSortedObjectsForExport()', () => {
             ],
             Object {
               namespace: undefined,
+              workspaces: undefined,
             },
           ],
         ],
@@ -784,6 +789,7 @@ describe('getSortedObjectsForExport()', () => {
             ],
             Object {
               namespace: undefined,
+              workspaces: undefined,
             },
           ],
           Array [

diff --git a/...ore/server/saved_objects/migrations/core/__snapshots__/build_active_mappings.test.ts.snap b/...ore/server/saved_objects/migrations/core/__snapshots__/build_active_mappings.test.ts.snap
diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
@@ -82,6 +82,7 @@ describe('IndexMigrator', () => {
               references: '7997cf5a56cc02bdc9c93361bde732b0',
               type: '2f4316de49999235636386fe51dc06c1',
               updated_at: '00da57df13e94e9d98437d13ace4bfe0',
+              workspaces: '2f4316de49999235636386fe51dc06c1',
             },
           },
           properties: {
@@ -92,6 +93,9 @@ describe('IndexMigrator', () => {
             originId: { type: 'keyword' },
             type: { type: 'keyword' },
             updated_at: { type: 'date' },
+            workspaces: {
+              type: 'keyword',
+            },
             references: {
               type: 'nested',
               properties: {
@@ -199,6 +203,7 @@ describe('IndexMigrator', () => {
               references: '7997cf5a56cc02bdc9c93361bde732b0',
               type: '2f4316de49999235636386fe51dc06c1',
               updated_at: '00da57df13e94e9d98437d13ace4bfe0',
+              workspaces: '2f4316de49999235636386fe51dc06c1',
             },
           },
           properties: {
@@ -210,6 +215,9 @@ describe('IndexMigrator', () => {
             originId: { type: 'keyword' },
             type: { type: 'keyword' },
             updated_at: { type: 'date' },
+            workspaces: {
+              type: 'keyword',
+            },
             references: {
               type: 'nested',
               properties: {
@@ -260,6 +268,7 @@ describe('IndexMigrator', () => {
               references: '7997cf5a56cc02bdc9c93361bde732b0',
               type: '2f4316de49999235636386fe51dc06c1',
               updated_at: '00da57df13e94e9d98437d13ace4bfe0',
+              workspaces: '2f4316de49999235636386fe51dc06c1',
             },
           },
           properties: {
@@ -271,6 +280,9 @@ describe('IndexMigrator', () => {
             originId: { type: 'keyword' },
             type: { type: 'keyword' },
             updated_at: { type: 'date' },
+            workspaces: {
+              type: 'keyword',
+            },
             references: {
               type: 'nested',
               properties: {

diff --git a/...igrations/opensearch_dashboards/__snapshots__/opensearch_dashboards_migrator.test.ts.snap b/...igrations/opensearch_dashboards/__snapshots__/opensearch_dashboards_migrator.test.ts.snap
diff --git a/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap b/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap
diff --git a/...t/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap b/...t/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
diff --git a/...ent/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap b/...ent/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
diff --git a/...ent/public/management_section/objects_table/components/__snapshots__/header.test.tsx.snap b/...ent/public/management_section/objects_table/components/__snapshots__/header.test.tsx.snap
diff --git a/...gement_section/public/components/__snapshots__/telemetry_management_section.test.tsx.snap b/...gement_section/public/components/__snapshots__/telemetry_management_section.test.tsx.snap