**Related issue:** Resolves #49276 **New features** - Added new "Secondary" (bordered, off-white fill) and "Subdued" (borderless, low-emphasis) button variants to match the Figma spec, alongside the existing Primary style. - Allowed rows to be selected in Controls > OS updates. **Cleanup** - Once nothing referenced the old styles anymore, fully removed the old `text-icon`, `brand-inverse-icon`, `inverse-alert`, `inverse`, and `icon` button variants (type, styles, and Storybook entries) from the shared `Button` component. - Removed the `iconStroke` prop, which had become a no-op once the old variants it supported were gone. - Renamed `ActionsDropdown`'s variants (`button`/`brand-button`/`small-button`) to `subdued`/`primary`/`secondary` to match the same naming used everywhere else. - Replaced a one-off dropdown implementation on the Software title page with the shared `ActionsDropdown` component, instead of maintaining duplicate styling logic. - Changed the button name on Host details > Reports > Report details from "View data for all hosts" to "View report for all hosts" (to match the previous page's Actions drop-down options). # Checklist for submitter - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. ## Testing - [x] Added/updated automated tests - [x] QA'd all new/changed functionality manually <img width="1475" height="241" alt="Screenshot 2026-07-21 at 06 35 49" src="https://github.com/user-attachments/assets/7cfbd444-7837-40e8-854e-bc5989d57d85" /> <img width="661" height="306" alt="Screenshot 2026-07-21 at 06 37 18" src="https://github.com/user-attachments/assets/5d0c4873-8179-4089-b115-7e8cd3a53b4d" /> <img width="1427" height="423" alt="Screenshot 2026-07-21 at 06 37 30" src="https://github.com/user-attachments/assets/a4850a60-f44a-4902-b45e-0094f23a52f8" /> <img width="1427" height="640" alt="Screenshot 2026-07-21 at 06 37 46" src="https://github.com/user-attachments/assets/738a4a7f-cd7d-4162-b659-6f649c32204d" /> <img width="1445" height="479" alt="Screenshot 2026-07-22 at 07 03 22" src="https://github.com/user-attachments/assets/4f672dc0-5c6d-4eb8-8465-ed5233fcd1b2" /> <img width="811" height="871" alt="Screenshot 2026-07-21 at 06 41 20" src="https://github.com/user-attachments/assets/5421c96e-2dab-492a-af26-be0e5a7791ca" />
92 lines
2.6 KiB
React
92 lines
2.6 KiB
React
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()}
|
|
readOnly={!smtpConfigured}
|
|
ignore1password={false}
|
|
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="secondary">
|
|
Cancel
|
|
</Button>
|
|
<Button type="submit">Update</Button>
|
|
</div>
|
|
</form>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default Form(UserSettingsForm, { fields: formFields, validate });
|