Merge branch 'main' into EVG-19947

evergreen-ci · Sep 21, 2023 · b0a3238 · b0a3238
2 parents 1f23cfa + 7df69bb
commit b0a3238
Show file tree

Hide file tree

Showing 182 changed files with 1,129 additions and 1,401 deletions.
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
@@ -129,9 +129,7 @@ beforeEach(() => {
   cy.setCookie(bannerCookie, "true");
   cy.setCookie(CY_DISABLE_COMMITS_WELCOME_MODAL, "true");
   cy.setCookie(CY_DISABLE_NEW_USER_WELCOME_MODAL, "true");
-  cy.setCookie(konamiCookie, "true");
   cy.setCookie(SLACK_NOTIFICATION_BANNER, "true");
 });
 
 const bannerCookie = "This is an important notification";
-const konamiCookie = "seen-konami-code";
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spruce",
-  "version": "3.0.139",
+  "version": "3.0.140",
   "private": true,
   "scripts": {
     "bootstrap-logkeeper": "./scripts/bootstrap-logkeeper.sh",
@@ -54,7 +54,7 @@
     "extends": "react-app"
   },
   "dependencies": {
-    "@apollo/client": "3.6.9",
+    "@apollo/client": "3.8.4",
     "@bugsnag/js": "7.20.2",
     "@bugsnag/plugin-react": "7.18.0",
     "@emotion/css": "11.11.2",

diff --git a/src/analytics/aprilFools/useAprilFoolsAnalytics.ts b/src/analytics/aprilFools/useAprilFoolsAnalytics.ts
@@ -1,6 +1,6 @@
 import { useAnalyticsRoot } from "analytics/useAnalyticsRoot";
 
-type Action = { name: "Triggered Konami Code" };
+type Action = { name: "2024 Boilerplate!" };
 
 export const useAprilFoolsAnalytics = () =>
   useAnalyticsRoot<Action>("April Fools");
diff --git a/src/analytics/patch/usePatchAnalytics.ts b/src/analytics/patch/usePatchAnalytics.ts
@@ -6,7 +6,7 @@ import {
   PatchQueryVariables,
   TaskSortCategory,
 } from "gql/generated/types";
-import { GET_PATCH } from "gql/queries";
+import { PATCH } from "gql/queries";
 
 type Action =
   | { name: "Filter Tasks"; filterBy: string }
@@ -49,13 +49,10 @@ type Action =
   | { name: "Open Schedule Tasks Modal" };
 
 export const usePatchAnalytics = (id: string) => {
-  const { data: eventData } = useQuery<PatchQuery, PatchQueryVariables>(
-    GET_PATCH,
-    {
-      variables: { id },
-      fetchPolicy: "cache-first",
-    }
-  );
+  const { data: eventData } = useQuery<PatchQuery, PatchQueryVariables>(PATCH, {
+    variables: { id },
+    fetchPolicy: "cache-first",
+  });
   const { status } = eventData?.patch || {};
 
   return useAnalyticsRoot<Action>("Patch", {

diff --git a/src/analytics/task/useAnnotationAnalytics.ts b/src/analytics/task/useAnnotationAnalytics.ts
@@ -8,7 +8,7 @@ import {
   AnnotationEventDataQuery,
   AnnotationEventDataQueryVariables,
 } from "gql/generated/types";
-import { GET_ANNOTATION_EVENT_DATA, GET_BUILD_BARON } from "gql/queries";
+import { ANNOTATION_EVENT_DATA, BUILD_BARON } from "gql/queries";
 import { RequiredQueryParams } from "types/task";
 import { queryString } from "utils";
 
@@ -36,13 +36,13 @@ export const useAnnotationAnalytics = () => {
   const { data: eventData } = useQuery<
     AnnotationEventDataQuery,
     AnnotationEventDataQueryVariables
-  >(GET_ANNOTATION_EVENT_DATA, {
+  >(ANNOTATION_EVENT_DATA, {
     variables: { taskId: id, execution },
     fetchPolicy: "cache-first",
   });
 
   const { data: bbData } = useQuery<BuildBaronQuery, BuildBaronQueryVariables>(
-    GET_BUILD_BARON,
+    BUILD_BARON,
     {
       variables: { taskId: id, execution },
       fetchPolicy: "cache-first",

diff --git a/src/analytics/task/useTaskAnalytics.ts b/src/analytics/task/useTaskAnalytics.ts
@@ -8,7 +8,7 @@ import {
   TaskSortCategory,
   TestSortCategory,
 } from "gql/generated/types";
-import { GET_TASK } from "gql/queries";
+import { TASK } from "gql/queries";
 import { CommitType } from "pages/task/actionButtons/previousCommits/types";
 import { RequiredQueryParams, LogTypes } from "types/task";
 import { queryString } from "utils";
@@ -71,13 +71,10 @@ export const useTaskAnalytics = () => {
 
   const parsed = parseQueryString(location.search);
   const execution = Number(parsed[RequiredQueryParams.Execution]);
-  const { data: eventData } = useQuery<TaskQuery, TaskQueryVariables>(
-    GET_TASK,
-    {
-      variables: { taskId: id, execution },
-      fetchPolicy: "cache-first",
-    }
-  );
+  const { data: eventData } = useQuery<TaskQuery, TaskQueryVariables>(TASK, {
+    variables: { taskId: id, execution },
+    fetchPolicy: "cache-first",
+  });
 
   const {
     failedTestCount,

diff --git a/src/analytics/version/useVersionAnalytics.ts b/src/analytics/version/useVersionAnalytics.ts
@@ -6,7 +6,7 @@ import {
   VersionQueryVariables,
   TaskSortCategory,
 } from "gql/generated/types";
-import { GET_VERSION } from "gql/queries";
+import { VERSION } from "gql/queries";
 
 type Action =
   | { name: "Filter Tasks"; filterBy: string }
@@ -52,7 +52,7 @@ type Action =
 
 export const useVersionAnalytics = (id: string) => {
   const { data: eventData } = useQuery<VersionQuery, VersionQueryVariables>(
-    GET_VERSION,
+    VERSION,
     {
       variables: { id },
       fetchPolicy: "cache-first",

diff --git a/src/components/Banners/GithubUsernameBanner.tsx b/src/components/Banners/GithubUsernameBanner.tsx
@@ -8,7 +8,7 @@ import {
   routes,
 } from "constants/routes";
 import { UserSettingsQuery } from "gql/generated/types";
-import { GET_USER_SETTINGS } from "gql/queries";
+import { USER_SETTINGS } from "gql/queries";
 
 export const GithubUsernameBanner = () => {
   const { pathname } = useLocation();
@@ -17,7 +17,7 @@ export const GithubUsernameBanner = () => {
 
   // USER SETTINGS QUERY
   const { data: userSettingsData } = useQuery<UserSettingsQuery>(
-    GET_USER_SETTINGS,
+    USER_SETTINGS,
     { skip: !isPatchesPage }
   );
   const { userSettings } = userSettingsData || {};

diff --git a/src/components/Banners/ProjectBanner.tsx b/src/components/Banners/ProjectBanner.tsx
@@ -3,7 +3,7 @@ import {
   ProjectBannerQuery,
   ProjectBannerQueryVariables,
 } from "gql/generated/types";
-import { GET_PROJECT_BANNER } from "gql/queries";
+import { PROJECT_BANNER } from "gql/queries";
 import { PortalBanner } from "./PortalBanner";
 
 interface ProjectBannerProps {
@@ -15,7 +15,7 @@ export const ProjectBanner: React.FC<ProjectBannerProps> = ({
   const { data: projectBannerData } = useQuery<
     ProjectBannerQuery,
     ProjectBannerQueryVariables
-  >(GET_PROJECT_BANNER, {
+  >(PROJECT_BANNER, {
     variables: { identifier: projectIdentifier },
     skip: !projectIdentifier,
   });

diff --git a/src/components/Banners/SlackNotificationBanner.tsx b/src/components/Banners/SlackNotificationBanner.tsx
@@ -15,7 +15,7 @@ import {
   UserSettingsQuery,
 } from "gql/generated/types";
 import { UPDATE_USER_SETTINGS } from "gql/mutations";
-import { GET_USER_SETTINGS } from "gql/queries";
+import { USER_SETTINGS } from "gql/queries";
 
 const { blue } = palette;
 
@@ -41,8 +41,7 @@ export const SlackNotificationBanner = () => {
     });
 
   // USER SETTINGS QUERY
-  const { data: userSettingsData } =
-    useQuery<UserSettingsQuery>(GET_USER_SETTINGS);
+  const { data: userSettingsData } = useQuery<UserSettingsQuery>(USER_SETTINGS);
   const { userSettings } = userSettingsData || {};
   const { notifications, slackUsername: defaultSlackUsername } =
     userSettings || {};

diff --git a/src/components/CodeChanges/index.tsx b/src/components/CodeChanges/index.tsx
@@ -17,7 +17,7 @@ import {
   CodeChangesQueryVariables,
   FileDiffsFragment,
 } from "gql/generated/types";
-import { GET_CODE_CHANGES } from "gql/queries";
+import { CODE_CHANGES } from "gql/queries";
 import { commits } from "utils";
 import { formatZeroIndexForDisplay } from "utils/numbers";
 
@@ -30,7 +30,7 @@ export const CodeChanges: React.FC<CodeChangesProps> = ({ patchId }) => {
   const { data, error, loading } = useQuery<
     CodeChangesQuery,
     CodeChangesQueryVariables
-  >(GET_CODE_CHANGES, {
+  >(CODE_CHANGES, {
     variables: { id: patchId },
   });
   const { moduleCodeChanges } = data?.patch ?? {};

diff --git a/src/components/Content/Layout.tsx b/src/components/Content/Layout.tsx
@@ -15,7 +15,7 @@ import { size } from "constants/tokens";
 import { newSpruceUser } from "constants/welcomeModalProps";
 import { useAuthStateContext } from "context/auth";
 import { UserQuery, UserQueryVariables } from "gql/generated/types";
-import { GET_USER } from "gql/queries";
+import { USER } from "gql/queries";
 import { useUserSettings } from "hooks";
 import { useAnnouncementToast } from "hooks/useAnnouncementToast";
 import { isProduction } from "utils/environmentVariables";
@@ -33,7 +33,7 @@ export const Layout: React.FC = () => {
   // this top-level query is required for authentication to work
   // afterware is used at apollo link level to authenticate or deauthenticate user based on response to query
   // therefore this could be any query as long as it is top-level
-  const { data } = useQuery<UserQuery, UserQueryVariables>(GET_USER);
+  const { data } = useQuery<UserQuery, UserQueryVariables>(USER);
   localStorage.setItem("userId", data?.user?.userId ?? "");
   const { userSettings } = useUserSettings();
   const { useSpruceOptions } = userSettings ?? {};

diff --git a/src/components/Header/Navbar.tsx b/src/components/Header/Navbar.tsx
@@ -13,7 +13,7 @@ import { getCommitsRoute, getUserPatchesRoute, routes } from "constants/routes";
 import { size } from "constants/tokens";
 import { useAuthStateContext } from "context/auth";
 import { UserQuery, SpruceConfigQuery } from "gql/generated/types";
-import { GET_USER, SPRUCE_CONFIG } from "gql/queries";
+import { USER, SPRUCE_CONFIG } from "gql/queries";
 import { useLegacyUIURL } from "hooks";
 import { AuxiliaryDropdown } from "./AuxiliaryDropdown";
 import { UserDropdown } from "./UserDropdown";
@@ -25,7 +25,7 @@ export const Navbar: React.FC = () => {
   const legacyURL = useLegacyUIURL();
   const { sendEvent } = useNavbarAnalytics();
 
-  const { data: userData } = useQuery<UserQuery>(GET_USER);
+  const { data: userData } = useQuery<UserQuery>(USER);
   const { user } = userData || {};
   const { userId } = user || {};
 

diff --git a/src/components/Header/UserDropdown.tsx b/src/components/Header/UserDropdown.tsx
@@ -4,11 +4,11 @@ import { adminSettingsURL } from "constants/externalResources";
 import { PreferencesTabRoutes, getPreferencesRoute } from "constants/routes";
 import { useAuthDispatchContext } from "context/auth";
 import { UserQuery } from "gql/generated/types";
-import { GET_USER } from "gql/queries";
+import { USER } from "gql/queries";
 import { MenuItemType, NavDropdown } from "./NavDropdown";
 
 export const UserDropdown = () => {
-  const { data } = useQuery<UserQuery>(GET_USER);
+  const { data } = useQuery<UserQuery>(USER);
   const { user } = data || {};
   const { displayName, permissions } = user || {};
 

diff --git a/src/components/HistoryTable/hooks/useTestResults.test.tsx b/src/components/HistoryTable/hooks/useTestResults.test.tsx
@@ -2,7 +2,7 @@ import {
   TaskTestSampleQuery,
   TaskTestSampleQueryVariables,
 } from "gql/generated/types";
-import { GET_TASK_TEST_SAMPLE } from "gql/queries";
+import { TASK_TEST_SAMPLE } from "gql/queries";
 import { act, renderHook, waitFor } from "test_utils";
 import { ApolloMock } from "types/gql";
 import { TestStatus } from "types/history";
@@ -241,7 +241,7 @@ const noFilterData: ApolloMock<
   TaskTestSampleQueryVariables
 > = {
   request: {
-    query: GET_TASK_TEST_SAMPLE,
+    query: TASK_TEST_SAMPLE,
     variables: {
       tasks: [
         "evergreen_lint_lint_model_distro_d4cf298cf0b2536fb3bff875775b93a9ceafb75c_21_09_02_14_20_04",
@@ -273,7 +273,7 @@ const withMatchingFilter: ApolloMock<
   TaskTestSampleQueryVariables
 > = {
   request: {
-    query: GET_TASK_TEST_SAMPLE,
+    query: TASK_TEST_SAMPLE,
     variables: {
       tasks: [
         "evergreen_lint_lint_model_distro_d4cf298cf0b2536fb3bff875775b93a9ceafb75c_21_09_02_14_20_04",
@@ -307,7 +307,7 @@ const withNonMatchingFilter: ApolloMock<
   TaskTestSampleQueryVariables
 > = {
   request: {
-    query: GET_TASK_TEST_SAMPLE,
+    query: TASK_TEST_SAMPLE,
     variables: {
       tasks: [
         "evergreen_lint_lint_model_distro_d4cf298cf0b2536fb3bff875775b93a9ceafb75c_21_09_02_14_20_04",

diff --git a/src/components/HistoryTable/hooks/useTestResults.ts b/src/components/HistoryTable/hooks/useTestResults.ts
@@ -5,7 +5,7 @@ import {
   TaskTestSampleQueryVariables,
   TaskTestResultSample,
 } from "gql/generated/types";
-import { GET_TASK_TEST_SAMPLE } from "gql/queries";
+import { TASK_TEST_SAMPLE } from "gql/queries";
 import { array } from "utils";
 import { useHistoryTable } from "../HistoryTableContext";
 import { rowType } from "../types";
@@ -35,7 +35,7 @@ const useTestResults = (rowIndex: number) => {
   const { loading } = useQuery<
     TaskTestSampleQuery,
     TaskTestSampleQueryVariables
-  >(GET_TASK_TEST_SAMPLE, {
+  >(TASK_TEST_SAMPLE, {
     variables: {
       tasks: taskIds,
       filters: historyTableFilters,

diff --git a/src/components/Notifications/index.tsx b/src/components/Notifications/index.tsx
@@ -18,7 +18,7 @@ import {
   UserQuery,
 } from "gql/generated/types";
 import { SAVE_SUBSCRIPTION } from "gql/mutations";
-import { GET_USER } from "gql/queries";
+import { USER } from "gql/queries";
 import { useUserSettings } from "hooks/useUserSettings";
 import { SubscriptionMethodOption } from "types/subscription";
 import { Trigger } from "types/triggers";
@@ -65,7 +65,7 @@ export const NotificationModal: React.FC<NotificationModalProps> = ({
   // Fetch user Slack and email information.
   const { userSettings } = useUserSettings();
   const { slackUsername } = userSettings || {};
-  const { data: userData } = useQuery<UserQuery>(GET_USER);
+  const { data: userData } = useQuery<UserQuery>(USER);
   const { user } = userData || {};
   const { emailAddress } = user || {};
 

diff --git a/src/components/PatchActionButtons/ScheduleTasks/testData.ts b/src/components/PatchActionButtons/ScheduleTasks/testData.ts
@@ -2,7 +2,7 @@ import {
   UndispatchedTasksQuery,
   UndispatchedTasksQueryVariables,
 } from "gql/generated/types";
-import { GET_UNSCHEDULED_TASKS } from "gql/queries";
+import { UNSCHEDULED_TASKS } from "gql/queries";
 import { ApolloMock } from "types/gql";
 
 const mocks: ApolloMock<
@@ -11,7 +11,7 @@ const mocks: ApolloMock<
 >[] = [
   {
     request: {
-      query: GET_UNSCHEDULED_TASKS,
+      query: UNSCHEDULED_TASKS,
       variables: { versionId: "version" },
     },
     result: {
@@ -142,7 +142,7 @@ const mocks: ApolloMock<
   },
   {
     request: {
-      query: GET_UNSCHEDULED_TASKS,
+      query: UNSCHEDULED_TASKS,
       variables: { versionId: "emptyVersion" },
     },
     result: {

diff --git a/src/components/ProjectSelect/ProjectSelect.test.tsx b/src/components/ProjectSelect/ProjectSelect.test.tsx
@@ -7,7 +7,7 @@ import {
   ViewableProjectRefsQuery,
   ViewableProjectRefsQueryVariables,
 } from "gql/generated/types";
-import { GET_PROJECTS, GET_VIEWABLE_PROJECTS } from "gql/queries";
+import { PROJECTS, VIEWABLE_PROJECTS } from "gql/queries";
 import { renderWithRouterMatch, screen, userEvent, waitFor } from "test_utils";
 import { ApolloMock } from "types/gql";
 
@@ -257,7 +257,7 @@ describe("projectSelect", () => {
 const getProjectsMock: [ApolloMock<ProjectsQuery, ProjectsQueryVariables>] = [
   {
     request: {
-      query: GET_PROJECTS,
+      query: PROJECTS,
     },
     result: {
       data: {
@@ -357,7 +357,7 @@ const getViewableProjectsMock: [
 ] = [
   {
     request: {
-      query: GET_VIEWABLE_PROJECTS,
+      query: VIEWABLE_PROJECTS,
     },
     result: {
       data: {
@@ -438,7 +438,7 @@ const noDisabledProjectsMock: [
 ] = [
   {
     request: {
-      query: GET_VIEWABLE_PROJECTS,
+      query: VIEWABLE_PROJECTS,
     },
     result: {
       data: {