cozy-bar 12.2.0 → 12.2.2

package/dist/components/Settings/SettingsContent.js

@@ -138,7 +138,7 @@ var SettingsContent = function SettingsContent(_ref4) {
     title: t('help')
   }, /*#__PURE__*/_react.default.createElement(MenuIcon, {
     icon: _Help.default
-  }), t('help'), /*#__PURE__*/_react.default.createElement(ExternalLinkIcon, null))), /*#__PURE__*/_react.default.createElement(NavItem, null, /*#__PURE__*/_react.default.createElement("a", {
+  }), t('help'), !(0, _cozyFlags.default)('settings.subscription') && /*#__PURE__*/_react.default.createElement(ExternalLinkIcon, null))), /*#__PURE__*/_react.default.createElement(NavItem, null, /*#__PURE__*/_react.default.createElement("a", {
     role: "menuitem",
     href: "".concat(settingsAppURL, "#/support"),
     target: "_self",

package/dist/components/Settings/index.js

@@ -9,6 +9,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Settings = void 0;
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -33,10 +35,6 @@ var _SettingsContent = _interopRequireDefault(require("./SettingsContent"));
 
 var _reducers = require("../../lib/reducers");
 
-var _queries = require("../../queries");
-
-var _helper = require("./helper");
-
 var instanceModel = undefined;
 var hasAnOffer = undefined;
 var isFremiumFixed = undefined;
@@ -75,12 +73,11 @@ var Settings = function Settings(_ref) {
       t = _useI18n.t;
 
   var client = (0, _cozyClient.useClient)();
-  var diskUsageQuery = (0, _queries.buildDiskUsageQuery)();
-  var diskUsageResult = (0, _cozyClient.useQuery)(diskUsageQuery.definition, diskUsageQuery.options);
-  var instanceQuery = (0, _queries.buildInstanceQuery)();
-  var instanceResult = (0, _cozyClient.useQuery)(instanceQuery.definition, instanceQuery.options);
-  var contextQuery = (0, _queries.buildContextQuery)();
-  var contextResult = (0, _cozyClient.useQuery)(contextQuery.definition, contextQuery.options);
+
+  var _useInstanceInfo = (0, _cozyClient.useInstanceInfo)(),
+      isInstanceInfoLoaded = _useInstanceInfo.isLoaded,
+      instanceInfo = (0, _objectWithoutProperties2.default)(_useInstanceInfo, ["isLoaded"]);
+
   var onClickOutside = (0, _react.useCallback)(function (event) {
     if (isFetching || isOpen) {
       // if it's not a cozy-bar nav popup, close the opened popup
@@ -107,16 +104,9 @@ var Settings = function Settings(_ref) {
 
   var shouldDisplayViewOfferButton = false;
   var managerUrlPremiumLink;
-  var isFetchingFromQueries;
-  isFetchingFromQueries = (0, _helper.isFetchingQueries)([diskUsageResult, instanceResult, contextResult]);
-
-  if (!isFetchingFromQueries) {
-    var data = {
-      context: contextResult.data,
-      diskUsage: diskUsageResult.data,
-      instance: instanceResult.data
-    };
-    shouldDisplayViewOfferButton = instanceModel.shouldDisplayOffers(data) || hasAnOffer(data);
+
+  if (isInstanceInfoLoaded) {
+    shouldDisplayViewOfferButton = instanceModel.shouldDisplayOffers(instanceInfo) || hasAnOffer(instanceInfo);
     var hasSubscription = (0, _cozyFlags.default)('settings.subscription');
 
     if (hasSubscription && client) {
@@ -129,11 +119,11 @@ var Settings = function Settings(_ref) {
       });
       managerUrlPremiumLink = webLink;
     } else {
-      managerUrlPremiumLink = instanceModel.buildPremiumLink(data);
+      managerUrlPremiumLink = instanceModel.buildPremiumLink(instanceInfo);
     }
   }
 
-  var areAllFetchingDone = !isFetchingFromQueries && !isFetching;
+  var areAllFetchingDone = isInstanceInfoLoaded && !isFetching;
   var openMenu = isOpen && areAllFetchingDone;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "coz-nav coz-nav-settings",

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.0\"";
+var version = "\"12.2.2\"";
 exports.version = version;

package/package.json

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

package/dist/queries/index.js

@@ -1,47 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.buildDiskUsageQuery = exports.buildContextQuery = exports.buildInstanceQuery = void 0;
-
-var _cozyClient = require("cozy-client");
-
-var buildInstanceQuery = function buildInstanceQuery() {
-  return {
-    definition: function definition() {
-      return (0, _cozyClient.Q)('io.cozy.settings').getById('io.cozy.settings.instance');
-    },
-    options: {
-      as: 'io.cozy.settings/io.cozy.settings.instance'
-    }
-  };
-};
-
-exports.buildInstanceQuery = buildInstanceQuery;
-
-var buildContextQuery = function buildContextQuery() {
-  return {
-    definition: function definition() {
-      return (0, _cozyClient.Q)('io.cozy.settings').getById('io.cozy.settings.context');
-    },
-    options: {
-      as: 'io.cozy.settings/io.cozy.settings.context'
-    }
-  };
-};
-
-exports.buildContextQuery = buildContextQuery;
-
-var buildDiskUsageQuery = function buildDiskUsageQuery() {
-  return {
-    definition: function definition() {
-      return (0, _cozyClient.Q)('io.cozy.settings').getById('io.cozy.settings.disk-usage');
-    },
-    options: {
-      as: 'io.cozy.settings/io.cozy.settings.disk-usage'
-    }
-  };
-};
-
-exports.buildDiskUsageQuery = buildDiskUsageQuery;