cozy-harvest-lib 30.7.0 → 30.8.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [30.8.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@30.7.1...cozy-harvest-lib@30.8.0) (2024-11-27)
+
+
+### Features
+
+* **Harvest:** Add last sync time in KonnectorBlock ([2642af1](https://github.com/cozy/cozy-libs/commit/2642af127192d187b40c0c7b2c424a6abf8fc0fa))
+* **Harvest:** Add link to store in KonnectorBlock ([ceb4608](https://github.com/cozy/cozy-libs/commit/ceb4608bd2c9a7aa2c34c41e58993ea799dc9a60))
+* **Harvest:** Adjust KonnectorBlock style ([94e413b](https://github.com/cozy/cozy-libs/commit/94e413bae050d4ebad71de4fd1728fe9f12e2112))
+* **Harvest:** Change wording in KonnectorBlock ([3b9cdfb](https://github.com/cozy/cozy-libs/commit/3b9cdfbba91ebe0c89071f75c12992ccd7c44ab8))
+
+
+
+
+
+## [30.7.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@30.7.0...cozy-harvest-lib@30.7.1) (2024-11-26)
+
+**Note:** Version bump only for package cozy-harvest-lib
+
+
+
+
+
 # [30.7.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@30.6.5...cozy-harvest-lib@30.7.0) (2024-11-22)
 
 

package/dist/components/KonnectorBlock.js

@@ -5,8 +5,8 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import cx from 'classnames';
 import get from 'lodash/get';
 import PropTypes from 'prop-types';
-import React, { useEffect, useState, useCallback } from 'react';
-import { useClient } from 'cozy-client';
+import React, { useEffect, useState } from 'react';
+import { useClient, generateWebLink } from 'cozy-client';
 import AppIcon from 'cozy-ui/transpiled/react/AppIcon';
 import Divider from 'cozy-ui/transpiled/react/Divider';
 import Icon from 'cozy-ui/transpiled/react/Icon';
@@ -15,12 +15,12 @@ import RightIcon from 'cozy-ui/transpiled/react/Icons/Right';
 import List from 'cozy-ui/transpiled/react/List';
 import ListItem from 'cozy-ui/transpiled/react/ListItem';
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon';
-import ListItemSecondaryAction from 'cozy-ui/transpiled/react/ListItemSecondaryAction';
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText';
 import Spinner from 'cozy-ui/transpiled/react/Spinner';
 import Typography from 'cozy-ui/transpiled/react/Typography';
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import Markdown from './Markdown';
+import { makeLabel } from './cards/helpers';
 import withLocales from './hoc/withLocales';
 import { fetchKonnectorData } from '../helpers/konnectorBlock';
 /**
@@ -43,16 +43,14 @@ var KonnectorBlock = function KonnectorBlock(_ref) {
       t = _useI18n.t;
 
   var slug = get(file, 'cozyMetadata.uploadedBy.slug');
-  var sourceAccountIdentifier = get(file, 'cozyMetadata.sourceAccountIdentifier'); // TODO To be removed when UI's AppIcon use getIconURL from Cozy-Client
-  // instead of its own see https://github.com/cozy/cozy-ui/issues/1723
-
-  var fetchIcon = useCallback(function () {
-    return client.getStackClient().getIconURL({
-      type: 'konnector',
-      slug: slug,
-      priority: 'registry'
-    });
-  }, [client, slug]);
+  var sourceAccountIdentifier = get(file, 'cozyMetadata.sourceAccountIdentifier');
+  var storeLink = generateWebLink({
+    slug: 'store',
+    cozyUrl: client.getStackClient().uri,
+    subDomainType: client.getInstanceOptions().subdomain,
+    pathname: '/',
+    hash: "/discover/".concat(slug)
+  });
   useEffect(function () {
     var fetchKonnector = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref2) {
@@ -109,6 +107,7 @@ var KonnectorBlock = function KonnectorBlock(_ref) {
       vendorLink = konnector.vendorLink,
       iconStatus = konnector.iconStatus,
       message = konnector.message,
+      trigger = konnector.trigger,
       fatalError = konnector.fatalError;
 
   if (fatalError) {
@@ -120,41 +119,57 @@ var KonnectorBlock = function KonnectorBlock(_ref) {
     }));
   }
 
+  var label = makeLabel({
+    t: t,
+    konnector: konnector,
+    trigger: trigger,
+    isRunning: trigger.current_state.status === 'running'
+  });
   return /*#__PURE__*/React.createElement(List, null, /*#__PURE__*/React.createElement(ListItem, {
-    className: "u-ph-2 u-h-3",
     button: true,
     component: "a",
     href: link,
     target: "_blank"
   }, /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(AppIcon, {
     app: slug,
+    type: "konnector",
+    priority: "registry",
     className: cx({
       'u-filter-gray-100 u-o-50': iconStatus === 'disabled'
-    }),
-    fetchIcon: fetchIcon
+    })
   })), /*#__PURE__*/React.createElement(ListItemText, {
     primary: name,
     primaryTypographyProps: {
       variant: 'h6'
     },
-    secondary: get(message, 'text'),
+    secondary: get(message, 'text', label),
     secondaryTypographyProps: get(message, 'color') && {
       color: message.color
     }
-  }), /*#__PURE__*/React.createElement(ListItemSecondaryAction, null, /*#__PURE__*/React.createElement(Icon, {
-    icon: RightIcon,
-    className: "u-mr-1",
-    color: "var(--secondaryTextColor)"
+  }), /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(Icon, {
+    icon: RightIcon
   }))), /*#__PURE__*/React.createElement(Divider, {
     component: "li"
+  }), /*#__PURE__*/React.createElement(ListItem, {
+    button: true,
+    component: "a",
+    href: storeLink,
+    target: "_blank"
+  }, /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(AppIcon, {
+    app: "store",
+    className: "u-w-1 u-h-1"
+  })), /*#__PURE__*/React.createElement(ListItemText, {
+    primary: t('konnectorBlock.store.primary'),
+    secondary: t('konnectorBlock.store.secondary')
+  })), /*#__PURE__*/React.createElement(Divider, {
+    component: "li",
+    variant: "inset"
   }), /*#__PURE__*/React.createElement(ListItem, _extends({
-    className: "u-ph-2",
     button: true
   }, vendorLink), /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(Icon, {
-    icon: GlobeIcon,
-    color: "var(--primaryTextColor)"
+    icon: GlobeIcon
   })), /*#__PURE__*/React.createElement(ListItemText, {
-    primary: t('konnectorBlock.account'),
+    primary: t('konnectorBlock.open'),
     secondary: get(vendorLink, 'href')
   })));
 };

package/dist/components/KonnectorBlock.spec.js

@@ -52,6 +52,9 @@ describe('KonnectorBlock', function () {
             fetchKonnectorData.mockResolvedValue({
               name: 'Pajemploi',
               link: 'https://links.mycozy.cloud/home/connected/pajemploi/accounts/012345?fallback=http%3A%2F%2Fcozy-home.tools%3A8080%2F%23%2Fconnected%2Fpajemploi%2Faccounts%2F012345',
+              trigger: {
+                current_state: {}
+              },
               vendorLink: {
                 component: 'a',
                 href: 'https://www.pajemploi.urssaf.fr/',
@@ -74,7 +77,8 @@ describe('KonnectorBlock', function () {
               expect(getByText('Pajemploi').closest('a')).toHaveAttribute('href', "https://links.mycozy.cloud/home/connected/pajemploi/accounts/012345?fallback=".concat(encodeURIComponent('http://cozy-home.tools:8080/#/connected/pajemploi/accounts/012345')));
               expect(getByText('https://www.pajemploi.urssaf.fr/'));
               expect(getByText('https://www.pajemploi.urssaf.fr/').closest('a')).toHaveAttribute('href', 'https://www.pajemploi.urssaf.fr/');
-              expect(getByText(en.konnectorBlock.account));
+              expect(getByText(en.konnectorBlock.store.primary));
+              expect(getByText(en.konnectorBlock.store.secondary));
             });
 
           case 5: