diff --git a/src/pages/dashboard/components/usage-inner/export-data.tsx b/src/pages/dashboard/components/usage-inner/export-data.tsx
index 00af7db8..a67409bf 100644
--- a/src/pages/dashboard/components/usage-inner/export-data.tsx
+++ b/src/pages/dashboard/components/usage-inner/export-data.tsx
@@ -27,7 +27,7 @@ const ExportData: React.FC<{
selectedModels,
query,
setQuery,
- handleExport,
+ resetQuery,
handleDateChange,
handleUsersChange,
handleModelsChange
@@ -105,7 +105,6 @@ const ExportData: React.FC<{
}
];
- console.log('export data: ', modelList);
const handleSubmit = () => {
const fileName = `usage-data_${query.start_date || ''}_${query.end_date || ''}.xlsx`;
exportJsonToExcel({
@@ -133,6 +132,11 @@ const ExportData: React.FC<{
});
};
+ const handleOnCancel = () => {
+ onCancel?.();
+ resetQuery();
+ };
+
useEffect(() => {
if (open) {
init();
@@ -157,7 +161,7 @@ const ExportData: React.FC<{
title={intl.formatMessage({ id: 'dashboard.usage.export' })}
open={open}
centered={false}
- onCancel={onCancel}
+ onCancel={handleOnCancel}
destroyOnHidden={true}
closeIcon={true}
maskClosable={false}
@@ -169,7 +173,7 @@ const ExportData: React.FC<{
footer={
}
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 a6d24f43..f91b8e5b 100644
--- a/src/pages/dashboard/components/usage-inner/use-usage-data.tsx
+++ b/src/pages/dashboard/components/usage-inner/use-usage-data.tsx
@@ -1,5 +1,3 @@
-import { queryModelsList } from '@/pages/llmodels/apis';
-import { ListItem as ModelListItem } from '@/pages/llmodels/config/types';
import useTargetSourceModels from '@/pages/model-routes/hooks/use-target-source-models';
import { queryUsersList } from '@/pages/users/apis';
import dayjs from 'dayjs';
@@ -107,7 +105,6 @@ export default function useUseageData(config: {
});
const { sourceModels: modelList, fetchSourceModels } =
useTargetSourceModels();
- const [models, setModelList] = useState[]>([]);
const [userList, setUserList] = useState[]>([]);
const [loading, setLoading] = useState(false);
const [selectedModels, setSelectedModels] = useState([]);
@@ -214,25 +211,6 @@ export default function useUseageData(config: {
};
}, [result, url]);
- const fetchModelsList = async () => {
- try {
- const params = {
- page: -1
- };
-
- const response = await queryModelsList(params);
- const list = _.map(response.items || [], (item: ModelListItem) => {
- return {
- label: item.name,
- value: item.id
- };
- });
- setModelList(list);
- } catch (error) {
- setModelList([]);
- }
- };
-
const fetchUsersList = async () => {
try {
const params = {
@@ -333,6 +311,19 @@ export default function useUseageData(config: {
fetchUsageData({ ...query, ...generateModelsValue(value) });
};
+ const resetQuery = () => {
+ setQuery({
+ start_date: dayjs()
+ .subtract(DefaultDateConfig.defaultRange, 'days')
+ .format('YYYY-MM-DD'),
+ end_date: dayjs().format('YYYY-MM-DD'),
+ model_ids: [],
+ user_ids: [],
+ provider_model_names: []
+ });
+ setSelectedModels([]);
+ };
+
const init = () => {
fetchUsageData(query);
fetchSourceModels();
@@ -355,6 +346,7 @@ export default function useUseageData(config: {
handleExport,
handleDateChange,
handleUsersChange,
- handleModelsChange
+ handleModelsChange,
+ resetQuery
};
}