From ab1a8c1d6ac628bb02401351fc82ce074d2a4ef1 Mon Sep 17 00:00:00 2001 From: Prabhat Khera <91852476+prabhat-org@users.noreply.github.com> Date: Fri, 31 Mar 2023 13:25:00 +1300 Subject: [PATCH] fix(ui): namespace caching issue EE-5273 (#8710) * fix namespace caching issue * fix(apps): add loading state [EE-5273] * rm endpoint provider * fix(namespace): remove caching [EE-5273] * variable typo --------- Co-authored-by: testa113 --- .../applicationsDatatable.html | 7 +++--- .../applicationsDatatable.js | 1 + .../applicationsStacksDatatable.html | 5 ++-- .../applicationsStacksDatatable.js | 1 + app/kubernetes/services/namespaceService.js | 25 +++---------------- .../services/resourcePoolService.js | 4 +-- .../views/applications/applications.html | 2 ++ .../applications/applicationsController.js | 11 ++++---- .../views/applications/edit/application.html | 1 - .../edit/resourcePoolController.js | 1 - .../resource-pools/resourcePoolsController.js | 4 +-- app/portainer/services/localStorage.js | 9 ------- app/react/kubernetes/namespaces/queries.ts | 2 +- 13 files changed, 25 insertions(+), 48 deletions(-) diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html index 0f4c6935b..af5adf0c3 100644 --- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html +++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html @@ -244,6 +244,7 @@ - + Loading... - + No application available. -
+
{{ $ctrl.state.selectedItemCount }} item(s) selected
diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js index 6a278c6c6..89a308752 100644 --- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js +++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.js @@ -18,6 +18,7 @@ angular.module('portainer.kubernetes').component('kubernetesApplicationsDatatabl namespaces: '<', namespace: '<', onChangeNamespaceDropdown: '<', + isAppsLoading: '<', isSystemResources: '<', setSystemResources: '<', }, diff --git a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html index da4920b0d..8df0d9989 100644 --- a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html +++ b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html @@ -168,6 +168,7 @@ - + Loading... - + No stack available. diff --git a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.js b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.js index 908b01a8b..f016de251 100644 --- a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.js +++ b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.js @@ -13,6 +13,7 @@ angular.module('portainer.kubernetes').component('kubernetesApplicationsStacksDa namespaces: '<', namespace: '<', onChangeNamespaceDropdown: '<', + isAppsLoading: '<', isSystemResources: '<', setSystemResources: '<', }, diff --git a/app/kubernetes/services/namespaceService.js b/app/kubernetes/services/namespaceService.js index 6d82c3e3c..a5ff56ca4 100644 --- a/app/kubernetes/services/namespaceService.js +++ b/app/kubernetes/services/namespaceService.js @@ -18,7 +18,6 @@ class KubernetesNamespaceService { this.deleteAsync = this.deleteAsync.bind(this); this.getJSONAsync = this.getJSONAsync.bind(this); this.updateFinalizeAsync = this.updateFinalizeAsync.bind(this); - this.refreshCacheAsync = this.refreshCacheAsync.bind(this); } /** @@ -81,20 +80,13 @@ class KubernetesNamespaceService { } } - async get(name, refreshCache = false) { + async get(name) { if (name) { return this.$async(this.getAsync, name); } - const cachedAllowedNamespaces = this.LocalStorage.getAllowedNamespaces(); - if (!cachedAllowedNamespaces || refreshCache) { - const allowedNamespaces = await this.getAllAsync(); - this.LocalStorage.storeAllowedNamespaces(allowedNamespaces); - updateNamespaces(allowedNamespaces); - return allowedNamespaces; - } else { - updateNamespaces(cachedAllowedNamespaces); - return cachedAllowedNamespaces; - } + const allowedNamespaces = await this.getAllAsync(); + updateNamespaces(allowedNamespaces); + return allowedNamespaces; } /** @@ -105,7 +97,6 @@ class KubernetesNamespaceService { const payload = KubernetesNamespaceConverter.createPayload(namespace); const params = {}; const data = await this.KubernetesNamespaces().create(params, payload).$promise; - await this.refreshCacheAsync(); return data; } catch (err) { throw new PortainerError('Unable to create namespace', err); @@ -116,14 +107,6 @@ class KubernetesNamespaceService { return this.$async(this.createAsync, namespace); } - async refreshCacheAsync() { - this.LocalStorage.deleteAllowedNamespaces(); - const allowedNamespaces = await this.getAllAsync(); - this.LocalStorage.storeAllowedNamespaces(allowedNamespaces); - updateNamespaces(allowedNamespaces); - return allowedNamespaces; - } - /** * DELETE */ diff --git a/app/kubernetes/services/resourcePoolService.js b/app/kubernetes/services/resourcePoolService.js index 1b0f03b26..639c44db1 100644 --- a/app/kubernetes/services/resourcePoolService.js +++ b/app/kubernetes/services/resourcePoolService.js @@ -36,8 +36,8 @@ export function KubernetesResourcePoolService( } // getting the quota for all namespaces is costly by default, so disable getting it by default - async function getAll({ getQuota = false, refreshCache = false }) { - const namespaces = await KubernetesNamespaceService.get('', refreshCache); + async function getAll({ getQuota = false }) { + const namespaces = await KubernetesNamespaceService.get(); const pools = await Promise.all( _.map(namespaces, async (namespace) => { const name = namespace.Name; diff --git a/app/kubernetes/views/applications/applications.html b/app/kubernetes/views/applications/applications.html index c36899adf..a6aa1e02b 100644 --- a/app/kubernetes/views/applications/applications.html +++ b/app/kubernetes/views/applications/applications.html @@ -22,6 +22,7 @@ namespaces="ctrl.state.namespaces" namespace="ctrl.state.namespaceName" on-change-namespace-dropdown="(ctrl.onChangeNamespaceDropdown)" + is-apps-loading="ctrl.state.isAppsLoading" is-system-resources="ctrl.state.isSystemResources" set-system-resources="(ctrl.setSystemResources)" > @@ -38,6 +39,7 @@ namespaces="ctrl.state.namespaces" namespace="ctrl.state.namespaceName" on-change-namespace-dropdown="(ctrl.onChangeNamespaceDropdown)" + is-apps-loading="ctrl.state.isAppsLoading" is-system-resources="ctrl.state.isSystemResources" set-system-resources="(ctrl.setSystemResources)" > diff --git a/app/kubernetes/views/applications/applicationsController.js b/app/kubernetes/views/applications/applicationsController.js index 424f47622..d48cccb10 100644 --- a/app/kubernetes/views/applications/applicationsController.js +++ b/app/kubernetes/views/applications/applicationsController.js @@ -143,15 +143,14 @@ class KubernetesApplicationsController { }); } - onChangeNamespaceDropdown(namespaceName) { - this.state.namespaceName = namespaceName; - // save the selected namespaceName in local storage with the key 'kubernetes_namespace_filter_${environmentId}_${userID}' - this.LocalStorage.storeNamespaceFilter(this.endpoint.Id, this.user.ID, namespaceName); - this.getApplicationsAsync(); + onChangeNamespaceDropdown(namespace) { + this.state.namespaceName = namespace; + return this.$async(this.getApplicationsAsync); } async getApplicationsAsync() { try { + this.state.isAppsLoading = true; const [applications, configurations] = await Promise.all([ this.KubernetesApplicationService.get(this.state.namespaceName), this.KubernetesConfigurationService.get(this.state.namespaceName), @@ -166,6 +165,8 @@ class KubernetesApplicationsController { this.$scope.$apply(); } catch (err) { this.Notifications.error('Failure', err, 'Unable to retrieve applications'); + } finally { + this.state.isAppsLoading = false; } } diff --git a/app/kubernetes/views/applications/edit/application.html b/app/kubernetes/views/applications/edit/application.html index 4e2b21c70..32bd6903e 100644 --- a/app/kubernetes/views/applications/edit/application.html +++ b/app/kubernetes/views/applications/edit/application.html @@ -290,7 +290,6 @@ diff --git a/app/kubernetes/views/resource-pools/edit/resourcePoolController.js b/app/kubernetes/views/resource-pools/edit/resourcePoolController.js index fd2224730..c353ea12e 100644 --- a/app/kubernetes/views/resource-pools/edit/resourcePoolController.js +++ b/app/kubernetes/views/resource-pools/edit/resourcePoolController.js @@ -221,7 +221,6 @@ class KubernetesResourcePoolController { return; } await this.KubernetesResourcePoolService.toggleSystem(this.endpoint.Id, namespaceName, !this.isSystem); - await this.KubernetesNamespaceService.refreshCacheAsync(); this.Notifications.success('Namespace successfully updated', namespaceName); this.$state.reload(this.$state.current); diff --git a/app/kubernetes/views/resource-pools/resourcePoolsController.js b/app/kubernetes/views/resource-pools/resourcePoolsController.js index b487bb7c7..c9353812c 100644 --- a/app/kubernetes/views/resource-pools/resourcePoolsController.js +++ b/app/kubernetes/views/resource-pools/resourcePoolsController.js @@ -21,7 +21,6 @@ class KubernetesResourcePoolsController { } async onReload() { - await this.KubernetesNamespaceService.refreshCacheAsync(); this.$state.reload(this.$state.current); } @@ -50,7 +49,6 @@ class KubernetesResourcePoolsController { } finally { --actionCount; if (actionCount === 0) { - await this.KubernetesNamespaceService.refreshCacheAsync(); this.$state.reload(this.$state.current); } } @@ -77,7 +75,7 @@ class KubernetesResourcePoolsController { async getResourcePoolsAsync() { try { - this.resourcePools = await this.KubernetesResourcePoolService.get('', { getQuota: true, refreshCache: true }); + this.resourcePools = await this.KubernetesResourcePoolService.get('', { getQuota: true }); } catch (err) { this.Notifications.error('Failure', err, 'Unable to retreive namespaces'); } diff --git a/app/portainer/services/localStorage.js b/app/portainer/services/localStorage.js index 10ada0cdc..78dba63a9 100644 --- a/app/portainer/services/localStorage.js +++ b/app/portainer/services/localStorage.js @@ -127,15 +127,6 @@ angular.module('portainer.app').factory('LocalStorage', [ getKubernetesSummaryToggle() { return localStorageService.get('kubernetes_summary_expanded'); }, - storeAllowedNamespaces: function (namespaces) { - localStorageService.set('ALLOWED_NAMESPACES', namespaces); - }, - getAllowedNamespaces: function () { - return localStorageService.get('ALLOWED_NAMESPACES'); - }, - deleteAllowedNamespaces: function () { - localStorageService.remove('ALLOWED_NAMESPACES'); - }, }; }, ]); diff --git a/app/react/kubernetes/namespaces/queries.ts b/app/react/kubernetes/namespaces/queries.ts index 397c878f5..6062a1f93 100644 --- a/app/react/kubernetes/namespaces/queries.ts +++ b/app/react/kubernetes/namespaces/queries.ts @@ -16,7 +16,7 @@ export function useNamespaces(environmentId: EnvironmentId) { async () => { const namespaces = await getNamespaces(environmentId); const namespaceNames = Object.keys(namespaces); - // use seflsubjectaccess reviews to avoid forbidden requests + // use selfsubjectaccess reviews to avoid forbidden requests const allNamespaceAccessReviews = await Promise.all( namespaceNames.map((namespaceName) => getSelfSubjectAccessReview(environmentId, namespaceName)