empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 00:45:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[tiny unreleased bugs] Fleet UI: Calendar feature calendar settings page (#17905)

Browse Source
This commit is contained in:
RachelElysia 2024-03-28 08:57:41 -04:00 committed by GitHub
parent fc19b0fa5f
commit 2a8d84a0fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/pages/admin/IntegrationsPage/cards/Calendars/Calendars.tsx
View File

@ -27,7 +27,7 @@ const GOOGLE_WORKSPACE_DOMAINS =
const DOMAIN_WIDE_DELEGATION =
"https://www.fleetdm.com/learn-more-about/domain-wide-delegation";
const ENABLING_CALENDAR_API =
"fleetdm.com/learn-more-about/enabling-calendar-api";
"https://www.fleetdm.com/learn-more-about/enabling-calendar-api";
const OAUTH_SCOPES =
"https://www.googleapis.com/auth/calendar.events,https://www.googleapis.com/auth/calendar.settings.readonly";
@ -112,10 +112,10 @@ const Calendars = (): JSX.Element => {
// Must set all keys or no keys at all
if (!curFormData.apiKeyJson && !!curFormData.domain) {
errors.apiKeyJson = "API key JSON must be present";
errors.apiKeyJson = "API key JSON must be completed";
}
if (!curFormData.domain && !!curFormData.apiKeyJson) {
errors.domain = "Domain must be present";
errors.domain = "Domain must be completed";
}
if (curFormData.apiKeyJson) {
try {
@ -167,11 +167,11 @@ const Calendars = (): JSX.Element => {
await configAPI.update({ integrations: destination });
renderFlash(
"success",
"Successfully saved calendar integration settings"
"Successfully saved calendar integration settings."
);
refetchConfig();
} catch (e) {
renderFlash("error", "Could not save calendar integration settings");
renderFlash("error", "Could not save calendar integration settings.");
} finally {
setIsUpdatingSettings(false);
}
@ -286,7 +286,7 @@ const Calendars = (): JSX.Element => {
</p>
<p className={`${baseClass}__configuration`}>
5. Configure your service account integration in Fleet using the
form below:
form below.
<ul>
<li>
Paste the full contents of the JSON file downloaded when

5
frontend/pages/admin/IntegrationsPage/cards/Calendars/_styles.scss
View File

@ -12,6 +12,10 @@
margin-block-start: $pad-small;
}
ul {
margin: 0;
}
li {
margin: $pad-small 0;
}
@ -27,6 +31,7 @@
}
&__api-key-json {
font-family: "SourceCodePro", $monospace;
min-width: 100%; // resize vertically only
height: 294px;
font-size: $x-small;