From 30e23ea5b491421533e93e486a0910688a3a48b6 Mon Sep 17 00:00:00 2001
From: matias-portainer <104775949+matias-portainer@users.noreply.github.com>
Date: Thu, 10 Nov 2022 16:13:20 -0300
Subject: [PATCH] fix(ui): tidy up Edge Devices configuration EE-3604 (#7797)

---
 .../components/EdgeCheckInIntervalField.tsx   | 21 ++++++++++++--
 app/portainer/views/settings/settings.html    | 11 ++++++++
 .../views/settings/settingsController.js      |  7 +++++
 .../FormControl/FormControl.tsx               |  6 +++-
 .../form-components/FormControl/index.ts      |  1 +
 .../DeploymentSyncOptions.tsx                 | 28 ++++++++++---------
 6 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/app/edge/components/EdgeCheckInIntervalField.tsx b/app/edge/components/EdgeCheckInIntervalField.tsx
index f8b6e85ff..f01f8ba60 100644
--- a/app/edge/components/EdgeCheckInIntervalField.tsx
+++ b/app/edge/components/EdgeCheckInIntervalField.tsx
@@ -4,7 +4,7 @@ import { r2a } from '@/react-tools/react2angular';
 import { useSettings } from '@/react/portainer/settings/queries';
 import { withReactQuery } from '@/react-tools/withReactQuery';
 
-import { FormControl } from '@@/form-components/FormControl';
+import { FormControl, Size } from '@@/form-components/FormControl';
 import { Select } from '@@/form-components/Input';
 
 interface Props {
@@ -14,6 +14,7 @@ interface Props {
   label?: string;
   tooltip?: string;
   readonly?: boolean;
+  size?: Size;
 }
 
 export const checkinIntervalOptions = [
@@ -42,11 +43,17 @@ export function EdgeCheckinIntervalField({
   isDefaultHidden = false,
   label = 'Poll frequency',
   tooltip = 'Interval used by this Edge agent to check in with the Portainer instance. Affects Edge environment management and Edge compute features.',
+  size = 'small',
 }: Props) {
   const options = useOptions(isDefaultHidden);
 
   return (
-    <FormControl inputId="edge_checkin" label={label} tooltip={tooltip}>
+    <FormControl
+      inputId="edge_checkin"
+      label={label}
+      tooltip={tooltip}
+      size={size}
+    >
       <Select
         value={value}
         onChange={(e) => {
@@ -61,7 +68,15 @@ export function EdgeCheckinIntervalField({
 
 export const EdgeCheckinIntervalFieldAngular = r2a(
   withReactQuery(EdgeCheckinIntervalField),
-  ['value', 'onChange', 'isDefaultHidden', 'tooltip', 'label', 'readonly']
+  [
+    'value',
+    'onChange',
+    'isDefaultHidden',
+    'tooltip',
+    'label',
+    'readonly',
+    'size',
+  ]
 );
 
 function useOptions(isDefaultHidden: boolean) {
diff --git a/app/portainer/views/settings/settings.html b/app/portainer/views/settings/settings.html
index b43234143..d3607d216 100644
--- a/app/portainer/views/settings/settings.html
+++ b/app/portainer/views/settings/settings.html
@@ -14,6 +14,17 @@
             </div>
           </div>
           <!-- !snapshot-interval -->
+
+          <!-- checkin-interval -->
+          <edge-checkin-interval-field
+            size="'xsmall'"
+            value="settings.EdgeAgentCheckinInterval"
+            label="'Edge agent default poll frequency'"
+            is-default-hidden="true"
+            on-change="(onChangeCheckInInterval)"
+          ></edge-checkin-interval-field>
+          <!-- !checkin-interval -->
+
           <!-- logo -->
           <div class="form-group">
             <por-switch-field
diff --git a/app/portainer/views/settings/settingsController.js b/app/portainer/views/settings/settingsController.js
index c33f32edf..085580f87 100644
--- a/app/portainer/views/settings/settingsController.js
+++ b/app/portainer/views/settings/settingsController.js
@@ -83,6 +83,13 @@ angular.module('portainer.app').controller('SettingsController', [
       $scope.state.featureLimited = limited;
     };
 
+    $scope.onChangeCheckInInterval = function (interval) {
+      $scope.$evalAsync(() => {
+        var settings = $scope.settings;
+        settings.EdgeAgentCheckinInterval = interval;
+      });
+    };
+
     $scope.removeFilteredContainerLabel = function (index) {
       var settings = $scope.settings;
       settings.BlackListedLabels.splice(index, 1);
diff --git a/app/react/components/form-components/FormControl/FormControl.tsx b/app/react/components/form-components/FormControl/FormControl.tsx
index 81b7d3847..ccf5f283e 100644
--- a/app/react/components/form-components/FormControl/FormControl.tsx
+++ b/app/react/components/form-components/FormControl/FormControl.tsx
@@ -7,7 +7,7 @@ import { FormError } from '../FormError';
 
 import styles from './FormControl.module.css';
 
-type Size = 'small' | 'medium' | 'large';
+export type Size = 'xsmall' | 'small' | 'medium' | 'large';
 
 export interface Props {
   inputId?: string;
@@ -60,6 +60,8 @@ function sizeClassLabel(size?: Size) {
       return 'col-sm-5 col-lg-4';
     case 'medium':
       return 'col-sm-4 col-lg-3';
+    case 'xsmall':
+      return 'col-sm-2';
     default:
       return 'col-sm-3 col-lg-2';
   }
@@ -71,6 +73,8 @@ function sizeClassChildren(size?: Size) {
       return 'col-sm-7 col-lg-8';
     case 'medium':
       return 'col-sm-8 col-lg-9';
+    case 'xsmall':
+      return 'col-sm-8';
     default:
       return 'col-sm-9 col-lg-10';
   }
diff --git a/app/react/components/form-components/FormControl/index.ts b/app/react/components/form-components/FormControl/index.ts
index 3d8eba866..46b99fad1 100644
--- a/app/react/components/form-components/FormControl/index.ts
+++ b/app/react/components/form-components/FormControl/index.ts
@@ -1 +1,2 @@
 export { FormControl } from './FormControl';
+export type { Size } from './FormControl';
diff --git a/app/react/portainer/settings/EdgeComputeView/DeploymentSyncOptions/DeploymentSyncOptions.tsx b/app/react/portainer/settings/EdgeComputeView/DeploymentSyncOptions/DeploymentSyncOptions.tsx
index 90605b8d2..ac7e959f2 100644
--- a/app/react/portainer/settings/EdgeComputeView/DeploymentSyncOptions/DeploymentSyncOptions.tsx
+++ b/app/react/portainer/settings/EdgeComputeView/DeploymentSyncOptions/DeploymentSyncOptions.tsx
@@ -83,25 +83,27 @@ export function DeploymentSyncOptions() {
                 </TextTip>
 
                 <FormSection title="Check-in Intervals">
-                  {!values.Edge.AsyncMode ? (
-                    <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."
-                    />
-                  ) : (
+                  <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 && (
+                  <FormSection title="Async Check-in Intervals">
                     <EdgeAsyncIntervalsForm
                       values={values.Edge}
                       onChange={(value) => setFieldValue('Edge', value)}
                       isDefaultHidden
                       fieldSettings={asyncIntervalFieldSettings}
                     />
-                  )}
-                </FormSection>
+                  </FormSection>
+                )}
 
                 <FormSection title="Actions">
                   <div className="form-group mt-5">