@blaze-cms/plugin-data-ui 0.145.1-alpha.1 → 0.146.0-alpha-q1-2026.0

package/CHANGELOG.md

@@ -3,24 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.145.1-alpha.1](https://github.com/thebyte9/blaze/compare/v0.145.1-alpha.0...v0.145.1-alpha.1) (2024-08-21)
+# [0.146.0-alpha-q1-2026.0](https://github.com/thebyte9/blaze/compare/v0.145.0...v0.146.0-alpha-q1-2026.0) (2026-02-03)
 
 
 ### Bug Fixes
 
+* add hasUnsavedChanges state to track actual user edits ([b2e507a](https://github.com/thebyte9/blaze/commit/b2e507a756d90990da603230b589defa8b7e12f4))
+* add necessary state for pop up ([fd37f1d](https://github.com/thebyte9/blaze/commit/fd37f1d45e27bae8ea4ab93ae1f52c3628be7d77))
+* admin listing search filter fixes ([#4827](https://github.com/thebyte9/blaze/issues/4827)) ([8f72d2c](https://github.com/thebyte9/blaze/commit/8f72d2c4e9bb1fa585e20dc899fae6120a3d644e))
+* correct tooltip position ([#4853](https://github.com/thebyte9/blaze/issues/4853)) ([f55356e](https://github.com/thebyte9/blaze/commit/f55356ed8900ba48e7320206ffa16ea57ca3cb2b))
+* fixed breaking tests, updated next to 14 ([fecb0e1](https://github.com/thebyte9/blaze/commit/fecb0e1d822bd69ebbaa084072a219f0fddd23f1))
+* get index from source data ([64425ec](https://github.com/thebyte9/blaze/commit/64425ec1b9e69385b45659f4b941631ae4c8b871))
 * group data table row fields correctly ([#4465](https://github.com/thebyte9/blaze/issues/4465)) ([a07a06f](https://github.com/thebyte9/blaze/commit/a07a06f4db5d0f1980afad70d28352641effea1e))
+* handle missing record error ([#4454](https://github.com/thebyte9/blaze/issues/4454)) ([f2ecf41](https://github.com/thebyte9/blaze/commit/f2ecf41962fd78b5808e6d7cd3714620697c4aaa))
+* linting fixed automatically ([73135b9](https://github.com/thebyte9/blaze/commit/73135b9b8b0d5407e2e1dfba42ab2381f290607f))
+* more test fixes ([a2a2f7a](https://github.com/thebyte9/blaze/commit/a2a2f7a650bb2c995660ba8e88e2d8f1c54586d7))
+* move tabs from entity to page builder ([#4601](https://github.com/thebyte9/blaze/issues/4601)) ([944fe19](https://github.com/thebyte9/blaze/commit/944fe19ce0a09d2f36604fcced44f0054dd5e8e5))
+* remove unused code ([95c24df](https://github.com/thebyte9/blaze/commit/95c24dfd3bb9068a5be69b40be1f3e93007ed850))
 * render page from the ur on initial load ([#4463](https://github.com/thebyte9/blaze/issues/4463)) ([8de5fbe](https://github.com/thebyte9/blaze/commit/8de5fbe969e9c2954f6484e044fdfec49d7050ae))
+* revert save text change ([#4833](https://github.com/thebyte9/blaze/issues/4833)) ([2cfc73b](https://github.com/thebyte9/blaze/commit/2cfc73bfc06dac1dc682f696ca30f932ac79e42b))
+* set missing ref on listing table to fix table header widths ([#4917](https://github.com/thebyte9/blaze/issues/4917)) ([d3d3cab](https://github.com/thebyte9/blaze/commit/d3d3cab771b8ab8c395fa071833b400e38b49f11))
+* show pagebuilder tabs when no components added ([#4844](https://github.com/thebyte9/blaze/issues/4844)) ([2cbb24d](https://github.com/thebyte9/blaze/commit/2cbb24df95b38d4c8f4575814daadebd74ba04d4))
+* table list cell style updates ([#4841](https://github.com/thebyte9/blaze/issues/4841)) ([e4fd643](https://github.com/thebyte9/blaze/commit/e4fd643300e710d2209763795280f5df84563806))
+* udpated yarn lock ([0cd4fa4](https://github.com/thebyte9/blaze/commit/0cd4fa4a185fca4b80b57e472badb771dd649ec2))
+* updated toaster version ([39f3dbd](https://github.com/thebyte9/blaze/commit/39f3dbd15833d45dd0d407b401eb825553135e01))
+* updated with dev ([90f545f](https://github.com/thebyte9/blaze/commit/90f545f1beabb35e26ba6fb2b45a7a0dfd072927))
+* updated with dev ([729bb6e](https://github.com/thebyte9/blaze/commit/729bb6ee7e87946081d51564a4ab45538f7be1e7))
+* updated with latest ([21cde6f](https://github.com/thebyte9/blaze/commit/21cde6f157c9279ed1eccb326870547821bc3dde))
+* use direct state value for toggling sidebar ([091a021](https://github.com/thebyte9/blaze/commit/091a0210bb312e06505d86582ee014a512317da0))
+* use isCreatePage to control navigation prompt display ([b56e0c7](https://github.com/thebyte9/blaze/commit/b56e0c7560308874554e3029a68878d1c2e8d948))
 
 
+### 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))
+* add env var to disable automatically appending blaze_debug param to admin links ([#4937](https://github.com/thebyte9/blaze/issues/4937)) ([b545d72](https://github.com/thebyte9/blaze/commit/b545d72112e311db3f73388487de8a9f284de84e))
+* add tooltip support to parent select in DynamicRelation component ([#4603](https://github.com/thebyte9/blaze/issues/4603)) ([7767b5d](https://github.com/thebyte9/blaze/commit/7767b5dd7641d4b0c2477cffe6c0be8f9e8aa9dd))
+* allow custom components in table columns ([#4482](https://github.com/thebyte9/blaze/issues/4482)) ([87098c9](https://github.com/thebyte9/blaze/commit/87098c93d9fd85adc2a2aa19f2e9a3db4402ae41))
+* get carousel images from record data ([#4341](https://github.com/thebyte9/blaze/issues/4341)) ([904e8a3](https://github.com/thebyte9/blaze/commit/904e8a319ab053ee470dbb4477c3865d3a5435df))
+* make right sidebar collapsible ([cd45684](https://github.com/thebyte9/blaze/commit/cd456849648a6fe674b4de7e5f994146d76066c9))
+* open frontend debug toolbar with a url param ([#4771](https://github.com/thebyte9/blaze/issues/4771)) ([37b8ea5](https://github.com/thebyte9/blaze/commit/37b8ea59a5ed4be0912465717adeb079fd6b3a89))
+* 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))
+* update info box properties to support tooltips ([#4701](https://github.com/thebyte9/blaze/issues/4701)) ([08ed041](https://github.com/thebyte9/blaze/commit/08ed041c9432f02e82e4846974cda65ae6c15a26))
+* updated react to 18 ([9335f84](https://github.com/thebyte9/blaze/commit/9335f8432b376494501abb9c3deef1ddaa9b35a8))
 
 
-## [0.145.1-alpha.0](https://github.com/thebyte9/blaze/compare/v0.145.0...v0.145.1-alpha.0) (2024-08-16)
-
-
-### Bug Fixes
+### Reverts
 
-* handle missing record error ([#4454](https://github.com/thebyte9/blaze/issues/4454)) ([f2ecf41](https://github.com/thebyte9/blaze/commit/f2ecf41962fd78b5808e6d7cd3714620697c4aaa))
+* Revert "chore: updating versions" ([1bbc7c2](https://github.com/thebyte9/blaze/commit/1bbc7c25a20903b8d517e1276b113b68976307d2))
 
 
 

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
 
@@ -93,3 +129,24 @@ import coreAdminPlugin from '@blaze-cms/plugin-admin-core-ui';
     }
   });
 ```
+
+## Environment Variables
+
+The following environment variables can be used to configure the behavior of this plugin:
+
+| Variable                        | Description                                                                      | Default |
+| ------------------------------- | -------------------------------------------------------------------------------- | ------- |
+| `BLAZE_DISABLE_PREVIEW`         | Disables the preview button functionality completely                             | `false` |
+| `BLAZE_DISABLE_URL_DEBUG_PARAM` | Disables adding "blaze_debug=1" parameter to preview and view URLs              | `false` |
+
+### Usage
+
+Set these variables in your environment to modify the plugin behavior:
+
+```bash
+# Disable preview functionality
+BLAZE_DISABLE_PREVIEW=true
+
+# Disable debug parameter in URLs
+BLAZE_DISABLE_URL_DEBUG_PARAM=true
+```

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    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;IAChD,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

@@ -44,10 +44,8 @@ var _admin = require("@blaze-cms/admin");
 var _toaster = require("@blaze-react/toaster");
 var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
 var _dataMappers = require("../utils/data-mappers");
-var _isFormEmpty = _interopRequireDefault(require("../utils/is-form-empty"));
 var _actionsHandlers = _interopRequireDefault(require("./actions-handlers"));
 var _SideBarRelations = _interopRequireDefault(require("./SideBarRelations"));
-var _Tabs = _interopRequireDefault(require("../../Tabs"));
 var _useCallbackDebounce = _interopRequireDefault(require("../../hooks/useCallbackDebounce"));
 var _constants = require("../../../constants");
 var _EntityHeader = _interopRequireDefault(require("./EntityHeader"));
@@ -58,11 +56,11 @@ 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, 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 && {}.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 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) {
-  var _schema$interfaces, _schema$interfaces2, _formData$values;
+  var _formData$values;
   var formData = _ref.formData,
     entity = _ref.entity,
     schema = _ref.schema,
@@ -74,43 +72,40 @@ var Entity = function Entity(_ref) {
     refetchRecord = _ref.refetchRecord;
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    setCurrentTabId = _useState2[1];
+    formValues = _useState2[0],
+    setFormValues = _useState2[1];
   var _useState3 = (0, _react.useState)(null),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    formValues = _useState4[0],
-    setFormValues = _useState4[1];
+    entitySchema = _useState4[0],
+    setEntitySchema = _useState4[1];
   var _useState5 = (0, _react.useState)(null),
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    entitySchema = _useState6[0],
-    setEntitySchema = _useState6[1];
+    entityData = _useState6[0],
+    setEntityData = _useState6[1];
   var _useState7 = (0, _react.useState)(null),
     _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
-    entityData = _useState8[0],
-    setEntityData = _useState8[1];
-  var _useState9 = (0, _react.useState)(null),
+    entityIdentifier = _useState8[0],
+    setEntityIdentifier = _useState8[1];
+  var _useState9 = (0, _react.useState)(''),
     _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
-    entityIdentifier = _useState10[0],
-    setEntityIdentifier = _useState10[1];
-  var _useState11 = (0, _react.useState)(''),
+    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 +114,50 @@ 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),
+    externalUpdateTime = _useState32[0],
+    setExternalUpdateTime = _useState32[1];
+  var _useState33 = (0, _react.useState)(false),
     _useState34 = (0, _slicedToArray2["default"])(_useState33, 2),
-    externalUpdateTime = _useState34[0],
-    setExternalUpdateTime = _useState34[1];
-  var isCreatePage = history.location.pathname.includes('create');
-  var _useState35 = (0, _react.useState)(isCreatePage),
+    suppressPrompt = _useState34[0],
+    setSuppressPrompt = _useState34[1];
+  var _useState35 = (0, _react.useState)(true),
     _useState36 = (0, _slicedToArray2["default"])(_useState35, 2),
-    isNewEntity = _useState36[0],
-    setIsNewEntity = _useState36[1];
+    isRightSidebarOpen = _useState36[0],
+    setIsRightSidebarOpen = _useState36[1];
+  var handleToggleRightSidebar = function handleToggleRightSidebar() {
+    return setIsRightSidebarOpen(!isRightSidebarOpen);
+  };
+  var isCreatePage = history.location.pathname.includes('create');
+  var _useState37 = (0, _react.useState)(isCreatePage),
+    _useState38 = (0, _slicedToArray2["default"])(_useState37, 2),
+    isNewEntity = _useState38[0],
+    setIsNewEntity = _useState38[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);
@@ -196,13 +202,14 @@ var Entity = function Entity(_ref) {
       client.writeQuery({
         query: (0, _adminUiUtils.getQuery)('GET_CURRENT_ENTITY'),
         data: {
-          currentEntity: schema.id
+          currentEntity: schema.id,
+          currentItemId: entity ? entity.id : null
         }
       });
     }
   }, [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) {
         while (1) switch (_context.prev = _context.next) {
@@ -261,8 +268,8 @@ var Entity = function Entity(_ref) {
     }
   };
   var onChangeFormValues = /*#__PURE__*/function () {
-    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;
+    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, isNotValidOrNotNewValueSet;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -332,12 +339,11 @@ var Entity = function Entity(_ref) {
               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) {
+            if (isValid && isNewValueSet && componentIsMounted.current) {
               setIsSaveButtonAvailable(true);
               setSaveButtonText(_constants.SAVE_BUTTON_TEXTS.save);
             }
@@ -347,7 +353,7 @@ var Entity = function Entity(_ref) {
             if (componentIsMounted.current) {
               setFormValues([].concat((0, _toConsumableArray2["default"])(updatedFormValues), itemsToAdd));
             }
-          case 24:
+          case 23:
           case "end":
             return _context2.stop();
         }
@@ -360,6 +366,9 @@ var Entity = function Entity(_ref) {
   var onSubmit = function onSubmit(event) {
     event && event.preventDefault();
     if (!isSaveButtonAvailable) return null;
+    if (isCreatePage) {
+      setSuppressPrompt(true);
+    }
     var parsedFormValues = (0, _reactFormBuilder.parseFormValues)(formValues);
     var updatedFormValues = newUpdatedDate ? _objectSpread(_objectSpread({}, formData.values), {}, {
       update: newUpdatedDate
@@ -398,7 +407,7 @@ 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) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -453,7 +462,7 @@ 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) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -511,10 +520,8 @@ var Entity = function Entity(_ref) {
     return (0, _entity.onViewUrlClick)(getFullUrl);
   } : onViewUrl;
   var pageName = formData && formData.values && formData.values.name;
-  var hasNewFormValues = (0, _entity.checkFulfilConditions)(isNewEntity, !(0, _isFormEmpty["default"])(formValues));
-  var hasToDisplayPrompt = isSaveButtonAvailable || hasNewFormValues;
+  var hasToDisplayPrompt = isSaveButtonAvailable && !suppressPrompt;
   var showSideBarRelations = (0, _entity.checkFulfilConditions)(schema, formData);
-  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(_RecordEditContext.RecordEditContextProvider, {
     value: {
       externalUpdateTime: externalUpdateTime,
@@ -555,7 +562,7 @@ var Entity = function Entity(_ref) {
     copyAction: onCopy,
     getFormData: getFormData
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "page__content--fixed"
+    className: "page__content".concat(!isRightSidebarOpen ? ' right-sidebar-collapsed' : '')
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "page__content"
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -567,18 +574,7 @@ var Entity = function Entity(_ref) {
   }), /*#__PURE__*/_react["default"].createElement(_InfoBoxes["default"], {
     id: entity.id,
     schema: schema
-  }), /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
-    enabled: showPageBuilderTabs,
-    onTabChange: function onTabChange(tabId) {
-      client.writeQuery({
-        query: _adminUiUtils.GET_CURRENT_TAB_ID,
-        data: {
-          currentTabId: tabId
-        }
-      });
-      setCurrentTabId(tabId);
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_reactFormBuilder.FormBuilder, {
+  }), /*#__PURE__*/_react["default"].createElement(_reactFormBuilder.FormBuilder, {
     getIsFormValid: setIsFormValid,
     getFormValues: getFormValues,
     schema: schema,
@@ -589,17 +585,19 @@ var Entity = function Entity(_ref) {
     formValues: formValues,
     isNewEntity: isNewEntity,
     onExternalUpdate: setExternalUpdateTime
-  })), /*#__PURE__*/_react["default"].createElement(_pluginRenderHooksUi.RenderHook, {
+  }), /*#__PURE__*/_react["default"].createElement(_pluginRenderHooksUi.RenderHook, {
     hookKey: "entity:".concat(action, ":main:bottom"),
     entity: entity,
     schema: schema
   }))))), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "column column--one-third page-sidebar page-sidebar--relations"
+    className: "column column--one-third page-sidebar page-sidebar--relations".concat(!isRightSidebarOpen ? ' sidebar--collapsed' : '')
   }, showSideBarRelations && /*#__PURE__*/_react["default"].createElement(_SideBarRelations["default"], {
     entity: entity,
     formData: formData.values,
     schema: schema,
-    onChange: onChangeSideBarRelations
+    onChange: onChangeSideBarRelations,
+    isOpen: isRightSidebarOpen,
+    onToggle: handleToggleRightSidebar
   })))));
 };
 Entity.propTypes = {