@dhis2/analytics 26.1.5 → 26.1.6

package/build/cjs/api/expression.js

@@ -32,9 +32,8 @@ const createCalculationMutation = {
 };
 exports.createCalculationMutation = createCalculationMutation;
 const updateCalculationMutation = {
-  type: 'update',
+  type: 'json-patch',
   resource: 'expressionDimensionItems',
-  partial: true,
   id: _ref3 => {
     let {
       id
@@ -46,11 +45,19 @@ const updateCalculationMutation = {
       name,
       expression
     } = _ref4;
-    return {
-      name,
-      shortName: name,
-      expression
-    };
+    return [{
+      op: 'add',
+      path: '/name',
+      value: name
+    }, {
+      op: 'add',
+      path: '/shortName',
+      value: name
+    }, {
+      op: 'add',
+      path: '/expression',
+      value: expression
+    }];
   }
 };
 exports.updateCalculationMutation = updateCalculationMutation;

package/build/cjs/components/FileMenu/RenameDialog.js

@@ -15,6 +15,21 @@ var _utils = require("./utils.js");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const formatPayload = (name, description) => {
+  const payload = [{
+    op: 'add',
+    path: '/name',
+    value: name
+  }];
+  if (description) {
+    payload.push({
+      op: 'add',
+      path: '/description',
+      value: description
+    });
+  }
+  return payload;
+};
 const getMutation = type => ({
   resource: (0, _utils.endpointFromFileType)(type),
   id: _ref => {
@@ -23,17 +38,13 @@ const getMutation = type => ({
     } = _ref;
     return id;
   },
-  type: 'update',
-  partial: true,
+  type: 'json-patch',
   data: _ref2 => {
     let {
       name,
       description
     } = _ref2;
-    return {
-      name,
-      description
-    };
+    return formatPayload(name, description);
   }
 });
 const RenameDialog = _ref3 => {
@@ -70,7 +81,8 @@ const RenameDialog = _ref3 => {
     });
   };
   return /*#__PURE__*/_react.default.createElement(_ui.Modal, {
-    onClose: onClose
+    onClose: onClose,
+    dataTest: "file-menu-rename-modal"
   }, /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _FileMenuStyles.modalStyles.__hash
   }, _FileMenuStyles.modalStyles), /*#__PURE__*/_react.default.createElement(_ui.ModalTitle, null, _index.default.t('Rename {{fileType}}', {
@@ -87,7 +99,8 @@ const RenameDialog = _ref3 => {
         value
       } = _ref4;
       return setName(value);
-    }
+    },
+    dataTest: "file-menu-rename-modal-name"
   }), /*#__PURE__*/_react.default.createElement(_ui.TextAreaField, {
     label: _index.default.t('Description'),
     disabled: loading,
@@ -98,15 +111,18 @@ const RenameDialog = _ref3 => {
         value
       } = _ref5;
       return setDescription(value);
-    }
+    },
+    dataTest: "file-menu-rename-modal-description"
   }))), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.ButtonStrip, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     onClick: onClose,
     disabled: loading,
-    secondary: true
+    secondary: true,
+    dataTest: "file-menu-rename-modal-cancel"
   }, _index.default.t('Cancel')), /*#__PURE__*/_react.default.createElement(_ui.Button, {
     onClick: renameObject,
     disabled: loading,
-    primary: true
+    primary: true,
+    dataTest: "file-menu-rename-modal-rename"
   }, _index.default.t('Rename')))));
 };
 exports.RenameDialog = RenameDialog;

package/build/es/api/expression.js

@@ -24,9 +24,8 @@ export const createCalculationMutation = {
   }
 };
 export const updateCalculationMutation = {
-  type: 'update',
+  type: 'json-patch',
   resource: 'expressionDimensionItems',
-  partial: true,
   id: _ref3 => {
     let {
       id
@@ -38,11 +37,19 @@ export const updateCalculationMutation = {
       name,
       expression
     } = _ref4;
-    return {
-      name,
-      shortName: name,
-      expression
-    };
+    return [{
+      op: 'add',
+      path: '/name',
+      value: name
+    }, {
+      op: 'add',
+      path: '/shortName',
+      value: name
+    }, {
+      op: 'add',
+      path: '/expression',
+      value: expression
+    }];
   }
 };
 export const deleteCalculationMutation = {

package/build/es/components/FileMenu/RenameDialog.js

@@ -6,6 +6,21 @@ import React, { useMemo, useState } from 'react';
 import i18n from '../../locales/index.js';
 import { modalStyles } from './FileMenu.styles.js';
 import { supportedFileTypes, endpointFromFileType, labelForFileType } from './utils.js';
+const formatPayload = (name, description) => {
+  const payload = [{
+    op: 'add',
+    path: '/name',
+    value: name
+  }];
+  if (description) {
+    payload.push({
+      op: 'add',
+      path: '/description',
+      value: description
+    });
+  }
+  return payload;
+};
 const getMutation = type => ({
   resource: endpointFromFileType(type),
   id: _ref => {
@@ -14,17 +29,13 @@ const getMutation = type => ({
     } = _ref;
     return id;
   },
-  type: 'update',
-  partial: true,
+  type: 'json-patch',
   data: _ref2 => {
     let {
       name,
       description
     } = _ref2;
-    return {
-      name,
-      description
-    };
+    return formatPayload(name, description);
   }
 });
 export const RenameDialog = _ref3 => {
@@ -61,7 +72,8 @@ export const RenameDialog = _ref3 => {
     });
   };
   return /*#__PURE__*/React.createElement(Modal, {
-    onClose: onClose
+    onClose: onClose,
+    dataTest: "file-menu-rename-modal"
   }, /*#__PURE__*/React.createElement(_JSXStyle, {
     id: modalStyles.__hash
   }, modalStyles), /*#__PURE__*/React.createElement(ModalTitle, null, i18n.t('Rename {{fileType}}', {
@@ -78,7 +90,8 @@ export const RenameDialog = _ref3 => {
         value
       } = _ref4;
       return setName(value);
-    }
+    },
+    dataTest: "file-menu-rename-modal-name"
   }), /*#__PURE__*/React.createElement(TextAreaField, {
     label: i18n.t('Description'),
     disabled: loading,
@@ -89,15 +102,18 @@ export const RenameDialog = _ref3 => {
         value
       } = _ref5;
       return setDescription(value);
-    }
+    },
+    dataTest: "file-menu-rename-modal-description"
   }))), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(ButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
     onClick: onClose,
     disabled: loading,
-    secondary: true
+    secondary: true,
+    dataTest: "file-menu-rename-modal-cancel"
   }, i18n.t('Cancel')), /*#__PURE__*/React.createElement(Button, {
     onClick: renameObject,
     disabled: loading,
-    primary: true
+    primary: true,
+    dataTest: "file-menu-rename-modal-rename"
   }, i18n.t('Rename')))));
 };
 RenameDialog.propTypes = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.1.5",
+    "version": "26.1.6",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {