[Dashboard listing] update edit url and view url (#416)

* [Dashboard listing] update edit url and view url Update to include BASE_URL if basePath is defined. Since create url is just a direct nav and needs the basePath when passing props to the provider, the source code no longer appends the basePath to keep these URLs consistent. A feature should consolidate the basePaths in the dashboard listing service so that createUrl also adds the base path. At which point we no longer need the base path. Also removed some rogue URLs. Core PR: opensearch-project/OpenSearch-Dashboards#3922 --------- Signed-off-by: Kawika Avilla <kavilla414@gmail.com> Signed-off-by: Joshua Li <joshuali925@gmail.com> Co-authored-by: Joshua Li <joshuali925@gmail.com>
opensearch-project · Apr 25, 2023 · f94c21e · f94c21e
1 parent a4cb6d1
commit f94c21e
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 28 deletions.
diff --git a/.cypress/integration/3_panels.spec.ts b/.cypress/integration/3_panels.spec.ts
@@ -5,19 +5,16 @@
 
 /// <reference types="cypress" />
 
+import { suppressResizeObserverIssue } from '../utils/constants';
 import {
   delay,
-  TEST_PANEL,
-  PPL_VISUALIZATIONS,
-  PPL_VISUALIZATIONS_NAMES,
   NEW_VISUALIZATION_NAME,
   PPL_FILTER,
-  SAMPLE_PANEL,
-  SAMPLE_VISUALIZATIONS_NAMES,
+  PPL_VISUALIZATIONS,
+  PPL_VISUALIZATIONS_NAMES,
+  TEST_PANEL,
 } from '../utils/panel_constants';
 
-import { suppressResizeObserverIssue } from '../utils/constants';
-
 describe('Adding sample data and visualization', () => {
   it('Adds sample flights data for visualization paragraph', () => {
     cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`);
@@ -195,6 +192,34 @@ describe('Testing panels table', () => {
       cy.get('button[data-test-subj="popoverModal__deleteButton"]').click();
       cy.get('h2[data-test-subj="customPanels__noPanelsHome"]').should('exist');
     });
+
+    it('Redirects to observability dashboard from OSD dashboards', () => {
+      moveToOsdDashboards();
+      cy.location('pathname').should('eq', '/app/dashboards');
+      cy.get('[data-test-subj="dashboardListingTitleLink-Test-Panel"]').click();
+      cy.location('pathname').should('eq', '/app/observability-dashboards');
+    });
+
+    it('Redirects to observability dashboard from OSD dashboards with edit', () => {
+      moveToOsdDashboards();
+      cy.location('pathname').should('eq', '/app/dashboards');
+      cy.get('[data-test-subj="dashboardListingTitleLink-Test-Panel"]')
+        .closest('tr')
+        .get('span.euiToolTipAnchor > button.euiButtonIcon')
+        .eq(0)
+        .click();
+      cy.location('pathname').should('eq', '/app/observability-dashboards');
+      cy.location('hash').should('include', '/edit');
+    });
+
+    it('Redirects to observability dashboard from OSD dashboards with create', () => {
+      moveToOsdDashboards();
+      cy.location('pathname').should('eq', '/app/dashboards');
+      cy.get('div#createMenuPopover').click();
+      cy.get('[data-test-subj="contextMenuItem-observability-panel"]').click();
+      cy.location('pathname').should('eq', '/app/observability-dashboards');
+      cy.location('hash').should('include', '/create');
+    });
   });
 
   it('Searches existing panel', () => {
@@ -274,7 +299,7 @@ describe('Testing a panel', () => {
 
     cy.get(`input.euiFieldText[value="${TEST_PANEL} (copy)"]`)
       .focus()
-      .clear({force: true})
+      .clear({ force: true })
       .focus()
       .type('Renamed Panel', {
         delay: 200,
@@ -347,9 +372,9 @@ describe('Testing a panel', () => {
 
     cy.get('h5[data-test-subj="visualizationHeader"]')
       .contains(PPL_VISUALIZATIONS_NAMES[1])
-      .trigger('mousedown', {which: 1})
-      .trigger('mousemove', {clientX: 1100, clientY: 0})
-      .trigger('mouseup', {force: true});
+      .trigger('mousedown', { which: 1 })
+      .trigger('mousemove', { clientX: 1100, clientY: 0 })
+      .trigger('mouseup', { force: true });
 
     cy.get('button[data-test-subj="savePanelButton"]').click();
     cy.wait(delay * 3);
@@ -364,9 +389,9 @@ describe('Testing a panel', () => {
 
     cy.get('.react-resizable-handle')
       .eq(1)
-      .trigger('mousedown', {which: 1})
-      .trigger('mousemove', {clientX: 2000, clientY: 800})
-      .trigger('mouseup', {force: true});
+      .trigger('mousedown', { which: 1 })
+      .trigger('mousemove', { clientX: 2000, clientY: 800 })
+      .trigger('mouseup', { force: true });
 
     cy.get('button[data-test-subj="savePanelButton"]').click();
     cy.wait(delay * 3);
@@ -481,7 +506,7 @@ describe('Testing a panel', () => {
     cy.get('[data-test-subj="eventExplorer__saveManagementPopover"]').trigger('mouseover').click();
     cy.wait(1000);
     cy.get('[data-test-subj="eventExplorer__querySaveName"]')
-      .clear({force: true})
+      .clear({ force: true })
       .type(NEW_VISUALIZATION_NAME, {
         delay: 200,
       });
@@ -535,6 +560,11 @@ describe('Clean up all test data', () => {
   });
 });
 
+const moveToOsdDashboards = () => {
+  cy.visit(`${Cypress.env('opensearchDashboards')}/app/dashboards#/`);
+  cy.wait(delay * 3);
+};
+
 const moveToEventsHome = () => {
   cy.visit(`${Cypress.env('opensearchDashboards')}/app/observability-logs#/`);
   cy.wait(delay * 3);
@@ -615,7 +645,8 @@ const eraseTestPanels = () => {
   eraseLegacyPanels();
   eraseSavedObjectPaenls();
 };
-const uuidRx = /[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}/;
+const uuidRx =
+  /[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}/;
 
 const clickCreatePanelButton = () =>
   cy.get('a[data-test-subj="customPanels__createNewPanels"]').click();

diff --git a/public/components/custom_panels/custom_panel_view_so.tsx b/public/components/custom_panels/custom_panel_view_so.tsx
@@ -255,7 +255,6 @@ export const CustomPanelViewSO = (props: CustomPanelViewProps) => {
   }, [panel]);
 
   const cancelEdit = () => {
-    console.log('cancelEdits');
     dispatch(fetchPanel(panelId));
     setIsEditing(false);
   };

diff --git a/public/components/trace_analytics/requests/dashboard_request_handler.ts b/public/components/trace_analytics/requests/dashboard_request_handler.ts
@@ -191,10 +191,7 @@ export const handleJaegerDashboardRequest = async (
       return map;
     })
     .catch((error) => {
-      console.log("error here")
-      console.error(error)
-
-      setToast('hello')
+      console.error(error);
     });
 
   await handleDslRequest(http, DSL, getJaegerDashboardQuery(), mode, true, setShowTimeoutToast)

diff --git a/public/plugin.ts b/public/plugin.ts
@@ -83,7 +83,6 @@ export class ObservabilityPlugin
     core: CoreSetup<AppPluginStartDependencies>,
     setupDeps: SetupDependencies
   ): ObservabilitySetup {
-    console.log('core: ', core, ', setupDeps: ', setupDeps);
     uiSettingsService.init(core.uiSettings, core.notifications);
     const pplService = new PPLService(core.http);
     const qm = new QueryManager();
@@ -107,16 +106,16 @@ export class ObservabilityPlugin
     // if (window.location.pathname.includes('application_analytics')) {
     //   window.location.assign(convertLegacyAppAnalyticsUrl(window.location));
     // }
-
+    const BASE_URL = core.http.basePath.prepend('/app/observability-dashboards#');
     setupDeps.dashboard.registerDashboardProvider({
       appId: 'observability-panel',
       savedObjectsType: 'observability-panel',
       savedObjectsName: 'Observability',
-      editUrlPathFn: (obj: SavedObject) => `/app/observability-dashboards#/${obj.id}/edit`,
-      viewUrlPathFn: (obj: SavedObject) => `/app/observability-dashboards#/${obj.id}`,
+      editUrlPathFn: (obj: SavedObject) => `${BASE_URL}/${obj.id}/edit`,
+      viewUrlPathFn: (obj: SavedObject) => `${BASE_URL}/${obj.id}`,
       createLinkText: 'Observability Dashboard',
       createSortText: 'Observability Dashboard',
-      createUrl: '/app/observability-dashboards#/create',
+      createUrl: `${BASE_URL}/create`,
     });
 
     const OBSERVABILITY_APP_CATEGORIES: Record<string, AppCategory> = Object.freeze({
@@ -130,7 +129,6 @@ export class ObservabilityPlugin
     });
 
     const appMountWithStartPage = (startPage: string) => async (params: AppMountParameters) => {
-      console.log('start page: ', startPage);
       const { Observability } = await import('./components/index');
       const [coreStart, depsStart] = await core.getStartServices();
       const dslService = new DSLService(coreStart.http);

diff --git a/public/services/saved_objects/saved_object_savers/ppl/save_as_new_query.ts b/public/services/saved_objects/saved_object_savers/ppl/save_as_new_query.ts
@@ -24,7 +24,6 @@ export class SaveAsNewQuery extends SavedQuerySaver {
     const { batch, dispatch, changeQuery, updateTabName } = this.dispatchers;
     const { tabId, history, notifications, showPermissionErrorToast } = this.saveContext;
     const { name } = this.saveParams;
-    console.log('this.saveParams: ', this.saveParams);
     this.saveClient
       .create({ ...this.saveParams })
       .then((res: any) => {