cozy-bar 12.2.3 → 12.2.4

package/dist/components/Bar.spec.jsx

@@ -33,7 +33,11 @@ describe('Bar', () => {
     isPublic = false,
     hasFetchedApps = false
   } = {}) => {
-    const mockClient = createMockClient({})
+    const mockClient = createMockClient({
+      clientOptions: {
+        uri: 'http://cozy.localhost:8080'
+      }
+    })
 
     const result = render(
       <BarLike client={mockClient}>

package/dist/components/Drawer.js

@@ -303,7 +303,6 @@ var Drawer = /*#__PURE__*/function (_Component) {
 
       var _this$props2 = this.props,
           visible = _this$props2.visible,
-          settingsAppURL = _this$props2.settingsAppURL,
           storageData = _this$props2.storageData,
           isInvertedTheme = _this$props2.isInvertedTheme;
       return /*#__PURE__*/_react.default.createElement("div", {
@@ -329,7 +328,6 @@ var Drawer = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react.default.createElement(_SettingsContent.default, {
         onLogOut: this.handleLogout,
         storageData: storageData,
-        settingsAppURL: settingsAppURL,
         isDrawer: true
       }))));
     }
@@ -344,15 +342,13 @@ Drawer.propTypes = {
   onLogOut: _propTypes.default.func,
   isInvertedTheme: _propTypes.default.bool,
   storageData: _propTypes.default.object,
-  settingsAppURL: _propTypes.default.string,
   fetchSettingsData: _propTypes.default.func,
   logOut: _propTypes.default.func
 };
 
 var mapStateToProps = function mapStateToProps(state) {
   return {
-    storageData: (0, _reducers.getStorageData)(state),
-    settingsAppURL: (0, _reducers.getSettingsAppURL)(state)
+    storageData: (0, _reducers.getStorageData)(state)
   };
 };
 

package/dist/components/Settings/SettingsContent.js

@@ -15,6 +15,8 @@ var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
 
 var _cozyDeviceHelper = require("cozy-device-helper");
 
+var _cozyClient = require("cozy-client");
+
 var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
 
 var _Openwith = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Openwith"));
@@ -37,6 +39,8 @@ var _Help = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Help"
 
 var _Email = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Email"));
 
+var _helper = require("./helper");
+
 var _StorageData = _interopRequireDefault(require("./StorageData"));
 
 var _useI18n2 = _interopRequireDefault(require("../useI18n"));
@@ -74,7 +78,6 @@ var NavItem = function NavItem(_ref3) {
 
 var SettingsContent = function SettingsContent(_ref4) {
   var onLogOut = _ref4.onLogOut,
-      settingsAppURL = _ref4.settingsAppURL,
       storageData = _ref4.storageData,
       _ref4$isDrawer = _ref4.isDrawer,
       isDrawer = _ref4$isDrawer === void 0 ? false : _ref4$isDrawer,
@@ -84,11 +87,15 @@ var SettingsContent = function SettingsContent(_ref4) {
   var _useI18n = (0, _useI18n2.default)(),
       t = _useI18n.t;
 
+  var client = (0, _cozyClient.useClient)();
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "coz-nav-pop-content"
-  }, isDrawer && /*#__PURE__*/_react.default.createElement("hr", null), settingsAppURL && /*#__PURE__*/_react.default.createElement(NavGroup, null, /*#__PURE__*/_react.default.createElement(NavItem, null, /*#__PURE__*/_react.default.createElement("a", {
+  }, isDrawer && /*#__PURE__*/_react.default.createElement("hr", null), /*#__PURE__*/_react.default.createElement(NavGroup, null, /*#__PURE__*/_react.default.createElement(NavItem, null, /*#__PURE__*/_react.default.createElement("a", {
     role: "menuitem",
-    href: "".concat(settingsAppURL, "#/profile"),
+    href: (0, _helper.getSettingsLink)({
+      client: client,
+      hash: 'profile'
+    }),
     target: "_self",
     title: t('profile')
   }, /*#__PURE__*/_react.default.createElement(MenuIcon, {
@@ -104,28 +111,40 @@ var SettingsContent = function SettingsContent(_ref4) {
     role: "menuitem",
     target: "_self",
     title: t('storage'),
-    href: "".concat(settingsAppURL, "#/storage")
+    href: (0, _helper.getSettingsLink)({
+      client: client,
+      hash: 'storage'
+    })
   }, /*#__PURE__*/_react.default.createElement(MenuIcon, {
     icon: _GraphCircle.default
-  }), /*#__PURE__*/_react.default.createElement("span", null, t('storage'), /*#__PURE__*/_react.default.createElement(_StorageData.default, {
+  }), /*#__PURE__*/_react.default.createElement("span", null, t('storage'), storageData ? /*#__PURE__*/_react.default.createElement(_StorageData.default, {
     data: storageData
-  }))))), /*#__PURE__*/_react.default.createElement(NavGroup, null, (0, _cozyFlags.default)('settings.permissions-dashboard') && /*#__PURE__*/_react.default.createElement(NavItem, null, /*#__PURE__*/_react.default.createElement("a", {
+  }) : null)))), /*#__PURE__*/_react.default.createElement(NavGroup, null, (0, _cozyFlags.default)('settings.permissions-dashboard') && /*#__PURE__*/_react.default.createElement(NavItem, null, /*#__PURE__*/_react.default.createElement("a", {
     role: "menuitem",
-    href: "".concat(settingsAppURL, "#/permissions/slug"),
+    href: (0, _helper.getSettingsLink)({
+      client: client,
+      hash: 'permissions/slug'
+    }),
     target: "_self",
     title: t('permissions')
   }, /*#__PURE__*/_react.default.createElement(MenuIcon, {
     icon: _Hand.default
   }), t('permissions'))), /*#__PURE__*/_react.default.createElement(NavItem, null, /*#__PURE__*/_react.default.createElement("a", {
     role: "menuitem",
-    href: "".concat(settingsAppURL, "#/connectedDevices"),
+    href: (0, _helper.getSettingsLink)({
+      client: client,
+      hash: 'connectedDevices'
+    }),
     target: "_self",
     title: t('connectedDevices')
   }, /*#__PURE__*/_react.default.createElement(MenuIcon, {
     icon: _Devices.default
   }), t('connectedDevices'))), /*#__PURE__*/_react.default.createElement(NavItem, null, /*#__PURE__*/_react.default.createElement("a", {
     role: "menuitem",
-    href: "".concat(settingsAppURL, "#/sessions"),
+    href: (0, _helper.getSettingsLink)({
+      client: client,
+      hash: 'sessions'
+    }),
     target: "_self",
     title: t('connections')
   }, /*#__PURE__*/_react.default.createElement(MenuIcon, {
@@ -140,7 +159,10 @@ var SettingsContent = function SettingsContent(_ref4) {
     icon: _Help.default
   }), t('help'), /*#__PURE__*/_react.default.createElement(ExternalLinkIcon, null))), /*#__PURE__*/_react.default.createElement(NavItem, null, /*#__PURE__*/_react.default.createElement("a", {
     role: "menuitem",
-    href: "".concat(settingsAppURL, "#/support"),
+    href: (0, _helper.getSettingsLink)({
+      client: client,
+      hash: 'support'
+    }),
     target: "_self",
     title: t('contact')
   }, /*#__PURE__*/_react.default.createElement(MenuIcon, {
@@ -161,7 +183,6 @@ SettingsContent.defaultProps = {
 SettingsContent.propTypes = {
   shoulDisplayViewOfferButton: _propTypes.default.bool,
   onLogOut: _propTypes.default.func.isRequired,
-  settingsAppURL: _propTypes.default.string,
   storageData: _propTypes.default.object,
   isDrawer: _propTypes.default.bool
 };

package/dist/components/Settings/helper.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isFetchingQueries = void 0;
+exports.getSettingsLink = exports.isFetchingQueries = void 0;
+
+var _cozyClient = require("cozy-client");
 
 var isFetchingQueries = function isFetchingQueries(requests) {
   return requests.some(function (request) {
@@ -11,4 +13,17 @@ var isFetchingQueries = function isFetchingQueries(requests) {
   });
 };
 
-exports.isFetchingQueries = isFetchingQueries;
+exports.isFetchingQueries = isFetchingQueries;
+
+var getSettingsLink = function getSettingsLink(_ref) {
+  var client = _ref.client,
+      hash = _ref.hash;
+  return (0, _cozyClient.generateWebLink)({
+    cozyUrl: client.getStackClient().uri,
+    slug: 'settings',
+    hash: hash,
+    subDomainType: client.getInstanceOptions().subdomain
+  });
+};
+
+exports.getSettingsLink = getSettingsLink;

package/dist/components/Settings/index.js

@@ -59,7 +59,6 @@ var Settings = function Settings(_ref) {
       logOut = _ref.logOut,
       _onLogOut = _ref.onLogOut,
       storageData = _ref.storageData,
-      settingsAppURL = _ref.settingsAppURL,
       isFetching = _ref.isFetching;
 
   var _useState = (0, _react.useState)(false),
@@ -150,7 +149,6 @@ var Settings = function Settings(_ref) {
       }
     },
     storageData: storageData,
-    settingsAppURL: settingsAppURL,
     shoulDisplayViewOfferButton: shouldDisplayViewOfferButton,
     managerUrlPremiumLink: managerUrlPremiumLink
   })));
@@ -161,7 +159,6 @@ exports.Settings = Settings;
 var mapStateToProps = function mapStateToProps(state) {
   return {
     storageData: (0, _reducers.getStorageData)(state),
-    settingsAppURL: (0, _reducers.getSettingsAppURL)(state),
     isBusy: (0, _reducers.isSettingsBusy)(state),
     isFetching: (0, _reducers.isFetchingSettings)(state)
   };

package/dist/index.js

@@ -72,5 +72,5 @@ var _BarProvider = _interopRequireDefault(require("./components/BarProvider"));
 var _reducers = require("./lib/reducers");
 
 /* global __VERSION__ */
-var version = "\"12.2.3\"";
+var version = "\"12.2.4\"";
 exports.version = version;

package/dist/lib/exceptions.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UnauthorizedStackException = exports.UnavailableSettingsException = exports.UnavailableStackException = exports.MethodNotAllowedException = exports.NotFoundException = exports.ServerErrorException = exports.ForbiddenException = void 0;
+exports.UnauthorizedStackException = exports.UnavailableStackException = exports.MethodNotAllowedException = exports.NotFoundException = exports.ServerErrorException = exports.ForbiddenException = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -150,25 +150,4 @@ var UnauthorizedStackException = /*#__PURE__*/function (_Error6) {
   return UnauthorizedStackException;
 }( /*#__PURE__*/(0, _wrapNativeSuper2.default)(Error));
 
-exports.UnauthorizedStackException = UnauthorizedStackException;
-
-var UnavailableSettingsException = /*#__PURE__*/function (_Error7) {
-  (0, _inherits2.default)(UnavailableSettingsException, _Error7);
-
-  var _super7 = _createSuper(UnavailableSettingsException);
-
-  function UnavailableSettingsException(message) {
-    var _this7;
-
-    (0, _classCallCheck2.default)(this, UnavailableSettingsException);
-    _this7 = _super7.call(this);
-    _this7.name = 'UnavailableSettings';
-    _this7.message = message || "The 'Settings' application isn't available or installed in the stack";
-    _this7.stack = new Error().stack;
-    return _this7;
-  }
-
-  return UnavailableSettingsException;
-}( /*#__PURE__*/(0, _wrapNativeSuper2.default)(Error));
-
-exports.UnavailableSettingsException = UnavailableSettingsException;
+exports.UnauthorizedStackException = UnauthorizedStackException;

package/dist/lib/reducers/apps.js

@@ -24,6 +24,7 @@ var RECEIVE_APP_LIST = 'RECEIVE_APP_LIST';
 var RECEIVE_HOME_APP = 'RECEIVE_HOME_APP';
 var FETCH_APPS = 'FETCH_APPS';
 var FETCH_APPS_FAILURE = 'FETCH_APPS_FAILURE';
+var FETCH_APPS_SUCCESS = 'FETCH_APPS_SUCCESS';
 var SET_INFOS = 'SET_INFOS';
 
 var isCurrentApp = function isCurrentApp(state, app) {
@@ -236,6 +237,11 @@ var reducer = function reducer() {
         isFetching: true
       });
 
+    case FETCH_APPS_SUCCESS:
+      return (0, _objectSpread2.default)({}, state, {
+        isFetching: false
+      });
+
     case FETCH_APPS_FAILURE:
       return (0, _objectSpread2.default)({}, state, {
         isFetching: false

package/dist/lib/reducers/index.js

@@ -5,7 +5,7 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.reducers = exports.onRealtimeDelete = exports.onRealtimeCreate = exports.getHelpLink = exports.isFetchingSettings = exports.isSettingsBusy = exports.getSettingsAppURL = exports.getStorageData = exports.hasFetched = exports.isCurrentApp = exports.isFetchingApps = exports.getHomeApp = exports.getApps = exports.fetchContext = exports.logOut = exports.fetchSettingsData = exports.setInfos = exports.fetchApps = void 0;
+exports.default = exports.reducers = exports.onRealtimeDelete = exports.onRealtimeCreate = exports.getHelpLink = exports.isFetchingSettings = exports.isSettingsBusy = exports.getStorageData = exports.hasFetched = exports.isCurrentApp = exports.isFetchingApps = exports.getHomeApp = exports.getApps = exports.fetchContext = exports.logOut = exports.fetchSettingsData = exports.setInfos = exports.fetchApps = void 0;
 
 var _redux = require("redux");
 
@@ -47,8 +47,6 @@ var hasFetched = proxy('apps', apps.hasFetched);
 exports.hasFetched = hasFetched;
 var getStorageData = proxy('settings', settings.getStorageData);
 exports.getStorageData = getStorageData;
-var getSettingsAppURL = proxy('settings', settings.getSettingsAppURL);
-exports.getSettingsAppURL = getSettingsAppURL;
 var isSettingsBusy = proxy('settings', settings.isSettingsBusy);
 exports.isSettingsBusy = isSettingsBusy;
 var isFetchingSettings = proxy('settings', settings.isFetchingSettings);

package/dist/lib/reducers/settings.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.logOut = exports.fetchSettingsData = exports.isFetchingSettings = exports.isSettingsBusy = exports.getSettingsAppURL = exports.getStorageData = exports.LOG_OUT = void 0;
+exports.default = exports.logOut = exports.fetchSettingsData = exports.isFetchingSettings = exports.isSettingsBusy = exports.getStorageData = exports.LOG_OUT = void 0;
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
 
@@ -20,7 +20,6 @@ var FETCH_SETTINGS_BUSY = 'FETCH_SETTINGS_BUSY';
 var FETCH_SETTINGS_SUCCESS = 'FETCH_SETTINGS_SUCCESS';
 var RECEIVE_NO_CONTEXT = 'RECEIVE_NO_CONTEXT';
 var RECEIVE_STORAGE = 'RECEIVE_STORAGE';
-var RECEIVE_SETTINGS_URL = 'RECEIVE_SETTINGS_URL';
 var LOG_OUT = 'LOG_OUT';
 exports.LOG_OUT = LOG_OUT;
 var BUSY_DELAY = 450; // selectors
@@ -31,12 +30,6 @@ var getStorageData = function getStorageData(state) {
 
 exports.getStorageData = getStorageData;
 
-var getSettingsAppURL = function getSettingsAppURL(state) {
-  return state.settingsAppURL;
-};
-
-exports.getSettingsAppURL = getSettingsAppURL;
-
 var isSettingsBusy = function isSettingsBusy(state) {
   return state.isBusy;
 };
@@ -90,65 +83,14 @@ var fetchStorageData = function fetchStorageData() {
   }();
 };
 
-var fetchSettingsAppURL = function fetchSettingsAppURL() {
-  return /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(dispatch, getState) {
-      var settingsAppURL;
-      return _regenerator.default.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!getState().cozyBar.settings.settingsAppURL) {
-                _context2.next = 2;
-                break;
-              }
-
-              return _context2.abrupt("return", dispatch({
-                type: RECEIVE_SETTINGS_URL,
-                settingsAppURL: getState().cozyBar.settings.settingsAppURL
-              }));
-
-            case 2:
-              _context2.prev = 2;
-              _context2.next = 5;
-              return _stack.default.get.settingsAppURL();
-
-            case 5:
-              settingsAppURL = _context2.sent;
-              return _context2.abrupt("return", dispatch({
-                type: RECEIVE_SETTINGS_URL,
-                settingsAppURL: settingsAppURL
-              }));
-
-            case 9:
-              _context2.prev = 9;
-              _context2.t0 = _context2["catch"](2);
-              // eslint-disable-next-line no-console
-              console.warn('Settings app is unavailable, settings links are disabled');
-              return _context2.abrupt("return", null);
-
-            case 13:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2, null, [[2, 9]]);
-    }));
-
-    return function (_x2, _x3) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-};
-
 var fetchSettingsData = function fetchSettingsData() {
   var displayBusy = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
   return /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(dispatch) {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(dispatch) {
       var busySpinner;
-      return _regenerator.default.wrap(function _callee3$(_context3) {
+      return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               dispatch({
                 type: FETCH_SETTINGS
@@ -160,29 +102,25 @@ var fetchSettingsData = function fetchSettingsData() {
                   type: FETCH_SETTINGS_BUSY
                 });
               }, BUSY_DELAY);
-              _context3.next = 4;
+              _context2.next = 4;
               return dispatch(fetchStorageData());
 
             case 4:
-              _context3.next = 6;
-              return dispatch(fetchSettingsAppURL());
-
-            case 6:
               clearTimeout(busySpinner);
               dispatch({
                 type: FETCH_SETTINGS_SUCCESS
               });
 
-            case 8:
+            case 6:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
         }
-      }, _callee3);
+      }, _callee2);
     }));
 
-    return function (_x4) {
-      return _ref3.apply(this, arguments);
+    return function (_x2) {
+      return _ref2.apply(this, arguments);
     };
   }();
 };
@@ -191,38 +129,38 @@ exports.fetchSettingsData = fetchSettingsData;
 
 var logOut = function logOut() {
   return /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(dispatch) {
-      return _regenerator.default.wrap(function _callee4$(_context4) {
+    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(dispatch) {
+      return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               dispatch({
                 type: LOG_OUT
               });
-              _context4.prev = 1;
-              _context4.next = 4;
+              _context3.prev = 1;
+              _context3.next = 4;
               return _stack.default.logout();
 
             case 4:
-              _context4.next = 9;
+              _context3.next = 9;
               break;
 
             case 6:
-              _context4.prev = 6;
-              _context4.t0 = _context4["catch"](1);
+              _context3.prev = 6;
+              _context3.t0 = _context3["catch"](1);
               // eslint-disable-next-line no-console
-              console.warn('Error while logging out in the cozy-bar', _context4.t0);
+              console.warn('Error while logging out in the cozy-bar', _context3.t0);
 
             case 9:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
         }
-      }, _callee4, null, [[1, 6]]);
+      }, _callee3, null, [[1, 6]]);
     }));
 
-    return function (_x5) {
-      return _ref4.apply(this, arguments);
+    return function (_x3) {
+      return _ref3.apply(this, arguments);
     };
   }();
 }; // reducers
@@ -233,7 +171,6 @@ var defaultState = {
   contextNotExist: false,
   isFetching: false,
   isBusy: false,
-  settingsAppURL: null,
   storageData: null
 };
 
@@ -268,11 +205,6 @@ var reducer = function reducer() {
         storageData: action.storageData
       });
 
-    case RECEIVE_SETTINGS_URL:
-      return (0, _objectSpread2.default)({}, state, {
-        settingsAppURL: action.settingsAppURL
-      });
-
     case LOG_OUT:
       return defaultState;
 

package/dist/lib/stack-client.js

@@ -380,16 +380,6 @@ var cozyFetchJSON = function cozyFetchJSON(cozy, method, path, body) {
     return responseData;
   });
 };
-
-var getSettingsAppURL = function getSettingsAppURL() {
-  return getApp('settings').then(function (settings) {
-    if (!settings) {
-      throw new _exceptions.UnavailableSettingsException();
-    }
-
-    return settings.links.related;
-  });
-};
 /**
  * Initializes the functions to call the cozy stack
  *
@@ -424,8 +414,7 @@ var _default = {
     storageData: getStorageData,
     iconProps: getAppIconProps,
     cozyURL: getCozyURLOrigin,
-    intents: getIntents,
-    settingsAppURL: getSettingsAppURL
+    intents: getIntents
   },
   updateAccessToken: updateAccessToken,
   cozyFetchJSON: cozyFetchJSON,

package/dist/lib/stack.js

@@ -94,11 +94,6 @@ var get = {
     var _current$get6;
 
     return (_current$get6 = current().get).cozyURL.apply(_current$get6, arguments);
-  },
-  settingsAppURL: function settingsAppURL() {
-    var _current$get7;
-
-    return (_current$get7 = current().get).settingsAppURL.apply(_current$get7, arguments);
   }
 };
 var stackProxy = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-bar",
-  "version": "12.2.3",
+  "version": "12.2.4",
   "description": "cozy-bar.js library, a small lib provided by cozy-stack to inject the Cozy-bar component into each app",
   "main": "dist/index.js",
   "author": "Cozy Cloud <contact@cozycloud.cc> (https://cozy.io/)",