github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(settings): fix settings save/update EE-3604 (#8180)

pull/8191/head
matias-portainer 2022-12-12 15:11:12 -03:00 committed by GitHub
parent 2188005b48
commit b59a0ba823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/portainer/views/settings/settingsController.js
View File

@ -174,6 +174,7 @@ angular.module('portainer.app').controller('SettingsController', [
LogoURL: $scope.formValues.customLogo ? $scope.settings.LogoURL : '', LogoURL: $scope.formValues.customLogo ? $scope.settings.LogoURL : '',
EnableTelemetry: $scope.formValues.enableTelemetry, EnableTelemetry: $scope.formValues.enableTelemetry,
TemplatesURL: $scope.settings.TemplatesURL, TemplatesURL: $scope.settings.TemplatesURL,
EdgeAgentCheckinInterval: $scope.settings.EdgeAgentCheckinInterval,
}; };
$scope.state.actionInProgress = true; $scope.state.actionInProgress = true;

24
app/react/portainer/settings/EdgeComputeView/DeploymentSyncOptions/DeploymentSyncOptions.tsx
View File

@ -60,6 +60,18 @@ export function DeploymentSyncOptions() {
> >
{({ errors, setFieldValue, values, isValid, dirty }) => ( {({ errors, setFieldValue, values, isValid, dirty }) => (
<Form className="form-horizontal"> <Form className="form-horizontal">
<FormSection title="Check-in Intervals">
<EdgeCheckinIntervalField
value={values.EdgeAgentCheckinInterval}
onChange={(value) =>
setFieldValue('EdgeAgentCheckinInterval', value)
}
isDefaultHidden
label="Edge agent default poll frequency"
tooltip="Interval used by default by each Edge agent to check in with the Portainer instance. Affects Edge environment management and Edge compute features."
/>
</FormSection>
<FormControl <FormControl
inputId="edge_async_mode" inputId="edge_async_mode"
label="Use Async mode by default" label="Use Async mode by default"
@ -83,18 +95,6 @@ export function DeploymentSyncOptions() {
Enabling Async disables the tunnel function. Enabling Async disables the tunnel function.
</TextTip> </TextTip>
<FormSection title="Check-in Intervals">
<EdgeCheckinIntervalField
value={values.EdgeAgentCheckinInterval}
onChange={(value) =>
setFieldValue('EdgeAgentCheckinInterval', value)
}
isDefaultHidden
label="Edge agent default poll frequency"
tooltip="Interval used by default by each Edge agent to check in with the Portainer instance. Affects Edge environment management and Edge compute features."
/>
</FormSection>
{values.Edge.AsyncMode && ( {values.Edge.AsyncMode && (
<FormSection title="Async Check-in Intervals"> <FormSection title="Async Check-in Intervals">
<EdgeAsyncIntervalsForm <EdgeAsyncIntervalsForm