@blaze-cms/plugin-data-ui 0.126.0 → 0.127.0-admin-updates.0

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.127.0-admin-updates.0](https://github.com/thebyte9/blaze/compare/v0.126.1...v0.127.0-admin-updates.0) (2023-02-07)
+
+
+### Bug Fixes
+
+* admin updates feedback ([0e69cbb](https://github.com/thebyte9/blaze/commit/0e69cbb0337df371c3e1cfc2f43c0d4ce666f33b))
+* persist menu accordion state ([#3792](https://github.com/thebyte9/blaze/issues/3792)) ([d41254a](https://github.com/thebyte9/blaze/commit/d41254a2785d04cbef661ca8e17d8f60cb79f525))
+* update snapshots ([c88c8be](https://github.com/thebyte9/blaze/commit/c88c8bec58af59a5707d15f5e212e6b515706676))
+* update snapshots ([d490e17](https://github.com/thebyte9/blaze/commit/d490e1746d63ed5842799d15d6696c287f9b0d10))
+
+
+### Features
+
+* add admin style feedback ([3f8b9a1](https://github.com/thebyte9/blaze/commit/3f8b9a1416a8a7977631583cff62fddb43cd2e9d))
+* style sidebar and add updated snapshots. Bz2 2870  ([#3539](https://github.com/thebyte9/blaze/issues/3539)) ([60640e5](https://github.com/thebyte9/blaze/commit/60640e5b65b4ed426ceefabc00c3beddb2113676))
+
+
+
+
+
 # [0.126.0](https://github.com/thebyte9/blaze/compare/v0.126.0-alpha.6...v0.126.0) (2023-01-17)
 
 **Note:** Version bump only for package @blaze-cms/plugin-data-ui

package/lib/components/EntityDataListing/EntityDataListing.js

@@ -41,10 +41,10 @@ var EntityDataListing = function EntityDataListing(_ref) {
         identifier: identifier
       }
     }),
-    _useQuery$data = _useQuery.data;
-  _useQuery$data = _useQuery$data === void 0 ? {} : _useQuery$data;
-  var _useQuery$data$getEnt = _useQuery$data.getEntitySchemas,
-    getEntitySchemas = _useQuery$data$getEnt === void 0 ? [] : _useQuery$data$getEnt;
+    _useQuery$data = _useQuery.data,
+    _useQuery$data2 = _useQuery$data === void 0 ? {} : _useQuery$data,
+    _useQuery$data2$getEn = _useQuery$data2.getEntitySchemas,
+    getEntitySchemas = _useQuery$data2$getEn === void 0 ? [] : _useQuery$data2$getEn;
   if (!getEntitySchemas.length) return '';
   return /*#__PURE__*/_react["default"].createElement(_ListingTable["default"], {
     entitySchema: getEntitySchemas[0],

package/lib/components/EntityDataListing/EntityDataListing.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityDataListing.js","names":["EntityDataListing","match","menuItems","identifier","params","entityIdentifier","map","_","items","item","filter","uri","endsWith","length","Boolean","selectedMenuItem","useQuery","getQuery","variables","data","getEntitySchemas","propTypes","PropTypes","object","isRequired","array","withContext"],"sources":["../../../src/components/EntityDataListing/EntityDataListing.js"],"sourcesContent":["import { useQuery } from '@apollo/client';\nimport React from 'react';\nimport PropTypes from 'prop-types';\nimport { getQuery } from '@blaze-cms/admin-ui-utils';\n\nimport ListingTable from '../ListingTable/ListingTable';\nimport { withContext } from '../../utils/hoc/withContext';\n\nconst EntityDataListing = ({ match, menuItems }) => {\n  const {\n    params: { entityIdentifier: identifier }\n  } = match;\n\n  const [[selectedMenuItem]] = menuItems\n    .map(([_, { items }]) => {\n      const item = items.filter(({ uri }) => uri.endsWith(`/${identifier}`));\n\n      return item.length ? item : null;\n    })\n    .filter(Boolean);\n\n  const { data: { getEntitySchemas = [] } = {} } = useQuery(getQuery('GET_ENTITY_SCHEMA'), {\n    variables: { identifier }\n  });\n\n  if (!getEntitySchemas.length) return '';\n\n  return <ListingTable entitySchema={getEntitySchemas[0]} selectedMenuItem={selectedMenuItem} />;\n};\n\nEntityDataListing.propTypes = {\n  match: PropTypes.object.isRequired,\n  menuItems: PropTypes.array.isRequired\n};\n\nexport default withContext(EntityDataListing);\n"],"mappings":";;;;;;;;;;;;;;;AAAA;AACA;AACA;AACA;AAEA;AACA;AAEA,IAAMA,iBAAiB,GAAG,SAApBA,iBAAiB,OAA6B;EAAA,IAAvBC,KAAK,QAALA,KAAK;IAAEC,SAAS,QAATA,SAAS;EAC3C,IAC8BC,UAAU,GACpCF,KAAK,CADPG,MAAM,CAAIC,gBAAgB;EAG5B,4BAA6BH,SAAS,CACnCI,GAAG,CAAC,iBAAoB;MAAA;QAAlBC,CAAC;QAAIC,KAAK,YAALA,KAAK;MACf,IAAMC,IAAI,GAAGD,KAAK,CAACE,MAAM,CAAC;QAAA,IAAGC,GAAG,SAAHA,GAAG;QAAA,OAAOA,GAAG,CAACC,QAAQ,YAAKT,UAAU,EAAG;MAAA,EAAC;MAEtE,OAAOM,IAAI,CAACI,MAAM,GAAGJ,IAAI,GAAG,IAAI;IAClC,CAAC,CAAC,CACDC,MAAM,CAACI,OAAO,CAAC;IAAA;IAAA;IANVC,gBAAgB;EAQxB,gBAAiD,IAAAC,gBAAQ,EAAC,IAAAC,sBAAQ,EAAC,mBAAmB,CAAC,EAAE;MACvFC,SAAS,EAAE;QAAEf,UAAU,EAAVA;MAAW;IAC1B,CAAC,CAAC;IAAA,2BAFMgB,IAAI;EAAZ,6CAA0C,CAAC,CAAC;EAA5C,2CAAgBC,gBAAgB;IAAhBA,gBAAgB,sCAAG,EAAE;EAIrC,IAAI,CAACA,gBAAgB,CAACP,MAAM,EAAE,OAAO,EAAE;EAEvC,oBAAO,gCAAC,wBAAY;IAAC,YAAY,EAAEO,gBAAgB,CAAC,CAAC,CAAE;IAAC,gBAAgB,EAAEL;EAAiB,EAAG;AAChG,CAAC;AAEDf,iBAAiB,CAACqB,SAAS,GAAG;EAC5BpB,KAAK,EAAEqB,qBAAS,CAACC,MAAM,CAACC,UAAU;EAClCtB,SAAS,EAAEoB,qBAAS,CAACG,KAAK,CAACD;AAC7B,CAAC;AAAC,eAEa,IAAAE,wBAAW,EAAC1B,iBAAiB,CAAC;AAAA"}
+{"version":3,"file":"EntityDataListing.js","names":["EntityDataListing","match","menuItems","identifier","params","entityIdentifier","map","_","items","item","filter","uri","endsWith","length","Boolean","selectedMenuItem","useQuery","getQuery","variables","data","getEntitySchemas","propTypes","PropTypes","object","isRequired","array","withContext"],"sources":["../../../src/components/EntityDataListing/EntityDataListing.js"],"sourcesContent":["import { useQuery } from '@apollo/client';\nimport React from 'react';\nimport PropTypes from 'prop-types';\nimport { getQuery } from '@blaze-cms/admin-ui-utils';\n\nimport ListingTable from '../ListingTable/ListingTable';\nimport { withContext } from '../../utils/hoc/withContext';\n\nconst EntityDataListing = ({ match, menuItems }) => {\n  const {\n    params: { entityIdentifier: identifier }\n  } = match;\n\n  const [[selectedMenuItem]] = menuItems\n    .map(([_, { items }]) => {\n      const item = items.filter(({ uri }) => uri.endsWith(`/${identifier}`));\n\n      return item.length ? item : null;\n    })\n    .filter(Boolean);\n\n  const { data: { getEntitySchemas = [] } = {} } = useQuery(getQuery('GET_ENTITY_SCHEMA'), {\n    variables: { identifier }\n  });\n\n  if (!getEntitySchemas.length) return '';\n\n  return <ListingTable entitySchema={getEntitySchemas[0]} selectedMenuItem={selectedMenuItem} />;\n};\n\nEntityDataListing.propTypes = {\n  match: PropTypes.object.isRequired,\n  menuItems: PropTypes.array.isRequired\n};\n\nexport default withContext(EntityDataListing);\n"],"mappings":";;;;;;;;;;;;;;;AAAA;AACA;AACA;AACA;AAEA;AACA;AAEA,IAAMA,iBAAiB,GAAG,SAApBA,iBAAiB,OAA6B;EAAA,IAAvBC,KAAK,QAALA,KAAK;IAAEC,SAAS,QAATA,SAAS;EAC3C,IAC8BC,UAAU,GACpCF,KAAK,CADPG,MAAM,CAAIC,gBAAgB;EAG5B,4BAA6BH,SAAS,CACnCI,GAAG,CAAC,iBAAoB;MAAA;QAAlBC,CAAC;QAAIC,KAAK,YAALA,KAAK;MACf,IAAMC,IAAI,GAAGD,KAAK,CAACE,MAAM,CAAC;QAAA,IAAGC,GAAG,SAAHA,GAAG;QAAA,OAAOA,GAAG,CAACC,QAAQ,YAAKT,UAAU,EAAG;MAAA,EAAC;MAEtE,OAAOM,IAAI,CAACI,MAAM,GAAGJ,IAAI,GAAG,IAAI;IAClC,CAAC,CAAC,CACDC,MAAM,CAACI,OAAO,CAAC;IAAA;IAAA;IANVC,gBAAgB;EAQxB,gBAAiD,IAAAC,gBAAQ,EAAC,IAAAC,sBAAQ,EAAC,mBAAmB,CAAC,EAAE;MACvFC,SAAS,EAAE;QAAEf,UAAU,EAAVA;MAAW;IAC1B,CAAC,CAAC;IAAA,2BAFMgB,IAAI;IAAA,8CAA8B,CAAC,CAAC;IAAA,wCAA5BC,gBAAgB;IAAhBA,gBAAgB,sCAAG,EAAE;EAIrC,IAAI,CAACA,gBAAgB,CAACP,MAAM,EAAE,OAAO,EAAE;EAEvC,oBAAO,gCAAC,wBAAY;IAAC,YAAY,EAAEO,gBAAgB,CAAC,CAAC,CAAE;IAAC,gBAAgB,EAAEL;EAAiB,EAAG;AAChG,CAAC;AAEDf,iBAAiB,CAACqB,SAAS,GAAG;EAC5BpB,KAAK,EAAEqB,qBAAS,CAACC,MAAM,CAACC,UAAU;EAClCtB,SAAS,EAAEoB,qBAAS,CAACG,KAAK,CAACD;AAC7B,CAAC;AAAC,eAEa,IAAAE,wBAAW,EAAC1B,iBAAiB,CAAC;AAAA"}

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

@@ -189,32 +189,31 @@ 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 query, _yield$client$query, _yield$client$query$d, _yield$client$query$d2, getEntityUrl;
+      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) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              query = (0, _adminUiUtils.getQuery)('GET_ENTITY_URL');
-              _context.next = 3;
-              return client.query({
-                query: query,
-                variables: {
-                  itemId: entity.id,
-                  itemEntity: schema.id,
-                  fullUrl: true
-                },
-                fetchPolicy: 'network-only'
-              });
-            case 3:
-              _yield$client$query = _context.sent;
-              _yield$client$query$d = _yield$client$query.data;
-              _yield$client$query$d = _yield$client$query$d === void 0 ? {} : _yield$client$query$d;
-              _yield$client$query$d2 = _yield$client$query$d.getEntityUrl, getEntityUrl = _yield$client$query$d2 === void 0 ? '' : _yield$client$query$d2;
-              return _context.abrupt("return", getEntityUrl);
-            case 8:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            query = (0, _adminUiUtils.getQuery)('GET_ENTITY_URL');
+            _context.next = 3;
+            return client.query({
+              query: query,
+              variables: {
+                itemId: entity.id,
+                itemEntity: schema.id,
+                fullUrl: true
+              },
+              fetchPolicy: 'network-only'
+            });
+          case 3:
+            _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 "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -251,94 +250,92 @@ var Entity = function Entity(_ref) {
     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) {
-        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;
-                break;
+        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;
+              break;
+            }
+            pageBuilderTemplateId = fieldValue;
+            client.writeQuery({
+              query: (0, _adminUiUtils.getQuery)('GET_PB_TEMPLATE_STATUS'),
+              data: {
+                pageBuilderTemplateSet: !!pageBuilderTemplateId,
+                pageBuilderTemplateId: pageBuilderTemplateId
               }
-              pageBuilderTemplateId = fieldValue;
-              client.writeQuery({
-                query: (0, _adminUiUtils.getQuery)('GET_PB_TEMPLATE_STATUS'),
-                data: {
-                  pageBuilderTemplateSet: !!pageBuilderTemplateId,
+            });
+            if (componentIsMounted.current) {
+              setPageBuilderTemplateStatus(false);
+            }
+            pageBuilder = updatedFormValues.filter(function (formValue) {
+              return formValue.id === _constants.PAGE_BUILDER_FIELD_ID;
+            });
+            if (!pageBuilderTemplateId) {
+              _context2.next = 14;
+              break;
+            }
+            _context2.next = 10;
+            return client.query({
+              query: (0, _adminUiUtils.getQuery)('MERGE_PB_TEMPLATE_CHANGES'),
+              variables: {
+                parent: {
+                  pageBuilder: pageBuilder[0].value,
                   pageBuilderTemplateId: pageBuilderTemplateId
-                }
-              });
-              if (componentIsMounted.current) {
-                setPageBuilderTemplateStatus(false);
-              }
-              pageBuilder = updatedFormValues.filter(function (formValue) {
-                return formValue.id === _constants.PAGE_BUILDER_FIELD_ID;
-              });
-              if (!pageBuilderTemplateId) {
-                _context2.next = 14;
-                break;
+                },
+                entityIdentifier: entityIdentifier
               }
-              _context2.next = 10;
-              return client.query({
-                query: (0, _adminUiUtils.getQuery)('MERGE_PB_TEMPLATE_CHANGES'),
-                variables: {
-                  parent: {
-                    pageBuilder: pageBuilder[0].value,
-                    pageBuilderTemplateId: pageBuilderTemplateId
-                  },
-                  entityIdentifier: entityIdentifier
+            });
+          case 10:
+            _yield$client$query2 = _context2.sent;
+            _yield$client$query2$ = _yield$client$query2.data;
+            data = _yield$client$query2$ === void 0 ? {} : _yield$client$query2$;
+            if (data && data.mergePageBuilderTemplateChanges) {
+              updatedFormValues = updatedFormValues.map(function (updatedFormValue) {
+                if (updatedFormValue.id === _constants.PAGE_BUILDER_FIELD_ID) {
+                  return _objectSpread(_objectSpread({}, updatedFormValue), {}, {
+                    value: data.mergePageBuilderTemplateChanges
+                  });
                 }
+                return updatedFormValue;
               });
-            case 10:
-              _yield$client$query2 = _context2.sent;
-              _yield$client$query2$ = _yield$client$query2.data;
-              data = _yield$client$query2$ === void 0 ? {} : _yield$client$query2$;
-              if (data && data.mergePageBuilderTemplateChanges) {
-                updatedFormValues = updatedFormValues.map(function (updatedFormValue) {
-                  if (updatedFormValue.id === _constants.PAGE_BUILDER_FIELD_ID) {
-                    return _objectSpread(_objectSpread({}, updatedFormValue), {}, {
-                      value: data.mergePageBuilderTemplateChanges
-                    });
-                  }
-                  return updatedFormValue;
-                });
-              }
-            case 14:
-              itemsToAdd = [];
-              if (formValues && formValues.length > updatedFormValues.length) {
-                [].concat((0, _toConsumableArray2["default"])(updatedFormValues), (0, _toConsumableArray2["default"])(formValues)).forEach(function (item) {
-                  var index = updatedFormValues.findIndex(function (value) {
-                    return value.id === item.id;
-                  });
-                  if (index === -1) {
-                    itemsToAdd.push(item);
-                  }
+            }
+          case 14:
+            itemsToAdd = [];
+            if (formValues && formValues.length > updatedFormValues.length) {
+              [].concat((0, _toConsumableArray2["default"])(updatedFormValues), (0, _toConsumableArray2["default"])(formValues)).forEach(function (item) {
+                var index = updatedFormValues.findIndex(function (value) {
+                  return value.id === item.id;
                 });
-              }
-              _fields$filter = fields.filter(function (_ref6) {
-                var id = _ref6.id;
-                return id === 'name';
-              }), _fields$filter2 = (0, _slicedToArray2["default"])(_fields$filter, 1), _fields$filter2$ = _fields$filter2[0], updatedEntity = _fields$filter2$ === void 0 ? null : _fields$filter2$;
-              updatedEntity && setPageTitle(updatedEntity.value);
-              isValidAndNewValueSet = isValid && isNewValueSet;
-              isNotValidOrNotNewValueSet = !isValid || !isNewValueSet;
-              if (componentIsMounted.current) {
-                setIsFormValid(isValid);
-              }
-              if (isValidAndNewValueSet && componentIsMounted.current) {
-                setIsSaveButtonAvailable(true);
-                setSaveButtonText(_constants.SAVE_BUTTON_TEXTS.save);
-              }
-              if (isNotValidOrNotNewValueSet && componentIsMounted.current) {
-                setIsSaveButtonAvailable(false);
-              }
-              if (componentIsMounted.current) {
-                setFormValues([].concat((0, _toConsumableArray2["default"])(updatedFormValues), itemsToAdd));
-              }
-            case 24:
-            case "end":
-              return _context2.stop();
-          }
+                if (index === -1) {
+                  itemsToAdd.push(item);
+                }
+              });
+            }
+            _fields$filter = fields.filter(function (_ref6) {
+              var id = _ref6.id;
+              return id === 'name';
+            }), _fields$filter2 = (0, _slicedToArray2["default"])(_fields$filter, 1), _fields$filter2$ = _fields$filter2[0], updatedEntity = _fields$filter2$ === void 0 ? null : _fields$filter2$;
+            updatedEntity && setPageTitle(updatedEntity.value);
+            isValidAndNewValueSet = isValid && isNewValueSet;
+            isNotValidOrNotNewValueSet = !isValid || !isNewValueSet;
+            if (componentIsMounted.current) {
+              setIsFormValid(isValid);
+            }
+            if (isValidAndNewValueSet && componentIsMounted.current) {
+              setIsSaveButtonAvailable(true);
+              setSaveButtonText(_constants.SAVE_BUTTON_TEXTS.save);
+            }
+            if (isNotValidOrNotNewValueSet && componentIsMounted.current) {
+              setIsSaveButtonAvailable(false);
+            }
+            if (componentIsMounted.current) {
+              setFormValues([].concat((0, _toConsumableArray2["default"])(updatedFormValues), itemsToAdd));
+            }
+          case 24:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }));
@@ -390,27 +387,25 @@ var Entity = function Entity(_ref) {
     var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       var id;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              id = formData.values.id;
-              if (componentIsMounted.current) {
-                setIsSaveButtonAvailable(false);
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            id = formData.values.id;
+            if (componentIsMounted.current) {
+              setIsSaveButtonAvailable(false);
+            }
+            _context3.next = 4;
+            return _actionsHandlers["default"]["delete"].submit({
+              entitySchema: entitySchema,
+              client: client,
+              parsedFormValues: {
+                id: id
               }
-              _context3.next = 4;
-              return _actionsHandlers["default"]["delete"].submit({
-                entitySchema: entitySchema,
-                client: client,
-                parsedFormValues: {
-                  id: id
-                }
-              }, addToast);
-            case 4:
-              history.push("/data-listing/".concat(entitySchema.id));
-            case 5:
-            case "end":
-              return _context3.stop();
-          }
+            }, addToast);
+          case 4:
+            history.push("/data-listing/".concat(entitySchema.id));
+          case 5:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3);
     }));
@@ -447,51 +442,49 @@ var Entity = function Entity(_ref) {
     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) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              textContent = _ref8.target.textContent;
-              isPublishButton = textContent === _constants.TEXT_CONTENT_TYPE;
-              isPublished = entityIsPublished === _constants.ENTITY_PUBLISHED;
-              isUnpublish = (0, _entity.checkFulfilConditions)(!isPublishButton, !isPublished);
-              if (!isUnpublish) {
-                _context4.next = 6;
-                break;
-              }
-              return _context4.abrupt("return", addToast(_constants.UNPUBLISHED_WARNING, {
-                appearance: 'warning',
-                autoDismiss: true
-              }));
-            case 6:
-              if (!(0, _entity.checkFulfilConditions)(isPublishButton, isSaveButtonAvailable)) {
-                _context4.next = 12;
-                break;
-              }
-              _context4.next = 9;
-              return onSubmit();
-            case 9:
-              savedPageMessage = _context4.sent;
-              if (!(savedPageMessage === _constants.ERROR)) {
-                _context4.next = 12;
-                break;
-              }
-              return _context4.abrupt("return", addToast("Content not published", {
-                appearance: _constants.ERROR,
-                autoDismiss: true
-              }));
-            case 12:
-              return _context4.abrupt("return", _actionsHandlers["default"].shared.triggerPublish({
-                entityData: entityData,
-                client: client,
-                setEntityIsPublish: setEntityIsPublish,
-                entitySchema: entitySchema,
-                textContent: textContent,
-                refetchRecord: refetchRecord
-              }, addToast));
-            case 13:
-            case "end":
-              return _context4.stop();
-          }
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            textContent = _ref8.target.textContent;
+            isPublishButton = textContent === _constants.TEXT_CONTENT_TYPE;
+            isPublished = entityIsPublished === _constants.ENTITY_PUBLISHED;
+            isUnpublish = (0, _entity.checkFulfilConditions)(!isPublishButton, !isPublished);
+            if (!isUnpublish) {
+              _context4.next = 6;
+              break;
+            }
+            return _context4.abrupt("return", addToast(_constants.UNPUBLISHED_WARNING, {
+              appearance: 'warning',
+              autoDismiss: true
+            }));
+          case 6:
+            if (!(0, _entity.checkFulfilConditions)(isPublishButton, isSaveButtonAvailable)) {
+              _context4.next = 12;
+              break;
+            }
+            _context4.next = 9;
+            return onSubmit();
+          case 9:
+            savedPageMessage = _context4.sent;
+            if (!(savedPageMessage === _constants.ERROR)) {
+              _context4.next = 12;
+              break;
+            }
+            return _context4.abrupt("return", addToast("Content not published", {
+              appearance: _constants.ERROR,
+              autoDismiss: true
+            }));
+          case 12:
+            return _context4.abrupt("return", _actionsHandlers["default"].shared.triggerPublish({
+              entityData: entityData,
+              client: client,
+              setEntityIsPublish: setEntityIsPublish,
+              entitySchema: entitySchema,
+              textContent: textContent,
+              refetchRecord: refetchRecord
+            }, addToast));
+          case 13:
+          case "end":
+            return _context4.stop();
         }
       }, _callee4);
     }));
@@ -510,21 +503,6 @@ var Entity = function Entity(_ref) {
   var showPageBuilderTabs = (schema === null || schema === void 0 ? void 0 : (_schema$interfaces = schema.interfaces) === null || _schema$interfaces === void 0 ? void 0 : _schema$interfaces.includes('page-builder/page-builder-template')) || (schema === null || schema === void 0 ? void 0 : (_schema$interfaces2 = schema.interfaces) === null || _schema$interfaces2 === void 0 ? void 0 : _schema$interfaces2.includes('page-builder/page-builder'));
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "page"
-  }, /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Prompt, {
-    when: hasToDisplayPrompt,
-    message: _constants.LEAVE_PAGE_MESSAGE
-  }), showModal && /*#__PURE__*/_react["default"].createElement(_admin.DeleteAction, {
-    onClose: setModalStatus,
-    deleteAction: onDelete,
-    itemName: formData.values.name
-  }), copyModalStatus && /*#__PURE__*/_react["default"].createElement(_admin.CopyDataFromAction, {
-    onClose: handleCopyDataFromClose,
-    copyAction: onCopy,
-    getFormData: getFormData
-  }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "row row--display-row"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "column column--three-quarters"
   }, /*#__PURE__*/_react["default"].createElement(_EntityHeader["default"], {
     entityData: entityData,
     entityIdentifier: entityIdentifier,
@@ -541,6 +519,23 @@ var Entity = function Entity(_ref) {
     onViewUrl: onViewUrlHandler,
     saveButtonText: saveButtonText
   }), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "page-wrapper__content"
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "tabs-wrapper tabs-wrapper__tab"
+  }, /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Prompt, {
+    when: hasToDisplayPrompt,
+    message: _constants.LEAVE_PAGE_MESSAGE
+  }), showModal && /*#__PURE__*/_react["default"].createElement(_admin.DeleteAction, {
+    onClose: setModalStatus,
+    deleteAction: onDelete,
+    itemName: formData.values.name
+  }), copyModalStatus && /*#__PURE__*/_react["default"].createElement(_admin.CopyDataFromAction, {
+    onClose: handleCopyDataFromClose,
+    copyAction: onCopy,
+    getFormData: getFormData
+  }), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "page__content--fixed"
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "page__content"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "content"
@@ -565,8 +560,8 @@ var Entity = function Entity(_ref) {
     updateCopyData: updateCopyData,
     formValues: formValues,
     isNewEntity: isNewEntity
-  }))))), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "column column--one-third"
+  })))))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "column column--one-third page-sidebar"
   }, showSideBarRelations && /*#__PURE__*/_react["default"].createElement(_SideBarRelations["default"], {
     entity: entity,
     formData: formData.values,