cozy-bar 29.1.0 → 29.3.0

package/dist/components/UserMenu/UserMenuContent.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _reactRedux = require("react-redux");
 var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
 var _cozyIntent = require("cozy-intent");
 var _cozyClient = require("cozy-client");
@@ -15,7 +16,6 @@ var _List = _interopRequireDefault(require("cozy-ui/transpiled/react/List"));
 var _ListItem = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItem"));
 var _ListItemIcon = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItemIcon"));
 var _ListItemText = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItemText"));
-var _PersonAdd = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/PersonAdd"));
 var _FromUser = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/FromUser"));
 var _Logout = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Logout"));
 var _CloudRainbow = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/CloudRainbow"));
@@ -23,9 +23,9 @@ var _Company = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Co
 var _Right = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Right"));
 var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
 var _Divider = _interopRequireDefault(require("cozy-ui/transpiled/react/Divider"));
-var _Buttons = _interopRequireDefault(require("cozy-ui/transpiled/react/Buttons"));
 var _Typography = _interopRequireDefault(require("cozy-ui/transpiled/react/Typography"));
 var _Breakpoints = require("cozy-ui/transpiled/react/providers/Breakpoints");
+var _reducers = require("../../lib/reducers");
 var _useI18n2 = _interopRequireDefault(require("../useI18n"));
 var _AvatarMyself = _interopRequireDefault(require("./components/AvatarMyself"));
 var _helpers = require("./helpers");
@@ -37,6 +37,7 @@ var UserMenuContent = function UserMenuContent(_ref) {
   var onLogOut = _ref.onLogOut,
     instance = _ref.instance,
     diskUsage = _ref.diskUsage,
+    isSettingsAppInstalled = _ref.isSettingsAppInstalled,
     closeMenu = _ref.closeMenu;
   var webviewIntent = (0, _cozyIntent.useWebviewIntent)();
   var client = (0, _cozyClient.useClient)();
@@ -69,16 +70,9 @@ var UserMenuContent = function UserMenuContent(_ref) {
     variant: "h4"
   }, public_name), /*#__PURE__*/_react.default.createElement(_Typography.default, {
     variant: "body2"
-  }, email), (0, _cozyFlags.default)('cozy.b2b.enabled') && /*#__PURE__*/_react.default.createElement(_Buttons.default, {
-    label: t('userMenu.addAccount'),
-    variant: "secondary",
-    startIcon: /*#__PURE__*/_react.default.createElement(_Icon.default, {
-      icon: _PersonAdd.default
-    }),
-    className: (0, _classnames.default)(styles['user-menu-content-add-account'], 'u-mt-1')
-  })), /*#__PURE__*/_react.default.createElement(_List.default, {
+  }, email)), /*#__PURE__*/_react.default.createElement(_List.default, {
     className: "u-pb-0"
-  }, /*#__PURE__*/_react.default.createElement(_ListItem.default, {
+  }, isSettingsAppInstalled && /*#__PURE__*/_react.default.createElement(_ListItem.default, {
     button: true,
     gutters: gutters,
     size: "small",
@@ -100,7 +94,7 @@ var UserMenuContent = function UserMenuContent(_ref) {
     icon: _Company.default
   })), /*#__PURE__*/_react.default.createElement(_ListItemText.default, {
     primary: t('userMenu.createBusinessAccount')
-  })), /*#__PURE__*/_react.default.createElement(_ListItem.default, {
+  })), isSettingsAppInstalled && /*#__PURE__*/_react.default.createElement(_ListItem.default, {
     button: true,
     gutters: gutters,
     size: "small",
@@ -134,4 +128,9 @@ var UserMenuContent = function UserMenuContent(_ref) {
     primary: t('userMenu.logOut')
   }))));
 };
-var _default = exports.default = UserMenuContent;
+var mapStateToProps = function mapStateToProps(state) {
+  return {
+    isSettingsAppInstalled: (0, _reducers.getIsSettingsAppInstalled)(state)
+  };
+};
+var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps)(UserMenuContent);

package/dist/index.js

@@ -71,4 +71,4 @@ var _BarProvider = _interopRequireDefault(require("./components/BarProvider"));
 var _reducers = require("./lib/reducers");
 /* global __VERSION__ */
 
-var version = exports.version = "\"29.1.0\"";
+var version = exports.version = "\"29.3.0\"";

package/dist/lib/reducers/apps.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setInfos = exports.setDefaultApp = exports.receiveApp = exports.isFetchingApps = exports.isCurrentApp = exports.hasFetched = exports.getHomeApp = exports.getApps = exports.fetchApps = exports.deleteApp = exports.default = void 0;
+exports.setIsSettingsAppInstalled = exports.setInfos = exports.setDefaultApp = exports.receiveApp = exports.isFetchingApps = exports.isCurrentApp = exports.hasFetched = exports.getIsSettingsAppInstalled = exports.getHomeApp = exports.getApps = exports.fetchApps = exports.deleteApp = exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -22,6 +22,7 @@ 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 SET_IS_SETTINGS_APP_INSTALLED = 'SET_IS_SETTINGS_APP_INSTALLED';
 var isCurrentApp = exports.isCurrentApp = function isCurrentApp(state, app) {
   return app.slug === state.appSlug;
 };
@@ -37,6 +38,9 @@ var getHomeApp = exports.getHomeApp = function getHomeApp(state) {
 var isFetchingApps = exports.isFetchingApps = function isFetchingApps(state) {
   return state ? state.isFetching : false;
 };
+var getIsSettingsAppInstalled = exports.getIsSettingsAppInstalled = function getIsSettingsAppInstalled(state) {
+  return state ? state.isSettingsAppInstalled : false;
+};
 var hasFetched = exports.hasFetched = function hasFetched(state) {
   return state.hasFetched;
 };
@@ -74,12 +78,18 @@ var setInfos = exports.setInfos = function setInfos(appName, appNamePrefix, appS
     appSlug: appSlug
   };
 };
+var setIsSettingsAppInstalled = exports.setIsSettingsAppInstalled = function setIsSettingsAppInstalled(isSettingsAppInstalled) {
+  return {
+    type: SET_IS_SETTINGS_APP_INSTALLED,
+    isSettingsAppInstalled: isSettingsAppInstalled
+  };
+};
 
 // actions async
 var fetchApps = exports.fetchApps = function fetchApps() {
   return /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(dispatch) {
-      var rawAppList, excludedApps, apps;
+      var rawAppList, isSettingsAppInstalled, excludedApps, apps;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -91,37 +101,45 @@ var fetchApps = exports.fetchApps = function fetchApps() {
             return _stack.default.get.apps();
           case 4:
             rawAppList = _context.sent;
-            excludedApps = (0, _cozyFlags.default)('apps.hidden') || [];
-            apps = rawAppList.map(mapApp).filter(function (app) {
-              return !excludedApps.includes(app.slug);
-            });
             if (rawAppList.length) {
-              _context.next = 9;
+              _context.next = 7;
               break;
             }
             throw new Error('No installed apps found by the bar');
-          case 9:
-            _context.next = 11;
+          case 7:
+            // We need to store if settings app is installed because it maybe be filtered because of apps.hidden
+            isSettingsAppInstalled = rawAppList.some(function (app) {
+              var _app$attributes;
+              return (app === null || app === void 0 || (_app$attributes = app.attributes) === null || _app$attributes === void 0 ? void 0 : _app$attributes.slug) === 'settings';
+            });
+            _context.next = 10;
+            return dispatch(setIsSettingsAppInstalled(isSettingsAppInstalled));
+          case 10:
+            excludedApps = (0, _cozyFlags.default)('apps.hidden') || [];
+            apps = rawAppList.map(mapApp).filter(function (app) {
+              return !excludedApps.includes(app.slug);
+            }); // TODO load only one time icons
+            _context.next = 14;
             return dispatch(setDefaultApp(apps));
-          case 11:
-            _context.next = 13;
+          case 14:
+            _context.next = 16;
             return dispatch(receiveAppList(apps));
-          case 13:
-            _context.next = 19;
+          case 16:
+            _context.next = 22;
             break;
-          case 15:
-            _context.prev = 15;
+          case 18:
+            _context.prev = 18;
             _context.t0 = _context["catch"](0);
             dispatch({
               type: FETCH_APPS_FAILURE
             });
             // eslint-disable-next-line no-console
             console.warn(_context.t0.message ? _context.t0.message : _context.t0);
-          case 19:
+          case 22:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 15]]);
+      }, _callee, null, [[0, 18]]);
     }));
     return function (_x) {
       return _ref.apply(this, arguments);
@@ -176,7 +194,8 @@ var defaultState = {
   appName: null,
   appNamePrefix: null,
   appSlug: null,
-  hasFetched: false
+  hasFetched: false,
+  isSettingsAppInstalled: false
 };
 var reducer = function reducer() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultState;
@@ -236,6 +255,10 @@ var reducer = function reducer() {
         appNamePrefix: action.appNamePrefix,
         appSlug: action.appSlug
       });
+    case SET_IS_SETTINGS_APP_INSTALLED:
+      return _objectSpread(_objectSpread({}, state), {}, {
+        isSettingsAppInstalled: action.isSettingsAppInstalled
+      });
     default:
       return state;
   }

package/dist/lib/reducers/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setInfos = exports.reducers = exports.onRealtimeDelete = exports.onRealtimeCreate = exports.logOut = exports.isSettingsBusy = exports.isFetchingSettings = exports.isFetchingApps = exports.isCurrentApp = exports.hasFetched = exports.getStorageData = exports.getHomeApp = exports.getHelpLink = exports.getApps = exports.fetchSettingsData = exports.fetchContext = exports.fetchApps = exports.default = void 0;
+exports.setInfos = exports.reducers = exports.onRealtimeDelete = exports.onRealtimeCreate = exports.logOut = exports.isSettingsBusy = exports.isFetchingSettings = exports.isFetchingApps = exports.isCurrentApp = exports.hasFetched = exports.getStorageData = exports.getIsSettingsAppInstalled = exports.getHomeApp = exports.getHelpLink = exports.getApps = exports.fetchSettingsData = exports.fetchContext = exports.fetchApps = exports.default = void 0;
 var _redux = require("redux");
 var _apps = _interopRequireWildcard(require("./apps"));
 var apps = _apps;
@@ -26,6 +26,7 @@ var setInfos = exports.setInfos = apps.setInfos;
 var fetchSettingsData = exports.fetchSettingsData = settings.fetchSettingsData;
 var logOut = exports.logOut = settings.logOut;
 var fetchContext = exports.fetchContext = context.fetchContext;
+var getIsSettingsAppInstalled = exports.getIsSettingsAppInstalled = proxy('apps', apps.getIsSettingsAppInstalled);
 var getApps = exports.getApps = proxy('apps', apps.getApps);
 var getHomeApp = exports.getHomeApp = proxy('apps', apps.getHomeApp);
 var isFetchingApps = exports.isFetchingApps = proxy('apps', apps.isFetchingApps);

package/dist/locales/en.json

@@ -51,7 +51,6 @@
     }
   },
   "userMenu": {
-    "addAccount": "Add account",
     "manageProfile": "Manage profile",
     "createBusinessAccount": "Create business account",
     "storage": "Storage",

package/dist/locales/fr.json

@@ -51,7 +51,6 @@
     }
   },
   "userMenu": {
-    "addAccount": "Ajouter un compte",
     "manageProfile": "Gérer mon profil",
     "createBusinessAccount": "Créer un compte entreprise",
     "storage": "Stockage",

package/dist/locales/ru.json

@@ -51,7 +51,6 @@
     }
   },
   "userMenu": {
-    "addAccount": "Добавить аккаунт",
     "manageProfile": "Управление профилем",
     "createBusinessAccount": "Создать бизнес-аккаунт",
     "storage": "Хранилище",

package/dist/locales/vi.json

@@ -51,7 +51,6 @@
     }
   },
   "userMenu": {
-    "addAccount": "Thêm tài khoản",
     "manageProfile": "Quản lý hồ sơ",
     "createBusinessAccount": "Tạo tài khoản doanh nghiệp",
     "storage": "Lưu trữ",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-bar",
-  "version": "29.1.0",
+  "version": "29.3.0",
   "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/)",