Skip to content

Commit ecc40fa

Browse files
BC-10311 - rename RoleName.EXPERT to RoleName.EXTERNALPERSON (#3978)
* rename RoleName.EXPERT to RoleName.EXTERNALPERSON and update variable names * rename SchoolPurpose.EXPERT to SchoolPupose.EXTERNAL_PERSON_SCHOOL * rename "Expertenschule" to "Externe-Personen-Schule"
1 parent 13e04cf commit ecc40fa

File tree

15 files changed

+37
-33
lines changed

15 files changed

+37
-33
lines changed

src/components/molecules/vImportUsersMatchSearch.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,8 @@ const mapRoleNames = (roleNames: unknown[]) => {
372372
return t("common.roleName.administrator");
373373
case "expert":
374374
return t("common.roleName.expert");
375+
case "externalPerson":
376+
return t("common.roleName.externalPerson");
375377
case "superhero":
376378
return t("common.roleName.superhero");
377379
default:

src/modules/data/application/application.store.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const useAppStore = defineStore("applicationStore", () => {
4141

4242
const isTeacher = computed(() => userRoles.value.includes(RoleName.Teacher));
4343
const isStudent = computed(() => userRoles.value.includes(RoleName.Student));
44-
const isExpert = computed(() => userRoles.value.includes(RoleName.Expert));
44+
const isExternalPerson = computed(() => userRoles.value.includes(RoleName.ExternalPerson));
4545

4646
// Helpers/Utils
4747
const hasPermission = (permission: Permission) =>
@@ -129,7 +129,7 @@ export const useAppStore = defineStore("applicationStore", () => {
129129
hasPermission,
130130
isTeacher,
131131
isStudent,
132-
isExpert,
132+
isExternalPerson,
133133
school,
134134
userRoles,
135135
systemId,

src/modules/data/application/application.store.unit.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ describe("useApplicationStore", () => {
6363
it("should return false for role checks initially", () => {
6464
expect(useAppStore().isTeacher).toBe(false);
6565
expect(useAppStore().isStudent).toBe(false);
66-
expect(useAppStore().isExpert).toBe(false);
66+
expect(useAppStore().isExternalPerson).toBe(false);
6767
});
6868

6969
it("should return correct computed from meResponse", async () => {
@@ -91,28 +91,28 @@ describe("useApplicationStore", () => {
9191

9292
expect(useAppStore().isTeacher).toBe(true);
9393
expect(useAppStore().isStudent).toBe(false);
94-
expect(useAppStore().isExpert).toBe(false);
94+
expect(useAppStore().isExternalPerson).toBe(false);
9595
});
9696

9797
it("should correctly identify student role", async () => {
9898
await setup({ roles: [{ id: "any", name: RoleName.Student }] });
9999

100100
expect(useAppStore().isTeacher).toBe(false);
101101
expect(useAppStore().isStudent).toBe(true);
102-
expect(useAppStore().isExpert).toBe(false);
102+
expect(useAppStore().isExternalPerson).toBe(false);
103103
});
104104

105-
it("should correctly identify expert role", async () => {
105+
it("should correctly identify external person role", async () => {
106106
await setup({
107107
roles: [
108-
{ id: "any", name: RoleName.Expert },
108+
{ id: "any", name: RoleName.ExternalPerson },
109109
{ id: "any", name: RoleName.Teacher },
110110
],
111111
});
112112

113113
expect(useAppStore().isTeacher).toBe(true);
114114
expect(useAppStore().isStudent).toBe(false);
115-
expect(useAppStore().isExpert).toBe(true);
115+
expect(useAppStore().isExternalPerson).toBe(true);
116116
});
117117
});
118118
});

src/modules/data/room/roomMembers/RoomMembers.store.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const useRoomMembersStore = defineStore("roomMembersStore", () => {
7575
const schoolRoleMap: Record<string, string> = {
7676
[RoleName.Teacher]: t("common.labels.teacher.neutral"),
7777
[RoleName.Student]: t("common.labels.student.neutral"),
78-
[RoleName.Expert]: t("common.roleName.externalPerson"),
78+
[RoleName.ExternalPerson]: t("common.roleName.externalPerson"),
7979
};
8080

8181
const roomApi = RoomApiFactory(undefined, "/v3", $axios);
@@ -131,14 +131,14 @@ export const useRoomMembersStore = defineStore("roomMembersStore", () => {
131131
const getSchoolRoleName = (schoolRoleNames: RoleName[]) => {
132132
const isAdmin = schoolRoleNames.includes(RoleName.Administrator);
133133
const isTeacher = schoolRoleNames.includes(RoleName.Teacher);
134-
const isExpert = schoolRoleNames.includes(RoleName.Expert);
134+
const isExternalPerson = schoolRoleNames.includes(RoleName.ExternalPerson);
135135

136136
if (isAdmin || isTeacher) {
137137
return schoolRoleMap[RoleName.Teacher];
138138
}
139139

140-
if (isExpert) {
141-
return schoolRoleMap[RoleName.Expert];
140+
if (isExternalPerson) {
141+
return schoolRoleMap[RoleName.ExternalPerson];
142142
}
143143

144144
return schoolRoleMap[RoleName.Student];

src/modules/data/room/roomMembers/RoomMembers.store.unit.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ describe("useRoomMembers", () => {
145145
const { roomMembersStore } = setup();
146146
const membersMock = roomMemberFactory.buildList(3, {
147147
roomRoleName: RoleName.Roomeditor,
148-
schoolRoleNames: [RoleName.Expert],
148+
schoolRoleNames: [RoleName.ExternalPerson],
149149
});
150150
roomApiMock.roomControllerGetMembers.mockResolvedValue(
151151
mockApiResponse({

src/modules/feature/board-video-conference-element/components/VideoConferenceContentElement.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ const { modelValue, computedElement } = useContentElementState(props, {
153153
const route = useRoute();
154154
const boardId = route.params.id;
155155
156-
const { isStudent, isTeacher, isExpert, userRoles } = useAppStoreRefs();
156+
const { isStudent, isTeacher, isExternalPerson, userRoles } = useAppStoreRefs();
157157
158158
const { hasManageVideoConferencePermission } = useBoardPermissions();
159159
const { t } = useI18n();
@@ -170,7 +170,7 @@ const hasParticipationPermission = computed(() => canJoin.value || canStart.valu
170170
const canJoin = computed(
171171
() =>
172172
(isStudent.value || isTeacher.value) &&
173-
(!isExpert.value || userRoles.value?.length > 1 || isWaitingRoomActive.value)
173+
(!isExternalPerson.value || userRoles.value?.length > 1 || isWaitingRoomActive.value)
174174
);
175175
176176
const canStart = computed(() => hasManageVideoConferencePermission.value);

src/modules/feature/room/manageRoom/tables/RoomAdminMembersTable.unit.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ describe("RoomAdminMembersTable", () => {
136136
expectedIcon: mdiAccountOutline,
137137
},
138138
{
139-
description: "expert icon for external experts",
140-
schoolRoleNames: [RoleName.Expert],
139+
description: "expert icon for external persons",
140+
schoolRoleNames: [RoleName.ExternalPerson],
141141
expectedIcon: mdiAccountClockOutline,
142142
},
143143
{

src/modules/feature/room/manageRoom/tables/RoomAdminMembersTable.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const getSchoolRoleIcon = (schoolRoleNames: RoleName[]) => {
121121
if (schoolRoleNames.includes(RoleName.Student)) {
122122
return mdiAccountOutline;
123123
}
124-
if (schoolRoleNames.includes(RoleName.Expert)) {
124+
if (schoolRoleNames.includes(RoleName.ExternalPerson)) {
125125
return mdiAccountClockOutline;
126126
}
127127
return undefined;

src/modules/feature/room/roomMembers/dialogs/ChangeRole.unit.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,10 @@ describe("ChangeRole.vue", () => {
299299
expect(radioGroup.props("modelValue")).toBe(null);
300300
});
301301

302-
describe("when the selected user is 'RoleName.Expert'", () => {
302+
describe("when the selected user is 'RoleName.ExternalPerson'", () => {
303303
it("should render only Viewer and Editor radio options", () => {
304304
const members = roomMemberFactory.buildList(2, {
305-
schoolRoleNames: [RoleName.Expert],
305+
schoolRoleNames: [RoleName.ExternalPerson],
306306
roomRoleName: RoleName.Roomviewer,
307307
});
308308
const { wrapper } = setup({ membersForRoleChange: members });

src/modules/feature/room/roomMembers/dialogs/ChangeRole.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,10 @@ const radioOptions = computed(() => {
304304
return [roomOwnerOption];
305305
}
306306
307-
const isExpertMember = memberToChangeRole?.value.some((member) => member.schoolRoleNames.includes(RoleName.Expert));
308-
if (isExpertMember) {
307+
const isExternalPersonMember = memberToChangeRole?.value.some((member) =>
308+
member.schoolRoleNames.includes(RoleName.ExternalPerson)
309+
);
310+
if (isExternalPersonMember) {
309311
return baseRoles.filter((r) => r.role === RoleName.Roomviewer || r.role === RoleName.Roomeditor);
310312
}
311313

0 commit comments

Comments
 (0)