fleet/frontend/components/forms/RegistrationForm/RegistrationForm.jsx
Jacob Shandling 67c45d5417
UI – refactor forms and form fields (#16159)
## 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**
![Screenshot 2024-01-17 at 11 49
14 AM](https://github.com/fleetdm/fleet/assets/61553566/14f209fb-31db-41ef-8e63-e0d8994698c1)

**Edit query form**
![Screenshot 2024-01-17 at 11 50
35 AM](https://github.com/fleetdm/fleet/assets/61553566/b07e70ea-3095-4e4f-be73-95a3c499839b)

**Add hosts modal**
![Screenshot 2024-01-17 at 11 51
48 AM](https://github.com/fleetdm/fleet/assets/61553566/4ef1f410-a823-41d1-b2f6-ea8eb5231f93)


## 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>
2024-01-18 10:48:44 -05:00

164 lines
4.4 KiB
JavaScript

import React, { Component } from "react";
import PropTypes from "prop-types";
import classnames from "classnames";
import AdminDetails from "components/forms/RegistrationForm/AdminDetails";
import ConfirmationPage from "components/forms/RegistrationForm/ConfirmationPage";
import FleetDetails from "components/forms/RegistrationForm/FleetDetails";
import OrgDetails from "components/forms/RegistrationForm/OrgDetails";
const baseClass = "user-registration";
class RegistrationForm extends Component {
static propTypes = {
onNextPage: PropTypes.func,
onSubmit: PropTypes.func,
page: PropTypes.number,
};
constructor(props) {
super(props);
const { window } = global;
this.state = {
errors: {},
formData: {
server_url: window.location.origin,
},
};
}
onPageFormSubmit = (pageFormData) => {
const { formData } = this.state;
const { onNextPage } = this.props;
this.setState({
formData: {
...formData,
...pageFormData,
},
});
return onNextPage();
};
onSubmitConfirmation = (evt) => {
evt.preventDefault();
const { formData } = this.state;
const { onSubmit: handleSubmit } = this.props;
return handleSubmit(formData);
};
isCurrentPage = (num) => {
const { page } = this.props;
if (num === page) {
return true;
}
return false;
};
render() {
const { page } = this.props;
const { formData } = this.state;
const { isCurrentPage, onPageFormSubmit, onSubmitConfirmation } = this;
const adminDetailsContainerClass = classnames(
`${baseClass}__container`,
`${baseClass}__container--admin`
);
const adminDetailsClass = classnames(
`${baseClass}__field-wrapper`,
`${baseClass}__field-wrapper--admin`
);
const orgDetailsContainerClass = classnames(
`${baseClass}__container`,
`${baseClass}__container--org`
);
const orgDetailsClass = classnames(
`${baseClass}__field-wrapper`,
`${baseClass}__field-wrapper--org`
);
const fleetDetailsContainerClass = classnames(
`${baseClass}__container`,
`${baseClass}__container--fleet`
);
const fleetDetailsClass = classnames(
`${baseClass}__field-wrapper`,
`${baseClass}__field-wrapper--fleet`
);
const confirmationContainerClass = classnames(
`${baseClass}__container`,
`${baseClass}__container--confirmation`
);
const confirmationClass = classnames(
`${baseClass}__field-wrapper`,
`${baseClass}__field-wrapper--confirmation`
);
const formSectionClasses = classnames(`${baseClass}__form`, {
[`${baseClass}__form--step1-active`]: page === 1,
[`${baseClass}__form--step1-complete`]: page > 1,
[`${baseClass}__form--step2-active`]: page === 2,
[`${baseClass}__form--step2-complete`]: page > 2,
[`${baseClass}__form--step3-active`]: page === 3,
[`${baseClass}__form--step3-complete`]: page > 3,
[`${baseClass}__form--step4-active`]: page === 4,
});
return (
<div className={baseClass}>
<div className={formSectionClasses}>
<div className={adminDetailsContainerClass}>
<h2>Setup user</h2>
<AdminDetails
formData={formData}
handleSubmit={onPageFormSubmit}
className={adminDetailsClass}
currentPage={isCurrentPage(1)}
/>
</div>
<div className={orgDetailsContainerClass}>
<h2>Organization details</h2>
<OrgDetails
formData={formData}
handleSubmit={onPageFormSubmit}
className={orgDetailsClass}
currentPage={isCurrentPage(2)}
/>
</div>
<div className={fleetDetailsContainerClass}>
<h2>Set Fleet URL</h2>
<FleetDetails
formData={formData}
handleSubmit={onPageFormSubmit}
className={fleetDetailsClass}
currentPage={isCurrentPage(3)}
/>
</div>
<div className={confirmationContainerClass}>
<h2>Confirm configuration</h2>
<ConfirmationPage
formData={formData}
handleSubmit={onSubmitConfirmation}
className={confirmationClass}
currentPage={isCurrentPage(4)}
/>
</div>
</div>
</div>
);
}
}
export default RegistrationForm;