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

feat(edge/jobs): migrate create view to react [EE-2221] (#11867)

Browse source
This commit is contained in:
Chaim Lev-Ari 2024-06-02 11:10:38 +03:00 • committed by GitHub
parent 94c91035a7
commit 02fbdfec36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 777 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/edge/components/edge-job-form/edgeJobForm.html
View file

@ -36,7 +36,7 @@
<!-- edge-job-method-select -->
<div class="col-sm-12 form-section-title"> Edge job configuration </div>
<box-selector slim="true" radio-name="'configuration'" value="$ctrl.formValues.cronMethod" options="$ctrl.cronMethods" on-change="($ctrl.onCronMethodChange)"></box-selector>
<box-selector slim="true" radio-name="'configurationold'" value="$ctrl.formValues.cronMethod" options="$ctrl.cronMethods" on-change="($ctrl.onCronMethodChange)"></box-selector>
<!-- !edge-job-method-select -->
<!-- basic-edge-job -->
@ -44,9 +44,10 @@
<div class="form-group">
<label for="recurring" class="col-sm-2 control-label text-left">Recurring Edge job</label>
<div class="col-sm-10">
<label class="switch"
><input type="checkbox" name="recurring" ng-model="$ctrl.model.Recurring" data-cy="recurring-edge-job-checkbox" /><span class="slider round"></span
></label>
<label class="switch">
<input type="checkbox" name="recurring" ng-model="$ctrl.model.Recurring" id="recurring" data-cy="recurring-edge-job-checkbox" />
<span class="slider round"></span>
</label>
</div>
</div>
<!-- not-recurring -->
@ -135,7 +136,7 @@
<!-- execution-method -->
<div ng-if="!$ctrl.model.Id">
<div class="col-sm-12 form-section-title"> Job content </div>
<box-selector value="$ctrl.formValues.method" options="$ctrl.buildMethods" radio-name="buildMethod" on-change="($ctrl.onBuildMethodChange)" slim="true"></box-selector>
<box-selector value="$ctrl.formValues.method" options="$ctrl.buildMethods" radio-name="'buildMethodolds'" on-change="($ctrl.onBuildMethodChange)" slim="true"></box-selector>
</div>
<!-- !execution-method -->

10
app/edge/components/edge-job-form/edgeJobFormController.js
View file

@ -9,8 +9,8 @@ export class EdgeJobFormController {
this.$scope = $scope;
this.$async = $async;
this.cronMethods = cronMethodOptions;
this.buildMethods = [editor, upload];
this.cronMethods = cronMethodOptions.map((o) => ({ ...o, id: o.id + '-old' }));
this.buildMethods = [editor, upload].map((o) => ({ ...o, id: o.id + '-old' }));
this.state = {
formValidationError: '',
@ -70,10 +70,12 @@ export class EdgeJobFormController {
onChangeModel(model) {
const defaultTime = moment().add('hours', 1);
const scheduled = this.scheduleValues.find((v) => v.cron === model.CronExpression);
this.formValues = {
datetime: model.CronExpression ? cronToDatetime(model.CronExpression, defaultTime) : defaultTime,
scheduleValue: this.formValues.scheduleValue,
cronMethod: model.Recurring ? 'advanced' : 'basic',
scheduleValue: scheduled || this.scheduleValues[0],
cronMethod: model.Recurring && !scheduled ? 'advanced' : 'basic',
method: this.formValues.method,
};
}