mirror of
https://github.com/fleetdm/fleet
synced 2026-05-21 07:58:31 +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>
134 lines
3.4 KiB
TypeScript
134 lines
3.4 KiB
TypeScript
import React, { useState } from "react";
|
|
import { uniqueId } from "lodash";
|
|
|
|
import { stringToClipboard } from "utilities/copy_text";
|
|
import { IEnrollSecret } from "interfaces/enroll_secret";
|
|
|
|
import Button from "components/buttons/Button";
|
|
// @ts-ignore
|
|
import InputField from "components/forms/fields/InputField";
|
|
import Icon from "components/Icon";
|
|
|
|
const baseClass = "enroll-secrets";
|
|
|
|
interface IEnrollSecretRowProps {
|
|
secret: IEnrollSecret;
|
|
toggleSecretEditorModal?: () => void;
|
|
toggleDeleteSecretModal?: () => void;
|
|
setSelectedSecret?: React.Dispatch<
|
|
React.SetStateAction<IEnrollSecret | undefined>
|
|
>;
|
|
}
|
|
const EnrollSecretRow = ({
|
|
secret,
|
|
toggleSecretEditorModal,
|
|
toggleDeleteSecretModal,
|
|
setSelectedSecret,
|
|
}: IEnrollSecretRowProps): JSX.Element | null => {
|
|
const [showSecret, setShowSecret] = useState(false);
|
|
const [copyMessage, setCopyMessage] = useState("");
|
|
|
|
const onCopySecret = (evt: React.MouseEvent) => {
|
|
evt.preventDefault();
|
|
|
|
stringToClipboard(secret.secret)
|
|
.then(() => setCopyMessage("Copied!"))
|
|
.catch(() => setCopyMessage("Copy failed"));
|
|
|
|
// Clear message after 1 second
|
|
setTimeout(() => setCopyMessage(""), 1000);
|
|
|
|
return false;
|
|
};
|
|
|
|
const onToggleSecret = (evt: React.MouseEvent) => {
|
|
evt.preventDefault();
|
|
|
|
setShowSecret(!showSecret);
|
|
return false;
|
|
};
|
|
|
|
const onEditSecretClick = (evt: React.MouseEvent<HTMLButtonElement>) => {
|
|
evt.preventDefault();
|
|
if (toggleSecretEditorModal && setSelectedSecret) {
|
|
setSelectedSecret(secret);
|
|
toggleSecretEditorModal();
|
|
}
|
|
};
|
|
|
|
const onDeleteSecretClick = (evt: React.MouseEvent<HTMLButtonElement>) => {
|
|
evt.preventDefault();
|
|
if (toggleDeleteSecretModal && setSelectedSecret) {
|
|
setSelectedSecret(secret);
|
|
toggleDeleteSecretModal();
|
|
}
|
|
};
|
|
|
|
const renderCopyShowButtons = () => {
|
|
return (
|
|
<div className="buttons">
|
|
{copyMessage && (
|
|
<span
|
|
className={`${baseClass}__copy-message`}
|
|
>{`${copyMessage} `}</span>
|
|
)}
|
|
<Button
|
|
variant="unstyled"
|
|
className={`${baseClass}__copy-secret-icon`}
|
|
onClick={onCopySecret}
|
|
>
|
|
<Icon name="copy" />
|
|
</Button>
|
|
<Button
|
|
variant="unstyled"
|
|
className={`${baseClass}__show-secret-icon`}
|
|
onClick={onToggleSecret}
|
|
>
|
|
<Icon name="eye" />
|
|
</Button>
|
|
</div>
|
|
);
|
|
};
|
|
|
|
const renderEditDeleteButtons = () => (
|
|
<>
|
|
<Button
|
|
onClick={onEditSecretClick}
|
|
className={`${baseClass}__edit-secret-icon`}
|
|
variant="text-icon"
|
|
>
|
|
<Icon name="pencil" />
|
|
</Button>
|
|
<Button
|
|
onClick={onDeleteSecretClick}
|
|
className={`${baseClass}__delete-secret-icon`}
|
|
variant="text-icon"
|
|
>
|
|
<Icon name="trash" />
|
|
</Button>
|
|
</>
|
|
);
|
|
|
|
return (
|
|
<div
|
|
className={`${baseClass}__secret`}
|
|
key={uniqueId()}
|
|
data-testid="osquery-secret"
|
|
>
|
|
{/* TODO: replace with InputFieldHiddenContent component */}
|
|
<InputField
|
|
disabled
|
|
inputWrapperClass={`${baseClass}__secret-input`}
|
|
name={`osqueryd-secret-${uniqueId()}`}
|
|
type={showSecret ? "text" : "password"}
|
|
value={secret.secret}
|
|
/>
|
|
{renderCopyShowButtons()}
|
|
{toggleSecretEditorModal &&
|
|
toggleDeleteSecretModal &&
|
|
renderEditDeleteButtons()}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
export default EnrollSecretRow;
|