Merge pull request #5555 from nextcloud/backport/5550/stable20

[stable20] Fix quality warning tooltip not staying dismissed
nextcloud · May 6, 2021 · 8b8acc1 · 8b8acc1
2 parents 7c8d79e + c20602d
commit 8b8acc1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/components/CallView/shared/LocalMediaControls.vue b/src/components/CallView/shared/LocalMediaControls.vue
@@ -118,7 +118,7 @@
  <button
  v-if="!isQualityWarningTooltipDismissed"
  class="hint__button"
- @click="isQualityWarningTooltipDismissed = true">
+ @click="dismissQualityWarningTooltip">
  {{ t('spreed', 'Dismiss') }}
  </button>
  </div>
@@ -183,7 +183,6 @@ export default {
  screenSharingMenuOpen: false,
  splitScreenSharingMenu: false,
  boundaryElement: document.querySelector('.main-view'),
- isQualityWarningTooltipDismissed: false,
  mouseover: false,
  }
  },
@@ -314,6 +313,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)
  },
@@ -469,16 +472,20 @@ 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()
  }
  },
 
  handleStopFollowing() {
  this.$store.dispatch('selectedVideoPeerId', null)
  },
+
+ dismissQualityWarningTooltip() {
+ this.$store.dispatch('dismissQualityWarningTooltip')
+ },
  },
 }
 </script>

diff --git a/src/store/callViewStore.js b/src/store/callViewStore.js
@@ -25,6 +25,7 @@ import Vue from 'vue'
 const state = {
  isGrid: false,
  selectedVideoPeerId: null,
+ qualityWarningTooltipDismissed: false,
  backgroundImageAverageColorCache: {},
 }
 
@@ -35,6 +36,7 @@ const getters = {
  selectedVideoPeerId: (state) => {
  return state.selectedVideoPeerId
  },
+ isQualityWarningTooltipDismissed: (state) => state.qualityWarningTooltipDismissed,
  getCachedBackgroundImageAverageColor: (state) => (videoBackgroundId) => {
  return state.backgroundImageAverageColorCache[videoBackgroundId]
  },
@@ -48,6 +50,9 @@ const mutations = {
  selectedVideoPeerId(state, value) {
  state.selectedVideoPeerId = value
  },
+ setQualityWarningTooltipDismissed(state, { qualityWarningTooltipDismissed }) {
+ state.qualityWarningTooltipDismissed = qualityWarningTooltipDismissed
+ },
  setCachedBackgroundImageAverageColor(state, { videoBackgroundId, backgroundImageAverageColor }) {
  Vue.set(state.backgroundImageAverageColorCache, videoBackgroundId, backgroundImageAverageColor)
  },
@@ -64,13 +69,21 @@ const actions = {
  context.commit('selectedVideoPeerId', value)
  },
 
+ joinCall(context, { token }) {
+ context.commit('setQualityWarningTooltipDismissed', { qualityWarningTooltipDismissed: false })
+ },
+
  leaveCall(context) {
  context.commit('clearBackgroundImageAverageColorCache')
  },
 
  setCachedBackgroundImageAverageColor(context, { videoBackgroundId, backgroundImageAverageColor }) {
  context.commit('setCachedBackgroundImageAverageColor', { videoBackgroundId, backgroundImageAverageColor })
  },
+
+ dismissQualityWarningTooltip(context) {
+ context.commit('setQualityWarningTooltipDismissed', { qualityWarningTooltipDismissed: true })
+ },
 }
 
 export default { state, mutations, getters, actions }