summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaksim Sukharev <antreesy.web@gmail.com>2023-06-14 16:15:42 +0200
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>2023-08-08 07:46:18 +0000
commit5182d543ae1ac8b1e4f82ba1fe71ac9f2fa5a5a8 (patch)
tree3d457a1e35ee4fd2da6e9906564642a7ccb94bb3
parentc2fe40c14e0af6f4013323a4316d57e703b44d03 (diff)
clear system setups for existing components
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
-rw-r--r--src/components/MessagesList/MessagesGroup/Message/Message.spec.js1
-rw-r--r--src/components/MessagesList/MessagesGroup/Message/Message.vue6
-rw-r--r--src/components/MessagesList/MessagesGroup/MessagesGroup.vue20
3 files changed, 8 insertions, 19 deletions
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.spec.js b/src/components/MessagesList/MessagesGroup/Message/Message.spec.js
index 526c41966..5bd27f0b1 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.spec.js
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.spec.js
@@ -541,6 +541,7 @@ describe('Message.vue', () => {
test('renders author if first message', async () => {
messageProps.isFirstMessage = true
+ messageProps.showAuthor = true
const wrapper = shallowMount(Message, {
localVue,
store,
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 31c630b17..0506a6454 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -341,7 +341,7 @@ export default {
*/
showAuthor: {
type: Boolean,
- default: true,
+ default: false,
},
/**
* Specifies if the message is temporary in order to display the spinner instead
@@ -349,14 +349,14 @@ export default {
*/
isTemporary: {
type: Boolean,
- required: true,
+ default: false,
},
/**
* Specifies if the message is the first of a group of same-author messages.
*/
isFirstMessage: {
type: Boolean,
- required: true,
+ default: false,
},
/**
* Specifies if the message can be replied to.
diff --git a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
index ab70e0609..76b78d206 100644
--- a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
+++ b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
@@ -27,9 +27,8 @@
role="heading"
aria-level="3">{{ dateSeparator }}</span>
</div>
- <div class="wrapper"
- :class="{'wrapper--system': isSystemMessage}">
- <div v-if="!isSystemMessage" class="messages__avatar">
+ <div class="wrapper">
+ <div class="messages__avatar">
<AuthorAvatar :author-type="actorType"
:author-id="actorId"
:display-name="actorDisplayName" />
@@ -40,13 +39,13 @@
ref="message"
v-bind="message"
:is-first-message="index === 0"
+ :is-temporary="message.timestamp === 0"
:next-message-id="(messages[index + 1] && messages[index + 1].id) || nextMessageId"
:previous-message-id="(index > 0 && messages[index - 1].id) || previousMessageId"
:actor-type="actorType"
:actor-id="actorId"
:actor-display-name="actorDisplayName"
- :show-author="!isSystemMessage"
- :is-temporary="message.timestamp === 0" />
+ show-author />
</ul>
</div>
</div>
@@ -138,14 +137,6 @@ export default {
return displayName
},
- /**
- * Whether the given message is a system message
- *
- * @return {boolean}
- */
- isSystemMessage() {
- return this.messages[0].systemMessage.length !== 0
- },
},
methods: {
@@ -188,9 +179,6 @@ export default {
display: flex;
margin: auto;
padding: 0;
- &--system {
- padding-left: $clickable-area + 8px;
- }
&:focus {
background-color: rgba(47, 47, 47, 0.068);
}