Merge pull request #13666 from rhamilto/OCPBUGS-30805

OCPBUGS-30805: fix Configure link in AlertmanagerReceiversNotConfigur…
openshift · Mar 13, 2024 · e56ab7e · e56ab7e
2 parents 824a736 + a9110ca
commit e56ab7e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/frontend/.vscode/settings.json b/frontend/.vscode/settings.json
@@ -3,29 +3,29 @@
   "[javascript]": {
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.organizeImports": false,
-      "source.sortImports": false
+      "source.organizeImports": "never",
+      "source.sortImports": "never"
     }
   },
   "[javascriptreact]": {
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.organizeImports": false,
-      "source.sortImports": false
+      "source.organizeImports": "never",
+      "source.sortImports": "never"
     }
   },
   "[typescript]": {
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.organizeImports": false,
-      "source.sortImports": false
+      "source.organizeImports": "never",
+      "source.sortImports": "never"
     }
   },
   "[typescriptreact]": {
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.organizeImports": false,
-      "source.sortImports": false
+      "source.organizeImports": "never",
+      "source.sortImports": "never"
     }
   },
   "[json]": {
@@ -82,7 +82,7 @@
     }
   ],
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "cucumberautocomplete.steps": ["./packages/*/integration-tests/support/step-definitions/*/*.ts"],
   "cucumberautocomplete.strictGherkinCompletion": true,

diff --git a/frontend/public/components/notification-drawer.tsx b/frontend/public/components/notification-drawer.tsx
@@ -5,7 +5,7 @@ import i18next from 'i18next';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import { connect, useDispatch } from 'react-redux';
-import { Link, redirect } from 'react-router-dom-v5-compat';
+import { Link } from 'react-router-dom-v5-compat';
 import {
   NotificationDrawer,
   NotificationEntry,
@@ -21,6 +21,7 @@ import {
 } from '@console/internal/actions/observe';
 import * as UIActions from '@console/internal/actions/ui';
 import { RootState } from '@console/internal/redux';
+import { history, resourcePath } from '@console/internal/components/utils';
 
 import { getClusterID } from '../module/k8s/cluster-settings';
 
@@ -61,7 +62,6 @@ import {
   useResolvedExtensions,
   ResolvedExtension,
 } from '@console/dynamic-plugin-sdk';
-import { resourcePath } from '@console/internal/components/utils';
 import { coFetchJSON } from '../co-fetch';
 import { ConsolePluginModel } from '../models';
 import {
@@ -128,7 +128,7 @@ export const getAlertActions = (actionsExtensions: ResolvedExtension<AlertAction
     Omit<ResolvedExtension<AlertAction>['properties'], 'alert'>
   >().set('AlertmanagerReceiversNotConfigured', {
     text: i18next.t('public~Configure'),
-    action: () => redirect('/monitoring/alertmanagerconfig'),
+    action: () => history.push('/monitoring/alertmanagerconfig'),
   });
   actionsExtensions.forEach(({ properties }) =>
     alertActions.set(properties.alert, {