Feat/remove ccjs

config/webpack.config.cozy-home.js

@@ -64,12 +64,6 @@ module.exports = {
     }
   },
   plugins: [
-    environment === 'development'
-      ? new webpack.ProvidePlugin({
-          'cozy.client': 'cozy-client-js/dist/cozy-client.js'
-        })
-      : null,
-
     new ContextReplacementPlugin(
       /moment[/\\]locale$/,
       regexpMomentDateFnsLocales

jest.config.js

@@ -8,7 +8,6 @@ module.exports = {
   moduleDirectories: ['src', 'node_modules'],
   moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx', 'json', 'styl'],
   moduleNameMapper: {
-    '^lib/redux-cozy-client$': '<rootDir>/src/lib/redux-cozy-client',
     '\\.(png|gif|jpe?g|svg|css)$': '<rootDir>/test/__mocks__/fileMock.js',
     '.styl$': 'identity-obj-proxy',
     '^cozy-client$': 'cozy-client/dist/index',

manifest.webapp

@@ -113,7 +113,14 @@
     {
       "action": "CREATE",
       "type": ["io.cozy.accounts"],
-      "href": "/intents"
+      "href": "/intents",
+      "data": ["slug"]
+    },
+    {
+      "action": "VIEW",
+      "type": ["io.cozy.accounts"],
+      "href": "/intents",
+      "data": ["slug", "accountId"]
     },
     {
       "action": "REDIRECT",

package.json

@@ -42,6 +42,7 @@
     "cozy-harvest-lib": "^21.0.0",
     "cozy-intent": "^2.3.0",
     "cozy-keys-lib": "^6.0.0",
+    "cozy-interapp": "^0.8.1",
     "cozy-logger": "1.10.0",
     "cozy-realtime": "4.2.9",
     "cozy-sharing": "10.0.0",
@@ -68,6 +69,7 @@
     "redux-logger": "3.0.6",
     "redux-persist": "^6.0.0",
     "redux-thunk": "2.3.0",
+    "reselect": "^4.1.8",
     "terser-webpack-plugin": "1.4.4"
   },
   "devDependencies": {
@@ -80,7 +82,6 @@
     "babel-jest": "27.5.1",
     "babel-preset-cozy-app": "2.0.2",
     "bundlemon": "1.3.2",
-    "cozy-client-js": "0.20.0",
     "cozy-scripts": "8.1.1",
     "eslint": "8.9.0",
     "eslint-config-cozy-app": "4.0.0",

src/components/AppWrapper.jsx

@@ -1,5 +1,3 @@
-/* global __DEVELOPMENT__ */
-
 import React, { createContext } from 'react'
 import { Provider as ReduxProvider } from 'react-redux'
 import memoize from 'lodash/memoize'
@@ -12,10 +10,6 @@ import CozyTheme from 'cozy-ui/transpiled/react/providers/CozyTheme'
 import { BreakpointsProvider } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 import { PersistGate } from 'redux-persist/integration/react'
 
-import {
-  CozyClient as LegacyCozyClient,
-  CozyProvider as LegacyCozyProvider
-} from 'lib/redux-cozy-client'
 import configureStore from 'store/configureStore'
 import homeConfig from 'config/home.json'
 import { RealtimePlugin } from 'cozy-realtime'
@@ -52,23 +46,14 @@ export const setupAppContext = memoize(() => {
       ? true
       : false
   })
-  const legacyClient = new LegacyCozyClient({
-    cozyURL: `//${data.cozyDomain}`,
-    token: data.cozyToken,
-    cozyClient
-  })
+
   cozyClient.registerPlugin(flag.plugin)
   cozyClient.registerPlugin(RealtimePlugin)
   // store
-  const { store, persistor } = configureStore(
-    legacyClient,
-    cozyClient,
-    context,
-    {
-      lang,
-      ...homeConfig
-    }
-  )
+  const { store, persistor } = configureStore(cozyClient, context, {
+    lang,
+    ...homeConfig
+  })
   cozyClient.setStore(store)
 
   return { cozyClient, store, data, lang, context, persistor }
@@ -80,6 +65,7 @@ const Inner = ({ children, lang, context }) => (
     <RealTimeQueries doctype="io.cozy.apps" />
     <RealTimeQueries doctype="io.cozy.jobs" />
     <RealTimeQueries doctype="io.cozy.triggers" />
+    <RealTimeQueries doctype="io.cozy.konnectors" />
     {process.env.NODE_ENV !== 'production' ? <CozyDevtools /> : null}
   </I18n>
 )
@@ -103,34 +89,27 @@ const ThemeProvider = ({ children }) => {
  */
 const AppWrapper = ({ children }) => {
   const appContext = setupAppContext()
-  const { store, cozyClient, data, context, lang, persistor } = appContext
+  const { store, cozyClient, context, lang, persistor } = appContext
 
   return (
     <AppContext.Provider value={appContext}>
       <BreakpointsProvider>
         <CozyProvider client={cozyClient}>
           <ThemeProvider>
-            <LegacyCozyProvider
-              store={store}
-              client={cozyClient}
-              domain={data.cozyDomain}
-              secure={!__DEVELOPMENT__}
-            >
-              <ReduxProvider store={store}>
-                <ConditionalWrapper
-                  condition={persistor}
-                  wrapper={children => (
-                    <PersistGate loading={null} persistor={persistor}>
-                      {children}
-                    </PersistGate>
-                  )}
-                >
-                  <Inner lang={lang} context={context}>
+            <ReduxProvider store={store}>
+              <ConditionalWrapper
+                condition={persistor}
+                wrapper={children => (
+                  <PersistGate loading={null} persistor={persistor}>
                     {children}
-                  </Inner>
-                </ConditionalWrapper>
-              </ReduxProvider>
-            </LegacyCozyProvider>
+                  </PersistGate>
+                )}
+              >
+                <Inner lang={lang} context={context}>
+                  {children}
+                </Inner>
+              </ConditionalWrapper>
+            </ReduxProvider>
           </ThemeProvider>
         </CozyProvider>
       </BreakpointsProvider>

src/components/AppWrapper.spec.jsx

@@ -15,10 +15,7 @@ jest.mock('cozy-client', () => ({
   ),
   default: () => mockClient
 }))
-jest.mock('lib/redux-cozy-client', () => ({
-  CozyClient: children => children,
-  CozyProvider: ({ children }) => children
-}))
+
 jest.mock('store/configureStore', () => () => ({
   store: {
     dispatch: () => jest.fn(),

src/components/Applications.jsx

@@ -1,6 +1,6 @@
 import React, { memo, useEffect, useRef } from 'react'
 import memoize from 'lodash/memoize'
-
+import uniqBy from 'lodash/uniqBy'
 import { useQuery } from 'cozy-client'
 import flag from 'cozy-flags'
 import Divider from 'cozy-ui/transpiled/react/Divider'
@@ -47,8 +47,8 @@ const getApplicationsList = memoize(data => {
         !homeConfig.filteredApps.includes(app.slug) &&
         !flag(`home_hidden_apps.${app.slug.toLowerCase()}`) // can be set in the context with `home_hidden_apps: - drive - banks`for example
     )
-
-    const array = apps.map(app => <AppTile key={app.id} app={app} />)
+    const dedupapps = uniqBy(apps, 'slug')
+    const array = dedupapps.map(app => <AppTile key={app.id} app={app} />)
 
     array.push(
       <AppHighlightAlertWrapper key="AppHighlightAlertWrapper" apps={apps} />

src/components/Banners/UpdateMessage.jsx

@@ -1,22 +1,23 @@
-/* global cozy */
-
 import React, { useState, useCallback } from 'react'
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 import Button from 'cozy-ui/transpiled/react/deprecated/Button'
 import Infos from 'cozy-ui/transpiled/react/deprecated/Infos'
 import Typography from 'cozy-ui/transpiled/react/Typography'
 import PropTypes from 'prop-types'
+import { useClient } from 'cozy-client'
+import Intents from 'cozy-interapp'
 
 const UpdateMessage = props => {
   const [isRedirecting, setIsRedirecting] = useState(false)
   const { t } = useI18n()
   const { isBlocking, konnector } = props
-
+  const client = useClient()
+  const intents = new Intents({ client })
   const handleRedirectToStore = useCallback(async () => {
     setIsRedirecting(true)
 
     try {
-      await cozy.client.intents.redirect('io.cozy.apps', {
+      await intents.redirect('io.cozy.apps', {
         slug: konnector.slug,
         step: 'update'
       })

src/components/IntentRedirect.jsx

@@ -1,19 +1,35 @@
-/* global cozy */
 import React from 'react'
 import { Navigate, useSearchParams } from 'react-router-dom'
-import { connect } from 'react-redux'
-
-import { getInstalledKonnectors } from 'reducers'
-
-const IntentRedirect = ({ installedKonnectors }) => {
+import {
+  useClient,
+  useQuery,
+  isQueryLoading,
+  hasQueryBeenLoaded
+} from 'cozy-client'
+import Intents from 'cozy-interapp'
+import { konnectorsConn } from 'queries'
+const IntentRedirect = () => {
+  const client = useClient()
+  const intents = new Intents({ client })
   const [searchParams] = useSearchParams()
   const queryConnector = searchParams.get('konnector')
   const queryAccount = searchParams.get('account')
+  const konnectorsDataResult = useQuery(konnectorsConn.query, konnectorsConn)
+
+  if (
+    isQueryLoading(konnectorsDataResult) &&
+    !hasQueryBeenLoaded(konnectorsDataResult)
+  )
+    return null
 
   if (!queryConnector) return <Navigate to="/connected" />
 
-  if (!installedKonnectors.find(konnector => konnector.slug === queryConnector))
-    return cozy.client.intents.redirect('io.cozy.apps', {
+  if (
+    !konnectorsDataResult.data.find(
+      konnector => konnector.slug === queryConnector
+    )
+  )
+    return intents.redirect('io.cozy.apps', {
       slug: queryConnector
     })
 
@@ -24,8 +40,4 @@ const IntentRedirect = ({ installedKonnectors }) => {
   return <Navigate to={redirectRoute} />
 }
 
-const mapStateToProps = state => ({
-  installedKonnectors: getInstalledKonnectors(state)
-})
-
-export default connect(mapStateToProps)(IntentRedirect)
+export default IntentRedirect

src/components/Konnector.jsx

@@ -51,7 +51,7 @@ export const StatelessKonnector = ({ konnector, triggers, slug }) => {
 }
 
 const StatefulKonnector = connect((state, { slug }) => ({
-  konnector: getKonnector(state.oldcozy, slug),
+  konnector: getKonnector(state.cozy, slug),
   triggers: getTriggersByKonnector(state, slug)
 }))(StatelessKonnector)