Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump axios from 0.22.0 to 1.6.0 in /openmetadata-ui/src/main/resources/ui #13947

Merged
merged 8 commits into from
Dec 5, 2023
Merged

chore(deps): bump axios from 0.22.0 to 1.6.0 in /openmetadata-ui/src/main/resources/ui #13947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
55ba7b3
chore(deps): bump axios in /openmetadata-ui/src/main/resources/ui
dependabot[bot] Nov 17, 2023
7d78b0a
Merge branch 'main' into dependabot/npm_and_yarn/openmetadata-ui/src/…
chirag-madlani Nov 27, 2023
15e7898
fix tests
chirag-madlani Dec 4, 2023
e9537d5
fix imports
chirag-madlani Dec 4, 2023
0fbc405
Merge branch 'main' into dependabot/npm_and_yarn/openmetadata-ui/src/…
chirag-madlani Dec 4, 2023
62c7c15
fix errors
chirag-madlani Dec 4, 2023
a753c33
remove import
chirag-madlani Dec 4, 2023
c82536c
remove import
chirag-madlani Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions openmetadata-ui/src/main/resources/ui/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ module.exports = {
'<rootDir>/src/test/unit/mocks/file.mock.js',
'\\.json': '<rootDir>/src/test/unit/mocks/json.mock.js',
'@github/g-emoji-element': '<rootDir>/src/test/unit/mocks/gemoji.mock.js',
axios: 'axios/dist/node/axios.cjs',
},

// TypeScript
Expand Down
2 changes: 1 addition & 1 deletion openmetadata-ui/src/main/resources/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"antd": "4.24.0",
"antlr4": "4.9.2",
"autoprefixer": "^10.0.0",
"axios": "0.22.0",
"axios": "1.6.0",
"classnames": "^2.3.1",
"codemirror": "^5.62.3",
"cookie-storage": "^6.1.0",
Expand Down
25 changes: 0 additions & 25 deletions openmetadata-ui/src/main/resources/ui/src/components/AppRouter/GlobalSettingRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ const ImportTeamsPage = withSuspenseFallback(
() => import('../../pages/TeamsPage/ImportTeamsPage/ImportTeamsPage')
)
);
const AddDataInsightReportAlert = withSuspenseFallback(
React.lazy(
() =>
import('../../pages/AddDataInsightReportAlert/AddDataInsightReportAlert')
)
);

const AlertDetailsPage = withSuspenseFallback(
React.lazy(() => import('../../pages/AlertDetailsPage/AlertDetailsPage'))
Expand Down Expand Up @@ -361,25 +355,6 @@ const GlobalSettingRouter = () => {
GlobalSettingOptions.ACTIVITY_FEED
)}
/>
<AdminProtectedRoute
exact
component={AddDataInsightReportAlert}
hasPermission={false}
path={getSettingPath(
GlobalSettingsMenuCategory.NOTIFICATIONS,
GlobalSettingOptions.ADD_DATA_INSIGHT_REPORT_ALERT
)}
/>
<AdminProtectedRoute
exact
component={AddDataInsightReportAlert}
hasPermission={false}
path={getSettingPath(
GlobalSettingsMenuCategory.NOTIFICATIONS,
GlobalSettingOptions.EDIT_DATA_INSIGHT_REPORT_ALERT,
true
)}
/>

<AdminProtectedRoute
exact
Expand Down
14 changes: 10 additions & 4 deletions openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ import { Auth0Provider } from '@auth0/auth0-react';
import { Configuration } from '@azure/msal-browser';
import { MsalProvider } from '@azure/msal-react';
import { LoginCallback } from '@okta/okta-react';
import { AxiosError, AxiosRequestConfig } from 'axios';
import {
AxiosError,
AxiosRequestHeaders,
InternalAxiosRequestConfig,
} from 'axios';
import { CookieStorage } from 'cookie-storage';
import { compare } from 'fast-json-patch';
import { isEmpty, isNil, isNumber } from 'lodash';
Expand Down Expand Up @@ -412,7 +416,8 @@ export const AuthProvider = ({
}
};

const withDomainFilter = (config: AxiosRequestConfig) => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const withDomainFilter = (config: InternalAxiosRequestConfig<any>) => {
const activeDomain =
localStorage.getItem(ACTIVE_DOMAIN_STORAGE_KEY) ?? DEFAULT_DOMAIN_VALUE;
const isGetRequest = config.method === 'get';
Expand Down Expand Up @@ -466,7 +471,8 @@ export const AuthProvider = ({
}

requestInterceptor = axiosClient.interceptors.request.use(async function (
config
// eslint-disable-next-line @typescript-eslint/no-explicit-any
config: InternalAxiosRequestConfig<any>
) {
const token: string = localState.getOidcToken() || '';
if (token) {
Expand All @@ -475,7 +481,7 @@ export const AuthProvider = ({
} else {
config.headers = {
Authorization: `Bearer ${token}`,
};
} as AxiosRequestHeaders;
}
}

Expand Down
182 changes: 0 additions & 182 deletions .../main/resources/ui/src/pages/AddDataInsightReportAlert/AddDataInsightReportAlert.test.tsx
View file
Open in desktop

This file was deleted.

Loading
Loading