Merge branch 'main' into DEVPROD-5050

.evergreen.yml

@@ -428,7 +428,7 @@ functions:
         REACT_APP_DEPLOYS_EMAIL: ${REACT_APP_DEPLOYS_EMAIL}
         REACT_APP_HONEYCOMB_BASE_URL: ${REACT_APP_HONEYCOMB_BASE_URL}
         EVERGREEN_API_SERVER_HOST: ${evergreen_api_server_host}
-        EVERGREEN_UI_SERVER_HOST: ${evergreen_api_server_host}
+        EVERGREEN_UI_SERVER_HOST: ${evergreen_ui_server_host}
         EVERGREEN_API_KEY: ${evergreen_api_key}
         EVERGREEN_USER: ${evergreen_user}
       script: |

cypress/integration/task/select_execution.ts

@@ -8,12 +8,15 @@ describe("Selecting Task Execution", () => {
   });
 
   it("Should take user to the latest execution if no execution is specified", () => {
+    cy.location("search").should("include", "execution=1");
     cy.dataCy("execution-select").contains("Execution 2 (latest)");
     cy.dataCy("task-status-badge").contains("Will Run");
-    cy.location("search").should("include", "execution=1");
   });
 
   it("Toggling a different execution should change the displayed execution", () => {
+    cy.location("search").should("include", "execution=1");
+    cy.dataCy("execution-select").contains("Execution 2 (latest)");
+    cy.dataCy("execution-select").should("have.attr", "aria-disabled", "false");
     cy.dataCy("execution-select").click();
     cy.dataCy("execution-0").click();
     cy.dataCy("task-status-badge").contains("Succeeded");

package.json

@@ -1,6 +1,6 @@
 {
   "name": "spruce",
-  "version": "3.0.208",
+  "version": "3.0.210",
   "private": true,
   "scripts": {
     "bootstrap-logkeeper": "./scripts/bootstrap-logkeeper.sh",
@@ -74,7 +74,7 @@
     "@leafygreen-ui/icon-button": "15.0.19",
     "@leafygreen-ui/inline-definition": "6.0.14",
     "@leafygreen-ui/interaction-ring": "7.0.2",
-    "@leafygreen-ui/leafygreen-provider": "3.1.10",
+    "@leafygreen-ui/leafygreen-provider": "3.1.11",
     "@leafygreen-ui/loading-indicator": "2.0.6",
     "@leafygreen-ui/menu": "20.0.1",
     "@leafygreen-ui/modal": "16.0.3",

scripts/deploy/deploy-production.ts

@@ -29,7 +29,7 @@ const evergreenDeploy = async () => {
         console.log("Check Evergreen for deploy progress.");
       } else {
         console.log(
-          "Deploy canceled. If systems are experiencing an outage and you'd like to push the deploy directly to S3, run yarn deploy:prod --local."
+          "Deploy canceled. If systems are experiencing an outage and you'd like to push the deploy directly to S3, run yarn deploy:prod --local.",
         );
       }
       return;

src/gql/generated/types.ts

@@ -2402,6 +2402,7 @@ export type SpruceConfig = {
   jira?: Maybe<JiraConfig>;
   keys: Array<SshKey>;
   providers?: Maybe<CloudProviderConfig>;
+  secretFields: Array<Scalars["String"]["output"]>;
   slack?: Maybe<SlackConfig>;
   spawnHost: SpawnHostConfig;
   ui?: Maybe<UiConfig>;

src/pages/task/executionDropdown/ExecutionSelector.tsx

@@ -37,16 +37,17 @@ export const ExecutionSelect: React.FC<ExecutionSelectProps> = ({
   const getDateCopy = useDateFormat();
   return (
     <StyledSelect
-      placeholder="Choose an execution"
+      aria-disabled={executionsLoading}
+      data-cy="execution-select"
       disabled={executionsLoading}
       key={currentExecution}
-      data-cy="execution-select"
-      value={`Execution ${formatZeroIndexForDisplay(currentExecution)}${
-        currentExecution === latestExecution ? " (latest)" : ""
-      }`}
       onChange={(selected: number | null) => {
         updateExecution(selected);
       }}
+      placeholder="Choose an execution"
+      value={`Execution ${formatZeroIndexForDisplay(currentExecution)}${
+        currentExecution === latestExecution ? " (latest)" : ""
+      }`}
     >
       {allExecutions?.map((singleExecution) => {
         const optionText = `Execution ${formatZeroIndexForDisplay(
@@ -58,9 +59,9 @@ export const ExecutionSelect: React.FC<ExecutionSelectProps> = ({
 
         return (
           <Option
+            data-cy={`execution-${singleExecution.execution}`}
             key={singleExecution.execution}
             value={singleExecution.execution}
-            data-cy={`execution-${singleExecution.execution}`}
           >
             <ExecutionInfo>
               <StyledTaskStatusIcon status={singleExecution.status} />

yarn.lock

@@ -3547,13 +3547,13 @@
     "@leafygreen-ui/palette" "^3.4.5"
     "@leafygreen-ui/tokens" "^1.4.1"
 
-"@leafygreen-ui/[email protected].10":
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/@leafygreen-ui/leafygreen-provider/-/leafygreen-provider-3.1.10.tgz#44a5de540f4052ad945970610b0bca7a8f9f44dc"
-  integrity sha512-ZPrC9rQVCvyRQU76snv7h/DhDrarVlvbokV8r9ylanfnjFZwm02RliRVYiGiJHkz3LYrdmpJ2384z9juRFQDaQ==
+"@leafygreen-ui/[email protected].11":
+  version "3.1.11"
+  resolved "https://registry.yarnpkg.com/@leafygreen-ui/leafygreen-provider/-/leafygreen-provider-3.1.11.tgz#b5d438ec0b859a388c54f487668c0106097d062d"
+  integrity sha512-xRwZjchRcvtpbkrLAxuHDl5MPgdi6J7ErVyeeP8k6+y7yTdaaAu8j8bbiacASwpOJdX5Q2XNl2pJ8gzC2PgyRA==
   dependencies:
-    "@leafygreen-ui/hooks" "^8.0.0"
-    "@leafygreen-ui/lib" "^13.0.0"
+    "@leafygreen-ui/hooks" "^8.1.0"
+    "@leafygreen-ui/lib" "^13.2.0"
 
 "@leafygreen-ui/lib@^10.0.0", "@leafygreen-ui/lib@^10.1.0", "@leafygreen-ui/lib@^10.2.2", "@leafygreen-ui/lib@^10.3.3", "@leafygreen-ui/lib@^10.4.0", "@leafygreen-ui/lib@^10.4.3":
   version "10.4.3"