IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

items are fetched by batch of 100

Browse Source
This commit is contained in:
Vladimir Khvan 2023-06-07 21:22:24 +05:00
parent 01497dbe8f
commit 8bb8d59770
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/index.js
View File

@ -14,12 +14,7 @@ const WebhookWrapper = styled.div`
`;
const WebhookHistory = (props) => {
const {
historyItems,
fetchHistoryItems,
emptyCheckedIds,
clearHistoryFilters,
} = props;
const { historyItems, fetchHistoryItems, emptyCheckedIds, clearHistoryFilters } = props;
const [isFetchFinished, setIsFetchFinished] = useState(false);
const [isPending, startTransition] = useTransition();
@ -29,7 +24,6 @@ const WebhookHistory = (props) => {
const fetchItems = async () => {
await fetchHistoryItems({
configId: id,
count: 30,
});
setIsFetchFinished(true);
};
@ -42,7 +36,7 @@ const WebhookHistory = (props) => {
const applyFilters = async ({ deliveryFrom, deliveryTo, groupStatus }) => {
emptyCheckedIds();
const params = { configId: id, deliveryFrom, deliveryTo, groupStatus, count: 30 };
const params = { configId: id, deliveryFrom, deliveryTo, groupStatus };
await fetchHistoryItems(params);
};
@ -64,12 +58,7 @@ const WebhookHistory = (props) => {
};
export default inject(({ webhooksStore }) => {
const {
historyItems,
fetchHistoryItems,
emptyCheckedIds,
clearHistoryFilters,
} = webhooksStore;
const { historyItems, fetchHistoryItems, emptyCheckedIds, clearHistoryFilters } = webhooksStore;
return {
historyItems,

1
packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/HistoryHeader.js
View File

@ -124,7 +124,6 @@ const HistoryHeader = (props) => {
await retryWebhookEvents(checkedEventIds);
fetchHistoryItems({
configId: id,
count: 30,
});
toastr.success(
`${t("WebhookRedilivered")}: ${checkedEventIds.length}`,

2
packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/WebhookHistoryTable/HistoryRowView/index.js
View File

@ -54,7 +54,7 @@ const HistoryRowView = (props) => {
const fetchMoreFiles = () => {
const params = historyFilters === null ? {} : formatFilters(historyFilters);
fetchMoreItems({ ...params, configId: id, count: 10 });
fetchMoreItems({ ...params, configId: id });
};
return (

2
packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/WebhookHistoryTable/HistoryTableView/index.js
View File

@ -78,7 +78,7 @@ const HistoryTableView = (props) => {
const fetchMoreFiles = () => {
const params = historyFilters === null ? {} : formatFilters(historyFilters);
fetchMoreItems({ ...params, configId: id, count: 10 });
fetchMoreItems({ ...params, configId: id });
};
const columnStorageName = `${COLUMNS_SIZE}=${userId}`;

22
packages/client/src/store/WebhooksStore.js
View File

@ -20,6 +20,7 @@ class WebhooksStore {
developerToolsTab = 0;
currentWebhook = {};
eventDetails = {};
FETCH_COUNT = 100;
constructor() {
makeAutoObservable(this);
@ -110,18 +111,29 @@ class WebhooksStore {
};
fetchHistoryItems = async (params) => {
this.totalItems = 0;
this.startIndex = 0;
const historyData = await getWebhooksJournal({ ...params, startIndex: this.startIndex });
const count = params.count ? params.count : this.FETCH_COUNT;
const historyData = await getWebhooksJournal({
...params,
startIndex: this.startIndex,
count: count,
});
runInAction(() => {
this.startIndex = params.count;
this.startIndex = count;
this.historyItems = historyData.items;
this.totalItems = historyData.total;
});
};
fetchMoreItems = async (params) => {
const historyData = await getWebhooksJournal({ ...params, startIndex: this.startIndex });
const count = params.count ? params.count : this.FETCH_COUNT;
const historyData = await getWebhooksJournal({
...params,
startIndex: this.startIndex,
count: count,
});
runInAction(() => {
this.startIndex = this.startIndex + params.count;
this.startIndex = this.startIndex + count;
this.historyItems = [...this.historyItems, ...historyData.items];
});
};
@ -130,7 +142,7 @@ class WebhooksStore {
this.eventDetails = data.items[0];
};
get hasMoreItems() {
return this.totalItems > this.historyItems.length;
return this.totalItems > this.startIndex;
}
get isWebhooksEmpty() {