Merge remote-tracking branch 'origin/master'

ui/src/pages/ActivityLogs.vue

@@ -1,5 +1,5 @@
 <template>
-  <q-page v-if="canReadUser" class="act-page with-bg">
+  <q-page v-if="isAllowed" class="act-page with-bg">
 
     <!-- =======================================================
          🔍 FILTER BAR
@@ -218,14 +218,14 @@
 
 
 <script setup>
-import { ref,onMounted, watch } from 'vue'
+import { ref, computed, onMounted, watch } from 'vue'
 import { date } from 'quasar'
 import { useActivityLogStore } from 'src/stores/activityLogStore'
 import { useAuthStore } from 'stores/authStore.js'
 import { usePermission } from 'src/composables/usePermission'
+import { isActivityLogsAllowedUser } from 'src/modules/activityLogs'
 
-const { canRead, canUpdate } = usePermission()
-const canReadUser = canRead('user')
+const { canUpdate } = usePermission()
 const canUpdateUser = canUpdate('user')
 
 const diffDialog = ref(false)
@@ -236,6 +236,7 @@ const selectedDiff = ref({
 })
 const store = useActivityLogStore()
 const auth = useAuthStore()
+const isAllowed = computed(() => isActivityLogsAllowedUser(auth.user))
 
 const categoryOptions = [
   { label: 'Auth', value: 'auth' },