cozy-client 60.3.0 → 60.6.0

package/dist/CozyClient.js

@@ -3126,7 +3126,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 = "60.3.0";
+CozyClient.version = "60.6.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/models/contact.js

@@ -5,7 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isContact = exports.getIndexByFamilyNameGivenNameEmailCozyUrl = exports.getDefaultSortIndexValue = exports.makeDefaultSortIndexValue = exports.getDisplayName = exports.makeDisplayName = exports.getFullname = exports.makeFullname = exports.getPrimaryAddress = exports.getPrimaryPhone = exports.getPrimaryCozyDomain = exports.getPrimaryCozy = exports.getPrimaryEmail = exports.getInitials = exports.getPrimaryOrFirst = exports.CONTACTS_DOCTYPE = void 0;
+exports.updateIndexFullNameAndDisplayName = exports.getFormattedAddress = exports.cleanFormattedAddress = exports.isContact = exports.getIndexByFamilyNameGivenNameEmailCozyUrl = exports.getDefaultSortIndexValue = exports.makeDefaultSortIndexValue = exports.getDisplayName = exports.makeDisplayName = exports.getFullname = exports.makeFullname = exports.getPrimaryAddress = exports.getPrimaryPhone = exports.getPrimaryCozyDomain = exports.getPrimaryCozy = exports.getPrimaryEmail = exports.getInitials = exports.getPrimaryOrFirst = exports.CONTACTS_DOCTYPE = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
@@ -13,6 +15,10 @@ var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 
 var _logger = _interopRequireDefault(require("../logger"));
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 var CONTACTS_DOCTYPE = 'io.cozy.contacts';
 /**
  * @typedef {'namePrefix'|'givenName'|'additionalName'|'familyName'|'nameSuffix'} FullnameAttributes
@@ -289,5 +295,77 @@ exports.getIndexByFamilyNameGivenNameEmailCozyUrl = getIndexByFamilyNameGivenNam
 var isContact = function isContact(doc) {
   return doc._type === CONTACTS_DOCTYPE;
 };
+/**
+ * Removed unwanted characters on contact's formatted address
+ *
+ * @param {string} formattedAddress - The contact's formatted address
+ * @returns {string}
+ */
+
+
+exports.isContact = isContact;
+
+var cleanFormattedAddress = function cleanFormattedAddress(formattedAddress) {
+  // Replace all spaces by one space, to fix cases where there are multiple spaces
+  // Replace commas that have a space before
+  // And remove all spaces before & after the string
+  var formattedAddressClean = formattedAddress.replace(/\s+/g, ' ').replace(/\s,/g, '').trim(); // Case where a comma is the last character
+
+  if (formattedAddressClean.lastIndexOf(',') === formattedAddressClean.length - 1) {
+    formattedAddressClean = formattedAddressClean.slice(0, formattedAddressClean.length - 1);
+  } // Case where a comma is the first character
+
+
+  if (formattedAddressClean.indexOf(',') === 0) {
+    formattedAddressClean = formattedAddressClean.slice(1);
+  }
+
+  return formattedAddressClean;
+};
+/**
+ * Returns the contact's formatted address
+ *
+ * @param {object} address - A contact address
+ * @param {function} t - Translate function
+ * @returns {string} - The contact's formatted address
+ */
+
+
+exports.cleanFormattedAddress = cleanFormattedAddress;
+
+var getFormattedAddress = function getFormattedAddress(address, t) {
+  if (address && address.formattedAddress) {
+    return address.formattedAddress;
+  }
+
+  var unformattedAddress = {
+    number: address.number || '',
+    street: address.street || '',
+    code: address.postcode || '',
+    city: address.city || '',
+    region: address.region || '',
+    country: address.country || ''
+  };
+  return cleanFormattedAddress(t('formatted.address', unformattedAddress));
+};
+/**
+ * Update fullname, displayName and Index values of a contact
+ *
+ * @param {object} contact - an io.cozy.contact document
+ * @returns {object} an io.cozy.contact document
+ */
+
+
+exports.getFormattedAddress = getFormattedAddress;
+
+var updateIndexFullNameAndDisplayName = function updateIndexFullNameAndDisplayName(contact) {
+  return _objectSpread(_objectSpread({}, contact), {}, {
+    fullname: makeFullname(contact),
+    displayName: makeDisplayName(contact),
+    indexes: {
+      byFamilyNameGivenNameEmailCozyUrl: makeDefaultSortIndexValue(contact)
+    }
+  });
+};
 
-exports.isContact = isContact;
+exports.updateIndexFullNameAndDisplayName = updateIndexFullNameAndDisplayName;

package/dist/models/contact.spec.js

@@ -11,6 +11,8 @@ import {
   getPrimaryCozyDomain,
   makeFullname,
   makeDisplayName,
+  getFormattedAddress,
+  updateIndexFullNameAndDisplayName,
   makeDefaultSortIndexValue
 } from './contact'
 
@@ -715,3 +717,115 @@ describe('getPrimaryCozyDomain', () => {
     expect(result).toEqual(expected)
   })
 })
+
+describe('getFormattedAddress', () => {
+  describe('with connector address format', () => {
+    it('should return full formatted address', () => {
+      const addressMock = {
+        city: 'Cambridge',
+        country: 'Russian Federation',
+        postcode: '16862',
+        street: '38 Taylor Street'
+      }
+
+      const res = getFormattedAddress(
+        addressMock,
+        jest.fn(() => '38 Taylor Street, 16862 Cambridge, Russian Federation')
+      )
+
+      expect(res).toBe('38 Taylor Street, 16862 Cambridge, Russian Federation')
+    })
+    it('should return formatted address if only "postcode" & "city" values are defined', () => {
+      const addressMock = {
+        city: 'Cambridge',
+        country: undefined,
+        postcode: '16862',
+        street: undefined
+      }
+      const res = getFormattedAddress(
+        addressMock,
+        jest.fn(() => ' , 16862 Cambridge, ')
+      )
+
+      expect(res).toBe('16862 Cambridge')
+    })
+    it('should return formatted address if "postcode" & "city" values are undefined', () => {
+      const addressMock = {
+        city: 'Cambridge',
+        country: undefined,
+        postcode: undefined,
+        street: '38 Taylor Street'
+      }
+      const res = getFormattedAddress(
+        addressMock,
+        jest.fn(() => '38 Taylor Street,  , Cambridge')
+      )
+
+      expect(res).toBe('38 Taylor Street, Cambridge')
+    })
+    it('should return formatted address if "postcode" & "city" values are undefined', () => {
+      const addressMock = {
+        city: undefined,
+        country: undefined,
+        postcode: undefined,
+        street: undefined
+      }
+      const res = getFormattedAddress(addressMock, jest.fn(() => ' ,  , '))
+
+      expect(res).toBe('')
+    })
+  })
+
+  describe('with manual address format', () => {
+    it('should return full formatted address', () => {
+      const addressMock = {
+        formattedAddress: '38 Taylor Street 16862 Cambridge Russian Federation'
+      }
+
+      const res = getFormattedAddress(addressMock, jest.fn(() => ''))
+
+      expect(res).toBe('38 Taylor Street 16862 Cambridge Russian Federation')
+    })
+  })
+})
+
+describe('updateIndexFullNameAndDisplayName', () => {
+  it('should returns a contact with new attributes', () => {
+    const contact = {
+      name: {
+        givenName: 'John',
+        familyName: 'Doe',
+        additionalName: 'J.'
+      },
+      email: [
+        {
+          address: 'john.doe@posteo.net',
+          type: 'personal',
+          primary: false
+        },
+        {
+          address: 'john.doe@cozycloud.cc',
+          primary: true
+        }
+      ],
+      cozy: [
+        {
+          type: 'MyCozy',
+          primary: true,
+          url: 'https://johndoe.mycozy.cloud'
+        }
+      ]
+    }
+
+    const expected = {
+      ...contact,
+      displayName: 'John J. Doe',
+      fullname: 'John J. Doe',
+      indexes: {
+        byFamilyNameGivenNameEmailCozyUrl:
+          'doejohnjohn.doe@cozycloud.ccjohndoe.mycozy.cloud'
+      }
+    }
+    expect(updateIndexFullNameAndDisplayName(contact)).toEqual(expected)
+  })
+})

package/dist/models/note.js

@@ -47,6 +47,7 @@ var generateUrlForNote = function generateUrlForNote(notesAppUrl, file) {
  * @param {object} file io.cozy.file object
  * @param {object} options Options
  * @param {string} [options.pathname] Pathname to use in the URL
+ * @param {string} [options.driveId] Shared drive ID used to fetched the URL
  * @returns {Promise<string>} url
  */
 
@@ -75,7 +76,9 @@ var fetchURL = /*#__PURE__*/function () {
           case 0:
             options = _args.length > 2 && _args[2] !== undefined ? _args[2] : {};
             _context.next = 3;
-            return client.getStackClient().collection('io.cozy.notes').fetchURL({
+            return client.getStackClient().collection('io.cozy.notes', {
+              driveId: options.driveId
+            }).fetchURL({
               _id: file.id
             });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "60.3.0",
+  "version": "60.6.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -19,7 +19,7 @@
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.170",
     "btoa": "^1.2.1",
-    "cozy-stack-client": "^60.1.0",
+    "cozy-stack-client": "^60.6.0",
     "date-fns": "2.29.3",
     "fast-deep-equal": "^3.1.3",
     "json-stable-stringify": "^1.0.1",
@@ -74,5 +74,5 @@
     "react-native-ios11-devicecheck": "^0.0.3"
   },
   "sideEffects": false,
-  "gitHead": "708cec590442076e46405082403975018fa8bb31"
+  "gitHead": "467bc59982b8d29e4d026b677432cdb2a29c8d6a"
 }

package/types/models/contact.d.ts

@@ -18,4 +18,7 @@ export function makeDefaultSortIndexValue(contact: import('../types').IOCozyCont
 export function getDefaultSortIndexValue(contact: import('../types').IOCozyContact): string;
 export function getIndexByFamilyNameGivenNameEmailCozyUrl(contact: import('../types').IOCozyContact): string;
 export function isContact(doc: object): boolean;
+export function cleanFormattedAddress(formattedAddress: string): string;
+export function getFormattedAddress(address: object, t: Function): string;
+export function updateIndexFullNameAndDisplayName(contact: object): object;
 export type FullnameAttributes = "namePrefix" | "givenName" | "additionalName" | "familyName" | "nameSuffix";

package/types/models/note.d.ts

@@ -2,4 +2,5 @@ export function generatePrivateUrl(notesAppUrl: string, file: object, options?:
 export function generateUrlForNote(notesAppUrl: any, file: any): string;
 export function fetchURL(client: object, file: object, options?: {
     pathname: string;
+    driveId: string;
 }): Promise<string>;