cozy-client 57.6.0 → 57.7.1

package/dist/CozyClient.js

@@ -3112,7 +3112,7 @@ var CozyClient = /*#__PURE__*/function () {
 CozyClient.hooks = CozyClient.hooks || {};
 CozyClient.fetchPolicies = _policies.default; //COZY_CLIENT_VERSION_PACKAGE in replaced by babel. See babel config
 
-CozyClient.version = "57.6.0";
+CozyClient.version = "57.7.1";
 
 _microee.default.mixin(CozyClient);
 

package/dist/models/applications.js

@@ -5,7 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAppDisplayName = exports.getUrl = exports.isInstalled = exports.getStoreInstallationURL = exports.getStoreURL = void 0;
+exports.sortApplicationsList = exports.getAppDisplayName = exports.getUrl = exports.isInstalled = exports.getStoreInstallationURL = exports.getStoreURL = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
@@ -103,7 +105,29 @@ var getAppDisplayName = function getAppDisplayName(app, lang) {
   var baseName = (0, _get.default)(app, 'name');
   var translatedName = (0, _get.default)(app, ['locales', lang, 'name'], baseName);
   var translatedPrefix = (0, _get.default)(app, ['locales', lang, 'name_prefix'], basePrefix);
-  return translatedPrefix && translatedPrefix.toLowerCase() !== 'cozy' ? "".concat(translatedPrefix, " ").concat(translatedName) : translatedName;
+  return translatedPrefix && translatedPrefix.toLowerCase() !== 'cozy' && translatedPrefix.toLowerCase() !== 'twake' ? "".concat(translatedPrefix, " ").concat(translatedName) : translatedName;
+};
+/**
+ * sortApplicationsList - Sort the apps based on the slugs in parameters. Apps listed in the slugsOrder array will be added first
+ * and will respect the order defined by slugsOrder and other apps will be added after.
+ *
+ * @param {object[]} apps io.cozy.apps array
+ * @param {string[]} slugsOrder slugs array
+ *
+ * @returns {object[]} io.cozy.apps array
+ */
+
+
+exports.getAppDisplayName = getAppDisplayName;
+
+var sortApplicationsList = function sortApplicationsList(apps, slugsOrder) {
+  return (0, _toConsumableArray2.default)(apps).sort(function (a, b) {
+    var indexA = slugsOrder.indexOf(a.slug);
+    if (indexA === -1) indexA = 1000;
+    var indexB = slugsOrder.indexOf(b.slug);
+    if (indexB === -1) indexB = 1000;
+    return indexA - indexB;
+  });
 };
 
-exports.getAppDisplayName = getAppDisplayName;
+exports.sortApplicationsList = sortApplicationsList;

package/dist/models/applications.spec.js

@@ -1,5 +1,10 @@
 import { applications } from './'
-const { getAppDisplayName, getStoreURL, getStoreInstallationURL } = applications
+const {
+  getAppDisplayName,
+  getStoreURL,
+  getStoreInstallationURL,
+  sortApplicationsList
+} = applications
 
 describe('applications model', () => {
   describe('application name', () => {
@@ -18,6 +23,12 @@ describe('applications model', () => {
       expect(getAppDisplayName({ name_prefix: 'Cozy', name: 'Cozy' })).toBe(
         'Cozy'
       )
+      expect(getAppDisplayName({ name_prefix: 'Twake', name: 'Cloud' })).toBe(
+        'Cloud'
+      )
+      expect(getAppDisplayName({ name_prefix: 'Twake', name: 'Twake' })).toBe(
+        'Twake'
+      )
     })
 
     it('should support translations', () => {
@@ -129,4 +140,88 @@ describe('applications model', () => {
       })
     })
   })
+
+  describe('sort applications list', () => {
+    it('should sort apps according to the given order', () => {
+      const availableApps = [
+        { slug: 'drive', name: 'Drive' },
+        { slug: 'chat', name: 'Chat' },
+        { slug: 'mail', name: 'Mail' },
+        { slug: 'contacts', name: 'Contacts' },
+        { slug: 'password', name: 'Password' }
+      ]
+      const order = ['chat', 'drive', 'mail', 'password', 'contacts']
+
+      const expected = [
+        { slug: 'chat', name: 'Chat' },
+        { slug: 'drive', name: 'Drive' },
+        { slug: 'mail', name: 'Mail' },
+        { slug: 'password', name: 'Password' },
+        { slug: 'contacts', name: 'Contacts' }
+      ]
+
+      const result = sortApplicationsList(availableApps, order)
+      expect(result).toEqual(expected)
+    })
+
+    it('should handle apps not in the order array', () => {
+      const availableApps = [
+        { slug: 'drive', name: 'Drive' },
+        { slug: 'chat', name: 'Chat' },
+        { slug: 'store', name: 'Store' },
+        { slug: 'mail', name: 'Mail' },
+        { slug: 'contacts', name: 'Contacts' },
+        { slug: 'password', name: 'Password' },
+        { slug: 'calendar', name: 'Calendar' }
+      ]
+      const order = ['chat', 'drive', 'mail', 'password', 'contacts']
+
+      const expected = [
+        { slug: 'chat', name: 'Chat' },
+        { slug: 'drive', name: 'Drive' },
+        { slug: 'mail', name: 'Mail' },
+        { slug: 'password', name: 'Password' },
+        { slug: 'contacts', name: 'Contacts' },
+        { slug: 'store', name: 'Store' },
+        { slug: 'calendar', name: 'Calendar' }
+      ]
+
+      const result = sortApplicationsList(availableApps, order)
+      expect(result).toEqual(expected)
+    })
+
+    it('should handle an empty apps array', () => {
+      const availableApps = []
+      const order = ['chat', 'drive', 'mail', 'password', 'notes', 'contacts']
+
+      const expected = []
+
+      const result = sortApplicationsList(availableApps, order)
+      expect(result).toEqual(expected)
+    })
+
+    it('should handle an empty order array', () => {
+      const availableApps = [
+        { slug: 'drive', name: 'Drive' },
+        { slug: 'chat', name: 'Chat' },
+        { slug: 'store', name: 'Store' },
+        { slug: 'mail', name: 'Mail' },
+        { slug: 'contacts', name: 'Contacts' },
+        { slug: 'password', name: 'Password' }
+      ]
+      const order = []
+
+      const expected = [
+        { slug: 'drive', name: 'Drive' },
+        { slug: 'chat', name: 'Chat' },
+        { slug: 'store', name: 'Store' },
+        { slug: 'mail', name: 'Mail' },
+        { slug: 'contacts', name: 'Contacts' },
+        { slug: 'password', name: 'Password' }
+      ]
+
+      const result = sortApplicationsList(availableApps, order)
+      expect(result).toEqual(expected)
+    })
+  })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "57.6.0",
+  "version": "57.7.1",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -74,5 +74,5 @@
     "react-native-ios11-devicecheck": "^0.0.3"
   },
   "sideEffects": false,
-  "gitHead": "5a646c30c51b7a93ea7e65d309425799487b1968"
+  "gitHead": "6be3e7f973341b52f8394ba6e5adbba672e32dd6"
 }

package/types/models/applications.d.ts

@@ -3,3 +3,4 @@ export function getStoreInstallationURL(appData?: any[], app?: object): string;
 export function isInstalled(apps?: any[], wantedApp?: object): object;
 export function getUrl(app: object): string;
 export function getAppDisplayName(app: object, lang: string): string;
+export function sortApplicationsList(apps: object[], slugsOrder: string[]): object[];