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 page #17593

Merged
merged 17 commits into from
Mar 21, 2024
Merged

Fleet UI: Calendar settings page #17593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
70d03ea
[draft] Fleet UI: Calendar settings page
RachelElysia Mar 13, 2024
9a29142
Add to other api updates
RachelElysia Mar 13, 2024
f596de0
API call works for data and no data
RachelElysia Mar 13, 2024
3200df4
Remove sandbox, remove 1password suggestion, add loading and error st…
RachelElysia Mar 14, 2024
061c292
More cleanup
RachelElysia Mar 14, 2024
8f3356c
Rough draft of the new global settings UI
RachelElysia Mar 19, 2024
db84606
Everything complete but api json key
RachelElysia Mar 19, 2024
dba69ac
Newest copy updates, form works
RachelElysia Mar 20, 2024
ca37e6f
Updated success/error messages
RachelElysia Mar 20, 2024
72d813c
google_calendar can be null
RachelElysia Mar 20, 2024
6691b01
Send JSON
RachelElysia Mar 20, 2024
586b229
Revert null integration
RachelElysia Mar 20, 2024
0572162
Remove unused variables, fix typing
RachelElysia Mar 21, 2024
ad5ccf2
If google_calendar is null, it won't update google_calendar
RachelElysia Mar 21, 2024
5d3d23e
Refactor copy-message to use new mixin
RachelElysia Mar 21, 2024
8f63492
Change to async await, code cleanup
RachelElysia Mar 21, 2024
d27cd88
Remove function from no longer function
RachelElysia Mar 21, 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
12 changes: 2 additions & 10 deletions frontend/components/AddHostsModal/PlatformWrapper/_styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,7 @@
}

&__copy-message {
font-weight: $regular;
vertical-align: top;
background-color: $ui-light-grey;
border: solid 1px #e2e4ea;
border-radius: 10px;
padding: 2px 6px;
@include copy-message;
RachelElysia marked this conversation as resolved.
Show resolved Hide resolved
}

.buttons {
Expand Down Expand Up @@ -122,9 +117,6 @@
}

&__copy-message {
background-color: $ui-light-grey;
border: solid 1px #e2e4ea;
border-radius: 10px;
padding: 2px 6px;
@include copy-message;
}
}
5 changes: 1 addition & 4 deletions frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/_styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@
}

&__copy-message {
background-color: $ui-light-grey;
border: solid 1px #e2e4ea;
border-radius: 10px;
padding: 2px 6px;
@include copy-message;
RachelElysia marked this conversation as resolved.
Show resolved Hide resolved
}

&__action-overlay {
Expand Down
5 changes: 1 addition & 4 deletions frontend/components/forms/fields/InputFieldHiddenContent/_styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@
}

&__copy-message {
background-color: $ui-light-grey;
border: solid 1px #e2e4ea;
border-radius: 10px;
padding: 2px 6px;
@include copy-message;
RachelElysia marked this conversation as resolved.
Show resolved Hide resolved
}
}
3 changes: 1 addition & 2 deletions frontend/interfaces/integration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,8 @@ export interface IIntegrationFormErrors {
}

export interface IGlobalCalendarIntegration {
email: string;
private_key: string;
domain: string;
api_key_json: string;
}

interface ITeamCalendarSettings {
Expand Down
7 changes: 1 addition & 6 deletions frontend/pages/AccountPage/APITokenModal/TokenSecretField/_styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,7 @@
}

&__copy-message {
font-weight: $regular;
vertical-align: top;
background-color: $ui-light-grey;
border: solid 1px #e2e4ea;
border-radius: 10px;
padding: 2px 6px;
@include copy-message;
RachelElysia marked this conversation as resolved.
Show resolved Hide resolved
}

&__secret-download-icon {
Expand Down
4 changes: 2 additions & 2 deletions ...SoftwarePage/components/ManageSoftwareAutomationsModal/ManageSoftwareAutomationsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
IJiraIntegration,
IZendeskIntegration,
IIntegration,
IIntegrations,
IGlobalIntegrations,
IIntegrationType,
} from "interfaces/integration";
import {
Expand Down Expand Up @@ -124,7 +124,7 @@ const ManageAutomationsModal = ({
}
}, [destinationUrl]);

const { data: integrations } = useQuery<IConfig, Error, IIntegrations>(
const { data: integrations } = useQuery<IConfig, Error, IGlobalIntegrations>(
["integrations"],
() => configAPI.loadAll(),
{
Expand Down
56 changes: 29 additions & 27 deletions frontend/pages/admin/IntegrationsPage/IntegrationNavItems.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,34 @@ import { ISideNavItem } from "../components/SideNav/SideNav";
import Integrations from "./cards/Integrations";
import Mdm from "./cards/MdmSettings/MdmSettings";
import AutomaticEnrollment from "./cards/AutomaticEnrollment/AutomaticEnrollment";
import Calendars from "./cards/Calendars/Calendars";

const getFilteredIntegrationSettingsNavItems = (
isSandboxMode = false
): ISideNavItem<any>[] => {
return [
// TODO: types
{
title: "Ticket destinations",
urlSection: "ticket-destinations",
path: PATHS.ADMIN_INTEGRATIONS_TICKET_DESTINATIONS,
Card: Integrations,
},
{
title: "Mobile device management (MDM)",
urlSection: "mdm",
path: PATHS.ADMIN_INTEGRATIONS_MDM,
Card: Mdm,
exclude: isSandboxMode,
},
{
title: "Automatic enrollment",
urlSection: "automatic-enrollment",
path: PATHS.ADMIN_INTEGRATIONS_AUTOMATIC_ENROLLMENT,
Card: AutomaticEnrollment,
},
].filter((navItem) => !navItem.exclude);
};
const integrationSettingsNavItems: ISideNavItem<any>[] = [
// TODO: types
{
title: "Ticket destinations",
urlSection: "ticket-destinations",
path: PATHS.ADMIN_INTEGRATIONS_TICKET_DESTINATIONS,
Card: Integrations,
},
{
title: "Mobile device management (MDM)",
urlSection: "mdm",
path: PATHS.ADMIN_INTEGRATIONS_MDM,
Card: Mdm,
},
{
title: "Automatic enrollment",
urlSection: "automatic-enrollment",
path: PATHS.ADMIN_INTEGRATIONS_AUTOMATIC_ENROLLMENT,
Card: AutomaticEnrollment,
},
{
title: "Calendars",
urlSection: "calendars",
path: PATHS.ADMIN_INTEGRATIONS_CALENDARS,
Card: Calendars,
},
];

export default getFilteredIntegrationSettingsNavItems;
export default integrationSettingsNavItems;
8 changes: 3 additions & 5 deletions frontend/pages/admin/IntegrationsPage/IntegrationsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { AppContext } from "context/app";
import React, { useContext } from "react";
import React from "react";
import { InjectedRouter, Params } from "react-router/lib/Router";

import SideNav from "../components/SideNav";
import getFilteredIntegrationSettingsNavItems from "./IntegrationNavItems";
import integrationSettingsNavItems from "./IntegrationNavItems";

const baseClass = "integrations";

Expand All @@ -16,9 +15,8 @@ const IntegrationsPage = ({
router,
params,
}: IIntegrationSettingsPageProps) => {
const { isSandboxMode } = useContext(AppContext);
const { section } = params;
const navItems = getFilteredIntegrationSettingsNavItems(isSandboxMode);
const navItems = integrationSettingsNavItems;
const DEFAULT_SETTINGS_SECTION = navItems[0];
const currentSection =
navItems.find((item) => item.urlSection === section) ??
Expand Down
Loading
Loading