Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Host expiry setting to validate on change (#4604)

Browse Source 
* cleaned up old conflicting tooltip styles

* fixed hsot expiry validation; validate on change
This commit is contained in:
Martavis Parker
2022-03-15 23:38:19 -07:00
committed by GitHub
parent d0ab0bca9e
commit 0fef79926f
6 changed files with 98 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/components/forms/admin/AppConfigForm/AppConfigForm.tsx
+70 -82
View File
@@ -219,7 +219,7 @@ const AppConfigFormFunctional = ({
}
if (enableHostExpiry) {
if (!hostExpiryWindow) {
if (!hostExpiryWindow || hostExpiryWindow <= 0) {
errors.host_expiry_window =
"Host expiry window must be a positive number";
}
@@ -235,7 +235,7 @@ const AppConfigFormFunctional = ({
setFormErrors(errors);
};
// Validates forms when certain checkboxes and dropdowns are selected
// Validates forms when certain information is changed
useEffect(() => {
validateForm();
}, [
@@ -245,6 +245,7 @@ const AppConfigFormFunctional = ({
enableHostStatusWebhook,
enableHostExpiry,
agentOptions,
hostExpiryWindow,
]);
// TOGGLE MODALS
@@ -832,86 +833,73 @@ const AppConfigFormFunctional = ({
</p>
<div className={`${baseClass}__inputs`}>
<div className={`${baseClass}__form-fields`}>
<div className="tooltip-wrap tooltip-wrap--input">
<InputField
label="Domain"
onChange={handleInputChange}
name="domain"
value={domain}
parseTarget
tooltip={
'<p>If you need to specify a HELO domain, <br />you can do it here <em className="hint hint--brand">(Default: <strong>Blank</strong>)</em></p>'
}
/>
</div>
<div className="tooltip-wrap">
<Checkbox
onChange={handleInputChange}
name="verifySSLCerts"
value={verifySSLCerts}
parseTarget
tooltip={
'<p>Turn this off (not recommended) <br />if you use a self-signed certificate <em className="hint hint--brand"><br />(Default: <strong>On</strong>)</em></p>'
}
>
Verify SSL certs
</Checkbox>
</div>
<div className="tooltip-wrap">
<Checkbox
onChange={handleInputChange}
name="enableStartTLS"
value={enableStartTLS}
parseTarget
tooltip={
'<p>Detects if STARTTLS is enabled <br />in your SMTP server and starts <br />to use it. <em className="hint hint--brand">(Default: <strong>On</strong>)</em></p>'
}
>
Enable STARTTLS
</Checkbox>
</div>
<div className="tooltip-wrap">
<Checkbox
onChange={handleInputChange}
name="enableHostExpiry"
value={enableHostExpiry}
parseTarget
tooltip={
'<p>When enabled, allows automatic cleanup <br />of hosts that have not communicated with Fleet <br />in some number of days. <em className="hint hint--brand">(Default: <strong>Off</strong>)</em></p>'
}
>
Host expiry
</Checkbox>
</div>
<div className="tooltip-wrap tooltip-wrap--input">
<InputField
label="Host expiry window"
type="number"
disabled={!enableHostExpiry}
onChange={handleInputChange}
name="hostExpiryWindow"
value={hostExpiryWindow}
parseTarget
onBlur={validateForm}
error={formErrors.host_expiry_window}
tooltip={
"<p>If a host has not communicated with Fleet in the specified number of days, it will be removed.</p>"
}
/>
</div>
<div className="tooltip-wrap">
<Checkbox
onChange={handleInputChange}
name="disableLiveQuery"
value={disableLiveQuery}
parseTarget
tooltip={
'<p>When enabled, disables the ability to run live queries <br />(ad hoc queries executed via the UI or fleetctl). <em className="hint hint--brand">(Default: <strong>Off</strong>)</em></p>'
}
>
Disable live queries
</Checkbox>
</div>
<InputField
label="Domain"
onChange={handleInputChange}
name="domain"
value={domain}
parseTarget
tooltip={
'<p>If you need to specify a HELO domain, <br />you can do it here <em className="hint hint--brand">(Default: <strong>Blank</strong>)</em></p>'
}
/>
<Checkbox
onChange={handleInputChange}
name="verifySSLCerts"
value={verifySSLCerts}
parseTarget
tooltip={
'<p>Turn this off (not recommended) <br />if you use a self-signed certificate <em className="hint hint--brand"><br />(Default: <strong>On</strong>)</em></p>'
}
>
Verify SSL certs
</Checkbox>
<Checkbox
onChange={handleInputChange}
name="enableStartTLS"
value={enableStartTLS}
parseTarget
tooltip={
'<p>Detects if STARTTLS is enabled <br />in your SMTP server and starts <br />to use it. <em className="hint hint--brand">(Default: <strong>On</strong>)</em></p>'
}
>
Enable STARTTLS
</Checkbox>
<Checkbox
onChange={handleInputChange}
name="enableHostExpiry"
value={enableHostExpiry}
parseTarget
tooltip={
'<p>When enabled, allows automatic cleanup <br />of hosts that have not communicated with Fleet <br />in some number of days. <em className="hint hint--brand">(Default: <strong>Off</strong>)</em></p>'
}
>
Host expiry
</Checkbox>
<InputField
label="Host expiry window"
type="number"
disabled={!enableHostExpiry}
onChange={handleInputChange}
name="hostExpiryWindow"
value={hostExpiryWindow}
parseTarget
error={formErrors.host_expiry_window}
tooltip={
"<p>If a host has not communicated with Fleet in the specified number of days, it will be removed.</p>"
}
/>
<Checkbox
onChange={handleInputChange}
name="disableLiveQuery"
value={disableLiveQuery}
parseTarget
tooltip={
'<p>When enabled, disables the ability to run live queries <br />(ad hoc queries executed via the UI or fleetctl). <em className="hint hint--brand">(Default: <strong>Off</strong>)</em></p>'
}
>
Disable live queries
</Checkbox>
</div>
</div>
</div>
frontend/components/forms/admin/AppConfigForm/_styles.scss
-46
View File
@@ -224,51 +224,5 @@
&__advanced-options {
margin-bottom: $pad-large;
.tooltip-wrap {
display: flex;
align-items: center;
width: 100%;
margin-bottom: $pad-large;
.icon-tooltip {
span {
display: flex;
align-items: center;
}
p {
text-align: center;
}
}
.form-field--input {
display: flex;
flex-direction: column;
width: 100%;
margin-right: $pad-small;
margin-bottom: 0;
}
.form-field--checkbox {
display: flex;
flex-direction: column;
align-items: center;
margin-right: $pad-small;
margin-bottom: 0;
.fleet-checkbox {
display: flex;
align-items: center;
}
}
}
.tooltip-wrap--input {
.icon-tooltip {
span {
margin-top: 22px;
}
}
}
}
}