cozy-harvest-lib 9.32.2 → 9.32.4

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.
 
+## [9.32.4](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.32.3...cozy-harvest-lib@9.32.4) (2022-12-05)
+
+
+### Bug Fixes
+
+* Do not use CozyRealtime.unsubscribeAll anymore ([dc6d942](https://github.com/cozy/cozy-libs/commit/dc6d9423a4b49d5e11ddb6c7620cca9541c22519))
+
+
+
+
+
+## [9.32.3](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.32.2...cozy-harvest-lib@9.32.3) (2022-12-05)
+
+
+### Bug Fixes
+
+* **harvest:** Use correct button to close CozyConfirmDialog ([cd7e22b](https://github.com/cozy/cozy-libs/commit/cd7e22bdb9c5f7addacb1230e788b4a3a03c1126))
+
+
+
+
+
 ## [9.32.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.32.1...cozy-harvest-lib@9.32.2) (2022-12-02)
 
 

package/dist/components/CozyConfirmDialogProvider/index.js

@@ -1,7 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { createContext, useContext, useState } from 'react';
-import Buttons from 'cozy-ui/transpiled/react/MuiCozyTheme/Buttons';
+import Button from 'cozy-ui/transpiled/react/Buttons';
 import { ConfirmDialog } from 'cozy-ui/transpiled/react/CozyDialogs';
 export var CozyConfirmDialogContext = /*#__PURE__*/createContext();
 var currentDialogId = 0;
@@ -55,21 +55,20 @@ export var CozyConfirmDialogProvider = /*#__PURE__*/React.memo(function (props)
     value: context
   }, dialogs && dialogs.map(function (dialog) {
     return /*#__PURE__*/React.createElement(ConfirmDialog, {
-      key: dialog.id,
       open: true,
+      key: dialog.id,
       title: dialog.title,
       content: dialog.description,
-      onClose: function onClose() {
-        return _onClose(dialog.id);
-      },
-      actions: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Buttons, {
-        variant: "text",
-        color: "primary",
+      actions: /*#__PURE__*/React.createElement(Button, {
+        label: dialog.closeLabel,
         "aria-label": "Close dialog",
         onClick: function onClick() {
           return _onClose(dialog.id);
         }
-      }, dialog.closeLabel))
+      }),
+      onClose: function onClose() {
+        return _onClose(dialog.id);
+      }
     });
   }), children);
 });

package/dist/components/OAuthService.js

@@ -364,7 +364,7 @@ function registerRealtime(_ref4) {
     var realtime = client.plugins.realtime;
     realtime.subscribe('notified', 'io.cozy.accounts', OAUTH_REALTIME_CHANNEL, handleRealtime(konnector, resolve));
     return function () {
-      return realtime.unsubscribeAll();
+      return realtime.unsubscribe('notified', 'io.cozy.accounts', OAUTH_REALTIME_CHANNEL, handleRealtime(konnector, resolve));
     };
   };
 }

package/dist/components/OAuthService.spec.js

@@ -37,7 +37,7 @@ function CozyRealtimeMock() {
   this.subscribe = jest.fn().mockImplementation(function (eventType, doctype, channel, fn) {
     _this.on(eventType + doctype + channel, fn);
   });
-  this.unsubscribeAll = jest.fn().mockImplementation(function () {
+  this.unsubscribe = jest.fn().mockImplementation(function () {
     _this.removeAllListeners();
   });
 
@@ -50,7 +50,7 @@ function CozyRealtimeMock() {
 
     _this.subscribe.mockClear();
 
-    _this.unsubscribeAll.mockClear();
+    _this.unsubscribe.mockClear();
   };
 }
 

package/dist/models/ConnectionFlow.js

@@ -1089,9 +1089,15 @@ export var ConnectionFlow = /*#__PURE__*/function () {
       this.unsubscribeAllRealtime = function () {
         _this3.jobWatcher.unsubscribeAll();
 
-        _this3.realtime.unsubscribeAll();
+        _this3.unsubscribeAllConnectionFlowRealtime();
       };
     }
+  }, {
+    key: "unsubscribeAllConnectionFlowRealtime",
+    value: function unsubscribeAllConnectionFlowRealtime() {
+      this.realtime.unsubscribe('updated', JOBS_DOCTYPE, this.handleTriggerJobUpdated);
+      this.realtime.unsubscribe('updated', JOBS_DOCTYPE, this.job._id, this.handleCurrentJobUpdated.bind(this));
+    }
   }, {
     key: "unwatch",
     value: function unwatch() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "9.32.2",
+  "version": "9.32.4",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -91,5 +91,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "17af5df3d39fd8b3bc37aa6f421ec0dd1c97b787"
+  "gitHead": "e05c102ddedafe5162d5f01f398c0d9655340321"
 }

package/src/components/CozyConfirmDialogProvider/index.jsx

@@ -1,5 +1,6 @@
 import React, { createContext, useContext, useState } from 'react'
-import Buttons from 'cozy-ui/transpiled/react/MuiCozyTheme/Buttons'
+
+import Button from 'cozy-ui/transpiled/react/Buttons'
 import { ConfirmDialog } from 'cozy-ui/transpiled/react/CozyDialogs'
 
 export const CozyConfirmDialogContext = createContext()
@@ -19,12 +20,14 @@ export const useCozyConfirmDialog = () => {
 export const CozyConfirmDialogProvider = React.memo(props => {
   const [dialogs, setDialogs] = useState([])
   const { children } = props
+
   const onClose = dialogId => {
     dialogs.find(dialog => dialog.id === dialogId).callback()
     setDialogs(prevDialogs =>
       prevDialogs.filter(dialog => dialog.id !== dialogId)
     )
   }
+
   const context = {
     showDialog: ({ title, closeLabel, description }) => {
       return new Promise(resolve => {
@@ -43,29 +46,25 @@ export const CozyConfirmDialogProvider = React.memo(props => {
       })
     }
   }
+
   return (
     <CozyConfirmDialogContext.Provider value={context}>
       {dialogs &&
         dialogs.map(dialog => {
           return (
             <ConfirmDialog
+              open
               key={dialog.id}
-              open={true}
               title={dialog.title}
               content={dialog.description}
-              onClose={() => onClose(dialog.id)}
               actions={
-                <>
-                  <Buttons
-                    variant="text"
-                    color="primary"
-                    aria-label="Close dialog"
-                    onClick={() => onClose(dialog.id)}
-                  >
-                    {dialog.closeLabel}
-                  </Buttons>
-                </>
+                <Button
+                  label={dialog.closeLabel}
+                  aria-label="Close dialog"
+                  onClick={() => onClose(dialog.id)}
+                />
               }
+              onClose={() => onClose(dialog.id)}
             />
           )
         })}

package/src/components/OAuthService.js

@@ -256,7 +256,13 @@ function registerRealtime({ client, konnector }) {
       OAUTH_REALTIME_CHANNEL,
       handleRealtime(konnector, resolve)
     )
-    return () => realtime.unsubscribeAll()
+    return () =>
+      realtime.unsubscribe(
+        'notified',
+        'io.cozy.accounts',
+        OAUTH_REALTIME_CHANNEL,
+        handleRealtime(konnector, resolve)
+      )
   }
 }
 

package/src/components/OAuthService.spec.js

@@ -30,7 +30,7 @@ function CozyRealtimeMock() {
     .mockImplementation((eventType, doctype, channel, fn) => {
       this.on(eventType + doctype + channel, fn)
     })
-  this.unsubscribeAll = jest.fn().mockImplementation(() => {
+  this.unsubscribe = jest.fn().mockImplementation(() => {
     this.removeAllListeners()
   })
 
@@ -41,7 +41,7 @@ function CozyRealtimeMock() {
   this.clear = () => {
     this.removeAllListeners()
     this.subscribe.mockClear()
-    this.unsubscribeAll.mockClear()
+    this.unsubscribe.mockClear()
   }
 }
 MicroEE.mixin(CozyRealtimeMock)

package/src/models/ConnectionFlow.js

@@ -710,10 +710,25 @@ export class ConnectionFlow {
 
     this.unsubscribeAllRealtime = () => {
       this.jobWatcher.unsubscribeAll()
-      this.realtime.unsubscribeAll()
+      this.unsubscribeAllConnectionFlowRealtime()
     }
   }
 
+  unsubscribeAllConnectionFlowRealtime() {
+    this.realtime.unsubscribe(
+      'updated',
+      JOBS_DOCTYPE,
+      this.handleTriggerJobUpdated
+    )
+
+    this.realtime.unsubscribe(
+      'updated',
+      JOBS_DOCTYPE,
+      this.job._id,
+      this.handleCurrentJobUpdated.bind(this)
+    )
+  }
+
   unwatch() {
     if (typeof this.unsubscribeAllRealtime === 'function') {
       this.unsubscribeAllRealtime()