From 0a800e8d8a6b6232d5cf2f400bef1798d6cc8edd Mon Sep 17 00:00:00 2001 From: leon-up9 <97597983+leon-up9@users.noreply.github.com> Date: Sun, 27 Mar 2022 19:41:51 +0300 Subject: [PATCH] passed containerId in the object config (#935) * passed containerId in the object config * pkg version * tmp: run acceptance tests, revert before merge * reverte Co-authored-by: Leon <> --- ui-common/package.json | 8 ++++---- ui-common/src/components/TrafficViewer/EntryDetailed.tsx | 8 ++------ ui-common/src/components/TrafficViewer/TrafficViewer.tsx | 7 ++----- ui/package.json | 4 ++-- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/ui-common/package.json b/ui-common/package.json index e3fb5a81e..2d3f72462 100644 --- a/ui-common/package.json +++ b/ui-common/package.json @@ -1,6 +1,6 @@ { "name": "@up9/mizu-common", - "version": "1.0.140", + "version": "1.0.141", "description": "Made with create-react-library", "author": "", "license": "MIT", @@ -27,7 +27,7 @@ "@material-ui/icons": "^4.11.2", "@material-ui/lab": "^4.0.0-alpha.60", "node-sass": "^6.0.0", - "react":"^17.0.2", + "react": "^17.0.2", "react-dom": "^17.0.2", "recoil": "^0.5.2", "react-copy-to-clipboard": "^5.0.3", @@ -77,7 +77,7 @@ "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-sass": "^1.2.10", "rollup-plugin-scss": "^3.0.0", - "react":"^17.0.2", + "react": "^17.0.2", "react-dom": "^17.0.2", "typescript": "^4.2.4" }, @@ -90,4 +90,4 @@ "files": [ "dist" ] -} +} \ No newline at end of file diff --git a/ui-common/src/components/TrafficViewer/EntryDetailed.tsx b/ui-common/src/components/TrafficViewer/EntryDetailed.tsx index 8ca458492..895168b5a 100644 --- a/ui-common/src/components/TrafficViewer/EntryDetailed.tsx +++ b/ui-common/src/components/TrafficViewer/EntryDetailed.tsx @@ -118,15 +118,11 @@ export const EntryDetailed = () => { } catch (error) { if (error.response?.data?.type) { toast[error.response.data.type](`Entry[${focusedEntryId}]: ${error.response.data.msg}`, { - position: "bottom-right", theme: "colored", autoClose: error.response.data.autoClose, - hideProgressBar: false, - closeOnClick: true, - pauseOnHover: true, - draggable: true, progress: undefined, - }, { containerId: TOAST_CONTAINER_ID }); + containerId: TOAST_CONTAINER_ID + }); } console.error(error); } diff --git a/ui-common/src/components/TrafficViewer/TrafficViewer.tsx b/ui-common/src/components/TrafficViewer/TrafficViewer.tsx index 51f7b4358..41f6b09f1 100644 --- a/ui-common/src/components/TrafficViewer/TrafficViewer.tsx +++ b/ui-common/src/components/TrafficViewer/TrafficViewer.tsx @@ -186,15 +186,12 @@ export const TrafficViewer: React.FC = ({ setAnalyzeStatus, break; case "toast": toast[message.data.type](message.data.text, { - position: "bottom-right", theme: "colored", autoClose: message.data.autoClose, - hideProgressBar: false, - closeOnClick: true, pauseOnHover: true, - draggable: true, progress: undefined, - }, { containerId: TOAST_CONTAINER_ID }); + containerId: TOAST_CONTAINER_ID + }); break; case "queryMetadata": setQueriedCurrent(queriedCurrent + message.data.current); diff --git a/ui/package.json b/ui/package.json index aac9737d4..4be75a978 100644 --- a/ui/package.json +++ b/ui/package.json @@ -13,7 +13,7 @@ "@types/jest": "^26.0.22", "@types/node": "^12.20.10", "@uiw/react-textarea-code-editor": "^1.4.12", - "@up9/mizu-common": "1.0.140", + "@up9/mizu-common": "1.0.141", "axios": "^0.25.0", "core-js": "^3.20.2", "craco-babel-loader": "^1.0.3", @@ -75,4 +75,4 @@ "last 1 safari version" ] } -} +} \ No newline at end of file