Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolving some issues around rendering pagination loading on resource list pages #12884

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Resolving some issues around rendering pagination loading on resource list pages #12884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shell/components/ResourceList/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ export default {
v-else
:schema="schema"
:rows="rows"
:alt-loading="canPaginate"
:alt-loading="canPaginate && !isFirstLoad"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We really only want alt-loading to happen on manual refresh and when changing pages. It seemed easiest to base this on whether or not it was the first load or not.

:loading="loading"
:headers="headers"
:group-by="groupBy"
Expand Down
5 changes: 1 addition & 4 deletions shell/components/SortableTable/THead.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,7 @@ export default {
background-color: var(--sortable-table-header-bg);
color: var(--body-text);
text-align: left;

&:not(.loading) {
border-bottom: 1px solid var(--sortable-table-top-divider);
}
border-bottom: 1px solid var(--sortable-table-top-divider);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We get a flicker without a border momentarily if we keep the .loading negation.

}
}

Expand Down
11 changes: 5 additions & 6 deletions shell/components/SortableTable/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,10 @@ export default {
eventualSearchQuery = this.$route.query?.q;
}

const isLoading = this.loading || false;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sometimes loading has a value and that's what we should initiate our state with.


return {
refreshButtonPhase: ASYNC_BUTTON_STATES.WAITING,
refreshButtonPhase: isLoading ? ASYNC_BUTTON_STATES.WAITING : ASYNC_BUTTON_STATES.ACTION,
expanded: {},
searchQuery,
eventualSearchQuery,
Expand All @@ -386,7 +388,7 @@ export default {
/**
* The is the bool the DOM uses to show loading state. it's proxied from `loading` to avoid blipping the indicator (see usages)
*/
isLoading: false,
isLoading
};
},

Expand Down Expand Up @@ -512,7 +514,7 @@ export default {
},

created() {
this.debouncedRefreshTableData = debounce(this.refreshTableData, 500);
this.debouncedRefreshTableData = debounce(this.refreshTableData, 500, { leading: true });
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This forces us to trigger at the beginning of the timer instead of the end which makes the visual for loading appear sooner.

this.debouncedPaginationChanged = debounce(this.paginationChanged, 50);
},

Expand All @@ -530,9 +532,6 @@ export default {
manualRefreshLoadingFinished() {
const res = !!(!this.isLoading && this._didinit && this.rows?.length && !this.isManualRefreshLoading);

// Always ensure the Refresh button phase aligns with loading state (regardless of if manualRefreshLoadingFinished has changed or not)
this.refreshButtonPhase = !res || this.loading ? ASYNC_BUTTON_STATES.WAITING : ASYNC_BUTTON_STATES.ACTION;

Comment on lines -534 to -535
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would cause the refresh button to get stuck on page load and refreshButtonPhase expects a phase value not a boolean true or false value.

You'll also notice that we have a manualRefreshLoadingFinished watcher which updates the phase as well so it seems safe to remove.

return res;
},

Expand Down
9 changes: 8 additions & 1 deletion shell/mixins/resource-fetch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export default {
incremental: false,
fetchedResourceType: [],
paginating: null,
isFirstLoad: true,
};
},

Expand Down Expand Up @@ -73,7 +74,7 @@ export default {
},
loading() {
if (this.canPaginate) {
return this.paginating;
return this.paginating === null ? true : this.paginating;
}

return this.rows.length ? false : this.$fetchState.pending;
Expand All @@ -89,6 +90,12 @@ export default {
this.fetchPageSecondaryResources(true);
}
}
},

loading(newValue, oldValue) {
if (oldValue && !newValue) {
this.isFirstLoad = false;
}
}
},

Expand Down
Loading