Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions src/components/AdminSettings/StunServer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@
labelOutside />
</div>

<IconAlertCircleOutline
<span
v-show="!isValidServer"
class="stun-server__alert"
:title="t('spreed', 'The server address is invalid')"
fillColor="var(--color-border-error)" />
:title="t('spreed', 'The server address is invalid')">
<IconAlertCircleOutline fillColor="var(--color-border-error)" />
</span>

<NcButton
v-show="!loading"
Expand Down Expand Up @@ -135,6 +136,9 @@ export default {
}

&__alert {
display: flex;
align-items: center;
justify-content: center;
width: var(--default-clickable-area);
height: var(--default-clickable-area);
}
Expand Down
1 change: 0 additions & 1 deletion src/components/MediaSettings/MediaDevicesSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ function updateDeviceId(deviceId: NcSelectOption['id']) {
<component
:is="deviceIcon"
class="media-devices-selector__icon"
title=""
:size="20" />

<NcSelect
Expand Down
12 changes: 6 additions & 6 deletions src/components/RightSidebar/Participants/Participant.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ describe('ParticipantItem.vue', () => {
['Alice', 'guest-id', ATTENDEE.ACTOR_TYPE.EMAILS, PARTICIPANT.TYPE.GUEST, 'Alice(guest)'],
['', 'guest-id', ATTENDEE.ACTOR_TYPE.GUESTS, PARTICIPANT.TYPE.GUEST, 'Guest(guest)'],
// The role is rendered as an icon, its accessible name is part of the text content
['Alice', 'alice', ATTENDEE.ACTOR_TYPE.USERS, PARTICIPANT.TYPE.OWNER, 'AliceOwner'],
['Alice', 'alice', ATTENDEE.ACTOR_TYPE.USERS, PARTICIPANT.TYPE.MODERATOR, 'AliceModerator'],
['Alice', 'guest-id', ATTENDEE.ACTOR_TYPE.GUESTS, PARTICIPANT.TYPE.GUEST_MODERATOR, 'AliceModerator(guest)'],
['Alice', 'alice', ATTENDEE.ACTOR_TYPE.USERS, PARTICIPANT.TYPE.OWNER, 'Alice'],
['Alice', 'alice', ATTENDEE.ACTOR_TYPE.USERS, PARTICIPANT.TYPE.MODERATOR, 'Alice'],
['Alice', 'guest-id', ATTENDEE.ACTOR_TYPE.GUESTS, PARTICIPANT.TYPE.GUEST_MODERATOR, 'Alice(guest)'],
['Bot', ATTENDEE.BRIDGE_BOT_ID, ATTENDEE.ACTOR_TYPE.USERS, PARTICIPANT.TYPE.USER, 'Bot(bot)'],
]

Expand All @@ -194,9 +194,9 @@ describe('ParticipantItem.vue', () => {
['Alice', 'guest-id', ATTENDEE.ACTOR_TYPE.EMAILS, PARTICIPANT.TYPE.GUEST, 'Alice(guest)(in the lobby)'],
['', 'guest-id', ATTENDEE.ACTOR_TYPE.GUESTS, PARTICIPANT.TYPE.GUEST, 'Guest(guest)(in the lobby)'],
// Owners and moderators can skip the lobby, so they get no lobby badge
['Alice', 'alice', ATTENDEE.ACTOR_TYPE.USERS, PARTICIPANT.TYPE.OWNER, 'AliceOwner'],
['Alice', 'alice', ATTENDEE.ACTOR_TYPE.USERS, PARTICIPANT.TYPE.MODERATOR, 'AliceModerator'],
['Alice', 'guest-id', ATTENDEE.ACTOR_TYPE.GUESTS, PARTICIPANT.TYPE.GUEST_MODERATOR, 'AliceModerator(guest)'],
['Alice', 'alice', ATTENDEE.ACTOR_TYPE.USERS, PARTICIPANT.TYPE.OWNER, 'Alice'],
['Alice', 'alice', ATTENDEE.ACTOR_TYPE.USERS, PARTICIPANT.TYPE.MODERATOR, 'Alice'],
['Alice', 'guest-id', ATTENDEE.ACTOR_TYPE.GUESTS, PARTICIPANT.TYPE.GUEST_MODERATOR, 'Alice(guest)'],
]

it.each([
Expand Down
23 changes: 10 additions & 13 deletions src/components/RightSidebar/Participants/ParticipantItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,13 @@
<!-- First line: participant's name and type -->
<span class="participant__user">
<span class="participant__user-name" :title="userNameTitle">{{ computedName }}</span>
<IconCrownOutline
v-if="showOwnerIcon"
<span
v-if="showOwnerIcon || showModeratorIcon"
class="participant__user-icon"
:size="16"
:title="ownerIconLabel" />
<IconShieldOutline
v-else-if="showModeratorIcon"
class="participant__user-icon"
:size="16"
:title="moderatorIconLabel" />
:title="showOwnerIcon ? ownerIconLabel : moderatorIconLabel">
<IconCrownOutline v-if="showOwnerIcon" :size="16" />
<IconShieldOutline v-else :size="16" />
</span>
<span v-if="isBridgeBotUser" class="participant__user-badge">({{ t('spreed', 'bot') }})</span>
<span v-if="isGuestActor || isEmailActor" class="participant__user-badge">({{ t('spreed', 'guest') }})</span>
<span v-if="!isSelf && isLobbyEnabled && !canSkipLobby" class="participant__user-badge">({{ t('spreed', 'in the lobby') }})</span>
Expand Down Expand Up @@ -92,12 +89,12 @@
</template>

<!-- Call state icon -->
<component
:is="callIcon.icon"
<span
v-else-if="callIcon"
class="participant__call-state"
:title="callIcon.title"
:size="callIcon.size" />
:title="callIcon.title">
<component :is="callIcon.icon" :size="callIcon.size" />
</span>

<!-- Grant or revoke lobby permissions (inline button) -->
<template v-if="showToggleLobbyAction">
Expand Down
8 changes: 8 additions & 0 deletions src/components/RightSidebar/Participants/ParticipantsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,10 @@ export default {
},

canAddPhones() {
if (!this.canAdd) {
return false
}

const canModerateSipDialOut = hasTalkFeature(this.token, 'sip-support-dialout')
&& getTalkConfig(this.token, 'call', 'enabled')
&& getTalkConfig(this.token, 'call', 'sip-enabled')
Expand All @@ -250,6 +254,10 @@ export default {
},

hintAddPhones() {
if (!this.canAdd) {
return false
}

const canModerateSipDialOut = hasTalkFeature(this.token, 'sip-support-dialout')
&& getTalkConfig(this.token, 'call', 'sip-enabled')
&& getTalkConfig(this.token, 'call', 'sip-dialout-enabled')
Expand Down
5 changes: 5 additions & 0 deletions src/components/RightSidebar/RightSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ export default {
return (this.getUserId || this.isGuestModerator)
&& (!this.isOneToOne || this.isInCall)
&& !this.isNoteToSelf
&& !this.isChangelog
&& (!isChannelConversation(this.conversation) || this.$store.getters.isModerator)
},

Expand All @@ -385,6 +386,10 @@ export default {
return this.conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF
},

isChangelog() {
return this.conversation.type === CONVERSATION.TYPE.CHANGELOG
},

breakoutRoomsText() {
return t('spreed', 'Breakout rooms')
},
Expand Down
Loading