fix: reset filter in export modal
This commit is contained in:
@@ -27,7 +27,7 @@ const ExportData: React.FC<{
|
|||||||
selectedModels,
|
selectedModels,
|
||||||
query,
|
query,
|
||||||
setQuery,
|
setQuery,
|
||||||
handleExport,
|
resetQuery,
|
||||||
handleDateChange,
|
handleDateChange,
|
||||||
handleUsersChange,
|
handleUsersChange,
|
||||||
handleModelsChange
|
handleModelsChange
|
||||||
@@ -105,7 +105,6 @@ const ExportData: React.FC<{
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
console.log('export data: ', modelList);
|
|
||||||
const handleSubmit = () => {
|
const handleSubmit = () => {
|
||||||
const fileName = `usage-data_${query.start_date || ''}_${query.end_date || ''}.xlsx`;
|
const fileName = `usage-data_${query.start_date || ''}_${query.end_date || ''}.xlsx`;
|
||||||
exportJsonToExcel({
|
exportJsonToExcel({
|
||||||
@@ -133,6 +132,11 @@ const ExportData: React.FC<{
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleOnCancel = () => {
|
||||||
|
onCancel?.();
|
||||||
|
resetQuery();
|
||||||
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (open) {
|
if (open) {
|
||||||
init();
|
init();
|
||||||
@@ -157,7 +161,7 @@ const ExportData: React.FC<{
|
|||||||
title={intl.formatMessage({ id: 'dashboard.usage.export' })}
|
title={intl.formatMessage({ id: 'dashboard.usage.export' })}
|
||||||
open={open}
|
open={open}
|
||||||
centered={false}
|
centered={false}
|
||||||
onCancel={onCancel}
|
onCancel={handleOnCancel}
|
||||||
destroyOnHidden={true}
|
destroyOnHidden={true}
|
||||||
closeIcon={true}
|
closeIcon={true}
|
||||||
maskClosable={false}
|
maskClosable={false}
|
||||||
@@ -169,7 +173,7 @@ const ExportData: React.FC<{
|
|||||||
footer={
|
footer={
|
||||||
<ModalFooter
|
<ModalFooter
|
||||||
onOk={handleSubmit}
|
onOk={handleSubmit}
|
||||||
onCancel={onCancel}
|
onCancel={handleOnCancel}
|
||||||
okText={intl.formatMessage({ id: 'common.button.export' })}
|
okText={intl.formatMessage({ id: 'common.button.export' })}
|
||||||
></ModalFooter>
|
></ModalFooter>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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 useTargetSourceModels from '@/pages/model-routes/hooks/use-target-source-models';
|
||||||
import { queryUsersList } from '@/pages/users/apis';
|
import { queryUsersList } from '@/pages/users/apis';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
@@ -107,7 +105,6 @@ export default function useUseageData<T>(config: {
|
|||||||
});
|
});
|
||||||
const { sourceModels: modelList, fetchSourceModels } =
|
const { sourceModels: modelList, fetchSourceModels } =
|
||||||
useTargetSourceModels();
|
useTargetSourceModels();
|
||||||
const [models, setModelList] = useState<Global.BaseOption<string>[]>([]);
|
|
||||||
const [userList, setUserList] = useState<Global.BaseOption<string>[]>([]);
|
const [userList, setUserList] = useState<Global.BaseOption<string>[]>([]);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const [selectedModels, setSelectedModels] = useState<string[][]>([]);
|
const [selectedModels, setSelectedModels] = useState<string[][]>([]);
|
||||||
@@ -214,25 +211,6 @@ export default function useUseageData<T>(config: {
|
|||||||
};
|
};
|
||||||
}, [result, url]);
|
}, [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 () => {
|
const fetchUsersList = async () => {
|
||||||
try {
|
try {
|
||||||
const params = {
|
const params = {
|
||||||
@@ -333,6 +311,19 @@ export default function useUseageData<T>(config: {
|
|||||||
fetchUsageData({ ...query, ...generateModelsValue(value) });
|
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 = () => {
|
const init = () => {
|
||||||
fetchUsageData(query);
|
fetchUsageData(query);
|
||||||
fetchSourceModels();
|
fetchSourceModels();
|
||||||
@@ -355,6 +346,7 @@ export default function useUseageData<T>(config: {
|
|||||||
handleExport,
|
handleExport,
|
||||||
handleDateChange,
|
handleDateChange,
|
||||||
handleUsersChange,
|
handleUsersChange,
|
||||||
handleModelsChange
|
handleModelsChange,
|
||||||
|
resetQuery
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user