cozy-harvest-lib 18.1.2 → 18.2.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.
 
+# [18.2.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@18.1.3...cozy-harvest-lib@18.2.0) (2023-10-12)
+
+
+### Features
+
+* Add information link redirecting to the store ([e058415](https://github.com/cozy/cozy-libs/commit/e058415ae9ad5e330e106e2e629cff6096355e5b))
+
+
+
+
+
+## [18.1.3](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@18.1.2...cozy-harvest-lib@18.1.3) (2023-10-12)
+
+
+### Bug Fixes
+
+* Optimize the request ([b948b48](https://github.com/cozy/cozy-libs/commit/b948b487c560db1e208612d7d5496e595bc94f21))
+
+
+
+
+
 ## [18.1.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@18.1.1...cozy-harvest-lib@18.1.2) (2023-10-11)
 
 

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

@@ -90,8 +90,8 @@ export var DataTab = function DataTab(_ref) {
     account: account,
     trigger: trigger,
     konnector: konnector
-  }), konnector.vendor_link && /*#__PURE__*/React.createElement(InformationsCard, {
-    link: konnector.vendor_link
+  }), /*#__PURE__*/React.createElement(InformationsCard, {
+    konnector: konnector
   }))));
 };
 DataTab.propTypes = {

package/dist/components/NewAccountModal.js

@@ -100,7 +100,7 @@ var NewAccountModal = function NewAccountModal(_ref) {
     onClose: onDismiss
   }), !serverSideKonnector && /*#__PURE__*/React.createElement(InformationsCard, {
     className: "u-mt-1",
-    link: konnector.vendor_link
+    konnector: konnector
   }), /*#__PURE__*/React.createElement("div", {
     className: "u-mb-2"
   })));

package/dist/components/cards/InformationsCard.js

@@ -1,19 +1,24 @@
-import { ListItemText } from '@material-ui/core';
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import cx from 'classnames';
 import React from 'react';
+import { useClient, generateWebLink } from 'cozy-client';
 import Card from 'cozy-ui/transpiled/react/Card';
 import Divider from 'cozy-ui/transpiled/react/Divider';
-import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import Icon from 'cozy-ui/transpiled/react/Icon';
 import GlobeIcon from 'cozy-ui/transpiled/react/Icons/Globe';
+import StoreIcon from 'cozy-ui/transpiled/react/Icons/Store';
 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 ListItemText from 'cozy-ui/transpiled/react/ListItemText';
 import Typography from 'cozy-ui/transpiled/react/Typography';
+import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import { getErrorMessage } from '../../helpers/getErrorMessage';
 import logger from '../../logger';
 
-var getLabel = function getLabel(link) {
+var getHost = function getHost(link) {
   if (!link) return null;
 
   try {
@@ -25,15 +30,92 @@ var getLabel = function getLabel(link) {
   }
 };
 
-export var InformationsCard = function InformationsCard(_ref) {
-  var className = _ref.className,
-      link = _ref.link;
+var ExternalLinkButton = function ExternalLinkButton(_ref) {
+  var url = _ref.url,
+      primaryText = _ref.primaryText,
+      secondaryText = _ref.secondaryText,
+      icon = _ref.icon;
+  return /*#__PURE__*/React.createElement(ListItem, {
+    button: true,
+    className: "u-mb-half",
+    component: "a",
+    href: url,
+    target: "_blank"
+  }, /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(Icon, {
+    icon: icon,
+    size: 16,
+    color: "textPrimary"
+  })), /*#__PURE__*/React.createElement(ListItemText, {
+    primary: primaryText,
+    secondary: secondaryText
+  }));
+};
+
+var StoreButton = function StoreButton(_ref2) {
+  var appSlug = _ref2.appSlug;
+  var client = useClient();
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  var label = getLabel(link);
-  if (!label) return null;
+  if (!client) {
+    return null;
+  }
+
+  if (!appSlug) {
+    return null;
+  }
+
+  var _client$getInstanceOp = client.getInstanceOptions(),
+      subDomainType = _client$getInstanceOp.cozySubdomainType;
+
+  var storeAppName = 'store'; // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
+
+  var cozyURL = new URL(client.getStackClient().uri);
+  var nativePath = "/myapps/".concat(appSlug);
+  var url = generateWebLink({
+    cozyUrl: cozyURL.origin,
+    searchParams: [],
+    pathname: '/',
+    hash: nativePath,
+    slug: storeAppName,
+    subDomainType: subDomainType
+  });
+  return /*#__PURE__*/React.createElement(ExternalLinkButton, {
+    url: url,
+    primaryText: t('card.information.store'),
+    secondaryText: t('card.information.storeDescription'),
+    icon: StoreIcon
+  });
+};
+
+var VendorLinkButton = function VendorLinkButton(_ref3) {
+  var vendorLink = _ref3.vendorLink;
+
+  var _useI18n2 = useI18n(),
+      t = _useI18n2.t;
+
+  var host = getHost(vendorLink);
+
+  if (!host) {
+    return null;
+  }
+
+  return /*#__PURE__*/React.createElement(ExternalLinkButton, {
+    url: vendorLink,
+    primaryText: t('card.information.websiteLink'),
+    secondaryText: host,
+    icon: GlobeIcon
+  });
+};
+
+export var InformationsCard = function InformationsCard(_ref4) {
+  var className = _ref4.className,
+      konnector = _ref4.konnector;
+
+  var _useI18n3 = useI18n(),
+      t = _useI18n3.t;
+
   return /*#__PURE__*/React.createElement(Card, {
     className: cx('u-p-0', className)
   }, /*#__PURE__*/React.createElement("div", {
@@ -43,22 +125,13 @@ export var InformationsCard = function InformationsCard(_ref) {
     }
   }, /*#__PURE__*/React.createElement(Typography, {
     variant: "h5"
-  }, t('card.websiteLink.title'))), /*#__PURE__*/React.createElement(Divider, {
+  }, t('card.information.title'))), /*#__PURE__*/React.createElement(Divider, {
     className: "u-ml-0 u-maw-100 u-mb-half"
   }), /*#__PURE__*/React.createElement(List, {
     className: "u-p-0"
-  }, /*#__PURE__*/React.createElement(ListItem, {
-    button: true,
-    className: "u-mb-half",
-    component: "a",
-    href: link,
-    target: "_blank"
-  }, /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(Icon, {
-    icon: GlobeIcon,
-    size: 16,
-    color: "textPrimary"
-  })), /*#__PURE__*/React.createElement(ListItemText, {
-    primary: t('card.websiteLink.description'),
-    secondary: label
-  }))));
+  }, /*#__PURE__*/React.createElement(StoreButton, {
+    appSlug: konnector.slug
+  }), /*#__PURE__*/React.createElement(VendorLinkButton, {
+    vendorLink: konnector.vendor_link
+  })));
 };

package/dist/components/cards/RunningAlert.js

@@ -4,9 +4,9 @@ import { isFlagshipApp } from 'cozy-device-helper';
 import Alert from 'cozy-ui/transpiled/react/Alert';
 import AlertTitle from 'cozy-ui/transpiled/react/AlertTitle';
 import Button from 'cozy-ui/transpiled/react/Buttons';
-import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import Icon from 'cozy-ui/transpiled/react/Icon';
 import ArrowUp from 'cozy-ui/transpiled/react/Icons/ArrowUp';
+import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 export var RunningAlert = function RunningAlert() {
   var _useI18n = useI18n(),
       t = _useI18n.t;

package/dist/connections/accounts.js

@@ -481,28 +481,34 @@ export var fetchAccountsWithoutTriggers = /*#__PURE__*/function () {
 
 export var fetchReusableAccount = /*#__PURE__*/function () {
   var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(client, konnector) {
-    var _yield$client$collect, triggers, accountsWithoutTrigger;
-
+    var triggers, accountsWithoutTrigger;
     return _regeneratorRuntime.wrap(function _callee8$(_context8) {
       while (1) {
         switch (_context8.prev = _context8.next) {
           case 0:
             _context8.next = 2;
-            return client.collection('io.cozy.triggers').all();
+            return client.queryAll(Q('io.cozy.triggers').where({
+              _id: {
+                $gt: null
+              }
+            }).partialIndex({
+              worker: {
+                $in: ['konnector', 'client']
+              }
+            }).indexFields(['_id']));
 
           case 2:
-            _yield$client$collect = _context8.sent;
-            triggers = _yield$client$collect.data;
-            _context8.next = 6;
+            triggers = _context8.sent;
+            _context8.next = 5;
             return fetchAccountsWithoutTriggers(client, triggers);
 
-          case 6:
+          case 5:
             accountsWithoutTrigger = _context8.sent;
             return _context8.abrupt("return", accountsWithoutTrigger.find(function (account) {
               return account.account_type === konnector.slug;
             }));
 
-          case 8:
+          case 7:
           case "end":
             return _context8.stop();
         }

package/dist/connections/accounts.spec.js

@@ -564,22 +564,14 @@ describe('fetchReusableAccount', function () {
     var accounts = _ref22.accounts,
         triggers = _ref22.triggers;
     var client = new CozyClient({});
-    client.collection = jest.fn(function (doctype) {
-      if (doctype === 'io.cozy.triggers') {
-        return {
-          all: jest.fn().mockResolvedValue({
-            data: triggers
-          })
-        };
-      } else {
-        throw new Error("client.collection for ".concat(doctype, " is not mocked"));
-      }
-    });
     client.query = jest.fn().mockImplementation(function () {
       return {
         data: accounts
       };
     });
+    client.queryAll = jest.fn().mockImplementation(function () {
+      return triggers;
+    });
     return {
       client: client
     };

package/dist/locales/en.json

@@ -136,9 +136,11 @@
         "install": "Discover CoachCO2"
       }
     },
-    "websiteLink": {
+    "information": {
       "title": "Useful information",
-      "description": "Service website"
+      "websiteLink": "Open the website",
+      "store": "See in Cozy Cloud Store",
+      "storeDescription": "Access the description of this konnector app"
     }
   },
   "default": {

package/dist/locales/fr.json

@@ -136,9 +136,11 @@
         "install": "Découvrir Coach CO2"
       }
     },
-    "websiteLink": {
+    "information": {
       "title": "Informations utiles",
-      "description": "Site du service"
+      "websiteLink": "Ouvrir le site",
+      "store": "Voir dans le Store Cozy Cloud",
+      "storeDescription": "Accès la fiche descriptive de cette application connecteur"
     }
   },
   "default": {

package/dist/locales/nl_NL.json

@@ -136,9 +136,11 @@
         "install": "Ontdek CoachCO2"
       }
     },
-    "websiteLink": {
+    "information": {
       "title": "Nuttige informatie",
-      "description": "Website van dienst"
+      "websiteLink": "De website openen",
+      "store": "Zie in de Cozy Cloud Store",
+      "storeDescription": "Ga naar de beschrijving van deze konnector app"
     }
   },
   "default": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "18.1.2",
+  "version": "18.2.0",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -112,5 +112,5 @@
     "react-router-dom": ">=4.3.1"
   },
   "sideEffects": false,
-  "gitHead": "db4a954385db84b920e714ae87bda1fb96010c80"
+  "gitHead": "263e7855ca380bce6202f0ef242483b8f77d6469"
 }

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

@@ -94,9 +94,7 @@ export const DataTab = ({
             trigger={trigger}
             konnector={konnector}
           />
-          {konnector.vendor_link && (
-            <InformationsCard link={konnector.vendor_link} />
-          )}
+          <InformationsCard konnector={konnector} />
         </Stack>
       </div>
     </div>

package/src/components/NewAccountModal.jsx

@@ -102,7 +102,7 @@ const NewAccountModal = ({ konnector, onSuccess, onDismiss }) => {
           />
 
           {!serverSideKonnector && (
-            <InformationsCard className="u-mt-1" link={konnector.vendor_link} />
+            <InformationsCard className="u-mt-1" konnector={konnector} />
           )}
 
           {/*

package/src/components/cards/InformationsCard.tsx

@@ -1,26 +1,48 @@
-import { ListItemText } from '@material-ui/core'
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import cx from 'classnames'
 import React from 'react'
 
+import { useClient, generateWebLink } from 'cozy-client'
 import Card from 'cozy-ui/transpiled/react/Card'
 import Divider from 'cozy-ui/transpiled/react/Divider'
-import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import GlobeIcon from 'cozy-ui/transpiled/react/Icons/Globe'
+import StoreIcon from 'cozy-ui/transpiled/react/Icons/Store'
 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 ListItemText from 'cozy-ui/transpiled/react/ListItemText'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
 import { getErrorMessage } from '../../helpers/getErrorMessage'
 import logger from '../../logger'
 
+interface Konnector {
+  vendor_link: string
+  slug: string
+}
 interface InformationsCardProps {
   className?: string
-  link: string
+  konnector: Konnector
+}
+
+interface StoreButtonProps {
+  appSlug: string
+}
+interface VendorLinkButtonProps {
+  vendorLink: string
+}
+interface ExternalLinkButtonProps {
+  url: string
+  primaryText: string
+  secondaryText: string
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  icon: any
 }
 
-const getLabel = (link?: string): string | null => {
+const getHost = (link?: string): string | null => {
   if (!link) return null
 
   try {
@@ -32,14 +54,87 @@ const getLabel = (link?: string): string | null => {
   }
 }
 
+const ExternalLinkButton = ({
+  url,
+  primaryText,
+  secondaryText,
+  icon
+}: ExternalLinkButtonProps): JSX.Element | null => {
+  return (
+    <ListItem
+      button
+      className="u-mb-half"
+      component="a"
+      href={url}
+      target="_blank"
+    >
+      <ListItemIcon>
+        <Icon icon={icon} size={16} color="textPrimary" />
+      </ListItemIcon>
+
+      <ListItemText primary={primaryText} secondary={secondaryText} />
+    </ListItem>
+  )
+}
+
+const StoreButton = ({ appSlug }: StoreButtonProps): JSX.Element | null => {
+  const client = useClient()
+  const { t } = useI18n()
+  if (!client) {
+    return null
+  }
+  if (!appSlug) {
+    return null
+  }
+  const { cozySubdomainType: subDomainType }: any = client.getInstanceOptions()
+
+  const storeAppName = 'store'
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
+  const cozyURL = new URL(client.getStackClient().uri)
+  const nativePath = `/myapps/${appSlug}`
+  const url = generateWebLink({
+    cozyUrl: cozyURL.origin,
+    searchParams: [],
+    pathname: '/',
+    hash: nativePath,
+    slug: storeAppName,
+    subDomainType
+  })
+  return (
+    <ExternalLinkButton
+      url={url}
+      primaryText={t('card.information.store')}
+      secondaryText={t('card.information.storeDescription')}
+      icon={StoreIcon}
+    />
+  )
+}
+
+const VendorLinkButton = ({
+  vendorLink
+}: VendorLinkButtonProps): JSX.Element | null => {
+  const { t } = useI18n()
+  const host = getHost(vendorLink)
+
+  if (!host) {
+    return null
+  }
+
+  return (
+    <ExternalLinkButton
+      url={vendorLink}
+      primaryText={t('card.information.websiteLink')}
+      secondaryText={host}
+      icon={GlobeIcon}
+    />
+  )
+}
+
 export const InformationsCard = ({
   className,
-  link
+  konnector
 }: InformationsCardProps): JSX.Element | null => {
   const { t } = useI18n()
-  const label = getLabel(link)
-
-  if (!label) return null
 
   return (
     <Card className={cx('u-p-0', className)}>
@@ -47,28 +142,14 @@ export const InformationsCard = ({
         className="u-ph-1 u-flex u-flex-items-center"
         style={{ minHeight: '64px' }}
       >
-        <Typography variant="h5">{t('card.websiteLink.title')}</Typography>
+        <Typography variant="h5">{t('card.information.title')}</Typography>
       </div>
 
       <Divider className="u-ml-0 u-maw-100 u-mb-half" />
 
       <List className="u-p-0">
-        <ListItem
-          button
-          className="u-mb-half"
-          component="a"
-          href={link}
-          target="_blank"
-        >
-          <ListItemIcon>
-            <Icon icon={GlobeIcon} size={16} color="textPrimary" />
-          </ListItemIcon>
-
-          <ListItemText
-            primary={t('card.websiteLink.description')}
-            secondary={label}
-          />
-        </ListItem>
+        <StoreButton appSlug={konnector.slug} />
+        <VendorLinkButton vendorLink={konnector.vendor_link} />
       </List>
     </Card>
   )

package/src/components/cards/RunningAlert.tsx

@@ -4,9 +4,9 @@ import { isFlagshipApp } from 'cozy-device-helper'
 import Alert from 'cozy-ui/transpiled/react/Alert'
 import AlertTitle from 'cozy-ui/transpiled/react/AlertTitle'
 import Button from 'cozy-ui/transpiled/react/Buttons'
-import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import ArrowUp from 'cozy-ui/transpiled/react/Icons/ArrowUp'
+import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
 export const RunningAlert = (): JSX.Element | null => {
   const { t } = useI18n()

package/src/connections/accounts.js

@@ -237,7 +237,22 @@ export const fetchAccountsWithoutTriggers = async (client, triggers) => {
  * @return {Account} An account without trigger for the given konnector
  */
 export const fetchReusableAccount = async (client, konnector) => {
-  const { data: triggers } = await client.collection('io.cozy.triggers').all()
+  // the where is there because ATM TriggerCollection check if there is
+  // a selector to know if it should call /jobs/triggers or
+  // /data/io.cozy.triggers.
+  // In our case, we only want the triggers without the job, so we want
+  // to use /data/io.cozy.triggers
+  const triggers = await client.queryAll(
+    Q('io.cozy.triggers')
+      .where({
+        _id: { $gt: null }
+      })
+      .partialIndex({
+        worker: { $in: ['konnector', 'client'] }
+      })
+      .indexFields(['_id'])
+  )
+
   const accountsWithoutTrigger = await fetchAccountsWithoutTriggers(
     client,
     triggers

package/src/connections/accounts.spec.js

@@ -417,20 +417,15 @@ describe('Account mutations', () => {
 describe('fetchReusableAccount', () => {
   const setup = ({ accounts, triggers }) => {
     const client = new CozyClient({})
-    client.collection = jest.fn(doctype => {
-      if (doctype === 'io.cozy.triggers') {
-        return {
-          all: jest.fn().mockResolvedValue({ data: triggers })
-        }
-      } else {
-        throw new Error(`client.collection for ${doctype} is not mocked`)
-      }
-    })
     client.query = jest.fn().mockImplementation(() => {
       return {
         data: accounts
       }
     })
+
+    client.queryAll = jest.fn().mockImplementation(() => {
+      return triggers
+    })
     return { client }
   }
   it('should return the right account when possible', async () => {

package/src/locales/en.json

@@ -136,9 +136,11 @@
         "install": "Discover CoachCO2"
       }
     },
-    "websiteLink": {
+    "information": {
       "title": "Useful information",
-      "description": "Service website"
+      "websiteLink": "Open the website",
+      "store": "See in Cozy Cloud Store",
+      "storeDescription": "Access the description of this konnector app"
     }
   },
   "default": {

package/src/locales/fr.json

@@ -136,9 +136,11 @@
         "install": "Découvrir Coach CO2"
       }
     },
-    "websiteLink": {
+    "information": {
       "title": "Informations utiles",
-      "description": "Site du service"
+      "websiteLink": "Ouvrir le site",
+      "store": "Voir dans le Store Cozy Cloud",
+      "storeDescription": "Accès la fiche descriptive de cette application connecteur"
     }
   },
   "default": {

package/src/locales/nl_NL.json

@@ -136,9 +136,11 @@
         "install": "Ontdek CoachCO2"
       }
     },
-    "websiteLink": {
+    "information": {
       "title": "Nuttige informatie",
-      "description": "Website van dienst"
+      "websiteLink": "De website openen",
+      "store": "Zie in de Cozy Cloud Store",
+      "storeDescription": "Ga naar de beschrijving van deze konnector app"
     }
   },
   "default": {