DEVPROD-4198: Add prompt when pausing sleep-scheduled host (#133)

evergreen-ci · May 28, 2024 · ed23d87 · ed23d87
1 parent 958c11a
commit ed23d87
Show file tree

Hide file tree

Showing 23 changed files with 584 additions and 253 deletions.
diff --git a/README.md b/README.md
@@ -33,5 +33,5 @@ yarn test
 
 To run a particular workspace's unit tests from root:
 ```bash
-yarn test --selectProjects [workspace-name]
+yarn test --project [workspace-name]
 ```
diff --git a/apps/parsley/src/gql/generated/types.ts b/apps/parsley/src/gql/generated/types.ts
@@ -1091,8 +1091,7 @@ export type MutationAddAnnotationIssueArgs = {
 };
 
 export type MutationAddFavoriteProjectArgs = {
-  identifier?: InputMaybe<Scalars["String"]["input"]>;
-  opts?: InputMaybe<AddFavoriteProjectInput>;
+  opts: AddFavoriteProjectInput;
 };
 
 export type MutationAttachProjectToNewRepoArgs = {
@@ -1135,16 +1134,11 @@ export type MutationCreatePublicKeyArgs = {
 };
 
 export type MutationDeactivateStepbackTaskArgs = {
-  buildVariantName?: InputMaybe<Scalars["String"]["input"]>;
-  opts?: InputMaybe<DeactivateStepbackTaskInput>;
-  projectId?: InputMaybe<Scalars["String"]["input"]>;
-  taskName?: InputMaybe<Scalars["String"]["input"]>;
+  opts: DeactivateStepbackTaskInput;
 };
 
 export type MutationDefaultSectionToRepoArgs = {
-  opts?: InputMaybe<DefaultSectionToRepoInput>;
-  projectId?: InputMaybe<Scalars["String"]["input"]>;
-  section?: InputMaybe<ProjectSettingsSection>;
+  opts: DefaultSectionToRepoInput;
 };
 
 export type MutationDeleteDistroArgs = {
@@ -1204,9 +1198,7 @@ export type MutationOverrideTaskDependenciesArgs = {
 };
 
 export type MutationPromoteVarsToRepoArgs = {
-  opts?: InputMaybe<PromoteVarsToRepoInput>;
-  projectId?: InputMaybe<Scalars["String"]["input"]>;
-  varNames?: InputMaybe<Array<Scalars["String"]["input"]>>;
+  opts: PromoteVarsToRepoInput;
 };
 
 export type MutationRemoveAnnotationIssueArgs = {
@@ -1217,8 +1209,7 @@ export type MutationRemoveAnnotationIssueArgs = {
 };
 
 export type MutationRemoveFavoriteProjectArgs = {
-  identifier?: InputMaybe<Scalars["String"]["input"]>;
-  opts?: InputMaybe<RemoveFavoriteProjectInput>;
+  opts: RemoveFavoriteProjectInput;
 };
 
 export type MutationRemoveItemFromCommitQueueArgs = {
@@ -2095,14 +2086,12 @@ export type QueryProjectArgs = {
 
 export type QueryProjectEventsArgs = {
   before?: InputMaybe<Scalars["Time"]["input"]>;
-  identifier?: InputMaybe<Scalars["String"]["input"]>;
   limit?: InputMaybe<Scalars["Int"]["input"]>;
-  projectIdentifier?: InputMaybe<Scalars["String"]["input"]>;
+  projectIdentifier: Scalars["String"]["input"];
 };
 
 export type QueryProjectSettingsArgs = {
-  identifier?: InputMaybe<Scalars["String"]["input"]>;
-  projectIdentifier?: InputMaybe<Scalars["String"]["input"]>;
+  projectIdentifier: Scalars["String"]["input"];
 };
 
 export type QueryRepoEventsArgs = {
@@ -2604,8 +2593,6 @@ export type Task = {
   status: Scalars["String"]["output"];
   stepbackInfo?: Maybe<StepbackInfo>;
   tags: Array<Scalars["String"]["output"]>;
-  /** @deprecated Use files instead */
-  taskFiles: TaskFiles;
   taskGroup?: Maybe<Scalars["String"]["output"]>;
   taskGroupMaxHosts?: Maybe<Scalars["Int"]["output"]>;
   /** taskLogs returns the tail 100 lines of the task's logs. */
@@ -2689,8 +2676,6 @@ export type TaskFiles = {
 /** TaskFilterOptions defines the parameters that are used when fetching tasks from a Version. */
 export type TaskFilterOptions = {
   baseStatuses?: InputMaybe<Array<Scalars["String"]["input"]>>;
-  /** @deprecated Use includeNeverActivatedTasks instead */
-  includeEmptyActivation?: InputMaybe<Scalars["Boolean"]["input"]>;
   includeNeverActivatedTasks?: InputMaybe<Scalars["Boolean"]["input"]>;
   limit?: InputMaybe<Scalars["Int"]["input"]>;
   page?: InputMaybe<Scalars["Int"]["input"]>;

diff --git a/apps/spruce/cypress/integration/projectSettings/access.ts b/apps/spruce/cypress/integration/projectSettings/access.ts
@@ -38,6 +38,7 @@ describe("Access page", () => {
     cy.validateToast("success", "Successfully updated project");
     // Assert persistence
     cy.reload();
+    saveButtonEnabled(false);
     cy.get("@usernameInput").should("not.exist");
   });
 

diff --git a/apps/spruce/src/components/DayPicker/index.tsx b/apps/spruce/src/components/DayPicker/index.tsx
@@ -2,19 +2,11 @@ import { useCallback, useState } from "react";
 import styled from "@emotion/styled";
 import { palette } from "@leafygreen-ui/palette";
 import { transitionDuration } from "@leafygreen-ui/tokens";
+import { days } from "constants/fieldMaps";
 import { size } from "constants/tokens";
 
 const { gray, white } = palette;
 
-const days = [
-  "Sunday",
-  "Monday",
-  "Tuesday",
-  "Wednesday",
-  "Thursday",
-  "Friday",
-  "Saturday",
-];
 const emptyState = new Array(days.length).fill(false);
 
 type DayPickerState = Array<boolean>;

diff --git a/apps/spruce/src/components/Spawn/editHostModal/getFormSchema.tsx b/apps/spruce/src/components/Spawn/editHostModal/getFormSchema.tsx
@@ -15,9 +15,8 @@ interface Props {
   canEditRdpPassword: boolean;
   canEditSshKeys: boolean;
   disableExpirationCheckbox: boolean;
-  hostUptimeValidation?: {
+  hostUptimeWarnings?: {
     enabledHoursCount: number;
-    errors: string[];
     warnings: string[];
   };
   instanceTypes: string[];
@@ -32,7 +31,7 @@ export const getFormSchema = ({
   canEditRdpPassword,
   canEditSshKeys,
   disableExpirationCheckbox,
-  hostUptimeValidation,
+  hostUptimeWarnings,
   instanceTypes,
   myPublicKeys,
   noExpirationCheckboxTooltip,
@@ -41,7 +40,7 @@ export const getFormSchema = ({
 }: Props): ReturnType<GetFormSchema> => {
   const expirationDetails = getExpirationDetailsSchema({
     disableExpirationCheckbox,
-    hostUptimeValidation,
+    hostUptimeWarnings,
     noExpirationCheckboxTooltip,
     timeZone,
   });

diff --git a/apps/spruce/src/components/Spawn/getFormSchema.tsx b/apps/spruce/src/components/Spawn/getFormSchema.tsx
@@ -16,16 +16,15 @@ import {
 const today = new Date();
 
 type HostUptimeProps = {
-  hostUptimeValidation?: {
+  hostUptimeWarnings?: {
     enabledHoursCount: number;
-    errors: string[];
     warnings: string[];
   };
   timeZone?: string;
 };
 
 const getHostUptimeSchema = ({
-  hostUptimeValidation,
+  hostUptimeWarnings,
   timeZone,
 }: HostUptimeProps) => ({
   schema: {
@@ -160,12 +159,11 @@ const getHostUptimeSchema = ({
       "ui:descriptionNode": (
         <Details
           timeZone={timeZone}
-          totalUptimeHours={hostUptimeValidation?.enabledHoursCount}
+          totalUptimeHours={hostUptimeWarnings?.enabledHoursCount}
         />
       ),
       "ui:showLabel": false,
-      "ui:warnings": hostUptimeValidation?.warnings,
-      "ui:errors": hostUptimeValidation?.errors,
+      "ui:warnings": hostUptimeWarnings?.warnings,
     },
   },
 });
@@ -183,9 +181,8 @@ const Details: React.FC<{ timeZone: string; totalUptimeHours: number }> = ({
 
 type ExpirationProps = {
   disableExpirationCheckbox: boolean;
-  hostUptimeValidation?: {
+  hostUptimeWarnings?: {
     enabledHoursCount: number;
-    errors: string[];
     warnings: string[];
   };
   noExpirationCheckboxTooltip?: string;
@@ -194,12 +191,12 @@ type ExpirationProps = {
 
 export const getExpirationDetailsSchema = ({
   disableExpirationCheckbox,
-  hostUptimeValidation,
+  hostUptimeWarnings,
   noExpirationCheckboxTooltip,
   timeZone,
 }: ExpirationProps) => {
   const defaultExpiration = getDefaultExpiration();
-  const hostUptime = getHostUptimeSchema({ hostUptimeValidation, timeZone });
+  const hostUptime = getHostUptimeSchema({ hostUptimeWarnings, timeZone });
   return {
     schema: {
       title: "Expiration Details",

diff --git a/apps/spruce/src/components/Spawn/index.tsx b/apps/spruce/src/components/Spawn/index.tsx
@@ -3,7 +3,9 @@ export { DetailsCard } from "./DetailsCard";
 export { MountVolumeSelect } from "./MountVolumeSelect";
 export {
   defaultSleepSchedule,
+  getEnabledHoursCount,
   getHostUptimeFromGql,
-  validateUptimeSchedule,
+  getHostUptimeWarnings,
+  isNullSleepSchedule,
   validator,
 } from "./utils";
diff --git a/apps/spruce/src/components/Spawn/spawnHostModal/getFormSchema.tsx b/apps/spruce/src/components/Spawn/spawnHostModal/getFormSchema.tsx
@@ -25,9 +25,8 @@ interface Props {
     isVirtualWorkStation: boolean;
     name?: string;
   }[];
-  hostUptimeValidation?: {
+  hostUptimeWarnings?: {
     enabledHoursCount: number;
-    errors: string[];
     warnings: string[];
   };
   isMigration: boolean;
@@ -47,7 +46,7 @@ export const getFormSchema = ({
   disableExpirationCheckbox,
   distroIdQueryParam,
   distros,
-  hostUptimeValidation,
+  hostUptimeWarnings,
   isMigration,
   isVirtualWorkstation,
   myPublicKeys,
@@ -74,7 +73,7 @@ export const getFormSchema = ({
 
   const expirationDetails = getExpirationDetailsSchema({
     disableExpirationCheckbox,
-    hostUptimeValidation,
+    hostUptimeWarnings,
     noExpirationCheckboxTooltip,
     timeZone,
   });