Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions .github/workflows/job-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,32 @@ jobs:
sudo apt-get update -qq
sudo apt-get install -y --no-install-recommends nginx gettext-base
# Préparer un répertoire de test isolé avec la config substituée
mkdir -p /tmp/nginx-test/conf.d /tmp/nginx-test/logs
mkdir -p /tmp/nginx-test/server_blocks /tmp/nginx-test/logs
envsubst '${LEGACY_UPSTREAM} ${NESTJS_UPSTREAM}' \
< apps/nginx-strangler/conf.d/routing.conf \
> /tmp/nginx-test/conf.d/routing.conf
# Adapter nginx.conf pour l'environnement CI (user www-data, paths accessibles)
sed \
-e 's|^user .*|user www-data;|' \
-e 's|pid .*|pid /tmp/nginx-test/nginx.pid;|' \
-e 's|error_log .*|error_log /tmp/nginx-test/logs/error.log notice;|' \
-e 's|access_log .*|access_log /tmp/nginx-test/logs/access.log main;|' \
-e 's|include /etc/nginx/conf\.d/\*\.conf|include /tmp/nginx-test/conf.d/*.conf|' \
apps/nginx-strangler/nginx.conf > /tmp/nginx-test/nginx.conf
> /tmp/nginx-test/server_blocks/routing.conf
# Créer un nginx.conf minimal pour la validation
cat > /tmp/nginx-test/nginx.conf <<'EOF'
user www-data;
worker_processes auto;
pid /tmp/nginx-test/nginx.pid;
error_log /tmp/nginx-test/logs/error.log notice;
events {
worker_connections 1024;
}
http {
include /etc/nginx/mime.types;
default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for" '
'upstream=$upstream_addr rt=$request_time';
access_log /tmp/nginx-test/logs/access.log main;
sendfile on;
keepalive_timeout 65;
include /tmp/nginx-test/server_blocks/*.conf;
}
EOF
nginx -t -c /tmp/nginx-test/nginx.conf
env:
LEGACY_UPSTREAM: "127.0.0.1:8080"
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "9.16.1"
".": "9.16.3"
}
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## [9.16.3](https://github.com/cloud-pi-native/console/compare/v9.16.2...v9.16.3) (2026-05-21)


### Miscellaneous Chores

* **client:** explicitely add eslint as a devDep ([804c7d4](https://github.com/cloud-pi-native/console/commit/804c7d4058854bc3a53a0af570e07805434a7df3))
* **client:** fix custom role management ([918e9cc](https://github.com/cloud-pi-native/console/commit/918e9ccb2e622d2fb6d8fb7cee48dac43aef3cb0))

## [9.16.2](https://github.com/cloud-pi-native/console/compare/v9.16.1...v9.16.2) (2026-05-20)


### Bug Fixes

* use bitnami image for strangler ([1c0ea16](https://github.com/cloud-pi-native/console/commit/1c0ea169ce221cb0bb7e73790b030032a8897260))

## [9.16.1](https://github.com/cloud-pi-native/console/compare/v9.16.0...v9.16.1) (2026-04-13)


Expand Down
1 change: 1 addition & 0 deletions apps/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"@vitest/coverage-v8": "^2.1.9",
"@vue/eslint-config-typescript": "^14.7.0",
"chalk": "^5.6.2",
"eslint": "^10.1.0",
"eslint-plugin-vue": "^10.8.0",
"jsdom": "^25.0.1",
"rimraf": "^6.1.3",
Expand Down
91 changes: 50 additions & 41 deletions apps/client/src/components/ProjectRoleForm.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<script lang="ts" setup>
import type { Member, ProjectRoleBigint, ProjectV2 } from '@cpn-console/shared'
import { isManagedRoleType, isSystemRoleType, PROJECT_PERMS, projectPermsDetails, shallowEqual } from '@cpn-console/shared'
import {
isManagedRoleType,
isSystemRoleType,
PROJECT_PERMS,
projectPermsDetails,
shallowEqual,
} from '@cpn-console/shared'
import { computed, ref } from 'vue'

const props = defineProps<{
Expand Down Expand Up @@ -33,17 +39,17 @@ const isSystem = computed(() => isSystemRoleType(role.value.type))
const isManaged = computed(() => isManagedRoleType(role.value.type))

const isUpdated = computed(() => {
if (role.value.isEveryone) return props.permissions !== role.value.permissions
if (role.value.isEveryone)
return props.permissions !== role.value.permissions
return !shallowEqual(props, role.value)
})

const tabListName = 'Liste d’onglet'
const tabTitles = computed(() => [
{ title: 'Général', icon: 'ri:checkbox-circle-line', tabId: 'general' },
...(
isManaged.value
? [{ title: 'Membres', icon: 'ri:checkbox-circle-line', tabId: 'members' }]
: []),
...(isManaged.value
? [{ title: 'Membres', icon: 'ri:checkbox-circle-line', tabId: 'members' }]
: []),
{ title: 'Fermer', icon: 'ri:close-line', tabId: 'close' },
])

Expand All @@ -67,10 +73,14 @@ function updateChecked(checked: boolean, value: bigint) {
:tab-titles="tabTitles"
class="mb-5"
>
<DsfrTabContent
panel-id="general"
tab-id="general"
>
<DsfrTabContent panel-id="general" tab-id="general">
<DsfrNotice
v-if="!role.isEveryone && !isSystem"
class="mb-5"
style="width: fit-content"
title="Les rôles personnalisés d'un projet ne concernent que la Console, pas les services externes !"
type="warning"
/>
<h6>Nom du rôle</h6>
<DsfrInput
v-model="role.name"
Expand All @@ -79,14 +89,9 @@ function updateChecked(checked: boolean, value: bigint) {
class="mb-5"
:disabled="role.isEveryone || isSystem"
/>
<h6>Permissions</h6>
<div
v-for="scope in projectPermsDetails"
:key="scope.name"
>
<p
class="mb-3 ml-2 font-bold font-underline"
>
<h6>Permissions de la Console</h6>
<div v-for="scope in projectPermsDetails" :key="scope.name">
<p class="mb-3 ml-2 font-bold font-underline">
{{ scope.name }}
</p>
<DsfrCheckbox
Expand All @@ -98,8 +103,14 @@ function updateChecked(checked: boolean, value: bigint) {
:label="perm?.label"
:hint="perm?.hint"
:name="perm.key"
:disabled="isSystem || (role.permissions & PROJECT_PERMS.MANAGE && perm.key !== 'MANAGE')"
@update:model-value="(checked: boolean) => updateChecked(checked, PROJECT_PERMS[perm.key])"
:disabled="
isSystem
|| (role.permissions & PROJECT_PERMS.MANAGE && perm.key !== 'MANAGE')
"
@update:model-value="
(checked: boolean) =>
updateChecked(checked, PROJECT_PERMS[perm.key])
"
/>
</div>
<DsfrButton
Expand All @@ -118,15 +129,11 @@ function updateChecked(checked: boolean, value: bigint) {
@click="$emit('delete')"
/>
</DsfrTabContent>
<DsfrTabContent
panel-id="members"
tab-id="members"
>
<template
v-if="props.isEveryone"
>
<DsfrTabContent panel-id="members" tab-id="members">
<template v-if="props.isEveryone">
<DsfrNotice
class="mb-5"
style="width: fit-content"
title="Le rôle par défaut 'Tout le monde' inclut tous les utilisateurs de l'équipe"
/>
<DsfrCheckbox
Expand All @@ -141,9 +148,7 @@ function updateChecked(checked: boolean, value: bigint) {
:model-value="true"
/>
</template>
<template
v-else
>
<template v-else>
<DsfrCheckbox
v-for="member in role.allMembers"
:id="`${member.userId}-cbx`"
Expand All @@ -153,25 +158,29 @@ function updateChecked(checked: boolean, value: bigint) {
:label="`${member.lastName} ${member.firstName}`"
:hint="member.email"
:model-value="member.roleIds.includes(role.id)"
@update:model-value="(checked: boolean) => $emit('updateMemberRoles', checked, member.userId)"
@update:model-value="
(checked: boolean) =>
$emit('updateMemberRoles', checked, member.userId)
"
/>
</template>
<template
v-if="!role.allMembers.length"
>
<div>
Vous n'avez pas d'utilisateur dans votre projet
</div>
<template v-if="!role.allMembers.length">
<div>Vous n'avez pas d'utilisateur dans votre projet</div>
<DsfrButton
label="Gérer l'équipe"
class="mt-5"
@click="router.push({ name: 'Team' })"
@click="
router.push({
name: 'Project',
query: { tab: 'team' },
replace: true,
force: true,
})
"
/>
</template>
</DsfrTabContent>
<div
class="ms-8"
>
<div class="ms-8">
<DsfrTabContent
panel-id="close"
tab-id="close"
Expand Down
Loading
Loading