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

refactor(ui): migrate env var field to react [EE-4853] (#8451)

Browse source
This commit is contained in:
Chaim Lev-Ari 2023-05-31 10:08:41 +07:00 • committed by GitHub
parent 6b5940e00e
commit 2d05103fed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 721 additions and 442 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/docker/views/containers/create/createContainerController.js
View file

@ -1,9 +1,9 @@
import _ from 'lodash-es';
import * as envVarsUtils from '@/react/components/form-components/EnvironmentVariablesFieldset/utils';
import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
import { confirmDestructive } from '@@/modals/confirm';
import * as envVarsUtils from '@/portainer/helpers/env-vars';
import { FeatureId } from '@/react/portainer/feature-flags/enums';
import { buildConfirmButton } from '@@/modals/utils';

12
app/docker/views/containers/create/createcontainer.html
View file

@ -578,11 +578,13 @@
<!-- !tab-labels -->
<!-- tab-env -->
<div class="tab-pane" id="env">
<environment-variables-panel
ng-model="formValues.Env"
explanation="These values will be applied to the container when deployed"
on-change="(handleEnvVarChange)"
></environment-variables-panel>
<div class="form-horizontal">
<environment-variables-panel
values="formValues.Env"
explanation="'These values will be applied to the container when deployed'"
on-change="(handleEnvVarChange)"
></environment-variables-panel>
</div>
</div>
<!-- !tab-env -->
<!-- tab-restart-policy -->

2
app/docker/views/services/create/createServiceController.js
View file

@ -1,7 +1,7 @@
import _ from 'lodash-es';
import * as envVarsUtils from '@/react/components/form-components/EnvironmentVariablesFieldset/utils';
import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
import * as envVarsUtils from '@/portainer/helpers/env-vars';
import { AccessControlFormData } from '../../../../portainer/components/accessControlForm/porAccessControlFormModel';
require('./includes/update-restart.html');

12
app/docker/views/services/create/createservice.html
View file

@ -396,11 +396,13 @@
<!-- !tab-network -->
<!-- tab-env -->
<div class="tab-pane" id="env">
<environment-variables-panel
ng-model="formValues.Env"
explanation="These values will be applied to the service when created"
on-change="(handleEnvVarChange)"
></environment-variables-panel>
<div class="form-horizontal">
<environment-variables-panel
values="formValues.Env"
explanation="'These values will be applied to the service when created'"
on-change="(handleEnvVarChange)"
></environment-variables-panel>
</div>
</div>
<!-- !tab-env -->
<!-- tab-labels -->

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

@ -1,4 +1,4 @@
<ng-form ng-if="service.EnvironmentVariables" id="service-env-variables" name="serviceEnvForm">
<ng-form ng-if="service.EnvironmentVariables" id="service-env-variables" name="serviceEnvForm" class="form-horizontal">
<rd-widget>
<rd-widget-header icon="list" title-text="Environment variables">
<div class="nopadding" authorization="DockerServiceUpdate">
@ -11,7 +11,9 @@
<p>There are no environment variables for this service.</p>
</rd-widget-body>
<rd-widget-body ng-if="service.EnvironmentVariables.length > 0">
<environment-variables-panel is-name-disabled="true" ng-model="service.EnvironmentVariables" on-change="(onChangeEnvVars)"></environment-variables-panel>
<div class="form-group">
<environment-variables-fieldset values="service.EnvironmentVariables" on-change="(onChangeEnvVars)"></environment-variables-fieldset>
</div>
</rd-widget-body>
<rd-widget-footer authorization="DockerServiceUpdate">
<div class="btn-toolbar" role="toolbar">

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

@ -19,8 +19,8 @@ require('./includes/updateconfig.html');
import _ from 'lodash-es';
import * as envVarsUtils from '@/react/components/form-components/EnvironmentVariablesFieldset/utils';
import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
import * as envVarsUtils from '@/portainer/helpers/env-vars';
import { ResourceControlType } from '@/react/portainer/access-control/types';
import { confirmServiceForceUpdate } from '@/react/docker/services/common/update-service-modal';
import { confirm, confirmDelete } from '@@/modals/confirm';
@ -125,8 +125,10 @@ angular.module('portainer.docker').controller('ServiceController', [
};
$scope.addEnvironmentVariable = function addEnvironmentVariable(service) {
service.EnvironmentVariables.push({ name: '', value: '' });
updateServiceArray(service, 'EnvironmentVariables', service.EnvironmentVariables);
$scope.$evalAsync(() => {
service.EnvironmentVariables = service.EnvironmentVariables.concat({ name: '', value: '' });
updateServiceArray(service, 'EnvironmentVariables', service.EnvironmentVariables);
});
};
$scope.onChangeEnvVars = onChangeEnvVars;