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>
142 lines
3.6 KiB
JavaScript
142 lines
3.6 KiB
JavaScript
import React from "react";
|
|
import PropTypes from "prop-types";
|
|
import classnames from "classnames";
|
|
|
|
import Icon from "components/Icon/Icon";
|
|
import FleetIcon from "components/icons/FleetIcon";
|
|
import TooltipWrapper from "components/TooltipWrapper";
|
|
import InputField from "../InputField";
|
|
|
|
const baseClass = "input-icon-field";
|
|
|
|
class InputFieldWithIcon extends InputField {
|
|
static propTypes = {
|
|
autofocus: PropTypes.bool,
|
|
error: PropTypes.string,
|
|
helpText: PropTypes.oneOfType([PropTypes.array, PropTypes.string]),
|
|
iconName: PropTypes.string,
|
|
iconSvg: PropTypes.string,
|
|
label: PropTypes.string,
|
|
name: PropTypes.string,
|
|
onChange: PropTypes.func,
|
|
onClick: PropTypes.func,
|
|
placeholder: PropTypes.string,
|
|
tabIndex: PropTypes.number,
|
|
type: PropTypes.string,
|
|
className: PropTypes.string,
|
|
disabled: PropTypes.bool,
|
|
iconPosition: PropTypes.oneOf(["start", "end"]),
|
|
inputOptions: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
|
tooltip: PropTypes.string,
|
|
ignore1Password: PropTypes.bool,
|
|
};
|
|
|
|
renderHeading = () => {
|
|
const { error, placeholder, name, tooltip } = this.props;
|
|
const label = this.props.label ?? placeholder;
|
|
|
|
const labelClasses = classnames(`${baseClass}__label`, {
|
|
[`${baseClass}__errors`]: !!error,
|
|
});
|
|
|
|
return (
|
|
<label
|
|
htmlFor={name}
|
|
className={labelClasses}
|
|
data-has-tooltip={!!tooltip}
|
|
>
|
|
{tooltip && !error ? (
|
|
<TooltipWrapper position="top-start" tipContent={tooltip}>
|
|
{label}
|
|
</TooltipWrapper>
|
|
) : (
|
|
<>{error || label}</>
|
|
)}
|
|
</label>
|
|
);
|
|
};
|
|
|
|
renderHelpText = () => {
|
|
const { helpText } = this.props;
|
|
|
|
if (helpText) {
|
|
return (
|
|
<span className={`${baseClass}__help-text form-field__help-text`}>
|
|
{helpText}
|
|
</span>
|
|
);
|
|
}
|
|
|
|
return false;
|
|
};
|
|
|
|
render() {
|
|
const {
|
|
className,
|
|
error,
|
|
iconName,
|
|
iconSvg,
|
|
name,
|
|
placeholder,
|
|
tabIndex,
|
|
type,
|
|
value,
|
|
disabled,
|
|
iconPosition,
|
|
inputOptions,
|
|
ignore1Password,
|
|
onClick,
|
|
} = this.props;
|
|
const { onInputChange, renderHelpText } = this;
|
|
|
|
const wrapperClasses = classnames(baseClass, "form-field", {
|
|
[`${baseClass}--icon-start`]: iconPosition && iconPosition === "start",
|
|
});
|
|
|
|
const inputClasses = classnames(
|
|
`${baseClass}__input`,
|
|
"input-with-icon",
|
|
className,
|
|
{ [`${baseClass}__input--error`]: error },
|
|
{ [`${baseClass}__input--password`]: type === "password" && value },
|
|
{
|
|
[`${baseClass}__input--icon-start`]:
|
|
iconPosition && iconPosition === "start",
|
|
}
|
|
);
|
|
|
|
const iconClasses = classnames(
|
|
`${baseClass}__icon`,
|
|
{ [`${baseClass}__icon--error`]: error },
|
|
{ [`${baseClass}__icon--active`]: value }
|
|
);
|
|
|
|
return (
|
|
<div className={wrapperClasses}>
|
|
{this.props.label && this.renderHeading()}
|
|
<input
|
|
id={name}
|
|
name={name}
|
|
onChange={onInputChange}
|
|
onClick={onClick}
|
|
className={inputClasses}
|
|
placeholder={placeholder}
|
|
ref={(r) => {
|
|
this.input = r;
|
|
}}
|
|
tabIndex={tabIndex}
|
|
type={type}
|
|
value={value}
|
|
disabled={disabled}
|
|
{...inputOptions}
|
|
data-1p-ignore={ignore1Password}
|
|
/>
|
|
{iconSvg && <Icon name={iconSvg} className={iconClasses} />}
|
|
{iconName && <FleetIcon name={iconName} className={iconClasses} />}
|
|
{renderHelpText()}
|
|
</div>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default InputFieldWithIcon;
|