@blaze-cms/plugin-data-ui 0.134.0-project-admin-customisations.0 → 0.134.0

package/lib-es/index.js

@@ -6,7 +6,15 @@ import getAddContentMenuItems from './utils/add-content-menu-items';
 const EntityDataListing = React.lazy(() => import( /* webpackChunkName: 'EntityDataListing' */'./components/EntityDataListing'));
 const EntityManager = React.lazy(() => import( /* webpackChunkName: 'EntityManager' */'./components/EntityManager'));
 export default async function load(app) {
-  app.events.once('admin:menu:config:load', getAddContentMenuItems(app));
+  // To load different plugin information into menu
+  const sectionKey = 'content';
+  app.events.once('load:menu-section', addSection => {
+    addSection(sectionKey, {
+      header: 'content',
+      order: 100
+    });
+  });
+  app.events.once('load:menu-items', getAddContentMenuItems(app, sectionKey));
   app.events.once('load:custom:field:type', addFieldType => {
     Object.keys(formFieldTypes).forEach(type => {
       addFieldType({

package/lib-es/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["getFormBuilderLookup","formFieldTypes","React","pkg","DATA_LISTING_PREFIX","PLUGIN_NAME","getAddContentMenuItems","EntityDataListing","lazy","EntityManager","load","app","events","once","addFieldType","Object","keys","forEach","type","component","emitAsync","entityDataListingRoute","path","key","exact","editEntityRoute","addEntityRoute","addRoute","name","version","pluginName"],"sources":["../src/index.js"],"sourcesContent":["import { getFormBuilderLookup, formFieldTypes } from '@blaze-cms/react-form-builder';\nimport React from 'react';\nimport pkg from '../package.json';\nimport { DATA_LISTING_PREFIX, PLUGIN_NAME } from './constants';\nimport getAddContentMenuItems from './utils/add-content-menu-items';\n\nconst EntityDataListing = React.lazy(() =>\n  import(/* webpackChunkName: 'EntityDataListing' */ './components/EntityDataListing')\n);\nconst EntityManager = React.lazy(() =>\n  import(/* webpackChunkName: 'EntityManager' */ './components/EntityManager')\n);\n\nexport default async function load(app) {\n  app.events.once('admin:menu:config:load', getAddContentMenuItems(app));\n\n  app.events.once('load:custom:field:type', addFieldType => {\n    Object.keys(formFieldTypes).forEach(type => {\n      addFieldType({ type, component: formFieldTypes[type] });\n    });\n  });\n\n  app.events.once('plugin:data-ui:load:loaded', async () => {\n    await app.events.emitAsync('load:custom:field:type', getFormBuilderLookup.addFieldType);\n  });\n\n  const entityDataListingRoute = {\n    path: `${DATA_LISTING_PREFIX}/:entityIdentifier`,\n    key: 'entityDataListing',\n    component: EntityDataListing,\n    exact: true\n  };\n\n  const editEntityRoute = {\n    path: `${DATA_LISTING_PREFIX}/:entityIdentifier/:action/:id`,\n    key: 'editEntity',\n    component: EntityManager,\n    exact: true\n  };\n\n  const addEntityRoute = {\n    path: `${DATA_LISTING_PREFIX}/:entityIdentifier/:action`,\n    key: 'createEntity',\n    component: EntityManager,\n    exact: true\n  };\n\n  app.addRoute(entityDataListingRoute);\n  app.addRoute(editEntityRoute);\n  app.addRoute(addEntityRoute);\n\n  return {\n    name: PLUGIN_NAME,\n    version: pkg.version\n  };\n}\n\nload.pluginName = PLUGIN_NAME;\n"],"mappings":"AAAA,SAASA,oBAAoB,EAAEC,cAAc,QAAQ,+BAA+B;AACpF,OAAOC,KAAK,MAAM,OAAO;AACzB,OAAOC,GAAG,MAAM,iBAAiB;AACjC,SAASC,mBAAmB,EAAEC,WAAW,QAAQ,aAAa;AAC9D,OAAOC,sBAAsB,MAAM,gCAAgC;AAEnE,MAAMC,iBAAiB,GAAGL,KAAK,CAACM,IAAI,CAAC,MACnC,MAAM,EAAC,2CAA4C,gCAAgC,CACrF,CAAC;AACD,MAAMC,aAAa,GAAGP,KAAK,CAACM,IAAI,CAAC,MAC/B,MAAM,EAAC,uCAAwC,4BAA4B,CAC7E,CAAC;AAED,eAAe,eAAeE,IAAIA,CAACC,GAAG,EAAE;EACtCA,GAAG,CAACC,MAAM,CAACC,IAAI,CAAC,wBAAwB,EAAEP,sBAAsB,CAACK,GAAG,CAAC,CAAC;EAEtEA,GAAG,CAACC,MAAM,CAACC,IAAI,CAAC,wBAAwB,EAAEC,YAAY,IAAI;IACxDC,MAAM,CAACC,IAAI,CAACf,cAAc,CAAC,CAACgB,OAAO,CAACC,IAAI,IAAI;MAC1CJ,YAAY,CAAC;QAAEI,IAAI;QAAEC,SAAS,EAAElB,cAAc,CAACiB,IAAI;MAAE,CAAC,CAAC;IACzD,CAAC,CAAC;EACJ,CAAC,CAAC;EAEFP,GAAG,CAACC,MAAM,CAACC,IAAI,CAAC,4BAA4B,EAAE,YAAY;IACxD,MAAMF,GAAG,CAACC,MAAM,CAACQ,SAAS,CAAC,wBAAwB,EAAEpB,oBAAoB,CAACc,YAAY,CAAC;EACzF,CAAC,CAAC;EAEF,MAAMO,sBAAsB,GAAG;IAC7BC,IAAI,EAAG,GAAElB,mBAAoB,oBAAmB;IAChDmB,GAAG,EAAE,mBAAmB;IACxBJ,SAAS,EAAEZ,iBAAiB;IAC5BiB,KAAK,EAAE;EACT,CAAC;EAED,MAAMC,eAAe,GAAG;IACtBH,IAAI,EAAG,GAAElB,mBAAoB,gCAA+B;IAC5DmB,GAAG,EAAE,YAAY;IACjBJ,SAAS,EAAEV,aAAa;IACxBe,KAAK,EAAE;EACT,CAAC;EAED,MAAME,cAAc,GAAG;IACrBJ,IAAI,EAAG,GAAElB,mBAAoB,4BAA2B;IACxDmB,GAAG,EAAE,cAAc;IACnBJ,SAAS,EAAEV,aAAa;IACxBe,KAAK,EAAE;EACT,CAAC;EAEDb,GAAG,CAACgB,QAAQ,CAACN,sBAAsB,CAAC;EACpCV,GAAG,CAACgB,QAAQ,CAACF,eAAe,CAAC;EAC7Bd,GAAG,CAACgB,QAAQ,CAACD,cAAc,CAAC;EAE5B,OAAO;IACLE,IAAI,EAAEvB,WAAW;IACjBwB,OAAO,EAAE1B,GAAG,CAAC0B;EACf,CAAC;AACH;AAEAnB,IAAI,CAACoB,UAAU,GAAGzB,WAAW"}
+{"version":3,"file":"index.js","names":["getFormBuilderLookup","formFieldTypes","React","pkg","DATA_LISTING_PREFIX","PLUGIN_NAME","getAddContentMenuItems","EntityDataListing","lazy","EntityManager","load","app","sectionKey","events","once","addSection","header","order","addFieldType","Object","keys","forEach","type","component","emitAsync","entityDataListingRoute","path","key","exact","editEntityRoute","addEntityRoute","addRoute","name","version","pluginName"],"sources":["../src/index.js"],"sourcesContent":["import { getFormBuilderLookup, formFieldTypes } from '@blaze-cms/react-form-builder';\nimport React from 'react';\nimport pkg from '../package.json';\nimport { DATA_LISTING_PREFIX, PLUGIN_NAME } from './constants';\nimport getAddContentMenuItems from './utils/add-content-menu-items';\n\nconst EntityDataListing = React.lazy(() =>\n  import(/* webpackChunkName: 'EntityDataListing' */ './components/EntityDataListing')\n);\nconst EntityManager = React.lazy(() =>\n  import(/* webpackChunkName: 'EntityManager' */ './components/EntityManager')\n);\n\nexport default async function load(app) {\n  // To load different plugin information into menu\n  const sectionKey = 'content';\n\n  app.events.once('load:menu-section', addSection => {\n    addSection(sectionKey, { header: 'content', order: 100 });\n  });\n\n  app.events.once('load:menu-items', getAddContentMenuItems(app, sectionKey));\n\n  app.events.once('load:custom:field:type', addFieldType => {\n    Object.keys(formFieldTypes).forEach(type => {\n      addFieldType({ type, component: formFieldTypes[type] });\n    });\n  });\n\n  app.events.once('plugin:data-ui:load:loaded', async () => {\n    await app.events.emitAsync('load:custom:field:type', getFormBuilderLookup.addFieldType);\n  });\n\n  const entityDataListingRoute = {\n    path: `${DATA_LISTING_PREFIX}/:entityIdentifier`,\n    key: 'entityDataListing',\n    component: EntityDataListing,\n    exact: true\n  };\n\n  const editEntityRoute = {\n    path: `${DATA_LISTING_PREFIX}/:entityIdentifier/:action/:id`,\n    key: 'editEntity',\n    component: EntityManager,\n    exact: true\n  };\n\n  const addEntityRoute = {\n    path: `${DATA_LISTING_PREFIX}/:entityIdentifier/:action`,\n    key: 'createEntity',\n    component: EntityManager,\n    exact: true\n  };\n\n  app.addRoute(entityDataListingRoute);\n  app.addRoute(editEntityRoute);\n  app.addRoute(addEntityRoute);\n\n  return {\n    name: PLUGIN_NAME,\n    version: pkg.version\n  };\n}\n\nload.pluginName = PLUGIN_NAME;\n"],"mappings":"AAAA,SAASA,oBAAoB,EAAEC,cAAc,QAAQ,+BAA+B;AACpF,OAAOC,KAAK,MAAM,OAAO;AACzB,OAAOC,GAAG,MAAM,iBAAiB;AACjC,SAASC,mBAAmB,EAAEC,WAAW,QAAQ,aAAa;AAC9D,OAAOC,sBAAsB,MAAM,gCAAgC;AAEnE,MAAMC,iBAAiB,GAAGL,KAAK,CAACM,IAAI,CAAC,MACnC,MAAM,EAAC,2CAA4C,gCAAgC,CACrF,CAAC;AACD,MAAMC,aAAa,GAAGP,KAAK,CAACM,IAAI,CAAC,MAC/B,MAAM,EAAC,uCAAwC,4BAA4B,CAC7E,CAAC;AAED,eAAe,eAAeE,IAAIA,CAACC,GAAG,EAAE;EACtC;EACA,MAAMC,UAAU,GAAG,SAAS;EAE5BD,GAAG,CAACE,MAAM,CAACC,IAAI,CAAC,mBAAmB,EAAEC,UAAU,IAAI;IACjDA,UAAU,CAACH,UAAU,EAAE;MAAEI,MAAM,EAAE,SAAS;MAAEC,KAAK,EAAE;IAAI,CAAC,CAAC;EAC3D,CAAC,CAAC;EAEFN,GAAG,CAACE,MAAM,CAACC,IAAI,CAAC,iBAAiB,EAAER,sBAAsB,CAACK,GAAG,EAAEC,UAAU,CAAC,CAAC;EAE3ED,GAAG,CAACE,MAAM,CAACC,IAAI,CAAC,wBAAwB,EAAEI,YAAY,IAAI;IACxDC,MAAM,CAACC,IAAI,CAACnB,cAAc,CAAC,CAACoB,OAAO,CAACC,IAAI,IAAI;MAC1CJ,YAAY,CAAC;QAAEI,IAAI;QAAEC,SAAS,EAAEtB,cAAc,CAACqB,IAAI;MAAE,CAAC,CAAC;IACzD,CAAC,CAAC;EACJ,CAAC,CAAC;EAEFX,GAAG,CAACE,MAAM,CAACC,IAAI,CAAC,4BAA4B,EAAE,YAAY;IACxD,MAAMH,GAAG,CAACE,MAAM,CAACW,SAAS,CAAC,wBAAwB,EAAExB,oBAAoB,CAACkB,YAAY,CAAC;EACzF,CAAC,CAAC;EAEF,MAAMO,sBAAsB,GAAG;IAC7BC,IAAI,EAAG,GAAEtB,mBAAoB,oBAAmB;IAChDuB,GAAG,EAAE,mBAAmB;IACxBJ,SAAS,EAAEhB,iBAAiB;IAC5BqB,KAAK,EAAE;EACT,CAAC;EAED,MAAMC,eAAe,GAAG;IACtBH,IAAI,EAAG,GAAEtB,mBAAoB,gCAA+B;IAC5DuB,GAAG,EAAE,YAAY;IACjBJ,SAAS,EAAEd,aAAa;IACxBmB,KAAK,EAAE;EACT,CAAC;EAED,MAAME,cAAc,GAAG;IACrBJ,IAAI,EAAG,GAAEtB,mBAAoB,4BAA2B;IACxDuB,GAAG,EAAE,cAAc;IACnBJ,SAAS,EAAEd,aAAa;IACxBmB,KAAK,EAAE;EACT,CAAC;EAEDjB,GAAG,CAACoB,QAAQ,CAACN,sBAAsB,CAAC;EACpCd,GAAG,CAACoB,QAAQ,CAACF,eAAe,CAAC;EAC7BlB,GAAG,CAACoB,QAAQ,CAACD,cAAc,CAAC;EAE5B,OAAO;IACLE,IAAI,EAAE3B,WAAW;IACjB4B,OAAO,EAAE9B,GAAG,CAAC8B;EACf,CAAC;AACH;AAEAvB,IAAI,CAACwB,UAAU,GAAG7B,WAAW"}

package/lib-es/utils/add-content-menu-items.js

@@ -2,10 +2,8 @@ import { getQuery } from '@blaze-cms/admin-ui-utils';
 const {
   MENU_PERMISSIONS
 } = require('../constants');
-function getAddContentMenuItems(app) {
-  return async ({
-    addConfig
-  }) => {
+function getAddContentMenuItems(app, sectionKey) {
+  return async addItem => {
     const client = app.getClient();
     const {
       data: {
@@ -18,57 +16,15 @@ function getAddContentMenuItems(app) {
         canDoActions: MENU_PERMISSIONS
       }
     });
-    if (!getEntitySchemas || !getEntitySchemas.length) return; // no items so don't add section
-
-    const menuItems = {};
-    const sectionMenuItems = {
-      content: {}
-    };
-    getEntitySchemas.forEach(({
-      id,
-      displayName,
-      displayProperties
-    }) => {
-      if (!displayProperties) return null;
-      const {
-        adminMenu: {
-          sectionKey = 'content'
-        } = {}
-      } = displayProperties;
-      const sectionItems = sectionMenuItems[sectionKey] || {};
-      sectionItems[id] = {
-        label: displayName,
-        uri: `/data-listing/${id}`
-      };
-      sectionMenuItems[sectionKey] = sectionItems;
-    });
-    const menuConfig = {
-      main: {
-        items: {
-          content: {
-            label: 'Content',
-            loadOpen: true,
-            order: 10,
-            items: menuItems
-          }
-        }
-      }
-    };
-    Object.entries(sectionMenuItems).forEach(([sectionKey, sectionItems]) => {
-      const sectionConfig = menuConfig.main.items[sectionKey] || {};
-      sectionConfig.items = sectionItems;
-      menuConfig.main.items[sectionKey] = sectionConfig;
-    });
     getEntitySchemas.forEach(({
       id,
       displayName
     }) => {
-      menuItems[id] = {
-        label: displayName,
+      addItem({
+        name: displayName,
         uri: `/data-listing/${id}`
-      };
+      }, sectionKey);
     });
-    addConfig(menuConfig);
   };
 }
 export default getAddContentMenuItems;

package/lib-es/utils/add-content-menu-items.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-content-menu-items.js","names":["getQuery","MENU_PERMISSIONS","require","getAddContentMenuItems","app","addConfig","client","getClient","data","getEntitySchemas","query","variables","canDoActions","length","menuItems","sectionMenuItems","content","forEach","id","displayName","displayProperties","adminMenu","sectionKey","sectionItems","label","uri","menuConfig","main","items","loadOpen","order","Object","entries","sectionConfig"],"sources":["../../src/utils/add-content-menu-items.js"],"sourcesContent":["import { getQuery } from '@blaze-cms/admin-ui-utils';\n\nconst { MENU_PERMISSIONS } = require('../constants');\n\nfunction getAddContentMenuItems(app) {\n  return async ({ addConfig }) => {\n    const client = app.getClient();\n    const {\n      data: { getEntitySchemas }\n    } = await client.query({\n      query: getQuery('GET_USER_EDITABLE_ENTITIES'),\n      variables: {\n        // only return entities that the current user can do the following actions on\n        canDoActions: MENU_PERMISSIONS\n      }\n    });\n\n    if (!getEntitySchemas || !getEntitySchemas.length) return; // no items so don't add section\n\n    const menuItems = {};\n    const sectionMenuItems = { content: {} };\n\n    getEntitySchemas.forEach(({ id, displayName, displayProperties }) => {\n      if (!displayProperties) return null;\n\n      const { adminMenu: { sectionKey = 'content' } = {} } = displayProperties;\n      const sectionItems = sectionMenuItems[sectionKey] || {};\n      sectionItems[id] = {\n        label: displayName,\n        uri: `/data-listing/${id}`\n      };\n      sectionMenuItems[sectionKey] = sectionItems;\n    });\n\n    const menuConfig = {\n      main: {\n        items: {\n          content: {\n            label: 'Content',\n            loadOpen: true,\n            order: 10,\n            items: menuItems\n          }\n        }\n      }\n    };\n\n    Object.entries(sectionMenuItems).forEach(([sectionKey, sectionItems]) => {\n      const sectionConfig = menuConfig.main.items[sectionKey] || {};\n      sectionConfig.items = sectionItems;\n      menuConfig.main.items[sectionKey] = sectionConfig;\n    });\n\n    getEntitySchemas.forEach(({ id, displayName }) => {\n      menuItems[id] = {\n        label: displayName,\n        uri: `/data-listing/${id}`\n      };\n    });\n\n    addConfig(menuConfig);\n  };\n}\n\nexport default getAddContentMenuItems;\n"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,2BAA2B;AAEpD,MAAM;EAAEC;AAAiB,CAAC,GAAGC,OAAO,CAAC,cAAc,CAAC;AAEpD,SAASC,sBAAsBA,CAACC,GAAG,EAAE;EACnC,OAAO,OAAO;IAAEC;EAAU,CAAC,KAAK;IAC9B,MAAMC,MAAM,GAAGF,GAAG,CAACG,SAAS,CAAC,CAAC;IAC9B,MAAM;MACJC,IAAI,EAAE;QAAEC;MAAiB;IAC3B,CAAC,GAAG,MAAMH,MAAM,CAACI,KAAK,CAAC;MACrBA,KAAK,EAAEV,QAAQ,CAAC,4BAA4B,CAAC;MAC7CW,SAAS,EAAE;QACT;QACAC,YAAY,EAAEX;MAChB;IACF,CAAC,CAAC;IAEF,IAAI,CAACQ,gBAAgB,IAAI,CAACA,gBAAgB,CAACI,MAAM,EAAE,OAAO,CAAC;;IAE3D,MAAMC,SAAS,GAAG,CAAC,CAAC;IACpB,MAAMC,gBAAgB,GAAG;MAAEC,OAAO,EAAE,CAAC;IAAE,CAAC;IAExCP,gBAAgB,CAACQ,OAAO,CAAC,CAAC;MAAEC,EAAE;MAAEC,WAAW;MAAEC;IAAkB,CAAC,KAAK;MACnE,IAAI,CAACA,iBAAiB,EAAE,OAAO,IAAI;MAEnC,MAAM;QAAEC,SAAS,EAAE;UAAEC,UAAU,GAAG;QAAU,CAAC,GAAG,CAAC;MAAE,CAAC,GAAGF,iBAAiB;MACxE,MAAMG,YAAY,GAAGR,gBAAgB,CAACO,UAAU,CAAC,IAAI,CAAC,CAAC;MACvDC,YAAY,CAACL,EAAE,CAAC,GAAG;QACjBM,KAAK,EAAEL,WAAW;QAClBM,GAAG,EAAG,iBAAgBP,EAAG;MAC3B,CAAC;MACDH,gBAAgB,CAACO,UAAU,CAAC,GAAGC,YAAY;IAC7C,CAAC,CAAC;IAEF,MAAMG,UAAU,GAAG;MACjBC,IAAI,EAAE;QACJC,KAAK,EAAE;UACLZ,OAAO,EAAE;YACPQ,KAAK,EAAE,SAAS;YAChBK,QAAQ,EAAE,IAAI;YACdC,KAAK,EAAE,EAAE;YACTF,KAAK,EAAEd;UACT;QACF;MACF;IACF,CAAC;IAEDiB,MAAM,CAACC,OAAO,CAACjB,gBAAgB,CAAC,CAACE,OAAO,CAAC,CAAC,CAACK,UAAU,EAAEC,YAAY,CAAC,KAAK;MACvE,MAAMU,aAAa,GAAGP,UAAU,CAACC,IAAI,CAACC,KAAK,CAACN,UAAU,CAAC,IAAI,CAAC,CAAC;MAC7DW,aAAa,CAACL,KAAK,GAAGL,YAAY;MAClCG,UAAU,CAACC,IAAI,CAACC,KAAK,CAACN,UAAU,CAAC,GAAGW,aAAa;IACnD,CAAC,CAAC;IAEFxB,gBAAgB,CAACQ,OAAO,CAAC,CAAC;MAAEC,EAAE;MAAEC;IAAY,CAAC,KAAK;MAChDL,SAAS,CAACI,EAAE,CAAC,GAAG;QACdM,KAAK,EAAEL,WAAW;QAClBM,GAAG,EAAG,iBAAgBP,EAAG;MAC3B,CAAC;IACH,CAAC,CAAC;IAEFb,SAAS,CAACqB,UAAU,CAAC;EACvB,CAAC;AACH;AAEA,eAAevB,sBAAsB"}
+{"version":3,"file":"add-content-menu-items.js","names":["getQuery","MENU_PERMISSIONS","require","getAddContentMenuItems","app","sectionKey","addItem","client","getClient","data","getEntitySchemas","query","variables","canDoActions","forEach","id","displayName","name","uri"],"sources":["../../src/utils/add-content-menu-items.js"],"sourcesContent":["import { getQuery } from '@blaze-cms/admin-ui-utils';\n\nconst { MENU_PERMISSIONS } = require('../constants');\n\nfunction getAddContentMenuItems(app, sectionKey) {\n  return async addItem => {\n    const client = app.getClient();\n    const {\n      data: { getEntitySchemas }\n    } = await client.query({\n      query: getQuery('GET_USER_EDITABLE_ENTITIES'),\n      variables: {\n        // only return entities that the current user can do the following actions on\n        canDoActions: MENU_PERMISSIONS\n      }\n    });\n    getEntitySchemas.forEach(({ id, displayName }) => {\n      addItem({ name: displayName, uri: `/data-listing/${id}` }, sectionKey);\n    });\n  };\n}\n\nexport default getAddContentMenuItems;\n"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,2BAA2B;AAEpD,MAAM;EAAEC;AAAiB,CAAC,GAAGC,OAAO,CAAC,cAAc,CAAC;AAEpD,SAASC,sBAAsBA,CAACC,GAAG,EAAEC,UAAU,EAAE;EAC/C,OAAO,MAAMC,OAAO,IAAI;IACtB,MAAMC,MAAM,GAAGH,GAAG,CAACI,SAAS,CAAC,CAAC;IAC9B,MAAM;MACJC,IAAI,EAAE;QAAEC;MAAiB;IAC3B,CAAC,GAAG,MAAMH,MAAM,CAACI,KAAK,CAAC;MACrBA,KAAK,EAAEX,QAAQ,CAAC,4BAA4B,CAAC;MAC7CY,SAAS,EAAE;QACT;QACAC,YAAY,EAAEZ;MAChB;IACF,CAAC,CAAC;IACFS,gBAAgB,CAACI,OAAO,CAAC,CAAC;MAAEC,EAAE;MAAEC;IAAY,CAAC,KAAK;MAChDV,OAAO,CAAC;QAAEW,IAAI,EAAED,WAAW;QAAEE,GAAG,EAAG,iBAAgBH,EAAG;MAAE,CAAC,EAAEV,UAAU,CAAC;IACxE,CAAC,CAAC;EACJ,CAAC;AACH;AAEA,eAAeF,sBAAsB"}

package/lib-es/utils/build-listing-query.js

@@ -1,18 +1,9 @@
 import { gql } from '@apollo/client';
 import { BlazeError } from '@blaze-cms/core-errors';
-import { getDynamicQuery } from '@blaze-cms/admin-ui-utils';
-const buildAdminSearchQuery = entitySchema => {
-  const {
-    listingProperties = []
-  } = entitySchema || {};
-  const parsedProperties = `id, ${listingProperties.join(' ') || 'id name'}`;
-  return getDynamicQuery('ADMIN_SEARCH')([entitySchema], parsedProperties, true);
-};
-function buildListingQuery(entitySchema, isSearchQuery) {
+function buildListingQuery(entitySchema) {
   if (!entitySchema.actions || !entitySchema.actions.getAll || !entitySchema.listingProperties) {
     throw new BlazeError('Listing query requires getAll action and listingProperties from entity schema');
   }
-  if (isSearchQuery) return buildAdminSearchQuery(entitySchema);
   const sortType = entitySchema.actions.getAll[0].toUpperCase() + entitySchema.actions.getAll.substr(1);
   return gql`
     query ${entitySchema.actions.getAll}($where: JSON, $limit: Int, $offset:Int, $sort: [${sortType}SortItem]) {

package/lib-es/utils/build-listing-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-listing-query.js","names":["gql","BlazeError","getDynamicQuery","buildAdminSearchQuery","entitySchema","listingProperties","parsedProperties","join","buildListingQuery","isSearchQuery","actions","getAll","sortType","toUpperCase","substr"],"sources":["../../src/utils/build-listing-query.js"],"sourcesContent":["import { gql } from '@apollo/client';\nimport { BlazeError } from '@blaze-cms/core-errors';\nimport { getDynamicQuery } from '@blaze-cms/admin-ui-utils';\n\nconst buildAdminSearchQuery = entitySchema => {\n  const { listingProperties = [] } = entitySchema || {};\n  const parsedProperties = `id, ${listingProperties.join(' ') || 'id name'}`;\n\n  return getDynamicQuery('ADMIN_SEARCH')([entitySchema], parsedProperties, true);\n};\n\nfunction buildListingQuery(entitySchema, isSearchQuery) {\n  if (!entitySchema.actions || !entitySchema.actions.getAll || !entitySchema.listingProperties) {\n    throw new BlazeError(\n      'Listing query requires getAll action and listingProperties from entity schema'\n    );\n  }\n\n  if (isSearchQuery) return buildAdminSearchQuery(entitySchema);\n\n  const sortType =\n    entitySchema.actions.getAll[0].toUpperCase() + entitySchema.actions.getAll.substr(1);\n\n  return gql`\n    query ${\n      entitySchema.actions.getAll\n    }($where: JSON, $limit: Int, $offset:Int, $sort: [${sortType}SortItem]) {\n      listingData: ${\n        entitySchema.actions.getAll\n      }(where: $where, limit: $limit, offset:$offset, sort:$sort){\n        id,\n        ${entitySchema.listingProperties.join(',\\n')}\n      }\n    }\n  `;\n}\n\nexport default buildListingQuery;\n"],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,SAASC,UAAU,QAAQ,wBAAwB;AACnD,SAASC,eAAe,QAAQ,2BAA2B;AAE3D,MAAMC,qBAAqB,GAAGC,YAAY,IAAI;EAC5C,MAAM;IAAEC,iBAAiB,GAAG;EAAG,CAAC,GAAGD,YAAY,IAAI,CAAC,CAAC;EACrD,MAAME,gBAAgB,GAAI,OAAMD,iBAAiB,CAACE,IAAI,CAAC,GAAG,CAAC,IAAI,SAAU,EAAC;EAE1E,OAAOL,eAAe,CAAC,cAAc,CAAC,CAAC,CAACE,YAAY,CAAC,EAAEE,gBAAgB,EAAE,IAAI,CAAC;AAChF,CAAC;AAED,SAASE,iBAAiBA,CAACJ,YAAY,EAAEK,aAAa,EAAE;EACtD,IAAI,CAACL,YAAY,CAACM,OAAO,IAAI,CAACN,YAAY,CAACM,OAAO,CAACC,MAAM,IAAI,CAACP,YAAY,CAACC,iBAAiB,EAAE;IAC5F,MAAM,IAAIJ,UAAU,CAClB,+EACF,CAAC;EACH;EAEA,IAAIQ,aAAa,EAAE,OAAON,qBAAqB,CAACC,YAAY,CAAC;EAE7D,MAAMQ,QAAQ,GACZR,YAAY,CAACM,OAAO,CAACC,MAAM,CAAC,CAAC,CAAC,CAACE,WAAW,CAAC,CAAC,GAAGT,YAAY,CAACM,OAAO,CAACC,MAAM,CAACG,MAAM,CAAC,CAAC,CAAC;EAEtF,OAAOd,GAAI;AACb,YACMI,YAAY,CAACM,OAAO,CAACC,MACtB,oDAAmDC,QAAS;AACjE,qBACQR,YAAY,CAACM,OAAO,CAACC,MACtB;AACP;AACA,UAAUP,YAAY,CAACC,iBAAiB,CAACE,IAAI,CAAC,KAAK,CAAE;AACrD;AACA;AACA,GAAG;AACH;AAEA,eAAeC,iBAAiB"}
+{"version":3,"file":"build-listing-query.js","names":["gql","BlazeError","buildListingQuery","entitySchema","actions","getAll","listingProperties","sortType","toUpperCase","substr","join"],"sources":["../../src/utils/build-listing-query.js"],"sourcesContent":["import { gql } from '@apollo/client';\nimport { BlazeError } from '@blaze-cms/core-errors';\n\nfunction buildListingQuery(entitySchema) {\n  if (!entitySchema.actions || !entitySchema.actions.getAll || !entitySchema.listingProperties) {\n    throw new BlazeError(\n      'Listing query requires getAll action and listingProperties from entity schema'\n    );\n  }\n\n  const sortType =\n    entitySchema.actions.getAll[0].toUpperCase() + entitySchema.actions.getAll.substr(1);\n\n  return gql`\n    query ${\n      entitySchema.actions.getAll\n    }($where: JSON, $limit: Int, $offset:Int, $sort: [${sortType}SortItem]) {\n      listingData: ${\n        entitySchema.actions.getAll\n      }(where: $where, limit: $limit, offset:$offset, sort:$sort){\n        id,\n        ${entitySchema.listingProperties.join(',\\n')}\n      }\n    }\n  `;\n}\n\nexport default buildListingQuery;\n"],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,SAASC,UAAU,QAAQ,wBAAwB;AAEnD,SAASC,iBAAiBA,CAACC,YAAY,EAAE;EACvC,IAAI,CAACA,YAAY,CAACC,OAAO,IAAI,CAACD,YAAY,CAACC,OAAO,CAACC,MAAM,IAAI,CAACF,YAAY,CAACG,iBAAiB,EAAE;IAC5F,MAAM,IAAIL,UAAU,CAClB,+EACF,CAAC;EACH;EAEA,MAAMM,QAAQ,GACZJ,YAAY,CAACC,OAAO,CAACC,MAAM,CAAC,CAAC,CAAC,CAACG,WAAW,CAAC,CAAC,GAAGL,YAAY,CAACC,OAAO,CAACC,MAAM,CAACI,MAAM,CAAC,CAAC,CAAC;EAEtF,OAAOT,GAAI;AACb,YACMG,YAAY,CAACC,OAAO,CAACC,MACtB,oDAAmDE,QAAS;AACjE,qBACQJ,YAAY,CAACC,OAAO,CAACC,MACtB;AACP;AACA,UAAUF,YAAY,CAACG,iBAAiB,CAACI,IAAI,CAAC,KAAK,CAAE;AACrD;AACA;AACA,GAAG;AACH;AAEA,eAAeR,iBAAiB"}

package/lib-es/utils/get-default-query-params.js

@@ -1,4 +1,6 @@
-const getDefaultQueryParams = schema => {
+const getDefaultQueryParams = ({
+  schema
+}) => {
   const updated = schema.properties && schema.properties.updated;
   const {
     adminDefaultListingFilter: where

package/lib-es/utils/get-default-query-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-default-query-params.js","names":["getDefaultQueryParams","schema","updated","properties","adminDefaultListingFilter","where","displayProperties","limit","offset","sort","property","direction"],"sources":["../../src/utils/get-default-query-params.js"],"sourcesContent":["const getDefaultQueryParams = schema => {\n  const updated = schema.properties && schema.properties.updated;\n  const { adminDefaultListingFilter: where } = schema.displayProperties || {};\n\n  return {\n    where,\n    limit: 40,\n    offset: 0,\n    sort: updated\n      ? [\n          {\n            property: 'updated',\n            direction: 'desc'\n          }\n        ]\n      : []\n  };\n};\n\nexport { getDefaultQueryParams };\n"],"mappings":"AAAA,MAAMA,qBAAqB,GAAGC,MAAM,IAAI;EACtC,MAAMC,OAAO,GAAGD,MAAM,CAACE,UAAU,IAAIF,MAAM,CAACE,UAAU,CAACD,OAAO;EAC9D,MAAM;IAAEE,yBAAyB,EAAEC;EAAM,CAAC,GAAGJ,MAAM,CAACK,iBAAiB,IAAI,CAAC,CAAC;EAE3E,OAAO;IACLD,KAAK;IACLE,KAAK,EAAE,EAAE;IACTC,MAAM,EAAE,CAAC;IACTC,IAAI,EAAEP,OAAO,GACT,CACE;MACEQ,QAAQ,EAAE,SAAS;MACnBC,SAAS,EAAE;IACb,CAAC,CACF,GACD;EACN,CAAC;AACH,CAAC;AAED,SAASX,qBAAqB"}
+{"version":3,"file":"get-default-query-params.js","names":["getDefaultQueryParams","schema","updated","properties","adminDefaultListingFilter","where","displayProperties","limit","offset","sort","property","direction"],"sources":["../../src/utils/get-default-query-params.js"],"sourcesContent":["const getDefaultQueryParams = ({ schema }) => {\n  const updated = schema.properties && schema.properties.updated;\n  const { adminDefaultListingFilter: where } = schema.displayProperties || {};\n\n  return {\n    where,\n    limit: 40,\n    offset: 0,\n    sort: updated\n      ? [\n          {\n            property: 'updated',\n            direction: 'desc'\n          }\n        ]\n      : []\n  };\n};\n\nexport { getDefaultQueryParams };\n"],"mappings":"AAAA,MAAMA,qBAAqB,GAAGA,CAAC;EAAEC;AAAO,CAAC,KAAK;EAC5C,MAAMC,OAAO,GAAGD,MAAM,CAACE,UAAU,IAAIF,MAAM,CAACE,UAAU,CAACD,OAAO;EAC9D,MAAM;IAAEE,yBAAyB,EAAEC;EAAM,CAAC,GAAGJ,MAAM,CAACK,iBAAiB,IAAI,CAAC,CAAC;EAE3E,OAAO;IACLD,KAAK;IACLE,KAAK,EAAE,EAAE;IACTC,MAAM,EAAE,CAAC;IACTC,IAAI,EAAEP,OAAO,GACT,CACE;MACEQ,QAAQ,EAAE,SAAS;MACnBC,SAAS,EAAE;IACb,CAAC,CACF,GACD;EACN,CAAC;AACH,CAAC;AAED,SAASX,qBAAqB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/plugin-data-ui",
-  "version": "0.134.0-project-admin-customisations.0",
+  "version": "0.134.0",
   "description": "Blaze plugin data ui",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -27,13 +27,12 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@blaze-cms/admin-ui-utils": "0.134.0-project-admin-customisations.0",
-    "@blaze-cms/core-errors": "0.134.0-project-admin-customisations.0",
-    "@blaze-cms/plugin-render-hooks-ui": "0.134.0-project-admin-customisations.0",
-    "@blaze-cms/react-form-builder": "0.134.0-project-admin-customisations.0",
-    "@blaze-cms/react-page-builder": "0.134.0-project-admin-customisations.0",
-    "@blaze-cms/setup-ui": "0.134.0-project-admin-customisations.0",
-    "@blaze-cms/versioning-ui": "0.134.0-project-admin-customisations.0",
+    "@blaze-cms/admin-ui-utils": "^0.132.0",
+    "@blaze-cms/core-errors": "^0.131.0",
+    "@blaze-cms/react-form-builder": "^0.134.0",
+    "@blaze-cms/react-page-builder": "^0.134.0",
+    "@blaze-cms/setup-ui": "^0.131.0",
+    "@blaze-cms/versioning-ui": "^0.134.0",
     "@blaze-react/button": "0.5.19",
     "@blaze-react/more": "0.5.19",
     "@blaze-react/multiselect": "0.6.6",
@@ -54,7 +53,7 @@
     "uuid": "^3.3.3"
   },
   "devDependencies": {
-    "@blaze-cms/core-ui": "0.134.0-project-admin-customisations.0"
+    "@blaze-cms/core-ui": "^0.131.0"
   },
   "peerDependencies": {
     "@apollo/client": "3.x",
@@ -66,5 +65,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "ed7ba9d56aee2c4913b8204b0181fdc8c5975d94"
+  "gitHead": "0ee132aebf4417d5259a42bef9f790df2a2bb453"
 }

package/src/components/EntityDataListing/EntityDataListing.js

@@ -6,22 +6,31 @@ import { getQuery } from '@blaze-cms/admin-ui-utils';
 import ListingTable from '../ListingTable/ListingTable';
 import { withContext } from '../../utils/hoc/withContext';
 
-const EntityDataListing = ({ match }) => {
+const EntityDataListing = ({ match, menuItems }) => {
   const {
     params: { entityIdentifier: identifier }
   } = match;
 
+  const [[selectedMenuItem]] = menuItems
+    .map(([_, { items }]) => {
+      const item = items.filter(({ uri }) => uri.endsWith(`/${identifier}`));
+
+      return item.length ? item : null;
+    })
+    .filter(Boolean);
+
   const { data: { getEntitySchemas = [] } = {} } = useQuery(getQuery('GET_ENTITY_SCHEMA'), {
     variables: { identifier }
   });
 
   if (!getEntitySchemas.length) return '';
 
-  return <ListingTable entitySchema={getEntitySchemas[0]} />;
+  return <ListingTable entitySchema={getEntitySchemas[0]} selectedMenuItem={selectedMenuItem} />;
 };
 
 EntityDataListing.propTypes = {
-  match: PropTypes.object.isRequired
+  match: PropTypes.object.isRequired,
+  menuItems: PropTypes.array.isRequired
 };
 
 export default withContext(EntityDataListing);

package/src/components/EntityManager/Entity/Entity.js

@@ -3,7 +3,6 @@ import React, { useEffect, useState, useRef } from 'react';
 import { withRouter, Prompt } from 'react-router-dom';
 import { useApolloClient } from '@apollo/client';
 import PropTypes from 'prop-types';
-import { RenderHook } from '@blaze-cms/plugin-render-hooks-ui';
 import { getQuery, GET_CURRENT_TAB_ID } from '@blaze-cms/admin-ui-utils';
 import { FormBuilder, parseFormValues } from '@blaze-cms/react-form-builder';
 import { DeleteAction, CopyDataFromAction } from '@blaze-cms/admin';
@@ -35,7 +34,6 @@ import {
   checkFulfilConditions
 } from '../utils/entity';
 import useToggle from '../../../utils/hooks/useToggle';
-import InfoBoxes from '../../InfoBoxes/InfoBoxes';
 
 const Entity = ({
   formData,
@@ -405,77 +403,68 @@ const Entity = ({
 
   return (
     <div className="page">
-      <EntityHeader
-        entityData={entityData}
-        entityIdentifier={entityIdentifier}
-        pageTitle={pageTitle}
-        pageName={pageName}
-        onSubmit={onSubmit}
-        handlePublishAndUnpublish={handlePublishAndUnpublish}
-        isSaveButtonAvailable={isSaveButtonAvailable}
-        isEnablePublishButton={isEnablePublishButton}
-        isEnablePreviewButton={isEnablePreviewButton}
-        toggleCopyModal={setCopyModalStatus}
-        toggleModal={setModalStatus}
-        formData={formData}
-        onViewUrl={onViewUrlHandler}
-        saveButtonText={saveButtonText}
-      />
-      <div className="page-wrapper__content">
-        <div className="tabs-wrapper tabs-wrapper__tab">
-          <Prompt when={hasToDisplayPrompt} message={LEAVE_PAGE_MESSAGE} />
-          {showModal && (
-            <DeleteAction
-              onClose={setModalStatus}
-              deleteAction={onDelete}
-              itemName={formData.values.name}
-            />
-          )}
-          {copyModalStatus && (
-            <CopyDataFromAction
-              onClose={handleCopyDataFromClose}
-              copyAction={onCopy}
-              getFormData={getFormData}
-            />
-          )}
-
-          <div className="page__content--fixed">
-            <div className="page__content">
-              <div className="content">
-                <RenderHook hookKey={`entity:${action}:main:top`} entity={entity} schema={schema} />
-                <InfoBoxes id={entity.id} schema={schema} />
-                <Tabs
-                  enabled={showPageBuilderTabs}
-                  onTabChange={tabId => {
-                    client.writeQuery({
-                      query: GET_CURRENT_TAB_ID,
-                      data: { currentTabId: tabId }
-                    });
-                    setCurrentTabId(tabId);
-                  }}>
-                  <FormBuilder
-                    getIsFormValid={setIsFormValid}
-                    getFormValues={getFormValues}
-                    schema={schema}
-                    data={clonedFormData}
-                    onChange={onChangeFormValues}
-                    shouldCopyData={shouldCopyData}
-                    updateCopyData={updateCopyData}
-                    formValues={formValues}
-                    isNewEntity={isNewEntity}
-                  />
-                </Tabs>
-                <RenderHook
-                  hookKey={`entity:${action}:main:bottom`}
-                  entity={entity}
+      <Prompt when={hasToDisplayPrompt} message={LEAVE_PAGE_MESSAGE} />
+      {showModal && (
+        <DeleteAction
+          onClose={setModalStatus}
+          deleteAction={onDelete}
+          itemName={formData.values.name}
+        />
+      )}
+      {copyModalStatus && (
+        <CopyDataFromAction
+          onClose={handleCopyDataFromClose}
+          copyAction={onCopy}
+          getFormData={getFormData}
+        />
+      )}
+
+      <div className="row row--display-row">
+        <div className="column column--three-quarters">
+          <EntityHeader
+            entityData={entityData}
+            entityIdentifier={entityIdentifier}
+            pageTitle={pageTitle}
+            pageName={pageName}
+            onSubmit={onSubmit}
+            handlePublishAndUnpublish={handlePublishAndUnpublish}
+            isSaveButtonAvailable={isSaveButtonAvailable}
+            isEnablePublishButton={isEnablePublishButton}
+            isEnablePreviewButton={isEnablePreviewButton}
+            toggleCopyModal={setCopyModalStatus}
+            toggleModal={setModalStatus}
+            formData={formData}
+            onViewUrl={onViewUrlHandler}
+            saveButtonText={saveButtonText}
+          />
+
+          <div className="page__content">
+            <div className="content">
+              <Tabs
+                enabled={showPageBuilderTabs}
+                onTabChange={tabId => {
+                  client.writeQuery({
+                    query: GET_CURRENT_TAB_ID,
+                    data: { currentTabId: tabId }
+                  });
+                  setCurrentTabId(tabId);
+                }}>
+                <FormBuilder
+                  getIsFormValid={setIsFormValid}
+                  getFormValues={getFormValues}
                   schema={schema}
+                  data={clonedFormData}
+                  onChange={onChangeFormValues}
+                  shouldCopyData={shouldCopyData}
+                  updateCopyData={updateCopyData}
+                  formValues={formValues}
+                  isNewEntity={isNewEntity}
                 />
-              </div>
+              </Tabs>
             </div>
           </div>
         </div>
-
-        <div className="column column--one-third page-sidebar page-sidebar--relations">
+        <div className="column column--one-third">
           {showSideBarRelations && (
             <SideBarRelations
               entity={entity}

package/src/components/EntityManager/Entity/SideBarRelations/index.js

@@ -4,23 +4,14 @@ import uuidv1 from 'uuid/v1';
 import { useApolloClient } from '@apollo/client';
 import { getQuery } from '@blaze-cms/admin-ui-utils';
 import { formFieldTypes } from '@blaze-cms/react-form-builder';
-import classnames from 'classnames';
+import Badge from '@blaze-react/badge';
 import { VersionsList } from '@blaze-cms/versioning-ui';
-import { PUBLISHED, UNPUBLISHED } from '../../../../constants';
-import CustomSidebarInfoContainer from './container/CustomSidebarInfoContainer';
-import EntityNavLinks from '../EntitiyNavLinks';
+import { PUBLISHED } from '../../../../constants';
 
 const SideBarRelations = ({ schema, onChange, formData, entity }) => {
   const { relation: RelationComponent } = formFieldTypes;
-  const {
-    formattedStatus,
-    formattedUpdated,
-    formattedCreated,
-    formattedPublished,
-    status
-  } = formData;
+  const { formattedStatus, formattedUpdated, formattedCreated, formattedPublished } = formData;
   const client = useApolloClient();
-
   const [relationsComponents, setRelationsComponents] = useState(null);
 
   useEffect(
@@ -60,50 +51,27 @@ const SideBarRelations = ({ schema, onChange, formData, entity }) => {
   const { id: itemId } = entity;
   const { identifier: itemEntity, interfaces } = schema;
 
-  const statusClassName = classnames('sidebar__status__badge', {
-    'sidebar__status__badge--published': status === PUBLISHED,
-    'sidebar__status__badge--unpublished': status === UNPUBLISHED
-  });
-
   return (
     <div className="sidebar" data-testid="sideBarRelations-main-div">
       <div className="sidebar__content">
-        <div className="sidebar__status">
-          {formattedCreated && (
-            <div className="sidebar__top">
-              <div className="sidebar__status__wrapper">
-                <b>Status</b>
-                <span className={statusClassName}>{formattedStatus}</span>
-              </div>
-              {formattedStatus === PUBLISHED && (
-                <p>
-                  {formattedStatus} on: <span> {formattedPublished}</span>
-                </p>
-              )}
-            </div>
-          )}
-
-          {!schema.displayProperties.adminMainInfoProperty && (
-            <>
-              <p>
-                Created: <span>{formattedCreated}</span>
-              </p>
-              <p>
-                Updated: <span>{formattedUpdated}</span>
-              </p>
-            </>
-          )}
-
-          <CustomSidebarInfoContainer
-            id={itemId}
-            schema={schema}
-            displayProperties={schema.displayProperties}
-          />
-        </div>
+        {formattedCreated && (
+          <div className="sidebar__status">
+            {formattedStatus && (
+              <Badge type="status" modifiers={formattedStatus}>
+                {formattedStatus}
+                {formattedStatus === PUBLISHED && `: ${formattedPublished}`}
+              </Badge>
+            )}
+            <p>
+              Created: <span>{formattedCreated}</span>
+            </p>
+            <p>
+              Updated: <span>{formattedUpdated}</span>
+            </p>
+          </div>
+        )}
 
         <VersionsList itemEntity={itemEntity} itemId={itemId} interfaces={interfaces} />
-        <EntityNavLinks schema={schema} />
-
         {relationsComponents &&
           relationsComponents.map(({ id, staticData, schema: entitySchema }) => (
             <RelationComponent