feat: update test

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
ruanyl · Sep 28, 2023 · ba2de2e · ba2de2e
1 parent 7c8b69c
commit ba2de2e
Show file tree

Hide file tree

Showing 25 changed files with 56 additions and 84 deletions.
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/management/opensearch-dashboards/settings');
+    miscUtils.visitPage('app/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/management/opensearch-dashboards/settings');
+    miscUtils.visitPage('app/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/management/opensearch-dashboards/settings');
+    miscUtils.visitPage('app/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/management/opensearch-dashboards/settings');
+    miscUtils.visitPage('app/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/management/opensearch-dashboards/settings');
+    miscUtils.visitPage('app/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/management/opensearch-dashboards/settings"
+          href="/test-123/app/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/management/opensearch-dashboards/settings')}>
+                <a href={basePath.prepend('/app/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/management/opensearch-dashboards/settings')}>
+                <a href={basePath.prepend('/app/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/management/opensearch-dashboards/settings`,
+        path: `/app/settings`,
         uiCapabilitiesPath: 'advancedSettings.show',
       };
     },

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

diff --git a/...cover/public/application/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap b/...cover/public/application/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap
diff --git a/src/plugins/discover/public/application/components/top_nav/open_search_panel.tsx b/src/plugins/discover/public/application/components/top_nav/open_search_panel.tsx
@@ -109,7 +109,7 @@ export function OpenSearchPanel({ onClose, makeUrl }: Props) {
               fill
               onClick={onClose}
               href={addBasePath(
-                `/app/management/opensearch-dashboards/objects?_a=${rison.encode({
+                `/app/objects?_a=${rison.encode({
                   tab: SAVED_OBJECT_TYPE,
                 })}`
               )}

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

diff --git a/...legacy/public/application/components/top_nav/__snapshots__/open_search_panel.test.js.snap b/...legacy/public/application/components/top_nav/__snapshots__/open_search_panel.test.js.snap
diff --git a/src/plugins/discover_legacy/public/application/components/top_nav/open_search_panel.js b/src/plugins/discover_legacy/public/application/components/top_nav/open_search_panel.js
@@ -99,7 +99,7 @@ export function OpenSearchPanel(props) {
               fill
               onClick={props.onClose}
               href={addBasePath(
-                `/app/management/opensearch-dashboards/objects?_a=${rison.encode({
+                `/app/objects?_a=${rison.encode({
                   tab: SEARCH_OBJECT_TYPE,
                 })}`
               )}

diff --git a/src/plugins/home/public/application/components/new_theme_modal.tsx b/src/plugins/home/public/application/components/new_theme_modal.tsx
@@ -56,9 +56,7 @@ export const NewThemeModal: FC<Props> = ({ addBasePath, onClose }) => {
             modes. You or your administrator can change to the previous theme by visiting {advancedSettingsLink}."
               values={{
                 advancedSettingsLink: (
-                  <EuiLink
-                    href={addBasePath('/app/management/opensearch-dashboards/settings#appearance')}
-                  >
+                  <EuiLink href={addBasePath('/app/settings#appearance')}>
                     <FormattedMessage
                       id="home.newThemeModal.previewDescription.advancedSettingsLinkText"
                       defaultMessage="Advanced Settings"

diff --git a/...earch_dashboards_react/public/overview_page/overview_page_footer/overview_page_footer.tsx b/...earch_dashboards_react/public/overview_page/overview_page_footer/overview_page_footer.tsx
@@ -62,7 +62,7 @@ export const OverviewPageFooter: FC<Props> = ({ addBasePath, path }) => {
         <EuiButtonEmpty
           className="osdOverviewPageFooter__button"
           flush="both"
-          href={addBasePath('/app/management/opensearch-dashboards/settings#defaultRoute')}
+          href={addBasePath('/app/settings#defaultRoute')}
           iconType="home"
           size="xs"
         >

diff --git a/src/plugins/opensearch_dashboards_react/public/table_list_view/table_list_view.tsx b/src/plugins/opensearch_dashboards_react/public/table_list_view/table_list_view.tsx
@@ -315,7 +315,7 @@ class TableListView extends React.Component<TableListViewProps, TableListViewSta
                   listingLimitValue: this.props.listingLimit,
                   listingLimitText: <strong>listingLimit</strong>,
                   advancedSettingsLink: (
-                    <EuiLink href="#/management/opensearch-dashboards/settings">
+                    <EuiLink href="#/settings">
                       <FormattedMessage
                         id="opensearch-dashboards-react.tableListView.listing.listingLimitExceeded.advancedSettingsLinkText"
                         defaultMessage="Advanced Settings"

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/...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',
             },
           },
@@ -185,7 +185,7 @@ describe('SavedObjectsTable', () => {
           meta: {
             title: `MySearch`,
             icon: 'search',
-            editUrl: '/management/opensearch-dashboards/objects/savedSearches/2',
+            editUrl: '/objects/savedSearches/2',
             inAppUrl: {
               path: '/discover/2',
               uiCapabilitiesPath: 'discover.show',
@@ -198,7 +198,7 @@ describe('SavedObjectsTable', () => {
           meta: {
             title: `MyDashboard`,
             icon: 'dashboardApp',
-            editUrl: '/management/opensearch-dashboards/objects/savedDashboards/3',
+            editUrl: '/objects/savedDashboards/3',
             inAppUrl: {
               path: '/dashboard/3',
               uiCapabilitiesPath: 'dashboard.show',
@@ -211,7 +211,7 @@ describe('SavedObjectsTable', () => {
           meta: {
             title: `MyViz`,
             icon: 'visualizeApp',
-            editUrl: '/management/opensearch-dashboards/objects/savedVisualizations/4',
+            editUrl: '/objects/savedVisualizations/4',
             inAppUrl: {
               path: '/edit/4',
               uiCapabilitiesPath: 'visualize.show',
@@ -460,7 +460,7 @@ describe('SavedObjectsTable', () => {
         meta: {
           title: `MySearch`,
           icon: 'search',
-          editUrl: '/management/opensearch-dashboards/objects/savedSearches/2',
+          editUrl: '/objects/savedSearches/2',
           inAppUrl: {
             path: '/discover/2',
             uiCapabilitiesPath: 'discover.show',
@@ -475,7 +475,7 @@ describe('SavedObjectsTable', () => {
         type: 'search',
         meta: {
           title: 'MySearch',
-          editUrl: '/management/opensearch-dashboards/objects/savedSearches/2',
+          editUrl: '/objects/savedSearches/2',
           icon: 'search',
           inAppUrl: {
             path: '/discover/2',

diff --git a/src/plugins/vis_augmenter/server/saved_objects/augment_vis.ts b/src/plugins/vis_augmenter/server/saved_objects/augment_vis.ts
@@ -15,9 +15,7 @@ export const augmentVisSavedObjectType: SavedObjectsType = {
       return `augment-vis-${obj?.attributes?.originPlugin}`;
     },
     getEditUrl(obj) {
-      return `/management/opensearch-dashboards/objects/savedAugmentVis/${encodeURIComponent(
-        obj.id
-      )}`;
+      return `/objects/savedAugmentVis/${encodeURIComponent(obj.id)}`;
     },
   },
   mappings: {

diff --git a/src/plugins/vis_builder/server/saved_objects/vis_builder_app.ts b/src/plugins/vis_builder/server/saved_objects/vis_builder_app.ts
@@ -20,8 +20,7 @@ export const visBuilderSavedObjectType: SavedObjectsType = {
     defaultSearchField: 'title',
     importableAndExportable: true,
     getTitle: ({ attributes: { title } }: SavedObject<VisBuilderSavedObjectAttributes>) => title,
-    getEditUrl: ({ id }: SavedObject) =>
-      `/management/opensearch-dashboards/objects/savedVisBuilder/${encodeURIComponent(id)}`,
+    getEditUrl: ({ id }: SavedObject) => `/objects/savedVisBuilder/${encodeURIComponent(id)}`,
     getInAppUrl({ id }: SavedObject) {
       return {
         path: `/app/${PLUGIN_ID}${EDIT_PATH}/${encodeURIComponent(id)}`,

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