Skip to content

Commit e0e1dca

Browse files
committed
remove pagination from keywords view
1 parent 36d7ac1 commit e0e1dca

3 files changed

Lines changed: 6 additions & 51 deletions

File tree

backend/src/kitconcept/keywordmanager/services/get.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,12 @@ def reply(self):
3535
)
3636
keywords.sort(key=sort_keys.get(sort_on), reverse=reverse)
3737

38-
batch = HypermediaBatch(self.request, keywords)
39-
items = [{"name": name, "total": count} for name, count in batch]
40-
41-
keywords_data = {
42-
"@id": batch.canonical_url,
43-
"items": items,
44-
"items_total": batch.items_total,
38+
result = {
39+
"@id": self.context.absolute_url(),
40+
"items": [{"name": name, "total": count} for name, count in keywords],
41+
"items_total": len(keywords),
4542
}
46-
if batch.links:
47-
keywords_data["batching"] = batch.links
48-
return keywords_data
43+
return result
4944

5045

5146
class KeywordIndexesGet(Service):

frontend/packages/volto-keywordmanager/src/actions/keywords.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,16 @@ import { DELETE_KEYWORDS } from 'volto-keywordmanager/constants/Keywords';
55
export function getKeywords({
66
index = null,
77
groupKeywords = false,
8-
batchSize = 25,
9-
batchStart = 0,
108
sortOn = null,
119
sortOrder = null,
1210
}: {
1311
index?: string | null;
1412
groupKeywords?: boolean;
15-
batchSize?: number;
16-
batchStart?: number;
1713
sortOn?: string;
1814
sortOrder?: string;
1915
}) {
2016
let params = new URLSearchParams({
2117
grouped: String(groupKeywords),
22-
b_size: String(batchSize),
23-
b_start: String(batchStart),
2418
});
2519

2620
if (index) params.append('idx', index);

frontend/packages/volto-keywordmanager/src/components/KeywordManager.tsx

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ const KeywordManager = (props) => {
6969
const selectionCount =
7070
selectedKeys === 'all' ? keywords.items?.length : selectedKeys?.size;
7171
const [keywordIndex, setKeywordIndex] = useState<string>('Subject');
72-
// Pagination
73-
const [currentPage, setCurrentPage] = useState<number>(0);
74-
const [pageSize, setPageSize] = useState<number>(25);
75-
const pageSizes = [25, 50, 100];
7672
// Sorting
7773
const [sortDescriptor, setSortDescriptor] = useState<SortDescriptor>();
7874
const sortOn = sortDescriptor?.column;
@@ -81,13 +77,11 @@ const KeywordManager = (props) => {
8177

8278
const options = useMemo(
8379
() => ({
84-
...(pageSize !== 25 && { batchSize: pageSize }),
85-
...(currentPage !== 0 && { batchStart: currentPage }),
8680
...(keywordIndex !== 'Subject' && { idx: keywordIndex }),
8781
...(sortOrder && { sortOrder: sortOrder }),
8882
...(sortOn && { sortOn: sortOn }),
8983
}),
90-
[pageSize, currentPage, keywordIndex, sortOrder, sortOn],
84+
[keywordIndex, sortOrder, sortOn],
9185
);
9286

9387
useEffect(() => {
@@ -351,34 +345,6 @@ const KeywordManager = (props) => {
351345
)}
352346
</TableBody>
353347
</Table>
354-
{keywords?.items_total > Math.min(...pageSizes) && (
355-
<Pagination
356-
current={currentPage}
357-
total={Math.ceil(keywords?.items_total / pageSize)}
358-
pageSize={pageSize}
359-
pageSizes={pageSizes}
360-
onChangePage={(e, { value }) => {
361-
setCurrentPage(value);
362-
dispatch(
363-
getKeywords({
364-
batchSize: pageSize,
365-
batchStart: pageSize * value,
366-
...(keywordIndex !== 'Subject' && { index: keywordIndex }),
367-
}),
368-
);
369-
}}
370-
onChangePageSize={(e, { value }) => {
371-
setPageSize(value);
372-
dispatch(
373-
getKeywords({
374-
batchSize: value,
375-
batchStart: currentPage,
376-
...(keywordIndex !== 'Subject' && { index: keywordIndex }),
377-
}),
378-
);
379-
}}
380-
/>
381-
)}
382348
{isClient &&
383349
createPortal(
384350
<Toolbar

0 commit comments

Comments
 (0)