@blaze-cms/plugin-data-ui 0.146.0-alpha.52 → 0.146.0-alpha.57

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.146.0-alpha.57](https://github.com/thebyte9/blaze/compare/v0.146.0-alpha.56...v0.146.0-alpha.57) (2025-07-14)
+
+
+### Bug Fixes
+
+* admin listing search filter fixes ([#4827](https://github.com/thebyte9/blaze/issues/4827)) ([8f72d2c](https://github.com/thebyte9/blaze/commit/8f72d2c4e9bb1fa585e20dc899fae6120a3d644e))
+* revert save text change ([#4833](https://github.com/thebyte9/blaze/issues/4833)) ([2cfc73b](https://github.com/thebyte9/blaze/commit/2cfc73bfc06dac1dc682f696ca30f932ac79e42b))
+
+
+### Features
+
+* query for getting the audit details in dynamic properties ([#3287](https://github.com/thebyte9/blaze/issues/3287)) ([39d889b](https://github.com/thebyte9/blaze/commit/39d889b18a6c6b8bc43ae1a5fddb4d19751cf159))
+
+
+
+
+
+# [0.146.0-alpha.56](https://github.com/thebyte9/blaze/compare/v0.146.0-alpha.55...v0.146.0-alpha.56) (2025-07-09)
+
+
+### Bug Fixes
+
+* get index from source data ([64425ec](https://github.com/thebyte9/blaze/commit/64425ec1b9e69385b45659f4b941631ae4c8b871))
+
+
+### Features
+
+* add admin listing filters based on schema settings ([#4797](https://github.com/thebyte9/blaze/issues/4797)) ([84b3109](https://github.com/thebyte9/blaze/commit/84b310900222a60050e3cf32928ab62a12a99b8d))
+
+
+
+
+
 # [0.146.0-alpha.52](https://github.com/thebyte9/blaze/compare/v0.146.0-alpha.51...v0.146.0-alpha.52) (2025-06-12)
 
 **Note:** Version bump only for package @blaze-cms/plugin-data-ui

package/README.md

@@ -31,6 +31,12 @@ The `displayProperties` property can be set on entity schema in the api to provi
       "firstname": {
         "_exists": false
       }
+    },
+    "adminListings": {
+      "dataSource": {
+        "source": "search",
+        "index": "admin"
+      }
     }
   }
 ```
@@ -40,7 +46,37 @@ The `displayProperties` property can be set on entity schema in the api to provi
 - adminHeader: properties to build admin header
 - adminMainInfoProperty: indicates a property that returns data to be displayed in the admin edit sidebar. Data is returned is formatted with the [data/info-properties](#Info properties) definition
 - disableDefaultAdminInfo: boolean value that can be used to hide default sidebar values updated/created
+- adminListings.dataSource: 
+-- adminListings.dataSource.source: indicates whether to get listing data from search queries instead of direct entity queries.
+-- adminListings.dataSource.index: which index to search. This changes the query used e.g. searchAdmin
 
+### Listing filters
+You can add the following to an entity properties/dynamicProperties to have them generate filters that appear at the top of admin record listings.
+```json
+// this will be represented as a select
+"relationKeyId": {
+  "type": "string",
+  "label": "Related records",
+  "searchable": true,
+  "showInForm": true,
+  "formFieldType": "relation",
+  "adminListingOptions": {
+    "filterType": "select"
+  }
+},
+
+// will include this property in a keyword search
+"name": {
+  "type": "string",
+  "label": "Name",
+  "searchable": true,
+  "adminListingOptions": {
+    "includeInKeywordSeach": true
+  }
+}
+```
+- `filterType: "select"`: This will get relevant options and display them in a select. If the property is relation data the select will be populated with the `name` property from the related records
+- `includeInKeywordSeach`: This property will be included in a keyword search
 
 ### Info properties
 

package/lib/components/EntityManager/Entity/EntitiyNavLinks/EntityNavLinks.js

@@ -9,6 +9,7 @@ exports["default"] = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.entries.js");
+require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.starts-with.js");
 var _reactRouterDom = require("react-router-dom");
 var _react = _interopRequireDefault(require("react"));

package/lib/components/EntityManager/Entity/EntitiyNavLinks/EntityNavLinks.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityNavLinks.js","names":["_reactRouterDom","require","_react","_interopRequireDefault","EntityNavLinks","_ref","schema","adminSectionNavigation","displayProperties","links","Object","entries","map","_ref2","_ref3","_slicedToArray2","k","v","label","uri","Wrapper","startsWith","Link","createElement","className","href","to","_default","exports"],"sources":["../../../../../src/components/EntityManager/Entity/EntitiyNavLinks/EntityNavLinks.js"],"sourcesContent":["import { Link } from 'react-router-dom';\nimport React from 'react';\n\nconst EntityNavLinks = ({ schema }) => {\n  if (!schema) return null;\n\n  const {\n    displayProperties: { adminSectionNavigation }\n  } = schema;\n\n  if (!adminSectionNavigation) return null;\n\n  const links = Object.entries(adminSectionNavigation).map(([k, v]) => {\n    const { label, uri } = v;\n    const Wrapper = uri.startsWith('#') ? 'a' : Link;\n\n    return (\n      <Wrapper className=\"entity-section-link\" href={uri} to={uri}>\n        {label}\n      </Wrapper>\n    );\n  });\n\n  return <div className=\"entity-section-links\">{links}</div>;\n};\n\nexport default EntityNavLinks;\n"],"mappings":";;;;;;;;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAC,sBAAA,CAAAF,OAAA;AAEA,IAAMG,cAAc,GAAG,SAAjBA,cAAcA,CAAAC,IAAA,EAAmB;EAAA,IAAbC,MAAM,GAAAD,IAAA,CAANC,MAAM;EAC9B,IAAI,CAACA,MAAM,EAAE,OAAO,IAAI;EAExB,IACuBC,sBAAsB,GACzCD,MAAM,CADRE,iBAAiB,CAAID,sBAAsB;EAG7C,IAAI,CAACA,sBAAsB,EAAE,OAAO,IAAI;EAExC,IAAME,KAAK,GAAGC,MAAM,CAACC,OAAO,CAACJ,sBAAsB,CAAC,CAACK,GAAG,CAAC,UAAAC,KAAA,EAAY;IAAA,IAAAC,KAAA,OAAAC,eAAA,aAAAF,KAAA;MAAVG,CAAC,GAAAF,KAAA;MAAEG,CAAC,GAAAH,KAAA;IAC7D,IAAQI,KAAK,GAAUD,CAAC,CAAhBC,KAAK;MAAEC,GAAG,GAAKF,CAAC,CAATE,GAAG;IAClB,IAAMC,OAAO,GAAGD,GAAG,CAACE,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG,GAAGC,oBAAI;IAEhD,oBACEpB,MAAA,YAAAqB,aAAA,CAACH,OAAO;MAACI,SAAS,EAAC,qBAAqB;MAACC,IAAI,EAAEN,GAAI;MAACO,EAAE,EAAEP;IAAI,GACzDD,KACM,CAAC;EAEd,CAAC,CAAC;EAEF,oBAAOhB,MAAA,YAAAqB,aAAA;IAAKC,SAAS,EAAC;EAAsB,GAAEf,KAAW,CAAC;AAC5D,CAAC;AAAC,IAAAkB,QAAA,GAAAC,OAAA,cAEaxB,cAAc","ignoreList":[]}
+{"version":3,"file":"EntityNavLinks.js","names":["_reactRouterDom","require","_react","_interopRequireDefault","EntityNavLinks","_ref","schema","adminSectionNavigation","displayProperties","links","Object","entries","map","_ref2","_ref3","_slicedToArray2","k","v","label","uri","Wrapper","startsWith","Link","createElement","className","href","to","_default","exports"],"sources":["../../../../../src/components/EntityManager/Entity/EntitiyNavLinks/EntityNavLinks.js"],"sourcesContent":["import { Link } from 'react-router-dom';\nimport React from 'react';\n\nconst EntityNavLinks = ({ schema }) => {\n  if (!schema) return null;\n\n  const {\n    displayProperties: { adminSectionNavigation }\n  } = schema;\n\n  if (!adminSectionNavigation) return null;\n\n  const links = Object.entries(adminSectionNavigation).map(([k, v]) => {\n    const { label, uri } = v;\n    const Wrapper = uri.startsWith('#') ? 'a' : Link;\n\n    return (\n      <Wrapper className=\"entity-section-link\" href={uri} to={uri}>\n        {label}\n      </Wrapper>\n    );\n  });\n\n  return <div className=\"entity-section-links\">{links}</div>;\n};\n\nexport default EntityNavLinks;\n"],"mappings":";;;;;;;;;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAC,sBAAA,CAAAF,OAAA;AAEA,IAAMG,cAAc,GAAG,SAAjBA,cAAcA,CAAAC,IAAA,EAAmB;EAAA,IAAbC,MAAM,GAAAD,IAAA,CAANC,MAAM;EAC9B,IAAI,CAACA,MAAM,EAAE,OAAO,IAAI;EAExB,IACuBC,sBAAsB,GACzCD,MAAM,CADRE,iBAAiB,CAAID,sBAAsB;EAG7C,IAAI,CAACA,sBAAsB,EAAE,OAAO,IAAI;EAExC,IAAME,KAAK,GAAGC,MAAM,CAACC,OAAO,CAACJ,sBAAsB,CAAC,CAACK,GAAG,CAAC,UAAAC,KAAA,EAAY;IAAA,IAAAC,KAAA,OAAAC,eAAA,aAAAF,KAAA;MAAVG,CAAC,GAAAF,KAAA;MAAEG,CAAC,GAAAH,KAAA;IAC7D,IAAQI,KAAK,GAAUD,CAAC,CAAhBC,KAAK;MAAEC,GAAG,GAAKF,CAAC,CAATE,GAAG;IAClB,IAAMC,OAAO,GAAGD,GAAG,CAACE,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG,GAAGC,oBAAI;IAEhD,oBACEpB,MAAA,YAAAqB,aAAA,CAACH,OAAO;MAACI,SAAS,EAAC,qBAAqB;MAACC,IAAI,EAAEN,GAAI;MAACO,EAAE,EAAEP;IAAI,GACzDD,KACM,CAAC;EAEd,CAAC,CAAC;EAEF,oBAAOhB,MAAA,YAAAqB,aAAA;IAAKC,SAAS,EAAC;EAAsB,GAAEf,KAAW,CAAC;AAC5D,CAAC;AAAC,IAAAkB,QAAA,GAAAC,OAAA,cAEaxB,cAAc","ignoreList":[]}

package/lib/components/EntityManager/Entity/Entity.js

@@ -57,8 +57,7 @@ var _InfoBoxes = _interopRequireDefault(require("../../InfoBoxes/InfoBoxes"));
 var _RecordEditContext = require("../utils/RecordEditContext");
 var _excluded = ["isValid", "fields", "isNewValueSet", "valuesChecked", "currentField", "value"];
 /* eslint-disable no-undef */
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Entity = function Entity(_ref) {
@@ -88,29 +87,29 @@ var Entity = function Entity(_ref) {
     entityData = _useState8[0],
     setEntityData = _useState8[1];
   var _useState9 = (0, _react.useState)(null),
-    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
-    entityIdentifier = _useState10[0],
-    setEntityIdentifier = _useState10[1];
-  var _useState11 = (0, _react.useState)(''),
+    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
+    entityIdentifier = _useState0[0],
+    setEntityIdentifier = _useState0[1];
+  var _useState1 = (0, _react.useState)(''),
+    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
+    pageTitle = _useState10[0],
+    setPageTitle = _useState10[1];
+  var _useState11 = (0, _react.useState)(false),
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    pageTitle = _useState12[0],
-    setPageTitle = _useState12[1];
-  var _useState13 = (0, _react.useState)(false),
+    isSaveButtonAvailable = _useState12[0],
+    setIsSaveButtonAvailable = _useState12[1];
+  var _useState13 = (0, _react.useState)(formData && formData.values && formData.values.status),
     _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
-    isSaveButtonAvailable = _useState14[0],
-    setIsSaveButtonAvailable = _useState14[1];
-  var _useState15 = (0, _react.useState)(formData && formData.values && formData.values.status),
+    entityIsPublished = _useState14[0],
+    setEntityIsPublish = _useState14[1];
+  var _useState15 = (0, _react.useState)(false),
     _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
-    entityIsPublished = _useState16[0],
-    setEntityIsPublish = _useState16[1];
+    isEnablePublishButton = _useState16[0],
+    setEnablePublishButton = _useState16[1];
   var _useState17 = (0, _react.useState)(false),
     _useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
-    isEnablePublishButton = _useState18[0],
-    setEnablePublishButton = _useState18[1];
-  var _useState19 = (0, _react.useState)(false),
-    _useState20 = (0, _slicedToArray2["default"])(_useState19, 2),
-    isEnablePreviewButton = _useState20[0],
-    setEnablePreviewButton = _useState20[1];
+    isEnablePreviewButton = _useState18[0],
+    setEnablePreviewButton = _useState18[1];
   var _useToggle = (0, _useToggle5["default"])(false),
     _useToggle2 = (0, _slicedToArray2["default"])(_useToggle, 2),
     modalStatus = _useToggle2[0],
@@ -119,39 +118,39 @@ var Entity = function Entity(_ref) {
     _useToggle4 = (0, _slicedToArray2["default"])(_useToggle3, 2),
     copyModalStatus = _useToggle4[0],
     setCopyModalStatus = _useToggle4[1];
-  var _useState21 = (0, _react.useState)(true),
+  var _useState19 = (0, _react.useState)(true),
+    _useState20 = (0, _slicedToArray2["default"])(_useState19, 2),
+    pageBuilderTemplateStatus = _useState20[0],
+    setPageBuilderTemplateStatus = _useState20[1];
+  var _useState21 = (0, _react.useState)(false),
     _useState22 = (0, _slicedToArray2["default"])(_useState21, 2),
-    pageBuilderTemplateStatus = _useState22[0],
-    setPageBuilderTemplateStatus = _useState22[1];
+    shouldCopyData = _useState22[0],
+    setShouldCopyData = _useState22[1];
   var _useState23 = (0, _react.useState)(false),
     _useState24 = (0, _slicedToArray2["default"])(_useState23, 2),
-    shouldCopyData = _useState24[0],
-    setShouldCopyData = _useState24[1];
-  var _useState25 = (0, _react.useState)(false),
+    isFormValid = _useState24[0],
+    setIsFormValid = _useState24[1];
+  var _useState25 = (0, _react.useState)(null),
     _useState26 = (0, _slicedToArray2["default"])(_useState25, 2),
-    isFormValid = _useState26[0],
-    setIsFormValid = _useState26[1];
+    formDataFromCopy = _useState26[0],
+    setFormDataFromCopy = _useState26[1];
   var _useState27 = (0, _react.useState)(null),
     _useState28 = (0, _slicedToArray2["default"])(_useState27, 2),
-    formDataFromCopy = _useState28[0],
-    setFormDataFromCopy = _useState28[1];
-  var _useState29 = (0, _react.useState)(null),
+    newUpdatedDate = _useState28[0],
+    setNewUpdatedDate = _useState28[1];
+  var _useState29 = (0, _react.useState)(_constants.SAVE_BUTTON_TEXTS.save),
     _useState30 = (0, _slicedToArray2["default"])(_useState29, 2),
-    newUpdatedDate = _useState30[0],
-    setNewUpdatedDate = _useState30[1];
-  var _useState31 = (0, _react.useState)(_constants.SAVE_BUTTON_TEXTS.save),
+    saveButtonText = _useState30[0],
+    setSaveButtonText = _useState30[1];
+  var _useState31 = (0, _react.useState)(null),
     _useState32 = (0, _slicedToArray2["default"])(_useState31, 2),
-    saveButtonText = _useState32[0],
-    setSaveButtonText = _useState32[1];
-  var _useState33 = (0, _react.useState)(null),
-    _useState34 = (0, _slicedToArray2["default"])(_useState33, 2),
-    externalUpdateTime = _useState34[0],
-    setExternalUpdateTime = _useState34[1];
+    externalUpdateTime = _useState32[0],
+    setExternalUpdateTime = _useState32[1];
   var isCreatePage = history.location.pathname.includes('create');
-  var _useState35 = (0, _react.useState)(isCreatePage),
-    _useState36 = (0, _slicedToArray2["default"])(_useState35, 2),
-    isNewEntity = _useState36[0],
-    setIsNewEntity = _useState36[1];
+  var _useState33 = (0, _react.useState)(isCreatePage),
+    _useState34 = (0, _slicedToArray2["default"])(_useState33, 2),
+    isNewEntity = _useState34[0],
+    setIsNewEntity = _useState34[1];
   var client = (0, _client.useApolloClient)();
   var shouldUpdateState = !entityIdentifier || (0, _entity.checkFulfilConditions)(entity, schema, previousQuery, !entityData) || entityData && entityData.id !== entity.id;
   var clonedFormData = (0, _lodash["default"])(formData);
@@ -202,13 +201,13 @@ var Entity = function Entity(_ref) {
     }
   }, [client, entity, entityData, formData, formValues, pageBuilderTemplateStatus, previousQuery, schema, shouldUpdateState]);
   var getFullUrl = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var query, _yield$client$query, _yield$client$query$d, _yield$client$query$d2, _yield$client$query$d3, getEntityUrl;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             query = (0, _adminUiUtils.getQuery)('GET_ENTITY_URL');
-            _context.next = 3;
+            _context.next = 1;
             return client.query({
               query: query,
               variables: {
@@ -218,14 +217,14 @@ var Entity = function Entity(_ref) {
               },
               fetchPolicy: 'network-only'
             });
-          case 3:
+          case 1:
             _yield$client$query = _context.sent;
             _yield$client$query$d = _yield$client$query.data;
             _yield$client$query$d2 = _yield$client$query$d === void 0 ? {} : _yield$client$query$d;
             _yield$client$query$d3 = _yield$client$query$d2.getEntityUrl;
             getEntityUrl = _yield$client$query$d3 === void 0 ? '' : _yield$client$query$d3;
             return _context.abrupt("return", getEntityUrl);
-          case 9:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -261,15 +260,15 @@ var Entity = function Entity(_ref) {
     }
   };
   var onChangeFormValues = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(_ref4) {
+    var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(_ref4) {
       var isValid, fields, isNewValueSet, valuesChecked, currentField, fieldValue, otherProps, updatedFormValues, pageBuilderTemplateId, pageBuilder, _yield$client$query2, _yield$client$query2$, data, itemsToAdd, _fields$filter, _fields$filter2, _fields$filter2$, updatedEntity, isValidAndNewValueSet, isNotValidOrNotNewValueSet;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
+      return _regenerator["default"].wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             isValid = _ref4.isValid, fields = _ref4.fields, isNewValueSet = _ref4.isNewValueSet, valuesChecked = _ref4.valuesChecked, currentField = _ref4.currentField, fieldValue = _ref4.value, otherProps = (0, _objectWithoutProperties2["default"])(_ref4, _excluded);
             updatedFormValues = valuesChecked ? valuesChecked.slice() : [];
             if (!(currentField === _constants.PAGE_BUILDER_TEMPLATE_FIELD_ID)) {
-              _context2.next = 14;
+              _context2.next = 2;
               break;
             }
             pageBuilderTemplateId = fieldValue;
@@ -287,10 +286,10 @@ var Entity = function Entity(_ref) {
               return formValue.id === _constants.PAGE_BUILDER_FIELD_ID;
             });
             if (!pageBuilderTemplateId) {
-              _context2.next = 14;
+              _context2.next = 2;
               break;
             }
-            _context2.next = 10;
+            _context2.next = 1;
             return client.query({
               query: (0, _adminUiUtils.getQuery)('MERGE_PB_TEMPLATE_CHANGES'),
               variables: {
@@ -301,7 +300,7 @@ var Entity = function Entity(_ref) {
                 entityIdentifier: entityIdentifier
               }
             });
-          case 10:
+          case 1:
             _yield$client$query2 = _context2.sent;
             _yield$client$query2$ = _yield$client$query2.data;
             data = _yield$client$query2$ === void 0 ? {} : _yield$client$query2$;
@@ -315,7 +314,7 @@ var Entity = function Entity(_ref) {
                 return updatedFormValue;
               });
             }
-          case 14:
+          case 2:
             itemsToAdd = [];
             if (formValues && formValues.length > updatedFormValues.length) {
               [].concat((0, _toConsumableArray2["default"])(updatedFormValues), (0, _toConsumableArray2["default"])(formValues)).forEach(function (item) {
@@ -347,7 +346,7 @@ var Entity = function Entity(_ref) {
             if (componentIsMounted.current) {
               setFormValues([].concat((0, _toConsumableArray2["default"])(updatedFormValues), itemsToAdd));
             }
-          case 24:
+          case 3:
           case "end":
             return _context2.stop();
         }
@@ -398,16 +397,16 @@ var Entity = function Entity(_ref) {
     return _actionsHandlers["default"][action].submit(currentAction, addToast);
   };
   var onDelete = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+    var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       var id;
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
+      return _regenerator["default"].wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             id = formData.values.id;
             if (componentIsMounted.current) {
               setIsSaveButtonAvailable(false);
             }
-            _context3.next = 4;
+            _context3.next = 1;
             return _actionsHandlers["default"]["delete"].submit({
               entitySchema: entitySchema,
               client: client,
@@ -415,9 +414,9 @@ var Entity = function Entity(_ref) {
                 id: id
               }
             }, addToast);
-          case 4:
+          case 1:
             history.push("/data-listing/".concat(entitySchema.id));
-          case 5:
+          case 2:
           case "end":
             return _context3.stop();
         }
@@ -453,9 +452,9 @@ var Entity = function Entity(_ref) {
     setFormDataFromCopy(formDataUpdated);
   };
   var handlePublishAndUnpublish = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(_ref8) {
+    var _ref9 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(_ref8) {
       var textContent, isPublishButton, isPublished, isUnpublish, savedPageMessage;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
+      return _regenerator["default"].wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             textContent = _ref8.target.textContent;
@@ -463,31 +462,31 @@ var Entity = function Entity(_ref) {
             isPublished = entityIsPublished === _constants.ENTITY_PUBLISHED;
             isUnpublish = (0, _entity.checkFulfilConditions)(!isPublishButton, !isPublished);
             if (!isUnpublish) {
-              _context4.next = 6;
+              _context4.next = 1;
               break;
             }
             return _context4.abrupt("return", addToast(_constants.UNPUBLISHED_WARNING, {
               appearance: 'warning',
               autoDismiss: true
             }));
-          case 6:
+          case 1:
             if (!(0, _entity.checkFulfilConditions)(isPublishButton, isSaveButtonAvailable)) {
-              _context4.next = 12;
+              _context4.next = 3;
               break;
             }
-            _context4.next = 9;
+            _context4.next = 2;
             return onSubmit();
-          case 9:
+          case 2:
             savedPageMessage = _context4.sent;
             if (!(savedPageMessage === _constants.ERROR)) {
-              _context4.next = 12;
+              _context4.next = 3;
               break;
             }
             return _context4.abrupt("return", addToast("Content not published", {
               appearance: _constants.ERROR,
               autoDismiss: true
             }));
-          case 12:
+          case 3:
             return _context4.abrupt("return", _actionsHandlers["default"].shared.triggerPublish({
               entityData: entityData,
               client: client,
@@ -496,7 +495,7 @@ var Entity = function Entity(_ref) {
               textContent: textContent,
               refetchRecord: refetchRecord
             }, addToast));
-          case 13:
+          case 4:
           case "end":
             return _context4.stop();
         }