Fix stuff

owncloud · Dec 23, 2023 · 8b46a4d · 8b46a4d
1 parent 3897926
commit 8b46a4d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
@@ -122,11 +122,10 @@
 <script lang="ts">
 import { computed, defineComponent, inject, Ref, ref, unref, watch } from 'vue'
 import { mapGetters } from 'vuex'
-import { ImageDimension, useConfigurationManager, useUserContext } from '@ownclouders/web-pkg'
+import { ImageDimension, useConfigurationManager } from '@ownclouders/web-pkg'
 import upperFirst from 'lodash-es/upperFirst'
 import { ShareTypes } from '@ownclouders/web-client/src/helpers/share'
 import {
-  useCapabilityFilesTags,
   useClientService,
   usePublicLinkContext,
   useStore,
@@ -176,7 +175,6 @@ export default defineComponent({
     const resource = inject<Ref<Resource>>('resource')
     const space = inject<Ref<SpaceResource>>('space')
     const isPublicLinkContext = usePublicLinkContext({ store })
-    const isUserContext = useUserContext({ store })
     const previewService = usePreviewService()
     const preview = ref(undefined)
 
@@ -260,9 +258,8 @@ export default defineComponent({
       data: tagsHelper({ configurationManager: configurationManager })
     } as ContextualHelper
 
-    const capabilityFilesTags = useCapabilityFilesTags()
     const hasTags = computed(() => {
-      return props.tagsEnabled && unref(capabilityFilesTags) && unref(isUserContext)
+      return props.tagsEnabled && unref(capabilityFilesTags)
     })
 
     return {

diff --git a/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue b/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
@@ -234,7 +234,10 @@ export default defineComponent({
       if (unref(resource)?.tags) {
         selectedTags.value = unref(currentTags)
       }
-      loadAvailableTagsTask.perform()
+
+      if (!unref(readonly)) {
+        loadAvailableTagsTask.perform()
+      }
     })
 
     const keydownMethods = (map, vm) => {

diff --git a/packages/web-runtime/src/components/Topbar/TopBar.vue b/packages/web-runtime/src/components/Topbar/TopBar.vue
@@ -138,7 +138,11 @@ export default {
       return props.applicationsList
         .filter((app) => {
           if (app.type === 'extension') {
-            return app?.applicationMenu?.enabled(store, ability) && !permittedMenus.includes('user')
+            return (
+              app.applicationMenu.enabled instanceof Function &&
+              app.applicationMenu.enabled(store, ability) &&
+              !permittedMenus.includes('user')
+            )
           }
           return isNavItemPermitted(permittedMenus, app)
         })