Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-04-21 13:37:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 91

Fleet UI: Add padding to calendar instructions (#43777)

Browse source
This commit is contained in:
RachelElysia 2026-04-20 12:21:20 -05:00 committed by GitHub
parent 33f0d8454a
commit 404ee696f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 78 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
frontend/pages/admin/IntegrationsPage/cards/Calendars/Calendars.tsx
View file

@ -301,64 +301,68 @@ const Calendars = ({ appConfig }: IAppConfigFormProps): JSX.Element => {
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}
disabled={gomEnabled}
helpText={
apiKeyJson === UNCHANGED_PASSWORD_API_RESPONSE
? "API key is configured. Replace with a new key to update."
: undefined
}
/>
<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}
disabled={gomEnabled}
/>
<div className="button-wrap">
<GitOpsModeTooltipWrapper
tipOffset={8}
renderChildren={(dC) => (
<Button
type="submit"
disabled={Object.keys(formErrors).length > 0 || dC}
className="save-loading"
isLoading={isUpdatingSettings}
>
Save
</Button>
)}
<div className={`${baseClass}__save-changes`}>
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}
disabled={gomEnabled}
helpText={
apiKeyJson === UNCHANGED_PASSWORD_API_RESPONSE
? "API key is configured. Replace with a new key to update."
: undefined
}
/>
</div>
</form>
</Card>
<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}
disabled={gomEnabled}
/>
<div className="button-wrap">
<GitOpsModeTooltipWrapper
tipOffset={8}
renderChildren={(dC) => (
<Button
type="submit"
disabled={
Object.keys(formErrors).length > 0 || dC
}
className="save-loading"
isLoading={isUpdatingSettings}
>
Save
</Button>
)}
/>
</div>
</form>
</Card>
</div>
</li>
</ul>
</p>
@ -389,15 +393,16 @@ const Calendars = ({ appConfig }: IAppConfigFormProps): JSX.Element => {
account.
</li>
<li>
For the OAuth scopes, paste the following value:
<InputField
readOnly
inputWrapperClass={`${baseClass}__oauth-scopes`}
name="oauth-scopes"
enableCopy
type="textarea"
value={OAUTH_SCOPES}
/>
<div className={`${baseClass}__oauth-scopes`}>
For the OAuth scopes, paste the following value:
<InputField
readOnly
name="oauth-scopes"
enableCopy
type="textarea"
value={OAUTH_SCOPES}
/>
</div>
</li>
<li>
Click <b>Authorize</b>.

12
frontend/pages/admin/IntegrationsPage/cards/Calendars/_styles.scss
View file

@ -19,10 +19,6 @@
margin: $pad-small 0;
}
.card {
margin-top: $pad-small;
}
&__configuration {
button {
align-self: flex-end;
@ -36,12 +32,18 @@
font-size: $x-small;
}
&__save-changes,
&__oauth-scopes {
@include vertical-form-layout;
padding-bottom: $pad-large;
}
#oauth-scopes {
font-family: "SourceCodePro", $monospace;
color: $core-fleet-black;
min-height: 82px;
min-width: 100%;
padding: $pad-medium;
padding-right: $pad-xxlarge;
resize: none;
}