Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
373eef2
chore: Tidy logic sharing between AlbumRoots
artonge May 7, 2025
aabc175
feat: Support setting and getting filters in albums
artonge May 7, 2025
b3c7b4f
test(e2e): Enable place filter test
artonge May 7, 2025
03494e6
chore: Remove legacy files client initialisation
artonge May 7, 2025
aa5dd4a
chore: Use public const to identify metadata
artonge May 15, 2025
452d062
feat: Populate albums based on the set filters
artonge May 15, 2025
de77a12
chore: Simplify filters implementation
artonge May 15, 2025
dc2a1a9
chore: Improve layout of HeaderNavigation to support more content
artonge May 15, 2025
bb24c82
feat: Allow edition of filters in album view
artonge May 15, 2025
fd7ba97
feat: Display filters in album form and album
artonge May 16, 2025
7ee8f21
feat: Return cover picture based on filters
artonge May 16, 2025
9b58191
fix: Parent route computing in HeaderNavigation
artonge May 16, 2025
0f41a2d
feat: Use places in the store to render places filter
artonge May 16, 2025
860c94c
fix: Support filters in shared and public albums
artonge May 16, 2025
6ef4c25
feat: Display filters in public and shared albums
artonge May 16, 2025
95e170c
test: Fix e2e tests after adding filters to albums
artonge May 16, 2025
e6a55c4
fix: Setting filters in album form
artonge May 19, 2025
0e2a03f
feat: Navigate to album upon creating it
artonge May 19, 2025
f4c2c84
test: Add e2e test for filters in albums
artonge May 19, 2025
5b12984
fix: Condition to create album from filters
artonge May 20, 2025
f23e077
test(API): Ensure permissions are respected in the DAV API
artonge May 22, 2025
c7e8abf
fix(albums): Do not offer to remove selection if is coming from filters
artonge May 22, 2025
6b7070a
fix: Psalm, cs and eslint error
artonge May 22, 2025
e8176a7
test: Fix instanciation of AlbumMapper
artonge May 22, 2025
94d2210
chore: Compile assets
artonge May 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: Display filters in public and shared albums
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
artonge committed May 22, 2025
commit 6ef4c25aa73bbbea2a3b2966194a69fdc4790835
2 changes: 1 addition & 1 deletion src/components/PhotosFilters/PlacesFilterDisplay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<MapMarker /> <b>{{ t('photos', 'Places') }}: </b>
<span v-for="place in selectedPlaces" :key="place.label">
<NcChip no-close>
<template #icon>
<template v-if="place.previewUrl !== undefined" #icon>
<img :src="place.previewUrl" class="place__preview">
</template>
<template #default>
Expand Down
8 changes: 8 additions & 0 deletions src/views/PublicAlbumContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
<div v-if="album.attributes.location !== ''" slot="subtitle" class="album__location">
<MapMarker />{{ album.attributes.location }}
</div>
<template slot="default">
<span v-if="album !== undefined" class="album-container__filters">
<PhotosFiltersDisplay :filters-value="album.attributes.filters" />
</span>
</template>

<template v-if="album !== undefined" slot="right">
<NcActions :force-menu="true" :aria-label="t('photos', 'Open actions menu')">
<!-- TODO: enable download on public albums -->
Expand Down Expand Up @@ -84,6 +90,7 @@ import { generateRemoteUrl, generateUrl } from '@nextcloud/router'
import { translate } from '@nextcloud/l10n'
import { getClient } from '@nextcloud/files/dav'

import PhotosFiltersDisplay from '../components/PhotosFilters/PhotosFiltersDisplay.vue'
import CollectionContent from '../components/Collection/CollectionContent.vue'
import HeaderNavigation from '../components/HeaderNavigation.vue'
// import ActionDownload from '../components/Actions/ActionDownload.vue'
Expand All @@ -107,6 +114,7 @@ export default {
CollectionContent,
// ActionDownload,
HeaderNavigation,
PhotosFiltersDisplay,
},

mixins: [
Expand Down
6 changes: 6 additions & 0 deletions src/views/SharedAlbumContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
</template>
{{ t('photos', 'Unselect all') }}
</NcButton>

<span v-if="album !== undefined" class="album-container__filters">
<PhotosFiltersDisplay :filters-value="album.attributes.filters" />
</span>
</template>

<template v-if="album !== undefined" slot="right">
Expand Down Expand Up @@ -120,6 +124,7 @@ import Close from 'vue-material-design-icons/Close.vue'
import FetchFilesMixin from '../mixins/FetchFilesMixin.js'
import FetchCollectionContentMixin from '../mixins/FetchCollectionContentMixin.js'

import PhotosFiltersDisplay from '../components/PhotosFilters/PhotosFiltersDisplay.vue'
import CollectionContent from '../components/Collection/CollectionContent.vue'
import HeaderNavigation from '../components/HeaderNavigation.vue'
// import ActionDownload from '../components/Actions/ActionDownload.vue'
Expand All @@ -146,6 +151,7 @@ export default {
// ActionDownload,
PhotosPicker,
HeaderNavigation,
PhotosFiltersDisplay,
},

mixins: [
Expand Down