cozy-harvest-lib 6.13.0 → 6.14.2

package/CHANGELOG.md

@@ -3,6 +3,53 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.14.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@6.14.1...cozy-harvest-lib@6.14.2) (2021-11-22)
+
+
+### Bug Fixes
+
+* Handle undefined this.konnector for OAuth connectors ([9bea259](https://github.com/cozy/cozy-libs/commit/9bea259))
+
+
+
+
+
+## [6.14.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@6.14.0...cozy-harvest-lib@6.14.1) (2021-11-18)
+
+
+### Bug Fixes
+
+* Harvest Konnector translation ([d7c13ca](https://github.com/cozy/cozy-libs/commit/d7c13ca))
+
+
+
+
+
+# [6.14.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@6.13.1...cozy-harvest-lib@6.14.0) (2021-11-10)
+
+
+### Bug Fixes
+
+* Change UI for geocard ([6408ecb](https://github.com/cozy/cozy-libs/commit/6408ecb))
+* Harmonize title variant ([a4b7941](https://github.com/cozy/cozy-libs/commit/a4b7941))
+
+
+### Features
+
+* Do not display AppLinkCard icon for GeoCard ([d9aadbd](https://github.com/cozy/cozy-libs/commit/d9aadbd))
+
+
+
+
+
+## [6.13.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@6.13.0...cozy-harvest-lib@6.13.1) (2021-11-09)
+
+**Note:** Version bump only for package cozy-harvest-lib
+
+
+
+
+
 # [6.13.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@6.12.0...cozy-harvest-lib@6.13.0) (2021-11-08)
 
 

package/dist/components/KonnectorConfiguration/DataTab/appLinksProps.js

@@ -26,7 +26,6 @@ var appLinksProps = {
   coachco2: function coachco2() {
     return {
       slug: 'coachco2',
-      icon: 'location',
       iconColor: 'brightSun'
     };
   }

package/dist/components/cards/AppLinkCard.js

@@ -66,14 +66,14 @@ var AppLinkCard = function AppLinkCard(_ref3) {
   return /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(Stack, null, /*#__PURE__*/React.createElement(Typography, {
     variant: "h6",
     gutterBottom: true
-  }, /*#__PURE__*/React.createElement(Circle, {
+  }, icon ? /*#__PURE__*/React.createElement(Circle, {
     size: "small",
     backgroundColor: palette[iconColor],
     className: "u-mr-half"
   }, /*#__PURE__*/React.createElement(Icon, {
     icon: icon,
     color: palette['white']
-  })), t("card.appLink.".concat(slug, ".title"))), /*#__PURE__*/React.createElement(Typography, {
+  })) : null, t("card.appLink.".concat(slug, ".title"))), /*#__PURE__*/React.createElement(Typography, {
     variant: "body1"
   }, t("card.appLink.".concat(slug, ".description"))), /*#__PURE__*/React.createElement(AppLinkButton, {
     path: path,

package/dist/components/hoc/withKonnectorLocales.js

@@ -17,13 +17,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { extend } from 'cozy-ui/transpiled/react/I18n';
 import { getDisplayName } from './utils';
-/**
- * Index of konnectors which locales have already extended the I18n.
- * For now we are not supposed to update konnector locales at runtime and we
- * should just load them once for all.
- */
-
-var loadedKonnectors = [];
 /**
  * HOC which ensures that a component get extended I18n with locales data from
  * konnector manifest.
@@ -44,12 +37,10 @@ export var withKonnectorLocales = function withKonnectorLocales(Component) {
       var _this$props = _this.props,
           konnector = _this$props.konnector,
           lang = _this$props.lang;
-      if (loadedKonnectors.includes(konnector.slug)) return _possibleConstructorReturn(_this);
       var locales = konnector.locales;
 
       if (locales && lang) {
         extend(locales[lang]);
-        loadedKonnectors.push(konnector.slug);
       }
 
       return _this;

package/dist/datacards/GeoDataCard.js

@@ -35,7 +35,7 @@ import RightIcon from 'cozy-ui/transpiled/react/Icons/Right';
 import FlagIcon from 'cozy-ui/transpiled/react/Icons/Flag';
 import { useI18n } from 'cozy-ui/transpiled/react/I18n';
 import Stack from 'cozy-ui/transpiled/react/Stack';
-import AppLinkCard, { AppLinkButton } from '../components/cards/AppLinkCard';
+import AppLinkCard from '../components/cards/AppLinkCard';
 import appLinksProps from '../components/KonnectorConfiguration/DataTab/appLinksProps';
 import useCycle from './useCycle';
 import { transformTimeSeriesToTrips, getStartPlaceDisplayName, getEndPlaceDisplayName, getFormattedDuration, getModes } from './trips';
@@ -242,7 +242,7 @@ var GeoDataCard = function GeoDataCard(_ref4) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "u-ph-1 u-mb-half"
   }, /*#__PURE__*/React.createElement(Typography, {
-    variant: "h5"
+    variant: "h6"
   }, t('datacards.trips.title')), /*#__PURE__*/React.createElement(Typography, {
     variant: "caption"
   }, t('datacards.trips.caption', {
@@ -291,11 +291,7 @@ var GeoDataCard = function GeoDataCard(_ref4) {
   }) : /*#__PURE__*/React.createElement(TripsMap, {
     trips: trips,
     index: index
-  }), flag('harvest.datacard.coachCO2') ? /*#__PURE__*/React.createElement("div", {
-    className: "u-ta-right u-mv-half u-mh-1"
-  }, /*#__PURE__*/React.createElement(AppLinkButton, {
-    slug: "coachco2"
-  })) : null);
+  }));
 };
 
 var makeQueryFromProps = function makeQueryFromProps(_ref5) {
@@ -341,11 +337,11 @@ var DataGeoDataCard = function DataGeoDataCard(_ref6) {
     return null;
   }
 
-  return /*#__PURE__*/React.createElement(GeoDataCard, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(GeoDataCard, {
     trips: ascendingTrips,
     loading: isLoading,
     konnector: konnector
-  });
+  }), flag('harvest.datacard.coachCO2') ? /*#__PURE__*/React.createElement(AppLinkCard, appLinksProps.coachco2()) : null);
 };
 
 DataGeoDataCard.propTypes = {

package/dist/models/ConnectionFlow.js

@@ -17,6 +17,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 import MicroEE from 'microee';
+import get from 'lodash/get';
 import Realtime from 'cozy-realtime';
 import flag from 'cozy-flags';
 import { fetchReusableAccount, saveAccount as _saveAccount, ACCOUNTS_DOCTYPE } from '../connections/accounts';
@@ -773,7 +774,7 @@ export var ConnectionFlow = /*#__PURE__*/function () {
             switch (_context10.prev = _context10.next) {
               case 0:
                 _ref4 = _args10.length > 0 && _args10[0] !== undefined ? _args10[0] : {}, _ref4$autoSuccessTime = _ref4.autoSuccessTimer, autoSuccessTimer = _ref4$autoSuccessTime === void 0 ? true : _ref4$autoSuccessTime;
-                computedAutoSuccessTimer = autoSuccessTimer && !this.konnector.clientSide;
+                computedAutoSuccessTimer = autoSuccessTimer && !get(this, 'konnector.clientSide');
                 logger.info('ConnectionFlow: Launching job...');
                 this.setState({
                   status: PENDING
@@ -791,7 +792,7 @@ export var ConnectionFlow = /*#__PURE__*/function () {
               case 11:
                 this.job = _context10.sent;
 
-                if (this.konnector.clientSide) {
+                if (get(this, 'konnector.clientSide')) {
                   logger.info('This connector can be run by the launcher', this.konnector.slug);
                   launcher = getLauncher({
                     win: window

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "6.13.0",
+  "version": "6.14.2",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -29,7 +29,7 @@
     "@cozy/minilog": "^1.0.0",
     "@sentry/browser": "^6.0.1",
     "cozy-bi-auth": "0.0.24",
-    "cozy-doctypes": "^1.83.0",
+    "cozy-doctypes": "^1.83.1",
     "cozy-logger": "^1.7.0",
     "date-fns": "^1.30.1",
     "final-form": "^4.18.5",
@@ -85,5 +85,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "a3ffe5f098d8adbe8e8ce93f97e1989f518c40bb"
+  "gitHead": "4accdb64b9d8d6798e31c4545c3bcf9a28c4cc17"
 }

package/src/components/KonnectorConfiguration/DataTab/appLinksProps.jsx

@@ -19,7 +19,6 @@ const appLinksProps = {
   }),
   coachco2: () => ({
     slug: 'coachco2',
-    icon: 'location',
     iconColor: 'brightSun'
   })
 }

package/src/components/cards/AppLinkCard.jsx

@@ -60,13 +60,15 @@ const AppLinkCard = ({ slug, path, icon, iconColor }) => {
     <Card>
       <Stack>
         <Typography variant="h6" gutterBottom>
-          <Circle
-            size="small"
-            backgroundColor={palette[iconColor]}
-            className="u-mr-half"
-          >
-            <Icon icon={icon} color={palette['white']} />
-          </Circle>
+          {icon ? (
+            <Circle
+              size="small"
+              backgroundColor={palette[iconColor]}
+              className="u-mr-half"
+            >
+              <Icon icon={icon} color={palette['white']} />
+            </Circle>
+          ) : null}
           {t(`card.appLink.${slug}.title`)}
         </Typography>
         <Typography variant="body1">

package/src/components/hoc/withKonnectorLocales.jsx

@@ -5,13 +5,6 @@ import { extend } from 'cozy-ui/transpiled/react/I18n'
 
 import { getDisplayName } from './utils'
 
-/**
- * Index of konnectors which locales have already extended the I18n.
- * For now we are not supposed to update konnector locales at runtime and we
- * should just load them once for all.
- */
-const loadedKonnectors = []
-
 /**
  * HOC which ensures that a component get extended I18n with locales data from
  * konnector manifest.
@@ -21,15 +14,11 @@ export const withKonnectorLocales = Component => {
     constructor(props, context) {
       super(props, context)
       const { konnector, lang } = this.props
-      if (loadedKonnectors.includes(konnector.slug)) return
-
       const { locales } = konnector
       if (locales && lang) {
         extend(locales[lang])
-        loadedKonnectors.push(konnector.slug)
       }
     }
-
     render() {
       return <Component {...this.props} />
     }

package/src/datacards/GeoDataCard.jsx

@@ -33,7 +33,7 @@ import FlagIcon from 'cozy-ui/transpiled/react/Icons/Flag'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Stack from 'cozy-ui/transpiled/react/Stack'
 
-import AppLinkCard, { AppLinkButton } from '../components/cards/AppLinkCard'
+import AppLinkCard from '../components/cards/AppLinkCard'
 import appLinksProps from '../components/KonnectorConfiguration/DataTab/appLinksProps'
 
 import useCycle from './useCycle'
@@ -214,7 +214,7 @@ const GeoDataCard = ({ trips, loading, konnector }) => {
   return (
     <Card className="u-ph-0 u-pb-0 u-ov-hidden">
       <div className="u-ph-1 u-mb-half">
-        <Typography variant="h5">{t('datacards.trips.title')}</Typography>
+        <Typography variant="h6">{t('datacards.trips.title')}</Typography>
         <Typography variant="caption">
           {t('datacards.trips.caption', { konnectorName: konnector.name })}
         </Typography>
@@ -261,11 +261,6 @@ const GeoDataCard = ({ trips, loading, konnector }) => {
       ) : (
         <TripsMap trips={trips} index={index} />
       )}
-      {flag('harvest.datacard.coachCO2') ? (
-        <div className="u-ta-right u-mv-half u-mh-1">
-          <AppLinkButton slug="coachco2" />
-        </div>
-      ) : null}
     </Card>
   )
 }
@@ -306,11 +301,16 @@ const DataGeoDataCard = ({ timeseriesCol, konnector }) => {
     return null
   }
   return (
-    <GeoDataCard
-      trips={ascendingTrips}
-      loading={isLoading}
-      konnector={konnector}
-    />
+    <>
+      <GeoDataCard
+        trips={ascendingTrips}
+        loading={isLoading}
+        konnector={konnector}
+      />
+      {flag('harvest.datacard.coachCO2') ? (
+        <AppLinkCard {...appLinksProps.coachco2()} />
+      ) : null}
+    </>
   )
 }
 

package/src/models/ConnectionFlow.js

@@ -1,4 +1,5 @@
 import MicroEE from 'microee'
+import get from 'lodash/get'
 
 import Realtime from 'cozy-realtime'
 import flag from 'cozy-flags'
@@ -483,7 +484,7 @@ export class ConnectionFlow {
    */
   async launch({ autoSuccessTimer = true } = {}) {
     const computedAutoSuccessTimer =
-      autoSuccessTimer && !this.konnector.clientSide
+      autoSuccessTimer && !get(this, 'konnector.clientSide')
 
     logger.info('ConnectionFlow: Launching job...')
     this.setState({ status: PENDING })
@@ -501,7 +502,7 @@ export class ConnectionFlow {
 
     this.job = await launchTrigger(this.client, this.trigger)
 
-    if (this.konnector.clientSide) {
+    if (get(this, 'konnector.clientSide')) {
       logger.info(
         'This connector can be run by the launcher',
         this.konnector.slug