Use href for Dashboard List "view" link.

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
opensearch-project · Mar 29, 2023 · 5e23be7 · 5e23be7
1 parent b1aab11
commit 5e23be7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/src/plugins/dashboard/public/application/legacy_app.js b/src/plugins/dashboard/public/application/legacy_app.js
@@ -164,11 +164,11 @@ export function initDashboardApp(app, deps) {
             };
           };
 
-          $scope.editItem = ({ appId, editUrl }) => {
-            deps.core.application.navigateToApp(appId, { path: editUrl });
+          $scope.editItem = ({ editUrl }) => {
+            history.push(deps.addBasePath(editUrl));
           };
-          $scope.viewItem = ({ appId, viewUrl }) => {
-            deps.core.application.navigateToApp(appId, { path: viewUrl });
+          $scope.viewItem = ({ viewUrl }) => {
+            history.push(deps.addBasePath(viewUrl));
           };
           $scope.delete = (dashboards) => {
             return service.delete(dashboards.map((d) => d.id));

diff --git a/src/plugins/dashboard/public/application/listing/dashboard_listing.js b/src/plugins/dashboard/public/application/listing/dashboard_listing.js
@@ -171,11 +171,6 @@ export class DashboardListing extends React.Component {
   getTableColumns() {
     const dateFormat = this.props.core.uiSettings.get('dateFormat');
 
-    const urlLinkProps = (record) =>
-      this.props.getUrl
-        ? { href: () => this.props.getUrl(record) }
-        : { onClick: () => this.props.viewItem(record) };
-
     return [
       {
         field: 'title',
@@ -185,7 +180,7 @@ export class DashboardListing extends React.Component {
         sortable: true,
         render: (field, record) => (
           <EuiLink
-            {...urlLinkProps(record)}
+            href={record.viewUrl}
             data-test-subj={`dashboardListingTitleLink-${record.title.split(' ').join('-')}`}
           >
             {field}

diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
@@ -346,7 +346,7 @@ export class DashboardPlugin
       savedObjectsName: 'Dashboard',
       appId: 'dashboards',
       viewUrlPathFn: (obj) => `#/view/${obj.id}`,
-      editUrlPathFn: (obj) => `#/view/${obj.id}?_a=(viewMode:edit)`,
+      editUrlPathFn: (obj) => `/view/${obj.id}?_a=(viewMode:edit)`,
       createUrl: core.http.basePath.prepend('/app/dashboards#/create'),
       createSortText: 'Dashboard',
       createLinkText: (