Skip to content

Commit 8450bb8

Browse files
committed
fix(editor): Simplify component data
1 parent 5328e5b commit 8450bb8

File tree

1 file changed

+31
-22
lines changed

1 file changed

+31
-22
lines changed

packages/frontend/editor-ui/src/views/SettingsPersonalView.vue

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ type UserBasicDetailsWithMfa = UserBasicDetailsForm & {
3030
mfaCode?: string;
3131
};
3232
33+
type RoleContent = {
34+
name: string;
35+
description: string;
36+
};
37+
3338
const i18n = useI18n();
3439
const { showToast, showError } = useToast();
3540
const documentTitle = useDocumentTitle();
@@ -85,28 +90,32 @@ const hasAnyChanges = computed(() => {
8590
return hasAnyBasicInfoChanges.value || hasAnyPersonalisationChanges.value;
8691
});
8792
88-
const roles = computed<Record<IRole, string>>(() => ({
89-
[ROLE.Default]: i18n.baseText('auth.roles.default'),
90-
[ROLE.Member]: i18n.baseText('auth.roles.member'),
91-
[ROLE.Admin]: i18n.baseText('auth.roles.admin'),
92-
[ROLE.Owner]: i18n.baseText('auth.roles.owner'),
93-
}));
94-
95-
const roleTooltipText = computed<Record<IRole, string>>(() => ({
96-
[ROLE.Default]: i18n.baseText('settings.personal.role.tooltip.default'),
97-
[ROLE.Member]: i18n.baseText('settings.personal.role.tooltip.member'),
98-
[ROLE.Admin]: i18n.baseText('settings.personal.role.tooltip.admin'),
99-
[ROLE.Owner]: i18n.baseText('settings.personal.role.tooltip.owner', {
100-
interpolate: {
101-
cloudAccess: cloudPlanStore.hasCloudPlan
102-
? i18n.baseText('settings.personal.role.tooltip.cloud')
103-
: '',
104-
},
105-
}),
93+
const roles = computed<Record<IRole, RoleContent>>(() => ({
94+
[ROLE.Default]: {
95+
name: i18n.baseText('auth.roles.default'),
96+
description: i18n.baseText('settings.personal.role.tooltip.default'),
97+
},
98+
[ROLE.Member]: {
99+
name: i18n.baseText('auth.roles.member'),
100+
description: i18n.baseText('settings.personal.role.tooltip.member'),
101+
},
102+
[ROLE.Admin]: {
103+
name: i18n.baseText('auth.roles.admin'),
104+
description: i18n.baseText('settings.personal.role.tooltip.admin'),
105+
},
106+
[ROLE.Owner]: {
107+
name: i18n.baseText('auth.roles.owner'),
108+
description: i18n.baseText('settings.personal.role.tooltip.owner', {
109+
interpolate: {
110+
cloudAccess: cloudPlanStore.hasCloudPlan
111+
? i18n.baseText('settings.personal.role.tooltip.cloud')
112+
: '',
113+
},
114+
}),
115+
},
106116
}));
107117
108-
const currentUserRole = computed(() => roles.value[usersStore.globalRoleName]);
109-
const currentUserRoleTooltip = computed(() => roleTooltipText.value[usersStore.globalRoleName]);
118+
const currentUserRole = computed<RoleContent>(() => roles.value[usersStore.globalRoleName]);
110119
111120
onMounted(() => {
112121
documentTitle.set(i18n.baseText('settings.personal.personalSettings'));
@@ -288,9 +297,9 @@ onBeforeUnmount(() => {
288297
<span :class="$style.username" data-test-id="current-user-name">
289298
<n8n-text color="text-base" bold>{{ currentUser.fullName }}</n8n-text>
290299
<N8nTooltip placement="bottom">
291-
<template #content>{{ currentUserRoleTooltip }}</template>
300+
<template #content>{{ currentUserRole.description }}</template>
292301
<n8n-text :class="$style.tooltip" color="text-light" data-test-id="current-user-role">{{
293-
currentUserRole
302+
currentUserRole.name
294303
}}</n8n-text>
295304
</N8nTooltip>
296305
</span>

0 commit comments

Comments
 (0)