Skip to content

Commit e025402

Browse files
author
Jicheng Lu
committed
refine pagination
1 parent d03546c commit e025402

File tree

6 files changed

+41
-81
lines changed

6 files changed

+41
-81
lines changed

‎src/lib/helpers/utils/common.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@ export function setUrlQueryParams(url, pairs, callback) {
121121

122122
/**
123123
* @param {string} url
124-
* @param {boolean} replaceState
124+
* @param {{ replaceState?: boolean, noScroll?: boolean }} [opts]
125125
*/
126-
export function goToUrl(url, replaceState = true) {
127-
goto(url, { replaceState: replaceState });
126+
export function goToUrl(url, opts = {}) {
127+
const { replaceState = true, noScroll = true } = opts;
128+
goto(url, { replaceState, noScroll });
128129
}

‎src/routes/page/agent/+page.svelte‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@
7777
}
7878
};
7979
80-
setUrlQueryParams($page.url, [
81-
{ key: 'page', value: `${filter.pager.page}` },
82-
{ key: 'pageSize', value: `${filter.pager.size}` }
83-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
84-
8580
user = await myInfo();
8681
getPagedAgents();
8782
getAgentLabelOptions();
@@ -100,10 +95,6 @@
10095
similarName: event.payload || null
10196
};
10297
103-
setUrlQueryParams($page.url, [
104-
{ key: 'page', value: `${filter.pager.page}` }
105-
], () => () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
106-
10798
getPagedAgents();
10899
});
109100
});
@@ -173,12 +164,17 @@
173164
}
174165
175166
/** @param {number} totalItemsCount */
176-
function refreshPager(totalItemsCount, page = firstPage) {
167+
function refreshPager(totalItemsCount, pageNum = firstPage) {
177168
pager = {
178169
...filter.pager,
179-
page: page,
170+
page: pageNum,
180171
count: totalItemsCount || 0
181172
};
173+
174+
setUrlQueryParams($page.url, [
175+
{ key: 'page', value: `${pager.page}` },
176+
{ key: 'pageSize', value: `${pager.size}` }
177+
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
182178
}
183179
184180
/**
@@ -195,10 +191,6 @@
195191
pager: pager
196192
};
197193
198-
setUrlQueryParams($page.url, [
199-
{ key: 'page', value: `${pageNum}` }
200-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
201-
202194
getPagedAgents();
203195
}
204196

‎src/routes/page/conversation/+page.svelte‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@
101101
}
102102
};
103103
104-
setUrlQueryParams($page.url, [
105-
{ key: 'page', value: `${filter.pager.page}` },
106-
{ key: 'pageSize', value: `${filter.pager.size}` }
107-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
108-
109104
isLoading = true;
110105
Promise.all([
111106
loadAgentOptions(),
@@ -161,12 +156,17 @@
161156
}
162157
163158
/** @param {number} totalItemsCount */
164-
function refreshPager(totalItemsCount, page = firstPage) {
159+
function refreshPager(totalItemsCount, pageNum = firstPage) {
165160
pager = {
166161
...filter.pager,
167-
page: page,
162+
page: pageNum,
168163
count: totalItemsCount
169164
};
165+
166+
setUrlQueryParams($page.url, [
167+
{ key: 'page', value: `${pager.page}` },
168+
{ key: 'pageSize', value: `${pager.size}` }
169+
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
170170
}
171171
172172
/** @param {number} pageNum */
@@ -181,15 +181,12 @@
181181
pager: pager
182182
};
183183
184-
setUrlQueryParams($page.url, [
185-
{ key: 'page', value: `${pageNum}` }
186-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
187-
188184
getPagedConversations();
189185
}
190186
191187
192188
async function reloadConversations() {
189+
initFilterPager();
193190
conversations = await getConversations({ ...filter });
194191
refreshPager(conversations.count);
195192
}
@@ -246,10 +243,6 @@
246243
count: 0
247244
}
248245
};
249-
250-
setUrlQueryParams($page.url, [
251-
{ key: 'page', value: `${filter.pager.page}` }
252-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
253246
}
254247
255248
/**

‎src/routes/page/instruction/log/+page.svelte‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,6 @@
7676
page: pageNum,
7777
size: pageSizeNum
7878
};
79-
80-
setUrlQueryParams($page.url, [
81-
{ key: 'page', value: `${filter.page}` },
82-
{ key: 'pageSize', value: `${filter.size}` }
83-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
8479
8580
Promise.all([
8681
initAgentOptions(),
@@ -155,12 +150,17 @@
155150
}
156151
157152
/** @param {number} totalItemsCount */
158-
function refreshPager(totalItemsCount, page = firstPage) {
153+
function refreshPager(totalItemsCount, pageNum = firstPage) {
159154
pager = {
160155
...filter,
161-
page: page,
156+
page: pageNum,
162157
count: totalItemsCount
163158
};
159+
160+
setUrlQueryParams($page.url, [
161+
{ key: 'page', value: `${pager.page}` },
162+
{ key: 'pageSize', value: `${pager.size}` }
163+
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
164164
}
165165
166166
/**
@@ -224,10 +224,6 @@
224224
templateNames: template ? [template] : [],
225225
states: states
226226
};
227-
228-
setUrlQueryParams($page.url, [
229-
{ key: 'page', value: `${firstPage}` }
230-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
231227
}
232228
233229
function getSearchStates() {
@@ -246,10 +242,6 @@
246242
page: pageNum
247243
};
248244
249-
setUrlQueryParams($page.url, [
250-
{ key: 'page', value: `${pageNum}` }
251-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
252-
253245
getPagedInstructionLogs();
254246
}
255247
@@ -295,7 +287,7 @@
295287
</div>
296288
<div class="search-btn-text">{'State Search'}</div>
297289
</div>
298-
</Button>
290+
</Button>
299291
</div>
300292
</div>
301293
</CardBody>

‎src/routes/page/plugin/+page.svelte‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@
5151
}
5252
};
5353
54-
setUrlQueryParams($page.url, [
55-
{ key: 'page', value: `${filter.pager.page}` },
56-
{ key: 'pageSize', value: `${filter.pager.size}` }
57-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
58-
5954
await getPagedPlugins();
6055
6156
unsubscriber = globalEventStore.subscribe((/** @type {import('$commonTypes').GlobalEvent} */ event) => {
@@ -69,9 +64,6 @@
6964
},
7065
similarName: event.payload || null
7166
};
72-
setUrlQueryParams($page.url, [
73-
{ key: 'page', value: `${filter.pager.page}` }
74-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
7567
7668
getPagedPlugins();
7769
});
@@ -104,22 +96,23 @@
10496
}
10597
10698
/** @param {number} totalItemsCount */
107-
function refreshPager(totalItemsCount, page = firstPage) {
99+
function refreshPager(totalItemsCount, pageNum = firstPage) {
108100
pager = {
109101
...filter.pager,
110-
page: page,
102+
page: pageNum,
111103
count: totalItemsCount || 0
112104
};
105+
106+
setUrlQueryParams($page.url, [
107+
{ key: 'page', value: `${pager.page}` },
108+
{ key: 'pageSize', value: `${pager.size}` }
109+
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
113110
}
114111
115112
/**
116113
* @param {number} pageNum
117114
*/
118115
function pageTo(pageNum) {
119-
setUrlQueryParams($page.url, [
120-
{ key: 'page', value: `${pageNum}` }
121-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
122-
123116
pager = {
124117
...pager,
125118
page: pageNum

‎src/routes/page/users/+page.svelte‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,6 @@
7878
size: pageSizeNum
7979
};
8080
81-
setUrlQueryParams($page.url, [
82-
{ key: 'page', value: `${filter.page}` },
83-
{ key: 'pageSize', value: `${filter.size}` }
84-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
85-
8681
init();
8782
8883
unsubscriber = globalEventStore.subscribe((/** @type {import('$commonTypes').GlobalEvent} */ event) => {
@@ -94,9 +89,6 @@
9489
page: firstPage,
9590
user_names: userNames
9691
};
97-
setUrlQueryParams($page.url, [
98-
{ key: 'page', value: `${filter.page}` }
99-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
10092
10193
getPagedUsers();
10294
});
@@ -157,12 +149,17 @@
157149
}
158150
159151
/** @param {number} totalItemsCount */
160-
function refreshPager(totalItemsCount, page = firstPage) {
152+
function refreshPager(totalItemsCount, pageNum = firstPage) {
161153
pager = {
162154
...filter,
163-
page: page,
155+
page: pageNum,
164156
count: totalItemsCount
165157
};
158+
159+
setUrlQueryParams($page.url, [
160+
{ key: 'page', value: `${pager.page}` },
161+
{ key: 'pageSize', value: `${pager.size}` }
162+
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
166163
}
167164
168165
function search() {
@@ -184,10 +181,6 @@
184181
roles: !!role ? [role] : [],
185182
types: !!type ? [type] : []
186183
};
187-
188-
setUrlQueryParams($page.url, [
189-
{ key: 'page', value: `${filter.page}` }
190-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
191184
}
192185
193186
/** @param {number} pageNum */
@@ -197,10 +190,6 @@
197190
page: pageNum
198191
};
199192
200-
setUrlQueryParams($page.url, [
201-
{ key: 'page', value: `${pageNum}` }
202-
], () => goToUrl(`${$page.url.pathname}${$page.url.search}`));
203-
204193
getPagedUsers();
205194
}
206195

0 commit comments

Comments
 (0)