github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(stacks): conditionally hide node and namespace stacks [EE-6949] (#11528)

pull/11653/head
Ali 2024-04-19 17:33:26 +12:00 committed by GitHub
parent d5c4671320
commit d73b162d16
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 70 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html
View File

@ -70,7 +70,7 @@
ng-click="$ctrl.changeOrderBy('Name')" ng-click="$ctrl.changeOrderBy('Name')"
></table-column-header> ></table-column-header>
</th> </th>
<th> <th ng-if="!$ctrl.deploymentOptions.hideStacksFunctionality">
<table-column-header <table-column-header
col-title="'Stack'" col-title="'Stack'"
can-sort="true" can-sort="true"

62
app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatableController.js
View File

@ -1,12 +1,14 @@
import { KubernetesApplicationDeploymentTypes } from 'Kubernetes/models/application/models/appConstants'; import { KubernetesApplicationDeploymentTypes } from 'Kubernetes/models/application/models/appConstants';
import KubernetesApplicationHelper from 'Kubernetes/helpers/application'; import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper'; import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper';
import { getDeploymentOptions } from '@/react/portainer/environments/environment.service';
angular.module('portainer.docker').controller('KubernetesNodeApplicationsDatatableController', [ angular.module('portainer.docker').controller('KubernetesNodeApplicationsDatatableController', [
'$scope', '$scope',
'$controller', '$controller',
'$async',
'DatatableService', 'DatatableService',
function ($scope, $controller, DatatableService) { function ($scope, $controller, $async, DatatableService) {
angular.extend(this, $controller('GenericDatatableController', { $scope: $scope })); angular.extend(this, $controller('GenericDatatableController', { $scope: $scope }));
this.isSystemNamespace = function (item) { this.isSystemNamespace = function (item) {
@ -18,37 +20,41 @@ angular.module('portainer.docker').controller('KubernetesNodeApplicationsDatatab
}; };
this.$onInit = function () { this.$onInit = function () {
this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes; return $async(async () => {
this.setDefaults(); this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes;
this.prepareTableFromDataset(); this.setDefaults();
this.prepareTableFromDataset();
this.state.orderBy = this.orderBy; this.deploymentOptions = await getDeploymentOptions();
var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
if (storedOrder !== null) {
this.state.reverseOrder = storedOrder.reverse;
this.state.orderBy = storedOrder.orderBy;
}
var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); this.state.orderBy = this.orderBy;
if (textFilter !== null) { var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
this.state.textFilter = textFilter; if (storedOrder !== null) {
this.onTextFilterChange(); this.state.reverseOrder = storedOrder.reverse;
} this.state.orderBy = storedOrder.orderBy;
}
var storedFilters = DatatableService.getDataTableFilters(this.tableKey); var textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
if (storedFilters !== null) { if (textFilter !== null) {
this.filters = storedFilters; this.state.textFilter = textFilter;
} this.onTextFilterChange();
if (this.filters && this.filters.state) { }
this.filters.state.open = false;
}
var storedSettings = DatatableService.getDataTableSettings(this.tableKey); var storedFilters = DatatableService.getDataTableFilters(this.tableKey);
if (storedSettings !== null) { if (storedFilters !== null) {
this.settings = storedSettings; this.filters = storedFilters;
this.settings.open = false; }
} if (this.filters && this.filters.state) {
this.onSettingsRepeaterChange(); this.filters.state.open = false;
}
var storedSettings = DatatableService.getDataTableSettings(this.tableKey);
if (storedSettings !== null) {
this.settings = storedSettings;
this.settings.open = false;
}
this.onSettingsRepeaterChange();
});
}; };
}, },
]); ]);

4
app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html
View File

@ -68,9 +68,9 @@
ng-click="$ctrl.changeOrderBy('Name')" ng-click="$ctrl.changeOrderBy('Name')"
></table-column-header> ></table-column-header>
</th> </th>
<th> <th ng-if="!$ctrl.deploymentOptions.hideStacksFunctionality">
<table-column-header <table-column-header
col-title="'StackName'" col-title="'Stack'"
can-sort="true" can-sort="true"
is-sorted="$ctrl.state.orderBy === 'StackName'" is-sorted="$ctrl.state.orderBy === 'StackName'"
is-sorted-desc="$ctrl.state.orderBy === 'StackName' && $ctrl.state.reverseOrder" is-sorted-desc="$ctrl.state.orderBy === 'StackName' && $ctrl.state.reverseOrder"

60
app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatableController.js
View File

@ -1,10 +1,12 @@
import KubernetesApplicationHelper from 'Kubernetes/helpers/application'; import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
import { getDeploymentOptions } from '@/react/portainer/environments/environment.service';
angular.module('portainer.docker').controller('KubernetesResourcePoolApplicationsDatatableController', [ angular.module('portainer.docker').controller('KubernetesResourcePoolApplicationsDatatableController', [
'$scope', '$scope',
'$controller', '$controller',
'$async',
'DatatableService', 'DatatableService',
function ($scope, $controller, DatatableService) { function ($scope, $controller, $async, DatatableService) {
angular.extend(this, $controller('GenericDatatableController', { $scope: $scope })); angular.extend(this, $controller('GenericDatatableController', { $scope: $scope }));
this.isExternalApplication = function (item) { this.isExternalApplication = function (item) {
@ -12,36 +14,40 @@ angular.module('portainer.docker').controller('KubernetesResourcePoolApplication
}; };
this.$onInit = function () { this.$onInit = function () {
this.setDefaults(); return $async(async () => {
this.prepareTableFromDataset(); this.setDefaults();
this.prepareTableFromDataset();
this.state.orderBy = this.orderBy; this.deploymentOptions = await getDeploymentOptions();
var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
if (storedOrder !== null) {
this.state.reverseOrder = storedOrder.reverse;
this.state.orderBy = storedOrder.orderBy;
}
var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); this.state.orderBy = this.orderBy;
if (textFilter !== null) { var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
this.state.textFilter = textFilter; if (storedOrder !== null) {
this.onTextFilterChange(); this.state.reverseOrder = storedOrder.reverse;
} this.state.orderBy = storedOrder.orderBy;
}
var storedFilters = DatatableService.getDataTableFilters(this.tableKey); var textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
if (storedFilters !== null) { if (textFilter !== null) {
this.filters = storedFilters; this.state.textFilter = textFilter;
} this.onTextFilterChange();
if (this.filters && this.filters.state) { }
this.filters.state.open = false;
}
var storedSettings = DatatableService.getDataTableSettings(this.tableKey); var storedFilters = DatatableService.getDataTableFilters(this.tableKey);
if (storedSettings !== null) { if (storedFilters !== null) {
this.settings = storedSettings; this.filters = storedFilters;
this.settings.open = false; }
} if (this.filters && this.filters.state) {
this.onSettingsRepeaterChange(); this.filters.state.open = false;
}
var storedSettings = DatatableService.getDataTableSettings(this.tableKey);
if (storedSettings !== null) {
this.settings = storedSettings;
this.settings.open = false;
}
this.onSettingsRepeaterChange();
});
}; };
}, },
]); ]);