diff --git a/frontend/.vscode/settings.json b/frontend/.vscode/settings.json index 564ef8bc410..7c4212a5f95 100644 --- 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 index b65583938fb..54dd0316bfb 100644 --- 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['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, {