Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-08 07:15:23 +02:00
Code Issues Releases Activity

refactor(access-control): create access-control-panel component [EE-2345] (#6486)

Browse source
This commit is contained in:
Chaim Lev-Ari 2022-03-16 08:35:32 +02:00 • committed by GitHub
parent 07294c19bb
commit f63b07bbb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
109 changed files with 2053 additions and 1518 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/docker/views/configs/edit/config.html
View file

@ -59,7 +59,14 @@
</div>
<!-- access-control-panel -->
<por-access-control-panel ng-if="config" resource-id="config.Id" resource-control="config.ResourceControl" resource-type="'config'"> </por-access-control-panel>
<access-control-panel
ng-if="config"
resource-id="config.Id"
resource-control="config.ResourceControl"
resource-type="resourceType"
on-update-success="(onUpdateResourceControlSuccess)"
>
</access-control-panel>
<!-- !access-control-panel -->
<div class="row" ng-if="config">

8
app/docker/views/configs/edit/configController.js
View file

@ -1,3 +1,5 @@
import { ResourceControlType } from '@/portainer/access-control/types';
angular.module('portainer.docker').controller('ConfigController', [
'$scope',
'$transition$',
@ -5,6 +7,12 @@ angular.module('portainer.docker').controller('ConfigController', [
'ConfigService',
'Notifications',
function ($scope, $transition$, $state, ConfigService, Notifications) {
$scope.resourceType = ResourceControlType.Config;
$scope.onUpdateResourceControlSuccess = function () {
$state.reload();
};
$scope.removeConfig = function removeConfig(configId) {
ConfigService.remove(configId)
.then(function success() {

9
app/docker/views/containers/edit/container.html
View file

@ -152,7 +152,14 @@
</div>
<!-- access-control-panel -->
<por-access-control-panel ng-if="container" resource-id="container.Id" resource-control="container.ResourceControl" resource-type="'container'"> </por-access-control-panel>
<access-control-panel
ng-if="container"
resource-id="container.Id"
resource-control="container.ResourceControl"
resource-type="resourceType"
on-update-success="(onUpdateResourceControlSuccess)"
>
</access-control-panel>
<!-- !access-control-panel -->
<div ng-if="container.State.Health" class="row">

6
app/docker/views/containers/edit/containerController.js
View file

@ -3,6 +3,7 @@ import _ from 'lodash-es';
import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
import { confirmContainerDeletion } from '@/portainer/services/modal.service/prompt';
import { FeatureId } from 'Portainer/feature-flags/enums';
import { ResourceControlType } from '@/portainer/access-control/types';
angular.module('portainer.docker').controller('ContainerController', [
'$q',
@ -45,6 +46,7 @@ angular.module('portainer.docker').controller('ContainerController', [
Authentication,
endpoint
) {
$scope.resourceType = ResourceControlType.Container;
$scope.endpoint = endpoint;
$scope.isAdmin = Authentication.isAdmin();
$scope.activityTime = 0;
@ -71,6 +73,10 @@ angular.module('portainer.docker').controller('ContainerController', [
$scope.updateRestartPolicy = updateRestartPolicy;
$scope.onUpdateResourceControlSuccess = function () {
$state.reload();
};
var update = function () {
var nodeName = $transition$.params().nodeName;
HttpRequestHelper.setPortainerAgentTargetHeader(nodeName);

7
app/docker/views/networks/edit/network.html
View file

@ -69,14 +69,15 @@
</div>
<!-- access-control-panel -->
<por-access-control-panel
<access-control-panel
ng-if="network"
resource-id="network.Id"
resource-control="network.ResourceControl"
resource-type="'network'"
resource-type="resourceType"
disable-ownership-change="isSystemNetwork()"
on-update-success="(onUpdateResourceControlSuccess)"
>
</por-access-control-panel>
</access-control-panel>
<!-- !access-control-panel -->
<div class="row" ng-if="!(network.Options | emptyobject)">

7
app/docker/views/networks/edit/networkController.js
View file

@ -1,3 +1,4 @@
import { ResourceControlType } from '@/portainer/access-control/types';
import DockerNetworkHelper from 'Docker/helpers/networkHelper';
angular.module('portainer.docker').controller('NetworkController', [
@ -11,6 +12,12 @@ angular.module('portainer.docker').controller('NetworkController', [
'HttpRequestHelper',
'NetworkHelper',
function ($scope, $state, $transition$, $filter, NetworkService, Container, Notifications, HttpRequestHelper, NetworkHelper) {
$scope.resourceType = ResourceControlType.Network;
$scope.onUpdateResourceControlSuccess = function () {
$state.reload();
};
$scope.removeNetwork = function removeNetwork() {
NetworkService.remove($transition$.params().id, $transition$.params().id)
.then(function success() {

9
app/docker/views/secrets/edit/secret.html
View file

@ -56,5 +56,12 @@
</div>
<!-- access-control-panel -->
<por-access-control-panel ng-if="secret" resource-id="secret.Id" resource-control="secret.ResourceControl" resource-type="'secret'"> </por-access-control-panel>
<access-control-panel
ng-if="secret"
resource-id="secret.Id"
resource-control="secret.ResourceControl"
resource-type="resourceType"
on-update-success="(onUpdateResourceControlSuccess)"
>
</access-control-panel>
<!-- !access-control-panel -->

8
app/docker/views/secrets/edit/secretController.js
View file

@ -1,3 +1,5 @@
import { ResourceControlType } from '@/portainer/access-control/types';
angular.module('portainer.docker').controller('SecretController', [
'$scope',
'$transition$',
@ -5,6 +7,12 @@ angular.module('portainer.docker').controller('SecretController', [
'SecretService',
'Notifications',
function ($scope, $transition$, $state, SecretService, Notifications) {
$scope.resourceType = ResourceControlType.Secret;
$scope.onUpdateResourceControlSuccess = function () {
$state.reload();
};
$scope.removeSecret = function removeSecret(secretId) {
SecretService.remove(secretId)
.then(function success() {

9
app/docker/views/services/edit/service.html
View file

@ -198,7 +198,14 @@
</div>
<!-- access-control-panel -->
<por-access-control-panel ng-if="service" resource-id="service.Id" resource-control="service.ResourceControl" resource-type="'service'"> </por-access-control-panel>
<access-control-panel
ng-if="service"
resource-id="service.Id"
resource-control="service.ResourceControl"
resource-type="resourceType"
on-update-success="(onUpdateResourceControlSuccess)"
>
</access-control-panel>
<!-- !access-control-panel -->
<div class="row">

7
app/docker/views/services/edit/serviceController.js
View file

@ -21,6 +21,7 @@ import _ from 'lodash-es';
import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
import * as envVarsUtils from '@/portainer/helpers/env-vars';
import { ResourceControlType } from '@/portainer/access-control/types';
angular.module('portainer.docker').controller('ServiceController', [
'$q',
@ -87,6 +88,12 @@ angular.module('portainer.docker').controller('ServiceController', [
RegistryService,
endpoint
) {
$scope.resourceType = ResourceControlType.Service;
$scope.onUpdateResourceControlSuccess = function () {
$state.reload();
};
$scope.endpoint = endpoint;
$scope.state = {

9
app/docker/views/volumes/edit/volume.html
View file

@ -52,7 +52,14 @@
</div>
<!-- access-control-panel -->
<por-access-control-panel ng-if="volume" resource-id="volume.ResourceId" resource-control="volume.ResourceControl" resource-type="'volume'"> </por-access-control-panel>
<access-control-panel
ng-if="volume"
resource-id="volume.ResourceId"
resource-control="volume.ResourceControl"
resource-type="resourceType"
on-update-success="(onUpdateResourceControlSuccess)"
>
</access-control-panel>
<!-- !access-control-panel -->
<div class="row" ng-if="!(volume.Options | emptyobject)">

8
app/docker/views/volumes/edit/volumeController.js
View file

@ -1,3 +1,5 @@
import { ResourceControlType } from '@/portainer/access-control/types';
angular.module('portainer.docker').controller('VolumeController', [
'$scope',
'$state',
@ -9,6 +11,12 @@ angular.module('portainer.docker').controller('VolumeController', [
'Notifications',
'HttpRequestHelper',
function ($scope, $state, $transition$, $q, ModalService, VolumeService, ContainerService, Notifications, HttpRequestHelper) {
$scope.resourceType = ResourceControlType.Volume;
$scope.onUpdateResourceControlSuccess = function () {
$state.reload();
};
$scope.removeVolume = function removeVolume() {
ModalService.confirmDeletion('Do you want to remove this volume?', (confirmed) => {
if (confirmed) {