-
Notifications
You must be signed in to change notification settings - Fork 15
Centralize shortcut code in cozy-client models and hooks #1637
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.
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
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
2a195f4
docs: Update IOCozyFile metadata type with shortcut data
github-actions[bot] 80a9819
feat: Add helper to get shortcut img src
github-actions[bot] 27ce025
feat: Add useFetchHomeShortcuts hook
zatteo 598819d
fix: Return undefined if not shortcut icon
zatteo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| import CozyClient, { Q, useQuery } from 'cozy-client' | ||
|
|
||
| const fetchPolicy = CozyClient.fetchPolicies.olderThan(30 * 1000) | ||
|
|
||
| const buildHomeMagicFolderQuery = () => { | ||
| return { | ||
| query: Q('io.cozy.files') | ||
| .where({ path: '/Settings/Home' }) | ||
| .indexFields(['path']), | ||
| as: 'io.cozy.files/path/Settings/Home', | ||
| fetchPolicy: fetchPolicy | ||
| } | ||
| } | ||
|
|
||
| const buildHomeShortcutsQuery = folderId => { | ||
| return { | ||
| query: Q('io.cozy.files') | ||
| .where({ dir_id: folderId, class: 'shortcut' }) | ||
| .indexFields(['dir_id', 'class']), | ||
| as: `io.cozy.files/dir_id/${folderId}/class/shortcut`, | ||
| fetchPolicy: fetchPolicy | ||
| } | ||
| } | ||
|
|
||
| const useFetchHomeShortcuts = () => { | ||
| const homeMagicFolderQuery = buildHomeMagicFolderQuery() | ||
|
|
||
| const magicHomeFolder = useQuery( | ||
| homeMagicFolderQuery.query, | ||
| homeMagicFolderQuery | ||
| ) | ||
|
|
||
| const magicHomeFolderId = magicHomeFolder?.data?.[0]?._id | ||
|
|
||
| const homeShortcutsQuery = buildHomeShortcutsQuery(magicHomeFolderId) | ||
|
|
||
| const { data: shortcuts } = useQuery(homeShortcutsQuery.query, { | ||
| ...homeShortcutsQuery, | ||
| enabled: !!magicHomeFolderId | ||
| }) | ||
|
|
||
| return shortcuts | ||
| } | ||
|
|
||
| export default useFetchHomeShortcuts | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There were previous discussions about raising up default fetch policy duration, since 30 seconds is very short.
We have for instance 10mins in Drive: https://github.com/cozy/cozy-drive/blob/master/src/queries/index.ts#L29
Should we have a common policy here @Crash-- ?