Merge branch 'app' into app-publish

.github/workflows/azure-functions.yml

@@ -32,7 +32,7 @@ jobs:
         env:
           NITRO_PRESET: azure-functions
           IZNIK_API_V1: https://fdapilive.ilovefreegle.org/api
-          IZNIK_API_V2: https://api.ilovefreegle.org:8192/apiv2
+          IZNIK_API_V2: https://api.ilovefreegle.org/apiv2
 
       - name: 'Deploy to Azure Functions'
         uses: Azure/functions-action@v1

README.md

@@ -31,7 +31,7 @@ npm install --legacy-peer-deps
 Set some environment variables:
 ```
 IZNIK_API_V1=https://fdapidbg.ilovefreegle.org/api
-IZNIK_API_V2=https://api.ilovefreegle.org:8192/apiv2
+IZNIK_API_V2=https://api.ilovefreegle.org/apiv2
 ```
 
 (if running the Go Server locally then http://localhost:8192/api)

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.ilovefreegle.direct"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1201
-        versionName "3.0.1"
+        versionCode 1202
+        versionName "3.0.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

api/AddressAPI.js

@@ -9,6 +9,10 @@ export default class AddressAPI extends BaseAPI {
     return this.$getv2('/address')
   }
 
+  fetchByIdv2(id, logError = true) {
+    return this.$getv2('/address/' + id, [], logError)
+  }
+
   add(data) {
     return this.$put('/address', data)
   }

api/BaseAPI.js

@@ -4,11 +4,19 @@ import { useAuthStore } from '~/stores/auth'
 import { useMobileStore } from '~/stores/mobile'
 import { useMiscStore } from '~/stores/misc'
 
+let timer = 0
+
 // We add fetch retrying.
 // Note that $fetch and useFetch cause problems on Node v18, so we don't use them.
 const ourFetch = fetchRetry(fetch, {
   retries: 10,
   retryOn: (attempt, error, response) => {
+    if (useMiscStore()?.unloading) {
+      // Don't retry if we're unloading.
+      console.log("Unloading - don't retry")
+      return false
+    }
+
     // Retry on pretty much anything except errors which can legitimately be returned by the API server.  These are
     // the low 400s.
     if (error !== null || response?.status > 404) {
@@ -262,6 +270,12 @@ export default class BaseAPI {
   }
 
   async $requestv2(method, path, config, logError = true, body = null) {
+    timer++
+    const timerLabel = path + ' api-' + timer
+
+    console.log('Start ', timerLabel)
+    console.time(timerLabel)
+
     let status = null
     let data = null
 
@@ -344,7 +358,7 @@ export default class BaseAPI {
     //   probably do the right thing.
     // - otherwise throw an exception.
     if (status !== 200 || !data) {
-      const statusstr = data && data.status ? data.status : 'Unknown'
+      const statusstr = status.toString()
 
       // Whether or not we log this error to Sentry depends.  Most errors are worth logging, because they're unexpected.
       // But some API calls are expected to fail, and throw an exception which is then handled in the code.  We don't
@@ -390,6 +404,8 @@ export default class BaseAPI {
       )
     }
 
+    console.timeEnd(timerLabel)
+
     return data
   }
 

api/ChatAPI.js

@@ -5,11 +5,15 @@ export default class ChatAPI extends BaseAPI {
     return this.$getv2(`/chat/${chatid}/message`)
   }
 
-  async listChats(since, search) {
-    return await this.$getv2('/chat', {
-      since,
-      search,
-    })
+  async listChats(since, search, logError) {
+    return await this.$getv2(
+      '/chat',
+      {
+        since,
+        search,
+      },
+      logError
+    )
   }
 
   fetchChat(chatid, logError) {
@@ -54,40 +58,6 @@ export default class ChatAPI extends BaseAPI {
     return this.$post('/chatrooms', { id: chatid, status: 'Blocked' })
   }
 
-  unseenCount(chatid) {
-    return this.$get('/chatrooms', {
-      count: true,
-      chattypes: ['User2User', 'User2Mod'],
-    })
-  }
-
-  hold(msgid) {
-    return this.$post('/chatmessages', { id: msgid, action: 'Hold' })
-  }
-
-  release(msgid) {
-    return this.$post('/chatmessages', { id: msgid, action: 'Release' })
-  }
-
-  redact(msgid) {
-    return this.$post('/chatmessages', { id: msgid, action: 'Redact' })
-  }
-
-  reject(msgid) {
-    return this.$post('/chatmessages', { id: msgid, action: 'Reject' })
-  }
-
-  approve(msgid) {
-    return this.$post('/chatmessages', { id: msgid, action: 'Approve' })
-  }
-
-  whitelist(msgid) {
-    return this.$post('/chatmessages', {
-      id: msgid,
-      action: 'ApproveAllFuture',
-    })
-  }
-
   rsvp(id, chatid, value) {
     return this.$patch('/chatmessages', {
       roomid: chatid,

api/CommunityEventAPI.js

@@ -1,8 +1,8 @@
 import BaseAPI from '@/api/BaseAPI'
 
 export default class CommunityEventAPI extends BaseAPI {
-  fetch(id) {
-    return this.$getv2('/communityevent/' + id)
+  fetch(id, logError = true) {
+    return this.$getv2('/communityevent/' + id, {}, logError)
   }
 
   list(id) {

api/DashboardAPI.js

@@ -5,4 +5,11 @@ export default class DashboardAPI extends BaseAPI {
     const { dashboard, components } = await this.$get('/dashboard', params)
     return dashboard || components
   }
+
+  async fetchHeatmap(params) {
+    const { heatmap } = await this.$get('/dashboard', {
+      heatmap: true,
+    })
+    return heatmap
+  }
 }

api/NewsAPI.js

@@ -50,7 +50,7 @@ export default class NewsAPI extends BaseAPI {
   }
 
   async seen(id) {
-    await this.$post('/newsfeed', { id, action: 'Seen' })
+    await this.$post('/newsfeed?bump=' + id, { id, action: 'Seen' })
   }
 
   del(id) {

api/NotificationAPI.js

@@ -2,7 +2,7 @@ import BaseAPI from '@/api/BaseAPI'
 
 export default class NotificationAPI extends BaseAPI {
   count() {
-    return this.$getv2('/notification/count')
+    return this.$getv2('/notification/count', {}, false)
   }
 
   list() {

api/SessionAPI.js

@@ -4,14 +4,10 @@ export default class SessionAPI extends BaseAPI {
   fetch(params) {
     // Add the build date to the call.  This is used by the server to spot out of date apps, but we need
     // to make it clear that we're not an app at all.
-    const runtimeConfig = useRuntimeConfig()
-    params.webversion = runtimeConfig.public.BUILD_DATE
     return this.$get('/session', params)
   }
 
   fetchv2(params, log = true) {
-    const runtimeConfig = useRuntimeConfig()
-    params.webversion = runtimeConfig.public.BUILD_DATE
     return this.$getv2('/user', params, log)
   }
 

api/VolunteeringAPI.js

@@ -1,8 +1,8 @@
 import BaseAPI from '@/api/BaseAPI'
 
 export default class VolunteeringAPI extends BaseAPI {
-  fetch(id) {
-    return this.$getv2('/volunteering/' + id)
+  fetch(id, logError = true) {
+    return this.$getv2('/volunteering/' + id, {}, logError)
   }
 
   list(id) {

app.vue

@@ -40,6 +40,7 @@ import { useImageStore } from './stores/image'
 import { useDomainStore } from './stores/domain'
 import { useLogoStore } from './stores/logo'
 import { useLocationStore } from './stores/location'
+import { useShortlinkStore } from './stores/shortlinks'
 
 const route = useRoute()
 
@@ -83,6 +84,7 @@ const imageStore = useImageStore()
 const domainStore = useDomainStore()
 const logoStore = useLogoStore()
 const locationStore = useLocationStore()
+const shortlinkStore = useShortlinkStore()
 
 groupStore.init(runtimeConfig)
 messageStore.init(runtimeConfig)
@@ -113,6 +115,7 @@ imageStore.init(runtimeConfig)
 domainStore.init(runtimeConfig)
 logoStore.init(runtimeConfig)
 locationStore.init(runtimeConfig)
+shortlinkStore.init(runtimeConfig)
 
 // We use a key to force the whole page to re-render if we have logged in.  This is a sledgehammer way of
 // re-calling all the setup() methods etc.  Perhaps there's a better way to do this.

assets/css/global.scss

@@ -322,6 +322,12 @@ form {
   }
 }
 
+.modal-content {
+  // Need to make this scrollable so that e.g. login modal can all be accessed on screens with small height.
+  overflow-y: auto !important;
+  max-height: 100% !important;
+}
+
 label {
   font-weight: bold !important;
 }

components/AdaptiveMap.vue

@@ -96,7 +96,7 @@
             v-if="me"
             v-model="selectedGroup"
             label="Communities to view"
-            label-visually-hidden
+            label-sr-only
             all
             all-my
           />
@@ -282,13 +282,45 @@ export default {
     const selectedType = ref(postType || 'All')
 
     const showGroups = ref(props.startOnGroups)
-    const groupids = ref(props.initialGroupIds)
     const swlat = ref(props.initialBounds[0][0])
     const swlng = ref(props.initialBounds[0][1])
     const nelat = ref(props.initialBounds[1][0])
     const nelng = ref(props.initialBounds[1][1])
     const search = ref(props.initialSearch)
     const searchOn = ref(props.initialSearch)
+    const groupsInMap = ref(null)
+
+    const groupids = computed(() => {
+      const gids = props.initialGroupIds
+
+      const allGroups = Object.values(groupStore.list)
+
+      // Find groups from allGroups with an id in groupids
+      const groups = allGroups.filter((group) => {
+        if (groupsInMap.value) {
+          return groupsInMap.value.includes(group.id)
+        }
+
+        return gids.includes(group.id)
+      })
+
+      // Sort groups by namedisplay case-insensitive ascending
+      groups.sort((a, b) => {
+        const nameA = a.namedisplay.toUpperCase()
+        const nameB = b.namedisplay.toUpperCase()
+        if (nameA < nameB) {
+          return -1
+        }
+        if (nameA > nameB) {
+          return 1
+        }
+
+        // names must be equal
+        return 0
+      })
+
+      return groups.map((group) => group.id)
+    })
 
     if (process.client) {
       const L = await import('leaflet/dist/leaflet-src.esm')
@@ -317,6 +349,7 @@ export default {
       nelng,
       search,
       searchOn,
+      groupsInMap,
     }
   },
   data() {
@@ -576,7 +609,10 @@ export default {
       }
     },
     groupsChanged(groupids) {
-      this.groupids = groupids
+      // When we're showing a region, we want to keep listing all the same groups even if we zoom about.
+      if (!this.region) {
+        this.groupsInMap = groupids
+      }
     },
     doSearch() {
       if (this.search) {
@@ -605,6 +641,7 @@ export default {
 .postcode {
   position: absolute;
   top: 0px;
+
   right: 0px;
   z-index: 20000;
 }

components/AdaptiveMapGroup.vue

@@ -57,9 +57,12 @@ export default {
       required: true,
     },
   },
-  setup() {
+  setup(props) {
     const groupStore = useGroupStore()
 
+    // Fetch the full group so that we get the tagline.
+    groupStore.fetch(props.id, true)
+
     return {
       groupStore,
     }

components/AutoComplete.vue

@@ -465,7 +465,7 @@ export default {
       // Force the list to show.
       this.showList = true
       this.startTimer()
-      let value = this.$refs.input.value
+      let value = this.$refs.input?.value
       if (value) {
         this.getData(value)
       }

components/ChatHeader.vue

@@ -98,10 +98,7 @@
               View profile
             </b-button>
           </div>
-          <div
-            v-if="chat.chattype === 'User2User' || chat.chattype === 'User2Mod'"
-            class="mr-2"
-          >
+          <div v-if="chat.chattype === 'User2User' || !unseen" class="mr-2">
             <b-button
               v-b-tooltip="
                 'Don\'t show this chat unless there\'s a new message'

components/ChatMenu.vue

@@ -69,10 +69,18 @@ export default {
 }
 </script>
 <style scoped lang="scss">
+@import '~bootstrap/scss/functions';
+@import '~bootstrap/scss/variables';
+@import '~bootstrap/scss/mixins/_breakpoints';
+
 .chatbadge {
   position: absolute;
   top: 0px;
-  left: 25px;
+  left: 18px;
+
+  @include media-breakpoint-up(xl) {
+    left: 22px;
+  }
 }
 
 .chat__icon {