Merge branch 'main' into dependabot/github_actions/docker/build-push-…

…action-5
nordeck · Oct 18, 2023 · 697e867 · 697e867
2 parents aa7250a + bfcb1cb
commit 697e867
Show file tree

Hide file tree

Showing 13 changed files with 216 additions and 215 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,18 +53,18 @@ jobs:
         run: yarn generate-disclaimer
 
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Generate Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         env:
           DOCKER_METADATA_PR_HEAD_SHA: true
         with:
@@ -132,18 +132,18 @@ jobs:
         run: yarn generate-disclaimer
 
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Generate Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         env:
           DOCKER_METADATA_PR_HEAD_SHA: true
         with:
@@ -192,7 +192,7 @@ jobs:
 
       - name: Generate GitHub token
         id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
         with:
           app_id: ${{ secrets.GH_APP_OS_APP_ID }}
           private_key: ${{ secrets.GH_APP_OS_PRIVATE_KEY }}
@@ -276,7 +276,7 @@ jobs:
     steps:
       - name: Generate GitHub token
         id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 # @v1.8.0
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # @v2.1.0
         with:
           app_id: ${{ secrets.GH_APP_OS_APP_ID }}
           private_key: ${{ secrets.GH_APP_OS_PRIVATE_KEY }}

diff --git a/.github/workflows/publish-release-bot.yml b/.github/workflows/publish-release-bot.yml
@@ -17,15 +17,15 @@ jobs:
     steps:
       - name: Generate Docker metadata of the existing image
         id: meta-existing-tag
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.DOCKER_IMAGE }}
           tags: |
             type=sha,prefix=
 
       - name: Generate Docker metadata of the new image
         id: meta-new-tags
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.DOCKER_IMAGE }}
           labels: |
@@ -42,14 +42,14 @@ jobs:
           echo "FROM $SOURCE_IMAGE" > Dockerfile
 
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and push
         uses: docker/build-push-action@v5

diff --git a/.github/workflows/publish-release-widget.yml b/.github/workflows/publish-release-widget.yml
@@ -17,15 +17,15 @@ jobs:
     steps:
       - name: Generate Docker metadata of the existing image
         id: meta-existing-tag
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.DOCKER_IMAGE }}
           tags: |
             type=sha,prefix=
 
       - name: Generate Docker metadata of the new image
         id: meta-new-tags
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.DOCKER_IMAGE }}
           labels: |
@@ -42,14 +42,14 @@ jobs:
           echo "FROM $SOURCE_IMAGE" > Dockerfile
 
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and push
         uses: docker/build-push-action@v5

diff --git a/e2e/src/pages/helper.ts b/e2e/src/pages/helper.ts
@@ -56,8 +56,8 @@ export async function fillDate(
   await pickerModal
     .getByRole('button', { name: /switch to year view/ })
     .click();
-  await pickerModal.getByRole('button', { name: `${year}` }).click();
-  await pickerModal.getByRole('button', { name: `${monthLabel}` }).click();
+  await pickerModal.getByRole('radio', { name: `${year}` }).click();
+  await pickerModal.getByRole('radio', { name: `${monthLabel}` }).click();
 
   if (day !== undefined) {
     // There might be a transition between two month views, therefore we wait

diff --git a/matrix-meetings-bot/package.json b/matrix-meetings-bot/package.json
@@ -31,32 +31,32 @@
     "yarn": ">=1.22.1 <2.0.0"
   },
   "dependencies": {
-    "@nestjs/common": "^10.2.4",
-    "@nestjs/config": "^3.0.1",
-    "@nestjs/core": "^10.2.4",
-    "@nestjs/microservices": "^10.2.4",
-    "@nestjs/platform-express": "^10.2.4",
-    "@nestjs/swagger": "^7.1.10",
+    "@nestjs/common": "^10.2.7",
+    "@nestjs/config": "^3.1.1",
+    "@nestjs/core": "^10.2.7",
+    "@nestjs/microservices": "^10.2.7",
+    "@nestjs/platform-express": "^10.2.7",
+    "@nestjs/swagger": "^7.1.13",
     "@supercharge/promise-pool": "^3.0.0",
     "base64url": "^3.0.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
     "express": "^4.17.1",
     "html-entities": "^2.4.0",
     "i18next": "^23.4.5",
-    "i18next-fs-backend": "^2.1.5",
-    "i18next-http-middleware": "^3.3.2",
-    "joi": "^17.10.2",
+    "i18next-fs-backend": "^2.2.0",
+    "joi": "^17.11.0",
+    "i18next-http-middleware": "^3.4.1",
     "lodash": "^4.17.20",
     "luxon": "^3.3.0",
     "matrix-bot-sdk": "^0.6.6",
     "mime-types": "^2.1.35",
     "moment-timezone": "^0.5.43",
     "mustache": "^4.2.0",
-    "nestjs-pino": "^3.4.0",
+    "nestjs-pino": "^3.5.0",
     "node-fetch": "^2.7.0",
-    "pino": "^8.15.1",
-    "pino-http": "^8.4.0",
+    "pino": "^8.16.0",
+    "pino-http": "^8.5.0",
     "reflect-metadata": "^0.1.13",
     "rfc4648": "^1.5.2",
     "rrule": "^2.7.2",

diff --git a/matrix-meetings-widget/package.json b/matrix-meetings-widget/package.json
@@ -6,33 +6,33 @@
   "version": "1.5.0",
   "private": true,
   "dependencies": {
-    "@fullcalendar/core": "^6.1.8",
-    "@fullcalendar/daygrid": "^6.1.8",
-    "@fullcalendar/interaction": "^6.1.8",
-    "@fullcalendar/react": "^6.1.8",
-    "@fullcalendar/timegrid": "^6.1.8",
+    "@fullcalendar/core": "^6.1.9",
+    "@fullcalendar/daygrid": "^6.1.9",
+    "@fullcalendar/interaction": "^6.1.9",
+    "@fullcalendar/react": "^6.1.9",
+    "@fullcalendar/timegrid": "^6.1.9",
     "@matrix-widget-toolkit/api": "^3.2.1",
     "@matrix-widget-toolkit/mui": "^1.1.5",
     "@matrix-widget-toolkit/react": "^1.0.5",
     "@mui/icons-material": "^5.11.16",
     "@mui/lab": "^5.0.0-alpha.140",
     "@mui/material": "^5.13.4",
-    "@mui/utils": "^5.13.1",
-    "@mui/x-date-pickers": "^6.13.0",
-    "@reduxjs/toolkit": "^1.9.5",
+    "@mui/x-date-pickers": "^6.16.2",
+    "@mui/utils": "^5.14.13",
+    "@reduxjs/toolkit": "^1.9.7",
     "i18next": "^23.4.5",
-    "i18next-chained-backend": "^4.4.0",
+    "i18next-chained-backend": "^4.5.0",
     "i18next-http-backend": "^2.2.2",
-    "joi": "^17.10.2",
+    "joi": "^17.11.0",
     "lodash": "^4.17.20",
     "luxon": "^3.3.0",
     "matrix-widget-api": "^1.5.0",
     "mustache": "^4.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-i18next": "^13.2.0",
-    "react-redux": "^8.1.2",
-    "react-router-dom": "^6.15.0",
+    "react-redux": "^8.1.3",
+    "react-router-dom": "^6.16.0",
     "react-use": "^17.4.0",
     "redux": "^4.2.1",
     "reselect": "^4.1.8",

diff --git a/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarDayPicker.test.tsx b/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarDayPicker.test.tsx
@@ -104,8 +104,10 @@ describe('<CalendarDayPicker>', () => {
       }),
     );
 
-    await userEvent.click(within(dialog).getByRole('button', { name: '2023' }));
-    await userEvent.click(within(dialog).getByRole('button', { name: 'Jan' }));
+    await userEvent.click(within(dialog).getByRole('radio', { name: '2023' }));
+    await userEvent.click(
+      within(dialog).getByRole('radio', { name: 'January' }),
+    );
     await userEvent.click(within(dialog).getByRole('gridcell', { name: '13' }));
 
     expect(onRangeChange).toBeCalledTimes(1);

diff --git a/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarMonthPicker.test.tsx b/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarMonthPicker.test.tsx
@@ -104,8 +104,8 @@ describe('<CalendarMonthPicker>', () => {
       }),
     );
 
-    await userEvent.click(within(dialog).getByRole('button', { name: '2023' }));
-    await userEvent.click(within(dialog).getByRole('button', { name: 'Mar' }));
+    await userEvent.click(within(dialog).getByRole('radio', { name: '2023' }));
+    await userEvent.click(within(dialog).getByRole('radio', { name: 'March' }));
 
     expect(onRangeChange).toBeCalledTimes(1);
     expect(onRangeChange).toHaveBeenLastCalledWith(

diff --git a/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarWeekPicker.test.tsx b/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarWeekPicker.test.tsx
@@ -104,8 +104,10 @@ describe('<CalendarWeekPicker>', () => {
       }),
     );
 
-    await userEvent.click(within(dialog).getByRole('button', { name: '2023' }));
-    await userEvent.click(within(dialog).getByRole('button', { name: 'Jan' }));
+    await userEvent.click(within(dialog).getByRole('radio', { name: '2023' }));
+    await userEvent.click(
+      within(dialog).getByRole('radio', { name: 'January' }),
+    );
     await userEvent.click(within(dialog).getByRole('gridcell', { name: '13' }));
 
     expect(onRangeChange).toBeCalledTimes(1);

diff --git a/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarWorkWeekPicker.test.tsx b/matrix-meetings-widget/src/components/common/DateTimePickers/CalendarWorkWeekPicker.test.tsx
@@ -103,8 +103,10 @@ describe('<CalendarWorkWeekPicker>', () => {
       }),
     );
 
-    await userEvent.click(within(dialog).getByRole('button', { name: '2023' }));
-    await userEvent.click(within(dialog).getByRole('button', { name: 'Jan' }));
+    await userEvent.click(within(dialog).getByRole('radio', { name: '2023' }));
+    await userEvent.click(
+      within(dialog).getByRole('radio', { name: 'January' }),
+    );
     await userEvent.click(within(dialog).getByRole('gridcell', { name: '13' }));
 
     expect(onRangeChange).toBeCalledTimes(1);

diff --git a/matrix-meetings-widget/src/components/common/DateTimePickers/DateRangePicker.test.tsx b/matrix-meetings-widget/src/components/common/DateTimePickers/DateRangePicker.test.tsx
@@ -132,8 +132,8 @@ describe('<DateRangePicker>', () => {
       }),
     );
 
-    await userEvent.click(screen.getByRole('button', { name: '2022' }));
-    await userEvent.click(screen.getByRole('button', { name: 'Jan' }));
+    await userEvent.click(screen.getByRole('radio', { name: '2022' }));
+    await userEvent.click(screen.getByRole('radio', { name: 'January' }));
     await userEvent.click(screen.getByRole('gridcell', { name: '13' }));
 
     await userEvent.click(screen.getByRole('gridcell', { name: '20' }));
@@ -166,8 +166,8 @@ describe('<DateRangePicker>', () => {
       }),
     );
 
-    await userEvent.click(screen.getByRole('button', { name: '2022' }));
-    await userEvent.click(screen.getByRole('button', { name: 'Jan' }));
+    await userEvent.click(screen.getByRole('radio', { name: '2022' }));
+    await userEvent.click(screen.getByRole('radio', { name: 'January' }));
     await userEvent.click(screen.getByRole('gridcell', { name: '15' }));
 
     await userEvent.keyboard('{escape}');
@@ -205,8 +205,8 @@ describe('<DateRangePicker>', () => {
       }),
     );
 
-    await userEvent.click(screen.getByRole('button', { name: '2022' }));
-    await userEvent.click(screen.getByRole('button', { name: 'Jan' }));
+    await userEvent.click(screen.getByRole('radio', { name: '2022' }));
+    await userEvent.click(screen.getByRole('radio', { name: 'January' }));
     await userEvent.click(screen.getByRole('gridcell', { name: '15' }));
 
     await userEvent.click(screen.getByRole('gridcell', { name: '15' }));
@@ -239,8 +239,8 @@ describe('<DateRangePicker>', () => {
       }),
     );
 
-    await userEvent.click(screen.getByRole('button', { name: '2022' }));
-    await userEvent.click(screen.getByRole('button', { name: 'Jan' }));
+    await userEvent.click(screen.getByRole('radio', { name: '2022' }));
+    await userEvent.click(screen.getByRole('radio', { name: 'January' }));
     await userEvent.click(screen.getByRole('gridcell', { name: '15' }));
 
     expect(screen.getByRole('gridcell', { name: '14' })).toBeDisabled();

diff --git a/matrix-meetings-widget/src/components/meetings/MeetingsFilter/MeetingsFilter.test.tsx b/matrix-meetings-widget/src/components/meetings/MeetingsFilter/MeetingsFilter.test.tsx
@@ -81,8 +81,8 @@ describe('<MeetingsFilter/>', () => {
       }),
     );
 
-    await userEvent.click(screen.getByRole('button', { name: '2022' }));
-    await userEvent.click(screen.getByRole('button', { name: 'Jan' }));
+    await userEvent.click(screen.getByRole('radio', { name: '2022' }));
+    await userEvent.click(screen.getByRole('radio', { name: 'January' }));
     await userEvent.click(screen.getByRole('gridcell', { name: '13' }));
 
     await userEvent.click(screen.getByRole('gridcell', { name: '20' }));