Skip to content
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.

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

Fix quality warning tooltip not staying dismissed #5550

Merged
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
15 changes: 11 additions & 4 deletions src/components/CallView/shared/LocalMediaControls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
<button
v-if="!isQualityWarningTooltipDismissed"
class="hint__button"
@click="isQualityWarningTooltipDismissed = true">
@click="dismissQualityWarningTooltip">
{{ t('spreed', 'Dismiss') }}
</button>
</div>
Expand Down Expand Up @@ -299,7 +299,6 @@ export default {
screenSharingMenuOpen: false,
splitScreenSharingMenu: false,
boundaryElement: document.querySelector('.main-view'),
isQualityWarningTooltipDismissed: false,
mouseover: false,
callAnalyzer: callAnalyzer,
qualityWarningInGracePeriodTimeout: null,
Expand Down Expand Up @@ -438,6 +437,10 @@ export default {
return (this.model.attributes.localScreen || this.splitScreenSharingMenu) ? t('spreed', 'Screensharing options') : t('spreed', 'Enable screensharing')
},

isQualityWarningTooltipDismissed() {
return this.$store.getters.isQualityWarningTooltipDismissed
},

showQualityWarningTooltip() {
return this.qualityWarningTooltip && (!this.isQualityWarningTooltipDismissed || this.mouseover)
},
Expand Down Expand Up @@ -753,12 +756,16 @@ export default {
}
if (this.qualityWarningTooltip.action === 'disableScreenShare') {
this.model.stopSharingScreen()
this.isQualityWarningTooltipDismissed = true
this.dismissQualityWarningTooltip()
} else if (this.qualityWarningTooltip.action === 'disableVideo') {
this.model.disableVideo()
this.isQualityWarningTooltipDismissed = true
this.dismissQualityWarningTooltip()
}
},

dismissQualityWarningTooltip() {
this.$store.dispatch('dismissQualityWarningTooltip')
},
},
}
</script>
Expand Down
11 changes: 11 additions & 0 deletions src/store/callViewStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const state = {
lastIsStripeOpen: null,
presentationStarted: false,
selectedVideoPeerId: null,
qualityWarningTooltipDismissed: false,
participantRaisedHands: {},
backgroundImageAverageColorCache: {},
}
Expand All @@ -46,6 +47,7 @@ const getters = {
selectedVideoPeerId: (state) => {
return state.selectedVideoPeerId
},
isQualityWarningTooltipDismissed: (state) => state.qualityWarningTooltipDismissed,
getParticipantRaisedHand: (state) => (sessionIds) => {
for (let i = 0; i < sessionIds.length; i++) {
if (state.participantRaisedHands[sessionIds[i]]) {
Expand Down Expand Up @@ -81,6 +83,9 @@ const mutations = {
presentationStarted(state, value) {
state.presentationStarted = value
},
setQualityWarningTooltipDismissed(state, { qualityWarningTooltipDismissed }) {
state.qualityWarningTooltipDismissed = qualityWarningTooltipDismissed
},
setParticipantHandRaised(state, { sessionId, raisedHand }) {
if (!sessionId) {
throw new Error('Missing or empty sessionId argument in call to setParticipantHandRaised')
Expand Down Expand Up @@ -119,6 +124,8 @@ const actions = {
isGrid = (isGrid === 'true')
}
context.dispatch('setCallViewMode', { isGrid: isGrid, isStripeOpen: true })

context.commit('setQualityWarningTooltipDismissed', { qualityWarningTooltipDismissed: false })
},

leaveCall(context) {
Expand Down Expand Up @@ -210,6 +217,10 @@ const actions = {
})
context.commit('presentationStarted', false)
},

dismissQualityWarningTooltip(context) {
context.commit('setQualityWarningTooltipDismissed', { qualityWarningTooltipDismissed: true })
},
}

export default { state, mutations, getters, actions }