root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 73 Packages Projects Releases Wiki Activity

NestedFolderList: Folder Expand & Inf Loader Causing Duplicates (#102944) 

* NestedFoldeList: remove nested folder dupe during save

* Change solution for loading/pending check in useFoldersQuery

* moved pending string to constant

* Moved last page loading logic to proper func

* Updated comment to reflect func changes
This commit is contained in:
Collin Fingar 2025-04-01 08:12:59 -04:00 committed by GitHub
parent af08a9fae2
commit feadd37f27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/app/core/components/NestedFolderPicker/useFoldersQuery.ts
View File

@ -22,6 +22,8 @@ type ListFoldersRequest = QueryActionCreatorResult<
>
>;
const PENDING_STATUS = 'pending';
const listAllFoldersSelector = createSelector(
[(state: RootState) => state, (state: RootState, requests: ListFoldersRequest[]) => requests],
(state: RootState, requests: ListFoldersRequest[]) => {
@ -43,7 +45,7 @@ const listAllFoldersSelector = createSelector(
permission: req.arg.permission,
})(state);
if (page.status === 'pending') {
if (page.status === PENDING_STATUS) {
isLoading = true;
}
@ -68,17 +70,18 @@ const listAllFoldersSelector = createSelector(
);
/**
* Returns whether the set of pages are 'fully loaded', and the last page number
* Returns whether the set of pages are 'fully loaded', the last page number, and if the last page is currently loading
*/
function getPagesLoadStatus(pages: ListFoldersQuery[]): [boolean, number | undefined] {
function getPagesLoadStatus(pages: ListFoldersQuery[]): [boolean, number | undefined, boolean] {
const lastPage = pages.at(-1);
const lastPageNumber = lastPage?.originalArgs?.page;
const lastPageLoading = lastPage?.status === PENDING_STATUS;
if (!lastPage?.data) {
// If there's no pages yet, or the last page is still loading
return [false, lastPageNumber];
return [false, lastPageNumber, lastPageLoading];
} else {
return [lastPage.data.length < lastPage.originalArgs.limit, lastPageNumber];
return [lastPage.data.length < lastPage.originalArgs.limit, lastPageNumber, lastPageLoading];
}
}
@ -106,8 +109,10 @@ export function useFoldersQuery(
const requestNextPage = useCallback(
(parentUid: string | undefined) => {
const pages = parentUid ? state.pagesByParent[parentUid] : state.rootPages;
const [fullyLoaded, pageNumber] = getPagesLoadStatus(pages ?? []);
if (fullyLoaded) {
const [fullyLoaded, pageNumber, lastPageLoading] = getPagesLoadStatus(pages ?? []);
// If fully loaded or the last page is still loading, don't request a new page
if (fullyLoaded || lastPageLoading) {
return;
}