Merge branch 'main' into 10368-remove-teams-ui

.github/workflows/phpunit.yml

@@ -68,6 +68,6 @@ jobs:
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: coverage.xml
+          files: coverage.xml
           flags: integrationtests
           fail_ci_if_error: false

api/app/Models/Classification.php

@@ -59,7 +59,7 @@ protected function displayName(): Attribute
 
     /**
      * Used to limit the results for the search page input
-     * to IT up to level 5 and PM up to level 6 and CR level 4
+     * to IT up to level 5; PM up to level 6; CR level 4; EX level 3, EX level 4.
      *
      * TODO: Update in #9483 to derive from new column
      */
@@ -75,6 +75,10 @@ public static function scopeAvailableInSearch(Builder $query, bool $availableInS
             $query->where('group', 'PM')->where('level', '<=', 6);
         })->orWhere(function ($query) {
             $query->where('group', 'CR')->where('level', '=', 4);
+        })->orWhere(function ($query) {
+            $query->where('group', 'EX')->where('level', '=', 3);
+        })->orWhere(function ($query) {
+            $query->where('group', 'EX')->where('level', '=', 4);
         });
     }
 }

api/database/seeders/ClassificationSeeder.php

@@ -256,6 +256,14 @@ public function run()
                     'max_salary' => 198939,
                 ]
             ),
+            array_merge(
+                $exGroup,
+                [
+                    'level' => 4,
+                    'min_salary' => 193896,
+                    'max_salary' => 228114,
+                ]
+            ),
             array_merge(
                 $crGroup,
                 [

api/graphql/schema.graphql

@@ -234,7 +234,6 @@ type GeneralQuestion {
   pool: Pool @belongsTo
   question: LocalizedString
   sortOrder: Int @rename(attribute: "sort_order")
-  # generalQuestionResponses: [GeneralQuestionResponse] @hasMany # TODO: uncomment this and add sensible permission check
 }
 
 type ScreeningQuestion {

apps/web/package.json

@@ -54,15 +54,15 @@
     "@tanstack/react-table": "^8.20.6",
     "dataloader": "^2.2.3",
     "date-fns": "^3.6.0",
-    "framer-motion": "^11.15.0",
     "graphql": "^16.10.0",
     "lodash": "^4.17.21",
+    "motion": "^11.15.0",
     "react": "^18.3.1",
     "react-dom": "^18.2.0",
     "react-helmet-async": "^2.0.5",
-    "react-hook-form": "^7.54.1",
+    "react-hook-form": "^7.54.2",
     "react-intl": "^7.0.4",
-    "react-router": "^7.0.2",
+    "react-router": "^7.1.1",
     "react-to-print": "^2.15.1",
     "urql": "^4.2.1"
   },
@@ -98,7 +98,7 @@
     "ts-node": "^10.9.2",
     "tsconfig": "workspace:*",
     "typescript": "^5.7.2",
-    "vite": "^6.0.4",
+    "vite": "^6.0.5",
     "vite-plugin-compression2": "^1.3.3",
     "vite-plugin-html": "^3.2.2"
   }

apps/web/src/components/Context/ContextProvider.tsx

@@ -1,5 +1,5 @@
 import { HelmetProvider } from "react-helmet-async";
-import { MotionConfig, LazyMotion, domAnimation } from "framer-motion";
+import { MotionConfig, LazyMotion, domAnimation } from "motion/react";
 import { ReactNode } from "react";
 
 import { AppInsightsProvider } from "@gc-digital-talent/app-insights";

apps/web/src/components/Layout/IAPLayout.tsx

@@ -2,7 +2,7 @@ import { Fragment } from "react";
 import { useIntl } from "react-intl";
 import { useLocation, Outlet, ScrollRestoration } from "react-router";
 import { ApplicationInsights } from "@microsoft/applicationinsights-web";
-import { AnimatePresence } from "framer-motion";
+import { AnimatePresence } from "motion/react";
 
 import {
   NestedLanguageProvider,

apps/web/src/components/NotificationDialog/NotificationDialog.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState } from "react";
 import { useIntl } from "react-intl";
-import { AnimatePresence, m, usePresence } from "framer-motion";
+import { AnimatePresence, m, usePresence } from "motion/react";
 import BellAlertIcon from "@heroicons/react/24/outline/BellAlertIcon";
 import BellAlertIconSm from "@heroicons/react/20/solid/BellAlertIcon";
 import XMarkIcon from "@heroicons/react/20/solid/XMarkIcon";

apps/web/src/components/PoolCandidatesTable/tableMessages.ts

@@ -7,8 +7,8 @@ const messages = defineMessages({
     id: "/LGiVB",
   },
   candidateName: {
-    defaultMessage: "Candidate Name",
-    id: "p/Qp/u",
+    defaultMessage: "Candidate name",
+    id: "awEvCF",
     description: "Title displayed on the Pool Candidates table name column.",
   },
   skillCount: {
@@ -23,10 +23,10 @@ const messages = defineMessages({
       "Title displayed on the Pool Candidates table Current Location column.",
   },
   dateReceived: {
-    defaultMessage: "Date Received",
-    id: "3eNQnt",
+    defaultMessage: "Date received",
+    id: "fI0idr",
     description:
-      "Title displayed on the Pool Candidates table Date Received column.",
+      "Title displayed on the Pool Candidates table Date received column.",
   },
   rowSelection: {
     defaultMessage: "Row Selection",

apps/web/src/components/SearchRequestFilters/FilterBlock.tsx

@@ -5,8 +5,6 @@ import isArray from "lodash/isArray";
 import { ReactNode } from "react";
 
 import { Maybe } from "@gc-digital-talent/graphql";
-import { commonMessages } from "@gc-digital-talent/i18n";
-
 interface FilterBlockProps {
   title: string;
   content?: Maybe<string | ReactNode> | Maybe<string[]>;
@@ -49,8 +47,6 @@ const FilterBlockContent = ({
 };
 
 const FilterBlock = ({ title, content }: FilterBlockProps) => {
-  const intl = useIntl();
-
   return (
     <div data-h2-padding="base(0, 0, x1, 0)">
       <p
@@ -59,9 +55,6 @@ const FilterBlock = ({ title, content }: FilterBlockProps) => {
         data-h2-font-weight="base(600)"
       >
         <span data-h2-display="base(inline)">{title}</span>
-        <span data-h2-display="base(none) p-tablet(inline)">
-          {intl.formatMessage(commonMessages.dividingColon)}
-        </span>
       </p>
       <FilterBlockContent content={content} />
     </div>

apps/web/src/components/SearchRequestFilters/SearchRequestFilters.tsx

@@ -230,8 +230,8 @@ const ApplicantFilters = ({
           <FilterBlock
             title={intl.formatMessage({
               defaultMessage:
-                "Conditions of employment / Operational requirements",
-              id: "cMsRgt",
+                "Conditions of employment or operational requirements",
+              id: "SNxTm+",
               description:
                 "Title for operational requirements section on summary of filters section",
             })}
@@ -430,8 +430,8 @@ const SearchRequestFilters = ({
               <FilterBlock
                 title={intl.formatMessage({
                   defaultMessage:
-                    "Conditions of employment / Operational requirements",
-                  id: "cMsRgt",
+                    "Conditions of employment or operational requirements",
+                  id: "SNxTm+",
                   description:
                     "Title for operational requirements section on summary of filters section",
                 })}

apps/web/src/components/SearchRequestTable/SearchRequestTable.tsx

@@ -330,8 +330,8 @@ const SearchRequestTable = ({ title }: SearchRequestTableProps) => {
         id: "requestedDate",
         enableColumnFilter: false,
         header: intl.formatMessage({
-          defaultMessage: "Date Received",
-          id: "r2gD/4",
+          defaultMessage: "Date received",
+          id: "m0Qcow",
           description:
             "Title displayed on the search request table requested date column.",
         }),

apps/web/src/components/SelfDeclaration/CommunityIcon.tsx

@@ -1,4 +1,4 @@
-import { AnimatePresence, m } from "framer-motion";
+import { AnimatePresence, m } from "motion/react";
 import { useFormContext } from "react-hook-form";
 
 import firstNationsOn from "~/assets/img/first-nations-true.webp";

apps/web/src/components/SpinnerIcon/SpinnerIcon.tsx

@@ -1,4 +1,4 @@
-import { m, useReducedMotion } from "framer-motion";
+import { m, useReducedMotion } from "motion/react";
 import ArrowPathIcon from "@heroicons/react/20/solid/ArrowPathIcon";
 
 import { IconProps } from "@gc-digital-talent/ui";