From af0ad122bc8c30114dbb7f12689461969a104327 Mon Sep 17 00:00:00 2001 From: Peter Pan Date: Fri, 15 May 2020 18:30:04 +0800 Subject: [PATCH] Minor bug fix (#626) * fix: navbar items order * feat: refresh components when click refresh button * v2.0.0-beta.41 * bump 2.0.0-alpha.3 * fix: language change support public path * v2.0.0-beta.42 * bump 2.0.0-alpha.4 --- frontend/lerna.json | 2 +- frontend/packages/cli/package.json | 4 ++-- frontend/packages/core/components/Navbar.tsx | 2 +- frontend/packages/core/hooks/useNavItems.ts | 15 ++++++++++++--- frontend/packages/core/hooks/useRequest.ts | 4 ++-- frontend/packages/core/package.json | 8 ++++---- frontend/packages/i18n/package.json | 2 +- .../i18n/src/hocs/app-with-translation.tsx | 14 +++++++++++++- frontend/packages/mock/data/components.ts | 2 +- frontend/packages/mock/package.json | 2 +- frontend/packages/server/package.json | 8 ++++---- frontend/packages/serverless/package.json | 4 ++-- frontend/packages/wasm/package.json | 2 +- visualdl/version.py | 3 +-- 14 files changed, 46 insertions(+), 26 deletions(-) diff --git a/frontend/lerna.json b/frontend/lerna.json index 231ef29a..be0fffc8 100644 --- a/frontend/lerna.json +++ b/frontend/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "2.0.0-beta.40", + "version": "2.0.0-beta.42", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/frontend/packages/cli/package.json b/frontend/packages/cli/package.json index 38e73eb7..db377c3d 100644 --- a/frontend/packages/cli/package.json +++ b/frontend/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@visualdl/cli", - "version": "2.0.0-beta.40", + "version": "2.0.0-beta.42", "description": "A platform to visualize the deep learning process and result.", "keywords": [ "visualdl", @@ -34,7 +34,7 @@ "dist" ], "dependencies": { - "@visualdl/server": "2.0.0-beta.40", + "@visualdl/server": "2.0.0-beta.42", "open": "7.0.3", "ora": "4.0.4", "pm2": "4.4.0", diff --git a/frontend/packages/core/components/Navbar.tsx b/frontend/packages/core/components/Navbar.tsx index 0fe3a55f..a54b5d91 100644 --- a/frontend/packages/core/components/Navbar.tsx +++ b/frontend/packages/core/components/Navbar.tsx @@ -131,7 +131,7 @@ const Navbar: FunctionComponent = () => { - ee.emit('refresh-running')}> + ee.emit('refresh')}> diff --git a/frontend/packages/core/hooks/useNavItems.ts b/frontend/packages/core/hooks/useNavItems.ts index ecface5d..123c7d4a 100644 --- a/frontend/packages/core/hooks/useNavItems.ts +++ b/frontend/packages/core/hooks/useNavItems.ts @@ -1,6 +1,8 @@ +import {useEffect, useMemo} from 'react'; + +import ee from '~/utils/event'; import {fetcher} from '~/utils/fetch'; import intersection from 'lodash/intersection'; -import {useMemo} from 'react'; import useRequest from '~/hooks/useRequest'; const allNavItems = ['scalars', 'samples', 'high-dimensional']; @@ -11,7 +13,7 @@ export const navMap = { } as const; const useNavItems = () => { - const {data: components} = useRequest<(keyof typeof navMap)[]>('/components', fetcher, { + const {data: components, mutate} = useRequest<(keyof typeof navMap)[]>('/components', fetcher, { refreshInterval: 61 * 1000, dedupingInterval: 29 * 1000, errorRetryInterval: 29 * 1000, @@ -22,7 +24,14 @@ const useNavItems = () => { refreshWhenOffline: false }); - const navItems = useMemo(() => intersection(components?.map(component => navMap[component]) ?? [], allNavItems), [ + useEffect(() => { + ee.on('refresh', mutate); + return () => { + ee.off('refresh', mutate); + }; + }, [mutate]); + + const navItems = useMemo(() => intersection(allNavItems, components?.map(component => navMap[component]) ?? []), [ components ]); diff --git a/frontend/packages/core/hooks/useRequest.ts b/frontend/packages/core/hooks/useRequest.ts index 7b2bd7fb..8f4674dd 100644 --- a/frontend/packages/core/hooks/useRequest.ts +++ b/frontend/packages/core/hooks/useRequest.ts @@ -63,9 +63,9 @@ function useRunningRequest( }, [running, mutate]); useEffect(() => { - ee.on('refresh-running', mutate); + ee.on('refresh', mutate); return () => { - ee.off('refresh-running', mutate); + ee.off('refresh', mutate); }; }, [mutate]); diff --git a/frontend/packages/core/package.json b/frontend/packages/core/package.json index 24632d3f..3f37eb84 100644 --- a/frontend/packages/core/package.json +++ b/frontend/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@visualdl/core", - "version": "2.0.0-beta.40", + "version": "2.0.0-beta.42", "title": "VisualDL", "description": "A platform to visualize the deep learning process and result.", "keywords": [ @@ -31,8 +31,8 @@ "test": "echo \"Error: no test specified\" && exit 0" }, "dependencies": { - "@visualdl/i18n": "2.0.0-beta.40", - "@visualdl/wasm": "2.0.0-beta.40", + "@visualdl/i18n": "2.0.0-beta.42", + "@visualdl/wasm": "2.0.0-beta.42", "bignumber.js": "9.0.0", "dagre-d3": "0.6.4", "echarts": "4.7.0", @@ -73,7 +73,7 @@ "@types/react": "16.9.34", "@types/react-dom": "16.9.7", "@types/styled-components": "5.1.0", - "@visualdl/mock": "2.0.0-beta.40", + "@visualdl/mock": "2.0.0-beta.42", "babel-plugin-emotion": "10.0.33", "babel-plugin-styled-components": "1.10.7", "babel-plugin-typescript-to-proptypes": "1.3.2", diff --git a/frontend/packages/i18n/package.json b/frontend/packages/i18n/package.json index d9ead0b2..40c2799b 100644 --- a/frontend/packages/i18n/package.json +++ b/frontend/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@visualdl/i18n", - "version": "2.0.0-beta.40", + "version": "2.0.0-beta.42", "description": "A platform to visualize the deep learning process and result.", "keywords": [ "visualdl", diff --git a/frontend/packages/i18n/src/hocs/app-with-translation.tsx b/frontend/packages/i18n/src/hocs/app-with-translation.tsx index 1de42f8b..017fc929 100644 --- a/frontend/packages/i18n/src/hocs/app-with-translation.tsx +++ b/frontend/packages/i18n/src/hocs/app-with-translation.tsx @@ -52,7 +52,19 @@ export const appWithTranslation = function (this: NextI18Next, WrappedComponent: if (!isServer()) { const changeLanguageCallback = (prevLng: string, newLng: string) => { const {router} = props; - const {pathname, asPath, query} = router; + const {query} = router; + let {pathname, asPath} = router; + + if (process.env.PUBLIC_PATH) { + const publicPath = process.env.PUBLIC_PATH; + if (pathname.indexOf(publicPath) === 0) { + pathname = pathname.replace(publicPath, ''); + } + if (asPath.indexOf(publicPath) === 0) { + asPath = asPath.replace(publicPath, ''); + } + } + const routeInfo = {pathname, query}; if ((i18n as any).initializedLanguageOnce && typeof newLng === 'string' && prevLng !== newLng) { diff --git a/frontend/packages/mock/data/components.ts b/frontend/packages/mock/data/components.ts index 661edcf7..ca5eb431 100644 --- a/frontend/packages/mock/data/components.ts +++ b/frontend/packages/mock/data/components.ts @@ -1 +1 @@ -export default ['scalar', 'image', 'embeddings']; +export default ['embeddings', 'scalar', 'image']; diff --git a/frontend/packages/mock/package.json b/frontend/packages/mock/package.json index 1c4dc72a..b32d83de 100644 --- a/frontend/packages/mock/package.json +++ b/frontend/packages/mock/package.json @@ -1,6 +1,6 @@ { "name": "@visualdl/mock", - "version": "2.0.0-beta.40", + "version": "2.0.0-beta.42", "description": "A platform to visualize the deep learning process and result.", "keywords": [ "visualdl", diff --git a/frontend/packages/server/package.json b/frontend/packages/server/package.json index 3e658dfa..997b3c79 100644 --- a/frontend/packages/server/package.json +++ b/frontend/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@visualdl/server", - "version": "2.0.0-beta.40", + "version": "2.0.0-beta.42", "description": "A platform to visualize the deep learning process and result.", "keywords": [ "visualdl", @@ -36,8 +36,8 @@ "ecosystem.config.d.ts" ], "dependencies": { - "@visualdl/core": "2.0.0-beta.40", - "@visualdl/i18n": "2.0.0-beta.40", + "@visualdl/core": "2.0.0-beta.42", + "@visualdl/i18n": "2.0.0-beta.42", "express": "4.17.1", "http-proxy-middleware": "1.0.3", "next": "9.3.6", @@ -49,7 +49,7 @@ "@types/shelljs": "0.8.7", "@types/webpack": "4.41.12", "@types/webpack-dev-middleware": "3.7.0", - "@visualdl/mock": "2.0.0-beta.40", + "@visualdl/mock": "2.0.0-beta.42", "cross-env": "7.0.2", "nodemon": "2.0.3", "shelljs": "0.8.4", diff --git a/frontend/packages/serverless/package.json b/frontend/packages/serverless/package.json index c59f911b..5746c405 100644 --- a/frontend/packages/serverless/package.json +++ b/frontend/packages/serverless/package.json @@ -1,6 +1,6 @@ { "name": "@visualdl/serverless", - "version": "2.0.0-beta.40", + "version": "2.0.0-beta.42", "description": "A platform to visualize the deep learning process and result.", "keywords": [ "visualdl", @@ -33,7 +33,7 @@ "devDependencies": { "@types/node": "13.13.5", "@types/rimraf": "3.0.0", - "@visualdl/core": "2.0.0-beta.40", + "@visualdl/core": "2.0.0-beta.42", "cross-env": "7.0.2", "rimraf": "3.0.2", "ts-node": "8.10.1", diff --git a/frontend/packages/wasm/package.json b/frontend/packages/wasm/package.json index 1a6396d6..adc7b6ed 100644 --- a/frontend/packages/wasm/package.json +++ b/frontend/packages/wasm/package.json @@ -1,6 +1,6 @@ { "name": "@visualdl/wasm", - "version": "2.0.0-beta.40", + "version": "2.0.0-beta.42", "title": "VisualDL", "description": "A platform to visualize the deep learning process and result.", "keywords": [ diff --git a/visualdl/version.py b/visualdl/version.py index 85029eeb..4f1d79c2 100644 --- a/visualdl/version.py +++ b/visualdl/version.py @@ -13,5 +13,4 @@ # limitations under the License. # ======================================================================= -vdl_version = '2.0.0-alpha.2' - +vdl_version = '2.0.0-alpha.4' -- GitLab