scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-16 00:37:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

Truncate long names in Access modal [SCI-10273]

Browse source
This commit is contained in:
sboursen-scinote 2024-03-01 11:33:30 +01:00
parent 1abd370d3e
commit 5cc3ad6cbb
4 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/javascript/vue/shared/access_modal/assign_flyout.vue
View file

@ -3,7 +3,7 @@
<div class="sci-label mb-2"> <div class="sci-label mb-2">
{{ i18n.t('access_permissions.partials.new_assignments_form.grant_access') }} {{ i18n.t('access_permissions.partials.new_assignments_form.grant_access') }}
</div> </div>
<GeneralDropdown @open="$emit('assigningNewUsers', true)" @close="$emit('assigningNewUsers', false)" :fieldOnlyOpen="true"> <GeneralDropdown @open="$emit('assigningNewUsers', true)" @close="$emit('assigningNewUsers', false)" :fieldOnlyOpen="true" :fixed-width="true">
<template v-slot:field> <template v-slot:field>
<div class="sci-input-container-v2 left-icon"> <div class="sci-input-container-v2 left-icon">
<input type="text" v-model="query" class="sci-input-field" <input type="text" v-model="query" class="sci-input-field"
@ -31,14 +31,13 @@
></MenuDropdown> ></MenuDropdown>
</div> </div>
<perfect-scrollbar class="h-80 relative"> <perfect-scrollbar class="h-80 relative">
<div v-for="user in filteredUsers" :key="user.id" class="py-2 flex items-center gap-2"> <div v-for="user in filteredUsers" :key="user.id" class="py-2 flex items-center w-full">
<div> <div>
<img :src="user.attributes.avatar_url" class="rounded-full w-8 h-8"> <img :src="user.attributes.avatar_url" class="rounded-full w-8 h-8">
</div> </div>
<div> <div class="truncate ml-2" :title="user.attributes.name">{{ user.attributes.name }}</div>
{{ <div v-if="user.attributes.current_user" class="text-nowrap">
`${user.attributes.name}${user.attributes.current_user ? ` (${i18n.t('access_permissions.you')})` : ''}` {{ `(${i18n.t('access_permissions.you')})` }}
}}
</div> </div>
<MenuDropdown <MenuDropdown
class="ml-auto" class="ml-auto"

9
app/javascript/vue/shared/access_modal/edit.vue
View file

@ -31,10 +31,13 @@
<div> <div>
<img :src="userAssignment.attributes.user.avatar_url" class="rounded-full w-8 h-8"> <img :src="userAssignment.attributes.user.avatar_url" class="rounded-full w-8 h-8">
</div> </div>
<div> <div class="truncate"
<div>{{ userAssignment.attributes.user.name }}</div> :title="userAssignment.attributes.user.name"
<div class="text-xs text-sn-grey">{{ userAssignment.attributes.inherit_message }}</div> >{{ userAssignment.attributes.user.name }}</div>
<div v-if="userAssignment.attributes.current_user" class="text-nowrap">
{{ `(${i18n.t('access_permissions.you')})` }}
</div> </div>
<div class="text-xs text-sn-grey text-nowrap">{{ userAssignment.attributes.inherit_message }}</div>
<MenuDropdown <MenuDropdown
v-if="!userAssignment.attributes.last_owner && params.object.urls.update_access" v-if="!userAssignment.attributes.last_owner && params.object.urls.update_access"
class="ml-auto" class="ml-auto"

3
app/javascript/vue/shared/general_dropdown.vue
View file

@ -36,7 +36,8 @@ export default {
caret: { type: Boolean, default: false }, caret: { type: Boolean, default: false },
alwaysShow: { type: Boolean, default: false }, alwaysShow: { type: Boolean, default: false },
closeDropdown: { type: Boolean, default: false }, closeDropdown: { type: Boolean, default: false },
fieldOnlyOpen: { type: Boolean, default: false } fieldOnlyOpen: { type: Boolean, default: false },
fixedWidth: { type: Boolean, default: false }
}, },
data() { data() {
return { return {

10
app/serializers/user_assignment_serializer.rb
View file

@ -5,6 +5,7 @@ class UserAssignmentSerializer < ActiveModel::Serializer
include Rails.application.routes.url_helpers include Rails.application.routes.url_helpers
attributes :id, :assigned, :assignable_type, :user, :user_role, :last_owner, :inherit_message attributes :id, :assigned, :assignable_type, :user, :user_role, :last_owner, :inherit_message
attribute :current_user
def assigned def assigned
parent_assignment(parent).assigned parent_assignment(parent).assigned
@ -15,16 +16,17 @@ class UserAssignmentSerializer < ActiveModel::Serializer
end end
def user def user
current_user = instance_options[:user]
name = object.user.name
name += " (#{I18n.t('access_permissions.you')})" if current_user == object.user
{ {
id: object.user.id, id: object.user.id,
name: name, name: object.user.name,
avatar_url: avatar_path(object.user, :icon_small) avatar_url: avatar_path(object.user, :icon_small)
} }
end end
def current_user
instance_options[:user].id == object.user.id
end
def user_role def user_role
{ {
id: object.user_role.id, id: object.user_role.id,