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>
211 lines
5.2 KiB
JavaScript
211 lines
5.2 KiB
JavaScript
import React, { Component } from "react";
|
|
import PropTypes from "prop-types";
|
|
import classnames from "classnames";
|
|
import { noop, pick } from "lodash";
|
|
|
|
import { stringToClipboard } from "utilities/copy_text";
|
|
|
|
import FormField from "components/forms/FormField";
|
|
import Button from "components/buttons/Button";
|
|
import Icon from "components/Icon";
|
|
|
|
const baseClass = "input-field";
|
|
|
|
class InputField extends Component {
|
|
static propTypes = {
|
|
autofocus: PropTypes.bool,
|
|
disabled: PropTypes.bool,
|
|
error: PropTypes.string,
|
|
inputClassName: PropTypes.string, // eslint-disable-line react/forbid-prop-types
|
|
inputWrapperClass: PropTypes.string,
|
|
inputOptions: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
|
name: PropTypes.string,
|
|
onChange: PropTypes.func,
|
|
onBlur: PropTypes.func,
|
|
onFocus: PropTypes.func,
|
|
placeholder: PropTypes.string,
|
|
type: PropTypes.string,
|
|
blockAutoComplete: PropTypes.bool,
|
|
value: PropTypes.oneOfType([
|
|
PropTypes.bool,
|
|
PropTypes.string,
|
|
PropTypes.number,
|
|
]).isRequired,
|
|
parseTarget: PropTypes.bool,
|
|
tooltip: PropTypes.string,
|
|
helpText: PropTypes.oneOfType([
|
|
PropTypes.string,
|
|
PropTypes.arrayOf(PropTypes.string),
|
|
PropTypes.object,
|
|
]),
|
|
enableCopy: PropTypes.bool,
|
|
ignore1password: PropTypes.bool,
|
|
};
|
|
|
|
static defaultProps = {
|
|
autofocus: false,
|
|
inputWrapperClass: "",
|
|
inputOptions: {},
|
|
label: null,
|
|
labelClassName: "",
|
|
onFocus: noop,
|
|
onBlur: noop,
|
|
type: "text",
|
|
blockAutoComplete: false,
|
|
value: "",
|
|
parseTarget: false,
|
|
tooltip: "",
|
|
helpText: "",
|
|
enableCopy: false,
|
|
ignore1password: false,
|
|
};
|
|
|
|
constructor() {
|
|
super();
|
|
this.state = {
|
|
copied: false,
|
|
};
|
|
}
|
|
|
|
componentDidMount() {
|
|
const { autofocus } = this.props;
|
|
const { input } = this;
|
|
|
|
if (autofocus) {
|
|
input.focus();
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
onInputChange = (evt) => {
|
|
evt.preventDefault();
|
|
|
|
const { value, name } = evt.target;
|
|
const { onChange, parseTarget } = this.props;
|
|
|
|
if (parseTarget) {
|
|
// Returns both name and value
|
|
return onChange({ value, name });
|
|
}
|
|
|
|
return onChange(value);
|
|
};
|
|
|
|
render() {
|
|
const {
|
|
disabled,
|
|
error,
|
|
inputClassName,
|
|
inputOptions,
|
|
inputWrapperClass,
|
|
name,
|
|
onFocus,
|
|
onBlur,
|
|
placeholder,
|
|
type,
|
|
blockAutoComplete,
|
|
value,
|
|
ignore1password,
|
|
} = this.props;
|
|
|
|
const { onInputChange } = this;
|
|
const shouldShowPasswordClass = type === "password";
|
|
const inputClasses = classnames(baseClass, inputClassName, {
|
|
[`${baseClass}--password`]: shouldShowPasswordClass,
|
|
[`${baseClass}--disabled`]: disabled,
|
|
[`${baseClass}--error`]: error,
|
|
[`${baseClass}__textarea`]: type === "textarea",
|
|
});
|
|
|
|
const formFieldProps = pick(this.props, [
|
|
"helpText",
|
|
"label",
|
|
"error",
|
|
"name",
|
|
"tooltip",
|
|
]);
|
|
|
|
const copyValue = (e) => {
|
|
e.preventDefault();
|
|
stringToClipboard(value).then(() => {
|
|
this.setState({ copied: true });
|
|
setTimeout(() => {
|
|
this.setState({ copied: false });
|
|
}, 2000);
|
|
});
|
|
};
|
|
|
|
if (type === "textarea") {
|
|
return (
|
|
<FormField
|
|
{...formFieldProps}
|
|
type="textarea"
|
|
className={inputWrapperClass}
|
|
>
|
|
<textarea
|
|
name={name}
|
|
id={name}
|
|
onChange={onInputChange}
|
|
className={inputClasses}
|
|
disabled={disabled}
|
|
placeholder={placeholder}
|
|
ref={(r) => {
|
|
this.input = r;
|
|
}}
|
|
type={type}
|
|
{...inputOptions}
|
|
value={value}
|
|
/>
|
|
</FormField>
|
|
);
|
|
}
|
|
|
|
const inputContainerClasses = classnames(`${baseClass}__input-container`, {
|
|
"copy-enabled": this.props.enableCopy,
|
|
});
|
|
|
|
return (
|
|
<FormField {...formFieldProps} type="input" className={inputWrapperClass}>
|
|
<div className={inputContainerClasses}>
|
|
<input
|
|
disabled={disabled}
|
|
name={name}
|
|
id={name}
|
|
onChange={onInputChange}
|
|
onFocus={onFocus}
|
|
onBlur={onBlur}
|
|
className={inputClasses}
|
|
placeholder={placeholder}
|
|
ref={(r) => {
|
|
this.input = r;
|
|
}}
|
|
type={type}
|
|
{...inputOptions}
|
|
value={value}
|
|
autoComplete={blockAutoComplete ? "new-password" : ""}
|
|
data-1p-ignore={ignore1password}
|
|
/>
|
|
{this.props.enableCopy && (
|
|
<div className={`${baseClass}__copy-wrapper`}>
|
|
<Button
|
|
variant="text-icon"
|
|
onClick={copyValue}
|
|
className={`${baseClass}__copy-value-button`}
|
|
>
|
|
<Icon name="copy" /> Copy
|
|
</Button>
|
|
{this.state.copied && (
|
|
<span className={`${baseClass}__copied-confirmation`}>
|
|
Copied!
|
|
</span>
|
|
)}
|
|
</div>
|
|
)}
|
|
</div>
|
|
</FormField>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default InputField;
|