diff --git a/src/components/delete-modal/index.tsx b/src/components/delete-modal/index.tsx index 754675c4..db4ad06a 100644 --- a/src/components/delete-modal/index.tsx +++ b/src/components/delete-modal/index.tsx @@ -35,6 +35,8 @@ const useStyles = createStyles(({ css }) => ({ white-space: pre-line; span { color: var(--ant-color-text); + display: flex; + margin-top: 8px; } ` })); diff --git a/src/pages/dashboard/components/usage-inner/export-data.tsx b/src/pages/dashboard/components/usage-inner/export-data.tsx index 7602510f..e7c996d7 100644 --- a/src/pages/dashboard/components/usage-inner/export-data.tsx +++ b/src/pages/dashboard/components/usage-inner/export-data.tsx @@ -29,7 +29,8 @@ const ExportData: React.FC<{ } = useUsageData<{ items: TableRow[]; }>({ - url: DASHBOARD_USAGE_API + url: DASHBOARD_USAGE_API, + disabledDate: false }); const exportTableColumns: TableColumnType[] = [ diff --git a/src/pages/dashboard/components/usage-inner/index.tsx b/src/pages/dashboard/components/usage-inner/index.tsx index 433f3098..028a3e24 100644 --- a/src/pages/dashboard/components/usage-inner/index.tsx +++ b/src/pages/dashboard/components/usage-inner/index.tsx @@ -24,6 +24,7 @@ const UsageInner: FC<{ paddingRight: string }> = ({ paddingRight }) => { const { usageData, handleOnCancel, handleExport, FilterBar, init, open } = useUsageData({ url: DASHBOARD_STATS_API, + disabledDate: true, defaultData: { api_request_history: [], completion_token_history: [], diff --git a/src/pages/dashboard/components/usage-inner/request-token-inner.tsx b/src/pages/dashboard/components/usage-inner/request-token-inner.tsx index 2450f3e1..3da203b6 100644 --- a/src/pages/dashboard/components/usage-inner/request-token-inner.tsx +++ b/src/pages/dashboard/components/usage-inner/request-token-inner.tsx @@ -80,7 +80,7 @@ const legendData = [ ]; const RequestTokenInner: React.FC = (props) => { - const { requestData, tokenData, xAxisData, onExport } = props; + const { requestData, tokenData, xAxisData } = props; const totalData = useMemo(() => { const data: Record = { diff --git a/src/pages/dashboard/components/usage-inner/use-usage-data.tsx b/src/pages/dashboard/components/usage-inner/use-usage-data.tsx index 202e8986..0cbb6537 100644 --- a/src/pages/dashboard/components/usage-inner/use-usage-data.tsx +++ b/src/pages/dashboard/components/usage-inner/use-usage-data.tsx @@ -42,10 +42,10 @@ interface RequestTokenData { xAxisData: string[]; } -interface TopUserData { - userData: { name: string; value: number }[]; - topUserList: string[]; -} +const DefaultDateConfig = { + maxRange: 60, + defaultRange: 30 +}; const getLast30Days = () => { const dates: string[] = []; @@ -94,14 +94,16 @@ const generateData = (dateRage: string[], valueMap: Map) => { export default function useUseageData(config: { url: string; defaultData?: T; + disabledDate?: boolean; }) { - const { url, defaultData } = config || {}; + const { url, defaultData, disabledDate = false } = config || {}; const intl = useIntl(); const { TagRender } = useSelectRender({ maxTagWidth: 100 }); const { disabledRangeDaysDate, rangePresets } = useRangePickerPreset({ - range: 60 + range: DefaultDateConfig.maxRange, + disabledDate: disabledDate }); const [open, setOpen] = useState(false); const [result, setResult] = useState<{ @@ -109,7 +111,9 @@ export default function useUseageData(config: { end_date?: string; data: T; }>({ - start_date: dayjs().subtract(30, 'days').format('YYYY-MM-DD'), + start_date: dayjs() + .subtract(DefaultDateConfig.defaultRange, 'days') + .format('YYYY-MM-DD'), end_date: dayjs().format('YYYY-MM-DD'), data: defaultData as T }); @@ -120,7 +124,9 @@ export default function useUseageData(config: { model_ids: number[]; user_ids: number[]; }>({ - start_date: dayjs().subtract(30, 'days').format('YYYY-MM-DD'), + start_date: dayjs() + .subtract(DefaultDateConfig.defaultRange, 'days') + .format('YYYY-MM-DD'), end_date: dayjs().format('YYYY-MM-DD'), model_ids: [], user_ids: [] @@ -318,11 +324,15 @@ export default function useUseageData(config: { }; const FilterBar = () => { + const filterOptions = (inputValue: any, option: any) => { + return option.label?.toLowerCase().includes(inputValue.toLowerCase()); + }; return (
(config: { >