Skip to content

feat: Add filters in timeline view #2986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artonge merged 7 commits into from
May 7, 2025
Merged

feat: Add filters in timeline view #2986

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c029c75
feat: Add date range filter in timeline
artonge Apr 30, 2025
5db88af
feat: Add places filter in timeline
artonge Apr 29, 2025
074ac20
feat: Use original_date_time for "On This Day"
artonge Apr 29, 2025
4d336f1
fix: Improve request abort logic
artonge Apr 30, 2025
ca1f74a
chore: Add typing for icons
artonge Apr 30, 2025
8ec5f0d
test: Add Cypress tests for timeline filters
artonge Apr 30, 2025
7f887a1
chore: Compile assets
artonge Apr 30, 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
fix: Improve request abort logic 
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@artonge
artonge committed May 7, 2025
commit 4d336f16aa267d139da81fbfbe940afe8bb2357d
10 changes: 8 additions & 2 deletions src/mixins/AbortControllerMixin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,19 @@ export default defineComponent({
}
},

methods: {
abortPendingRequest() {
this.abortController.abort()
this.abortController = new AbortController()
},
},

beforeDestroy() {
this.abortController.abort()
},

beforeRouteLeave(from, to, next) {
this.abortController.abort()
this.abortController = new AbortController()
this.abortPendingRequest()
next()
},
})
4 changes: 3 additions & 1 deletion src/mixins/FetchFilesMixin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export default defineComponent({
return []
}

const signal = this.abortController.signal
const fetchSemaphoreSymbol = await this.fetchSemaphore.acquire()

try {
Expand All @@ -65,7 +66,7 @@ export default defineComponent({
firstResult: this.fetchedFileIds.length,
nbResults: numberOfImagesPerBatch,
...options,
signal: this.abortController.signal,
signal,
})

// If we get less files than requested that means we got to the end
Expand Down Expand Up @@ -121,6 +122,7 @@ export default defineComponent({
},

resetFetchFilesState() {
this.abortPendingRequest()
this.doneFetchingFiles = false
this.errorFetchingFiles = null
this.loadingFiles = false
Expand Down