Merge remote-tracking branch 'origin/main' into accessibility-RG

.github/workflows/end-to-end-testing-dataset-browser.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Install Playwright Browsers
       run: npx playwright install --with-deps
     - name: Wait for a successful Vercel Preview
-      uses: patrickedqvist/[email protected].1
+      uses: patrickedqvist/[email protected].2
       id: waitForVercelPreviewDeployment
       with:
         token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/end-to-end-testing-researcher.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Install Playwright Browsers
       run: npx playwright install --with-deps
     - name: Wait for a successful Vercel Preview
-      uses: patrickedqvist/[email protected].1
+      uses: patrickedqvist/[email protected].2
       id: waitForVercelPreviewDeployment
       with:
         token: ${{ secrets.GITHUB_TOKEN }}

apps/dataset-browser/package.json

@@ -33,7 +33,7 @@
     "@next/mdx": "14.2.3",
     "classnames": "2.5.1",
     "next": "14.2.3",
-    "next-intl": "3.15.0",
+    "next-intl": "3.15.2",
     "react": "18.3.1",
     "react-dom": "18.2.0",
     "zod": "3.22.4",

apps/researcher/e2e/object-list.test.ts

@@ -126,7 +126,7 @@ test.describe('Object list page logged in', () => {
     await gotoSignedIn(objectUrl);
     await page.getByTestId('popover-menu-button').hover();
     await page.getByTestId(`object-list-${listId}`).click();
-    await expect(page.getByTestId('notification')).toHaveCount(2);
+    await expect(page.getByTestId('notification')).toHaveCount(3);
     await page.goto(`/en/communities/${community.slug}/${listId}`);
     await expect(page.getByTestId('object-card')).toHaveCount(1);
   });

apps/researcher/e2e/object.test.ts

@@ -86,15 +86,15 @@ test.describe('Object details page logged in', () => {
       .getByTestId('enrichment-form')
       .locator('textarea[name="citation"]')
       .fill('End to end test');
-    await page
-      .getByTestId('enrichment-form')
-      .locator('input[name="agreedToLicense"]')
-      .check();
+    await page.getByTestId('agreed-to-license').click();
+    await page.getByTestId('community-selector').click();
+    page.keyboard.press('ArrowDown');
+    page.keyboard.press('Enter');
     await page
       .getByTestId('enrichment-form')
       .locator('button[type="submit"]')
       .click();
-    await expect(page.getByTestId('notification')).toHaveCount(2, {
+    await expect(page.getByTestId('notification')).toHaveCount(3, {
       timeout: 30000,
     });
 

apps/researcher/package.json

@@ -36,7 +36,7 @@
     "@colonial-collections/ui": "*",
     "@headlessui/react": "2.0.4",
     "@heroicons/react": "2.1.3",
-    "@hookform/resolvers": "3.3.4",
+    "@hookform/resolvers": "3.6.0",
     "@next/mdx": "14.2.3",
     "classnames": "2.5.1",
     "edtf": "4.6.0",
@@ -45,7 +45,7 @@
     "leaflet": "1.9.4",
     "leaflet-defaulticon-compatibility": "0.1.2",
     "next": "14.2.3",
-    "next-intl": "3.15.0",
+    "next-intl": "3.15.2",
     "next-mdx-remote": "5.0.0",
     "openseadragon": "4.1.1",
     "react": "18.3.1",
@@ -70,7 +70,7 @@
     "@jest/globals": "29.7.0",
     "@next/env": "14.1.0",
     "@playwright/test": "1.43.1",
-    "@types/leaflet": "1.9.8",
+    "@types/leaflet": "1.9.12",
     "@types/mdx": "2.0.13",
     "@types/node": "20.12.12",
     "@types/openseadragon": "3.0.10",

apps/researcher/src/app/[locale]/communities/[slug]/[listId]/page.tsx

@@ -85,7 +85,7 @@ export default async function Page({params}: Props) {
               <SlideOutClosed id={slideOutEditId}>
                 <div className="block">
                   <div className="flex flex-col md:flex-row justify-between">
-                    <h1 className="text-2xl md:text-4xl mb-4">
+                    <h1 className="text-2xl md:text-4xl mb-4" tabIndex={0}>
                       {objectList.name}
                     </h1>
                     <div>
@@ -182,7 +182,7 @@ export default async function Page({params}: Props) {
           ) : (
             <>
               <div className="flex flex-col md:flex-row md:justify-between md:items-center mt-4">
-                <h2 className="text-xl">
+                <h2 className="text-xl" tabIndex={0}>
                   {t('objectCount', {count: objectList.objects.length})}
                 </h2>
               </div>

apps/researcher/src/app/[locale]/communities/[slug]/page.tsx

@@ -106,7 +106,10 @@ export default async function CommunityPage({params}: Props) {
         <div className="w-full px-4 sm:px-10 max-w-[1800px] mx-auto pt-4 pb-10 md:pt-10 md:pb-16 xl:pt-16 xl:pb-20 flex flex-col lg:flex-row gap-10">
           <SlideOutClosed id={slideOutEditFormId}>
             <main className="w-full lg:w-2/3 xl:w-3/4">
-              <h1 className="text-2xl md:text-3xl lg:text-4xl 2xl:text-5xl max-w-5xl inline-flex gap-2">
+              <h1
+                className="text-2xl md:text-3xl lg:text-4xl 2xl:text-5xl max-w-5xl inline-flex gap-2"
+                tabIndex={0}
+              >
                 <span className="font-normal">{t('title')}</span>
                 <span data-testid="community-name">{community.name}</span>
               </h1>
@@ -147,7 +150,13 @@ export default async function CommunityPage({params}: Props) {
         <div className="w-full md:w-3/4">
           <div className="flex justify-between my-4">
             <div>
-              <h2 className="text-xl">{t('objectListsTitle')}</h2>
+              <h2
+                className="text-xl"
+                tabIndex={0}
+                arial-label={t('accessibilityObjectListsTitle')}
+              >
+                {t('objectListsTitle')}
+              </h2>
               {objectLists.length > 0 && (
                 <p>{t('objectListsSubTitle', {count: objectLists.length})}</p>
               )}

apps/researcher/src/app/[locale]/communities/page.tsx

@@ -71,7 +71,9 @@ export default async function CommunitiesPage({searchParams = {}}: Props) {
       <div className="bg-consortium-green-300 text-consortium-blue-800 py-10 md:py-20 grow">
         <div className="flex flex-col md:flex-row gap-4 md:gap-20 w-full max-w-[1800px] mx-auto px-4 sm:px-10">
           <div className="flex flex-col gap-4 w-full md:w-3/5 max-w-md">
-            <h1 className="text-2xl md:text-4xl">{t('title')}</h1>
+            <h1 className="text-2xl md:text-4xl" tabIndex={0}>
+              {t('title')}
+            </h1>
 
             <div className="">
               <p>{t('pageDescription')}</p>