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

feat(app): sort environment variables (#4815)

Browse source 
* feat(app): sort environment variables

* feat(k8s/application): improve the sorting for the env variables when creating/editing application

* feat(k8s/application): update the removal of the env var

* feat(docker/service): improve the sorting order for env var in service edition view
This commit is contained in:
Alice Groux 2021-02-18 14:46:26 +01:00 • committed by GitHub
parent 86335a4357
commit 387bbeceba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,6 +96,7 @@ angular.module('portainer.docker').controller('ContainerController', [
});
}
$scope.container.Config.Env = _.sortBy($scope.container.Config.Env, _.toLower);
const inSwarm = $scope.container.Config.Labels['com.docker.swarm.service.id'];
const autoRemove = $scope.container.HostConfig.AutoRemove;
const admin = Authentication.isAdmin();

1
app/docker/views/images/edit/imageController.js
View file

@ -154,6 +154,7 @@ angular.module('portainer.docker').controller('ImageController', [
.then(function success(data) {
$scope.image = data.image;
$scope.history = data.history;
$scope.image.Env = _.sortBy($scope.image.Env, _.toLower);
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to retrieve image details');

4
app/docker/views/services/edit/includes/environmentvariables.html
View file

@ -19,7 +19,7 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="var in service.EnvironmentVariables">
<tr ng-repeat="var in service.EnvironmentVariables | orderBy: 'originalKey'">
<td>
<div class="input-group input-group-sm">
<span class="input-group-addon fit-text-size">name</span>
@ -39,7 +39,7 @@
disable-authorization="DockerServiceUpdate"
/>
<span class="input-group-btn" authorization="DockerServiceUpdate">
<button class="btn btn-sm btn-danger" type="button" ng-click="removeEnvironmentVariable(service, $index)" ng-disabled="isUpdating">
<button class="btn btn-sm btn-danger" type="button" ng-click="removeEnvironmentVariable(service, var)" ng-disabled="isUpdating">
<i class="fa fa-trash" aria-hidden="true"></i>
</button>
</span>

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

@ -115,8 +115,9 @@ angular.module('portainer.docker').controller('ServiceController', [
service.EnvironmentVariables.push({ key: '', value: '', originalValue: '' });
updateServiceArray(service, 'EnvironmentVariables', service.EnvironmentVariables);
};
$scope.removeEnvironmentVariable = function removeEnvironmentVariable(service, index) {
var removedElement = service.EnvironmentVariables.splice(index, 1);
$scope.removeEnvironmentVariable = function removeEnvironmentVariable(service, item) {
const index = service.EnvironmentVariables.indexOf(item);
const removedElement = service.EnvironmentVariables.splice(index, 1);
if (removedElement !== null) {
updateServiceArray(service, 'EnvironmentVariables', service.EnvironmentVariables);
}