Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fleet UI: Calendar settings design updates #17869

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Fleet UI: Calendar settings design updates #17869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12663f0
Updates to the calendar settings UI
RachelElysia Mar 26, 2024
07ef1a7
Add missing number
RachelElysia Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 74 additions & 62 deletions frontend/pages/admin/IntegrationsPage/cards/Calendars/Calendars.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { AppContext } from "context/app";
import configAPI from "services/entities/config";
// @ts-ignore
import { stringToClipboard } from "utilities/copy_text";
import paths from "router/paths";

// @ts-ignore
import InputField from "components/forms/fields/InputField";
Expand All @@ -17,6 +18,7 @@ import Spinner from "components/Spinner";
import DataError from "components/DataError";
import PremiumFeatureMessage from "components/PremiumFeatureMessage/PremiumFeatureMessage";
import Icon from "components/Icon";
import Card from "components/Card";

const CREATING_SERVICE_ACCOUNT =
"https://www.fleetdm.com/learn-more-about/creating-service-accounts";
Expand Down Expand Up @@ -236,6 +238,9 @@ const Calendars = (): JSX.Element => {
For "Organization" and "Location", select
your calendar's organization.
</li>
<li>
Click <b>Create</b>.
</li>
</ul>
</p>

Expand Down Expand Up @@ -277,69 +282,72 @@ const Calendars = (): JSX.Element => {
<li>
Click <b>Create</b> to create the key & download a JSON file.
</li>
<li className={`${baseClass}__configuration`}>
Configure your service account integration in Fleet using the
form below:
<form onSubmit={onFormSubmit} autoComplete="off">
<InputField
label="API key JSON"
onChange={onInputChange}
name="apiKeyJson"
value={apiKeyJson}
parseTarget
type="textarea"
tooltip={
<>
Paste the full contents of the JSON file downloaded{" "}
<br />
when creating your service account API key.
</>
}
placeholder={API_KEY_JSON_PLACEHOLDER}
ignore1password
inputClassName={`${baseClass}__api-key-json`}
error={formErrors.apiKeyJson}
/>
<InputField
label="Primary domain"
onChange={onInputChange}
name="domain"
value={domain}
parseTarget
tooltip={
<>
If the end user is signed into multiple Google accounts,
this will be used to identify their work calendar.
</>
}
placeholder="example.com"
helpText={
<>
You can find your primary domain in Google Workspace{" "}
<CustomLink
url={GOOGLE_WORKSPACE_DOMAINS}
text="here"
newTab
/>
</>
}
error={formErrors.domain}
/>
<Button
type="submit"
variant="brand"
disabled={Object.keys(formErrors).length > 0}
className="save-loading"
isLoading={isUpdatingSettings}
>
Save
</Button>
</form>
</ul>
</p>
<p className={`${baseClass}__configuration`}>
5. Configure your service account integration in Fleet using the
form below:
<ul>
<li>
Paste the full contents of the JSON file downloaded when
creating your service account API key.
</li>
<li>
Set your primary domain. (If the end user is signed into
multiple Google accounts, this will be used to identify their
work calendar.)
</li>
<li>
Save your changes.
<Card>
<form onSubmit={onFormSubmit} autoComplete="off">
<InputField
label="API key JSON"
onChange={onInputChange}
name="apiKeyJson"
value={apiKeyJson}
parseTarget
type="textarea"
placeholder={API_KEY_JSON_PLACEHOLDER}
ignore1password
inputClassName={`${baseClass}__api-key-json`}
error={formErrors.apiKeyJson}
/>
<InputField
label="Primary domain"
onChange={onInputChange}
name="domain"
value={domain}
parseTarget
placeholder="example.com"
helpText={
<>
You can find your primary domain in Google Workspace{" "}
<CustomLink
url={GOOGLE_WORKSPACE_DOMAINS}
text="here"
newTab
/>
</>
}
error={formErrors.domain}
/>
<Button
type="submit"
variant="brand"
disabled={Object.keys(formErrors).length > 0}
className="save-loading"
isLoading={isUpdatingSettings}
>
Save
</Button>
</form>
</Card>
</li>
</ul>
</p>
<p>
5. Authorize the service account via domain-wide delegation.
6. Authorize the service account via domain-wide delegation.
<ul>
<li>
In Google Workspace, go to{" "}
Expand Down Expand Up @@ -381,7 +389,7 @@ const Calendars = (): JSX.Element => {
</ul>
</p>
<p>
6. Enable the Google Calendar API.
7. Enable the Google Calendar API.
<ul>
<li>
In the Google Cloud console API library, go to the Google
Expand All @@ -402,8 +410,12 @@ const Calendars = (): JSX.Element => {
</ul>
</p>
<p>
You&apos;re ready to automatically schedule calendar events for end
users.
Now head over to{" "}
<CustomLink
url={paths.MANAGE_POLICIES}
text="Policies &gt; Manage automations"
/>{" "}
to finish setup.
</p>
</div>
</>
Expand Down
4 changes: 2 additions & 2 deletions frontend/pages/admin/IntegrationsPage/cards/Calendars/_styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
margin: $pad-small 0;
}

form {
margin-top: $pad-large;
.card {
margin-top: $pad-small;
}

&__configuration {
Expand Down
Loading