mirror of
https://github.com/portainer/portainer.git
synced 2025-08-05 05:45:22 +02:00
refactor(docker/services): convert services table to react [EE-4675] (#10289)
This commit is contained in:
Chaim Lev-Ari
GitHub
parent
6b5c24faff
commit
0dc1805881
46 changed files with 969 additions and 850 deletions
|
|
@ -1,29 +0,0 @@
|
|||
<div class="actionBar !gap-3" authorization="DockerServiceUpdate, DockerServiceDelete, DockerServiceCreate">
|
||||
<div class="btn-group" role="group" aria-label="...">
|
||||
<button
|
||||
ng-if="$ctrl.showUpdateAction"
|
||||
type="button"
|
||||
class="btn btn-sm btn-light h-fit"
|
||||
authorization="DockerServiceUpdate"
|
||||
ng-disabled="$ctrl.selectedItemCount === 0"
|
||||
ng-click="$ctrl.updateAction($ctrl.selectedItems)"
|
||||
data-cy="service-updateServiceButton"
|
||||
>
|
||||
<pr-icon icon="'refresh-cw'"></pr-icon>Update
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm btn-dangerlight h-fit"
|
||||
authorization="DockerServiceDelete"
|
||||
ng-disabled="$ctrl.selectedItemCount === 0"
|
||||
ng-click="$ctrl.removeAction($ctrl.selectedItems)"
|
||||
data-cy="service-removeServiceButton"
|
||||
>
|
||||
<pr-icon icon="'trash-2'"></pr-icon>Remove
|
||||
</button>
|
||||
</div>
|
||||
<button type="button" class="btn btn-sm btn-primary" ui-sref="docker.services.new" ng-if="$ctrl.showAddAction" authorization="DockerServiceCreate">
|
||||
<pr-icon icon="'plus'" class-name="'mr-1'"></pr-icon>
|
||||
Add service
|
||||
</button>
|
||||
</div>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
angular.module('portainer.docker').component('servicesDatatableActions', {
|
||||
templateUrl: './servicesDatatableActions.html',
|
||||
controller: 'ServicesDatatableActionsController',
|
||||
bindings: {
|
||||
selectedItems: '=',
|
||||
selectedItemCount: '=',
|
||||
showUpdateAction: '<',
|
||||
showAddAction: '<',
|
||||
endpointId: '<',
|
||||
},
|
||||
});
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
import { confirmDelete } from '@@/modals/confirm';
|
||||
import { confirmServiceForceUpdate } from '@/react/docker/services/common/update-service-modal';
|
||||
import { convertServiceToConfig } from '@/react/docker/services/common/convertServiceToConfig';
|
||||
|
||||
angular.module('portainer.docker').controller('ServicesDatatableActionsController', [
|
||||
'$q',
|
||||
'$state',
|
||||
'ServiceService',
|
||||
'Notifications',
|
||||
'ImageHelper',
|
||||
'WebhookService',
|
||||
function ($q, $state, ServiceService, Notifications, ImageHelper, WebhookService) {
|
||||
const ctrl = this;
|
||||
|
||||
this.removeAction = function (selectedItems) {
|
||||
confirmDelete('Do you want to remove the selected service(s)? All the containers associated to the selected service(s) will be removed too.').then((confirmed) => {
|
||||
if (!confirmed) {
|
||||
return;
|
||||
}
|
||||
removeServices(selectedItems);
|
||||
});
|
||||
};
|
||||
|
||||
this.updateAction = function (selectedItems) {
|
||||
confirmServiceForceUpdate('Do you want to force an update of the selected service(s)? All the tasks associated to the selected service(s) will be recreated.').then(
|
||||
(result) => {
|
||||
if (!result) {
|
||||
return;
|
||||
}
|
||||
|
||||
forceUpdateServices(selectedItems, result.pullLatest);
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
function forceUpdateServices(services, pullImage) {
|
||||
var actionCount = services.length;
|
||||
angular.forEach(services, function (service) {
|
||||
var config = convertServiceToConfig(service.Model);
|
||||
if (pullImage) {
|
||||
config.TaskTemplate.ContainerSpec.Image = ImageHelper.removeDigestFromRepository(config.TaskTemplate.ContainerSpec.Image);
|
||||
}
|
||||
|
||||
// As explained in https://github.com/docker/swarmkit/issues/2364 ForceUpdate can accept a random
|
||||
// value or an increment of the counter value to force an update.
|
||||
config.TaskTemplate.ForceUpdate++;
|
||||
ServiceService.update(service, config)
|
||||
.then(function success() {
|
||||
Notifications.success('Service successfully updated', service.Name);
|
||||
})
|
||||
.catch(function error(err) {
|
||||
Notifications.error('Failure', err, 'Unable to force update service' + service.Name);
|
||||
})
|
||||
.finally(function final() {
|
||||
--actionCount;
|
||||
if (actionCount === 0) {
|
||||
$state.reload();
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function removeServices(services) {
|
||||
var actionCount = services.length;
|
||||
angular.forEach(services, function (service) {
|
||||
ServiceService.remove(service)
|
||||
.then(function success() {
|
||||
return WebhookService.webhooks(service.Id, ctrl.endpointId);
|
||||
})
|
||||
.then(function success(data) {
|
||||
return $q.when(data.length !== 0 && WebhookService.deleteWebhook(data[0].Id));
|
||||
})
|
||||
.then(function success() {
|
||||
Notifications.success('Service successfully removed', service.Name);
|
||||
})
|
||||
.catch(function error(err) {
|
||||
Notifications.error('Failure', err, 'Unable to remove service');
|
||||
})
|
||||
.finally(function final() {
|
||||
--actionCount;
|
||||
if (actionCount === 0) {
|
||||
$state.reload();
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
]);
|
||||
|
|
@ -1,245 +0,0 @@
|
|||
<div class="datatable">
|
||||
<rd-widget>
|
||||
<rd-widget-body classes="no-padding">
|
||||
<div class="toolBar">
|
||||
<div class="toolBarTitle vertical-center">
|
||||
<div class="widget-icon space-right">
|
||||
<pr-icon icon="$ctrl.titleIcon"></pr-icon>
|
||||
</div>
|
||||
{{ $ctrl.titleText }}
|
||||
</div>
|
||||
<div class="searchBar vertical-center">
|
||||
<pr-icon icon="'search'" class-name="'searchIcon'"></pr-icon>
|
||||
<input
|
||||
ng-if="!$ctrl.notAutoFocus"
|
||||
auto-focus
|
||||
type="text"
|
||||
class="searchInput"
|
||||
ng-model="$ctrl.state.textFilter"
|
||||
ng-change="$ctrl.onTextFilterChange()"
|
||||
placeholder="Search for a service..."
|
||||
ng-model-options="{ debounce: 300 }"
|
||||
data-cy="service-searchInput"
|
||||
/>
|
||||
<input
|
||||
ng-if="$ctrl.notAutoFocus"
|
||||
type="text"
|
||||
class="searchInput"
|
||||
ng-model="$ctrl.state.textFilter"
|
||||
ng-change="$ctrl.onTextFilterChange()"
|
||||
placeholder="Search for a service..."
|
||||
ng-model-options="{ debounce: 300 }"
|
||||
data-cy="service-searchInput"
|
||||
/>
|
||||
</div>
|
||||
<services-datatable-actions
|
||||
selected-items="$ctrl.state.selectedItems"
|
||||
selected-item-count="$ctrl.state.selectedItemCount"
|
||||
show-add-action="$ctrl.showAddAction"
|
||||
show-update-action="$ctrl.showUpdateAction"
|
||||
endpoint-id="$ctrl.endpointId"
|
||||
></services-datatable-actions>
|
||||
<div class="settings">
|
||||
<datatable-columns-visibility columns="$ctrl.columnVisibility.columns" on-change="($ctrl.onColumnVisibilityChange)"></datatable-columns-visibility>
|
||||
<span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
|
||||
<span uib-dropdown-toggle aria-label="Settings">
|
||||
<pr-icon icon="'more-vertical'"></pr-icon>
|
||||
</span>
|
||||
<div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
|
||||
<div class="tableMenu">
|
||||
<div class="menuHeader"> Table settings </div>
|
||||
<div class="menuContent">
|
||||
<div>
|
||||
<div class="md-checkbox">
|
||||
<input id="setting_auto_refresh" type="checkbox" ng-model="$ctrl.settings.repeater.autoRefresh" ng-change="$ctrl.onSettingsRepeaterChange()" />
|
||||
<label for="setting_auto_refresh">Auto refresh</label>
|
||||
</div>
|
||||
<div ng-if="$ctrl.settings.repeater.autoRefresh">
|
||||
<label for="settings_refresh_rate"> Refresh rate </label>
|
||||
<select id="settings_refresh_rate" ng-model="$ctrl.settings.repeater.refreshRate" ng-change="$ctrl.onSettingsRepeaterChange()" class="small-select">
|
||||
<option value="10">10s</option>
|
||||
<option value="30">30s</option>
|
||||
<option value="60">1min</option>
|
||||
<option value="120">2min</option>
|
||||
<option value="300">5min</option>
|
||||
</select>
|
||||
<span>
|
||||
<pr-icon id="refreshRateChange" icon="'check'" mode="'success'" style="display: none"></pr-icon>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;">Close</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
<table class="table-hover nowrap-cells table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 55px">
|
||||
<span class="md-checkbox" authorization="DockerServiceUpdate, DockerServiceDelete, DockerServiceCreate">
|
||||
<input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
|
||||
<label for="select_all"></label>
|
||||
</span>
|
||||
<a ng-click="$ctrl.expandAll()">
|
||||
<pr-icon ng-if="$ctrl.state.expandAll" icon="'chevron-down'"></pr-icon>
|
||||
<pr-icon ng-if="!$ctrl.state.expandAll" icon="'chevron-right'"></pr-icon>
|
||||
</a>
|
||||
</th>
|
||||
<th>
|
||||
<table-column-header
|
||||
col-title="'Name'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'Name'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('Name')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
<th ng-if="$ctrl.showStackColumn">
|
||||
<table-column-header
|
||||
col-title="'Stack'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'StackName'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'StackName' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('StackName')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
<th ng-show="$ctrl.columnVisibility.columns.image.display">
|
||||
<table-column-header
|
||||
col-title="'Image'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'Image'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'Image' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('Image')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
<th>
|
||||
<table-column-header
|
||||
col-title="'Scheduling Mode'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'Mode'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'Mode' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('Mode')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
<th ng-show="$ctrl.columnVisibility.columns.ports.display">
|
||||
<table-column-header
|
||||
col-title="'Published Ports'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'Ports'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'Ports' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('Ports')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
<th ng-show="$ctrl.columnVisibility.columns.updated.display">
|
||||
<table-column-header
|
||||
col-title="'Last Update'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'UpdatedAt'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'UpdatedAt' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('UpdatedAt')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
<th ng-show="$ctrl.columnVisibility.columns.ownership.display">
|
||||
<table-column-header
|
||||
col-title="'Ownership'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'ResourceControl.Ownership'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'ResourceControl.Ownership' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('ResourceControl.Ownership')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr
|
||||
ng-click="$ctrl.expandItem(item, !item.Expanded)"
|
||||
dir-paginate-start="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))"
|
||||
ng-class="{ active: item.Checked }"
|
||||
class="interactive"
|
||||
>
|
||||
<td>
|
||||
<span class="md-checkbox" authorization="DockerServiceUpdate, DockerServiceDelete, DockerServiceCreate">
|
||||
<input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-click="$ctrl.selectItem(item, $event); $event.stopPropagation()" />
|
||||
<label for="select_{{ $index }}"></label>
|
||||
</span>
|
||||
<pr-icon ng-if="item.Expanded" icon="'chevron-down'" class-name="'mr-1'"></pr-icon>
|
||||
<pr-icon ng-if="!item.Expanded" icon="'chevron-right'" class-name="'mr-1'"></pr-icon>
|
||||
</td>
|
||||
<td>
|
||||
<button type="button" class="btn btn-link !ml-0 p-0 hover:no-underline" ui-sref="docker.services.service({id: item.Id})" ng-click="$event.stopPropagation()">{{
|
||||
item.Name
|
||||
}}</button>
|
||||
</td>
|
||||
<td ng-if="$ctrl.showStackColumn">{{ item.StackName ? item.StackName : '-' }}</td>
|
||||
<td ng-show="$ctrl.columnVisibility.columns.image.display">{{ item.Image | hideshasum }}</td>
|
||||
<td>
|
||||
{{ item.Mode }}
|
||||
<code>{{ item.Tasks | runningtaskscount }}</code> / <code>{{ item.Mode === 'replicated' ? item.Replicas : ($ctrl.nodes | availablenodecount: item) }}</code>
|
||||
<span ng-if="item.Mode === 'replicated'">
|
||||
<docker-services-datatable-scale-service-button service="item"></docker-services-datatable-scale-service-button>
|
||||
</span>
|
||||
</td>
|
||||
<td ng-show="$ctrl.columnVisibility.columns.ports.display">
|
||||
<a
|
||||
ng-if="item.Ports && item.Ports.length > 0 && p.PublishedPort"
|
||||
ng-repeat="p in item.Ports"
|
||||
class="image-tag vertical-center"
|
||||
ng-href="http://{{ $ctrl.endpointPublicUrl }}:{{ p.PublishedPort }}"
|
||||
target="_blank"
|
||||
ng-click="$event.stopPropagation();"
|
||||
>
|
||||
<pr-icon icon="'external-link'"></pr-icon>
|
||||
{{ p.PublishedPort }}:{{ p.TargetPort }}
|
||||
</a>
|
||||
<span ng-if="!item.Ports || item.Ports.length === 0">-</span>
|
||||
</td>
|
||||
<td ng-show="$ctrl.columnVisibility.columns.updated.display">{{ item.UpdatedAt | getisodate }}</td>
|
||||
<td ng-show="$ctrl.columnVisibility.columns.ownership.display">
|
||||
<span>
|
||||
<i ng-class="item.ResourceControl.Ownership | ownershipicon" aria-hidden="true"></i>
|
||||
{{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = $ctrl.RCO.ADMINISTRATORS }}
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr dir-paginate-end ng-show="item.Expanded">
|
||||
<td></td>
|
||||
<td colspan="8">
|
||||
<docker-service-tasks-datatable dataset="item.Tasks" search="$ctrl.state.textFilter"></docker-service-tasks-datatable>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="!$ctrl.dataset">
|
||||
<td colspan="8" class="text-muted text-center">Loading...</td>
|
||||
</tr>
|
||||
<tr ng-if="$ctrl.state.filteredDataSet.length === 0">
|
||||
<td colspan="8" class="text-muted text-center">No service available.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="footer" ng-if="$ctrl.dataset">
|
||||
<div class="infoBar" ng-if="$ctrl.state.selectedItemCount !== 0"> {{ $ctrl.state.selectedItemCount }} item(s) selected </div>
|
||||
<div class="paginationControls">
|
||||
<form class="form-inline vertical-center">
|
||||
<span class="limitSelector">
|
||||
<span style="margin-right: 5px"> Items per page </span>
|
||||
<select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
|
||||
<option value="0">All</option>
|
||||
<option value="10">10</option>
|
||||
<option value="25">25</option>
|
||||
<option value="50">50</option>
|
||||
<option value="100">100</option>
|
||||
</select>
|
||||
</span>
|
||||
<dir-pagination-controls max-size="5"></dir-pagination-controls>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</rd-widget-body>
|
||||
</rd-widget>
|
||||
</div>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
angular.module('portainer.docker').component('servicesDatatable', {
|
||||
templateUrl: './servicesDatatable.html',
|
||||
controller: 'ServicesDatatableController',
|
||||
bindings: {
|
||||
titleText: '@',
|
||||
titleIcon: '@',
|
||||
dataset: '<',
|
||||
tableKey: '@',
|
||||
orderBy: '@',
|
||||
reverseOrder: '<',
|
||||
nodes: '<',
|
||||
agentProxy: '<',
|
||||
showUpdateAction: '<',
|
||||
showAddAction: '<',
|
||||
showStackColumn: '<',
|
||||
showTaskLogsButton: '<',
|
||||
refreshCallback: '<',
|
||||
notAutoFocus: '<',
|
||||
endpointPublicUrl: '<',
|
||||
endpointId: '<',
|
||||
},
|
||||
});
|
||||
|
|
@ -1,143 +0,0 @@
|
|||
import _ from 'lodash-es';
|
||||
|
||||
angular.module('portainer.docker').controller('ServicesDatatableController', [
|
||||
'$scope',
|
||||
'$controller',
|
||||
'DatatableService',
|
||||
function ($scope, $controller, DatatableService) {
|
||||
angular.extend(this, $controller('GenericDatatableController', { $scope: $scope }));
|
||||
|
||||
var ctrl = this;
|
||||
|
||||
this.state = Object.assign(this.state, {
|
||||
expandAll: false,
|
||||
expandedItems: [],
|
||||
});
|
||||
|
||||
this.columnVisibility = {
|
||||
columns: {
|
||||
image: {
|
||||
label: 'Image',
|
||||
display: true,
|
||||
},
|
||||
ownership: {
|
||||
label: 'OwnerShip',
|
||||
display: true,
|
||||
},
|
||||
ports: {
|
||||
label: 'Published Ports',
|
||||
display: true,
|
||||
},
|
||||
updated: {
|
||||
label: 'Last Update',
|
||||
display: true,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
this.onColumnVisibilityChange = onColumnVisibilityChange.bind(this);
|
||||
function onColumnVisibilityChange(columns) {
|
||||
this.columnVisibility.columns = columns;
|
||||
DatatableService.setColumnVisibilitySettings(this.tableKey, this.columnVisibility);
|
||||
}
|
||||
|
||||
this.expandAll = function () {
|
||||
this.state.expandAll = !this.state.expandAll;
|
||||
for (var i = 0; i < this.state.filteredDataSet.length; i++) {
|
||||
var item = this.state.filteredDataSet[i];
|
||||
this.expandItem(item, this.state.expandAll);
|
||||
}
|
||||
};
|
||||
|
||||
this.expandItem = function (item, expanded) {
|
||||
item.Expanded = expanded;
|
||||
if (item.Expanded) {
|
||||
if (this.state.expandedItems.indexOf(item.Id) === -1) {
|
||||
this.state.expandedItems.push(item.Id);
|
||||
}
|
||||
} else {
|
||||
var index = this.state.expandedItems.indexOf(item.Id);
|
||||
if (index > -1) {
|
||||
this.state.expandedItems.splice(index, 1);
|
||||
}
|
||||
}
|
||||
DatatableService.setDataTableExpandedItems(this.tableKey, this.state.expandedItems);
|
||||
};
|
||||
|
||||
function expandPreviouslyExpandedItem(item, storedExpandedItems) {
|
||||
var expandedItem = _.find(storedExpandedItems, function (storedId) {
|
||||
return item.Id === storedId;
|
||||
});
|
||||
|
||||
if (expandedItem) {
|
||||
ctrl.expandItem(item, true);
|
||||
}
|
||||
}
|
||||
|
||||
this.expandItems = function (storedExpandedItems) {
|
||||
var expandedItemCount = 0;
|
||||
this.state.expandedItems = storedExpandedItems;
|
||||
|
||||
for (var i = 0; i < this.dataset.length; i++) {
|
||||
var item = this.dataset[i];
|
||||
expandPreviouslyExpandedItem(item, storedExpandedItems);
|
||||
if (item.Expanded) {
|
||||
++expandedItemCount;
|
||||
}
|
||||
}
|
||||
|
||||
if (expandedItemCount === this.dataset.length) {
|
||||
this.state.expandAll = true;
|
||||
}
|
||||
};
|
||||
|
||||
this.onDataRefresh = function () {
|
||||
var storedExpandedItems = DatatableService.getDataTableExpandedItems(this.tableKey);
|
||||
if (storedExpandedItems !== null) {
|
||||
this.expandItems(storedExpandedItems);
|
||||
}
|
||||
};
|
||||
|
||||
this.$onInit = function () {
|
||||
this.setDefaults();
|
||||
this.prepareTableFromDataset();
|
||||
|
||||
this.state.orderBy = this.orderBy;
|
||||
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);
|
||||
if (textFilter !== null) {
|
||||
this.state.textFilter = textFilter;
|
||||
this.onTextFilterChange();
|
||||
}
|
||||
|
||||
var storedFilters = DatatableService.getDataTableFilters(this.tableKey);
|
||||
if (storedFilters !== null) {
|
||||
this.filters = storedFilters;
|
||||
}
|
||||
if (this.filters && this.filters.state) {
|
||||
this.filters.state.open = false;
|
||||
}
|
||||
|
||||
var storedExpandedItems = DatatableService.getDataTableExpandedItems(this.tableKey);
|
||||
if (storedExpandedItems !== null) {
|
||||
this.expandItems(storedExpandedItems);
|
||||
}
|
||||
|
||||
var storedSettings = DatatableService.getDataTableSettings(this.tableKey);
|
||||
if (storedSettings !== null) {
|
||||
this.settings = storedSettings;
|
||||
this.settings.open = false;
|
||||
}
|
||||
this.onSettingsRepeaterChange();
|
||||
var storedColumnVisibility = DatatableService.getColumnVisibilitySettings(this.tableKey);
|
||||
if (storedColumnVisibility !== null) {
|
||||
this.columnVisibility = storedColumnVisibility;
|
||||
}
|
||||
};
|
||||
},
|
||||
]);
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
import _ from 'lodash-es';
|
||||
import { joinCommand, taskStatusBadge, nodeStatusBadge, trimSHA, dockerNodeAvailabilityBadge } from './utils';
|
||||
import { hideShaSum, joinCommand, nodeStatusBadge, taskStatusBadge, trimSHA } from './utils';
|
||||
|
||||
function includeString(text, values) {
|
||||
return values.some(function (val) {
|
||||
|
|
@ -76,7 +76,6 @@ angular
|
|||
};
|
||||
})
|
||||
.filter('nodestatusbadge', () => nodeStatusBadge)
|
||||
.filter('dockerNodeAvailabilityBadge', () => dockerNodeAvailabilityBadge)
|
||||
.filter('trimcontainername', function () {
|
||||
'use strict';
|
||||
return function (name) {
|
||||
|
|
@ -159,44 +158,7 @@ angular
|
|||
.filter('command', function () {
|
||||
return joinCommand;
|
||||
})
|
||||
.filter('hideshasum', function () {
|
||||
'use strict';
|
||||
return function (imageName) {
|
||||
if (imageName) {
|
||||
return imageName.split('@sha')[0];
|
||||
}
|
||||
return '';
|
||||
};
|
||||
})
|
||||
.filter('availablenodecount', [
|
||||
'ConstraintsHelper',
|
||||
function (ConstraintsHelper) {
|
||||
'use strict';
|
||||
return function (nodes, service) {
|
||||
var availableNodes = 0;
|
||||
for (var i = 0; i < nodes.length; i++) {
|
||||
var node = nodes[i];
|
||||
if (node.Availability === 'active' && node.Status === 'ready' && ConstraintsHelper.matchesServiceConstraints(service, node)) {
|
||||
availableNodes++;
|
||||
}
|
||||
}
|
||||
return availableNodes;
|
||||
};
|
||||
},
|
||||
])
|
||||
.filter('runningtaskscount', function () {
|
||||
'use strict';
|
||||
return function (tasks) {
|
||||
var runningTasks = 0;
|
||||
for (var i = 0; i < tasks.length; i++) {
|
||||
var task = tasks[i];
|
||||
if (task.Status.State === 'running' && task.DesiredState === 'running') {
|
||||
runningTasks++;
|
||||
}
|
||||
}
|
||||
return runningTasks;
|
||||
};
|
||||
})
|
||||
.filter('hideshasum', () => hideShaSum)
|
||||
.filter('tasknodename', function () {
|
||||
'use strict';
|
||||
return function (nodeId, nodes) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { NodeStatus, TaskState, NodeSpec } from 'docker-types/generated/1.41';
|
||||
import { NodeStatus, TaskState } from 'docker-types/generated/1.41';
|
||||
import _ from 'lodash';
|
||||
|
||||
export function trimSHA(imageName: string) {
|
||||
|
|
@ -62,14 +62,6 @@ export function nodeStatusBadge(text: NodeStatus['State']) {
|
|||
return 'success';
|
||||
}
|
||||
|
||||
export function dockerNodeAvailabilityBadge(text: NodeSpec['Availability']) {
|
||||
if (text === 'pause') {
|
||||
return 'warning';
|
||||
}
|
||||
|
||||
if (text === 'drain') {
|
||||
return 'danger';
|
||||
}
|
||||
|
||||
return 'success';
|
||||
export function hideShaSum(imageName = '') {
|
||||
return imageName.split('@sha')[0];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,108 +0,0 @@
|
|||
import _ from 'lodash-es';
|
||||
|
||||
function ConstraintModel(op, key, value) {
|
||||
this.op = op;
|
||||
this.value = value;
|
||||
this.key = key;
|
||||
}
|
||||
|
||||
var patterns = {
|
||||
id: {
|
||||
nodeId: 'node.id',
|
||||
nodeHostname: 'node.hostname',
|
||||
nodeRole: 'node.role',
|
||||
nodeLabels: 'node.labels.',
|
||||
engineLabels: 'engine.labels.',
|
||||
},
|
||||
op: {
|
||||
eq: '==',
|
||||
neq: '!=',
|
||||
},
|
||||
};
|
||||
|
||||
function matchesConstraint(value, constraint) {
|
||||
if (!constraint || (constraint.op === patterns.op.eq && value === constraint.value) || (constraint.op === patterns.op.neq && value !== constraint.value)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function matchesLabel(labels, constraint) {
|
||||
if (!constraint) {
|
||||
return true;
|
||||
}
|
||||
var found = _.find(labels, function (label) {
|
||||
return label.key === constraint.key && label.value === constraint.value;
|
||||
});
|
||||
return found !== undefined;
|
||||
}
|
||||
|
||||
function extractValue(constraint, op) {
|
||||
return constraint.split(op).pop().trim();
|
||||
}
|
||||
|
||||
function extractCustomLabelKey(constraint, op, baseLabelKey) {
|
||||
return constraint.split(op).shift().trim().replace(baseLabelKey, '');
|
||||
}
|
||||
|
||||
angular.module('portainer.docker').factory('ConstraintsHelper', [
|
||||
function ConstraintsHelperFactory() {
|
||||
'use strict';
|
||||
return {
|
||||
transformConstraints: function (constraints) {
|
||||
var transform = {};
|
||||
for (var i = 0; i < constraints.length; i++) {
|
||||
var constraint = constraints[i];
|
||||
|
||||
var op;
|
||||
if (constraint.includes(patterns.op.eq)) {
|
||||
op = patterns.op.eq;
|
||||
} else if (constraint.includes(patterns.op.neq)) {
|
||||
op = patterns.op.neq;
|
||||
}
|
||||
|
||||
var value = extractValue(constraint, op);
|
||||
var key = '';
|
||||
switch (true) {
|
||||
case constraint.includes(patterns.id.nodeId):
|
||||
transform.nodeId = new ConstraintModel(op, key, value);
|
||||
break;
|
||||
case constraint.includes(patterns.id.nodeHostname):
|
||||
transform.nodeHostname = new ConstraintModel(op, key, value);
|
||||
break;
|
||||
case constraint.includes(patterns.id.nodeRole):
|
||||
transform.nodeRole = new ConstraintModel(op, key, value);
|
||||
break;
|
||||
case constraint.includes(patterns.id.nodeLabels):
|
||||
key = extractCustomLabelKey(constraint, op, patterns.id.nodeLabels);
|
||||
transform.nodeLabels = new ConstraintModel(op, key, value);
|
||||
break;
|
||||
case constraint.includes(patterns.id.engineLabels):
|
||||
key = extractCustomLabelKey(constraint, op, patterns.id.engineLabels);
|
||||
transform.engineLabels = new ConstraintModel(op, key, value);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
return transform;
|
||||
},
|
||||
matchesServiceConstraints: function (service, node) {
|
||||
if (service.Constraints === undefined || service.Constraints.length === 0) {
|
||||
return true;
|
||||
}
|
||||
var constraints = this.transformConstraints(angular.copy(service.Constraints));
|
||||
if (
|
||||
matchesConstraint(node.Id, constraints.nodeId) &&
|
||||
matchesConstraint(node.Hostname, constraints.nodeHostname) &&
|
||||
matchesConstraint(node.Role, constraints.nodeRole) &&
|
||||
matchesLabel(node.Labels, constraints.nodeLabels) &&
|
||||
matchesLabel(node.EngineLabels, constraints.engineLabels)
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
};
|
||||
},
|
||||
]);
|
||||
|
|
@ -20,7 +20,6 @@ import { ConfigsDatatable } from '@/react/docker/configs/ListView/ConfigsDatatab
|
|||
import { AgentHostBrowser } from '@/react/docker/host/BrowseView/AgentHostBrowser';
|
||||
import { AgentVolumeBrowser } from '@/react/docker/volumes/BrowseView/AgentVolumeBrowser';
|
||||
import { ProcessesDatatable } from '@/react/docker/containers/StatsView/ProcessesDatatable';
|
||||
import { ScaleServiceButton } from '@/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/ScaleServiceButton';
|
||||
import { SecretsDatatable } from '@/react/docker/secrets/ListView/SecretsDatatable';
|
||||
import { StacksDatatable } from '@/react/docker/stacks/ListView/StacksDatatable';
|
||||
|
||||
|
|
@ -124,10 +123,6 @@ const ngModule = angular
|
|||
'dockerContainerProcessesDatatable',
|
||||
r2a(ProcessesDatatable, ['dataset', 'headers'])
|
||||
)
|
||||
.component(
|
||||
'dockerServicesDatatableScaleServiceButton',
|
||||
r2a(withUIRouter(withCurrentUser(ScaleServiceButton)), ['service'])
|
||||
)
|
||||
.component('dockerEventsDatatable', r2a(EventsDatatable, ['dataset']))
|
||||
.component(
|
||||
'dockerSecretsDatatable',
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import { withUIRouter } from '@/react-tools/withUIRouter';
|
|||
import { TasksDatatable } from '@/react/docker/services/ListView/ServicesDatatable/TasksDatatable';
|
||||
import { withCurrentUser } from '@/react-tools/withCurrentUser';
|
||||
import { TaskTableQuickActions } from '@/react/docker/services/common/TaskTableQuickActions';
|
||||
import { ServicesDatatable } from '@/react/docker/services/ListView/ServicesDatatable';
|
||||
|
||||
export const servicesModule = angular
|
||||
.module('portainer.docker.react.components.services', [])
|
||||
|
|
@ -18,4 +19,14 @@ export const servicesModule = angular
|
|||
'state',
|
||||
'taskId',
|
||||
])
|
||||
)
|
||||
.component(
|
||||
'dockerServicesDatatable',
|
||||
r2a(withUIRouter(withCurrentUser(ServicesDatatable)), [
|
||||
'dataset',
|
||||
'isAddActionVisible',
|
||||
'isStackColumnVisible',
|
||||
'onRefresh',
|
||||
'titleIcon',
|
||||
])
|
||||
).name;
|
||||
|
|
|
|||
|
|
@ -1,22 +1,9 @@
|
|||
<page-header title="'Service list'" breadcrumbs="['Services']" reload="true"> </page-header>
|
||||
|
||||
<div class="row" ng-if="services">
|
||||
<div class="col-sm-12">
|
||||
<services-datatable
|
||||
title-text="Services"
|
||||
title-icon="shuffle"
|
||||
dataset="services"
|
||||
table-key="services"
|
||||
order-by="Name"
|
||||
nodes="nodes"
|
||||
agent-proxy="applicationState.endpoint.mode.agentProxy"
|
||||
show-update-action="applicationState.endpoint.apiVersion >= 1.25"
|
||||
show-task-logs-button="applicationState.endpoint.apiVersion >= 1.30"
|
||||
show-add-action="true"
|
||||
show-stack-column="true"
|
||||
refresh-callback="getServices"
|
||||
endpoint-public-url="endpoint.PublicURL"
|
||||
endpoint-id="endpoint.Id"
|
||||
></services-datatable>
|
||||
</div>
|
||||
</div>
|
||||
<docker-services-datatable
|
||||
dataset="services"
|
||||
title-icon="shuffle"
|
||||
on-refresh="(getServices)"
|
||||
is-add-action-visible="true"
|
||||
is-stack-column-visible="true"
|
||||
></docker-services-datatable>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue