cozy-harvest-lib 13.3.0 → 13.4.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [13.4.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@13.3.0...cozy-harvest-lib@13.4.0) (2023-02-21)
+
+
+### Features
+
+* **harvest:** Add create account wording in CannotConnectModal ([1d78356](https://github.com/cozy/cozy-libs/commit/1d78356b441b70c4da0a0ad06df3250edfe5ae52))
+* **harvest:** Add props propagation on Markdown component ([f76f9a6](https://github.com/cozy/cozy-libs/commit/f76f9a6a22c6bbe23169638973b68ecfb7842257))
+
+
+
+
+
 # [13.3.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@13.2.2...cozy-harvest-lib@13.3.0) (2023-02-16)
 
 

package/dist/components/AccountForm/CannotConnectModal.js

@@ -1,10 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Typography from 'cozy-ui/transpiled/react/Typography';
-import Link from 'cozy-ui/transpiled/react/Link';
 import { ConfirmDialog } from 'cozy-ui/transpiled/react/CozyDialogs';
 import { useI18n } from 'cozy-ui/transpiled/react/I18n';
 import { useComponentsProps } from '../Providers/ComponentsPropsProvider';
+import Markdown from '../Markdown';
 
 var CannotConnectModal = function CannotConnectModal(_ref) {
   var _ComponentsProps$Cann;
@@ -24,13 +24,19 @@ var CannotConnectModal = function CannotConnectModal(_ref) {
     content: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Typography, {
       variant: "h4",
       className: "u-mb-1"
-    }, t('accountForm.cannotConnectModal.title')), /*#__PURE__*/React.createElement(Typography, {
-      className: "u-mb-1"
-    }, t('accountForm.cannotConnectModal.content'), /*#__PURE__*/React.createElement(Link, {
-      href: vendorLink,
-      target: "_blank",
-      rel: "noopener noreferrer"
-    }, vendorName)), ComponentsProps === null || ComponentsProps === void 0 ? void 0 : (_ComponentsProps$Cann = ComponentsProps.CannotConnectModal) === null || _ComponentsProps$Cann === void 0 ? void 0 : _ComponentsProps$Cann.extraContent),
+    }, t('accountForm.cannotConnectModal.title')), /*#__PURE__*/React.createElement(Markdown, {
+      className: "u-mb-1",
+      source: t('accountForm.cannotConnectModal.content', {
+        vendorLink: vendorLink,
+        vendorName: vendorName
+      })
+    }), /*#__PURE__*/React.createElement(Markdown, {
+      className: "u-mb-1",
+      source: t('accountForm.cannotConnectModal.noAccount', {
+        vendorLink: vendorLink,
+        vendorName: vendorName
+      })
+    }), ComponentsProps === null || ComponentsProps === void 0 ? void 0 : (_ComponentsProps$Cann = ComponentsProps.CannotConnectModal) === null || _ComponentsProps$Cann === void 0 ? void 0 : _ComponentsProps$Cann.extraContent),
     onClose: onClose
   });
 };

package/dist/components/Markdown.js

@@ -1,4 +1,6 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _extends from "@babel/runtime/helpers/extends";
+var _excluded = ["source", "linkProps"];
 import React from 'react';
 import ReactMarkdown from 'react-markdown';
 import Link from 'cozy-ui/transpiled/react/Link';
@@ -24,13 +26,15 @@ var reactMarkdownRendererOptions = function reactMarkdownRendererOptions(_ref) {
 
 export var Markdown = function Markdown(_ref2) {
   var source = _ref2.source,
-      linkProps = _ref2.linkProps;
-  return /*#__PURE__*/React.createElement(ReactMarkdown, {
+      linkProps = _ref2.linkProps,
+      props = _objectWithoutProperties(_ref2, _excluded);
+
+  return /*#__PURE__*/React.createElement(ReactMarkdown, _extends({}, props, {
     source: source,
     linkTarget: "_blank",
     renderers: reactMarkdownRendererOptions({
       linkProps: linkProps
     })
-  });
+  }));
 };
 export default Markdown;

package/dist/locales/en.json

@@ -23,7 +23,8 @@
     },
     "cannotConnectModal": {
       "title": "You can't connect?",
-      "content": "You can check your login or reset your password on the website "
+      "content": "You can check your login or reset your password on the [%{vendorName}](%{vendorLink})'s website.",
+      "noAccount": "If you do not have an account you will need to create one on the [%{vendorName}](%{vendorLink})'s website."
     },
     "cannotConnectLink": "I can't connect",
     "notClientSide": "The %{name} application uses a brand-new and efficient system for retrieving your data from your Cozy. This action is only accessible from the Cozy mobile app."

package/dist/locales/fr.json

@@ -23,7 +23,8 @@
     },
     "cannotConnectModal": {
       "title": "Vous ne parvenez pas à vous connecter ?",
-      "content": "Vous pouvez vérifier vos identifiants ou réinitialiser votre mot de passe sur le site "
+      "content": "Vous pouvez vérifier vos identifiants ou réinitialiser votre mot de passe sur le site [%{vendorName}](%{vendorLink}).",
+      "noAccount": "Si vous n'avez pas de compte il vous faudra en créer sur le site [%{vendorName}](%{vendorLink})."
     },
     "cannotConnectLink": "Je ne parviens pas à me connecter",
     "notClientSide": "L'application %{name} utilise un nouveau système plus efficace pour la récupération de vos données dans votre Cozy. Cette action est uniquement accessible depuis l’application mobile Cozy."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "13.3.0",
+  "version": "13.4.0",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -88,5 +88,5 @@
     "react-router-dom": ">=4.3.1"
   },
   "sideEffects": false,
-  "gitHead": "ffa117d846fffd160f7b40f70b0620acd39c78f0"
+  "gitHead": "33d3c7625a16ca02a771e5df5e9695366096261e"
 }

package/src/components/AccountForm/CannotConnectModal.jsx

@@ -2,11 +2,11 @@ import React from 'react'
 import PropTypes from 'prop-types'
 
 import Typography from 'cozy-ui/transpiled/react/Typography'
-import Link from 'cozy-ui/transpiled/react/Link'
 import { ConfirmDialog } from 'cozy-ui/transpiled/react/CozyDialogs'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 
 import { useComponentsProps } from '../Providers/ComponentsPropsProvider'
+import Markdown from '../Markdown'
 
 const CannotConnectModal = ({ vendorName, vendorLink, onClose }) => {
   const { t } = useI18n()
@@ -20,12 +20,20 @@ const CannotConnectModal = ({ vendorName, vendorLink, onClose }) => {
           <Typography variant="h4" className="u-mb-1">
             {t('accountForm.cannotConnectModal.title')}
           </Typography>
-          <Typography className="u-mb-1">
-            {t('accountForm.cannotConnectModal.content')}
-            <Link href={vendorLink} target="_blank" rel="noopener noreferrer">
-              {vendorName}
-            </Link>
-          </Typography>
+          <Markdown
+            className="u-mb-1"
+            source={t('accountForm.cannotConnectModal.content', {
+              vendorLink,
+              vendorName
+            })}
+          />
+          <Markdown
+            className="u-mb-1"
+            source={t('accountForm.cannotConnectModal.noAccount', {
+              vendorLink,
+              vendorName
+            })}
+          />
           {ComponentsProps?.CannotConnectModal?.extraContent}
         </>
       }

package/src/components/Markdown.jsx

@@ -13,8 +13,9 @@ const reactMarkdownRendererOptions = ({ linkProps }) => ({
   )
 })
 
-export const Markdown = ({ source, linkProps }) => (
+export const Markdown = ({ source, linkProps, ...props }) => (
   <ReactMarkdown
+    {...props}
     source={source}
     linkTarget="_blank"
     renderers={reactMarkdownRendererOptions({ linkProps })}

package/src/locales/en.json

@@ -23,7 +23,8 @@
     },
     "cannotConnectModal": {
       "title": "You can't connect?",
-      "content": "You can check your login or reset your password on the website "
+      "content": "You can check your login or reset your password on the [%{vendorName}](%{vendorLink})'s website.",
+      "noAccount": "If you do not have an account you will need to create one on the [%{vendorName}](%{vendorLink})'s website."
     },
     "cannotConnectLink": "I can't connect",
     "notClientSide": "The %{name} application uses a brand-new and efficient system for retrieving your data from your Cozy. This action is only accessible from the Cozy mobile app."

package/src/locales/fr.json

@@ -23,7 +23,8 @@
     },
     "cannotConnectModal": {
       "title": "Vous ne parvenez pas à vous connecter ?",
-      "content": "Vous pouvez vérifier vos identifiants ou réinitialiser votre mot de passe sur le site "
+      "content": "Vous pouvez vérifier vos identifiants ou réinitialiser votre mot de passe sur le site [%{vendorName}](%{vendorLink}).",
+      "noAccount": "Si vous n'avez pas de compte il vous faudra en créer sur le site [%{vendorName}](%{vendorLink})."
     },
     "cannotConnectLink": "Je ne parviens pas à me connecter",
     "notClientSide": "L'application %{name} utilise un nouveau système plus efficace pour la récupération de vos données dans votre Cozy. Cette action est uniquement accessible depuis l’application mobile Cozy."