Skip to content
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

feat: Files doctype should appear first in search #3283

Merged
merged 1 commit into from
Dec 24, 2024
Merged

feat: Files doctype should appear first in search #3283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"cozy-ci": "0.5.2",
"cozy-client": "^51.6.1",
"cozy-client-js": "0.20.0",
"cozy-dataproxy-lib": "^2.2.0",
"cozy-dataproxy-lib": "^2.3.0",
"cozy-device-helper": "^3.7.1",
"cozy-devtools": "^1.2.1",
"cozy-doctypes": "1.85.4",
Expand Down
27 changes: 14 additions & 13 deletions src/components/App/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { AcceptingSharingProvider } from 'lib/AcceptingSharingContext'
import DriveProvider from 'lib/DriveProvider'
import { ModalContextProvider } from 'lib/ModalContext'
import { ThumbnailSizeContextProvider } from 'lib/ThumbnailSizeContext'
import { DOCTYPE_APPS, DOCTYPE_CONTACTS, DOCTYPE_FILES } from 'lib/doctypes'
import { PublicProvider } from 'modules/public/PublicProvider'
import { onFileUploaded } from 'modules/views/Upload/UploadUtils'

Expand All @@ -26,19 +27,19 @@ const App = ({ isPublic, store, client, lang, polyglot, children }) => {
<BarProvider>
<Provider store={store}>
<DriveProvider client={client} lang={lang} polyglot={polyglot}>
<PushBannerProvider>
<AcceptingSharingProvider>
<ThumbnailSizeContextProvider>
<ModalContextProvider>
{isPublic ? (
children
) : (
<DataProxyProvider>{children}</DataProxyProvider>
)}
</ModalContextProvider>
</ThumbnailSizeContextProvider>
</AcceptingSharingProvider>
</PushBannerProvider>
<DataProxyProvider
options={{
doctypes: [DOCTYPE_FILES, DOCTYPE_CONTACTS, DOCTYPE_APPS]
}}
>
<PushBannerProvider>
<AcceptingSharingProvider>
<ThumbnailSizeContextProvider>
<ModalContextProvider>{children}</ModalContextProvider>
</ThumbnailSizeContextProvider>
</AcceptingSharingProvider>
</PushBannerProvider>
</DataProxyProvider>
</DriveProvider>
</Provider>
</BarProvider>
Expand Down
1 change: 1 addition & 0 deletions src/lib/doctypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const DOCTYPE_FILES_SHORTCUT = 'io.cozy.files.shortcuts'
export const DOCTYPE_ALBUMS = 'io.cozy.photos.albums'
export const DOCTYPE_PHOTOS_SETTINGS = 'io.cozy.photos.settings'
export const DOCTYPE_APPS = 'io.cozy.apps'
export const DOCTYPE_CONTACTS = 'io.cozy.contacts'
export const DOCTYPE_CONTACTS_VERSION = 2

export const schema = {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6309,10 +6309,10 @@ cozy-client@^51.6.1:
sift "^6.0.0"
url-search-params-polyfill "^8.0.0"

cozy-dataproxy-lib@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/cozy-dataproxy-lib/-/cozy-dataproxy-lib-2.2.0.tgz#99bcb2ef5ff07476d5168bcd4eda298fba0cfe32"
integrity sha512-NE5vi6pKysKdXKlmDU9OCorTetZNgYWH2YsYaX+cOcNE6q9talfNA4QlaDuTMju5u+ksbw3pf8gcd39pMJ+ubw==
cozy-dataproxy-lib@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/cozy-dataproxy-lib/-/cozy-dataproxy-lib-2.3.0.tgz#c702c36a674c61edffd31e10d3c9e3665f64c4ef"
integrity sha512-rDYd3yOykArExr8Iz/hoP+2jI57NX0Z/LIDsPmH3W9vifXnb1SVBfekxE4vNXj9vJKLSZ8vfKgl3OuqYbOKVow==
dependencies:
classnames "2.5.1"
comlink "4.4.1"
Expand Down
Loading