fix(editor): RBAC frontend fixes (#9416)

n8n-io · May 16, 2024 · 0f9fca6 · 0f9fca6
1 parent 681c2bf
commit 0f9fca6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/packages/editor-ui/src/components/DeleteUserModal.vue b/packages/editor-ui/src/components/DeleteUserModal.vue
@@ -31,9 +31,16 @@
 					</el-radio>
 					<div v-if="operation === 'transfer'" :class="$style.optionInput">
 						<n8n-text color="text-dark">{{
-							$locale.baseText('projects.settings.delete.question.transfer.title')
+							$locale.baseText('settings.users.transferWorkflowsAndCredentials.user')
 						}}</n8n-text>
-						<ProjectSharing v-model="selectedProject" class="pt-2xs" :projects="projects" />
+						<ProjectSharing
+							v-model="selectedProject"
+							class="pt-2xs"
+							:projects="projects"
+							:placeholder="
+								$locale.baseText('settings.users.transferWorkflowsAndCredentials.placeholder')
+							"
+						/>
 					</div>
 					<el-radio v-model="operation" label="delete" @update:model-value="operation = 'delete'">
 						<n8n-text color="text-dark">{{

diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -127,7 +127,7 @@ const onExecutionsTab = computed(() => {
 });
 
 const workflowPermissions = computed<PermissionsMap<WorkflowScope>>(() => {
-	return getWorkflowPermissions(props.workflow);
+	return getWorkflowPermissions(workflowsStore.getWorkflowById(props.workflow.id));
 });
 
 const workflowMenuItems = computed<ActionDropdownItem[]>(() => {
@@ -178,7 +178,7 @@ const workflowMenuItems = computed<ActionDropdownItem[]>(() => {
 		disabled: !onWorkflowPage.value || isNewWorkflow.value,
 	});
 
-	if (workflowPermissions.value.delete && !props.readOnly) {
+	if ((workflowPermissions.value.delete && !props.readOnly) || isNewWorkflow.value) {
 		actions.push({
 			id: WORKFLOW_MENU_ACTIONS.DELETE,
 			label: locale.baseText('menuActions.delete'),

diff --git a/packages/editor-ui/src/features/projects/components/ProjectSettings.vue b/packages/editor-ui/src/features/projects/components/ProjectSettings.vue
@@ -65,6 +65,7 @@ const projectRoles = computed(() =>
 		name: projectRoleTranslations.value[role.role],
 	})),
 );
+const firstLicensedRole = computed(() => projectRoles.value.find((role) => role.licensed)?.role);
 
 const onAddMember = (userId: string) => {
 	isDirty.value = true;
@@ -74,7 +75,9 @@ const onAddMember = (userId: string) => {
 	const { id, firstName, lastName, email } = user;
 	const relation = { id, firstName, lastName, email } as ProjectRelation;
 
-	relation.role = projectRoles.value[0].role;
+	if (firstLicensedRole.value) {
+		relation.role = firstLicensedRole.value;
+	}
 
 	formData.value.relations.push(relation);
 };

diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1578,7 +1578,9 @@
 	"settings.users.setupToInviteUsers": "To invite users, set up your own account",
 	"settings.users.setupToInviteUsersInfo": "Invited users won’t be able to see workflows and credentials of other users unless you upgrade. <a href=\"https://docs.n8n.io/user-management/\" target=\"_blank\">More info</a> <br /> <br />",
 	"settings.users.smtpToAddUsersWarning": "Set up SMTP before adding users (so that n8n can send them invitation emails). <a target=\"_blank\" href=\"https://docs.n8n.io/hosting/authentication/user-management-self-hosted/\">Instructions</a>",
-	"settings.users.transferWorkflowsAndCredentials": "Transfer their workflows and credentials to another project",
+	"settings.users.transferWorkflowsAndCredentials": "Transfer their workflows and credentials to another user",
+	"settings.users.transferWorkflowsAndCredentials.user": "User to transfer to",
+	"settings.users.transferWorkflowsAndCredentials.placeholder": "Select user",
 	"settings.users.transferredToUser": "Data transferred to {projectName}",
 	"settings.users.userDeleted": "User deleted",
 	"settings.users.userDeletedError": "Problem while deleting user",