diff --git a/.evergreen.yml b/.evergreen.yml index b551116ab3..f9b89007c9 100644 --- a/.evergreen.yml +++ b/.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: | diff --git a/cypress/integration/task/select_execution.ts b/cypress/integration/task/select_execution.ts index c14430fe4e..6140faee0d 100644 --- a/cypress/integration/task/select_execution.ts +++ b/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"); diff --git a/package.json b/package.json index b81919ed05..f54217ee53 100644 --- a/package.json +++ b/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", diff --git a/scripts/deploy/create-evergreen-yml.sh b/scripts/create-evergreen-yml.sh similarity index 100% rename from scripts/deploy/create-evergreen-yml.sh rename to scripts/create-evergreen-yml.sh diff --git a/scripts/deploy/deploy-production.ts b/scripts/deploy/deploy-production.ts index 1393f7f52d..5e671513cb 100644 --- a/scripts/deploy/deploy-production.ts +++ b/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; diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts index 53fdab5136..c75561a068 100644 --- a/src/gql/generated/types.ts +++ b/src/gql/generated/types.ts @@ -2402,6 +2402,7 @@ export type SpruceConfig = { jira?: Maybe; keys: Array; providers?: Maybe; + secretFields: Array; slack?: Maybe; spawnHost: SpawnHostConfig; ui?: Maybe; diff --git a/src/pages/task/executionDropdown/ExecutionSelector.tsx b/src/pages/task/executionDropdown/ExecutionSelector.tsx index 02a99d5b0b..9c4343c65a 100644 --- a/src/pages/task/executionDropdown/ExecutionSelector.tsx +++ b/src/pages/task/executionDropdown/ExecutionSelector.tsx @@ -37,16 +37,17 @@ export const ExecutionSelect: React.FC = ({ const getDateCopy = useDateFormat(); return ( { 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 = ({ return (