Skip to content

Update packages and routing to prepare support of search in cozy-bar #15

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
merged 2 commits into from
May 14, 2025
Merged

Update packages and routing to prepare support of search in cozy-bar #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
885483d
refactor: Use Routes components in routing
zatteo May 14, 2025
9511e91
feat: Modify layout and routes to support AI assistant
zatteo May 14, 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
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,18 @@
},
"dependencies": {
"comlink": "^4.4.2",
"cozy-bar": "^20.0.0",
"cozy-client": "^57.6.0",
"cozy-dataproxy-lib": "^4.1.0",
"cozy-bar": "^22.1.0",
"cozy-client": "^58.0.1",
"cozy-dataproxy-lib": "^4.1.1",
"cozy-device-helper": "^3.8.0",
"cozy-external-bridge": "^0.7.0",
"cozy-external-bridge": "^0.9.0",
"cozy-flags": "^4.7.0",
"cozy-intent": "^2.30.0",
"cozy-logger": "^1.17.0",
"cozy-pouch-link": "^54.0.0",
"cozy-pouch-link": "^58.0.1",
"cozy-realtime": "^5.6.4",
"cozy-search": "^0.4.0",
"cozy-ui": "^122.3.0",
"cozy-search": "^0.6.0",
"cozy-ui": "^123.1.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-router-dom": "6.14.2"
Expand Down
14 changes: 14 additions & 0 deletions src/components/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react'

import { useExternalBridge } from 'cozy-external-bridge/container'
import flag from 'cozy-flags'

const App = () => {
const embeddedMailUrl = flag('mail.embedded-app-url')

useExternalBridge(embeddedMailUrl)

return <iframe id="embeddedApp" src={embeddedMailUrl}></iframe>
}

export default App
9 changes: 2 additions & 7 deletions src/components/AppLayout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
import React from 'react'
import { Outlet } from 'react-router-dom'

import { BarComponent } from 'cozy-bar'
import { useExternalBridge } from 'cozy-external-bridge/container'
import flag from 'cozy-flags'

const AppLayout = () => {
const embeddedMailUrl = flag('mail.embedded-app-url')

useExternalBridge(embeddedMailUrl)

return (
<>
<BarComponent searchOptions={{ enabled: false }} />
<iframe id="embeddedApp" src={embeddedMailUrl}></iframe>
<Outlet />
</>
)
}
Expand Down
29 changes: 20 additions & 9 deletions src/components/AppRouter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
import React from 'react'
import { RouterProvider, createHashRouter } from 'react-router-dom'
import { HashRouter, Routes, Route, Outlet } from 'react-router-dom'

import App from '@/components/App'
import AppLayout from '@/components/AppLayout'

const routes = [
{
path: '*',
element: <AppLayout />
}
]
const OutletWrapper = ({ Component }) => (
<>
<Component />
<Outlet />
</>
)

const AppRouter = () => {
const router = createHashRouter(routes)
return <RouterProvider router={router} />
return (
<HashRouter>
<Routes>
<Route element={<AppLayout />}>
<Route path="/" element={<OutletWrapper Component={App} />}>
<Route path="bridge/*" />
</Route>
</Route>
</Routes>
</HashRouter>
)
}

export default AppRouter
106 changes: 36 additions & 70 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3958,10 +3958,10 @@ cozy-app-publish@^0.41.0:
tar "^6.1.11"
verror "^1.10.1"

cozy-bar@^20.0.0:
version "20.0.0"
resolved "https://registry.yarnpkg.com/cozy-bar/-/cozy-bar-20.0.0.tgz#4f739c700fd881619cb71e223529e4ce9b465791"
integrity sha512-AHpSOunkzdcEGTONUNisqrxhfzAu91W3clQAPIssOeSpQdiwC8A+zfF7KK06SdgkPOHQpcoUs6G0soZz7IU+dA==
cozy-bar@^22.1.0:
version "22.1.0"
resolved "https://registry.yarnpkg.com/cozy-bar/-/cozy-bar-22.1.0.tgz#b485f355b3eb35ebe7d4b083e44c3e57831d68f1"
integrity sha512-9NC4gDHd7y9hjwm8jhrFqYREykOphwdgpSD8NO7YwL/t/+ug+Qk0ftnOGswDVUb3nnaMu5rSVBzPGfyn/NYeAg==
dependencies:
hammerjs "2.0.8"
lodash.debounce "4.0.8"
Expand All @@ -3974,42 +3974,17 @@ cozy-bar@^20.0.0:
redux-persist "5.10.0"
redux-thunk "2.3.0"

cozy-client@^54.0.1:
version "54.0.1"
resolved "https://registry.yarnpkg.com/cozy-client/-/cozy-client-54.0.1.tgz#3ac8a421a14ed42f372aed1d7fe2282cb45ab699"
integrity sha512-3FLyVNFcIjfaOdJXba97y7z0B3INwQ6HTfeL839PRdwUEcXReweIk8vhLCE+JTMOPFQ2uaT82mtqvbbaO7u8pg==
dependencies:
"@cozy/minilog" "1.0.0"
"@types/jest" "^26.0.20"
"@types/lodash" "^4.14.170"
btoa "^1.2.1"
cozy-stack-client "^54.0.1"
date-fns "2.29.3"
json-stable-stringify "^1.0.1"
lodash "^4.17.13"
microee "^0.0.6"
node-fetch "^2.6.1"
node-polyglot "2.4.2"
open "7.4.2"
prop-types "^15.6.2"
react-redux "^7.2.0"
redux "3 || 4"
redux-thunk "^2.3.0"
server-destroy "^1.0.1"
sift "^6.0.0"
url-search-params-polyfill "^8.0.0"

cozy-client@^57.6.0:
version "57.6.0"
resolved "https://registry.yarnpkg.com/cozy-client/-/cozy-client-57.6.0.tgz#dde9da95da1aa371d85e1b30714bfc10fd381dcf"
integrity sha512-6BHephSsMGzrUFlcCV5OOzLT/yVxG7s7vT9rW3CJnTVRle/tiVR3wHgB+04brnq4vXgmd83J5lW4UhwZcMmFdQ==
cozy-client@^58.0.1:
version "58.0.1"
resolved "https://registry.yarnpkg.com/cozy-client/-/cozy-client-58.0.1.tgz#5f7d6244abb93c0393749b500c004a30f986a265"
integrity sha512-cc+/aeKnYo04ylZjB+O2GmYj0j7Sh4j5d5r6aAay/XPH9QpzWkaxQn9EwLLNZas3Gki3Js0o9O9rosKpSu1JNA==
dependencies:
"@cozy/minilog" "1.0.0"
"@fastify/deepmerge" "^2.0.2"
"@types/jest" "^26.0.20"
"@types/lodash" "^4.14.170"
btoa "^1.2.1"
cozy-stack-client "^57.2.0"
cozy-stack-client "^58.0.0"
date-fns "2.29.3"
fast-deep-equal "^3.1.3"
json-stable-stringify "^1.0.1"
Expand All @@ -4026,10 +4001,10 @@ cozy-client@^57.6.0:
sift "^6.0.0"
url-search-params-polyfill "^8.0.0"

cozy-dataproxy-lib@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/cozy-dataproxy-lib/-/cozy-dataproxy-lib-4.1.0.tgz#20d0a38e059fb5924d85f3b5a550d7d28ec9a477"
integrity sha512-k5lVjnpPmATEUZaYeK0B8J0+ntiNRmpmTXyDi8p6H7y41LO/yZ0XhbIqxbO4PjPnT8aKFWx3zQ7LGqIXS2Y7LA==
cozy-dataproxy-lib@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/cozy-dataproxy-lib/-/cozy-dataproxy-lib-4.1.1.tgz#dd3fbca347ca9b441d744ae24ff03562f0c339d7"
integrity sha512-zmX62btsZDQLPUeLMn+oMJZC+4QfqphGcrvFgK1YKhnvf+wLU9OZcw3BVuS2nqVAraKTOcZtk7Vyp7IJRFL5fg==
dependencies:
comlink "4.4.1"
flexsearch "0.7.43"
Expand All @@ -4041,10 +4016,10 @@ cozy-device-helper@^3.8.0:
dependencies:
lodash "^4.17.19"

cozy-external-bridge@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/cozy-external-bridge/-/cozy-external-bridge-0.7.0.tgz#a310833786bdb8a9a646fa80af05c038f4263be9"
integrity sha512-dP7afxXWodf03QAyfd3GbuK5I6smYYdTLa7fznn0pik/STMrJCktHJfFS2DbBQfTrda6IiUtL7bRxSfaX38Cog==
cozy-external-bridge@^0.9.0:
version "0.9.0"
resolved "https://registry.yarnpkg.com/cozy-external-bridge/-/cozy-external-bridge-0.9.0.tgz#77f4ff9d8cea93b4f12246862c4bfd76c8654068"
integrity sha512-5Nefvv65vlm5fH4fTbb55LLRlxTSx7MVsb23sGFEAZuQ8WiKVuOVg3pNMpB5o0UZ/zny2vbuzcZh7e/3bjGTWQ==
dependencies:
comlink "4.4.1"

Expand Down Expand Up @@ -4083,12 +4058,12 @@ cozy-minilog@^3.10.0:
dependencies:
microee "0.0.6"

cozy-pouch-link@^54.0.0:
version "54.0.1"
resolved "https://registry.yarnpkg.com/cozy-pouch-link/-/cozy-pouch-link-54.0.1.tgz#64fcbb808e6ad9ee22614216179e57614d6b286a"
integrity sha512-bg+22KAR66kA4Zmb1UmdpGiJJVie8jgKIGbs64eIpWBCqqSKmE1ksiMnAS94t42b+PIT3+r+sfKyAo3JDo2LYw==
cozy-pouch-link@^58.0.1:
version "58.0.1"
resolved "https://registry.yarnpkg.com/cozy-pouch-link/-/cozy-pouch-link-58.0.1.tgz#0f36c6f16a0135ac39b9e7b921f87338ad88163b"
integrity sha512-VsSsonLqYF7ZtGsie1JMa9++RcwaQH7Rwpj2Hv8jENOsQOhtIb0AX0yGkBaFXwxu9gH5cQ0pQuJ9AYDjUjnMRA==
dependencies:
cozy-client "^54.0.1"
cozy-client "^58.0.1"
pouchdb-browser "^7.2.2"
pouchdb-find "^7.2.2"

Expand All @@ -4099,30 +4074,21 @@ cozy-realtime@^5.6.4:
dependencies:
"@cozy/minilog" "^1.0.0"

cozy-search@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/cozy-search/-/cozy-search-0.4.0.tgz#126413d3e67ed105c4e76f6b3464324dc0e8db51"
integrity sha512-rFmOr3QM+doasZOhT4dW+/fvv/qUmpg/cPBzFTOt/x1XOvgbFORnHLRIXst2cFPRgpXarlRwj33+cqfjTKYAKQ==
cozy-search@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/cozy-search/-/cozy-search-0.6.0.tgz#b3debc8d626f4d7f33842306f57cbd53275aaa7f"
integrity sha512-8co1c3TSkWMqTSBPrcvsz/S4RKcYsmeK4JvT0oixvgoXpQwUh9bkIM8qlo9fRkp0kYycLyI5yB32rvChMw+RwA==
dependencies:
classnames "2.5.1"
lodash "4.17.21"
mime-types "2.1.35"
react-type-animation "3.2.0"
rooks "7.14.1"

cozy-stack-client@^54.0.1:
version "54.0.1"
resolved "https://registry.yarnpkg.com/cozy-stack-client/-/cozy-stack-client-54.0.1.tgz#b82892a4618b142129f9a780e6f5a7345f317d8d"
integrity sha512-J2142WR+v2pLRYtSoo5Nz4dV515Vrbnt5Y/899PsFa6gvYhOADpoZUZftIjVZWMVlDMRVbDO3GwOXUhtHFCHMg==
dependencies:
detect-node "^2.0.4"
mime "^2.4.0"
qs "^6.7.0"

cozy-stack-client@^57.2.0:
version "57.2.0"
resolved "https://registry.yarnpkg.com/cozy-stack-client/-/cozy-stack-client-57.2.0.tgz#837176d73561aa1983f6b2c0a9b0cbe1eb0a0d14"
integrity sha512-k68fuNdfLXsskdgA0pd04Bk+CDUCqICCm5IZHJZiIEJkovvA6IqI/jU8vyNI7fNrCuRQasCjwatIRoT7Qq9O6g==
cozy-stack-client@^58.0.0:
version "58.0.0"
resolved "https://registry.yarnpkg.com/cozy-stack-client/-/cozy-stack-client-58.0.0.tgz#de9082686d00d6f4ba9bd2b463df93be6b8de1ad"
integrity sha512-y462sU1Monpp6qZrTSpW7nAf/vYRYnBEFiqoaNUXX2kE7Ti3svUu9A/SoEu1jaE86iV5a/DKLMLY5GoOMyiYCQ==
dependencies:
detect-node "^2.0.4"
mime "^2.4.0"
Expand All @@ -4133,10 +4099,10 @@ cozy-tsconfig@^1.8.1:
resolved "https://registry.yarnpkg.com/cozy-tsconfig/-/cozy-tsconfig-1.8.1.tgz#5f206f4e6e041a4afc6691098264ba630bdeb7e2"
integrity sha512-/9QBxK8Tc12O2ojuyRpSMjPpXpqldVvzfNB1+/nPD+IkIBkU+mqxpHYJwKWjNYHGraCSy69mIwt9J3aiaJdz9w==

cozy-ui@^122.3.0:
version "122.3.0"
resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-122.3.0.tgz#44266c56124a4e3162dd674afb8f86f9a12fe89c"
integrity sha512-QtH08YVsb3ueVq6G+XslFT7oeKAJn/brPy+VeRpYyv5VuWDSlcrSkQj8NlWg+mDGht0q5Z88k4/zNMyuGY0XtQ==
cozy-ui@^123.1.1:
version "123.1.1"
resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-123.1.1.tgz#7ab9046db40a13593724304c7e64ae68eb51956e"
integrity sha512-OKKEwyMwEuFYCDjKbW7fdRC4RO5HFaUwfUl+SF2m8krqocBUjGzXILPKPMtdpZhgxTm2MdvCDJtU7Eo69n15xQ==
dependencies:
"@babel/runtime" "^7.3.4"
"@date-io/date-fns" "1"
Expand Down Expand Up @@ -7720,9 +7686,9 @@ [email protected], ms@^2.1.1, ms@^2.1.3:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==

"mui-bottom-sheet@git+https://github.com/cozy/mui-bottom-sheet.git#v1.0.9":
"mui-bottom-sheet@https://github.com/cozy/mui-bottom-sheet.git#v1.0.9":
version "1.0.8"
resolved "git+https://github.com/cozy/mui-bottom-sheet.git#3dc4c2a245ab39079bc2f73546bccf80847be14c"
resolved "https://github.com/cozy/mui-bottom-sheet.git#3dc4c2a245ab39079bc2f73546bccf80847be14c"
dependencies:
"@juggle/resize-observer" "^3.1.3"
jest-environment-jsdom-sixteen "^1.0.3"
Expand Down
Loading