From 83a6526d193f21f0b4aa9a8f54f39069e559fec1 Mon Sep 17 00:00:00 2001
From: Jared Henderson <jaredh159@users.noreply.github.com>
Date: Tue, 10 Dec 2024 13:53:31 -0500
Subject: [PATCH] dash: support app blocking canary testing

---
 dash/app/cypress/e2e/create-key.cy.ts         |  2 +-
 dash/app/src/reducers/__tests__/mocks.ts      |  2 +-
 dash/app/src/reducers/user-reducer.ts         |  6 ++--
 .../components/src/Keychains/KeychainCard.tsx |  4 +--
 .../Keychains/schedule/KeychainSchedule.tsx   |  6 ++--
 .../schedule/SpecifyingActiveOrInactive.tsx   |  6 ++--
 .../src/Keychains/schedule/WhatDays.tsx       |  6 ++--
 .../src/Keychains/schedule/WhatTime.tsx       |  6 ++--
 .../src/Users/AddKeychainDrawer.tsx           |  4 +--
 dash/components/src/Users/EditUser.tsx        |  8 ++---
 dash/types/src/defaults.ts                    |  4 +--
 .../src/pairql/pairs/GetIdentifiedApps.ts     |  2 +-
 dash/types/src/pairql/pairs/SaveUser.ts       |  4 +--
 dash/types/src/pairql/shared.ts               | 30 +++++++++----------
 14 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/dash/app/cypress/e2e/create-key.cy.ts b/dash/app/cypress/e2e/create-key.cy.ts
index 013f35adf..b8ed693b0 100644
--- a/dash/app/cypress/e2e/create-key.cy.ts
+++ b/dash/app/cypress/e2e/create-key.cy.ts
@@ -10,7 +10,7 @@ describe(`create key flow`, () => {
         id: `app-123`,
         name: `Brave`,
         slug: `brave`,
-        selectable: true,
+        launchable: true,
         bundleIds: [],
       },
     ]);
diff --git a/dash/app/src/reducers/__tests__/mocks.ts b/dash/app/src/reducers/__tests__/mocks.ts
index a715cd754..175886c38 100644
--- a/dash/app/src/reducers/__tests__/mocks.ts
+++ b/dash/app/src/reducers/__tests__/mocks.ts
@@ -35,7 +35,7 @@ export function identifiedApp(
     id: uuid(),
     name: `Brave Browser`,
     slug: `brave`,
-    selectable: true,
+    launchable: true,
     bundleIds: [{ id: uuid(), bundleId: `com.brave.Browser` }],
     ...override,
   };
diff --git a/dash/app/src/reducers/user-reducer.ts b/dash/app/src/reducers/user-reducer.ts
index 2a2d43600..1f026eb63 100644
--- a/dash/app/src/reducers/user-reducer.ts
+++ b/dash/app/src/reducers/user-reducer.ts
@@ -4,7 +4,7 @@ import type {
   UserKeychainSummary,
   PlainTimeWindow,
   User,
-  KeychainSchedule,
+  RuleSchedule,
 } from '@dash/types';
 import { commit, editable } from '../lib/helpers';
 
@@ -25,9 +25,9 @@ export type Action =
   | { type: 'setDowntime'; downtime: PlainTimeWindow }
   | { type: 'setShowSuspensionActivity'; show: boolean }
   | { type: 'removeKeychain'; id: UUID }
-  | { type: 'setKeychainSchedule'; id: UUID; schedule?: KeychainSchedule }
+  | { type: 'setKeychainSchedule'; id: UUID; schedule?: RuleSchedule }
   | { type: 'addKeychain'; keychain: UserKeychainSummary }
-  | { type: 'setAddingKeychainSchedule'; schedule?: KeychainSchedule }
+  | { type: 'setAddingKeychainSchedule'; schedule?: RuleSchedule }
   | { type: 'setAddingKeychain'; keychain?: UserKeychainSummary | null };
 
 function reducer(state: State, action: Action): State | undefined {
diff --git a/dash/components/src/Keychains/KeychainCard.tsx b/dash/components/src/Keychains/KeychainCard.tsx
index b37e69e96..3266ea158 100644
--- a/dash/components/src/Keychains/KeychainCard.tsx
+++ b/dash/components/src/Keychains/KeychainCard.tsx
@@ -4,7 +4,7 @@ import { inflect } from '@shared/string';
 import { Button, Badge } from '@shared/components';
 import { ChevronDownIcon, ClockIcon, TrashIcon } from '@heroicons/react/24/outline';
 import { UsersIcon } from '@heroicons/react/24/solid';
-import { defaults, type KeychainSchedule as Schedule } from '@dash/types';
+import { defaults, type RuleSchedule as Schedule } from '@dash/types';
 import GradientIcon from '../GradientIcon';
 import KeychainSchedule from './schedule/KeychainSchedule';
 
@@ -118,7 +118,7 @@ const KeychainCard: React.FC<Props> = ({
                 {props.mode === `assign_to_child` && !props.schedule && (
                   <button
                     onClick={() => {
-                      props.setSchedule(defaults.keychainSchedule());
+                      props.setSchedule(defaults.ruleSchedule());
                       setShowSchedule(true);
                     }}
                     className={cx(
diff --git a/dash/components/src/Keychains/schedule/KeychainSchedule.tsx b/dash/components/src/Keychains/schedule/KeychainSchedule.tsx
index 767238ed7..ff7b65ab1 100644
--- a/dash/components/src/Keychains/schedule/KeychainSchedule.tsx
+++ b/dash/components/src/Keychains/schedule/KeychainSchedule.tsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import cx from 'classnames';
-import type { KeychainSchedule } from '@dash/types';
+import type { RuleSchedule } from '@dash/types';
 import SpecifyingActiveOrInactive from './SpecifyingActiveOrInactive';
 import WhatDays from './WhatDays';
 import WhatTime from './WhatTime';
 
 interface Props {
-  schedule: KeychainSchedule;
-  setSchedule(schedule: KeychainSchedule): void;
+  schedule: RuleSchedule;
+  setSchedule(schedule: RuleSchedule): void;
 }
 
 const KeychainSchedule: React.FC<Props> = ({ schedule, setSchedule }) => (
diff --git a/dash/components/src/Keychains/schedule/SpecifyingActiveOrInactive.tsx b/dash/components/src/Keychains/schedule/SpecifyingActiveOrInactive.tsx
index e37ea6907..5d0365b79 100644
--- a/dash/components/src/Keychains/schedule/SpecifyingActiveOrInactive.tsx
+++ b/dash/components/src/Keychains/schedule/SpecifyingActiveOrInactive.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import cx from 'classnames';
 import { ArrowsRightLeftIcon } from '@heroicons/react/24/outline';
-import type { KeychainSchedule } from '@dash/types';
+import type { RuleSchedule } from '@dash/types';
 
 const SpecifyingActiveOrInactive: React.FC<{
-  schedule: KeychainSchedule;
-  setSchedule(schedule: KeychainSchedule): void;
+  schedule: RuleSchedule;
+  setSchedule(schedule: RuleSchedule): void;
   isTouchDevice: boolean;
 }> = ({ schedule, setSchedule, isTouchDevice }) => (
   <button
diff --git a/dash/components/src/Keychains/schedule/WhatDays.tsx b/dash/components/src/Keychains/schedule/WhatDays.tsx
index b34cd36d0..bab1b27cd 100644
--- a/dash/components/src/Keychains/schedule/WhatDays.tsx
+++ b/dash/components/src/Keychains/schedule/WhatDays.tsx
@@ -2,12 +2,12 @@ import React from 'react';
 import cx from 'classnames';
 import { typesafe } from '@shared/ts-utils';
 import { CheckIcon } from '@heroicons/react/24/outline';
-import type { KeychainSchedule } from '@dash/types';
+import type { RuleSchedule } from '@dash/types';
 import DropdownCustomizationPoint from './DropdownCustomizationPoint';
 
 const WhatDays: React.FC<{
-  schedule: KeychainSchedule;
-  setSchedule(schedule: KeychainSchedule): void;
+  schedule: RuleSchedule;
+  setSchedule(schedule: RuleSchedule): void;
   isTouchDevice: boolean;
 }> = ({ schedule, setSchedule, isTouchDevice }) => (
   <DropdownCustomizationPoint
diff --git a/dash/components/src/Keychains/schedule/WhatTime.tsx b/dash/components/src/Keychains/schedule/WhatTime.tsx
index fc7ff2412..a48c493c3 100644
--- a/dash/components/src/Keychains/schedule/WhatTime.tsx
+++ b/dash/components/src/Keychains/schedule/WhatTime.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import cx from 'classnames';
-import type { KeychainSchedule } from '@dash/types';
+import type { RuleSchedule } from '@dash/types';
 import TimeInput from '../../Forms/TimeInput';
 import DropdownCustomizationPoint from './DropdownCustomizationPoint';
 
 const WhatTime: React.FC<{
-  schedule: KeychainSchedule;
-  setSchedule(schedule: KeychainSchedule): void;
+  schedule: RuleSchedule;
+  setSchedule(schedule: RuleSchedule): void;
   isTouchDevice: boolean;
 }> = ({ schedule, setSchedule, isTouchDevice }) => {
   const isInvalid = (() => {
diff --git a/dash/components/src/Users/AddKeychainDrawer.tsx b/dash/components/src/Users/AddKeychainDrawer.tsx
index e8ac1790a..80a61e0ab 100644
--- a/dash/components/src/Users/AddKeychainDrawer.tsx
+++ b/dash/components/src/Users/AddKeychainDrawer.tsx
@@ -14,7 +14,7 @@ import {
 import { Badge, Button, Loading } from '@shared/components';
 import { inflect } from '@shared/string';
 import { defaults, type KeychainSummary as Keychain } from '@dash/types';
-import type { KeychainSchedule as Schedule, RequestState } from '@dash/types';
+import type { RuleSchedule as Schedule, RequestState } from '@dash/types';
 import KeychainSchedule from '../Keychains/schedule/KeychainSchedule';
 
 interface Props {
@@ -318,7 +318,7 @@ const AddKeychainDrawer: React.FC<Props> = ({
               </>
             ) : (
               <button
-                onClick={() => selected && setSchedule(defaults.keychainSchedule())}
+                onClick={() => selected && setSchedule(defaults.ruleSchedule())}
                 className={cx(
                   `flex items-center px-2 py-1 rounded-full transition-[background-color,transform] duration-200 active:scale-90 gap-1.5 bg-slate-200/50 hover:bg-slate-200 active:bg-slate-300`,
                 )}
diff --git a/dash/components/src/Users/EditUser.tsx b/dash/components/src/Users/EditUser.tsx
index ce712fd73..b243e6d64 100644
--- a/dash/components/src/Users/EditUser.tsx
+++ b/dash/components/src/Users/EditUser.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import cx from 'classnames';
 import { inflect } from '@shared/string';
 import { TextInput, Button, Toggle, Label } from '@shared/components';
-import type { KeychainSchedule, PlainTimeWindow } from '@dash/types';
+import type { RuleSchedule, PlainTimeWindow } from '@dash/types';
 import type { Subcomponents, ConfirmableEntityAction, RequestState } from '@dash/types';
 import type { UserKeychainSummary as Keychain } from '@dash/types';
 import KeychainCard from '../Keychains/KeychainCard';
@@ -49,9 +49,9 @@ interface Props {
   onDismissAddKeychain(): unknown;
   addingKeychain?: Keychain | null;
   fetchSelectableKeychainsRequest?: RequestState<{ own: Keychain[]; public: Keychain[] }>;
-  keychainSchedule?: KeychainSchedule;
-  setAddingKeychainSchedule(schedule?: KeychainSchedule): unknown;
-  setAssignedKeychainSchedule(id: UUID, schedule?: KeychainSchedule): unknown;
+  keychainSchedule?: RuleSchedule;
+  setAddingKeychainSchedule(schedule?: RuleSchedule): unknown;
+  setAssignedKeychainSchedule(id: UUID, schedule?: RuleSchedule): unknown;
 }
 
 const EditUser: React.FC<Props> = ({
diff --git a/dash/types/src/defaults.ts b/dash/types/src/defaults.ts
index 05bf230f8..248f3e2ec 100644
--- a/dash/types/src/defaults.ts
+++ b/dash/types/src/defaults.ts
@@ -1,4 +1,4 @@
-import type { PlainTimeWindow, KeychainSchedule } from './pairql/shared';
+import type { PlainTimeWindow, RuleSchedule } from './pairql/shared';
 
 export function timeWindow(): PlainTimeWindow {
   return {
@@ -7,7 +7,7 @@ export function timeWindow(): PlainTimeWindow {
   };
 }
 
-export function keychainSchedule(): KeychainSchedule {
+export function ruleSchedule(): RuleSchedule {
   return {
     mode: `active`,
     days: {
diff --git a/dash/types/src/pairql/pairs/GetIdentifiedApps.ts b/dash/types/src/pairql/pairs/GetIdentifiedApps.ts
index 9e88210c0..13fad064d 100644
--- a/dash/types/src/pairql/pairs/GetIdentifiedApps.ts
+++ b/dash/types/src/pairql/pairs/GetIdentifiedApps.ts
@@ -7,7 +7,7 @@ export namespace GetIdentifiedApps {
     id: UUID;
     name: string;
     slug: string;
-    selectable: boolean;
+    launchable: boolean;
     bundleIds: Array<{
       id: UUID;
       bundleId: string;
diff --git a/dash/types/src/pairql/pairs/SaveUser.ts b/dash/types/src/pairql/pairs/SaveUser.ts
index 95bec2e2e..0603787c6 100644
--- a/dash/types/src/pairql/pairs/SaveUser.ts
+++ b/dash/types/src/pairql/pairs/SaveUser.ts
@@ -1,5 +1,5 @@
 // auto-generated, do not edit
-import type { KeychainSchedule, SuccessOutput, PlainTimeWindow } from '../shared';
+import type { PlainTimeWindow, SuccessOutput, RuleSchedule } from '../shared';
 
 export namespace SaveUser {
   export interface Input {
@@ -14,7 +14,7 @@ export namespace SaveUser {
     downtime?: PlainTimeWindow;
     keychains: Array<{
       id: UUID;
-      schedule?: KeychainSchedule;
+      schedule?: RuleSchedule;
     }>;
   }
 
diff --git a/dash/types/src/pairql/shared.ts b/dash/types/src/pairql/shared.ts
index aca5eb3a3..9f4fd7296 100644
--- a/dash/types/src/pairql/shared.ts
+++ b/dash/types/src/pairql/shared.ts
@@ -60,20 +60,6 @@ export interface Key {
   key: SharedKey;
 }
 
-export interface KeychainSchedule {
-  mode: 'active' | 'inactive';
-  days: {
-    sunday: boolean;
-    monday: boolean;
-    tuesday: boolean;
-    wednesday: boolean;
-    thursday: boolean;
-    friday: boolean;
-    saturday: boolean;
-  };
-  window: PlainTimeWindow;
-}
-
 export interface KeychainSummary {
   id: UUID;
   authorId: UUID;
@@ -97,6 +83,20 @@ export type ReleaseChannel = 'stable' | 'beta' | 'canary';
 
 export type RequestStatus = 'pending' | 'accepted' | 'rejected';
 
+export interface RuleSchedule {
+  mode: 'active' | 'inactive';
+  days: {
+    sunday: boolean;
+    monday: boolean;
+    tuesday: boolean;
+    wednesday: boolean;
+    thursday: boolean;
+    friday: boolean;
+    saturday: boolean;
+  };
+  window: PlainTimeWindow;
+}
+
 export interface ServerPqlError {
   version: number;
   id: string;
@@ -213,7 +213,7 @@ export interface UserKeychainSummary {
   description?: string;
   isPublic: boolean;
   numKeys: number;
-  schedule?: KeychainSchedule;
+  schedule?: RuleSchedule;
 }
 
 export interface VerifiedNotificationMethod {