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

package/lib-es/components/ListingTable/mappers/populate-rows.js

@@ -10,20 +10,22 @@ const formatRows = ({
   url,
   toggleModal,
   label,
-  firstColumn = 'name'
+  firstColumn = 'name',
+  isEnquiry
 }) => rows.map(data => {
   const editUrl = `${url}/update/${data.id}`;
-  return _objectSpread(_objectSpread({}, data), {}, {
+  const rowProps = _objectSpread(_objectSpread({}, data), {}, {
     [firstColumn]: /*#__PURE__*/React.createElement(Link, {
       to: editUrl,
       role: "button"
-    }, data[firstColumn]),
-    actions: /*#__PURE__*/React.createElement(TableActions, {
-      editUrl: editUrl,
-      data: data,
-      showDeleteModal: toggleModal
-    })
+    }, data[firstColumn])
   });
+  if (!isEnquiry) rowProps.actions = /*#__PURE__*/React.createElement(TableActions, {
+    editUrl: editUrl,
+    data: data,
+    showDeleteModal: toggleModal
+  });
+  return rowProps;
 });
 const getSanitizedColumnLabel = columnProp => {
   let sanitizedChar = '';
@@ -32,14 +34,57 @@ const getSanitizedColumnLabel = columnProp => {
   }
   return sanitizedChar;
 };
-const getColumnLabels = (listingProperties, properties, dynamicProperties) => {
-  const allProperties = _objectSpread(_objectSpread({}, properties), dynamicProperties);
-  return listingProperties.reduce((acc, listingProperty) => {
-    const label = allProperties[listingProperty].label || getSanitizedColumnLabel(listingProperty);
-    return _objectSpread(_objectSpread({}, acc), {
-      [listingProperty]: label
-    });
-  }, {});
+const buildArrayRowContent = rowData => /*#__PURE__*/React.createElement("div", {
+  className: "table-row-list"
+}, rowData.map(rowGroup => /*#__PURE__*/React.createElement("div", {
+  className: "table-row-list__group"
+}, rowGroup.map(({
+  label,
+  value,
+  url
+}) => /*#__PURE__*/React.createElement("div", {
+  className: "table-row-list__group__item"
+}, /*#__PURE__*/React.createElement("span", {
+  className: "table-row-list__group__item__label"
+}, " ", label, ":"), url ? /*#__PURE__*/React.createElement(Link, {
+  to: url,
+  role: "button",
+  className: "table-row-list__group__item__value"
+}, value) : /*#__PURE__*/React.createElement("span", {
+  className: "table-row-list__group__item__value"
+}, " ", value))))));
+const buildArrayRowData = rowData => {
+  const dataGroups = [];
+  const groups = Math.ceil(rowData.length / 3) || 1;
+  for (let index = 0; index < groups; index += 1) {
+    const currentStart = index * groups;
+    dataGroups[index] = rowData.slice(currentStart, currentStart + 3);
+  }
+  return buildArrayRowContent(dataGroups);
+};
+const getParsedRowData = rows => rows.map(rowData => Object.keys(rowData).reduce((acc, key) => {
+  const parsedData = Array.isArray(rowData[key]) ? buildArrayRowData(rowData[key]) : rowData[key];
+  return _objectSpread(_objectSpread({}, acc), {}, {
+    [key]: parsedData
+  });
+}, {}));
+const getColumnsAndLabels = (listingProperties, allProperties, rows) => {
+  const columns = [];
+  const labels = {};
+  listingProperties.forEach(listingProperty => {
+    const propKey = listingProperty.includes(' ') ? listingProperty.split(' ')[0] : listingProperty;
+    const {
+      label
+    } = allProperties[propKey] || {};
+    columns.push(propKey);
+    labels[propKey] = label || getSanitizedColumnLabel(propKey);
+  });
+  const parsedRowData = getParsedRowData(rows);
+  return {
+    columns,
+    labels,
+    parsedRowData
+  };
 };
 const populateRows = ({
   toggleModal,
@@ -48,16 +93,21 @@ const populateRows = ({
   rows
 }) => {
   const {
+    id: schemaId,
     listingProperties,
     properties,
     dynamicProperties = {},
     formProperties
   } = entitySchema;
-  const columns = [...listingProperties, ACTIONS];
+  const isEnquiry = schemaId === 'enquiry';
+  const columnOptions = !isEnquiry ? [...listingProperties, ACTIONS] : [...listingProperties];
+  const allProperties = _objectSpread(_objectSpread({}, properties), dynamicProperties);
+  const {
+    columns,
+    labels,
+    parsedRowData
+  } = getColumnsAndLabels(columnOptions, allProperties, rows);
   const [firstColumn] = columns;
-  const labels = _objectSpread(_objectSpread({}, getColumnLabels(listingProperties, properties, dynamicProperties)), {}, {
-    [ACTIONS]: ACTIONS
-  });
   return {
     identification: 'id',
     sort: null,
@@ -66,11 +116,13 @@ const populateRows = ({
     orderBy: [...formProperties],
     rows: formatRows({
       firstColumn,
-      rows,
+      rows: parsedRowData,
       url,
-      toggleModal
-    })
+      toggleModal,
+      isEnquiry
+    }),
+    isEnquiry
   };
 };
-export { populateRows, formatRows };
+export { populateRows, formatRows, getParsedRowData };
 //# sourceMappingURL=populate-rows.js.map

package/lib-es/components/ListingTable/mappers/populate-rows.js.map

@@ -1 +1 @@
-{"version":3,"file":"populate-rows.js","names":["React","Link","TableActions","ACTIONS","formatRows","rows","url","toggleModal","label","firstColumn","map","data","editUrl","id","_objectSpread","createElement","to","role","actions","showDeleteModal","getSanitizedColumnLabel","columnProp","sanitizedChar","index","length","toUpperCase","toLowerCase","getColumnLabels","listingProperties","properties","dynamicProperties","allProperties","reduce","acc","listingProperty","populateRows","entitySchema","formProperties","columns","labels","identification","sort","orderBy"],"sources":["../../../../src/components/ListingTable/mappers/populate-rows.js"],"sourcesContent":["import React from 'react';\nimport { Link } from 'react-router-dom';\nimport TableActions from '../TableActions';\nimport { ACTIONS } from '../../../constants';\n\nconst formatRows = ({ rows, url, toggleModal, label, firstColumn = 'name' }) =>\n  rows.map(data => {\n    const editUrl = `${url}/update/${data.id}`;\n    return {\n      ...data,\n      [firstColumn]: (\n        <Link to={editUrl} role=\"button\">\n          {data[firstColumn]}\n        </Link>\n      ),\n      actions: <TableActions editUrl={editUrl} data={data} showDeleteModal={toggleModal} />\n    };\n  });\n\nconst getSanitizedColumnLabel = columnProp => {\n  let sanitizedChar = '';\n\n  for (let index = 0; index < columnProp.length; index += 1) {\n    if (index && columnProp[index] === columnProp[index].toUpperCase())\n      sanitizedChar = `${sanitizedChar} ${columnProp[index].toLowerCase()}`;\n    else sanitizedChar += columnProp[index];\n  }\n  return sanitizedChar;\n};\n\nconst getColumnLabels = (listingProperties, properties, dynamicProperties) => {\n  const allProperties = { ...properties, ...dynamicProperties };\n  return listingProperties.reduce((acc, listingProperty) => {\n    const label = allProperties[listingProperty].label || getSanitizedColumnLabel(listingProperty);\n    return { ...acc, ...{ [listingProperty]: label } };\n  }, {});\n};\n\nconst populateRows = ({ toggleModal, url, entitySchema, rows }) => {\n  const { listingProperties, properties, dynamicProperties = {}, formProperties } = entitySchema;\n  const columns = [...listingProperties, ACTIONS];\n  const [firstColumn] = columns;\n  const labels = {\n    ...getColumnLabels(listingProperties, properties, dynamicProperties),\n    [ACTIONS]: ACTIONS\n  };\n\n  return {\n    identification: 'id',\n    sort: null,\n    columns,\n    labels,\n    orderBy: [...formProperties],\n    rows: formatRows({ firstColumn, rows, url, toggleModal })\n  };\n};\n\nexport { populateRows, formatRows };\n"],"mappings":"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"}
+{"version":3,"file":"populate-rows.js","names":["React","Link","TableActions","ACTIONS","formatRows","rows","url","toggleModal","label","firstColumn","isEnquiry","map","data","editUrl","id","rowProps","_objectSpread","createElement","to","role","actions","showDeleteModal","getSanitizedColumnLabel","columnProp","sanitizedChar","index","length","toUpperCase","toLowerCase","buildArrayRowContent","rowData","className","rowGroup","value","buildArrayRowData","dataGroups","groups","Math","ceil","currentStart","slice","getParsedRowData","Object","keys","reduce","acc","key","parsedData","Array","isArray","getColumnsAndLabels","listingProperties","allProperties","columns","labels","forEach","listingProperty","propKey","includes","split","push","parsedRowData","populateRows","entitySchema","schemaId","properties","dynamicProperties","formProperties","columnOptions","identification","sort","orderBy"],"sources":["../../../../src/components/ListingTable/mappers/populate-rows.js"],"sourcesContent":["import React from 'react';\nimport { Link } from 'react-router-dom';\nimport TableActions from '../TableActions';\nimport { ACTIONS } from '../../../constants';\n\nconst formatRows = ({ rows, url, toggleModal, label, firstColumn = 'name', isEnquiry }) =>\n  rows.map(data => {\n    const editUrl = `${url}/update/${data.id}`;\n    const rowProps = {\n      ...data,\n      [firstColumn]: (\n        <Link to={editUrl} role=\"button\">\n          {data[firstColumn]}\n        </Link>\n      )\n    };\n    if (!isEnquiry)\n      rowProps.actions = (\n        <TableActions editUrl={editUrl} data={data} showDeleteModal={toggleModal} />\n      );\n    return rowProps;\n  });\n\nconst getSanitizedColumnLabel = columnProp => {\n  let sanitizedChar = '';\n\n  for (let index = 0; index < columnProp.length; index += 1) {\n    if (index && columnProp[index] === columnProp[index].toUpperCase())\n      sanitizedChar = `${sanitizedChar} ${columnProp[index].toLowerCase()}`;\n    else sanitizedChar += columnProp[index];\n  }\n  return sanitizedChar;\n};\n\nconst buildArrayRowContent = rowData => (\n  <div className=\"table-row-list\">\n    {rowData.map(rowGroup => (\n      <div className=\"table-row-list__group\">\n        {rowGroup.map(({ label, value, url }) => (\n          <div className=\"table-row-list__group__item\">\n            <span className=\"table-row-list__group__item__label\"> {label}:</span>\n            {url ? (\n              <Link to={url} role=\"button\" className=\"table-row-list__group__item__value\">\n                {value}\n              </Link>\n            ) : (\n              <span className=\"table-row-list__group__item__value\"> {value}</span>\n            )}\n          </div>\n        ))}\n      </div>\n    ))}\n  </div>\n);\n\nconst buildArrayRowData = rowData => {\n  const dataGroups = [];\n  const groups = Math.ceil(rowData.length / 3) || 1;\n  for (let index = 0; index < groups; index += 1) {\n    const currentStart = index * groups;\n    dataGroups[index] = rowData.slice(currentStart, currentStart + 3);\n  }\n\n  return buildArrayRowContent(dataGroups);\n};\n\nconst getParsedRowData = rows =>\n  rows.map(rowData =>\n    Object.keys(rowData).reduce((acc, key) => {\n      const parsedData = Array.isArray(rowData[key])\n        ? buildArrayRowData(rowData[key])\n        : rowData[key];\n      return { ...acc, [key]: parsedData };\n    }, {})\n  );\n\nconst getColumnsAndLabels = (listingProperties, allProperties, rows) => {\n  const columns = [];\n  const labels = {};\n\n  listingProperties.forEach(listingProperty => {\n    const propKey = listingProperty.includes(' ') ? listingProperty.split(' ')[0] : listingProperty;\n    const { label } = allProperties[propKey] || {};\n    columns.push(propKey);\n    labels[propKey] = label || getSanitizedColumnLabel(propKey);\n  });\n  const parsedRowData = getParsedRowData(rows);\n\n  return { columns, labels, parsedRowData };\n};\n\nconst populateRows = ({ toggleModal, url, entitySchema, rows }) => {\n  const {\n    id: schemaId,\n    listingProperties,\n    properties,\n    dynamicProperties = {},\n    formProperties\n  } = entitySchema;\n\n  const isEnquiry = schemaId === 'enquiry';\n  const columnOptions = !isEnquiry ? [...listingProperties, ACTIONS] : [...listingProperties];\n\n  const allProperties = { ...properties, ...dynamicProperties };\n  const { columns, labels, parsedRowData } = getColumnsAndLabels(\n    columnOptions,\n    allProperties,\n    rows\n  );\n  const [firstColumn] = columns;\n\n  return {\n    identification: 'id',\n    sort: null,\n    columns,\n    labels,\n    orderBy: [...formProperties],\n    rows: formatRows({ firstColumn, rows: parsedRowData, url, toggleModal, isEnquiry }),\n    isEnquiry\n  };\n};\n\nexport { populateRows, formatRows, getParsedRowData };\n"],"mappings":"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"}

package/lib-es/components/ListingTable/service/index.js

@@ -1,22 +1,80 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _defineProperty(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; }
 import buildListingQuery from '../../../utils/build-listing-query';
+function buildVariables({
+  entitySchema,
+  isSearchQuery,
+  listFilters = [],
+  queryParams = {}
+}) {
+  const {
+    identifier
+  } = entitySchema;
+  const {
+    sort,
+    offset,
+    limit,
+    where
+  } = queryParams;
+  const [{
+    property,
+    direction
+  }] = sort;
+  const parsedOffset = `${property}:${direction}`;
+  if (!isSearchQuery) return _objectSpread(_objectSpread({}, queryParams), {}, {
+    where: !Array.isArray(listFilters) ? listFilters : where
+  });
+  const rawQuery = {
+    bool: {
+      must: listFilters || [],
+      filter: [{
+        term: {
+          entityIdentifier: identifier
+        }
+      }]
+    }
+  };
+  return {
+    limit,
+    offset,
+    sort: parsedOffset,
+    where: JSON.stringify(rawQuery)
+  };
+}
 const fetchData = async ({
   client,
   querySettings: {
     entitySchema,
     queryParams
-  }
+  },
+  listFilters
 }) => {
-  const query = buildListingQuery(entitySchema);
   const {
-    data: {
-      listingData
-    }
+    displayProperties: {
+      adminListings: {
+        dataSource: {
+          source
+        } = {}
+      } = {}
+    } = {}
+  } = entitySchema;
+  const isSearchQuery = source === 'search';
+  const query = buildListingQuery(entitySchema, isSearchQuery);
+  const variables = buildVariables({
+    entitySchema,
+    listFilters,
+    queryParams,
+    isSearchQuery
+  });
+  const {
+    data = {}
   } = await client.query({
     query,
-    variables: queryParams,
+    variables,
     fetchPolicy: 'network-only'
   });
-  return listingData;
+  return data.searchResults ? data.searchResults.results : data.listingData;
 };
 export { fetchData };
 //# sourceMappingURL=index.js.map

package/lib-es/components/ListingTable/service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["buildListingQuery","fetchData","client","querySettings","entitySchema","queryParams","query","data","listingData","variables","fetchPolicy"],"sources":["../../../../src/components/ListingTable/service/index.js"],"sourcesContent":["import buildListingQuery from '../../../utils/build-listing-query';\n\nconst fetchData = async ({ client, querySettings: { entitySchema, queryParams } }) => {\n  const query = buildListingQuery(entitySchema);\n  const {\n    data: { listingData }\n  } = await client.query({ query, variables: queryParams, fetchPolicy: 'network-only' });\n\n  return listingData;\n};\n\nexport { fetchData };\n"],"mappings":"AAAA,OAAOA,iBAAiB,MAAM,oCAAoC;AAElE,MAAMC,SAAS,GAAG,MAAAA,CAAO;EAAEC,MAAM;EAAEC,aAAa,EAAE;IAAEC,YAAY;IAAEC;EAAY;AAAE,CAAC,KAAK;EACpF,MAAMC,KAAK,GAAGN,iBAAiB,CAACI,YAAY,CAAC;EAC7C,MAAM;IACJG,IAAI,EAAE;MAAEC;IAAY;EACtB,CAAC,GAAG,MAAMN,MAAM,CAACI,KAAK,CAAC;IAAEA,KAAK;IAAEG,SAAS,EAAEJ,WAAW;IAAEK,WAAW,EAAE;EAAe,CAAC,CAAC;EAEtF,OAAOF,WAAW;AACpB,CAAC;AAED,SAASP,SAAS"}
+{"version":3,"file":"index.js","names":["buildListingQuery","buildVariables","entitySchema","isSearchQuery","listFilters","queryParams","identifier","sort","offset","limit","where","property","direction","parsedOffset","_objectSpread","Array","isArray","rawQuery","bool","must","filter","term","entityIdentifier","JSON","stringify","fetchData","client","querySettings","displayProperties","adminListings","dataSource","source","query","variables","data","fetchPolicy","searchResults","results","listingData"],"sources":["../../../../src/components/ListingTable/service/index.js"],"sourcesContent":["import buildListingQuery from '../../../utils/build-listing-query';\n\nfunction buildVariables({ entitySchema, isSearchQuery, listFilters = [], queryParams = {} }) {\n  const { identifier } = entitySchema;\n  const { sort, offset, limit, where } = queryParams;\n  const [{ property, direction }] = sort;\n  const parsedOffset = `${property}:${direction}`;\n\n  if (!isSearchQuery)\n    return {\n      ...queryParams,\n      where: !Array.isArray(listFilters) ? listFilters : where\n    };\n\n  const rawQuery = {\n    bool: {\n      must: listFilters || [],\n      filter: [\n        {\n          term: {\n            entityIdentifier: identifier\n          }\n        }\n      ]\n    }\n  };\n\n  return {\n    limit,\n    offset,\n    sort: parsedOffset,\n    where: JSON.stringify(rawQuery)\n  };\n}\n\nconst fetchData = async ({ client, querySettings: { entitySchema, queryParams }, listFilters }) => {\n  const {\n    displayProperties: { adminListings: { dataSource: { source } = {} } = {} } = {}\n  } = entitySchema;\n\n  const isSearchQuery = source === 'search';\n  const query = buildListingQuery(entitySchema, isSearchQuery);\n  const variables = buildVariables({ entitySchema, listFilters, queryParams, isSearchQuery });\n  const { data = {} } = await client.query({ query, variables, fetchPolicy: 'network-only' });\n\n  return data.searchResults ? data.searchResults.results : data.listingData;\n};\n\nexport { fetchData };\n"],"mappings":";;;AAAA,OAAOA,iBAAiB,MAAM,oCAAoC;AAElE,SAASC,cAAcA,CAAC;EAAEC,YAAY;EAAEC,aAAa;EAAEC,WAAW,GAAG,EAAE;EAAEC,WAAW,GAAG,CAAC;AAAE,CAAC,EAAE;EAC3F,MAAM;IAAEC;EAAW,CAAC,GAAGJ,YAAY;EACnC,MAAM;IAAEK,IAAI;IAAEC,MAAM;IAAEC,KAAK;IAAEC;EAAM,CAAC,GAAGL,WAAW;EAClD,MAAM,CAAC;IAAEM,QAAQ;IAAEC;EAAU,CAAC,CAAC,GAAGL,IAAI;EACtC,MAAMM,YAAY,GAAI,GAAEF,QAAS,IAAGC,SAAU,EAAC;EAE/C,IAAI,CAACT,aAAa,EAChB,OAAAW,aAAA,CAAAA,aAAA,KACKT,WAAW;IACdK,KAAK,EAAE,CAACK,KAAK,CAACC,OAAO,CAACZ,WAAW,CAAC,GAAGA,WAAW,GAAGM;EAAK;EAG5D,MAAMO,QAAQ,GAAG;IACfC,IAAI,EAAE;MACJC,IAAI,EAAEf,WAAW,IAAI,EAAE;MACvBgB,MAAM,EAAE,CACN;QACEC,IAAI,EAAE;UACJC,gBAAgB,EAAEhB;QACpB;MACF,CAAC;IAEL;EACF,CAAC;EAED,OAAO;IACLG,KAAK;IACLD,MAAM;IACND,IAAI,EAAEM,YAAY;IAClBH,KAAK,EAAEa,IAAI,CAACC,SAAS,CAACP,QAAQ;EAChC,CAAC;AACH;AAEA,MAAMQ,SAAS,GAAG,MAAAA,CAAO;EAAEC,MAAM;EAAEC,aAAa,EAAE;IAAEzB,YAAY;IAAEG;EAAY,CAAC;EAAED;AAAY,CAAC,KAAK;EACjG,MAAM;IACJwB,iBAAiB,EAAE;MAAEC,aAAa,EAAE;QAAEC,UAAU,EAAE;UAAEC;QAAO,CAAC,GAAG,CAAC;MAAE,CAAC,GAAG,CAAC;IAAE,CAAC,GAAG,CAAC;EAChF,CAAC,GAAG7B,YAAY;EAEhB,MAAMC,aAAa,GAAG4B,MAAM,KAAK,QAAQ;EACzC,MAAMC,KAAK,GAAGhC,iBAAiB,CAACE,YAAY,EAAEC,aAAa,CAAC;EAC5D,MAAM8B,SAAS,GAAGhC,cAAc,CAAC;IAAEC,YAAY;IAAEE,WAAW;IAAEC,WAAW;IAAEF;EAAc,CAAC,CAAC;EAC3F,MAAM;IAAE+B,IAAI,GAAG,CAAC;EAAE,CAAC,GAAG,MAAMR,MAAM,CAACM,KAAK,CAAC;IAAEA,KAAK;IAAEC,SAAS;IAAEE,WAAW,EAAE;EAAe,CAAC,CAAC;EAE3F,OAAOD,IAAI,CAACE,aAAa,GAAGF,IAAI,CAACE,aAAa,CAACC,OAAO,GAAGH,IAAI,CAACI,WAAW;AAC3E,CAAC;AAED,SAASb,SAAS"}

package/lib-es/index.js

@@ -6,15 +6,7 @@ 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) {
-  // 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('admin:menu:config:load', getAddContentMenuItems(app));
   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","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"}
+{"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"}

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

@@ -2,8 +2,10 @@ import { getQuery } from '@blaze-cms/admin-ui-utils';
 const {
   MENU_PERMISSIONS
 } = require('../constants');
-function getAddContentMenuItems(app, sectionKey) {
-  return async addItem => {
+function getAddContentMenuItems(app) {
+  return async ({
+    addConfig
+  }) => {
     const client = app.getClient();
     const {
       data: {
@@ -16,15 +18,57 @@ function getAddContentMenuItems(app, sectionKey) {
         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
     }) => {
-      addItem({
-        name: displayName,
+      menuItems[id] = {
+        label: 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","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"}
+{"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"}

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

@@ -1,9 +1,18 @@
 import { gql } from '@apollo/client';
 import { BlazeError } from '@blaze-cms/core-errors';
-function buildListingQuery(entitySchema) {
+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) {
   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","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"}
+{"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"}

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

@@ -1,6 +1,4 @@
-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,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"}
+{"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"}

package/package.json

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

package/src/components/EntityDataListing/EntityDataListing.js

@@ -6,31 +6,22 @@ import { getQuery } from '@blaze-cms/admin-ui-utils';
 import ListingTable from '../ListingTable/ListingTable';
 import { withContext } from '../../utils/hoc/withContext';
 
-const EntityDataListing = ({ match, menuItems }) => {
+const EntityDataListing = ({ match }) => {
   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]} selectedMenuItem={selectedMenuItem} />;
+  return <ListingTable entitySchema={getEntitySchemas[0]} />;
 };
 
 EntityDataListing.propTypes = {
-  match: PropTypes.object.isRequired,
-  menuItems: PropTypes.array.isRequired
+  match: PropTypes.object.isRequired
 };
 
 export default withContext(EntityDataListing);

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

@@ -0,0 +1,26 @@
+import { Link } from 'react-router-dom';
+import React from 'react';
+
+const EntityNavLinks = ({ schema }) => {
+  if (!schema) return null;
+
+  const {
+    displayProperties: { adminSectionNavigation }
+  } = schema;
+
+  if (!adminSectionNavigation) return null;
+
+  const links = Object.entries(adminSectionNavigation).map(([k, v]) => {
+    const { label, uri } = v;
+    const Wrapper = uri.startsWith('#') ? 'a' : Link;
+    return (
+      <Wrapper className="entity-section-link" href={uri} to={uri}>
+        {label}
+      </Wrapper>
+    );
+  });
+
+  return <div className="entity-section-links">{links}</div>;
+};
+
+export default EntityNavLinks;

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

@@ -0,0 +1,3 @@
+import EntityNavLinks from './EntityNavLinks';
+
+export default EntityNavLinks;

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

@@ -3,6 +3,7 @@ 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';
@@ -34,6 +35,7 @@ import {
   checkFulfilConditions
 } from '../utils/entity';
 import useToggle from '../../../utils/hooks/useToggle';
+import InfoBoxes from '../../InfoBoxes/InfoBoxes';
 
 const Entity = ({
   formData,
@@ -440,6 +442,8 @@ const Entity = ({
           <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 => {
@@ -461,12 +465,17 @@ const Entity = ({
                     isNewEntity={isNewEntity}
                   />
                 </Tabs>
+                <RenderHook
+                  hookKey={`entity:${action}:main:bottom`}
+                  entity={entity}
+                  schema={schema}
+                />
               </div>
             </div>
           </div>
         </div>
 
-        <div className="column column--one-third page-sidebar">
+        <div className="column column--one-third page-sidebar page-sidebar--relations">
           {showSideBarRelations && (
             <SideBarRelations
               entity={entity}