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

UI: upgrade deps #2075

Merged
merged 11 commits into from
May 15, 2024
Merged

UI: upgrade deps #2075

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c72f3f5
upgrade minor and patch deps
manV Apr 9, 2024
77595b6
upgrade tailwind-merge
manV Apr 9, 2024
20aa252
upgrade major deps
manV Apr 9, 2024
3545148
update snapshots
manV Apr 9, 2024
c6167eb
remove console log
manV Apr 10, 2024
044c730
fix failed test for modal
milan-deepfence Apr 10, 2024
2e12878
fix act warning
milan-deepfence Apr 10, 2024
e8791ad
Merge branch 'main' into upgrade-deps
milan-deepfence May 13, 2024
0b2ad3f
fix: lint and add empty product_version.txt file
milan-deepfence May 13, 2024
46a90e3
fix linting
milan-deepfence May 15, 2024
9a69faa
add missing dep
manV May 15, 2024
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
89 changes: 44 additions & 45 deletions deepfence_frontend/apps/dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,65 +17,64 @@
"codegen:clean": "rm -rf ./src/api/generated"
},
"dependencies": {
"@antv/g6": "^4.8.21",
"@antv/g6-core": "^0.8.21",
"@antv/layout": "^0.3.23",
"@lukemorales/query-key-factory": "^1.3.2",
"@radix-ui/react-navigation-menu": "^1.1.3",
"@suspensive/react": "^1.11.6",
"@suspensive/react-query": "^1.11.6",
"@antv/g6": "^4.8.24",
"@antv/g6-core": "^0.8.24",
"@antv/layout": "^0.3.25",
"@lukemorales/query-key-factory": "^1.3.4",
"@radix-ui/react-navigation-menu": "^1.1.4",
"@suspensive/react": "^1.26.7",
"@suspensive/react-query": "^1.26.7",
"@tanstack/react-query": "^4.32.6",
"@yornaath/batshit": "^0.9.0",
"cron-converter": "^2.0.1",
"cronstrue": "^2.41.0",
"dayjs": "^1.11.9",
"echarts": "^5.4.3",
"cronstrue": "^2.49.0",
"dayjs": "^1.11.10",
"echarts": "^5.5.0",
"lodash-es": "^4.17.21",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-markdown": "^9.0.0",
"react-router-dom": "6.15.0",
"react-use": "^17.4.0",
"react-markdown": "^9.0.1",
"react-router-dom": "^6.22.3",
"react-use": "^17.5.0",
"rehype-sanitize": "^6.0.0",
"remark-gfm": "^4.0.0",
"sonner": "^0.6.2",
"tailwind-preset": "workspace:*",
"ui-components": "workspace:*"
},
"devDependencies": {
"@openapitools/openapi-generator-cli": "^2.7.0",
"@playwright/test": "^1.37.0",
"@tailwindcss/typography": "^0.5.10",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"@types/lodash-es": "^4.17.8",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/testing-library__jest-dom": "^5.14.9",
"@typescript-eslint/eslint-plugin": "^6.3.0",
"@typescript-eslint/parser": "^6.3.0",
"@vitejs/plugin-react": "^4.0.4",
"@vitest/coverage-c8": "^0.33.0",
"autoprefixer": "^10.4.15",
"eslint": "^8.47.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.33.1",
"eslint-plugin-simple-import-sort": "^10.0.0",
"msw": "^1.2.3",
"playwright": "1.37.0",
"postcss": "^8.4.27",
"@openapitools/openapi-generator-cli": "^2.13.1",
"@playwright/test": "^1.43.0",
"@tailwindcss/typography": "^0.5.12",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.3.0",
"@testing-library/user-event": "^14.5.2",
"@types/lodash-es": "^4.17.12",
"@types/react": "^18.2.75",
"@types/react-dom": "^18.2.24",
"@typescript-eslint/eslint-plugin": "^7.6.0",
"@typescript-eslint/parser": "^7.6.0",
"@vitejs/plugin-react": "^4.2.1",
"@vitest/coverage-v8": "^1.4.0",
"autoprefixer": "^10.4.19",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-simple-import-sort": "^12.0.0",
"msw": "^2.2.13",
"playwright": "1.43.0",
"postcss": "^8.4.38",
"resize-observer-polyfill": "^1.5.1",
"rollup-plugin-visualizer": "^5.9.2",
"tailwindcss": "^3.3.3",
"typescript": "^5.1.6",
"vite": "^4.4.9",
"vite-plugin-webfont-dl": "^3.7.6",
"vitest": "^0.34.1",
"whatwg-fetch": "^3.6.17"
"rollup-plugin-visualizer": "^5.12.0",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.4",
"vite": "^5.2.8",
"vite-plugin-webfont-dl": "^3.9.3",
"vitest": "^1.4.0",
"whatwg-fetch": "^3.6.20"
},
"engines": {
"node": ">=18.0.0"
Expand Down
10 changes: 5 additions & 5 deletions deepfence_frontend/apps/dashboard/src/components/forms/SearchableCloudAccountsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ const SearchableCloudAccounts = ({
isSelectVariantType && selectedAccounts.length > 0
? `${selectedAccounts.length} selected`
: cloudProvider
? displayValue
? displayValue
: `${cloudProvider} account`
: 'Cloud account'
? displayValue
: `${cloudProvider} account`
: 'Cloud account'
}
multiple
value={selectedAccounts}
Expand Down Expand Up @@ -147,8 +147,8 @@ export const SearchableCloudAccountsList = (props: SearchableCloudAccountsListPr
return displayValue
? displayValue
: cloudProvider
? `${cloudProvider} account`
: 'Cloud account';
? `${cloudProvider} account`
: 'Cloud account';
}}
multiple
onQueryChange={() => {
Expand Down
4 changes: 2 additions & 2 deletions deepfence_frontend/apps/dashboard/src/components/forms/SearchableClusterList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ const SearchableCluster = ({
isSelectVariantType && selectedClusters.length > 0
? `${selectedClusters.length} selected`
: displayValue
? displayValue
: null
? displayValue
: null
}
placeholder="Select cluster"
multiple
Expand Down
4 changes: 2 additions & 2 deletions deepfence_frontend/apps/dashboard/src/components/forms/SearchableHostList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ const SearchableHost = ({
isSelectVariantType && selectedHosts.length > 0
? `${selectedHosts.length} selected`
: displayValue
? displayValue
: null
? displayValue
: null
}
placeholder="Select host"
multiple
Expand Down
4 changes: 2 additions & 2 deletions deepfence_frontend/apps/dashboard/src/components/forms/SearchableRegistryAccountList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ const SearchableRegistryAccount = ({
isSelectVariantType && selectedRegistryAccounts.length > 0
? `${selectedRegistryAccounts.length} selected`
: displayValue
? displayValue
: 'Select registry account'
? displayValue
: 'Select registry account'
}
placeholder="Select registry account"
multiple
Expand Down
4 changes: 2 additions & 2 deletions deepfence_frontend/apps/dashboard/src/components/hosts-connector/DockerConnectorForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ const Command = () => {
status !== 'success'
? PLACEHOLDER_API_KEY
: apiToken === undefined
? PLACEHOLDER_API_KEY
: apiToken;
? PLACEHOLDER_API_KEY
: apiToken;
const { data: dataVersion } = useGetVersion();
const version = dataVersion.version || PLACEHOLDER_VERSION;

Expand Down
4 changes: 2 additions & 2 deletions deepfence_frontend/apps/dashboard/src/components/hosts-connector/K8ConnectorForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ const ThirdCommand = ({ command }: { command: string }) => {
status !== 'success'
? PLACEHOLDER_API_KEY
: apiToken === undefined
? PLACEHOLDER_API_KEY
: apiToken;
? PLACEHOLDER_API_KEY
: apiToken;

const { copy, isCopied } = useCopyToClipboardState();
return (
Expand Down
4 changes: 2 additions & 2 deletions deepfence_frontend/apps/dashboard/src/components/hosts-connector/LinuxConnectorForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ const SetConsoleURLCommand = ({ command }: { command: string }) => {
status !== 'success'
? PLACEHOLDER_API_KEY
: apiToken === undefined
? PLACEHOLDER_API_KEY
: apiToken;
? PLACEHOLDER_API_KEY
: apiToken;

return (
<div className="relative flex items-center">
Expand Down
1 change: 1 addition & 0 deletions deepfence_frontend/apps/dashboard/src/features/integrations/components/IntegrationTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const IntegrationTable = ({
}) => {
const columns = useIntegrationTableColumn(onTableAction);
const { data: list } = useListIntegrations();
console.log(list);
manV marked this conversation as resolved.
Show resolved Hide resolved

const { data = [], message } = list ?? {};
const params = useParams() as {
Expand Down
Loading
Loading