[PR #12] [MERGED] Dev #75

New issue

Closed

opened 2026-05-06 12:18:36 +02:00 by BreizhHardware · 0 comments

BreizhHardware commented

2026-05-06 12:18:36 +02:00

Owner

📋 Pull Request Information

Original PR: https://github.com/BreizhHardware/Site-comptage-heure/pull/12
Author: @BreizhHardware
Created: 10/25/2025
Status: ✅ Merged
Merged: 10/25/2025
Merged by: @BreizhHardware

Base: main ← Head: dev

📝 Commits (10+)

df0181d build(deps-dev): bump tailwindcss from 4.1.14 to 4.1.15
433ba37 build(deps-dev): bump @tailwindcss/postcss from 4.1.14 to 4.1.15
13c7a22 build(deps-dev): bump @types/node from 20.19.22 to 24.9.0
52ada37 Merge pull request #9 from BreizhHardware/dependabot/npm_and_yarn/dev/tailwindcss-4.1.15
eafed4a Merge pull request #10 from BreizhHardware/dependabot/npm_and_yarn/dev/tailwindcss/postcss-4.1.15
110d890 Merge pull request #11 from BreizhHardware/dependabot/npm_and_yarn/dev/types/node-24.9.0
ca87e7c chore: update pull request trigger branches in CI
5bdeb46 build(deps): bump node from 22-alpine to 25-alpine
d2790f9 Merge pull request #1 from BreizhHardware/dependabot/docker/node-25-alpine
35d3cae feat: extend user role access to include ADMIN for fetching users and route access

📊 Changes

8 files changed (+2260 additions, -932 deletions)

View changed files

📝 .github/workflows/ci.yml (+1 -1)
📝 Dockerfile (+1 -1)
📝 app/admin/page.tsx (+42 -31)
📝 app/api/users/route.ts (+4 -1)
📝 cypress/e2e/login.cy.ts (+7 -7)
📝 package.json (+11 -5)
📝 pnpm-lock.yaml (+2185 -884)
📝 tsconfig.json (+9 -2)

📄 Description

This pull request introduces several improvements across the codebase, focusing on expanding admin access, updating dependencies, and enhancing CI coverage. The most significant changes include broadening admin privileges, upgrading Node.js and related packages, and refining user role handling in the admin interface.

Access control and admin features:

Expanded access to the /api/users endpoint to include both ADMIN and SUPER_ADMIN roles, not just SUPER_ADMIN. (app/api/users/route.ts)
Updated the admin page to allow users with the ADMIN role to fetch users and access admin functionalities, not just those with SUPER_ADMIN role. (app/admin/page.tsx)
Improved role display logic in the admin user table to show more descriptive labels based on the current user's privileges and the user's role being displayed. (app/admin/page.tsx) [1] [2]

Dependency and environment updates:

Upgraded the Node.js base image from version 22-alpine to 25-alpine in the Dockerfile for improved performance and compatibility.
Updated several dependencies, including @types/node (from v20 to v24), @tailwindcss/postcss, and multiple lightningcss and tailwindcss packages to their latest versions. (package.json, pnpm-lock.yaml) [1] [2] [3] [4] [5] [6] [7] [8]

CI/CD improvements:

Modified the CI workflow to run on both main and dev branches, ensuring better test coverage during development. (.github/workflows/ci.yml)

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/BreizhHardware/Site-comptage-heure/pull/12 **Author:** [@BreizhHardware](https://github.com/BreizhHardware) **Created:** 10/25/2025 **Status:** ✅ Merged **Merged:** 10/25/2025 **Merged by:** [@BreizhHardware](https://github.com/BreizhHardware) **Base:** `main` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`df0181d`](https://github.com/BreizhHardware/Site-comptage-heure/commit/df0181d1dbf51ededcfd6cfe33d7e5b46b2ee049) build(deps-dev): bump tailwindcss from 4.1.14 to 4.1.15 - [`433ba37`](https://github.com/BreizhHardware/Site-comptage-heure/commit/433ba37fd6b8c6e9102d739b25066563198f9c56) build(deps-dev): bump @tailwindcss/postcss from 4.1.14 to 4.1.15 - [`13c7a22`](https://github.com/BreizhHardware/Site-comptage-heure/commit/13c7a228af06e312dc07374ced86882445d5cc25) build(deps-dev): bump @types/node from 20.19.22 to 24.9.0 - [`52ada37`](https://github.com/BreizhHardware/Site-comptage-heure/commit/52ada377d435369ec4c17bea0b2d98d7b9f7a182) Merge pull request #9 from BreizhHardware/dependabot/npm_and_yarn/dev/tailwindcss-4.1.15 - [`eafed4a`](https://github.com/BreizhHardware/Site-comptage-heure/commit/eafed4a637a70d8a13086e7c69a1ef021ac4280e) Merge pull request #10 from BreizhHardware/dependabot/npm_and_yarn/dev/tailwindcss/postcss-4.1.15 - [`110d890`](https://github.com/BreizhHardware/Site-comptage-heure/commit/110d8900462caae5ed8409555ca4ac2704ade4c5) Merge pull request #11 from BreizhHardware/dependabot/npm_and_yarn/dev/types/node-24.9.0 - [`ca87e7c`](https://github.com/BreizhHardware/Site-comptage-heure/commit/ca87e7cde38f90662219b93c8092321752e03cdd) chore: update pull request trigger branches in CI - [`5bdeb46`](https://github.com/BreizhHardware/Site-comptage-heure/commit/5bdeb46bb602707d4f8c3b8bdfeae092f7bfc635) build(deps): bump node from 22-alpine to 25-alpine - [`d2790f9`](https://github.com/BreizhHardware/Site-comptage-heure/commit/d2790f9877f7660a85c277a177a6845f7a8c01b2) Merge pull request #1 from BreizhHardware/dependabot/docker/node-25-alpine - [`35d3cae`](https://github.com/BreizhHardware/Site-comptage-heure/commit/35d3cae45db2db3a23a4d2b1b3af432b61304a0b) feat: extend user role access to include ADMIN for fetching users and route access ### 📊 Changes **8 files changed** (+2260 additions, -932 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/ci.yml` (+1 -1) 📝 `Dockerfile` (+1 -1) 📝 `app/admin/page.tsx` (+42 -31) 📝 `app/api/users/route.ts` (+4 -1) 📝 `cypress/e2e/login.cy.ts` (+7 -7) 📝 `package.json` (+11 -5) 📝 `pnpm-lock.yaml` (+2185 -884) 📝 `tsconfig.json` (+9 -2) </details> ### 📄 Description This pull request introduces several improvements across the codebase, focusing on expanding admin access, updating dependencies, and enhancing CI coverage. The most significant changes include broadening admin privileges, upgrading Node.js and related packages, and refining user role handling in the admin interface. **Access control and admin features:** * Expanded access to the `/api/users` endpoint to include both `ADMIN` and `SUPER_ADMIN` roles, not just `SUPER_ADMIN`. (`app/api/users/route.ts`) * Updated the admin page to allow users with the `ADMIN` role to fetch users and access admin functionalities, not just those with `SUPER_ADMIN` role. (`app/admin/page.tsx`) * Improved role display logic in the admin user table to show more descriptive labels based on the current user's privileges and the user's role being displayed. (`app/admin/page.tsx`) [[1]](diffhunk://#diff-a7c2b21269eaaa6f291a758c44939732a9f1d9fe8e0d71a3a7822b813a196f43L511-R512) [[2]](diffhunk://#diff-a7c2b21269eaaa6f291a758c44939732a9f1d9fe8e0d71a3a7822b813a196f43R543-R545) **Dependency and environment updates:** * Upgraded the Node.js base image from version 22-alpine to 25-alpine in the `Dockerfile` for improved performance and compatibility. * Updated several dependencies, including `@types/node` (from v20 to v24), `@tailwindcss/postcss`, and multiple `lightningcss` and `tailwindcss` packages to their latest versions. (`package.json`, `pnpm-lock.yaml`) [[1]](diffhunk://#diff-7ae45ad102eab3b6d7e7896acd08c427a9b25b346470d7bc6507b6481575d519L48-R48) [[2]](diffhunk://#diff-32824c984905bb02bc7ffcef96a77addd1f1602cff71a11fbbfdd7f53ee026bbL98-R104) [[3]](diffhunk://#diff-32824c984905bb02bc7ffcef96a77addd1f1602cff71a11fbbfdd7f53ee026bbL119-R119) [[4]](diffhunk://#diff-32824c984905bb02bc7ffcef96a77addd1f1602cff71a11fbbfdd7f53ee026bbL659-R713) [[5]](diffhunk://#diff-32824c984905bb02bc7ffcef96a77addd1f1602cff71a11fbbfdd7f53ee026bbL756-R753) [[6]](diffhunk://#diff-32824c984905bb02bc7ffcef96a77addd1f1602cff71a11fbbfdd7f53ee026bbL1377-R1436) [[7]](diffhunk://#diff-32824c984905bb02bc7ffcef96a77addd1f1602cff71a11fbbfdd7f53ee026bbR1972-R1974) [[8]](diffhunk://#diff-32824c984905bb02bc7ffcef96a77addd1f1602cff71a11fbbfdd7f53ee026bbL2050-R2040) **CI/CD improvements:** * Modified the CI workflow to run on both `main` and `dev` branches, ensuring better test coverage during development. (`.github/workflows/ci.yml`) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>