Merge branch 'main' of https://github.com/evergreen-ci/spruce into EV…

…G-19995
evergreen-ci · Sep 6, 2023 · c89de08 · c89de08
2 parents 47881fc + 9af9f1a
commit c89de08
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spruce",
-  "version": "3.0.132",
+  "version": "3.0.133",
   "private": true,
   "scripts": {
     "bootstrap-logkeeper": "./scripts/bootstrap-logkeeper.sh",
@@ -77,7 +77,7 @@
     "@leafygreen-ui/inline-definition": "6.0.0",
     "@leafygreen-ui/interaction-ring": "7.0.2",
     "@leafygreen-ui/leafygreen-provider": "3.1.0",
-    "@leafygreen-ui/loading-indicator": "2.0.0",
+    "@leafygreen-ui/loading-indicator": "2.0.5",
     "@leafygreen-ui/marketing-modal": "^4.0.5",
     "@leafygreen-ui/menu": "20.0.1",
     "@leafygreen-ui/modal": "14.0.1",

diff --git a/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx b/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx
@@ -109,6 +109,7 @@ export const LeafyGreenCheckBox: React.FC<SpruceWidgetProps> = ({
   value,
 }) => {
   const {
+    bold,
     customLabel,
     "data-cy": dataCy,
     description,
@@ -118,7 +119,7 @@ export const LeafyGreenCheckBox: React.FC<SpruceWidgetProps> = ({
   return (
     <ElementWrapper css={elementWrapperCSS}>
       <Checkbox
-        bold={false}
+        bold={bold || false}
         checked={value}
         data-cy={dataCy}
         description={description}

diff --git a/src/components/SpruceForm/Widgets/types.ts b/src/components/SpruceForm/Widgets/types.ts
@@ -8,6 +8,7 @@ export interface SpruceWidgetProps extends WidgetProps {
     "aria-controls": string[];
     "data-cy": string;
     ariaLabelledBy: string;
+    bold: boolean;
     customLabel: string;
     description: string;
     elementWrapperCSS: SerializedStyles;

diff --git a/src/gql/fragments/projectSettings/projectTriggers.graphql b/src/gql/fragments/projectSettings/projectTriggers.graphql
@@ -8,6 +8,7 @@ fragment ProjectTriggersSettings on Project {
     project
     status
     taskRegex
+    unscheduleDownstreamVersions
   }
 }
 
@@ -21,5 +22,6 @@ fragment RepoTriggersSettings on RepoRef {
     project
     status
     taskRegex
+    unscheduleDownstreamVersions
   }
 }
diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts
@@ -3629,6 +3629,7 @@ export type ProjectSettingsFieldsFragment = {
       project: string;
       status: string;
       taskRegex: string;
+      unscheduleDownstreamVersions?: boolean | null;
     }> | null;
     parsleyFilters?: Array<{
       __typename?: "ParsleyFilter";
@@ -3827,6 +3828,7 @@ export type RepoSettingsFieldsFragment = {
       project: string;
       status: string;
       taskRegex: string;
+      unscheduleDownstreamVersions?: boolean | null;
     }>;
     workstationConfig: {
       __typename?: "RepoWorkstationConfig";
@@ -4217,6 +4219,7 @@ export type ProjectEventSettingsFragment = {
       project: string;
       status: string;
       taskRegex: string;
+      unscheduleDownstreamVersions?: boolean | null;
     }> | null;
     parsleyFilters?: Array<{
       __typename?: "ParsleyFilter";
@@ -4316,6 +4319,7 @@ export type ProjectTriggersSettingsFragment = {
     project: string;
     status: string;
     taskRegex: string;
+    unscheduleDownstreamVersions?: boolean | null;
   }> | null;
 };
 
@@ -4331,6 +4335,7 @@ export type RepoTriggersSettingsFragment = {
     project: string;
     status: string;
     taskRegex: string;
+    unscheduleDownstreamVersions?: boolean | null;
   }>;
 };
 
@@ -6591,6 +6596,7 @@ export type ProjectEventLogsQuery = {
             project: string;
             status: string;
             taskRegex: string;
+            unscheduleDownstreamVersions?: boolean | null;
           }> | null;
           parsleyFilters?: Array<{
             __typename?: "ParsleyFilter";
@@ -6801,6 +6807,7 @@ export type ProjectEventLogsQuery = {
             project: string;
             status: string;
             taskRegex: string;
+            unscheduleDownstreamVersions?: boolean | null;
           }> | null;
           parsleyFilters?: Array<{
             __typename?: "ParsleyFilter";
@@ -7026,6 +7033,7 @@ export type ProjectSettingsQuery = {
         project: string;
         status: string;
         taskRegex: string;
+        unscheduleDownstreamVersions?: boolean | null;
       }> | null;
       parsleyFilters?: Array<{
         __typename?: "ParsleyFilter";
@@ -7275,6 +7283,7 @@ export type RepoEventLogsQuery = {
             project: string;
             status: string;
             taskRegex: string;
+            unscheduleDownstreamVersions?: boolean | null;
           }> | null;
           parsleyFilters?: Array<{
             __typename?: "ParsleyFilter";
@@ -7485,6 +7494,7 @@ export type RepoEventLogsQuery = {
             project: string;
             status: string;
             taskRegex: string;
+            unscheduleDownstreamVersions?: boolean | null;
           }> | null;
           parsleyFilters?: Array<{
             __typename?: "ParsleyFilter";
@@ -7700,6 +7710,7 @@ export type RepoSettingsQuery = {
         project: string;
         status: string;
         taskRegex: string;
+        unscheduleDownstreamVersions?: boolean | null;
       }>;
       workstationConfig: {
         __typename?: "RepoWorkstationConfig";

diff --git a/src/pages/distroSettings/tabs/testData.ts b/src/pages/distroSettings/tabs/testData.ts
@@ -17,7 +17,7 @@ import {
 const distroData: DistroQuery["distro"] = {
   __typename: "Distro",
   aliases: ["rhel71-power8", "rhel71-power8-build"],
-  arch: Arch.LinuxPpc_64Bit,
+  arch: Arch.Linux_64Bit,
   authorizedKeysFile: "",
   bootstrapSettings: {
     clientDir: "/home/evg/client",

diff --git a/src/pages/projectSettings/tabs/ProjectTriggersTab/getFormSchema.ts b/src/pages/projectSettings/tabs/ProjectTriggersTab/getFormSchema.ts
@@ -94,6 +94,10 @@ export const getFormSchema = (
               title: "Alias",
               default: "",
             },
+            unscheduleDownstreamVersions: {
+              type: "boolean" as "boolean",
+              title: "Unschedule Downstream Versions",
+            },
           },
         },
       }
@@ -148,6 +152,12 @@ export const getFormSchema = (
             "Patch alias to filter variants/tasks in this project.",
           "ui:optional": true,
         },
+        unscheduleDownstreamVersions: {
+          "ui:description":
+            "Downstream versions created by this trigger will be deactivated by default",
+          "ui:optional": true,
+          "ui:bold": true,
+        },
       },
     },
     repoData: {

diff --git a/src/pages/projectSettings/tabs/ProjectTriggersTab/transformers.test.ts b/src/pages/projectSettings/tabs/ProjectTriggersTab/transformers.test.ts
@@ -55,6 +55,7 @@ const repoForm: ProjectTriggersFormState = {
       project: "spruce",
       status: "succeeded",
       taskRegex: ".*",
+      unscheduleDownstreamVersions: true,
     },
   ],
 };
@@ -72,6 +73,7 @@ const repoResult: Pick<RepoSettingsInput, "projectRef"> = {
         project: "spruce",
         status: "succeeded",
         taskRegex: ".*",
+        unscheduleDownstreamVersions: true,
       },
     ],
   },

diff --git a/src/pages/projectSettings/tabs/ProjectTriggersTab/transformers.ts b/src/pages/projectSettings/tabs/ProjectTriggersTab/transformers.ts
@@ -50,6 +50,7 @@ export const formToGql = (({ triggers, triggersOverride }, projectId) => ({
           dateCutoff: trigger.dateCutoff,
           configFile: trigger.configFile,
           alias: trigger.alias,
+          unscheduleDownstreamVersions: trigger.unscheduleDownstreamVersions,
         }))
       : null,
   },

diff --git a/src/pages/projectSettings/tabs/ProjectTriggersTab/types.ts b/src/pages/projectSettings/tabs/ProjectTriggersTab/types.ts
@@ -10,6 +10,7 @@ type FormTrigger = {
   configFile: string;
   alias: string;
   displayTitle?: string;
+  unscheduleDownstreamVersions: boolean;
 };
 
 export type ProjectTriggersFormState = {

diff --git a/src/pages/projectSettings/tabs/testData.ts b/src/pages/projectSettings/tabs/testData.ts
@@ -243,6 +243,7 @@ const repoBase: RepoSettingsQuery["repoSettings"] = {
         taskRegex: ".*",
         configFile: ".evergreen.yml",
         alias: "my-alias",
+        unscheduleDownstreamVersions: true,
       },
     ],
     periodicBuilds: [

diff --git a/src/pages/task/taskTabs/logs/logTypes/TaskEventLogLine.tsx b/src/pages/task/taskTabs/logs/logTypes/TaskEventLogLine.tsx
@@ -17,6 +17,9 @@ export const TaskEventLogLine: React.FC<TaskEventLogEntry> = ({
   const containerOrHostCopy = podId ? "container" : "host";
   let message: JSX.Element;
   switch (eventType) {
+    case TaskEventType.TaskBlocked:
+      message = <>Task is blocked.</>;
+      break;
     case TaskEventType.TaskFinished:
       message = (
         <>

diff --git a/src/types/task.ts b/src/types/task.ts
@@ -106,6 +106,7 @@ export enum TaskEventType {
   TaskFinished = "TASK_FINISHED",
   TaskStarted = "TASK_STARTED",
   TaskDispatched = "TASK_DISPATCHED",
+  TaskBlocked = "TASK_BLOCKED",
   TaskUndispatched = "TASK_UNDISPATCHED",
   TaskCreated = "TASK_CREATED",
   TaskRestarted = "TASK_RESTARTED",

diff --git a/yarn.lock b/yarn.lock
@@ -3381,16 +3381,16 @@
     lodash "^4.17.21"
     prop-types "^15.7.2"
 
-"@leafygreen-ui/[email protected].0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@leafygreen-ui/loading-indicator/-/loading-indicator-2.0.0.tgz#21f6d81ff43e1dd6339f06a1504f4bf9fcfa6307"
-  integrity sha512-YaPe2meAZaGGRFCwWNpVdBEu8jU81/Sq9BEJD7xRNV6+CPMhe/8nw7OOOozNo+W/o9yzD/25KNT6tbXJZqGfOA==
+"@leafygreen-ui/[email protected].5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@leafygreen-ui/loading-indicator/-/loading-indicator-2.0.5.tgz#a961ac1da31346aab14a15c3f1efa84226af2ad4"
+  integrity sha512-46qAwxxApQUPCLDwtWdrqZiicn6Zdp/kuRatxq3c5Xgxackt/Z0obJmIhUC4hD4Ir3r87SbAE49Ucy8fgJ/5BQ==
   dependencies:
-    "@leafygreen-ui/emotion" "^4.0.4"
-    "@leafygreen-ui/lib" "^10.4.0"
-    "@leafygreen-ui/palette" "^4.0.4"
-    "@leafygreen-ui/tokens" "^2.1.1"
-    "@leafygreen-ui/typography" "^16.5.1"
+    "@leafygreen-ui/emotion" "^4.0.7"
+    "@leafygreen-ui/lib" "^11.0.0"
+    "@leafygreen-ui/palette" "^4.0.7"
+    "@leafygreen-ui/tokens" "^2.1.4"
+    "@leafygreen-ui/typography" "^17.0.0"
     react-lottie-player "^1.5.4"
 
 "@leafygreen-ui/marketing-modal@^4.0.5":