move index pattern to Library (opensearch-project#91)

* move index pattern to libaray Signed-off-by: Hailong Cui <[email protected]> * Remove it from Dashboards management when workspace is on Signed-off-by: Hailong Cui <[email protected]> --------- Signed-off-by: Hailong Cui <[email protected]> index pattern always show under library Signed-off-by: Hailong Cui <[email protected]>
Hailong-am · Sep 28, 2023 · 8a32ab5 · 8a32ab5
1 parent 5bc2ddf
commit 8a32ab5
Show file tree

Hide file tree

Showing 18 changed files with 105 additions and 85 deletions.
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -418,11 +418,7 @@ export class IndexPatternsService {
     );
 
     if (!savedObject.version) {
-      throw new SavedObjectNotFound(
-        savedObjectType,
-        id,
-        'management/opensearch-dashboards/indexPatterns'
-      );
+      throw new SavedObjectNotFound(savedObjectType, id, 'indexPatterns');
     }
 
     const spec = this.savedObjectToSpec(savedObject);

diff --git a/src/plugins/data/public/index_patterns/index_patterns/redirect_no_index_pattern.tsx b/src/plugins/data/public/index_patterns/index_patterns/redirect_no_index_pattern.tsx
@@ -42,9 +42,7 @@ export const onRedirectNoIndexPattern = (
   overlays: CoreStart['overlays']
 ) => () => {
   const canManageIndexPatterns = capabilities.management.opensearchDashboards.indexPatterns;
-  const redirectTarget = canManageIndexPatterns
-    ? '/management/opensearch-dashboards/indexPatterns'
-    : '/home';
+  const redirectTarget = canManageIndexPatterns ? '/indexPatterns' : '/home';
   let timeoutId: NodeJS.Timeout | undefined;
 
   if (timeoutId) {
@@ -72,8 +70,8 @@ export const onRedirectNoIndexPattern = (
   if (redirectTarget === '/home') {
     navigateToApp('home');
   } else {
-    navigateToApp('management', {
-      path: `/opensearch-dashboards/indexPatterns?bannerMessage=${bannerMessage}`,
+    navigateToApp('indexPatterns', {
+      path: `?bannerMessage=${bannerMessage}`,
     });
   }
 

diff --git a/src/plugins/data/public/search/errors/painless_error.tsx b/src/plugins/data/public/search/errors/painless_error.tsx
@@ -53,9 +53,7 @@ export class PainlessError extends OsdError {
 
   public getErrorMessage(application: ApplicationStart) {
     function onClick() {
-      application.navigateToApp('management', {
-        path: `/opensearch-dashboards/indexPatterns`,
-      });
+      application.navigateToApp('indexPatterns');
     }
 
     return (

diff --git a/src/plugins/data/server/saved_objects/index_patterns.ts b/src/plugins/data/server/saved_objects/index_patterns.ts
@@ -43,15 +43,11 @@ export const indexPatternSavedObjectType: SavedObjectsType = {
       return obj.attributes.title;
     },
     getEditUrl(obj) {
-      return `/management/opensearch-dashboards/indexPatterns/patterns/${encodeURIComponent(
-        obj.id
-      )}`;
+      return `/indexPatterns/patterns/${encodeURIComponent(obj.id)}`;
     },
     getInAppUrl(obj) {
       return {
-        path: `/app/management/opensearch-dashboards/indexPatterns/patterns/${encodeURIComponent(
-          obj.id
-        )}`,
+        path: `/app/indexPatterns/patterns/${encodeURIComponent(obj.id)}`,
         uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns',
       };
     },

diff --git a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx
@@ -36,6 +36,7 @@ import { i18n } from '@osd/i18n';
 import { I18nProvider } from '@osd/i18n/react';
 import { StartServicesAccessor } from 'src/core/public';
 
+import { EuiPage, EuiPageBody } from '@elastic/eui';
 import { OpenSearchDashboardsContextProvider } from '../../../opensearch_dashboards_react/public';
 import { ManagementAppMountParams } from '../../../management/public';
 import {
@@ -90,26 +91,34 @@ export async function mountManagementSection(
     dataSourceEnabled,
   };
 
+  const router = (
+    <Router history={params.history}>
+      <Switch>
+        <Route path={['/create']}>
+          <CreateIndexPatternWizardWithRouter />
+        </Route>
+        <Route path={['/patterns/:id/field/:fieldName', '/patterns/:id/create-field/']}>
+          <CreateEditFieldContainer />
+        </Route>
+        <Route path={['/patterns/:id']}>
+          <EditIndexPatternContainer />
+        </Route>
+        <Route path={['/']}>
+          <IndexPatternTableWithRouter canSave={canSave} />
+        </Route>
+      </Switch>
+    </Router>
+  );
+
+  const content = (
+    <EuiPage restrictWidth="1200px">
+      <EuiPageBody component="main">{router}</EuiPageBody>
+    </EuiPage>
+  );
+
   ReactDOM.render(
     <OpenSearchDashboardsContextProvider services={deps}>
-      <I18nProvider>
-        <Router history={params.history}>
-          <Switch>
-            <Route path={['/create']}>
-              <CreateIndexPatternWizardWithRouter />
-            </Route>
-            <Route path={['/patterns/:id/field/:fieldName', '/patterns/:id/create-field/']}>
-              <CreateEditFieldContainer />
-            </Route>
-            <Route path={['/patterns/:id']}>
-              <EditIndexPatternContainer />
-            </Route>
-            <Route path={['/']}>
-              <IndexPatternTableWithRouter canSave={canSave} />
-            </Route>
-          </Switch>
-        </Router>
-      </I18nProvider>
+      <I18nProvider>{content}</I18nProvider>
     </OpenSearchDashboardsContextProvider>,
     params.element
   );

diff --git a/src/plugins/index_pattern_management/public/plugin.ts b/src/plugins/index_pattern_management/public/plugin.ts
@@ -29,7 +29,15 @@
  */
 
 import { i18n } from '@osd/i18n';
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import {
+  PluginInitializerContext,
+  CoreSetup,
+  CoreStart,
+  Plugin,
+  AppMountParameters,
+  ChromeBreadcrumb,
+  ScopedHistory,
+} from 'src/core/public';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { DataSourcePluginStart } from 'src/plugins/data_source/public';
 import { UrlForwardingSetup } from '../../url_forwarding/public';
@@ -39,7 +47,9 @@ import {
   IndexPatternManagementServiceStart,
 } from './service';
 
-import { ManagementSetup } from '../../management/public';
+import { ManagementAppMountParams, ManagementSetup } from '../../management/public';
+import { DEFAULT_APP_CATEGORIES } from '../../../core/public';
+import { reactRouterNavigate } from '../../opensearch_dashboards_react/public';
 
 export interface IndexPatternManagementSetupDependencies {
   management: ManagementSetup;
@@ -83,7 +93,7 @@ export class IndexPatternManagementPlugin
       throw new Error('`opensearchDashboards` management section not found.');
     }
 
-    const newAppPath = `management/opensearch-dashboards/${IPM_APP_ID}`;
+    const newAppPath = IPM_APP_ID;
     const legacyPatternsPath = 'management/opensearch-dashboards/index_patterns';
 
     urlForwarding.forwardApp(
@@ -96,14 +106,39 @@ export class IndexPatternManagementPlugin
       return pathInApp && `/patterns${pathInApp}`;
     });
 
-    opensearchDashboardsSection.registerApp({
+    // register it under Library
+    core.application.register({
       id: IPM_APP_ID,
       title: sectionsHeader,
-      order: 0,
-      mount: async (params) => {
+      order: 8100,
+      category: DEFAULT_APP_CATEGORIES.opensearchDashboards,
+      mount: async (params: AppMountParameters) => {
         const { mountManagementSection } = await import('./management_app');
 
-        return mountManagementSection(core.getStartServices, params, () =>
+        const [coreStart] = await core.getStartServices();
+
+        const setBreadcrumbsScope = (
+          crumbs: ChromeBreadcrumb[] = [],
+          appHistory?: ScopedHistory
+        ) => {
+          const wrapBreadcrumb = (item: ChromeBreadcrumb, scopedHistory: ScopedHistory) => ({
+            ...item,
+            ...(item.href ? reactRouterNavigate(scopedHistory, item.href) : {}),
+          });
+
+          coreStart.chrome.setBreadcrumbs([
+            ...crumbs.map((item) => wrapBreadcrumb(item, appHistory || params.history)),
+          ]);
+        };
+
+        const managementParams: ManagementAppMountParams = {
+          element: params.element,
+          history: params.history,
+          setBreadcrumbs: setBreadcrumbsScope,
+          basePath: params.appBasePath,
+        };
+
+        return mountManagementSection(core.getStartServices, managementParams, () =>
           this.indexPatternManagementService.environmentService.getEnvironment().ml()
         );
       },

diff --git a/...ds_overview/public/components/getting_started/__snapshots__/getting_started.test.tsx.snap b/...ds_overview/public/components/getting_started/__snapshots__/getting_started.test.tsx.snap
diff --git a/...gins/opensearch_dashboards_overview/public/components/getting_started/getting_started.tsx b/...gins/opensearch_dashboards_overview/public/components/getting_started/getting_started.tsx
@@ -114,11 +114,7 @@ export const GettingStarted: FC<Props> = ({ addBasePath, isDarkTheme, apps }) =>
             <EuiSpacer size="xl" />
 
             <RedirectAppLinks application={application}>
-              <EuiButton
-                fill
-                iconType="indexOpen"
-                href={addBasePath('/app/management/opensearch-dashboards/indexPatterns')}
-              >
+              <EuiButton fill iconType="indexOpen" href={addBasePath('/app/indexPatterns')}>
                 <FormattedMessage
                   defaultMessage="Add your data"
                   id="opensearchDashboardsOverview.gettingStarted.addDataButtonLabel"

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/...lic/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap b/...lic/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
diff --git a/...ment/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap b/...ment/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
diff --git a/...ects_management/public/management_section/objects_table/components/relationships.test.tsx b/...ects_management/public/management_section/objects_table/components/relationships.test.tsx
@@ -85,9 +85,9 @@ describe('Relationships', () => {
         meta: {
           title: 'MyIndexPattern*',
           icon: 'indexPatternApp',
-          editUrl: '#/management/opensearch-dashboards/indexPatterns/patterns/1',
+          editUrl: '#/indexPatterns/patterns/1',
           inAppUrl: {
-            path: '/management/opensearch-dashboards/indexPatterns/patterns/1',
+            path: '/indexPatterns/patterns/1',
             uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns',
           },
         },
@@ -120,10 +120,10 @@ describe('Relationships', () => {
           id: '1',
           relationship: 'child',
           meta: {
-            editUrl: '/management/opensearch-dashboards/indexPatterns/patterns/1',
+            editUrl: '/indexPatterns/patterns/1',
             icon: 'indexPatternApp',
             inAppUrl: {
-              path: '/app/management/opensearch-dashboards/indexPatterns/patterns/1',
+              path: '/app/indexPatterns/patterns/1',
               uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns',
             },
             title: 'My Index Pattern',

diff --git a/...aved_objects_management/public/management_section/objects_table/components/table.test.tsx b/...aved_objects_management/public/management_section/objects_table/components/table.test.tsx
@@ -51,9 +51,9 @@ const defaultProps: TableProps = {
       meta: {
         title: `MyIndexPattern*`,
         icon: 'indexPatternApp',
-        editUrl: '#/management/opensearch-dashboards/indexPatterns/patterns/1',
+        editUrl: '#/indexPatterns/patterns/1',
         inAppUrl: {
-          path: '/management/opensearch-dashboards/indexPatterns/patterns/1',
+          path: '/indexPatterns/patterns/1',
           uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns',
         },
       },
@@ -91,9 +91,9 @@ const defaultProps: TableProps = {
       meta: {
         title: `MyIndexPattern*`,
         icon: 'indexPatternApp',
-        editUrl: '#/management/opensearch-dashboards/indexPatterns/patterns/1',
+        editUrl: '#/indexPatterns/patterns/1',
         inAppUrl: {
-          path: '/management/opensearch-dashboards/indexPatterns/patterns/1',
+          path: '/indexPatterns/patterns/1',
           uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns',
         },
       },

diff --git a/...d_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx b/...d_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
@@ -172,9 +172,9 @@ describe('SavedObjectsTable', () => {
           meta: {
             title: `MyIndexPattern*`,
             icon: 'indexPatternApp',
-            editUrl: '#/management/opensearch-dashboards/indexPatterns/patterns/1',
+            editUrl: '#/indexPatterns/patterns/1',
             inAppUrl: {
-              path: '/management/opensearch-dashboards/indexPatterns/patterns/1',
+              path: '/indexPatterns/patterns/1',
               uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns',
             },
           },

diff --git a/.../saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx b/.../saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
@@ -543,9 +543,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
       return null;
     }
     const { applications } = this.props;
-    const newIndexPatternUrl = applications.getUrlForApp('management', {
-      path: 'opensearch-dashboards/indexPatterns',
-    });
+    const newIndexPatternUrl = applications.getUrlForApp('indexPatterns');
 
     return (
       <Flyout

diff --git a/test/api_integration/apis/saved_objects_management/find.ts b/test/api_integration/apis/saved_objects_management/find.ts
@@ -305,11 +305,9 @@ export default function ({ getService }: FtrProviderContext) {
             expect(resp.body.saved_objects[0].meta).to.eql({
               icon: 'indexPatternApp',
               title: 'saved_objects*',
-              editUrl:
-                '/management/opensearch-dashboards/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357',
+              editUrl: '/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357',
               inAppUrl: {
-                path:
-                  '/app/management/opensearch-dashboards/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357',
+                path: '/app/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns',
               },
               namespaceType: 'single',