mirror of
https://github.com/fleetdm/fleet
synced 2026-04-21 21:47:20 +00:00
## Addresses #15325 - Define shared global styles for forms (`form` and `.form`s) and `.form-field`s - Sweep through the app, updating each form from being locally styled to first prioritizing the global styles and only defining local styles where needed for custom behavior - Remove lots of unnecessary nesting of elements - Other small bug fixes and improvements ### Samples, before (L) | after (R): **Save query modal**  **Edit query form**  **Add hosts modal**  ## QA Plan: @xpkoala here's the same list from the issue, freshly de-checked for you to use if it's helpful: * Please check error states of each field #### Specified by issue: ##### In "Save query" modal: - [ ] Reduce space between checkboxes and their help text to 8px/0.5rem for the following fields: - [ ] Observers can run - [ ] Discard data - [ ] Update the following checkbox labels to have normal font weight (not bold): - [ ] Discard data ##### On "Edit query" page: - [ ] Update the following checkbox labels to have normal font weight (not bold): - [ ] Observers can run - [ ] Discard data ##### In "Add hosts" modal, for copy text fields: - [ ] match typical form form field styles - [ ] Adjust the positioning of the copy icon to keep it from being too far down ##### Further locations to check - [ ] ChangeEmailForm.jsx - [ ] ChangePasswordForm.jsx - [ ] ConfirmInviteForm.jsx - [ ] ConfirmSSOInviteForm.jsx - [ ] EnrollSecretModal.tsx - [ ] ForgotPasswordForm.jsx - [ ] LoginForm.tsx - [ ] EditPackForm.tsx - [ ] (New)PackForm.tsx - [ ] AdminDetails.jsx - [ ] ConfirmationPage.tsx - [ ] FleetDetails.jsx - [ ] OrgDetails.jsx - [ ] ResetPasswordForm.tsx - [ ] UserSettingsForm.jsx - [ ] EditTeamModal.tsx - [ ] IdpSection.tsx - [ ] DeleteIntegrationModal.tsx - [ ] IntegrationForm.tsx - [ ] EndUserMigrationSection.tsx - [ ] RequestCSRModal.tsx - [ ] Advanced.tsx - [ ] Agents.tsx - [ ] FleetDesktop.tsx - [ ] HostStatusWebhook.tsx front - [ ] Info.tsx - [ ] Smtp.tsx - [ ] Sso.tsx - [ ] Statistics.tsx - [ ] WebAddress.tsx - [ ] CreateTeamModal.tsx - [ ] DeleteTeamModal.tsx - [ ] EditTeamModal.tsx - [ ] AgentOptionsPage.tsx - updated the layout of this page to align with the rest of the forms in the UI – can easily revert if it's not what we want - [ ] AddMemberModal.tsx - [ ] RemoveMemberModal.tsx - [ ] UserForm.tsx - Used by both `EditUserModal` and `CreateUserModal` - A few different conditions that cause different rendering behavior - [ ] DeleteHostModal.tsx - [ ] TransferHostModal.tsx - [ ] LabelForm.tsx - [ ] MacOSTargetForm.tsx - [ ] WindowsTargetForm.tsx - [ ] BootstrapPackageListltem.ts - [ ] EndUserAuthForm.tsx - [ ] PackQueryEditorModal.tsx - [ ] PolicyForm.tsx - [ ] SaveNewPolicyModal.tsx - [ ] ConfirmSaveChangesModal.tsx - [ ] Query automations modal - [ ] Policy automations modal - addresses #16010 - [ ] SoftwareAutomationsModal ## Checklist for submitter - [x] Changes file added for user-visible changes in `changes/` - [x] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com> Co-authored-by: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
203 lines
6.3 KiB
TypeScript
203 lines
6.3 KiB
TypeScript
import React, { useState, useEffect } from "react";
|
||
import { omit } from "lodash";
|
||
|
||
import Modal from "components/Modal";
|
||
import Button from "components/buttons/Button";
|
||
import InfoBanner from "components/InfoBanner/InfoBanner";
|
||
import CustomLink from "components/CustomLink/CustomLink";
|
||
import Checkbox from "components/forms/fields/Checkbox/Checkbox";
|
||
import QueryFrequencyIndicator from "components/QueryFrequencyIndicator/QueryFrequencyIndicator";
|
||
import LogDestinationIndicator from "components/LogDestinationIndicator/LogDestinationIndicator";
|
||
|
||
import { ISchedulableQuery } from "interfaces/schedulable_query";
|
||
|
||
interface IManageQueryAutomationsModalProps {
|
||
isUpdatingAutomations: boolean;
|
||
handleSubmit: (formData: any) => void; // TODO
|
||
onCancel: () => void;
|
||
togglePreviewDataModal: () => void;
|
||
availableQueries?: ISchedulableQuery[];
|
||
automatedQueryIds: number[];
|
||
logDestination: string;
|
||
}
|
||
|
||
interface ICheckedQuery {
|
||
name?: string;
|
||
id: number;
|
||
isChecked: boolean;
|
||
interval: number;
|
||
}
|
||
|
||
const useCheckboxListStateManagement = (
|
||
allQueries: ISchedulableQuery[],
|
||
automatedQueryIds: number[] | undefined
|
||
) => {
|
||
const [queryItems, setQueryItems] = useState<ICheckedQuery[]>(() => {
|
||
return allQueries.map(({ name, id, interval }) => ({
|
||
name,
|
||
id,
|
||
isChecked: !!automatedQueryIds?.includes(id),
|
||
interval,
|
||
}));
|
||
});
|
||
|
||
const updateQueryItems = (queryId: number) => {
|
||
setQueryItems((prevItems) =>
|
||
prevItems.map((query) =>
|
||
query.id !== queryId ? query : { ...query, isChecked: !query.isChecked }
|
||
)
|
||
);
|
||
};
|
||
|
||
return { queryItems, updateQueryItems };
|
||
};
|
||
|
||
const baseClass = "manage-query-automations-modal";
|
||
|
||
const ManageQueryAutomationsModal = ({
|
||
isUpdatingAutomations,
|
||
automatedQueryIds,
|
||
handleSubmit,
|
||
onCancel,
|
||
togglePreviewDataModal,
|
||
availableQueries,
|
||
logDestination,
|
||
}: IManageQueryAutomationsModalProps): JSX.Element => {
|
||
// TODO: Error handling, if any
|
||
const [errors, setErrors] = useState<{ [key: string]: string }>({});
|
||
|
||
// Client side sort queries alphabetically
|
||
const sortedAvailableQueries =
|
||
availableQueries?.sort((a, b) =>
|
||
a.name.toLowerCase().localeCompare(b.name.toLowerCase())
|
||
) || [];
|
||
|
||
const { queryItems, updateQueryItems } = useCheckboxListStateManagement(
|
||
sortedAvailableQueries,
|
||
automatedQueryIds || []
|
||
);
|
||
|
||
const onSubmit = (evt: React.MouseEvent<HTMLFormElement> | KeyboardEvent) => {
|
||
evt.preventDefault();
|
||
|
||
const newQueryIds: number[] = [];
|
||
queryItems?.forEach((p) => p.isChecked && newQueryIds.push(p.id));
|
||
|
||
handleSubmit(newQueryIds);
|
||
};
|
||
|
||
useEffect(() => {
|
||
const listener = (event: KeyboardEvent) => {
|
||
if (event.code === "Enter" || event.code === "NumpadEnter") {
|
||
event.preventDefault();
|
||
onSubmit(event);
|
||
}
|
||
};
|
||
document.addEventListener("keydown", listener);
|
||
return () => {
|
||
document.removeEventListener("keydown", listener);
|
||
};
|
||
});
|
||
|
||
return (
|
||
<Modal
|
||
title="Manage automations"
|
||
onExit={onCancel}
|
||
className={baseClass}
|
||
width="large"
|
||
>
|
||
<div className={`${baseClass} form`}>
|
||
<div className={`${baseClass}__heading`}>
|
||
Query automations let you send data to your log destination on a
|
||
schedule. Data is sent according to a query’s frequency.
|
||
</div>
|
||
{availableQueries?.length ? (
|
||
<div className={`${baseClass}__select form-field`}>
|
||
<div className="form-field__label">
|
||
Choose which queries will send data:
|
||
</div>
|
||
<div className={`${baseClass}__checkboxes`}>
|
||
{queryItems &&
|
||
queryItems.map((queryItem) => {
|
||
const { isChecked, name, id, interval } = queryItem;
|
||
return (
|
||
<div key={id} className={`${baseClass}__query-item`}>
|
||
<Checkbox
|
||
value={isChecked}
|
||
name={name}
|
||
onChange={() => {
|
||
updateQueryItems(id);
|
||
!isChecked &&
|
||
setErrors((errs) => omit(errs, "queryItems"));
|
||
}}
|
||
>
|
||
{name}
|
||
</Checkbox>
|
||
<QueryFrequencyIndicator
|
||
frequency={interval}
|
||
checked={isChecked}
|
||
/>
|
||
</div>
|
||
);
|
||
})}
|
||
</div>
|
||
</div>
|
||
) : (
|
||
<div className={`${baseClass}__no-queries`}>
|
||
<b>You have no queries.</b>
|
||
<p>Add a query to turn on automations.</p>
|
||
</div>
|
||
)}
|
||
<div className={`${baseClass}__log-destination form-field`}>
|
||
<div className="form-field__label">Log destination:</div>
|
||
<div className={`${baseClass}__selection`}>
|
||
<LogDestinationIndicator logDestination={logDestination} />
|
||
</div>
|
||
<div className={`${baseClass}__configure form-field__help-text`}>
|
||
Users with the admin role can
|
||
<CustomLink
|
||
url="https://fleetdm.com/docs/using-fleet/log-destinations"
|
||
text="configure a different log destination"
|
||
newTab
|
||
/>
|
||
</div>
|
||
</div>
|
||
<InfoBanner className={`${baseClass}__supported-platforms`}>
|
||
<p>Automations currently run on macOS, Windows, and Linux hosts.</p>
|
||
<p>
|
||
Interested in query automations for your Chromebooks?
|
||
<CustomLink
|
||
url="https://fleetdm.com/contact"
|
||
text="Let us know"
|
||
newTab
|
||
/>
|
||
</p>
|
||
</InfoBanner>
|
||
<Button
|
||
type="button"
|
||
variant="inverse"
|
||
onClick={togglePreviewDataModal}
|
||
className={`${baseClass}__preview-data`}
|
||
>
|
||
Preview data
|
||
</Button>
|
||
<div className="modal-cta-wrap">
|
||
<Button
|
||
type="submit"
|
||
variant="brand"
|
||
onClick={onSubmit}
|
||
className="save-loading"
|
||
isLoading={isUpdatingAutomations}
|
||
>
|
||
Save
|
||
</Button>
|
||
<Button onClick={onCancel} variant="inverse">
|
||
Cancel
|
||
</Button>
|
||
</div>
|
||
</div>
|
||
</Modal>
|
||
);
|
||
};
|
||
|
||
export default ManageQueryAutomationsModal;
|