cozy-client 40.5.0 → 41.0.0

package/dist/CozyClient.js

@@ -2695,7 +2695,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 = "40.5.0";
+CozyClient.version = "41.0.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/devtools/Pouch.js

@@ -21,7 +21,7 @@ var _cozyPouchLink = _interopRequireDefault(require("cozy-pouch-link"));
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
-var _Buttons = _interopRequireDefault(require("cozy-ui/transpiled/react/MuiCozyTheme/Buttons"));
+var _Button = _interopRequireDefault(require("cozy-ui/transpiled/react/Button"));
 
 var _Typography = _interopRequireDefault(require("cozy-ui/transpiled/react/Typography"));
 
@@ -186,17 +186,17 @@ var PouchDevTool = function PouchDevTool() {
     }));
   })), /*#__PURE__*/_react.default.createElement(_Typography.default, {
     variant: "subtitle1"
-  }, "Actions"), /*#__PURE__*/_react.default.createElement("p", null, /*#__PURE__*/_react.default.createElement(_Buttons.default, {
+  }, "Actions"), /*#__PURE__*/_react.default.createElement("p", null, /*#__PURE__*/_react.default.createElement(_Button.default, {
     className: "u-mb-half",
     variant: "contained",
     disabled: status === 'replicating',
     onClick: handleClickStartReplication
-  }, "Start replication"), /*#__PURE__*/_react.default.createElement(_Buttons.default, {
+  }, "Start replication"), /*#__PURE__*/_react.default.createElement(_Button.default, {
     className: "u-mb-half",
     variant: "contained",
     disabled: status === 'idle',
     onClick: handleClickStopReplication
-  }, "Stop replication"), /*#__PURE__*/_react.default.createElement(_Buttons.default, {
+  }, "Stop replication"), /*#__PURE__*/_react.default.createElement(_Button.default, {
     className: "u-mb-half",
     variant: "contained",
     disabled: resetting,

package/dist/devtools/Queries.js

@@ -45,7 +45,7 @@ var _styles = require("@material-ui/core/styles");
 
 var _Typography = _interopRequireDefault(require("cozy-ui/transpiled/react/Typography"));
 
-var _ListItem = _interopRequireDefault(require("cozy-ui/transpiled/react/MuiCozyTheme/ListItem"));
+var _ListItem = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItem"));
 
 var _ListItemText = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItemText"));
 

package/dist/devtools/index.js

@@ -55,15 +55,15 @@ var _Slide = _interopRequireDefault(require("@material-ui/core/Slide"));
 
 var _styles = require("@material-ui/core/styles");
 
-var _CozyTheme = _interopRequireDefault(require("cozy-ui/transpiled/react/CozyTheme"));
+var _CozyTheme = _interopRequireDefault(require("cozy-ui/transpiled/react/providers/CozyTheme"));
 
 var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
 
-var _List = _interopRequireDefault(require("cozy-ui/transpiled/react/MuiCozyTheme/List"));
+var _List = _interopRequireDefault(require("cozy-ui/transpiled/react/List"));
 
 var _Typography = _interopRequireDefault(require("cozy-ui/transpiled/react/Typography"));
 
-var _ListItem = _interopRequireDefault(require("cozy-ui/transpiled/react/MuiCozyTheme/ListItem"));
+var _ListItem = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItem"));
 
 var _ListItemText = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItemText"));
 

package/dist/hooks/useClientErrors.js

@@ -13,7 +13,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _QuotaAlert = _interopRequireDefault(require("cozy-ui/transpiled/react/QuotaAlert"));
+var _QuotaAlert = _interopRequireDefault(require("cozy-ui/transpiled/react/deprecated/QuotaAlert"));
 
 var _filter = _interopRequireDefault(require("lodash/filter"));
 

package/dist/models/file.js

@@ -659,18 +659,26 @@ var overrideFileForPath = /*#__PURE__*/function () {
  * Method to generate a new filename if there is a conflict
  *
  * @param {string} filenameWithoutExtension - A filename without the extension
+ * @param {RegExp} [originalNameFormatRegex] - A regex to check if the name is still in his original format
  * @returns {string} A filename with the right suffix
  */
 
 
 exports.overrideFileForPath = overrideFileForPath;
 
-var generateNewFileNameOnConflict = function generateNewFileNameOnConflict(filenameWithoutExtension) {
-  //Check if the string ends by _1
+var generateNewFileNameOnConflict = function generateNewFileNameOnConflict(filenameWithoutExtension, originalNameFormatRegex) {
+  var isOriginalNameFormat = false;
+
+  if (originalNameFormatRegex && originalNameFormatRegex.test(filenameWithoutExtension)) {
+    isOriginalNameFormat = true;
+  } //Check if the string ends by _1
+
+
   var regex = new RegExp('(_)([0-9]+)$');
   var matches = filenameWithoutExtension.match(regex);
+  var shouldIncrement = matches && !isOriginalNameFormat;
 
-  if (matches) {
+  if (shouldIncrement) {
     var versionNumber = parseInt(matches[2]); //increment versionNumber
 
     versionNumber++;

package/dist/models/file.spec.js

@@ -571,6 +571,29 @@ describe('File Model', () => {
       expect(filename3).toEqual('test_1_1_test_1')
       const filename4 = fileModel.generateNewFileNameOnConflict('test_')
       expect(filename4).toEqual('test__1')
+      const filename5 = fileModel.generateNewFileNameOnConflict('test_1_1')
+      expect(filename5).toEqual('test_1_2')
+    })
+
+    it('should generate the right file name with _X when passing a format', () => {
+      const regex = new RegExp('^([a-z]+)(_)([0-9]+)$') // test_1
+
+      const filename1 = fileModel.generateNewFileNameOnConflict('test', regex)
+      expect(filename1).toEqual('test_1')
+      const filename2 = fileModel.generateNewFileNameOnConflict('test_1', regex)
+      expect(filename2).toEqual('test_1_1')
+      const filename3 = fileModel.generateNewFileNameOnConflict(
+        'test_1_1_test',
+        regex
+      )
+      expect(filename3).toEqual('test_1_1_test_1')
+      const filename4 = fileModel.generateNewFileNameOnConflict('test_', regex)
+      expect(filename4).toEqual('test__1')
+      const filename5 = fileModel.generateNewFileNameOnConflict(
+        'test_1_1',
+        regex
+      )
+      expect(filename5).toEqual('test_1_2')
     })
   })
 

package/dist/models/fsnative.spec.js

@@ -11,7 +11,7 @@ jest.mock('cozy-device-helper', () => ({
   isMobileApp: jest.fn()
 }))
 
-jest.mock('cozy-ui/transpiled/react/Alerter', () => ({
+jest.mock('cozy-ui/transpiled/react/deprecated/Alerter', () => ({
   success: jest.fn(),
   error: jest.fn(),
   info: jest.fn()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "40.5.0",
+  "version": "41.0.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -18,7 +18,7 @@
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.170",
     "btoa": "^1.2.1",
-    "cozy-stack-client": "^40.2.1",
+    "cozy-stack-client": "^41.0.0",
     "date-fns": "2.29.3",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.13",
@@ -50,8 +50,9 @@
     "btoa": "1.2.1",
     "cozy-device-helper": "2.7.0",
     "cozy-flags": "2.10.2",
+    "cozy-intent": "1.17.3",
     "cozy-logger": "1.7.0",
-    "cozy-ui": "48.0.0",
+    "cozy-ui": "93.1.1",
     "jsdoc-plugin-intersection": "1.0.4",
     "mockdate": "2.0.5",
     "react": "16.14.0",
@@ -64,8 +65,9 @@
   "peerDependencies": {
     "cozy-device-helper": ">=2.1.0",
     "cozy-flags": ">2.8.6",
+    "cozy-intent": ">=1.3.0",
     "cozy-logger": ">1.7.0",
-    "cozy-ui": ">34.0.0",
+    "cozy-ui": ">=93.1.1",
     "react": "^16.7.0",
     "react-native": "^0.65.0",
     "react-native-google-safetynet": "npm:cozy-react-native-google-safetynet@^1.0.0",
@@ -73,5 +75,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "c05e32361f5bb6f3303d591a454b47a03bbb8217"
+  "gitHead": "407e4545f27490d0b0e1450ebcd9a70c1ab17aff"
 }

package/types/models/file.d.ts

@@ -52,7 +52,7 @@ export function move(client: CozyClient, fileId: string, destination: {
     path: string;
 }, force?: boolean): Promise<any>;
 export function overrideFileForPath(client: CozyClient, dirPath: string, file: object, metadata: object): Promise<import("../types").IOCozyFile>;
-export function generateNewFileNameOnConflict(filenameWithoutExtension: string): string;
+export function generateNewFileNameOnConflict(filenameWithoutExtension: string, originalNameFormatRegex?: RegExp): string;
 export function generateFileNameForRevision(file: import("../types").IOCozyFile, revision: object, f: Function): string;
 export function uploadFileWithConflictStrategy(client: CozyClient, file: string | ArrayBuffer, options: FileUploadOptions): any;
 export function readMobileFile(fileURL: string): Promise<any>;