Fix fileExtensionShown toggle for ResourceTiles

owncloud · Feb 17, 2023 · 17ba1f4 · 17ba1f4
1 parent 0ae35ff
commit 17ba1f4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/changelog/unreleased/enhancement-resources-tiles-view b/changelog/unreleased/enhancement-resources-tiles-view
@@ -9,6 +9,7 @@ https://github.com/owncloud/web/pull/8372
 https://github.com/owncloud/web/pull/8392
 https://github.com/owncloud/web/pull/8404
 https://github.com/owncloud/web/pull/8410
+https://github.com/owncloud/web/pull/8460
 https://github.com/owncloud/web/issues/6378
 https://github.com/owncloud/web/issues/6379
 https://github.com/owncloud/web/issues/6380

diff --git a/packages/design-system/src/components/OcTile/OcTile.vue b/packages/design-system/src/components/OcTile/OcTile.vue
@@ -43,6 +43,7 @@
           <oc-resource
             :resource="resource"
             :is-icon-displayed="false"
+            :is-extension-displayed="isExtensionDisplayed"
             :folder-link="resourceRoute"
             @click="$emit('click')"
           />
@@ -98,6 +99,10 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: false
+    },
+    isExtensionDisplayed: {
+      type: Boolean,
+      default: true
     }
   },
   emits: ['click', 'contextmenu']

diff --git a/packages/web-app-files/src/components/FilesList/ResourceTiles.vue b/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
@@ -41,6 +41,7 @@
           :resource="resource"
           :resource-route="getRoute(resource)"
           :is-resource-selected="isResourceSelected(resource)"
+          :is-extension-displayed="areFileExtensionsShown"
           @vue:mounted="
             $emit('rowMounted', resource, tileRefs.tiles[resource.id], ImageDimension.Tile)
           "
@@ -155,6 +156,8 @@ export default defineComponent({
     const store = useStore()
     const { $gettext } = useGettext()
 
+    const areFileExtensionsShown = computed(() => store.state.Files.areFileExtensionsShown)
+
     const tileRefs = ref({
       tiles: [],
       dropBtns: []
@@ -270,6 +273,7 @@ export default defineComponent({
     })
 
     return {
+      areFileExtensionsShown,
       emitTileClick,
       getRoute,
       showContextMenuOnBtnClick,

diff --git a/packages/web-app-files/tests/unit/components/FilesList/ResourceTiles.spec.ts b/packages/web-app-files/tests/unit/components/FilesList/ResourceTiles.spec.ts
@@ -1,5 +1,5 @@
-import { defaultPlugins, mount } from 'web-test-helpers'
-import ResourceTiles from '../../../../src/components/FilesList/ResourceTiles.vue'
+import { createStore, defaultPlugins, defaultStoreMockOptions, mount } from 'web-test-helpers'
+import ResourceTiles from 'web-app-files/src/components/FilesList/ResourceTiles.vue'
 import { sortFields } from 'web-app-files/src/helpers/ui/resourceTiles'
 
 const spacesResources = [
@@ -72,6 +72,9 @@ describe('ResourceTiles component', () => {
   })
 
   function getWrapper(props = {}, slots = {}) {
+    const storeOptions = defaultStoreMockOptions
+    const store = createStore(storeOptions)
+
     return {
       wrapper: mount(ResourceTiles, {
         props: {
@@ -81,7 +84,7 @@ describe('ResourceTiles component', () => {
           ...slots
         },
         global: {
-          plugins: [...defaultPlugins({ designSystem: false })]
+          plugins: [...defaultPlugins({ designSystem: false }), store]
         }
       })
     }