Merge pull request #11325 from nextcloud/fix/noid/migrate-talk-hash-m…

…ixin

follow-up: adjust talkHash store

src/components/LeftSidebar/LeftSidebar.spec.js

@@ -1,6 +1,7 @@
 import { createLocalVue, mount } from '@vue/test-utils'
 import flushPromises from 'flush-promises' // TODO fix after migration to @vue/test-utils v2.0.0
 import { cloneDeep } from 'lodash'
+import { createPinia, setActivePinia } from 'pinia'
 import VueRouter from 'vue-router'
 import Vuex from 'vuex'
 
@@ -57,6 +58,7 @@ describe('LeftSidebar.vue', () => {
 		localVue = createLocalVue()
 		localVue.use(Vuex)
 		localVue.use(VueRouter)
+		setActivePinia(createPinia())
 
 		loadStateSettings = {
 			circles_enabled: true,

src/components/LeftSidebar/LeftSidebar.vue

@@ -364,6 +364,7 @@ export default {
 		const searchBox = ref(null)
 		const list = ref(null)
 
+		const talkHashStore = useTalkHashStore()
 		const { initializeNavigation, resetNavigation } = useArrowNavigation(leftSidebar, searchBox, '.list-item')
 		const isMobile = useIsMobile()
 
@@ -373,6 +374,7 @@ export default {
 			leftSidebar,
 			searchBox,
 			list,
+			talkHashStore,
 			isMobile,
 			canModerateSipDialOut,
 		}
@@ -559,7 +561,7 @@ export default {
 					})
 					break
 				case 'update-nextcloud-talk-hash':
-					useTalkHashStore().setNextcloudTalkHash(event.data.hash)
+					this.talkHashStore.setNextcloudTalkHash(event.data.hash)
 					break
 				}
 			}

src/composables/useHashCheck.js

@@ -21,7 +21,7 @@
  *
  */
 
-import { watch, computed, ref } from 'vue'
+import { watch, computed } from 'vue'
 
 import { showError, TOAST_PERMANENT_TIMEOUT } from '@nextcloud/dialogs'
 
@@ -35,18 +35,18 @@ import { useTalkHashStore } from '../stores/talkHash.js'
 export function useHashCheck() {
 	const talkHashStore = useTalkHashStore()
 
-	const reloadWarningShown = ref(false)
+	let reloadWarningShown = false
 
 	const isNextcloudTalkHashDirty = computed(() => talkHashStore.isNextcloudTalkHashDirty)
 
 	watch(isNextcloudTalkHashDirty, (newValue) => {
-		if (newValue && !reloadWarningShown.value) {
+		if (newValue && !reloadWarningShown) {
 			showReloadWarning()
 		}
 	})
 
 	const showReloadWarning = () => {
-		reloadWarningShown.value = true
+		reloadWarningShown = true
 
 		showError(t('spreed', 'Nextcloud Talk was updated, please reload the page'), {
 			timeout: TOAST_PERMANENT_TIMEOUT,