UI – Calendar events modal #17717

jacobshandling · 2024-03-19T17:31:23Z

Addresses #17445

Follow-up iteration:

Finalize styling of dropdown tooltips
All //TODOs

codecov · 2024-03-19T17:33:20Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.28%. Comparing base (6f6e077) to head (3f9faeb).

❗ Current head 3f9faeb differs from pull request most recent head c8781cc. Consider uploading reports for the commit c8781cc to get more accurate results

Additional details and impacted files

@@                    Coverage Diff                     @@
##           17230-calendar-feature   #17717      +/-   ##
==========================================================
- Coverage                   65.29%   65.28%   -0.01%     
==========================================================
  Files                        1200     1201       +1     
  Lines                      109166   109167       +1     
  Branches                     2574     2575       +1     
==========================================================
- Hits                        71277    71275       -2     
- Misses                      32480    32483       +3     
  Partials                     5409     5409

Flag	Coverage Δ
frontend	`51.90% <100.00%> (-0.04%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

RachelElysia · 2024-03-20T20:18:00Z

frontend/interfaces/integration.ts

@@ -60,7 +60,31 @@ export interface IIntegrationFormErrors {
  enableSoftwareVulnerabilities?: boolean;
 }

+export interface IGlobalCalendarIntegration {
+  email: string;


api_key_json: string | null
domain: string | null

RachelElysia · 2024-03-20T20:23:00Z

frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx

+              enable_calendar_events: formData.enabled,
+              webhook_url: formData.url,
+            },
+            // TODO - can omit these?


According to @getvictor yes, omit

frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx

RachelElysia · 2024-03-20T20:26:32Z

...ges/policies/ManagePoliciesPage/components/CalendarEventsModal/CalendarEventsModal.tests.tsx

@@ -0,0 +1,11 @@
+import React from "react";
+


remove this test

RachelElysia · 2024-03-20T20:29:38Z

...end/pages/policies/ManagePoliciesPage/components/CalendarEventsModal/CalendarEventsModal.tsx

+    if (curFormData.enabled) {
+      const { url: curUrl } = curFormData;
+      if (!validURL({ url: curUrl })) {
+        const errorPrefix = curUrl ? `${curUrl} is not` : "Please enter";


Should we make this only show after editing the first time?

RachelElysia · 2024-03-20T20:35:39Z

...end/pages/policies/ManagePoliciesPage/components/CalendarEventsModal/CalendarEventsModal.tsx

+  const renderPlaceholderModal = () => {
+    return (
+      <div className="placeholder">
+        <a href="https://www.fleetdm.com/learn-more-about/calendar-events">


Open in new tab.

## Follow-up work to #17717 **Finalize disabled options and tooltips:** <img width="697" alt="Screenshot 2024-03-21 at 5 14 40 PM" src="https://github.com/fleetdm/fleet/assets/61553566/ea5d880f-75f6-48ef-85cc-b807812c9a50"> <img width="697" alt="Screenshot 2024-03-21 at 5 15 13 PM" src="https://github.com/fleetdm/fleet/assets/61553566/bdd33118-933e-4676-9e1e-680ebcddbc7a"> **Only update policies and settings when there's a diff:** ![1(1)](https://github.com/fleetdm/fleet/assets/61553566/183d1834-3c54-4fef-a208-dfbb0354e507) **Reorganize onChange handlers, types** - [x] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>

## Follow-up work to #17717 **Finalize disabled options and tooltips:** <img width="697" alt="Screenshot 2024-03-21 at 5 14 40 PM" src="https://github.com/fleetdm/fleet/assets/61553566/ea5d880f-75f6-48ef-85cc-b807812c9a50"> <img width="697" alt="Screenshot 2024-03-21 at 5 15 13 PM" src="https://github.com/fleetdm/fleet/assets/61553566/bdd33118-933e-4676-9e1e-680ebcddbc7a"> **Only update policies and settings when there's a diff:** ![1(1)](https://github.com/fleetdm/fleet/assets/61553566/183d1834-3c54-4fef-a208-dfbb0354e507) **Reorganize onChange handlers, types** - [x] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>

## Follow-up work to #17717 **Finalize disabled options and tooltips:** <img width="697" alt="Screenshot 2024-03-21 at 5 14 40 PM" src="https://github.com/fleetdm/fleet/assets/61553566/ea5d880f-75f6-48ef-85cc-b807812c9a50"> <img width="697" alt="Screenshot 2024-03-21 at 5 15 13 PM" src="https://github.com/fleetdm/fleet/assets/61553566/bdd33118-933e-4676-9e1e-680ebcddbc7a"> **Only update policies and settings when there's a diff:** ![1(1)](https://github.com/fleetdm/fleet/assets/61553566/183d1834-3c54-4fef-a208-dfbb0354e507) **Reorganize onChange handlers, types** - [x] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>

Jacob Shandling added 12 commits March 19, 2024 10:30

remove 'automations' column

eab1e03

Create modal; prototype not-configured state;

f4bf951

wip - scaffold

901fb77

move custom hook to its own file

3729da9

wip2 - it renders

c929e44

wip - update interfaces

69a0e0f

wip - building policies dropdown button

4a9950d

finish styling of policies dropdown

a754629

wip - render policy checkboxes in modal

8ad6f9a

wip - define update function. types need improvement

9a9f29d

working for demo

a489c54

reorder import

fac0f28

jacobshandling temporarily deployed to Docker Hub March 19, 2024 17:31 — with GitHub Actions Inactive

Jacob Shandling added 7 commits March 19, 2024 12:19

on submit, close and refetch

3c999be

update tooltip position, flash messages

70134ab

example payload

599fe9e

finalize placeholder, preview, and example

026ddb5

disable form fields when feature disabled; update error handling

69f8c45

add helptext, disable conditions to dropdown

e889736

wip - add tooltips, disabled styles to dropdown options

7403a06

jacobshandling temporarily deployed to Docker Hub March 20, 2024 19:59 — with GitHub Actions Inactive

jacobshandling marked this pull request as ready for review March 20, 2024 20:00

jacobshandling requested a review from a team as a code owner March 20, 2024 20:00

jacobshandling assigned RachelElysia Mar 20, 2024

Jacob Shandling added 2 commits March 20, 2024 13:09

Merge branch '17230-calendar-feature' into 17445-calendar-events-modal

e331a62

update names to "OtherWorkflowsModal"

3f9faeb

jacobshandling temporarily deployed to Docker Hub March 20, 2024 20:12 — with GitHub Actions Inactive

RachelElysia reviewed Mar 20, 2024

View reviewed changes

frontend/pages/policies/ManagePoliciesPage/ManagePoliciesPage.tsx Show resolved Hide resolved

RachelElysia reviewed Mar 20, 2024

View reviewed changes

cleanup

75c1758

jacobshandling had a problem deploying to Docker Hub March 20, 2024 20:26 — with GitHub Actions Error

RachelElysia reviewed Mar 20, 2024

View reviewed changes

more cleanup

c8781cc

jacobshandling temporarily deployed to Docker Hub March 20, 2024 20:36 — with GitHub Actions Inactive

RachelElysia approved these changes Mar 20, 2024

View reviewed changes

jacobshandling merged commit 7f05aaf into 17230-calendar-feature Mar 20, 2024
4 checks passed

jacobshandling deleted the 17445-calendar-events-modal branch March 20, 2024 20:53

jacobshandling restored the 17445-calendar-events-modal branch March 21, 2024 07:09

jacobshandling mentioned this pull request Mar 22, 2024

UI – Calendar events modal follow up #17788

Merged

1 task

jacobshandling changed the title ~~17445 calendar events modal~~ UI – Calendar events modal Dec 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UI – Calendar events modal #17717

UI – Calendar events modal #17717

jacobshandling commented Mar 19, 2024 •

edited

Loading

codecov bot commented Mar 19, 2024 •

edited

Loading

RachelElysia Mar 20, 2024 •

edited

Loading

RachelElysia Mar 20, 2024

RachelElysia Mar 20, 2024

RachelElysia Mar 20, 2024

RachelElysia Mar 20, 2024

UI – Calendar events modal #17717

UI – Calendar events modal #17717

Conversation

jacobshandling commented Mar 19, 2024 • edited Loading

codecov bot commented Mar 19, 2024 • edited Loading

Codecov Report

RachelElysia Mar 20, 2024 • edited Loading

Choose a reason for hiding this comment

RachelElysia Mar 20, 2024

Choose a reason for hiding this comment

RachelElysia Mar 20, 2024

Choose a reason for hiding this comment

RachelElysia Mar 20, 2024

Choose a reason for hiding this comment

RachelElysia Mar 20, 2024

Choose a reason for hiding this comment

jacobshandling commented Mar 19, 2024 •

edited

Loading

codecov bot commented Mar 19, 2024 •

edited

Loading

RachelElysia Mar 20, 2024 •

edited

Loading