cozy-bar 30.0.0 → 31.0.0

package/dist/components/AppsMenu/AppsMenuContent.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _reactRedux = require("react-redux");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
 var _Typography = _interopRequireDefault(require("cozy-ui/transpiled/react/Typography"));
@@ -16,7 +15,6 @@ var _ShortcutItem = _interopRequireDefault(require("./components/ShortcutItem"))
 var _EntrypointItem = _interopRequireDefault(require("./components/EntrypointItem"));
 var _AppItemPlaceholder = _interopRequireDefault(require("./components/AppItemPlaceholder"));
 var _useI18n2 = _interopRequireDefault(require("../useI18n"));
-var _reducers = require("../../lib/reducers");
 var _helper = require("./helper");
 var styles = {
   "apps-menu-grid": "apps-menu-grid",
@@ -85,11 +83,4 @@ AppsMenuContent.propTypes = {
   }),
   closeMenu: _propTypes.default.func
 };
-var mapStateToProps = function mapStateToProps(state) {
-  return {
-    isFetchingApps: (0, _reducers.isFetchingApps)(state),
-    apps: (0, _reducers.getApps)(state),
-    homeApp: (0, _reducers.getHomeApp)(state)
-  };
-};
-var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps)(AppsMenuContent);
+var _default = exports.default = AppsMenuContent;

package/dist/components/AppsMenu/components/AppItem.js

@@ -8,6 +8,7 @@ exports.default = exports.AppItem = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _applications = require("cozy-client/dist/models/applications");
+var _cozyClient = require("cozy-client");
 var _styles = require("cozy-ui/transpiled/react/styles");
 var _Buttons = _interopRequireDefault(require("cozy-ui/transpiled/react/Buttons"));
 var _AppIcon = _interopRequireDefault(require("cozy-ui-plus/dist/AppIcon"));
@@ -15,7 +16,6 @@ var _AppLinker = _interopRequireDefault(require("cozy-ui-plus/dist/AppLinker"));
 var _Typography = _interopRequireDefault(require("cozy-ui/transpiled/react/Typography"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _proptypes = require("../../../proptypes");
-var _stack = _interopRequireDefault(require("../../../lib/stack"));
 var styles = {
   "apps-menu-grid": "apps-menu-grid",
   "apps-menu-grid-item-wrapper": "apps-menu-grid-item-wrapper",
@@ -34,6 +34,12 @@ var useStyles = (0, _styles.makeStyles)(function () {
 var AppItem = exports.AppItem = function AppItem(_ref) {
   var app = _ref.app,
     onAppSwitch = _ref.onAppSwitch;
+  var client = (0, _cozyClient.useClient)();
+  var cozyURL = new URL(client.getStackClient().uri);
+  var iconProps = {
+    domain: cozyURL.host,
+    secure: cozyURL.protocol === 'https:'
+  };
   var appName = (0, _applications.getAppDisplayName)(app);
   var classes = useStyles();
   return /*#__PURE__*/_react.default.createElement(_AppLinker.default, {
@@ -59,7 +65,7 @@ var AppItem = exports.AppItem = function AppItem(_ref) {
       }, /*#__PURE__*/_react.default.createElement(_AppIcon.default, (0, _extends2.default)({
         app: app,
         key: app.slug
-      }, _stack.default.get.iconProps()))), /*#__PURE__*/_react.default.createElement(_Typography.default, {
+      }, iconProps))), /*#__PURE__*/_react.default.createElement(_Typography.default, {
         noWrap: true,
         align: "center",
         className: "u-w-100 ".concat(classes.text)

package/dist/components/AppsMenu/index.js

@@ -27,7 +27,10 @@ var useStyles = (0, _styles.makeStyles)({
   }
 });
 var AppsMenu = function AppsMenu(_ref) {
-  var shortcuts = _ref.shortcuts;
+  var shortcuts = _ref.shortcuts,
+    apps = _ref.apps,
+    homeApp = _ref.homeApp,
+    isFetchingApps = _ref.isFetchingApps;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isOpen = _useState2[0],
@@ -53,6 +56,9 @@ var AppsMenu = function AppsMenu(_ref) {
     open: isOpen,
     onClose: toggleMenu,
     content: /*#__PURE__*/_react.default.createElement(_AppsMenuContent.default, {
+      apps: apps,
+      homeApp: homeApp,
+      isFetchingApps: isFetchingApps,
       shortcuts: shortcuts,
       closeMenu: toggleMenu
     }),
@@ -82,6 +88,9 @@ var AppsMenu = function AppsMenu(_ref) {
       paper: 'u-bdrs-7'
     }
   }, /*#__PURE__*/_react.default.createElement(_AppsMenuContent.default, {
+    apps: apps,
+    homeApp: homeApp,
+    isFetchingApps: isFetchingApps,
     shortcuts: shortcuts,
     closeMenu: toggleMenu
   })));

package/dist/components/Bar.js

@@ -4,10 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mapStateToProps = exports.mapDispatchToProps = exports.default = exports.Bar = void 0;
+exports.default = exports.Bar = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
-var _reactRedux = require("react-redux");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Grid = _interopRequireDefault(require("cozy-ui/transpiled/react/Grid"));
 var _Divider = _interopRequireDefault(require("cozy-ui/transpiled/react/Divider"));
@@ -21,18 +21,18 @@ var _UserMenu = _interopRequireDefault(require("./UserMenu"));
 var _ButtonCozyHome = _interopRequireDefault(require("./utils/ButtonCozyHome"));
 var _SearchButton = _interopRequireDefault(require("./utils/SearchButton"));
 var _HelpLink = _interopRequireDefault(require("./utils/HelpLink"));
-var _reducers = require("../lib/reducers");
 var _cozyClient = require("cozy-client");
 var _cozySearch = require("cozy-search");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _queries = require("../queries");
+var _helpers = require("./helpers");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Bar = exports.Bar = function Bar(_ref) {
   var _componentsProps$Wrap;
-  var fetchContext = _ref.fetchContext,
-    fetchSettingsData = _ref.fetchSettingsData,
-    fetchApps = _ref.fetchApps,
-    isPublic = _ref.isPublic,
+  var isPublic = _ref.isPublic,
     barLeft = _ref.barLeft,
     barRight = _ref.barRight,
     barCenter = _ref.barCenter,
@@ -44,33 +44,23 @@ var Bar = exports.Bar = function Bar(_ref) {
     searchOptions = _ref.searchOptions,
     isInvertedTheme = _ref.isInvertedTheme,
     appSlug = _ref.appSlug,
-    hasFetchedApps = _ref.hasFetchedApps,
-    homeApp = _ref.homeApp,
     componentsProps = _ref.componentsProps;
-  var client = (0, _cozyClient.useClient)();
   var _useBreakpoints = (0, _Breakpoints.useBreakpoints)(),
     isMobile = _useBreakpoints.isMobile;
   var shortcuts = (0, _cozyClient.useFetchHomeShortcuts)();
+  var appsQuery = (0, _queries.buildAppsQuery)();
+  var appsResult = (0, _cozyClient.useQuery)(appsQuery.definition, _objectSpread(_objectSpread({}, appsQuery.options), {}, {
+    enabled: !isPublic
+  }));
+  var rawApps = appsResult.data || [];
+  var isFetchingApps = appsResult.fetchStatus === 'loading';
+  var _useMemo = (0, _react.useMemo)(function () {
+      return (0, _helpers.getAppsData)(rawApps, appSlug);
+    }, [rawApps, appSlug]),
+    apps = _useMemo.apps,
+    homeApp = _useMemo.homeApp,
+    isSettingsAppInstalled = _useMemo.isSettingsAppInstalled;
   var isSearchEnabled = searchOptions.enabled && !isPublic;
-  var fetchInitialData = (0, _react.useCallback)(function () {
-    if (!isPublic) {
-      fetchContext();
-      fetchSettingsData(false);
-      if (!hasFetchedApps) {
-        fetchApps();
-      }
-    }
-  }, [fetchApps, fetchContext, fetchSettingsData, hasFetchedApps, isPublic]);
-  (0, _react.useEffect)(function () {
-    var handleTokenRefreshed = function handleTokenRefreshed() {
-      fetchInitialData();
-    };
-    fetchInitialData();
-    client.on('tokenRefreshed', handleTokenRefreshed);
-    return function () {
-      client.removeListener('tokenRefreshed', handleTokenRefreshed);
-    };
-  }, [client, fetchInitialData]);
   var renderCenter = function renderCenter() {
     return null;
   };
@@ -113,9 +103,13 @@ var Bar = exports.Bar = function Bar(_ref) {
     // to remove this special case
     if (appSlug === 'drive' && isMobile && barSearch) return null;
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_HelpLink.default, null), /*#__PURE__*/_react.default.createElement(_AppsMenu.default, {
+      apps: apps,
+      homeApp: homeApp,
+      isFetchingApps: isFetchingApps,
       shortcuts: shortcuts
     }), /*#__PURE__*/_react.default.createElement(_UserMenu.default, {
-      onLogOut: onLogOut
+      onLogOut: onLogOut,
+      isSettingsAppInstalled: isSettingsAppInstalled
     }));
   };
   var renderSearch = function renderSearch() {
@@ -132,6 +126,8 @@ var Bar = exports.Bar = function Bar(_ref) {
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, componentsProps === null || componentsProps === void 0 ? void 0 : componentsProps.Wrapper, {
     className: (0, _classnames.default)('coz-bar-wrapper', componentsProps === null || componentsProps === void 0 || (_componentsProps$Wrap = componentsProps.Wrapper) === null || _componentsProps$Wrap === void 0 ? void 0 : _componentsProps$Wrap.className),
     "data-testid": "coz-bar-wrapper"
+  }), !isPublic && /*#__PURE__*/_react.default.createElement(_cozyClient.RealTimeQueries, {
+    doctype: "io.cozy.apps"
   }), /*#__PURE__*/_react.default.createElement("div", {
     id: "cozy-bar-modal-dom-place"
   }), /*#__PURE__*/_react.default.createElement("div", {
@@ -152,23 +148,4 @@ Bar.propTypes = {
     })
   })
 };
-var mapStateToProps = exports.mapStateToProps = function mapStateToProps(state) {
-  return {
-    hasFetchedApps: (0, _reducers.hasFetched)(state),
-    homeApp: (0, _reducers.getHomeApp)(state)
-  };
-};
-var mapDispatchToProps = exports.mapDispatchToProps = function mapDispatchToProps(dispatch) {
-  return {
-    fetchApps: function fetchApps() {
-      return dispatch((0, _reducers.fetchApps)());
-    },
-    fetchContext: function fetchContext() {
-      return dispatch((0, _reducers.fetchContext)());
-    },
-    fetchSettingsData: function fetchSettingsData(displayBusy) {
-      return dispatch((0, _reducers.fetchSettingsData)(displayBusy));
-    }
-  };
-};
-var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(Bar);
+var _default = exports.default = Bar;

package/dist/components/Bar.spec.jsx

@@ -7,7 +7,7 @@ import { render } from '@testing-library/react'
 import { createMockClient } from 'cozy-client'
 import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
-import { useInstanceInfo } from 'cozy-client'
+import { useInstanceInfo, useQuery } from 'cozy-client'
 import { shouldDisplayOffers } from 'cozy-client/dist/models/instance'
 
 jest.mock('cozy-device-helper', () => ({
@@ -17,7 +17,9 @@ jest.mock('cozy-device-helper', () => ({
 
 jest.mock('cozy-client', () => ({
   ...require.requireActual('cozy-client'),
-  useInstanceInfo: jest.fn()
+  useInstanceInfo: jest.fn(),
+  useQuery: jest.fn(),
+  RealTimeQueries: () => null
 }))
 
 jest.mock('cozy-client/dist/models/instance', () => ({
@@ -39,7 +41,12 @@ describe('Bar', () => {
     useInstanceInfo.mockReturnValue({
       isLoaded: true,
       diskUsage: { data: { used: 0 } },
-      instance: { data: {} }
+      instance: { data: {} },
+      context: { data: {} }
+    })
+    useQuery.mockReturnValue({
+      data: [],
+      fetchStatus: 'loaded'
     })
   })
 
@@ -47,17 +54,7 @@ describe('Bar', () => {
     isFlagshipApp.mockClear()
   })
 
-  const mockFetchContext = jest.fn().mockResolvedValue({})
-  const mockFetchApps = jest.fn().mockResolvedValue([])
-  const mockFetchSettingsData = jest.fn().mockResolvedValue({})
-
-  const setup = ({
-    fetchContext = mockFetchContext,
-    fetchApps = mockFetchApps,
-    fetchSettingsData = mockFetchSettingsData,
-    isPublic = false,
-    hasFetchedApps = false
-  } = {}) => {
+  const setup = ({ isPublic = false } = {}) => {
     const mockClient = createMockClient({
       clientOptions: {
         uri: 'http://cozy.localhost:8080'
@@ -67,11 +64,7 @@ describe('Bar', () => {
     const result = render(
       <BarLike client={mockClient}>
         <Bar
-          fetchContext={fetchContext}
-          fetchApps={fetchApps}
-          fetchSettingsData={fetchSettingsData}
           isPublic={isPublic}
-          hasFetchedApps={hasFetchedApps}
           onDrawer={jest.fn()}
           searchOptions={{ enabled: false }}
         />
@@ -84,28 +77,16 @@ describe('Bar', () => {
     }
   }
 
-  it('should fetch data when mounted', () => {
+  it('should render the bar', () => {
     setup()
-
-    expect(mockFetchContext).toHaveBeenCalled()
-    expect(mockFetchApps).toHaveBeenCalled()
-    expect(mockFetchSettingsData).toHaveBeenCalled()
+    expect(useQuery).toHaveBeenCalled()
   })
 
-  it('should not fetch data if public', () => {
+  it('should not fetch apps if public', () => {
     setup({ isPublic: true })
-
-    expect(mockFetchContext).not.toHaveBeenCalled()
-    expect(mockFetchApps).not.toHaveBeenCalled()
-    expect(mockFetchSettingsData).not.toHaveBeenCalled()
-  })
-
-  it('should call re-fetch data when token is refreshed', () => {
-    const { client } = setup()
-    client.emit('tokenRefreshed')
-
-    expect(mockFetchContext).toHaveBeenCalledTimes(2)
-    expect(mockFetchApps).toHaveBeenCalledTimes(2)
-    expect(mockFetchSettingsData).toHaveBeenCalledTimes(2)
+    expect(useQuery).toHaveBeenCalledWith(
+      expect.anything(),
+      expect.objectContaining({ enabled: false })
+    )
   })
 })

package/dist/components/BarComponent.js

@@ -9,13 +9,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactDom = require("react-dom");
-var _reducers = require("../lib/reducers");
 var _dom = require("../dom");
 var _Bar = _interopRequireDefault(require("./Bar"));
-var _reactRedux = require("react-redux");
 var _cozyClient = require("cozy-client");
 var _CozyTheme = _interopRequireDefault(require("cozy-ui-plus/dist/providers/CozyTheme"));
-var _stack = _interopRequireDefault(require("../lib/stack"));
 var _BarProvider = require("./BarProvider");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -80,8 +77,6 @@ var BarComponent = exports.BarComponent = function BarComponent(_ref2) {
     _ref2$isPublic = _ref2.isPublic,
     isPublic = _ref2$isPublic === void 0 ? false : _ref2$isPublic,
     onLogOut = _ref2.onLogOut,
-    _ref2$disableInternal = _ref2.disableInternalStore,
-    disableInternalStore = _ref2$disableInternal === void 0 ? false : _ref2$disableInternal,
     appIcon = _ref2.appIcon,
     appTextIcon = _ref2.appTextIcon,
     _ref2$searchOptions = _ref2.searchOptions,
@@ -105,25 +100,6 @@ var BarComponent = exports.BarComponent = function BarComponent(_ref2) {
 
   // Force public mode in `/public` URLs
   var isPublicForce = !isPublic && /^\/public/.test(window.location.pathname);
-  var getOrCreateStore = require("../lib/store").default;
-  var store;
-  if (disableInternalStore) {
-    store = cozyClient.store;
-  } else {
-    store = getOrCreateStore();
-  }
-  (0, _react.useEffect)(function () {
-    store.dispatch((0, _reducers.setInfos)(appName, appNamePrefix, appSlug));
-    _stack.default.init({
-      cozyClient: cozyClient,
-      onCreate: function onCreate(data) {
-        return store.dispatch((0, _reducers.onRealtimeCreate)(data));
-      },
-      onDelete: function onDelete(data) {
-        return store.dispatch((0, _reducers.onRealtimeDelete)(data));
-      }
-    });
-  }, [appName, appNamePrefix, appSlug, cozyClient, store]);
   var options = {
     appName: appName,
     isInvertedTheme: isInvertedTheme,
@@ -148,17 +124,10 @@ var BarComponent = exports.BarComponent = function BarComponent(_ref2) {
   }, /*#__PURE__*/_react.default.createElement(_CozyTheme.default, {
     variant: themeVariant,
     ignoreCozySettings: options.isPublic
-  }, disableInternalStore ? /*#__PURE__*/_react.default.createElement(_Bar.default, (0, _extends2.default)({}, options, {
-    barSearch: barSearch,
-    barLeft: barLeft,
-    barCenter: barCenter,
-    barRight: barRight
-  })) : /*#__PURE__*/_react.default.createElement(_reactRedux.Provider, {
-    store: store
   }, /*#__PURE__*/_react.default.createElement(_Bar.default, (0, _extends2.default)({}, options, {
     barSearch: barSearch,
     barLeft: barLeft,
     barCenter: barCenter,
     barRight: barRight
-  })))));
+  }))));
 };

package/dist/components/UserMenu/UserMenuContent.js

@@ -7,7 +7,6 @@ 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");
@@ -25,7 +24,6 @@ var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
 var _Divider = _interopRequireDefault(require("cozy-ui/transpiled/react/Divider"));
 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");
@@ -128,9 +126,4 @@ var UserMenuContent = function UserMenuContent(_ref) {
     primary: t('userMenu.logOut')
   }))));
 };
-var mapStateToProps = function mapStateToProps(state) {
-  return {
-    isSettingsAppInstalled: (0, _reducers.getIsSettingsAppInstalled)(state)
-  };
-};
-var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps)(UserMenuContent);
+var _default = exports.default = UserMenuContent;

package/dist/components/UserMenu/index.js

@@ -27,7 +27,8 @@ var useStyles = (0, _styles.makeStyles)({
   }
 });
 var UserMenu = function UserMenu(_ref) {
-  var onLogOut = _ref.onLogOut;
+  var onLogOut = _ref.onLogOut,
+    isSettingsAppInstalled = _ref.isSettingsAppInstalled;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isOpen = _useState2[0],
@@ -60,6 +61,7 @@ var UserMenu = function UserMenu(_ref) {
       onLogOut: onLogOut,
       instance: instance,
       diskUsage: diskUsage,
+      isSettingsAppInstalled: isSettingsAppInstalled,
       closeMenu: toggleMenu
     }),
     componentsProps: {
@@ -91,6 +93,7 @@ var UserMenu = function UserMenu(_ref) {
     onLogOut: onLogOut,
     instance: instance,
     diskUsage: diskUsage,
+    isSettingsAppInstalled: isSettingsAppInstalled,
     closeMenu: toggleMenu
   })));
 };

package/dist/components/helpers.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAppsData = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+// cozy-client's useQuery normalizes JSON:API responses — attributes are
+// spread to the top level (e.g. app.slug, app.name exist directly).
+// We only ensure `href` is derived from `links.related` for AppLinker.
+var mapApp = function mapApp(app) {
+  return _objectSpread(_objectSpread({}, app), {}, {
+    href: app.links && app.links.related || app.href
+  });
+};
+var getAppsData = exports.getAppsData = function getAppsData(rawApps, appSlug) {
+  var excludedApps = (0, _cozyFlags.default)('apps.hidden') || [];
+  var apps = rawApps.map(mapApp).filter(function (app) {
+    return !excludedApps.includes(app.slug);
+  }).map(function (app) {
+    return _objectSpread(_objectSpread({}, app), {}, {
+      isCurrentApp: app.slug === appSlug
+    });
+  });
+  var homeApp = apps.find(function (app) {
+    return app.slug === 'home';
+  }) || null;
+  var isSettingsAppInstalled = rawApps.some(function (app) {
+    return app.slug === 'settings';
+  });
+  return {
+    apps: apps,
+    homeApp: homeApp,
+    isSettingsAppInstalled: isSettingsAppInstalled
+  };
+};

package/dist/components/utils/HelpLink.js

@@ -6,13 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _reactRedux = require("react-redux");
 var _IconButton = _interopRequireDefault(require("cozy-ui/transpiled/react/IconButton"));
 var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
 var _HelpOutlined = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/HelpOutlined"));
-var _reducers = require("../../lib/reducers");
-var HelpLink = function HelpLink(_ref) {
-  var helpLink = _ref.helpLink;
+var _cozyClient = require("cozy-client");
+var HelpLink = function HelpLink() {
+  var _context$data;
+  var _useInstanceInfo = (0, _cozyClient.useInstanceInfo)(),
+    context = _useInstanceInfo.context;
+  var helpLink = ((_context$data = context.data) === null || _context$data === void 0 || (_context$data = _context$data.attributes) === null || _context$data === void 0 ? void 0 : _context$data.help_link) || null;
+  if (!helpLink) return null;
   return /*#__PURE__*/_react.default.createElement(_IconButton.default, {
     component: "a",
     href: helpLink,
@@ -24,9 +27,4 @@ var HelpLink = function HelpLink(_ref) {
     size: "18"
   }));
 };
-var mapStateToProps = function mapStateToProps(state) {
-  return {
-    helpLink: (0, _reducers.getHelpLink)(state)
-  };
-};
-var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps)(HelpLink);
+var _default = exports.default = HelpLink;

package/dist/index.js

@@ -52,12 +52,6 @@ Object.defineProperty(exports, "BarTheme", {
     return _BarTheme.BarTheme;
   }
 });
-Object.defineProperty(exports, "barReducers", {
-  enumerable: true,
-  get: function get() {
-    return _reducers.reducers;
-  }
-});
 exports.version = void 0;
 require("cozy-search/dist/stylesheet.css");
 var _BarComponent = require("./components/BarComponent");
@@ -68,7 +62,6 @@ var _BarTheme = require("./components/BarTheme");
 var _BarSearch = require("./components/BarSearch");
 var _BarRoutes = require("./components/BarRoutes");
 var _BarProvider = _interopRequireDefault(require("./components/BarProvider"));
-var _reducers = require("./lib/reducers");
 /* global __VERSION__ */
 
-var version = exports.version = "\"30.0.0\"";
+var version = exports.version = "\"31.0.0\"";

package/dist/index.spec.jsx

@@ -4,6 +4,18 @@ import { render, screen } from '@testing-library/react'
 import { BarComponent, BarProvider, BarLeft } from './index'
 import { BarLike } from '../test/lib/BarLike'
 
+jest.mock('cozy-client', () => ({
+  ...require.requireActual('cozy-client'),
+  useQuery: jest.fn().mockReturnValue({ data: [], fetchStatus: 'loaded' }),
+  RealTimeQueries: () => null,
+  useInstanceInfo: jest.fn().mockReturnValue({
+    isLoaded: true,
+    diskUsage: { data: { used: 0 } },
+    instance: { data: {} },
+    context: { data: {} }
+  })
+}))
+
 describe('The bar library', function() {
   beforeEach(() => {
     // Set up our document body

package/dist/queries.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildAppsQuery = void 0;
+var _cozyClient = _interopRequireWildcard(require("cozy-client"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var defaultFetchPolicy = _cozyClient.default.fetchPolicies.olderThan(60 * 60 * 1000);
+var buildAppsQuery = exports.buildAppsQuery = function buildAppsQuery() {
+  return {
+    definition: function definition() {
+      return (0, _cozyClient.Q)('io.cozy.apps');
+    },
+    options: {
+      as: "io.cozy.apps",
+      fetchPolicy: defaultFetchPolicy
+    }
+  };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-bar",
-  "version": "30.0.0",
+  "version": "31.0.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/)",
@@ -54,7 +54,6 @@
     "cozy-device-helper": "2.6.0",
     "cozy-flags": "^4.6.1",
     "cozy-intent": "^2.29.1",
-    "cozy-interapp": "0.4.9",
     "cozy-logger": "1.9.1",
     "cozy-realtime": "^4.0.5",
     "cozy-search": "^0.14.0",
@@ -75,13 +74,7 @@
   },
   "dependencies": {
     "lodash.set": "^4.3.2",
-    "lodash.unionwith": "4.6.0",
-    "prop-types": "15.7.2",
-    "react-redux": "5.1.1",
-    "redux": "4.1.2",
-    "redux-logger": "3.0.6",
-    "redux-persist": "5.10.0",
-    "redux-thunk": "2.3.0"
+    "prop-types": "15.7.2"
   },
   "peerDependencies": {
     "@cozy/minilog": ">=1.0.0",
@@ -90,7 +83,6 @@
     "cozy-device-helper": ">=2.6.0",
     "cozy-flags": ">=4.6.1",
     "cozy-intent": ">=2.29.1",
-    "cozy-interapp": ">=0.4.9",
     "cozy-realtime": ">=4.0.5",
     "cozy-search": ">=0.14.0",
     "cozy-ui": ">=137.0.0",

package/dist/config/persistWhitelist.json

@@ -1,4 +0,0 @@
-[
-  "apps",
-  "context"
-]