From 274fbeb34aa6c906c062ef9ca529821e5e747cc0 Mon Sep 17 00:00:00 2001 From: AmitUp9 <96980485+AmitUp9@users.noreply.github.com> Date: Wed, 6 Jul 2022 13:13:04 +0300 Subject: [PATCH] warning cleaning from console (#1187) * warning cleaning from console * code cleaning --- .../modals/ServiceMapModal/ServiceMapModal.module.sass | 1 + .../TimelineBarChart/TimelineBarChart.tsx | 2 +- .../TrafficStatsModal/TrafficPieChart/TrafficPieChart.tsx | 2 +- .../modals/TrafficStatsModal/TrafficStatsModal.tsx | 8 +------- .../src/components/modals/TrafficStatsModal/consts.ts | 5 +++++ ui-common/src/index.tsx | 3 +-- ui/src/components/Pages/TrafficPage/TrafficPage.tsx | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 ui-common/src/components/modals/TrafficStatsModal/consts.ts diff --git a/ui-common/src/components/modals/ServiceMapModal/ServiceMapModal.module.sass b/ui-common/src/components/modals/ServiceMapModal/ServiceMapModal.module.sass index 3f882c410..729075b5c 100644 --- a/ui-common/src/components/modals/ServiceMapModal/ServiceMapModal.module.sass +++ b/ui-common/src/components/modals/ServiceMapModal/ServiceMapModal.module.sass @@ -74,6 +74,7 @@ $modalMargin-from-edge : 35px width: -moz-available width: -webkit-fill-available width: fill-available + width: strech max-width: 200px box-shadow: 0px 1px 5px #979797 margin-left: 10px diff --git a/ui-common/src/components/modals/TrafficStatsModal/TimelineBarChart/TimelineBarChart.tsx b/ui-common/src/components/modals/TrafficStatsModal/TimelineBarChart/TimelineBarChart.tsx index 9639133cb..2681ffa04 100644 --- a/ui-common/src/components/modals/TrafficStatsModal/TimelineBarChart/TimelineBarChart.tsx +++ b/ui-common/src/components/modals/TrafficStatsModal/TimelineBarChart/TimelineBarChart.tsx @@ -1,5 +1,4 @@ import styles from "./TimelineBarChart.module.sass"; -import { ALL_PROTOCOLS, StatsMode } from "../TrafficStatsModal" import React, { useEffect, useMemo, useState } from "react"; import { BarChart, @@ -9,6 +8,7 @@ import { Tooltip, } from "recharts"; import { Utils } from "../../../../helpers/Utils"; +import { ALL_PROTOCOLS, StatsMode } from "../consts"; interface TimelineBarChartProps { timeLineBarChartMode: string; diff --git a/ui-common/src/components/modals/TrafficStatsModal/TrafficPieChart/TrafficPieChart.tsx b/ui-common/src/components/modals/TrafficStatsModal/TrafficPieChart/TrafficPieChart.tsx index 877cb4035..51a272fd3 100644 --- a/ui-common/src/components/modals/TrafficStatsModal/TrafficPieChart/TrafficPieChart.tsx +++ b/ui-common/src/components/modals/TrafficStatsModal/TrafficPieChart/TrafficPieChart.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useMemo, useState } from "react"; import { Cell, Legend, Pie, PieChart, Tooltip } from "recharts"; import { Utils } from "../../../../helpers/Utils"; -import { ALL_PROTOCOLS, StatsMode as PieChartMode } from "../TrafficStatsModal" +import { ALL_PROTOCOLS ,StatsMode as PieChartMode } from "../consts" const RADIAN = Math.PI / 180; const renderCustomizedLabel = ({ diff --git a/ui-common/src/components/modals/TrafficStatsModal/TrafficStatsModal.tsx b/ui-common/src/components/modals/TrafficStatsModal/TrafficStatsModal.tsx index 1bd1c3e6d..12267201d 100644 --- a/ui-common/src/components/modals/TrafficStatsModal/TrafficStatsModal.tsx +++ b/ui-common/src/components/modals/TrafficStatsModal/TrafficStatsModal.tsx @@ -7,6 +7,7 @@ import { TimelineBarChart } from "./TimelineBarChart/TimelineBarChart"; import refreshIcon from "assets/refresh.svg"; import { useCommonStyles } from "../../../helpers/commonStyle"; import { LoadingWrapper } from "../../UI/withLoading/withLoading"; +import { ALL_PROTOCOLS, StatsMode } from "./consts"; const modalStyle = { position: 'absolute', @@ -22,19 +23,12 @@ const modalStyle = { color: '#000', }; -export enum StatsMode { - REQUESTS = "entriesCount", - VOLUME = "volumeSizeBytes" -} - interface TrafficStatsModalProps { isOpen: boolean; onClose: () => void; getTrafficStatsDataApi: () => Promise } -export const ALL_PROTOCOLS = "ALL"; - export const TrafficStatsModal: React.FC = ({ isOpen, onClose, getTrafficStatsDataApi }) => { const modes = Object.keys(StatsMode).filter(x => !(parseInt(x) >= 0)); diff --git a/ui-common/src/components/modals/TrafficStatsModal/consts.ts b/ui-common/src/components/modals/TrafficStatsModal/consts.ts new file mode 100644 index 000000000..b237dd7d4 --- /dev/null +++ b/ui-common/src/components/modals/TrafficStatsModal/consts.ts @@ -0,0 +1,5 @@ +export const ALL_PROTOCOLS = "ALL"; +export enum StatsMode { + REQUESTS = "entriesCount", + VOLUME = "volumeSizeBytes" + } diff --git a/ui-common/src/index.tsx b/ui-common/src/index.tsx index 02b1d7c20..65a05f96a 100644 --- a/ui-common/src/index.tsx +++ b/ui-common/src/index.tsx @@ -7,6 +7,5 @@ import { ServiceMapModal } from './components/modals/ServiceMapModal/ServiceMapM import { TrafficStatsModal } from './components/modals/TrafficStatsModal/TrafficStatsModal'; export { CodeEditorWrap as QueryForm } from './components/Filters/Filters'; -export { UI, StatusBar, OasModal, ServiceMapModal, TrafficStatsModal } +export { UI, StatusBar, OasModal, ServiceMapModal, TrafficStatsModal, TrafficViewer } export { useWS, DEFAULT_LEFTOFF } -export default TrafficViewer; diff --git a/ui/src/components/Pages/TrafficPage/TrafficPage.tsx b/ui/src/components/Pages/TrafficPage/TrafficPage.tsx index 0c2717708..dd35d6512 100644 --- a/ui/src/components/Pages/TrafficPage/TrafficPage.tsx +++ b/ui/src/components/Pages/TrafficPage/TrafficPage.tsx @@ -5,7 +5,7 @@ import debounce from 'lodash/debounce'; import { useRecoilState } from "recoil"; import { useCommonStyles } from "../../../helpers/commonStyle" import serviceMapModalOpenAtom from "../../../recoil/serviceMapModalOpen"; -import TrafficViewer from "@up9/mizu-common" +import { TrafficViewer } from "@up9/mizu-common" import "@up9/mizu-common/dist/index.css" import oasModalOpenAtom from "../../../recoil/oasModalOpen/atom"; import serviceMap from "../../assets/serviceMap.svg";