cozy-harvest-lib 32.2.9 → 32.2.11

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [32.2.11](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@32.2.10...cozy-harvest-lib@32.2.11) (2025-01-16)
+
+
+### Bug Fixes
+
+* Force the update of the current konnector data ([23370de](https://github.com/cozy/cozy-libs/commit/23370ded95bfd42c6c482dd0cdd9015057d8502e))
+
+
+
+
+
+## [32.2.10](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@32.2.9...cozy-harvest-lib@32.2.10) (2025-01-15)
+
+**Note:** Version bump only for package cozy-harvest-lib
+
+
+
+
+
 ## [32.2.9](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@32.2.8...cozy-harvest-lib@32.2.9) (2025-01-13)
 
 **Note:** Version bump only for package cozy-harvest-lib

package/dist/helpers/useKonnectorWithTriggers.js

@@ -18,70 +18,100 @@ export var useKonnectorWithTriggers = function useKonnectorWithTriggers(slug, in
 
   var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
-      isFetching = _useState2[0],
-      setIsFetching = _useState2[1];
+      isFetchingKonnector = _useState2[0],
+      setIsFetchingKonnector = _useState2[1];
 
-  var _useState3 = useState({
-    data: []
-  }),
+  var _useState3 = useState(true),
       _useState4 = _slicedToArray(_useState3, 2),
-      triggers = _useState4[0],
-      setTriggers = _useState4[1];
+      isFetchingTriggers = _useState4[0],
+      setIsFetchingTriggers = _useState4[1];
 
-  var _useState5 = useState({}),
+  var _useState5 = useState({
+    data: []
+  }),
       _useState6 = _slicedToArray(_useState5, 2),
-      konnector = _useState6[0],
-      setKonnector = _useState6[1];
+      triggers = _useState6[0],
+      setTriggers = _useState6[1];
+
+  var _useState7 = useState({}),
+      _useState8 = _slicedToArray(_useState7, 2),
+      konnector = _useState8[0],
+      setKonnector = _useState8[1];
 
   useEffect(function () {
-    function load() {
-      return _load.apply(this, arguments);
+    function _getKonnector() {
+      return _getKonnector2.apply(this, arguments);
     }
 
-    function _load() {
-      _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _yield$Promise$all3, _yield$Promise$all4, _konnector, _triggers;
-
+    function _getKonnector2() {
+      _getKonnector2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var konnector;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return getKonnector(client, slug);
+
+            case 2:
+              konnector = _context.sent;
+              setKonnector(konnector);
+              setIsFetchingKonnector(false);
+
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return _getKonnector2.apply(this, arguments);
+    }
+
+    _getKonnector();
+  }, [client, slug]);
+  useEffect(function () {
+    function _getTriggers() {
+      return _getTriggers2.apply(this, arguments);
+    }
+
+    function _getTriggers2() {
+      _getTriggers2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _triggers;
+
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if (!injectedKonnector) {
-                _context.next = 5;
+                _context2.next = 4;
                 break;
               }
 
-              setKonnector(injectedKonnector);
               setTriggers(injectedKonnector.triggers);
-              _context.next = 13;
+              _context2.next = 8;
               break;
 
-            case 5:
-              _context.next = 7;
-              return Promise.all([getKonnector(client, slug), getTriggers(client, slug)]);
-
-            case 7:
-              _yield$Promise$all3 = _context.sent;
-              _yield$Promise$all4 = _slicedToArray(_yield$Promise$all3, 2);
-              _konnector = _yield$Promise$all4[0];
-              _triggers = _yield$Promise$all4[1];
-              setKonnector(_konnector);
+            case 4:
+              _context2.next = 6;
+              return getTriggers(client, slug);
+
+            case 6:
+              _triggers = _context2.sent;
               setTriggers({
                 data: _triggers
               });
 
-            case 13:
-              setIsFetching(false);
+            case 8:
+              setIsFetchingTriggers(false);
 
-            case 14:
+            case 9:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee);
+        }, _callee2);
       }));
-      return _load.apply(this, arguments);
+      return _getTriggers2.apply(this, arguments);
     }
 
-    load();
+    _getTriggers();
   }, [client, injectedKonnector, slug]);
   useEffect(function () {
     var realtime = client.plugins.realtime;
@@ -108,8 +138,8 @@ export var useKonnectorWithTriggers = function useKonnectorWithTriggers(slug, in
 
   return {
     konnectorWithTriggers: konnectorWithTriggers,
-    fetching: isFetching,
-    notFoundError: !isFetching && !konnector
+    fetching: isFetchingKonnector || isFetchingTriggers,
+    notFoundError: !(isFetchingKonnector || isFetchingTriggers) && !konnector
   };
 };
 
@@ -118,45 +148,45 @@ function isKonnectorTrigger(doc) {
 }
 
 function getKonnector(_x, _x2) {
-  return _getKonnector.apply(this, arguments);
+  return _getKonnector3.apply(this, arguments);
 }
 
-function _getKonnector() {
-  _getKonnector = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(client, slug) {
+function _getKonnector3() {
+  _getKonnector3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(client, slug) {
     var result;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          _context2.next = 2;
+          _context3.next = 2;
           return client.query(Q(KONNECTORS_DOCTYPE).where({
             slug: slug
           }));
 
         case 2:
-          result = _context2.sent;
-          return _context2.abrupt("return", result.data[0]);
+          result = _context3.sent;
+          return _context3.abrupt("return", result.data[0]);
 
         case 4:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2);
+    }, _callee3);
   }));
-  return _getKonnector.apply(this, arguments);
+  return _getKonnector3.apply(this, arguments);
 }
 
 function getTriggers(_x3, _x4) {
-  return _getTriggers.apply(this, arguments);
+  return _getTriggers3.apply(this, arguments);
 }
 
-function _getTriggers() {
-  _getTriggers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(client, slug) {
+function _getTriggers3() {
+  _getTriggers3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(client, slug) {
     var _yield$client$query, allTriggers;
 
-    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          _context3.next = 2;
+          _context4.next = 2;
           return client.query(Q(TRIGGERS_DOCTYPE).where({
             worker: {
               $in: ['client', 'konnector']
@@ -164,17 +194,17 @@ function _getTriggers() {
           }));
 
         case 2:
-          _yield$client$query = _context3.sent;
+          _yield$client$query = _context4.sent;
           allTriggers = _yield$client$query.data;
-          return _context3.abrupt("return", allTriggers.filter(function (trigger) {
+          return _context4.abrupt("return", allTriggers.filter(function (trigger) {
             return isKonnectorTrigger(trigger) && get(trigger, 'message.konnector') === slug;
           }));
 
         case 5:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3);
+    }, _callee4);
   }));
-  return _getTriggers.apply(this, arguments);
+  return _getTriggers3.apply(this, arguments);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "32.2.9",
+  "version": "32.2.11",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -75,7 +75,7 @@
     "cozy-realtime": "^5.6.2",
     "cozy-tsconfig": "^1.8.1",
     "cozy-ui": "^115.0.2",
-    "cozy-viewer": "^13.1.0",
+    "cozy-viewer": "^13.2.1",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
     "form-data": "4.0.0",
@@ -111,5 +111,5 @@
     "react-router-dom": ">=6.14.2"
   },
   "sideEffects": false,
-  "gitHead": "56e9eed8725f3adc458230177ed0f62cf970bc35"
+  "gitHead": "92e93154d3679fb181f185c9963297efd0c69c2f"
 }

package/src/helpers/useKonnectorWithTriggers.js

@@ -8,27 +8,35 @@ const KONNECTORS_DOCTYPE = 'io.cozy.konnectors'
 
 export const useKonnectorWithTriggers = (slug, injectedKonnector) => {
   const client = useClient()
-  const [isFetching, setIsFetching] = useState(true)
+  const [isFetchingKonnector, setIsFetchingKonnector] = useState(true)
+  const [isFetchingTriggers, setIsFetchingTriggers] = useState(true)
   const [triggers, setTriggers] = useState({ data: [] })
   const [konnector, setKonnector] = useState({})
 
   useEffect(() => {
-    async function load() {
+    async function _getKonnector() {
+      // need to do getKonnector anyway to force the update of the konnector to be
+      // sure to have updated konnector fields
+      const konnector = await getKonnector(client, slug)
+      setKonnector(konnector)
+      setIsFetchingKonnector(false)
+    }
+
+    _getKonnector()
+  }, [client, slug])
+
+  useEffect(() => {
+    async function _getTriggers() {
       if (injectedKonnector) {
-        setKonnector(injectedKonnector)
         setTriggers(injectedKonnector.triggers)
       } else {
-        const [konnector, triggers] = await Promise.all([
-          getKonnector(client, slug),
-          getTriggers(client, slug)
-        ])
-        setKonnector(konnector)
+        const triggers = await getTriggers(client, slug)
         setTriggers({ data: triggers })
       }
-      setIsFetching(false)
+      setIsFetchingTriggers(false)
     }
 
-    load()
+    _getTriggers()
   }, [client, injectedKonnector, slug])
 
   useEffect(() => {
@@ -52,8 +60,8 @@ export const useKonnectorWithTriggers = (slug, injectedKonnector) => {
   }
   return {
     konnectorWithTriggers,
-    fetching: isFetching,
-    notFoundError: !isFetching && !konnector
+    fetching: isFetchingKonnector || isFetchingTriggers,
+    notFoundError: !(isFetchingKonnector || isFetchingTriggers) && !konnector
   }
 }