fleet/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.tsx
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

117 lines
3.2 KiB
TypeScript

import React, { useEffect } from "react";
import classnames from "classnames";
import Button from "components/buttons/Button";
import { IRegistrationFormData } from "interfaces/registration_form_data";
import Checkbox from "components/forms/fields/Checkbox";
const baseClass = "confirm-user-reg";
interface IConfirmationPageProps {
className: string;
currentPage: boolean;
formData: IRegistrationFormData;
handleSubmit: React.FormEventHandler<HTMLFormElement>;
}
const ConfirmationPage = ({
className,
currentPage,
formData,
handleSubmit,
}: IConfirmationPageProps): JSX.Element => {
useEffect(() => {
if (currentPage) {
// Component has a transition duration of 300ms set in
// RegistrationForm/_styles.scss. We need to wait 300ms before
// calling .focus() to preserve smooth transition.
setTimeout(() => {
// wanted to use React ref here instead of class but ref is already used
// in Button.tsx, which could break other button uses
const confirmationButton = document.querySelector(
`.${baseClass} button.button--brand`
) as HTMLElement;
confirmationButton?.focus();
}, 300);
}
}, [currentPage]);
const importOsqueryConfig = () => {
const disableImport = true;
if (disableImport) {
return false;
}
return (
<div className={`${baseClass}__import`}>
<Checkbox name="import-install">
<p>
I am migrating an existing <strong>osquery</strong> installation.
</p>
<p>
Take me to the <strong>Import Configuration</strong> page.
</p>
</Checkbox>
</div>
);
};
const { email, server_url: serverUrl, org_name: orgName, name } = formData;
const tabIndex = currentPage ? 0 : -1;
const confirmRegClasses = classnames(className, baseClass);
return (
<form
onSubmit={handleSubmit}
className={confirmRegClasses}
autoComplete="off"
>
<div className={`${baseClass}__wrapper`}>
<table className={`${baseClass}__table`}>
<caption>Administrator configuration</caption>
<tbody>
<tr>
<th>Full name:</th>
<td>{name}</td>
</tr>
<tr>
<th>Email:</th>
<td className={`${baseClass}__table-email`}>{email}</td>
</tr>
<tr>
<th>Organization:</th>
<td>{orgName}</td>
</tr>
<tr>
<th>Fleet URL:</th>
<td>
<span className={`${baseClass}__table-url`} title={serverUrl}>
{serverUrl}
</span>
</td>
</tr>
</tbody>
</table>
{importOsqueryConfig()}
</div>
<p className="help-text">
Fleet Device Management Inc. periodically collects information about
your instance. Sending usage statistics from your Fleet instance is
optional and can be disabled in settings.
</p>
<Button
type="submit"
tabIndex={tabIndex}
disabled={!currentPage}
variant="brand"
>
Confirm
</Button>
</form>
);
};
export default ConfirmationPage;