cozy-harvest-lib 12.5.0 → 12.5.2

package/CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [12.5.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@12.5.1...cozy-harvest-lib@12.5.2) (2023-01-27)
+
+
+### Bug Fixes
+
+* **harvest-lib:** Redirect when close viewer modal ([48445b4](https://github.com/cozy/cozy-libs/commit/48445b4613df85fc702f5f649711a751ff9fca81))
+* **harvest-lib:** Routes order in RoutesV4 component ([a9052c0](https://github.com/cozy/cozy-libs/commit/a9052c0fa27b68aaa33f6c371f23020ee91e37da))
+
+
+
+
+
+## [12.5.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@12.5.0...cozy-harvest-lib@12.5.1) (2023-01-26)
+
+
+### Bug Fixes
+
+* **harvest:** Some propTypes was incorrect on LaunchTriggerAlert and ([eb5f8c1](https://github.com/cozy/cozy-libs/commit/eb5f8c1be7ab7420a59e4c3cad6c8aca09ac30eb))
+
+
+
+
+
 # [12.5.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@12.4.0...cozy-harvest-lib@12.5.0) (2023-01-25)
 
 

package/dist/components/AccountModalWithoutTabs/{FovV4Router → ForV4Router}/AccountModalContentWrapper.js

@@ -43,9 +43,9 @@ var AccountModalContentWrapper = function AccountModalContentWrapper(_ref) {
 };
 
 AccountModalContentWrapper.propTypes = {
-  konnector: PropTypes.object.isRequired,
-  trigger: PropTypes.object.isRequired,
-  account: PropTypes.object.isRequired,
+  konnector: PropTypes.object,
+  trigger: PropTypes.object,
+  account: PropTypes.object,
   intentsApi: intentsApiProptype,
   innerAccountModalOverrides: innerAccountModalOverridesProptype
 };

package/dist/components/Routes/RoutesV4.js

@@ -7,8 +7,8 @@ import NewAccountModal from '../NewAccountModal';
 import EditAccountModal from '../EditAccountModal';
 import KonnectorSuccess from '../KonnectorSuccess';
 import HarvestModalRoot from '../HarvestModalRoot';
-import AccountModalWithoutTabs from '../AccountModalWithoutTabs/FovV4Router/AccountModalWithoutTabs';
-import AccountModalContentWrapper from '../AccountModalWithoutTabs/FovV4Router/AccountModalContentWrapper';
+import AccountModalWithoutTabs from '../AccountModalWithoutTabs/ForV4Router/AccountModalWithoutTabs';
+import AccountModalContentWrapper from '../AccountModalWithoutTabs/ForV4Router/AccountModalContentWrapper';
 import DataTab from '../KonnectorConfiguration/DataTab';
 import ConfigurationTab from '../KonnectorConfiguration/ConfigurationTab';
 import withAdaptiveRouter from '../hoc/withRouter';
@@ -29,11 +29,38 @@ var RoutesV4 = function RoutesV4(_ref) {
         konnector: konnectorWithTriggers
       });
     }
-  }), flag('harvest.inappconnectors.enabled') ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Route, {
-    path: "".concat(konnectorRoot, "/accounts/:accountId"),
+  }), /*#__PURE__*/React.createElement(Route, {
+    path: "".concat(konnectorRoot, "/accounts/:accountId/edit"),
     exact: true,
     render: function render(_ref2) {
       var match = _ref2.match;
+      return /*#__PURE__*/React.createElement(EditAccountModal, {
+        konnector: konnectorWithTriggers,
+        accountId: match.params.accountId,
+        accounts: accountsAndTriggers
+      });
+    }
+  }), /*#__PURE__*/React.createElement(Route, {
+    path: "".concat(konnectorRoot, "/new"),
+    exact: true,
+    render: function render() {
+      return /*#__PURE__*/React.createElement(NewAccountModal, {
+        konnector: konnectorWithTriggers,
+        onSuccess: onSuccess,
+        onDismiss: onDismiss
+      });
+    }
+  }), /*#__PURE__*/React.createElement(Route, {
+    path: "".concat(konnectorRoot, "/viewer/:accountId/:folderToSaveId/:fileIndex"),
+    exact: true,
+    render: function render(routeComponentProps) {
+      return /*#__PURE__*/React.createElement(ViewerModal, routeComponentProps);
+    }
+  }), flag('harvest.inappconnectors.enabled') ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Route, {
+    path: "".concat(konnectorRoot, "/accounts/:accountId"),
+    exact: true,
+    render: function render(_ref3) {
+      var match = _ref3.match;
       return /*#__PURE__*/React.createElement(AccountModalWithoutTabs, {
         konnector: konnectorWithTriggers,
         accountId: match.params.accountId,
@@ -51,8 +78,8 @@ var RoutesV4 = function RoutesV4(_ref) {
   }), /*#__PURE__*/React.createElement(Route, {
     path: "".concat(konnectorRoot, "/accounts/:accountId/config"),
     exact: true,
-    render: function render(_ref3) {
-      var match = _ref3.match;
+    render: function render(_ref4) {
+      var match = _ref4.match;
       return /*#__PURE__*/React.createElement(AccountModalWithoutTabs, {
         konnector: konnectorWithTriggers,
         accountId: match.params.accountId,
@@ -72,8 +99,8 @@ var RoutesV4 = function RoutesV4(_ref) {
   })) : /*#__PURE__*/React.createElement(Route, {
     path: "".concat(konnectorRoot, "/accounts/:accountId"),
     exact: true,
-    render: function render(_ref4) {
-      var match = _ref4.match;
+    render: function render(_ref5) {
+      var match = _ref5.match;
       return /*#__PURE__*/React.createElement(AccountModal, {
         konnector: konnectorWithTriggers,
         accountId: match.params.accountId,
@@ -83,33 +110,6 @@ var RoutesV4 = function RoutesV4(_ref) {
         showAccountSelection: !konnectorWithTriggers.clientSide
       });
     }
-  }), /*#__PURE__*/React.createElement(Route, {
-    path: "".concat(konnectorRoot, "/accounts/:accountId/edit"),
-    exact: true,
-    render: function render(_ref5) {
-      var match = _ref5.match;
-      return /*#__PURE__*/React.createElement(EditAccountModal, {
-        konnector: konnectorWithTriggers,
-        accountId: match.params.accountId,
-        accounts: accountsAndTriggers
-      });
-    }
-  }), /*#__PURE__*/React.createElement(Route, {
-    path: "".concat(konnectorRoot, "/viewer/:accountId/:folderToSaveId/:fileIndex"),
-    exact: true,
-    render: function render(routeComponentProps) {
-      return /*#__PURE__*/React.createElement(ViewerModal, routeComponentProps);
-    }
-  }), /*#__PURE__*/React.createElement(Route, {
-    path: "".concat(konnectorRoot, "/new"),
-    exact: true,
-    render: function render() {
-      return /*#__PURE__*/React.createElement(NewAccountModal, {
-        konnector: konnectorWithTriggers,
-        onSuccess: onSuccess,
-        onDismiss: onDismiss
-      });
-    }
   }), !flag('harvest.inappconnectors.enabled') && /*#__PURE__*/React.createElement(Route, {
     path: "".concat(konnectorRoot, "/accounts/:accountId/success"),
     exact: true,

package/dist/components/cards/LaunchTriggerAlert.js

@@ -151,10 +151,10 @@ LaunchTriggerAlert.defaultProps = {
 };
 LaunchTriggerAlert.propTypes = {
   flow: PropTypes.object,
-  f: PropTypes.function,
-  t: PropTypes.function,
+  f: PropTypes.func,
+  t: PropTypes.func,
   disabled: PropTypes.bool,
   konnectorRoot: PropTypes.string,
-  historyAction: PropTypes.function
+  historyAction: PropTypes.func
 };
 export default withAdaptiveRouter(LaunchTriggerAlert);

package/dist/datacards/ViewerModal.js

@@ -18,7 +18,7 @@ export var ViewerModal = function ViewerModal(_ref) {
       fetchStatus = _useDataCardFiles.fetchStatus;
 
   var handleCloseViewer = function handleCloseViewer() {
-    return replaceHistory("/accounts");
+    return replaceHistory("/accounts/".concat(accountId));
   };
 
   var handleFileChange = function handleFileChange(_file, newIndex) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "12.5.0",
+  "version": "12.5.2",
   "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": "de1dbcd5311291ab3735ce82e961b158b2ba5c0f"
+  "gitHead": "375a7a11c40e30357d6215fa9a05b2a1a7f3c1f4"
 }

package/src/components/AccountModalWithoutTabs/{FovV4Router → ForV4Router}/AccountModalContentWrapper.jsx

@@ -52,9 +52,9 @@ const AccountModalContentWrapper = ({
 }
 
 AccountModalContentWrapper.propTypes = {
-  konnector: PropTypes.object.isRequired,
-  trigger: PropTypes.object.isRequired,
-  account: PropTypes.object.isRequired,
+  konnector: PropTypes.object,
+  trigger: PropTypes.object,
+  account: PropTypes.object,
   intentsApi: intentsApiProptype,
   innerAccountModalOverrides: innerAccountModalOverridesProptype
 }

package/src/components/Routes/RoutesV4.jsx

@@ -9,8 +9,8 @@ import NewAccountModal from '../NewAccountModal'
 import EditAccountModal from '../EditAccountModal'
 import KonnectorSuccess from '../KonnectorSuccess'
 import HarvestModalRoot from '../HarvestModalRoot'
-import AccountModalWithoutTabs from '../AccountModalWithoutTabs/FovV4Router/AccountModalWithoutTabs'
-import AccountModalContentWrapper from '../AccountModalWithoutTabs/FovV4Router/AccountModalContentWrapper'
+import AccountModalWithoutTabs from '../AccountModalWithoutTabs/ForV4Router/AccountModalWithoutTabs'
+import AccountModalContentWrapper from '../AccountModalWithoutTabs/ForV4Router/AccountModalContentWrapper'
 import DataTab from '../KonnectorConfiguration/DataTab'
 import ConfigurationTab from '../KonnectorConfiguration/ConfigurationTab'
 import withAdaptiveRouter from '../hoc/withRouter'
@@ -35,6 +35,33 @@ const RoutesV4 = ({
           />
         )}
       />
+      <Route
+        path={`${konnectorRoot}/accounts/:accountId/edit`}
+        exact
+        render={({ match }) => (
+          <EditAccountModal
+            konnector={konnectorWithTriggers}
+            accountId={match.params.accountId}
+            accounts={accountsAndTriggers}
+          />
+        )}
+      />
+      <Route
+        path={`${konnectorRoot}/new`}
+        exact
+        render={() => (
+          <NewAccountModal
+            konnector={konnectorWithTriggers}
+            onSuccess={onSuccess}
+            onDismiss={onDismiss}
+          />
+        )}
+      />
+      <Route
+        path={`${konnectorRoot}/viewer/:accountId/:folderToSaveId/:fileIndex`}
+        exact
+        render={routeComponentProps => <ViewerModal {...routeComponentProps} />}
+      />
       {flag('harvest.inappconnectors.enabled') ? (
         <>
           <Route
@@ -103,33 +130,6 @@ const RoutesV4 = ({
         />
       )}
 
-      <Route
-        path={`${konnectorRoot}/accounts/:accountId/edit`}
-        exact
-        render={({ match }) => (
-          <EditAccountModal
-            konnector={konnectorWithTriggers}
-            accountId={match.params.accountId}
-            accounts={accountsAndTriggers}
-          />
-        )}
-      />
-      <Route
-        path={`${konnectorRoot}/viewer/:accountId/:folderToSaveId/:fileIndex`}
-        exact
-        render={routeComponentProps => <ViewerModal {...routeComponentProps} />}
-      />
-      <Route
-        path={`${konnectorRoot}/new`}
-        exact
-        render={() => (
-          <NewAccountModal
-            konnector={konnectorWithTriggers}
-            onSuccess={onSuccess}
-            onDismiss={onDismiss}
-          />
-        )}
-      />
       {!flag('harvest.inappconnectors.enabled') && (
         <Route
           path={`${konnectorRoot}/accounts/:accountId/success`}

package/src/components/cards/LaunchTriggerAlert.jsx

@@ -153,11 +153,11 @@ LaunchTriggerAlert.defaultProps = {
 
 LaunchTriggerAlert.propTypes = {
   flow: PropTypes.object,
-  f: PropTypes.function,
-  t: PropTypes.function,
+  f: PropTypes.func,
+  t: PropTypes.func,
   disabled: PropTypes.bool,
   konnectorRoot: PropTypes.string,
-  historyAction: PropTypes.function
+  historyAction: PropTypes.func
 }
 
 export default withAdaptiveRouter(LaunchTriggerAlert)

package/src/datacards/ViewerModal.jsx

@@ -14,7 +14,7 @@ export const ViewerModal = ({
   const { pushHistory, replaceHistory } = useContext(MountPointContext)
   const { data, fetchStatus } = useDataCardFiles(accountId, folderToSaveId)
 
-  const handleCloseViewer = () => replaceHistory(`/accounts`)
+  const handleCloseViewer = () => replaceHistory(`/accounts/${accountId}`)
   const handleFileChange = (_file, newIndex) =>
     pushHistory(`/viewer/${accountId}/${folderToSaveId}/${newIndex}`)