revert Register Advance Settings, Data Source management,Index Patter…

…n management and SavedObject management as standalone app, retire dashboard management (opensearch-project#283) * Revert "Register Advance Settings, Data Source management,Index Pattern management and SavedObject management as standalone app, retire dashboard management (opensearch-project#208)" This reverts commit 5f09f84. * Revert "feat: add unit test for mountWrapper (opensearch-project#223)" This reverts commit a70ce71. * Revert "fix: cypress tests checkout workspace branch (opensearch-project#252)" This reverts commit 734c890. * run cypress with ftr main Signed-off-by: Yulong Ruan <ruanyl@amazon.com> --------- Signed-off-by: Yulong Ruan <ruanyl@amazon.com>
SuZhou-Joe · Mar 18, 2024 · fbe1039 · fbe1039
1 parent e0c9e87
commit fbe1039
Show file tree

Hide file tree

Showing 79 changed files with 360 additions and 633 deletions.
diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml
@@ -3,7 +3,7 @@ name: Run cypress tests
 # trigger on every PR for all branches
 on:
   pull_request:
-    branches: ['**']
+    branches: [ '**' ]
     paths-ignore:
       - '**/*.md'
   workflow_dispatch:
@@ -28,7 +28,7 @@ on:
 
 env:
   TEST_REPO: ${{ inputs.test_repo != '' && inputs.test_repo || 'opensearch-project/opensearch-dashboards-functional-test' }}
-  TEST_BRANCH: "${{ inputs.test_branch != '' && inputs.test_branch || 'workspace' }}"
+  TEST_BRANCH: "${{ inputs.test_branch != '' && inputs.test_branch || 'main' }}"
   FTR_PATH: 'ftr'
   START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true'
   OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot -E cluster.routing.allocation.disk.threshold_enabled=false'
@@ -243,7 +243,7 @@ jobs:
         with:
           issue-number: ${{ inputs.pr_number }}
           comment-author: 'github-actions[bot]'
-          body-includes: '${{ env.COMMENT_TAG }}'
+          body-includes: "${{ env.COMMENT_TAG }}"
 
       - name: Add comment on the PR
         uses: peter-evans/create-or-update-comment@v3

diff --git a/cypress/integration/with-security/check_advanced_settings.js b/cypress/integration/with-security/check_advanced_settings.js
@@ -13,7 +13,7 @@ const loginPage = new LoginPage(cy);
 
 describe('verify the advanced settings are saved', () => {
   beforeEach(() => {
-    miscUtils.visitPage('app/settings');
+    miscUtils.visitPage('app/management/opensearch-dashboards/settings');
     loginPage.enterUserName('admin');
     loginPage.enterPassword('admin');
     loginPage.submit();

diff --git a/cypress/integration/with-security/helpers/generate_data.js b/cypress/integration/with-security/helpers/generate_data.js
@@ -13,7 +13,7 @@ const loginPage = new LoginPage(cy);
 
 describe('Generating BWC test data with security', () => {
   beforeEach(() => {
-    miscUtils.visitPage('app/settings');
+    miscUtils.visitPage('app/management/opensearch-dashboards/settings');
     loginPage.enterUserName('admin');
     loginPage.enterPassword('admin');
     loginPage.submit();
@@ -29,7 +29,7 @@ describe('Generating BWC test data with security', () => {
   });
 
   it('adds advanced settings', () => {
-    miscUtils.visitPage('app/settings');
+    miscUtils.visitPage('app/management/opensearch-dashboards/settings');
     cy.get('[data-test-subj="advancedSetting-editField-theme:darkMode"]').click();
     cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').type(
       '{selectAll}4'

diff --git a/cypress/integration/without-security/check_advanced_settings.js b/cypress/integration/without-security/check_advanced_settings.js
@@ -9,7 +9,7 @@ const miscUtils = new MiscUtils(cy);
 
 describe('verify the advanced settings are saved', () => {
   beforeEach(() => {
-    miscUtils.visitPage('app/settings');
+    miscUtils.visitPage('app/management/opensearch-dashboards/settings');
   });
 
   it('the dark mode is on', () => {

diff --git a/cypress/integration/without-security/helpers/generate_data.js b/cypress/integration/without-security/helpers/generate_data.js
@@ -12,7 +12,7 @@ describe('Generating BWC test data without security', () => {
     miscUtils.visitPage('app');
   });
   it('adds advanced settings', () => {
-    miscUtils.visitPage('app/settings');
+    miscUtils.visitPage('app/management/opensearch-dashboards/settings');
     cy.get('[data-test-subj="advancedSetting-editField-theme:darkMode"]').click();
     cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').type(
       '{selectAll}4'

diff --git a/src/core/public/core_app/errors/url_overflow.test.ts b/src/core/public/core_app/errors/url_overflow.test.ts
@@ -102,7 +102,7 @@ describe('url overflow detection', () => {
         </code>
          option in 
         <a
-          href="/test-123/app/settings"
+          href="/test-123/app/management/opensearch-dashboards/settings"
         >
           advanced settings
         </a>

diff --git a/src/core/public/core_app/errors/url_overflow.tsx b/src/core/public/core_app/errors/url_overflow.tsx
@@ -92,7 +92,7 @@ export const setupUrlOverflowDetection = ({ basePath, history, toasts, uiSetting
             values={{
               storeInSessionStorageParam: <code>state:storeInSessionStorage</code>,
               advancedSettingsLink: (
-                <a href={basePath.prepend('/app/settings')}>
+                <a href={basePath.prepend('/app/management/opensearch-dashboards/settings')}>
                   <FormattedMessage
                     id="core.ui.errorUrlOverflow.bigUrlWarningNotificationMessage.advancedSettingsLinkText"
                     defaultMessage="advanced settings"

diff --git a/src/core/public/core_app/errors/url_overflow_ui.tsx b/src/core/public/core_app/errors/url_overflow_ui.tsx
@@ -54,7 +54,7 @@ export const UrlOverflowUi: React.FC<{ basePath: IBasePath }> = ({ basePath }) =
             values={{
               storeInSessionStorageConfig: <code>state:storeInSessionStorage</code>,
               opensearchDashboardsSettingsLink: (
-                <a href={basePath.prepend('/app/settings')}>
+                <a href={basePath.prepend('/app/management/opensearch-dashboards/settings')}>
                   <FormattedMessage
                     id="core.ui.errorUrlOverflow.optionsToFixError.enableOptionText.advancedSettingsLinkText"
                     defaultMessage="Advanced Settings"

diff --git a/src/core/server/ui_settings/saved_objects/ui_settings.ts b/src/core/server/ui_settings/saved_objects/ui_settings.ts
@@ -47,7 +47,7 @@ export const uiSettingsType: SavedObjectsType = {
     importableAndExportable: true,
     getInAppUrl() {
       return {
-        path: `/app/settings`,
+        path: `/app/management/opensearch-dashboards/settings`,
         uiCapabilitiesPath: 'advancedSettings.show',
       };
     },

diff --git a/...gs/public/management_app/components/page_wrapper/__snapshots__/page_wrapper.test.tsx.snap b/...gs/public/management_app/components/page_wrapper/__snapshots__/page_wrapper.test.tsx.snap
diff --git a/src/plugins/advanced_settings/public/management_app/components/page_wrapper/index.ts b/src/plugins/advanced_settings/public/management_app/components/page_wrapper/index.ts
diff --git a/...ins/advanced_settings/public/management_app/components/page_wrapper/page_wrapper.test.tsx b/...ins/advanced_settings/public/management_app/components/page_wrapper/page_wrapper.test.tsx
diff --git a/src/plugins/advanced_settings/public/management_app/components/page_wrapper/page_wrapper.tsx b/src/plugins/advanced_settings/public/management_app/components/page_wrapper/page_wrapper.tsx
diff --git a/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx b/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx
@@ -34,24 +34,18 @@ import { Router, Switch, Route } from 'react-router-dom';
 
 import { i18n } from '@osd/i18n';
 import { I18nProvider } from '@osd/i18n/react';
-import {
-  AppMountParameters,
-  ChromeBreadcrumb,
-  ScopedHistory,
-  StartServicesAccessor,
-} from 'src/core/public';
+import { StartServicesAccessor } from 'src/core/public';
 
 import { AdvancedSettings } from './advanced_settings';
+import { ManagementAppMountParams } from '../../../management/public';
 import { ComponentRegistry } from '../types';
-import { reactRouterNavigate } from '../../../opensearch_dashboards_react/public';
-import { PageWrapper } from './components/page_wrapper';
 
 import './index.scss';
 
 const title = i18n.translate('advancedSettings.advancedSettingsLabel', {
   defaultMessage: 'Advanced settings',
 });
-const crumb: ChromeBreadcrumb[] = [{ text: title }];
+const crumb = [{ text: title }];
 
 const readOnlyBadge = {
   text: i18n.translate('advancedSettings.badge.readOnly.text', {
@@ -63,18 +57,13 @@ const readOnlyBadge = {
   iconType: 'glasses',
 };
 
-export async function mountAdvancedSettingsManagementSection(
+export async function mountManagementSection(
   getStartServices: StartServicesAccessor,
-  params: AppMountParameters,
+  params: ManagementAppMountParams,
   componentRegistry: ComponentRegistry['start']
 ) {
+  params.setBreadcrumbs(crumb);
   const [{ uiSettings, notifications, docLinks, application, chrome }] = await getStartServices();
-  chrome.setBreadcrumbs([
-    ...crumb.map((item) => ({
-      ...item,
-      ...(item.href ? reactRouterNavigate(params.history, item.href) : {}),
-    })),
-  ]);
 
   const canSave = application.capabilities.advancedSettings.save as boolean;
 
@@ -83,23 +72,21 @@ export async function mountAdvancedSettingsManagementSection(
   }
 
   ReactDOM.render(
-    <PageWrapper>
-      <I18nProvider>
-        <Router history={params.history}>
-          <Switch>
-            <Route path={['/:query', '/']}>
-              <AdvancedSettings
-                enableSaving={canSave}
-                toasts={notifications.toasts}
-                dockLinks={docLinks.links}
-                uiSettings={uiSettings}
-                componentRegistry={componentRegistry}
-              />
-            </Route>
-          </Switch>
-        </Router>
-      </I18nProvider>
-    </PageWrapper>,
+    <I18nProvider>
+      <Router history={params.history}>
+        <Switch>
+          <Route path={['/:query', '/']}>
+            <AdvancedSettings
+              enableSaving={canSave}
+              toasts={notifications.toasts}
+              dockLinks={docLinks.links}
+              uiSettings={uiSettings}
+              componentRegistry={componentRegistry}
+            />
+          </Route>
+        </Switch>
+      </Router>
+    </I18nProvider>,
     params.element
   );
   return () => {

diff --git a/src/plugins/advanced_settings/public/plugin.ts b/src/plugins/advanced_settings/public/plugin.ts
@@ -29,11 +29,10 @@
  */
 
 import { i18n } from '@osd/i18n';
-import { AppMountParameters, CoreSetup, Plugin } from 'opensearch-dashboards/public';
+import { CoreSetup, Plugin } from 'opensearch-dashboards/public';
 import { FeatureCatalogueCategory } from '../../home/public';
 import { ComponentRegistry } from './component_registry';
 import { AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup } from './types';
-import { DEFAULT_APP_CATEGORIES } from '../../../core/public';
 
 const component = new ComponentRegistry();
 
@@ -43,21 +42,18 @@ const title = i18n.translate('advancedSettings.advancedSettingsLabel', {
 
 export class AdvancedSettingsPlugin
   implements Plugin<AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup> {
-  public setup(core: CoreSetup, { home }: AdvancedSettingsPluginSetup) {
-    core.application.register({
+  public setup(core: CoreSetup, { management, home }: AdvancedSettingsPluginSetup) {
+    const opensearchDashboardsSection = management.sections.section.opensearchDashboards;
+
+    opensearchDashboardsSection.registerApp({
       id: 'settings',
       title,
-      order: 99,
-      category: DEFAULT_APP_CATEGORIES.management,
-      async mount(params: AppMountParameters) {
-        const { mountAdvancedSettingsManagementSection } = await import(
+      order: 3,
+      async mount(params) {
+        const { mountManagementSection } = await import(
           './management_app/mount_management_section'
         );
-        return mountAdvancedSettingsManagementSection(
-          core.getStartServices,
-          params,
-          component.start
-        );
+        return mountManagementSection(core.getStartServices, params, component.start);
       },
     });
 
@@ -70,7 +66,7 @@ export class AdvancedSettingsPlugin
             'Customize your OpenSearch Dashboards experience — change the date format, turn on dark mode, and more.',
         }),
         icon: 'gear',
-        path: '/app/settings',
+        path: '/app/management/opensearch-dashboards/settings',
         showOnHomePage: false,
         category: FeatureCatalogueCategory.ADMIN,
       });

diff --git a/src/plugins/dashboard/server/saved_objects/dashboard.ts b/src/plugins/dashboard/server/saved_objects/dashboard.ts
@@ -43,7 +43,9 @@ export const dashboardSavedObjectType: SavedObjectsType = {
       return obj.attributes.title;
     },
     getEditUrl(obj) {
-      return `/objects/savedDashboards/${encodeURIComponent(obj.id)}`;
+      return `/management/opensearch-dashboards/objects/savedDashboards/${encodeURIComponent(
+        obj.id
+      )}`;
     },
     getInAppUrl(obj) {
       return {

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,7 +418,11 @@ export class IndexPatternsService {
     );
 
     if (!savedObject.version) {
-      throw new SavedObjectNotFound(savedObjectType, id, 'indexPatterns');
+      throw new SavedObjectNotFound(
+        savedObjectType,
+        id,
+        'management/opensearch-dashboards/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,7 +42,9 @@ export const onRedirectNoIndexPattern = (
   overlays: CoreStart['overlays']
 ) => () => {
   const canManageIndexPatterns = capabilities.management.opensearchDashboards.indexPatterns;
-  const redirectTarget = canManageIndexPatterns ? '/indexPatterns' : '/home';
+  const redirectTarget = canManageIndexPatterns
+    ? '/management/opensearch-dashboards/indexPatterns'
+    : '/home';
   let timeoutId: NodeJS.Timeout | undefined;
 
   if (timeoutId) {
@@ -70,8 +72,8 @@ export const onRedirectNoIndexPattern = (
   if (redirectTarget === '/home') {
     navigateToApp('home');
   } else {
-    navigateToApp('indexPatterns', {
-      path: `?bannerMessage=${bannerMessage}`,
+    navigateToApp('management', {
+      path: `/opensearch-dashboards/indexPatterns?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,7 +53,9 @@ export class PainlessError extends OsdError {
 
   public getErrorMessage(application: ApplicationStart) {
     function onClick() {
-      application.navigateToApp('indexPatterns');
+      application.navigateToApp('management', {
+        path: `/opensearch-dashboards/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,11 +43,15 @@ export const indexPatternSavedObjectType: SavedObjectsType = {
       return obj.attributes.title;
     },
     getEditUrl(obj) {
-      return `/indexPatterns/patterns/${encodeURIComponent(obj.id)}`;
+      return `/management/opensearch-dashboards/indexPatterns/patterns/${encodeURIComponent(
+        obj.id
+      )}`;
     },
     getInAppUrl(obj) {
       return {
-        path: `/app/indexPatterns/patterns/${encodeURIComponent(obj.id)}`,
+        path: `/app/management/opensearch-dashboards/indexPatterns/patterns/${encodeURIComponent(
+          obj.id
+        )}`,
         uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns',
       };
     },

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