Browse Source

refactor utils import/export

Signed-off-by: ruiyi.jiang <ruiyi.jiang@zilliz.com>
ruiyi.jiang 1 year ago
parent
commit
9713865fda
34 changed files with 56 additions and 59 deletions
  1. 1 1
      client/src/components/customInput/Types.ts
  2. 1 1
      client/src/context/Prometheus.tsx
  3. 1 1
      client/src/context/WebSocket.tsx
  4. 1 1
      client/src/hooks/Result.tsx
  5. 1 1
      client/src/pages/collections/Collection.tsx
  6. 1 1
      client/src/pages/collections/Collections.tsx
  7. 3 3
      client/src/pages/collections/CreateFields.tsx
  8. 1 1
      client/src/pages/connect/AuthForm.tsx
  9. 1 1
      client/src/pages/database/Create.tsx
  10. 1 1
      client/src/pages/dialogs/CreateAliasDialog.tsx
  11. 1 2
      client/src/pages/dialogs/CreateCollectionDialog.tsx
  12. 1 1
      client/src/pages/dialogs/CreatePartitionDialog.tsx
  13. 1 2
      client/src/pages/dialogs/LoadCollectionDialog.tsx
  14. 1 1
      client/src/pages/dialogs/RenameCollectionDialog.tsx
  15. 1 1
      client/src/pages/dialogs/insert/Dialog.tsx
  16. 1 1
      client/src/pages/dialogs/insert/Import.tsx
  17. 1 1
      client/src/pages/dialogs/insert/Preview.tsx
  18. 1 2
      client/src/pages/overview/Overview.tsx
  19. 1 1
      client/src/pages/preview/Preview.tsx
  20. 7 3
      client/src/pages/schema/Create.tsx
  21. 1 1
      client/src/pages/schema/IndexTypeElement.tsx
  22. 1 1
      client/src/pages/search/SearchParams.tsx
  23. 5 4
      client/src/pages/search/VectorSearch.tsx
  24. 1 5
      client/src/pages/system/DataCard.tsx
  25. 1 1
      client/src/pages/system/NodeListView.tsx
  26. 1 1
      client/src/pages/system/ProgressCard.tsx
  27. 1 1
      client/src/pages/system/SystemView.tsx
  28. 3 13
      client/src/pages/systemHealthy/ThresholdSetting.tsx
  29. 1 1
      client/src/pages/systemHealthy/Topology.tsx
  30. 1 1
      client/src/pages/user/CreateUser.tsx
  31. 1 1
      client/src/pages/user/Update.tsx
  32. 1 1
      client/src/pages/user/UpdateRoleDialog.tsx
  33. 1 1
      client/src/pages/user/Users.tsx
  34. 9 0
      client/src/utils/index.ts

+ 1 - 1
client/src/components/customInput/Types.ts

@@ -1,7 +1,7 @@
 import { ReactElement } from 'react';
 import { ReactElement } from 'react';
 import { InputLabelProps } from '@material-ui/core';
 import { InputLabelProps } from '@material-ui/core';
 import { IValidationItem } from '@/hooks';
 import { IValidationItem } from '@/hooks';
-import { IExtraParam, ValidType } from '@/utils/Validation';
+import { IExtraParam, ValidType } from '@/utils';
 
 
 export type InputType = 'icon' | 'adornment' | 'text' | undefined;
 export type InputType = 'icon' | 'adornment' | 'text' | undefined;
 export type VariantType = 'filled' | 'outlined' | 'standard';
 export type VariantType = 'filled' | 'outlined' | 'standard';

+ 1 - 1
client/src/context/Prometheus.tsx

@@ -8,7 +8,7 @@ import {
   LAST_TIME_PROMETHEUS_INSTANCE,
   LAST_TIME_PROMETHEUS_INSTANCE,
   LAST_TIME_PROMETHEUS_NAMESPACE,
   LAST_TIME_PROMETHEUS_NAMESPACE,
 } from '@/consts/Localstorage';
 } from '@/consts/Localstorage';
-import { formatPrometheusAddress } from '@/utils/Format';
+import { formatPrometheusAddress } from '@/utils';
 import { PrometheusHttp } from '@/http/Prometheus';
 import { PrometheusHttp } from '@/http/Prometheus';
 import {
 import {
   PROMETHEUS_ADDRESS,
   PROMETHEUS_ADDRESS,

+ 1 - 1
client/src/context/WebSocket.tsx

@@ -6,7 +6,7 @@ import { url } from '@/http/Axios';
 import { CollectionHttp } from '@/http/Collection';
 import { CollectionHttp } from '@/http/Collection';
 import { MilvusHttp } from '@/http/Milvus';
 import { MilvusHttp } from '@/http/Milvus';
 import { CollectionView } from '@/pages/collections/Types';
 import { CollectionView } from '@/pages/collections/Types';
-import { checkIndexBuilding, checkLoading } from '@/utils/Validation';
+import { checkIndexBuilding, checkLoading } from '@/utils';
 import { WebSocketType } from './Types';
 import { WebSocketType } from './Types';
 
 
 export const webSocketContext = createContext<WebSocketType>({
 export const webSocketContext = createContext<WebSocketType>({

+ 1 - 1
client/src/hooks/Result.tsx

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useTranslation } from 'react-i18next';
 import { ClassNameMap } from '@material-ui/styles/withStyles';
 import { ClassNameMap } from '@material-ui/styles/withStyles';
-import { detectItemType } from '@/utils/Common';
+import { detectItemType } from '@/utils';
 import CopyButton from '@/components/advancedSearch/CopyButton';
 import CopyButton from '@/components/advancedSearch/CopyButton';
 
 
 export const useSearchResult = (searchResult: any[], classes: ClassNameMap) => {
 export const useSearchResult = (searchResult: any[], classes: ClassNameMap) => {

+ 1 - 1
client/src/pages/collections/Collection.tsx

@@ -8,7 +8,7 @@ import { ALL_ROUTER_TYPES } from '@/router/Types';
 import CustomTabList from '@/components/customTabList/CustomTabList';
 import CustomTabList from '@/components/customTabList/CustomTabList';
 import { ITab } from '@/components/customTabList/Types';
 import { ITab } from '@/components/customTabList/Types';
 import Partitions from '../partitions/Partitions';
 import Partitions from '../partitions/Partitions';
-import { parseLocationSearch } from '@/utils/Format';
+import { parseLocationSearch } from '@/utils';
 import Schema from '../schema/Schema';
 import Schema from '../schema/Schema';
 import Query from '../query/Query';
 import Query from '../query/Query';
 import Preview from '../preview/Preview';
 import Preview from '../preview/Preview';

+ 1 - 1
client/src/pages/collections/Collections.tsx

@@ -32,7 +32,7 @@ import ImportSampleDialog from '../dialogs/ImportSampleDialog';
 import { MilvusHttp } from '@/http/Milvus';
 import { MilvusHttp } from '@/http/Milvus';
 import { LOADING_STATE } from '@/consts/Milvus';
 import { LOADING_STATE } from '@/consts/Milvus';
 import { WS_EVENTS, WS_EVENTS_TYPE } from '@/consts/Http';
 import { WS_EVENTS, WS_EVENTS_TYPE } from '@/consts/Http';
-import { checkIndexBuilding, checkLoading } from '@/utils/Validation';
+import { checkIndexBuilding, checkLoading } from '@/utils';
 import Aliases from './Aliases';
 import Aliases from './Aliases';
 
 
 const useStyles = makeStyles((theme: Theme) => ({
 const useStyles = makeStyles((theme: Theme) => ({

+ 3 - 3
client/src/pages/collections/CreateFields.tsx

@@ -11,13 +11,13 @@ import { useTranslation } from 'react-i18next';
 import CustomSelector from '@/components/customSelector/CustomSelector';
 import CustomSelector from '@/components/customSelector/CustomSelector';
 import icons from '@/components/icons/Icons';
 import icons from '@/components/icons/Icons';
 import CustomToolTip from '@/components/customToolTip/CustomToolTip';
 import CustomToolTip from '@/components/customToolTip/CustomToolTip';
-import { generateId } from '@/utils/Common';
-import { getCreateFieldType } from '@/utils/Format';
 import {
 import {
+  generateId,
+  getCreateFieldType,
   checkEmptyValid,
   checkEmptyValid,
   checkRange,
   checkRange,
   getCheckResult,
   getCheckResult,
-} from '@/utils/Validation';
+} from '@/utils';
 import {
 import {
   ALL_OPTIONS,
   ALL_OPTIONS,
   PRIMARY_FIELDS_OPTIONS,
   PRIMARY_FIELDS_OPTIONS,

+ 1 - 1
client/src/pages/connect/AuthForm.tsx

@@ -6,7 +6,7 @@ import CustomInput from '@/components/customInput/CustomInput';
 import icons from '@/components/icons/Icons';
 import icons from '@/components/icons/Icons';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
-import { formatForm } from '@/utils/Form';
+import { formatForm } from '@/utils';
 import { MilvusHttp } from '@/http/Milvus';
 import { MilvusHttp } from '@/http/Milvus';
 import { useNavigate } from 'react-router-dom';
 import { useNavigate } from 'react-router-dom';
 import { rootContext, authContext, prometheusContext } from '@/context';
 import { rootContext, authContext, prometheusContext } from '@/context';

+ 1 - 1
client/src/pages/database/Create.tsx

@@ -5,7 +5,7 @@ import DialogTemplate from '@/components/customDialog/DialogTemplate';
 import CustomInput from '@/components/customInput/CustomInput';
 import CustomInput from '@/components/customInput/CustomInput';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
-import { formatForm } from '@/utils/Form';
+import { formatForm } from '@/utils';
 import { CreateDatabaseProps, CreateDatabaseParams } from './Types';
 import { CreateDatabaseProps, CreateDatabaseParams } from './Types';
 
 
 const useStyles = makeStyles((theme: Theme) => ({
 const useStyles = makeStyles((theme: Theme) => ({

+ 1 - 1
client/src/pages/dialogs/CreateAliasDialog.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { rootContext } from '@/context';
 import { rootContext } from '@/context';
 import DialogTemplate from '@/components/customDialog/DialogTemplate';
 import DialogTemplate from '@/components/customDialog/DialogTemplate';
 import CustomInput from '@/components/customInput/CustomInput';
 import CustomInput from '@/components/customInput/CustomInput';
-import { formatForm } from '@/utils/Form';
+import { formatForm } from '@/utils';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { CollectionHttp } from '@/http/Collection';
 import { CollectionHttp } from '@/http/Collection';

+ 1 - 2
client/src/pages/dialogs/CreateCollectionDialog.tsx

@@ -7,8 +7,7 @@ import CustomSelector from '@/components/customSelector/CustomSelector';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { rootContext } from '@/context';
 import { rootContext } from '@/context';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
-import { formatForm } from '@/utils/Form';
-import { TypeEnum } from '@/utils/Validation';
+import { formatForm, TypeEnum } from '@/utils';
 import CreateFields from '../collections/CreateFields';
 import CreateFields from '../collections/CreateFields';
 import { CollectionHttp } from '@/http/Collection';
 import { CollectionHttp } from '@/http/Collection';
 import {
 import {

+ 1 - 1
client/src/pages/dialogs/CreatePartitionDialog.tsx

@@ -6,7 +6,7 @@ import DialogTemplate from '@/components/customDialog/DialogTemplate';
 import CustomInput from '@/components/customInput/CustomInput';
 import CustomInput from '@/components/customInput/CustomInput';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
-import { formatForm } from '@/utils/Form';
+import { formatForm } from '@/utils';
 import { PartitionCreateProps } from './Types';
 import { PartitionCreateProps } from './Types';
 import { PartitionManageParam } from '../partitions/Types';
 import { PartitionManageParam } from '../partitions/Types';
 import { ManageRequestMethods } from '../../types/Common';
 import { ManageRequestMethods } from '../../types/Common';

+ 1 - 2
client/src/pages/dialogs/LoadCollectionDialog.tsx

@@ -10,8 +10,7 @@ import { useTranslation } from 'react-i18next';
 import { authContext, rootContext } from '@/context';
 import { authContext, rootContext } from '@/context';
 import { CollectionHttp } from '@/http/Collection';
 import { CollectionHttp } from '@/http/Collection';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
-import { formatForm } from '@/utils/Form';
-import { parseJson, getNode } from '@/utils/Metric';
+import { formatForm, parseJson, getNode } from '@/utils';
 import CustomInput from '@/components/customInput/CustomInput';
 import CustomInput from '@/components/customInput/CustomInput';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import DialogTemplate from '@/components/customDialog/DialogTemplate';
 import DialogTemplate from '@/components/customDialog/DialogTemplate';

+ 1 - 1
client/src/pages/dialogs/RenameCollectionDialog.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { rootContext } from '@/context';
 import { rootContext } from '@/context';
 import DialogTemplate from '@/components/customDialog/DialogTemplate';
 import DialogTemplate from '@/components/customDialog/DialogTemplate';
 import CustomInput from '@/components/customInput/CustomInput';
 import CustomInput from '@/components/customInput/CustomInput';
-import { formatForm } from '@/utils/Form';
+import { formatForm } from '@/utils';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { CollectionHttp } from '@/http/Collection';
 import { CollectionHttp } from '@/http/Collection';

+ 1 - 1
client/src/pages/dialogs/insert/Dialog.tsx

@@ -15,7 +15,7 @@ import icons from '@/components/icons/Icons';
 import { rootContext } from '@/context';
 import { rootContext } from '@/context';
 import { Option } from '@/components/customSelector/Types';
 import { Option } from '@/components/customSelector/Types';
 import { PartitionHttp } from '@/http/Partition';
 import { PartitionHttp } from '@/http/Partition';
-import { combineHeadsAndData } from '@/utils/Insert';
+import { combineHeadsAndData } from '@/utils';
 import InsertImport from './Import';
 import InsertImport from './Import';
 import InsertPreview from './Preview';
 import InsertPreview from './Preview';
 import InsertStatus from './Status';
 import InsertStatus from './Status';

+ 1 - 1
client/src/pages/dialogs/insert/Import.tsx

@@ -5,7 +5,7 @@ import CustomSelector from '@/components/customSelector/CustomSelector';
 import { InsertImportProps } from './Types';
 import { InsertImportProps } from './Types';
 import Uploader from '@/components/uploader/Uploader';
 import Uploader from '@/components/uploader/Uploader';
 import { INSERT_CSV_SAMPLE, INSERT_MAX_SIZE } from '../../../consts/Insert';
 import { INSERT_CSV_SAMPLE, INSERT_MAX_SIZE } from '../../../consts/Insert';
-import { parseByte } from '@/utils/Format';
+import { parseByte } from '@/utils';
 
 
 const getStyles = makeStyles((theme: Theme) => ({
 const getStyles = makeStyles((theme: Theme) => ({
   tip: {
   tip: {

+ 1 - 1
client/src/pages/dialogs/insert/Preview.tsx

@@ -5,7 +5,7 @@ import { InsertPreviewProps } from './Types';
 import { Option } from '@/components/customSelector/Types';
 import { Option } from '@/components/customSelector/Types';
 import CustomSelector from '@/components/customSelector/CustomSelector';
 import CustomSelector from '@/components/customSelector/CustomSelector';
 import AttuGrid from '@/components/grid/Grid';
 import AttuGrid from '@/components/grid/Grid';
-import { transferCsvArrayToTableData } from '@/utils/Insert';
+import { transferCsvArrayToTableData } from '@/utils';
 import { ColDefinitionsType } from '@/components/grid/Types';
 import { ColDefinitionsType } from '@/components/grid/Types';
 import SimpleMenu from '@/components/menu/SimpleMenu';
 import SimpleMenu from '@/components/menu/SimpleMenu';
 import icons from '@/components/icons/Icons';
 import icons from '@/components/icons/Icons';

+ 1 - 2
client/src/pages/overview/Overview.tsx

@@ -10,8 +10,7 @@ import { useNavigationHook } from '@/hooks';
 import { CollectionHttp } from '@/http/Collection';
 import { CollectionHttp } from '@/http/Collection';
 import { MilvusHttp } from '@/http/Milvus';
 import { MilvusHttp } from '@/http/Milvus';
 import { ALL_ROUTER_TYPES } from '@/router/Types';
 import { ALL_ROUTER_TYPES } from '@/router/Types';
-import { formatNumber } from '@/utils/Common';
-import { checkLoading, checkIndexBuilding } from '@/utils/Validation';
+import { checkLoading, checkIndexBuilding, formatNumber } from '@/utils';
 import CollectionCard from './collectionCard/CollectionCard';
 import CollectionCard from './collectionCard/CollectionCard';
 import StatisticsCard from './statisticsCard/StatisticsCard';
 import StatisticsCard from './statisticsCard/StatisticsCard';
 
 

+ 1 - 1
client/src/pages/preview/Preview.tsx

@@ -8,7 +8,7 @@ import { IndexHttp } from '@/http/Index';
 import { usePaginationHook, useSearchResult } from '@/hooks';
 import { usePaginationHook, useSearchResult } from '@/hooks';
 import { ToolBarConfig } from '@/components/grid/Types';
 import { ToolBarConfig } from '@/components/grid/Types';
 import CustomToolBar from '@/components/grid/ToolBar';
 import CustomToolBar from '@/components/grid/ToolBar';
-import { generateVector } from '@/utils/Common';
+import { generateVector } from '@/utils';
 import { DataTypeEnum } from '@/pages/collections/Types';
 import { DataTypeEnum } from '@/pages/collections/Types';
 import { INDEX_CONFIG, DEFAULT_SEARCH_PARAM_VALUE_MAP } from '@/consts/Milvus';
 import { INDEX_CONFIG, DEFAULT_SEARCH_PARAM_VALUE_MAP } from '@/consts/Milvus';
 
 

+ 7 - 3
client/src/pages/schema/Create.tsx

@@ -9,13 +9,17 @@ import {
   INDEX_CONFIG,
   INDEX_CONFIG,
   INDEX_OPTIONS_MAP,
   INDEX_OPTIONS_MAP,
   METRIC_TYPES_VALUES,
   METRIC_TYPES_VALUES,
-} from '../../consts/Milvus';
+} from '@/consts/Milvus';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
 import { getCreateIndexJSCode } from '@/utils/code/Js';
 import { getCreateIndexJSCode } from '@/utils/code/Js';
 import { getCreateIndexPYCode } from '@/utils/code/Py';
 import { getCreateIndexPYCode } from '@/utils/code/Py';
 import { getCreateIndexJavaCode } from '@/utils/code/Java';
 import { getCreateIndexJavaCode } from '@/utils/code/Java';
-import { formatForm, getMetricOptions } from '@/utils/Form';
-import { computMilvusRecommonds, formatSize } from '@/utils/SizingTool';
+import {
+  formatForm,
+  getMetricOptions,
+  computMilvusRecommonds,
+  formatSize,
+} from '@/utils';
 import { DataTypeEnum, DataTypeStringEnum } from '../collections/Types';
 import { DataTypeEnum, DataTypeStringEnum } from '../collections/Types';
 import CreateForm from './CreateForm';
 import CreateForm from './CreateForm';
 import SizingInfo from './SizingInfo';
 import SizingInfo from './SizingInfo';

+ 1 - 1
client/src/pages/schema/IndexTypeElement.tsx

@@ -16,7 +16,7 @@ import CreateIndex from './Create';
 import DeleteTemplate from '@/components/customDialog/DeleteDialogTemplate';
 import DeleteTemplate from '@/components/customDialog/DeleteDialogTemplate';
 import StatusIcon from '@/components/status/StatusIcon';
 import StatusIcon from '@/components/status/StatusIcon';
 import { ChildrenStatusType } from '@/components/status/Types';
 import { ChildrenStatusType } from '@/components/status/Types';
-import { sleep } from '@/utils/Common';
+import { sleep } from '@/utils';
 
 
 const useStyles = makeStyles((theme: Theme) => ({
 const useStyles = makeStyles((theme: Theme) => ({
   wrapper: {
   wrapper: {

+ 1 - 1
client/src/pages/search/SearchParams.tsx

@@ -14,7 +14,7 @@ import {
 } from '@/consts/Milvus';
 } from '@/consts/Milvus';
 import { rootContext } from '@/context';
 import { rootContext } from '@/context';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
-import { formatForm } from '@/utils/Form';
+import { formatForm } from '@/utils';
 import { SearchParamInputConfig, SearchParamsProps } from './Types';
 import { SearchParamInputConfig, SearchParamsProps } from './Types';
 
 
 const getStyles = makeStyles((theme: Theme) => ({
 const getStyles = makeStyles((theme: Theme) => ({

+ 5 - 4
client/src/pages/search/VectorSearch.tsx

@@ -23,16 +23,17 @@ import { Field } from '@/components/advancedSearch/Types';
 import { CustomDatePicker } from '@/components/customDatePicker/CustomDatePicker';
 import { CustomDatePicker } from '@/components/customDatePicker/CustomDatePicker';
 import { CollectionHttp } from '@/http/Collection';
 import { CollectionHttp } from '@/http/Collection';
 import { IndexHttp } from '@/http/Index';
 import { IndexHttp } from '@/http/Index';
-import { parseValue } from '@/utils/Insert';
 import {
 import {
+  parseValue,
+  parseLocationSearch,
   classifyFields,
   classifyFields,
   getDefaultIndexType,
   getDefaultIndexType,
   getEmbeddingType,
   getEmbeddingType,
   getNonVectorFieldsForFilter,
   getNonVectorFieldsForFilter,
   getVectorFieldOptions,
   getVectorFieldOptions,
-} from '@/utils/search';
-import { parseLocationSearch } from '@/utils/Format';
-import { cloneObj, generateVector } from '@/utils/Common';
+  cloneObj,
+  generateVector,
+} from '@/utils';
 import { LOADING_STATE } from '@/consts/Milvus';
 import { LOADING_STATE } from '@/consts/Milvus';
 import { DEFAULT_METRIC_VALUE_MAP } from '@/consts/Milvus';
 import { DEFAULT_METRIC_VALUE_MAP } from '@/consts/Milvus';
 import { getLabelDisplayedRows } from './Utils';
 import { getLabelDisplayedRows } from './Utils';

+ 1 - 5
client/src/pages/system/DataCard.tsx

@@ -2,11 +2,7 @@ import { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useTranslation } from 'react-i18next';
 import { makeStyles, useTheme } from '@material-ui/core';
 import { makeStyles, useTheme } from '@material-ui/core';
 import Progress from './Progress';
 import Progress from './Progress';
-import {
-  formatByteSize,
-  formatSystemTime,
-  getByteString,
-} from '@/utils/Format';
+import { formatByteSize, formatSystemTime, getByteString } from '@/utils';
 import { DataProgressProps, DataSectionProps, DataCardProps } from './Types';
 import { DataProgressProps, DataSectionProps, DataCardProps } from './Types';
 
 
 const getStyles = makeStyles(theme => ({
 const getStyles = makeStyles(theme => ({

+ 1 - 1
client/src/pages/system/NodeListView.tsx

@@ -6,7 +6,7 @@ import { DataGrid } from '@mui/x-data-grid';
 import { useNavigationHook } from '@/hooks';
 import { useNavigationHook } from '@/hooks';
 import { ALL_ROUTER_TYPES } from '@/router/Types';
 import { ALL_ROUTER_TYPES } from '@/router/Types';
 import MiniTopo from './MiniTopology';
 import MiniTopo from './MiniTopology';
-import { getByteString, formatByteSize } from '@/utils/Format';
+import { getByteString, formatByteSize } from '@/utils';
 import DataCard from './DataCard';
 import DataCard from './DataCard';
 import { NodeListViewProps, Node } from './Types';
 import { NodeListViewProps, Node } from './Types';
 
 

+ 1 - 1
client/src/pages/system/ProgressCard.tsx

@@ -3,7 +3,7 @@ import { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useTranslation } from 'react-i18next';
 import BaseCard from './BaseCard';
 import BaseCard from './BaseCard';
 import Progress from './Progress';
 import Progress from './Progress';
-import { getByteString } from '@/utils/Format';
+import { getByteString } from '@/utils';
 import { ProgressCardProps } from './Types';
 import { ProgressCardProps } from './Types';
 
 
 const color1 = '#06F3AF';
 const color1 = '#06F3AF';

+ 1 - 1
client/src/pages/system/SystemView.tsx

@@ -10,7 +10,7 @@ import NodeListView from './NodeListView';
 // import LineChartCard from './LineChartCard';
 // import LineChartCard from './LineChartCard';
 // import ProgressCard from './ProgressCard';
 // import ProgressCard from './ProgressCard';
 import DataCard from './DataCard';
 import DataCard from './DataCard';
-import { parseJson } from '@/utils/Metric';
+import { parseJson } from '@/utils';
 
 
 const getStyles = makeStyles((theme: Theme) => ({
 const getStyles = makeStyles((theme: Theme) => ({
   root: {
   root: {

+ 3 - 13
client/src/pages/systemHealthy/ThresholdSetting.tsx

@@ -1,19 +1,9 @@
-import {
-  Button,
-  Dialog,
-  DialogTitle,
-  Input,
-  List,
-  ListItem,
-  makeStyles,
-  Theme,
-  Typography,
-} from '@material-ui/core';
-import { Dispatch, SetStateAction, useMemo, useState } from 'react';
+import { Dialog, makeStyles, Theme } from '@material-ui/core';
+import { useMemo, useState } from 'react';
 import CustomInput from '@/components/customInput/CustomInput';
 import CustomInput from '@/components/customInput/CustomInput';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
-import { formatForm } from '@/utils/Form';
+import { formatForm } from '@/utils';
 import { HEALTHY_STATUS_COLORS } from './consts';
 import { HEALTHY_STATUS_COLORS } from './consts';
 import { EHealthyStatus, IThreshold } from './Types';
 import { EHealthyStatus, IThreshold } from './Types';
 import SettingsOutlinedIcon from '@material-ui/icons/SettingsOutlined';
 import SettingsOutlinedIcon from '@material-ui/icons/SettingsOutlined';

+ 1 - 1
client/src/pages/systemHealthy/Topology.tsx

@@ -9,7 +9,7 @@ import {
 import { getIcon } from './getIcon';
 import { getIcon } from './getIcon';
 import { ENodeService, ENodeType, INodeTreeStructure } from './Types';
 import { ENodeService, ENodeType, INodeTreeStructure } from './Types';
 import clsx from 'clsx';
 import clsx from 'clsx';
-import { formatPrometheusAddress } from '@/utils/Format';
+import { formatPrometheusAddress } from '@/utils';
 import { prometheusContext } from '@/context';
 import { prometheusContext } from '@/context';
 
 
 const getStyles = makeStyles((theme: Theme) => ({
 const getStyles = makeStyles((theme: Theme) => ({

+ 1 - 1
client/src/pages/user/CreateUser.tsx

@@ -12,7 +12,7 @@ import DialogTemplate from '@/components/customDialog/DialogTemplate';
 import CustomInput from '@/components/customInput/CustomInput';
 import CustomInput from '@/components/customInput/CustomInput';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
-import { formatForm } from '@/utils/Form';
+import { formatForm } from '@/utils';
 import { CreateUserProps, CreateUserParams } from './Types';
 import { CreateUserProps, CreateUserParams } from './Types';
 import { Option as RoleOption } from '@/components/customSelector/Types';
 import { Option as RoleOption } from '@/components/customSelector/Types';
 
 

+ 1 - 1
client/src/pages/user/Update.tsx

@@ -5,7 +5,7 @@ import DialogTemplate from '@/components/customDialog/DialogTemplate';
 import CustomInput from '@/components/customInput/CustomInput';
 import CustomInput from '@/components/customInput/CustomInput';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
-import { formatForm } from '@/utils/Form';
+import { formatForm } from '@/utils';
 import { UpdateUserParams, UpdateUserProps } from './Types';
 import { UpdateUserParams, UpdateUserProps } from './Types';
 
 
 const useStyles = makeStyles((theme: Theme) => ({
 const useStyles = makeStyles((theme: Theme) => ({

+ 1 - 1
client/src/pages/user/UpdateRoleDialog.tsx

@@ -5,7 +5,7 @@ import DialogTemplate from '@/components/customDialog/DialogTemplate';
 import CustomInput from '@/components/customInput/CustomInput';
 import CustomInput from '@/components/customInput/CustomInput';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { ITextfieldConfig } from '@/components/customInput/Types';
 import { useFormValidation } from '@/hooks';
 import { useFormValidation } from '@/hooks';
-import { formatForm } from '@/utils/Form';
+import { formatForm } from '@/utils';
 import { UserHttp } from '@/http/User';
 import { UserHttp } from '@/http/User';
 import {
 import {
   CreateRoleProps,
   CreateRoleProps,

+ 1 - 1
client/src/pages/user/Users.tsx

@@ -6,7 +6,7 @@ import { useNavigationHook } from '@/hooks';
 import { ALL_ROUTER_TYPES } from '@/router/Types';
 import { ALL_ROUTER_TYPES } from '@/router/Types';
 import CustomTabList from '@/components/customTabList/CustomTabList';
 import CustomTabList from '@/components/customTabList/CustomTabList';
 import { ITab } from '@/components/customTabList/Types';
 import { ITab } from '@/components/customTabList/Types';
-import { parseLocationSearch } from '@/utils/Format';
+import { parseLocationSearch } from '@/utils';
 import User from './User';
 import User from './User';
 import Roles from './Roles';
 import Roles from './Roles';
 import { TAB_ENUM } from './Types';
 import { TAB_ENUM } from './Types';

+ 9 - 0
client/src/utils/index.ts

@@ -0,0 +1,9 @@
+export * from './Common';
+export * from './Form';
+export * from './Format';
+export * from './Insert';
+export * from './Metric';
+export * from './search';
+export * from './SizingTool';
+export * from './Sort';
+export * from './Validation';