diff --git a/packages/frontend-2/components/settings/workspaces/members/UpdateDialog.vue b/packages/frontend-2/components/settings/workspaces/members/ActionsDialog.vue similarity index 100% rename from packages/frontend-2/components/settings/workspaces/members/UpdateDialog.vue rename to packages/frontend-2/components/settings/workspaces/members/ActionsDialog.vue diff --git a/packages/frontend-2/components/settings/workspaces/members/UpdateActionsMenu.vue b/packages/frontend-2/components/settings/workspaces/members/ActionsMenu.vue similarity index 83% rename from packages/frontend-2/components/settings/workspaces/members/UpdateActionsMenu.vue rename to packages/frontend-2/components/settings/workspaces/members/ActionsMenu.vue index 1f7696799..4f54f8b13 100644 --- a/packages/frontend-2/components/settings/workspaces/members/UpdateActionsMenu.vue +++ b/packages/frontend-2/components/settings/workspaces/members/ActionsMenu.vue @@ -17,7 +17,7 @@ /> - () +const dialogType = ref() const isActiveUserWorkspaceAdmin = computed( () => props.workspaceRole === Roles.Workspace.Admin @@ -85,13 +85,13 @@ const filteredActionsItems = computed(() => { // 3. The target user's current role (to show/hide role change options) // 4. The target user's seat type (to show relevant upgrade/downgrade options) // Special case: For remove action, we check against 'canRemove' instead of actual role - Object.entries(WorkspaceUserUpdateConfig).forEach(([type, config]) => { + Object.entries(WorkspaceUserActionsConfig).forEach(([type, config]) => { if ( config.menu.show({ isActiveUserWorkspaceAdmin: isActiveUserWorkspaceAdmin.value, isActiveUserTargetUser: isActiveUserTargetUser.value, targetUserCurrentRole: - type === WorkspaceUserUpdateActionTypes.RemoveMember + type === WorkspaceUserActionTypes.RemoveMember ? 'canRemove' : props.targetUser.role, targetUserCurrentSeatType: props.targetUser.seatType @@ -101,8 +101,8 @@ const filteredActionsItems = computed(() => { // Add remove/leave actions to footer, others to main section if ( - type === WorkspaceUserUpdateActionTypes.RemoveMember || - type === WorkspaceUserUpdateActionTypes.LeaveWorkspace + type === WorkspaceUserActionTypes.RemoveMember || + type === WorkspaceUserActionTypes.LeaveWorkspace ) { footerItems.push(item) } else { @@ -118,7 +118,7 @@ const filteredActionsItems = computed(() => { }) const onActionChosen = (actionItem: LayoutMenuItem) => { - dialogType.value = actionItem.id as WorkspaceUserUpdateActionTypes + dialogType.value = actionItem.id as WorkspaceUserActionTypes showDialog.value = true } @@ -158,7 +158,7 @@ const onRemoveUser = async () => { const dialogConfig = computed(() => { if (!dialogType.value) return null - const config = WorkspaceUserUpdateConfig[dialogType.value].dialog + const config = WorkspaceUserActionsConfig[dialogType.value].dialog return { ...config, mainMessage: @@ -175,23 +175,23 @@ const onDialogConfirm = async () => { if (!props.workspaceId) return switch (dialogType.value) { - case WorkspaceUserUpdateActionTypes.MakeAdmin: + case WorkspaceUserActionTypes.MakeAdmin: await onUpdateRole(Roles.Workspace.Admin) break - case WorkspaceUserUpdateActionTypes.MakeGuest: + case WorkspaceUserActionTypes.MakeGuest: await onUpdateRole(Roles.Workspace.Guest) break - case WorkspaceUserUpdateActionTypes.RemoveAdmin: - case WorkspaceUserUpdateActionTypes.MakeMember: + case WorkspaceUserActionTypes.RemoveAdmin: + case WorkspaceUserActionTypes.MakeMember: await onUpdateRole(Roles.Workspace.Member) break - case WorkspaceUserUpdateActionTypes.UpgradeEditor: + case WorkspaceUserActionTypes.UpgradeEditor: await onUpdateSeatType(SeatTypes.Editor) break - case WorkspaceUserUpdateActionTypes.DowngradeEditor: + case WorkspaceUserActionTypes.DowngradeEditor: await onUpdateSeatType(SeatTypes.Viewer) break - case WorkspaceUserUpdateActionTypes.RemoveMember: + case WorkspaceUserActionTypes.RemoveMember: await onRemoveUser() break } diff --git a/packages/frontend-2/components/settings/workspaces/members/SeatTypeDisplay.vue b/packages/frontend-2/components/settings/workspaces/members/TableSeatType.vue similarity index 100% rename from packages/frontend-2/components/settings/workspaces/members/SeatTypeDisplay.vue rename to packages/frontend-2/components/settings/workspaces/members/TableSeatType.vue diff --git a/packages/frontend-2/components/settings/workspaces/members/new/GuestsTable.vue b/packages/frontend-2/components/settings/workspaces/members/new/GuestsTable.vue index 81383ba2f..155116f2c 100644 --- a/packages/frontend-2/components/settings/workspaces/members/new/GuestsTable.vue +++ b/packages/frontend-2/components/settings/workspaces/members/new/GuestsTable.vue @@ -52,13 +52,13 @@