mirror of
https://github.com/fleetdm/fleet
synced 2026-05-13 12:09:19 +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>
118 lines
3.1 KiB
TypeScript
118 lines
3.1 KiB
TypeScript
import React, { useState } from "react";
|
|
|
|
import { ITeam } from "interfaces/team";
|
|
import { IEnrollSecret } from "interfaces/enroll_secret";
|
|
|
|
import Modal from "components/Modal";
|
|
import Button from "components/buttons/Button";
|
|
// @ts-ignore
|
|
import InputField from "components/forms/fields/InputField";
|
|
|
|
interface ISecretEditorModalProps {
|
|
selectedTeam: number;
|
|
onSaveSecret: (newEnrollSecret: string) => void;
|
|
teams: ITeam[];
|
|
toggleSecretEditorModal: () => void;
|
|
selectedSecret: IEnrollSecret | undefined;
|
|
isUpdatingSecret: boolean;
|
|
}
|
|
|
|
const baseClass = "secret-editor-modal";
|
|
|
|
const randomSecretGenerator = () => {
|
|
const randomChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
|
|
let result = "";
|
|
for (let i = 0; i < 32; i += 1) {
|
|
result += randomChars.charAt(
|
|
Math.floor(Math.random() * randomChars.length)
|
|
);
|
|
}
|
|
return result;
|
|
};
|
|
|
|
const SecretEditorModal = ({
|
|
onSaveSecret,
|
|
selectedTeam,
|
|
teams,
|
|
toggleSecretEditorModal,
|
|
selectedSecret,
|
|
isUpdatingSecret,
|
|
}: ISecretEditorModalProps): JSX.Element => {
|
|
const [enrollSecretString, setEnrollSecretString] = useState(
|
|
selectedSecret ? selectedSecret.secret : randomSecretGenerator()
|
|
);
|
|
const [errors, setErrors] = useState<{ [key: string]: string }>({});
|
|
|
|
const renderTeam = () => {
|
|
if (typeof selectedTeam === "string") {
|
|
selectedTeam = parseInt(selectedTeam, 10);
|
|
}
|
|
|
|
if (selectedTeam === 0) {
|
|
return { name: "No team" };
|
|
}
|
|
return teams.find((team) => team.id === selectedTeam);
|
|
};
|
|
|
|
const onSecretChange = (value: string) => {
|
|
if (value.length < 32) {
|
|
setErrors({
|
|
secret: "Secret",
|
|
});
|
|
} else {
|
|
setErrors({});
|
|
}
|
|
setEnrollSecretString(value);
|
|
};
|
|
|
|
const onSaveSecretClick = () => {
|
|
if (enrollSecretString.length < 32) {
|
|
setErrors({
|
|
secret: "Secret",
|
|
});
|
|
} else {
|
|
setErrors({});
|
|
onSaveSecret(enrollSecretString);
|
|
}
|
|
};
|
|
|
|
return (
|
|
<Modal
|
|
onExit={toggleSecretEditorModal}
|
|
onEnter={onSaveSecretClick}
|
|
title={selectedSecret ? "Edit secret" : "Add secret"}
|
|
className={baseClass}
|
|
>
|
|
<div className={baseClass}>
|
|
<div className={`${baseClass}__description`}>
|
|
Create or edit the generated secret to enroll hosts to{" "}
|
|
<b>{renderTeam()?.name}</b>:
|
|
</div>
|
|
<div className={`${baseClass}__secret-wrapper`}>
|
|
<InputField
|
|
inputWrapperClass={`${baseClass}__secret-input`}
|
|
name="osqueryd-secret"
|
|
label="Secret"
|
|
type="text"
|
|
value={enrollSecretString}
|
|
onChange={onSecretChange}
|
|
error={errors.secret}
|
|
helpText="Must contain at least 32 characters."
|
|
/>
|
|
</div>
|
|
<div className="modal-cta-wrap">
|
|
<Button
|
|
onClick={onSaveSecretClick}
|
|
variant="brand"
|
|
className="save-loading"
|
|
isLoading={isUpdatingSecret}
|
|
>
|
|
Save
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</Modal>
|
|
);
|
|
};
|
|
|
|
export default SecretEditorModal;
|