chore: switch to apollo-composable

components/pages/events/index.vue

@@ -1,9 +1,10 @@
 <template>
   <div :key="isAuthenticated">
+    <span v-text="isAuthenticated"/>
     <v-container fluid grid-list-md class="app-fade-in" :key="range">
       <v-layout row wrap v-if="!isAuthenticated">
         <v-flex xs12>
-          <p><b v-text="$t('events.login')" /></p>
+          <p><b v-text="$t('events.login')"/></p>
         </v-flex>
       </v-layout>
       <v-layout row wrap>
@@ -16,10 +17,11 @@
             <v-tooltip top slot="append-outer">
               <template v-slot:activator="{ on }">
                 <v-icon v-on="on" v-on:click="fetchAddress()"
-                  >mdi-crosshairs-gps</v-icon
+                >mdi-crosshairs-gps
+                </v-icon
                 >
               </template>
-              <span v-text="$t('origins.fetchAddress')" />
+              <span v-text="$t('origins.fetchAddress')"/>
             </v-tooltip>
             <v-tooltip top slot="prepend" v-if="isAuthenticated">
               <template v-slot:activator="{ on }">
@@ -27,10 +29,11 @@
                   v-on="on"
                   :disabled="!origin"
                   v-on:click="saveOrigin(origin)"
-                  >mdi-bookmark-plus-outline</v-icon
+                >mdi-bookmark-plus-outline
+                </v-icon
                 >
               </template>
-              <span v-text="$t('origins.save')" />
+              <span v-text="$t('origins.save')"/>
             </v-tooltip>
           </v-text-field>
         </v-flex>
@@ -77,168 +80,168 @@
 </template>
 
 <script>
-import { useRouter, useMutations } from '@u3u/vue-hooks'
-import { computed, ref, watch } from '@vue/composition-api'
-import useAuth from '../../../plugins/auth'
+  import { useMutations, useRouter } from '@u3u/vue-hooks'
+  import { computed, ref, watch } from '@vue/composition-api'
+  import { useAuth } from '../../../plugins/auth'
 
-import List from './List'
-import { useLazyQuery, useMutation, useResult } from '../../../plugins/apollo'
-import {
-  fetchAddress,
-  findEvents,
-  saveOrigin,
-  toggleIgnoreBand,
-  toggleIgnoreCity,
-  toggleIgnoreDanceHall,
-  toggleIgnoreMunicipality,
-  toggleIgnoreState
-} from '../../../utils/graph-client'
-import { useTranslation } from '../../../plugins/i18n'
+  import List from './List'
+  import { useMutation, useQuery, useResult } from '@vue/apollo-composable'
+  import {
+    fetchAddress,
+    findEvents,
+    saveOrigin,
+    toggleIgnoreBand,
+    toggleIgnoreCity,
+    toggleIgnoreDanceHall,
+    toggleIgnoreMunicipality,
+    toggleIgnoreState
+  } from '../../../utils/graph-client'
+  import { useTranslation } from '../../../plugins/i18n'
 
-export default {
-  components: {
-    List
-  },
-  setup() {
-    const { setTitle } = useMutations(['setTitle'])
-    const { t } = useTranslation()
-    setTitle(t('app.links.events'))
-    const { loading: authLoading, isAuthenticated } = useAuth()
-    const { route, router } = useRouter()
-    const range = computed({
-      get: () => route.value.query.range || 'ONE_WEEK',
-      set: value => router.push(`/?range=${value}`)
-    })
-    const [query, { data }] = useLazyQuery(findEvents)
-    const events = useResult(data, [], result => result.events)
-    const origins = useResult(data, [], result => result.origins)
-    watch(
-      () => range.value,
-      r => {
-        query({
-          variables: {
+  export default {
+    components: {
+      List
+    },
+    setup() {
+      const { setTitle } = useMutations(['setTitle'])
+      const { t } = useTranslation()
+      setTitle(t('app.links.events'))
+      const { loading: authLoading, isAuthenticated } = useAuth()
+      const { route, router } = useRouter()
+      const range = computed({
+        get: () => route.value.query.range || 'ONE_WEEK',
+        set: value => router.push(`/?range=${value}`)
+      })
+      const enabled = ref(false)
+      const { result: data, refetch } = useQuery(findEvents, { includeOrigins: false }, () => ({ enabled: enabled.value }))
+      const events = useResult(data, [], result => result.events)
+      const origins = useResult(data, [], result => result.origins)
+      watch(
+        range,
+        r => {
+          enabled.value = true
+          console.log('isAuthenticated', isAuthenticated.value)
+          refetch({
             range: r,
-            includeOrigins: isAuthenticated.value
-          }
-        })
-      },
-      { lazy: false }
-    )
-    const submitting = ref(true)
-    const ranges = [
-      { name: '1 vecka', value: 'ONE_WEEK' },
-      { name: '2 veckor', value: 'TWO_WEEKS' },
-      { name: '1 månad', value: 'ONE_MONTH' },
-      { name: '1 kvartal', value: 'ONE_QUARTER' },
-      { name: '1 år', value: 'ONE_YEAR' }
-    ]
-    const snackbar = ref({ active: false, color: 'success', text: '' })
+            includeOrigins: isAuthenticated.value || false
+          })
+        },
+        { lazy: false }
+      )
+      const submitting = ref(true)
+      const ranges = [
+        { name: '1 vecka', value: 'ONE_WEEK' },
+        { name: '2 veckor', value: 'TWO_WEEKS' },
+        { name: '1 månad', value: 'ONE_MONTH' },
+        { name: '1 kvartal', value: 'ONE_QUARTER' },
+        { name: '1 år', value: 'ONE_YEAR' }
+      ]
+      const snackbar = ref({ active: false, color: 'success', text: '' })
 
-    const origin = ref('')
-    const fetchEvents = () => {
-      const originsTemp = [...(origins.value || [])]
-      if (origin.value) {
-        originsTemp.push(origin.value)
-      }
-      query({
-        variables: {
+      const origin = ref('')
+      const fetchEvents = () => {
+        const originsTemp = [...(origins.value || [])]
+        if (origin.value) {
+          originsTemp.push(origin.value)
+        }
+        enabled.value = true
+        refetch({
           range: range.value,
           origins: originsTemp,
           includeOrigins: isAuthenticated.value || false
-        }
-      })
-    }
-
-    const [doToggleIgnoreBand] = useMutation(toggleIgnoreBand)
-    const [doToggleIgnoreDanceHall] = useMutation(toggleIgnoreDanceHall)
-    const [doToggleIgnoreCity] = useMutation(toggleIgnoreCity)
-    const [doToggleIgnoreMunicipality] = useMutation(toggleIgnoreMunicipality)
-    const [doToggleIgnoreState] = useMutation(toggleIgnoreState)
-
-    const toggleIgnoreSuccess = name => {
-      return () => {
-        fetchEvents()
-        snackbar.value.color = 'success'
-        snackbar.value.text = `${name} har dolts`
-        snackbar.value.active = true
-      }
-    }
-
-    const toggleIgnoreFailed = name => {
-      return () => {
-        snackbar.value.color = 'error'
-        snackbar.value.text = `${name} kunde inte döljas`
-        snackbar.value.active = true
-      }
-    }
-
-    const toggleIgnore = (type, name) => {
-      switch (type) {
-        case 'band':
-          doToggleIgnoreBand({ variables: { name } })
-            .then(toggleIgnoreSuccess(name))
-            .catch(toggleIgnoreFailed)
-          break
-        case 'danceHall':
-          doToggleIgnoreDanceHall({ variables: { name } })
-            .then(toggleIgnoreSuccess(name))
-            .catch(toggleIgnoreFailed)
-          break
-        case 'city':
-          doToggleIgnoreCity({ variables: { name } })
-            .then(toggleIgnoreSuccess(name))
-            .catch(toggleIgnoreFailed)
-          break
-        case 'municipality':
-          doToggleIgnoreMunicipality({ variables: { name } })
-            .then(toggleIgnoreSuccess(name))
-            .catch(toggleIgnoreFailed)
-          break
-        case 'state':
-          doToggleIgnoreState({ variables: { name } })
-            .then(toggleIgnoreSuccess(name))
-            .catch(toggleIgnoreFailed)
-          break
-        default:
-      }
-    }
-
-    const [doSaveOrigin] = useMutation(saveOrigin)
-    const [doFetchAddress, { data: address }] = useLazyQuery(fetchAddress)
-    const fetchAddressFn = () => {
-      if (window.navigator) {
-        window.navigator.geolocation.getCurrentPosition(pos => {
-          doFetchAddress({
-            variables: {
-              latlng: `${pos.coords.latitude},${pos.coords.longitude}`
-            }
-          }).then(() => {
-            origin.value = address.value.address
-          })
         })
       }
-    }
-    const saveOriginFn = o =>
-      doSaveOrigin({ variables: { origin: o } }).then(() => {
-        origin.value = ''
-        fetchEvents()
-      })
 
-    return {
-      authLoading,
-      isAuthenticated,
-      range,
-      events,
-      origins,
-      query: fetchEvents,
-      submitting,
-      ranges,
-      snackbar,
-      toggleIgnore,
-      origin,
-      fetchAddress: fetchAddressFn,
-      saveOrigin: saveOriginFn
+      const { mutate: doToggleIgnoreBand } = useMutation(toggleIgnoreBand)
+      const { mutate: doToggleIgnoreDanceHall } = useMutation(toggleIgnoreDanceHall)
+      const { mutate: doToggleIgnoreCity } = useMutation(toggleIgnoreCity)
+      const { mutate: doToggleIgnoreMunicipality } = useMutation(toggleIgnoreMunicipality)
+      const { mutate: doToggleIgnoreState } = useMutation(toggleIgnoreState)
+
+      const toggleIgnoreSuccess = name => {
+        return () => {
+          fetchEvents()
+          snackbar.value.color = 'success'
+          snackbar.value.text = `${name} har dolts`
+          snackbar.value.active = true
+        }
+      }
+
+      const toggleIgnoreFailed = name => {
+        return () => {
+          snackbar.value.color = 'error'
+          snackbar.value.text = `${name} kunde inte döljas`
+          snackbar.value.active = true
+        }
+      }
+
+      const toggleIgnore = (type, name) => {
+        switch (type) {
+          case 'band':
+            doToggleIgnoreBand({ name })
+              .then(toggleIgnoreSuccess(name))
+              .catch(toggleIgnoreFailed)
+            break
+          case 'danceHall':
+            doToggleIgnoreDanceHall({ name })
+              .then(toggleIgnoreSuccess(name))
+              .catch(toggleIgnoreFailed)
+            break
+          case 'city':
+            doToggleIgnoreCity({ name })
+              .then(toggleIgnoreSuccess(name))
+              .catch(toggleIgnoreFailed)
+            break
+          case 'municipality':
+            doToggleIgnoreMunicipality({ name })
+              .then(toggleIgnoreSuccess(name))
+              .catch(toggleIgnoreFailed)
+            break
+          case 'state':
+            doToggleIgnoreState({ name })
+              .then(toggleIgnoreSuccess(name))
+              .catch(toggleIgnoreFailed)
+            break
+          default:
+        }
+      }
+
+      const { mutate: doSaveOrigin } = useMutation(saveOrigin)
+      const addressEnabled = ref(false)
+      const { result: address, refetch: doFetchAddress } = useQuery(fetchAddress, {}, () => ({ enabled: addressEnabled.value }))
+      const fetchAddressFn = () => {
+        if (window.navigator) {
+          window.navigator.geolocation.getCurrentPosition(pos => {
+            addressEnabled.value = true
+            doFetchAddress({
+              latlng: `${pos.coords.latitude},${pos.coords.longitude}`
+            }).then(() => {
+              origin.value = address.value.address
+            })
+          })
+        }
+      }
+      const saveOriginFn = o =>
+        doSaveOrigin({ origin: o }).then(() => {
+          origin.value = ''
+          fetchEvents()
+        })
+
+      return {
+        authLoading,
+        isAuthenticated,
+        range,
+        events,
+        origins,
+        query: fetchEvents,
+        submitting,
+        ranges,
+        snackbar,
+        toggleIgnore,
+        origin,
+        fetchAddress: fetchAddressFn,
+        saveOrigin: saveOriginFn
+      }
     }
   }
-}
 </script>

components/pages/filters/index.vue

@@ -69,8 +69,8 @@ import {
 } from '~/utils/graph-client'
 
 import List from './List'
-import { useMutation, useQuery, useResult } from '../../../plugins/apollo'
-import useAuth from '../../../plugins/auth'
+import { useMutation, useQuery, useResult } from '@vue/apollo-composable'
+import { useAuth } from '../../../plugins/auth'
 import { useTranslation } from '../../../plugins/i18n'
 
 export default {
@@ -82,18 +82,18 @@ export default {
     const { t } = useTranslation()
     setTitle(t('app.links.filters'))
     const { isAuthenticated } = useAuth()
-    const { data, loading, refetch } = useQuery(fetchFilters)
+    const { result: data, loading, refetch } = useQuery(fetchFilters)
     const bands = useResult(data, [], result => result.bands)
     const cities = useResult(data, [], result => result.cities)
     const danceHalls = useResult(data, [], result => result.danceHalls)
     const municipalities = useResult(data, [], result => result.municipalities)
     const states = useResult(data, [], result => result.states)
     const snackbar = ref({ active: false, color: 'success', text: '' })
-    const [doToggleIgnoreBand] = useMutation(toggleIgnoreBand)
-    const [doToggleIgnoreDanceHall] = useMutation(toggleIgnoreDanceHall)
-    const [doToggleIgnoreCity] = useMutation(toggleIgnoreCity)
-    const [doToggleIgnoreMunicipality] = useMutation(toggleIgnoreMunicipality)
-    const [doToggleIgnoreState] = useMutation(toggleIgnoreState)
+    const {mutate: doToggleIgnoreBand} = useMutation(toggleIgnoreBand)
+    const {mutate: doToggleIgnoreDanceHall} = useMutation(toggleIgnoreDanceHall)
+    const {mutate: doToggleIgnoreCity} = useMutation(toggleIgnoreCity)
+    const {mutate: doToggleIgnoreMunicipality} = useMutation(toggleIgnoreMunicipality)
+    const {mutate: doToggleIgnoreState} = useMutation(toggleIgnoreState)
 
     const toggleIgnoreSuccess = name => {
       return () => {
@@ -115,27 +115,27 @@ export default {
     const toggleIgnore = (type, name) => {
       switch (type) {
         case 'band':
-          doToggleIgnoreBand({ variables: { name } })
+          doToggleIgnoreBand({ name })
             .then(toggleIgnoreSuccess(name))
             .catch(toggleIgnoreFailed)
           break
         case 'danceHall':
-          doToggleIgnoreDanceHall({ variables: { name } })
+          doToggleIgnoreDanceHall({ name })
             .then(toggleIgnoreSuccess(name))
             .catch(toggleIgnoreFailed)
           break
         case 'city':
-          doToggleIgnoreCity({ variables: { name } })
+          doToggleIgnoreCity({ name })
             .then(toggleIgnoreSuccess(name))
             .catch(toggleIgnoreFailed)
           break
         case 'municipality':
-          doToggleIgnoreMunicipality({ variables: { name } })
+          doToggleIgnoreMunicipality({ name })
             .then(toggleIgnoreSuccess(name))
             .catch(toggleIgnoreFailed)
           break
         case 'state':
-          doToggleIgnoreState({ variables: { name } })
+          doToggleIgnoreState({ name })
             .then(toggleIgnoreSuccess(name))
             .catch(toggleIgnoreFailed)
           break

components/pages/origins/index.vue

@@ -11,10 +11,11 @@
             <v-tooltip top slot="append-outer">
               <template v-slot:activator="{ on }">
                 <v-icon v-on="on" v-on:click="fetchAddress()"
-                  >mdi-crosshairs-gps</v-icon
+                >mdi-crosshairs-gps
+                </v-icon
                 >
               </template>
-              <span v-text="$t('origins.fetchAddress')" />
+              <span v-text="$t('origins.fetchAddress')"/>
             </v-tooltip>
             <v-tooltip top slot="prepend">
               <template v-slot:activator="{ on }">
@@ -22,10 +23,11 @@
                   v-on="on"
                   :disabled="!origin"
                   v-on:click="saveOrigin(origin)"
-                  >mdi-bookmark-plus-outline</v-icon
+                >mdi-bookmark-plus-outline
+                </v-icon
                 >
               </template>
-              <span v-text="$t('origins.save')" />
+              <span v-text="$t('origins.save')"/>
             </v-tooltip>
           </v-text-field>
         </v-flex>
@@ -36,10 +38,10 @@
             <v-tooltip top slot="prepend">
               <template v-slot:activator="{ on }">
                 <v-icon v-on="on" v-on:click="removeOrigin(origin)"
-                  >mdi-delete-outline
+                >mdi-delete-outline
                 </v-icon>
               </template>
-              <span v-text="$t('origins.remove')" />
+              <span v-text="$t('origins.remove')"/>
             </v-tooltip>
             <span>{{ origin }}</span>
           </v-flex>
@@ -57,66 +59,55 @@
 </template>
 
 <script>
-import { ref } from '@vue/composition-api'
-import { useMutations } from '@u3u/vue-hooks'
-import {
-  fetchAddress,
-  findOrigins,
-  removeOrigin,
-  saveOrigin
-} from '../../../utils/graph-client'
-import {
-  useLazyQuery,
-  useMutation,
-  useQuery,
-  useResult
-} from '../../../plugins/apollo'
-import useAuth from '../../../plugins/auth'
-import { useTranslation } from '../../../plugins/i18n'
+  import { ref } from '@vue/composition-api'
+  import { useMutations } from '@u3u/vue-hooks'
+  import { fetchAddress, findOrigins, removeOrigin, saveOrigin } from '../../../utils/graph-client'
+  import { useMutation, useQuery, useResult } from '@vue/apollo-composable'
+  import { useAuth } from '../../../plugins/auth'
+  import { useTranslation } from '../../../plugins/i18n'
 
-export default {
-  setup() {
-    const { setTitle } = useMutations(['setTitle'])
-    const { t } = useTranslation()
-    setTitle(t('app.links.origins'))
-    const { isAuthenticated } = useAuth()
-    const { data, loading, refetch } = useQuery(findOrigins)
-    const origins = useResult(data, [])
-    const snackbar = ref({ active: false, color: 'success', text: '' })
-    const [doSaveOrigin] = useMutation(saveOrigin)
-    const [doRemoveOrigin] = useMutation(removeOrigin)
-    const [doFetchAddress] = useLazyQuery(fetchAddress)
-    const origin = ref('')
-    const fetchAddressFn = () => {
-      if (window.navigator) {
-        window.navigator.geolocation.getCurrentPosition(pos => {
-          doFetchAddress({
-            variables: {
-              latlng: `${pos.coords.latitude},${pos.coords.longitude}`
-            }
-          }).then(res => {
-            origin.value = res.address
+  export default {
+    setup() {
+      const { setTitle } = useMutations(['setTitle'])
+      const { t } = useTranslation()
+      setTitle(t('app.links.origins'))
+      const { isAuthenticated } = useAuth()
+      const { result: data, loading, refetch } = useQuery(findOrigins)
+      const origins = useResult(data, [])
+      const snackbar = ref({ active: false, color: 'success', text: '' })
+      const {mutate: doSaveOrigin} = useMutation(saveOrigin)
+      const {mutate: doRemoveOrigin} = useMutation(removeOrigin)
+      const enabled = ref(false)
+      const { refetch: doFetchAddress } = useQuery(fetchAddress, {}, () => ({ enabled: enabled.value }))
+      const origin = ref('')
+      const fetchAddressFn = () => {
+        if (window.navigator) {
+          window.navigator.geolocation.getCurrentPosition(pos => {
+            enabled.value = true
+            doFetchAddress({ latlng: `${pos.coords.latitude},${pos.coords.longitude}` })
+              .then(res => {
+                origin.value = res.address
+              })
           })
+        }
+      }
+      const saveOriginFn = o =>
+        doSaveOrigin({ origin: o }).then(() => {
+          refetch()
+          origin.value = ''
         })
+      const removeOriginFn = o =>
+        doRemoveOrigin({ origin: o }).then(() => refetch())
+      return {
+        isAuthenticated,
+        loading,
+        origins,
+        snackbar,
+        origin,
+        saveOrigin: saveOriginFn,
+        removeOrigin: removeOriginFn,
+        fetchAddress: fetchAddressFn
       }
     }
-    const saveOriginFn = o =>
-      doSaveOrigin({ variables: { origin: o } }).then(() => {
-        refetch()
-        origin.value = ''
-      })
-    const removeOriginFn = o =>
-      doRemoveOrigin({ variables: { origin: o } }).then(() => refetch())
-    return {
-      isAuthenticated,
-      loading,
-      origins,
-      snackbar,
-      origin,
-      saveOrigin: saveOriginFn,
-      removeOrigin: removeOriginFn,
-      fetchAddress: fetchAddressFn
-    }
   }
-}
 </script>