mirror of
https://github.com/fleetdm/fleet
synced 2026-05-10 10:40:46 +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>
92 lines
2.6 KiB
JavaScript
92 lines
2.6 KiB
JavaScript
import React, { Component } from "react";
|
|
import PropTypes from "prop-types";
|
|
|
|
import Button from "components/buttons/Button";
|
|
import Form from "components/forms/Form";
|
|
import formFieldInterface from "interfaces/form_field";
|
|
import InputField from "components/forms/fields/InputField";
|
|
import validate from "components/forms/UserSettingsForm/validate";
|
|
|
|
const formFields = ["email", "name", "position", "username"];
|
|
|
|
const baseClass = "manage-user";
|
|
|
|
class UserSettingsForm extends Component {
|
|
static propTypes = {
|
|
fields: PropTypes.shape({
|
|
email: formFieldInterface.isRequired,
|
|
name: formFieldInterface.isRequired,
|
|
position: formFieldInterface.isRequired,
|
|
}).isRequired,
|
|
handleSubmit: PropTypes.func.isRequired,
|
|
pendingEmail: PropTypes.string,
|
|
onCancel: PropTypes.func.isRequired,
|
|
smtpConfigured: PropTypes.bool,
|
|
};
|
|
|
|
renderEmailHelpText = () => {
|
|
const { pendingEmail } = this.props;
|
|
|
|
if (!pendingEmail) {
|
|
return undefined;
|
|
}
|
|
|
|
return (
|
|
<i className={`${baseClass}__email-help-text`}>
|
|
Pending change to <b>{pendingEmail}</b>
|
|
</i>
|
|
);
|
|
};
|
|
|
|
render() {
|
|
const { fields, handleSubmit, onCancel, smtpConfigured } = this.props;
|
|
const { renderEmailHelpText } = this;
|
|
|
|
return (
|
|
<form onSubmit={handleSubmit} className={baseClass} autoComplete="off">
|
|
<div
|
|
className="smtp-not-configured"
|
|
data-tip
|
|
data-for="smtp-tooltip"
|
|
data-tip-disable={smtpConfigured}
|
|
>
|
|
<InputField
|
|
{...fields.email}
|
|
autofocus
|
|
label="Email (required)"
|
|
helpText={renderEmailHelpText()}
|
|
disabled={!smtpConfigured}
|
|
tooltip={
|
|
<>
|
|
Editing your email address requires that SMTP or SES is
|
|
configured in order to send a validation email.
|
|
<br />
|
|
<br />
|
|
Users with Admin role can configure SMTP in{" "}
|
|
<strong>Settings > Organization settings</strong>.
|
|
</>
|
|
}
|
|
/>
|
|
</div>
|
|
<InputField
|
|
{...fields.name}
|
|
label="Full name (required)"
|
|
inputOptions={{
|
|
maxLength: "80",
|
|
}}
|
|
/>
|
|
<InputField {...fields.position} label="Position" />
|
|
<div className="button-wrap">
|
|
<Button onClick={onCancel} variant="inverse">
|
|
Cancel
|
|
</Button>
|
|
<Button type="submit" variant="brand">
|
|
Update
|
|
</Button>
|
|
</div>
|
|
</form>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default Form(UserSettingsForm, { fields: formFields, validate });
|