Skip to content

[stable30] fix(MessagesGroup): concat actor information #13206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 1 commit into from
Sep 3, 2024
Merged

[stable30] fix(MessagesGroup): concat actor information #13206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/components/MessagesList/MessagesGroup/MessagesGroup.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ describe('MessagesGroup.vue', () => {
test('renders grouped messages', () => {
useMessageInfoSpy.mockReturnValue({
actorDisplayName: computed(() => 'actor one'),
remoteServer: computed(() => ''),
lastEditor: computed(() => ''),
})
const wrapper = shallowMount(MessagesGroup, {
localVue,
Expand Down Expand Up @@ -131,6 +133,8 @@ describe('MessagesGroup.vue', () => {
// Arrange
useMessageInfoSpy.mockReturnValue({
actorDisplayName: computed(() => 'guest-one-display-name'),
remoteServer: computed(() => ''),
lastEditor: computed(() => ''),
})

const wrapper = shallowMount(MessagesGroup, {
Expand Down Expand Up @@ -196,6 +200,8 @@ describe('MessagesGroup.vue', () => {
// Arrange
useMessageInfoSpy.mockReturnValue({
actorDisplayName: computed(() => 'Deleted user'),
remoteServer: computed(() => ''),
lastEditor: computed(() => ''),
})

const wrapper = shallowMount(MessagesGroup, {
Expand Down
32 changes: 12 additions & 20 deletions src/components/MessagesList/MessagesGroup/MessagesGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@
disable-tooltip />
</div>
<ul class="messages">
<li class="messages__author" aria-level="4">
<span class="messages__author-name">{{ actorDisplayName }}</span>
<span v-if="remoteServer" class="messages__author-server">{{ remoteServer }}</span>
<span v-if="lastEditor" class="messages__author-edit">{{ lastEditor }}</span>
</li>
<li class="messages__author" aria-level="4">{{ actorInfo }}</li>
<Message v-for="(message, index) of messages"
:key="message.id"
:message="message"
Expand Down Expand Up @@ -86,12 +82,17 @@ export default {
lastEditor,
actorDisplayName,
} = useMessageInfo(firstMessage)

const actorInfo = computed(() => {
return [actorDisplayName.value, remoteServer.value, lastEditor.value]
.filter(value => value).join(' ')
})

return {
AVATAR,
guestNameStore: useGuestNameStore(),
remoteServer,
lastEditor,
actorDisplayName,
actorInfo,
}
},

Expand Down Expand Up @@ -147,22 +148,13 @@ export default {
}

&__author {
display: flex;
gap: 4px;
max-width: $messages-text-max-width;
padding-left: var(--default-grid-baseline);
color: var(--color-text-maxcontrast);

&-name {
flex-shrink: 0;
}

&-edit,
&-server {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
flex-shrink: 0;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
</style>
17 changes: 9 additions & 8 deletions src/components/Quote.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ components.
:source="message.actorType"
:size="AVATAR.SIZE.EXTRA_SMALL"
disable-menu />
{{ actorDisplayName }}
<span v-if="remoteServer" class="quote__main__author-server">{{ remoteServer }}</span>
<span v-if="lastEditor" class="quote__main__author-edit">{{ lastEditor }}</span>
<span class="quote__main__author-info">{{ actorInfo }}</span>
<div v-if="editMessage" class="quote__main__edit-hint">
<PencilIcon :size="20" />
{{ t('spreed', '(editing)') }}
Expand Down Expand Up @@ -57,7 +55,7 @@ components.
</template>

<script>
import { toRefs } from 'vue'
import { computed, toRefs } from 'vue'

import Close from 'vue-material-design-icons/Close.vue'
import PencilIcon from 'vue-material-design-icons/Pencil.vue'
Expand Down Expand Up @@ -117,14 +115,18 @@ export default {
actorDisplayName,
} = useMessageInfo(message)

const actorInfo = computed(() => {
return [actorDisplayName.value, remoteServer.value, lastEditor.value]
.filter(value => value).join(' ')
})

return {
AVATAR,
chatExtrasStore,
isFileShare,
isFileShareWithoutCaption,
remoteServer,
lastEditor,
actorDisplayName,
actorInfo,
}
},

Expand Down Expand Up @@ -277,8 +279,7 @@ export default {
gap: 4px;
color: var(--color-text-maxcontrast);

&-edit,
&-server {
&-info {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
Expand Down