-
Notifications
You must be signed in to change notification settings - Fork 266
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.
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
Converting the management cluster list and detail pages to be paginated #13170
base: master
Are you sure you want to change the base?
Conversation
4046f35
to
eb5daa5
Compare
@@ -283,97 +178,8 @@ export default { | |||
return info; | |||
}, | |||
|
|||
fakeMachines() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't seen the behavior described in the comment. It appears were able to scale up and down and the machines/machine pools sync properly without all of these extra hoops.
@@ -243,15 +138,15 @@ export default { | |||
}; | |||
}, | |||
|
|||
watch: { | |||
showNodes(neu) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we'll need this anymore especially with the new socket code.
if ( this.$store.getters['management/canList'](MANAGEMENT.NODE_TEMPLATE) ) { | ||
fetchTwo.nodeTemplates = this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE }); | ||
} | ||
this.clusterToken = await this.value.getOrCreateToken(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can prolly await on both this and the hasLocalCluster to speed things up slightly.
* This class allows us to fake a machine deployment - when created, we set additional properties (_cluster etc) | ||
* and use these in the getters. | ||
**/ | ||
class EmptyCapiMachineDeployment extends CapiMachineDeployment { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No longer used without the machinepool finagling.
@@ -691,26 +543,6 @@ export default { | |||
return day(time).format(this.dateTimeFormatStr); | |||
} | |||
}, | |||
|
|||
machineSortGenerationFn() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This appears to only be necessary if we have the fake machines and nodes but neither appear to be necessary.
@@ -745,33 +577,22 @@ export default { | |||
@update:value="$emit('input', $event)" | |||
> | |||
<Tab | |||
v-if="showMachines" | |||
v-if="showMachines || true" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will be removed. Accidentally left this in.
return filterHiddenLocalCluster(this.rows, this.$store); | ||
// We no longer make the request for rows the paginated table does. We still need to access these rows for things like harvester. | ||
filteredRows() { | ||
return this.$refs.paginatedTable?.filteredRows || []; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any thoughts on a better way to do this? I don't quite thing getters get us there unless we want to duplicate the filtering.
if (setting.resource === enabledFor.resource?.id) { | ||
if (!!setting.context) { | ||
return enabledFor.resource?.context ? setting.context.includes(enabledFor.resource.context) : false; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not obvious to me why this is necessary? It seems to cause problems if you want to use the PaginatedResourceTable on non-list pages.
r.serverPagination.stores.cluster.resources.enableSome.enabled.push('provisioning.cattle.io.cluster'); | ||
r.serverPagination.stores.cluster.resources.enableSome.enabled.push('cluster'); | ||
r.serverPagination.stores.cluster.resources.enableSome.enabled.push('rke.cattle.io.etcdsnapshot'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Temporary to allow paginated requests
eb5daa5
to
292646f
Compare
292646f
to
25db9c0
Compare
Summary
Fixes #9548
Occurred changes and/or fixed issues
Reduces the number of
findAll
calls and rely on the PaginatedResourceTable to do the paginated calls.Areas or cases that should be tested
The management cluster list and detail pages
Areas which could experience regressions
The management cluster list and detail pages
Checklist