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

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

@@ -1,11 +1,8 @@
 "use strict";
 
-require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
-require("core-js/modules/es.array.for-each.js");
-require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
@@ -13,14 +10,21 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.populateRows = exports.formatRows = void 0;
+exports.populateRows = exports.getParsedRowData = exports.formatRows = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.array.slice.js");
 require("core-js/modules/es.array.reduce.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.string.includes.js");
 var _react = _interopRequireDefault(require("react"));
 var _reactRouterDom = require("react-router-dom");
 var _TableActions = _interopRequireDefault(require("../TableActions"));
@@ -33,18 +37,20 @@ var formatRows = function formatRows(_ref) {
     toggleModal = _ref.toggleModal,
     label = _ref.label,
     _ref$firstColumn = _ref.firstColumn,
-    firstColumn = _ref$firstColumn === void 0 ? 'name' : _ref$firstColumn;
+    firstColumn = _ref$firstColumn === void 0 ? 'name' : _ref$firstColumn,
+    isEnquiry = _ref.isEnquiry;
   return rows.map(function (data) {
-    var _objectSpread2;
     var editUrl = "".concat(url, "/update/").concat(data.id);
-    return _objectSpread(_objectSpread({}, data), {}, (_objectSpread2 = {}, (0, _defineProperty2["default"])(_objectSpread2, firstColumn, /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
+    var rowProps = _objectSpread(_objectSpread({}, data), {}, (0, _defineProperty2["default"])({}, firstColumn, /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
       to: editUrl,
       role: "button"
-    }, data[firstColumn])), (0, _defineProperty2["default"])(_objectSpread2, "actions", /*#__PURE__*/_react["default"].createElement(_TableActions["default"], {
+    }, data[firstColumn])));
+    if (!isEnquiry) rowProps.actions = /*#__PURE__*/_react["default"].createElement(_TableActions["default"], {
       editUrl: editUrl,
       data: data,
       showDeleteModal: toggleModal
-    })), _objectSpread2));
+    });
+    return rowProps;
   });
 };
 exports.formatRows = formatRows;
@@ -55,27 +61,85 @@ var getSanitizedColumnLabel = function getSanitizedColumnLabel(columnProp) {
   }
   return sanitizedChar;
 };
-var getColumnLabels = function getColumnLabels(listingProperties, properties, dynamicProperties) {
-  var allProperties = _objectSpread(_objectSpread({}, properties), dynamicProperties);
-  return listingProperties.reduce(function (acc, listingProperty) {
-    var label = allProperties[listingProperty].label || getSanitizedColumnLabel(listingProperty);
-    return _objectSpread(_objectSpread({}, acc), (0, _defineProperty2["default"])({}, listingProperty, label));
-  }, {});
+var buildArrayRowContent = function buildArrayRowContent(rowData) {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "table-row-list"
+  }, rowData.map(function (rowGroup) {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "table-row-list__group"
+    }, rowGroup.map(function (_ref2) {
+      var label = _ref2.label,
+        value = _ref2.value,
+        url = _ref2.url;
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: "table-row-list__group__item"
+      }, /*#__PURE__*/_react["default"].createElement("span", {
+        className: "table-row-list__group__item__label"
+      }, " ", label, ":"), url ? /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
+        to: url,
+        role: "button",
+        className: "table-row-list__group__item__value"
+      }, value) : /*#__PURE__*/_react["default"].createElement("span", {
+        className: "table-row-list__group__item__value"
+      }, " ", value));
+    }));
+  }));
+};
+var buildArrayRowData = function buildArrayRowData(rowData) {
+  var dataGroups = [];
+  var groups = Math.ceil(rowData.length / 3) || 1;
+  for (var index = 0; index < groups; index += 1) {
+    var currentStart = index * groups;
+    dataGroups[index] = rowData.slice(currentStart, currentStart + 3);
+  }
+  return buildArrayRowContent(dataGroups);
 };
-var populateRows = function populateRows(_ref2) {
-  var toggleModal = _ref2.toggleModal,
-    url = _ref2.url,
-    entitySchema = _ref2.entitySchema,
-    rows = _ref2.rows;
-  var listingProperties = entitySchema.listingProperties,
+var getParsedRowData = function getParsedRowData(rows) {
+  return rows.map(function (rowData) {
+    return Object.keys(rowData).reduce(function (acc, key) {
+      var parsedData = Array.isArray(rowData[key]) ? buildArrayRowData(rowData[key]) : rowData[key];
+      return _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2["default"])({}, key, parsedData));
+    }, {});
+  });
+};
+exports.getParsedRowData = getParsedRowData;
+var getColumnsAndLabels = function getColumnsAndLabels(listingProperties, allProperties, rows) {
+  var columns = [];
+  var labels = {};
+  listingProperties.forEach(function (listingProperty) {
+    var propKey = listingProperty.includes(' ') ? listingProperty.split(' ')[0] : listingProperty;
+    var _ref3 = allProperties[propKey] || {},
+      label = _ref3.label;
+    columns.push(propKey);
+    labels[propKey] = label || getSanitizedColumnLabel(propKey);
+  });
+  var parsedRowData = getParsedRowData(rows);
+  return {
+    columns: columns,
+    labels: labels,
+    parsedRowData: parsedRowData
+  };
+};
+var populateRows = function populateRows(_ref4) {
+  var toggleModal = _ref4.toggleModal,
+    url = _ref4.url,
+    entitySchema = _ref4.entitySchema,
+    rows = _ref4.rows;
+  var schemaId = entitySchema.id,
+    listingProperties = entitySchema.listingProperties,
     properties = entitySchema.properties,
     _entitySchema$dynamic = entitySchema.dynamicProperties,
     dynamicProperties = _entitySchema$dynamic === void 0 ? {} : _entitySchema$dynamic,
     formProperties = entitySchema.formProperties;
-  var columns = [].concat((0, _toConsumableArray2["default"])(listingProperties), [_constants.ACTIONS]);
+  var isEnquiry = schemaId === 'enquiry';
+  var columnOptions = !isEnquiry ? [].concat((0, _toConsumableArray2["default"])(listingProperties), [_constants.ACTIONS]) : (0, _toConsumableArray2["default"])(listingProperties);
+  var allProperties = _objectSpread(_objectSpread({}, properties), dynamicProperties);
+  var _getColumnsAndLabels = getColumnsAndLabels(columnOptions, allProperties, rows),
+    columns = _getColumnsAndLabels.columns,
+    labels = _getColumnsAndLabels.labels,
+    parsedRowData = _getColumnsAndLabels.parsedRowData;
   var _columns = (0, _slicedToArray2["default"])(columns, 1),
     firstColumn = _columns[0];
-  var labels = _objectSpread(_objectSpread({}, getColumnLabels(listingProperties, properties, dynamicProperties)), {}, (0, _defineProperty2["default"])({}, _constants.ACTIONS, _constants.ACTIONS));
   return {
     identification: 'id',
     sort: null,
@@ -84,10 +148,12 @@ var populateRows = function populateRows(_ref2) {
     orderBy: (0, _toConsumableArray2["default"])(formProperties),
     rows: formatRows({
       firstColumn: firstColumn,
-      rows: rows,
+      rows: parsedRowData,
       url: url,
-      toggleModal: toggleModal
-    })
+      toggleModal: toggleModal,
+      isEnquiry: isEnquiry
+    }),
+    isEnquiry: isEnquiry
   };
 };
 exports.populateRows = populateRows;

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

@@ -1 +1 @@
-{"version":3,"file":"populate-rows.js","names":["_react","_interopRequireDefault","require","_reactRouterDom","_TableActions","_constants","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","formatRows","_ref","rows","url","toggleModal","label","_ref$firstColumn","firstColumn","map","data","_objectSpread2","editUrl","concat","id","createElement","Link","to","role","showDeleteModal","exports","getSanitizedColumnLabel","columnProp","sanitizedChar","index","toUpperCase","toLowerCase","getColumnLabels","listingProperties","properties","dynamicProperties","allProperties","reduce","acc","listingProperty","populateRows","_ref2","entitySchema","_entitySchema$dynamic","formProperties","columns","_toConsumableArray2","ACTIONS","_columns","_slicedToArray2","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","_interopRequireDefault","require","_reactRouterDom","_TableActions","_constants","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","formatRows","_ref","rows","url","toggleModal","label","_ref$firstColumn","firstColumn","isEnquiry","map","data","editUrl","concat","id","rowProps","createElement","Link","to","role","actions","showDeleteModal","exports","getSanitizedColumnLabel","columnProp","sanitizedChar","index","toUpperCase","toLowerCase","buildArrayRowContent","rowData","className","rowGroup","_ref2","value","buildArrayRowData","dataGroups","groups","Math","ceil","currentStart","slice","getParsedRowData","reduce","acc","key","parsedData","Array","isArray","getColumnsAndLabels","listingProperties","allProperties","columns","labels","listingProperty","propKey","includes","split","_ref3","parsedRowData","populateRows","_ref4","entitySchema","schemaId","properties","_entitySchema$dynamic","dynamicProperties","formProperties","columnOptions","_toConsumableArray2","ACTIONS","_getColumnsAndLabels","_columns","_slicedToArray2","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/components/ListingTable/service/index.js

@@ -1,5 +1,14 @@
 "use strict";
 
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
@@ -8,33 +17,86 @@ Object.defineProperty(exports, "__esModule", {
 exports.fetchData = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+require("core-js/modules/es.array.sort.js");
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.array.is-array.js");
 var _buildListingQuery = _interopRequireDefault(require("../../../utils/build-listing-query"));
+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; }
+function buildVariables(_ref) {
+  var entitySchema = _ref.entitySchema,
+    isSearchQuery = _ref.isSearchQuery,
+    _ref$listFilters = _ref.listFilters,
+    listFilters = _ref$listFilters === void 0 ? [] : _ref$listFilters,
+    _ref$queryParams = _ref.queryParams,
+    queryParams = _ref$queryParams === void 0 ? {} : _ref$queryParams;
+  var identifier = entitySchema.identifier;
+  var sort = queryParams.sort,
+    offset = queryParams.offset,
+    limit = queryParams.limit,
+    where = queryParams.where;
+  var _sort = (0, _slicedToArray2["default"])(sort, 1),
+    _sort$ = _sort[0],
+    property = _sort$.property,
+    direction = _sort$.direction;
+  var parsedOffset = "".concat(property, ":").concat(direction);
+  if (!isSearchQuery) return _objectSpread(_objectSpread({}, queryParams), {}, {
+    where: !Array.isArray(listFilters) ? listFilters : where
+  });
+  var rawQuery = {
+    bool: {
+      must: listFilters || [],
+      filter: [{
+        term: {
+          entityIdentifier: identifier
+        }
+      }]
+    }
+  };
+  return {
+    limit: limit,
+    offset: offset,
+    sort: parsedOffset,
+    where: JSON.stringify(rawQuery)
+  };
+}
 var fetchData = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(_ref) {
-    var client, _ref$querySettings, entitySchema, queryParams, query, _yield$client$query, listingData;
+  var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(_ref2) {
+    var client, _ref2$querySettings, entitySchema, queryParams, listFilters, _entitySchema$display, _entitySchema$display2, _entitySchema$display3, _entitySchema$display4, _entitySchema$display5, _entitySchema$display6, source, isSearchQuery, query, variables, _yield$client$query, _yield$client$query$d, data;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          client = _ref.client, _ref$querySettings = _ref.querySettings, entitySchema = _ref$querySettings.entitySchema, queryParams = _ref$querySettings.queryParams;
-          query = (0, _buildListingQuery["default"])(entitySchema);
-          _context.next = 4;
+          client = _ref2.client, _ref2$querySettings = _ref2.querySettings, entitySchema = _ref2$querySettings.entitySchema, queryParams = _ref2$querySettings.queryParams, listFilters = _ref2.listFilters;
+          _entitySchema$display = entitySchema.displayProperties, _entitySchema$display2 = _entitySchema$display === void 0 ? {} : _entitySchema$display, _entitySchema$display3 = _entitySchema$display2.adminListings, _entitySchema$display4 = _entitySchema$display3 === void 0 ? {} : _entitySchema$display3, _entitySchema$display5 = _entitySchema$display4.dataSource, _entitySchema$display6 = _entitySchema$display5 === void 0 ? {} : _entitySchema$display5, source = _entitySchema$display6.source;
+          isSearchQuery = source === 'search';
+          query = (0, _buildListingQuery["default"])(entitySchema, isSearchQuery);
+          variables = buildVariables({
+            entitySchema: entitySchema,
+            listFilters: listFilters,
+            queryParams: queryParams,
+            isSearchQuery: isSearchQuery
+          });
+          _context.next = 7;
           return client.query({
             query: query,
-            variables: queryParams,
+            variables: variables,
             fetchPolicy: 'network-only'
           });
-        case 4:
-          _yield$client$query = _context.sent;
-          listingData = _yield$client$query.data.listingData;
-          return _context.abrupt("return", listingData);
         case 7:
+          _yield$client$query = _context.sent;
+          _yield$client$query$d = _yield$client$query.data;
+          data = _yield$client$query$d === void 0 ? {} : _yield$client$query$d;
+          return _context.abrupt("return", data.searchResults ? data.searchResults.results : data.listingData);
+        case 11:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
   return function fetchData(_x) {
-    return _ref2.apply(this, arguments);
+    return _ref3.apply(this, arguments);
   };
 }();
 exports.fetchData = fetchData;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_buildListingQuery","_interopRequireDefault","require","fetchData","_ref2","_asyncToGenerator2","_regenerator","mark","_callee","_ref","client","_ref$querySettings","entitySchema","queryParams","query","_yield$client$query","listingData","wrap","_callee$","_context","prev","next","querySettings","buildListingQuery","variables","fetchPolicy","sent","data","abrupt","stop","_x","apply","arguments","exports"],"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,IAAAA,kBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAMC,SAAS;EAAA,IAAAC,KAAA,OAAAC,kBAAA,2BAAAC,YAAA,YAAAC,IAAA,CAAG,SAAAC,QAAAC,IAAA;IAAA,IAAAC,MAAA,EAAAC,kBAAA,EAAAC,YAAA,EAAAC,WAAA,EAAAC,KAAA,EAAAC,mBAAA,EAAAC,WAAA;IAAA,OAAAV,YAAA,YAAAW,IAAA,UAAAC,SAAAC,QAAA;MAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;QAAA;UAASX,MAAM,GAAAD,IAAA,CAANC,MAAM,EAAAC,kBAAA,GAAAF,IAAA,CAAEa,aAAa,EAAIV,YAAY,GAAAD,kBAAA,CAAZC,YAAY,EAAEC,WAAW,GAAAF,kBAAA,CAAXE,WAAW;UACrEC,KAAK,GAAG,IAAAS,6BAAiB,EAACX,YAAY,CAAC;UAAAO,QAAA,CAAAE,IAAA;UAAA,OAGnCX,MAAM,CAACI,KAAK,CAAC;YAAEA,KAAK,EAALA,KAAK;YAAEU,SAAS,EAAEX,WAAW;YAAEY,WAAW,EAAE;UAAe,CAAC,CAAC;QAAA;UAAAV,mBAAA,GAAAI,QAAA,CAAAO,IAAA;UAD5EV,WAAW,GAAAD,mBAAA,CAAnBY,IAAI,CAAIX,WAAW;UAAA,OAAAG,QAAA,CAAAS,MAAA,WAGdZ,WAAW;QAAA;QAAA;UAAA,OAAAG,QAAA,CAAAU,IAAA;MAAA;IAAA,GAAArB,OAAA;EAAA,CACnB;EAAA,gBAPKL,SAASA,CAAA2B,EAAA;IAAA,OAAA1B,KAAA,CAAA2B,KAAA,OAAAC,SAAA;EAAA;AAAA,GAOd;AAACC,OAAA,CAAA9B,SAAA,GAAAA,SAAA"}
+{"version":3,"file":"index.js","names":["_buildListingQuery","_interopRequireDefault","require","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","buildVariables","_ref","entitySchema","isSearchQuery","_ref$listFilters","listFilters","_ref$queryParams","queryParams","identifier","sort","offset","limit","where","_sort","_slicedToArray2","_sort$","property","direction","parsedOffset","concat","Array","isArray","rawQuery","bool","must","term","entityIdentifier","JSON","stringify","fetchData","_ref3","_asyncToGenerator2","_regenerator","mark","_callee","_ref2","client","_ref2$querySettings","_entitySchema$display","_entitySchema$display2","_entitySchema$display3","_entitySchema$display4","_entitySchema$display5","_entitySchema$display6","source","query","variables","_yield$client$query","_yield$client$query$d","data","wrap","_callee$","_context","prev","next","querySettings","displayProperties","adminListings","dataSource","buildListingQuery","fetchPolicy","sent","abrupt","searchResults","results","listingData","stop","_x","exports"],"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":"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"}

package/lib/index.js

@@ -41,19 +41,11 @@ function load(_x) {
 }
 function _load() {
   _load = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(app) {
-    var sectionKey, entityDataListingRoute, editEntityRoute, addEntityRoute;
+    var entityDataListingRoute, editEntityRoute, addEntityRoute;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          // To load different plugin information into menu
-          sectionKey = 'content';
-          app.events.once('load:menu-section', function (addSection) {
-            addSection(sectionKey, {
-              header: 'content',
-              order: 100
-            });
-          });
-          app.events.once('load:menu-items', (0, _addContentMenuItems["default"])(app, sectionKey));
+          app.events.once('admin:menu:config:load', (0, _addContentMenuItems["default"])(app));
           app.events.once('load:custom:field:type', function (addFieldType) {
             Object.keys(_reactFormBuilder.formFieldTypes).forEach(function (type) {
               addFieldType({
@@ -99,7 +91,7 @@ function _load() {
             name: _constants.PLUGIN_NAME,
             version: _package["default"].version
           });
-        case 12:
+        case 10:
         case "end":
           return _context2.stop();
       }

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_reactFormBuilder","require","_react","_interopRequireDefault","_package","_constants","_addContentMenuItems","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","_typeof2","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","EntityDataListing","React","lazy","Promise","resolve","then","EntityManager","load","_x","_load","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee2","app","sectionKey","entityDataListingRoute","editEntityRoute","addEntityRoute","wrap","_callee2$","_context2","prev","next","events","once","addSection","header","order","getAddContentMenuItems","addFieldType","keys","formFieldTypes","forEach","type","component","_callee","_callee$","_context","emitAsync","getFormBuilderLookup","stop","path","concat","DATA_LISTING_PREFIX","exact","addRoute","abrupt","name","PLUGIN_NAME","version","pkg","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":"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"}
+{"version":3,"file":"index.js","names":["_reactFormBuilder","require","_react","_interopRequireDefault","_package","_constants","_addContentMenuItems","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","_typeof2","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","EntityDataListing","React","lazy","Promise","resolve","then","EntityManager","load","_x","_load","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee2","app","entityDataListingRoute","editEntityRoute","addEntityRoute","wrap","_callee2$","_context2","prev","next","events","once","getAddContentMenuItems","addFieldType","keys","formFieldTypes","forEach","type","component","_callee","_callee$","_context","emitAsync","getFormBuilderLookup","stop","path","concat","DATA_LISTING_PREFIX","exact","addRoute","abrupt","name","PLUGIN_NAME","version","pkg","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":"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"}

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

@@ -10,19 +10,22 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/es.object.entries.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _adminUiUtils = require("@blaze-cms/admin-ui-utils");
 var _require = require('../constants'),
   MENU_PERMISSIONS = _require.MENU_PERMISSIONS;
-function getAddContentMenuItems(app, sectionKey) {
+function getAddContentMenuItems(app) {
   return /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(addItem) {
-      var client, _yield$client$query, getEntitySchemas;
+    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(_ref) {
+      var addConfig, client, _yield$client$query, getEntitySchemas, menuItems, sectionMenuItems, menuConfig;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            addConfig = _ref.addConfig;
             client = app.getClient();
-            _context.next = 3;
+            _context.next = 4;
             return client.query({
               query: (0, _adminUiUtils.getQuery)('GET_USER_EDITABLE_ENTITIES'),
               variables: {
@@ -30,25 +33,73 @@ function getAddContentMenuItems(app, sectionKey) {
                 canDoActions: MENU_PERMISSIONS
               }
             });
-          case 3:
+          case 4:
             _yield$client$query = _context.sent;
             getEntitySchemas = _yield$client$query.data.getEntitySchemas;
-            getEntitySchemas.forEach(function (_ref2) {
-              var id = _ref2.id,
-                displayName = _ref2.displayName;
-              addItem({
-                name: displayName,
+            if (!(!getEntitySchemas || !getEntitySchemas.length)) {
+              _context.next = 8;
+              break;
+            }
+            return _context.abrupt("return");
+          case 8:
+            // no items so don't add section
+            menuItems = {};
+            sectionMenuItems = {
+              content: {}
+            };
+            getEntitySchemas.forEach(function (_ref3) {
+              var id = _ref3.id,
+                displayName = _ref3.displayName,
+                displayProperties = _ref3.displayProperties;
+              if (!displayProperties) return null;
+              var _displayProperties$ad = displayProperties.adminMenu,
+                _displayProperties$ad2 = _displayProperties$ad === void 0 ? {} : _displayProperties$ad,
+                _displayProperties$ad3 = _displayProperties$ad2.sectionKey,
+                sectionKey = _displayProperties$ad3 === void 0 ? 'content' : _displayProperties$ad3;
+              var sectionItems = sectionMenuItems[sectionKey] || {};
+              sectionItems[id] = {
+                label: displayName,
                 uri: "/data-listing/".concat(id)
-              }, sectionKey);
+              };
+              sectionMenuItems[sectionKey] = sectionItems;
             });
-          case 6:
+            menuConfig = {
+              main: {
+                items: {
+                  content: {
+                    label: 'Content',
+                    loadOpen: true,
+                    order: 10,
+                    items: menuItems
+                  }
+                }
+              }
+            };
+            Object.entries(sectionMenuItems).forEach(function (_ref4) {
+              var _ref5 = (0, _slicedToArray2["default"])(_ref4, 2),
+                sectionKey = _ref5[0],
+                sectionItems = _ref5[1];
+              var sectionConfig = menuConfig.main.items[sectionKey] || {};
+              sectionConfig.items = sectionItems;
+              menuConfig.main.items[sectionKey] = sectionConfig;
+            });
+            getEntitySchemas.forEach(function (_ref6) {
+              var id = _ref6.id,
+                displayName = _ref6.displayName;
+              menuItems[id] = {
+                label: displayName,
+                uri: "/data-listing/".concat(id)
+              };
+            });
+            addConfig(menuConfig);
+          case 15:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function (_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 }

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

@@ -1 +1 @@
-{"version":3,"file":"add-content-menu-items.js","names":["_adminUiUtils","require","_require","MENU_PERMISSIONS","getAddContentMenuItems","app","sectionKey","_ref","_asyncToGenerator2","_regenerator","mark","_callee","addItem","client","_yield$client$query","getEntitySchemas","wrap","_callee$","_context","prev","next","getClient","query","getQuery","variables","canDoActions","sent","data","forEach","_ref2","id","displayName","name","uri","concat","stop","_x","apply","arguments","_default","exports"],"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,IAAAA,aAAA,GAAAC,OAAA;AAEA,IAAAC,QAAA,GAA6BD,OAAO,CAAC,cAAc,CAAC;EAA5CE,gBAAgB,GAAAD,QAAA,CAAhBC,gBAAgB;AAExB,SAASC,sBAAsBA,CAACC,GAAG,EAAEC,UAAU,EAAE;EAC/C;IAAA,IAAAC,IAAA,OAAAC,kBAAA,2BAAAC,YAAA,YAAAC,IAAA,CAAO,SAAAC,QAAMC,OAAO;MAAA,IAAAC,MAAA,EAAAC,mBAAA,EAAAC,gBAAA;MAAA,OAAAN,YAAA,YAAAO,IAAA,UAAAC,SAAAC,QAAA;QAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;UAAA;YACZP,MAAM,GAAGR,GAAG,CAACgB,SAAS,CAAC,CAAC;YAAAH,QAAA,CAAAE,IAAA;YAAA,OAGpBP,MAAM,CAACS,KAAK,CAAC;cACrBA,KAAK,EAAE,IAAAC,sBAAQ,EAAC,4BAA4B,CAAC;cAC7CC,SAAS,EAAE;gBACT;gBACAC,YAAY,EAAEtB;cAChB;YACF,CAAC,CAAC;UAAA;YAAAW,mBAAA,GAAAI,QAAA,CAAAQ,IAAA;YAPQX,gBAAgB,GAAAD,mBAAA,CAAxBa,IAAI,CAAIZ,gBAAgB;YAQ1BA,gBAAgB,CAACa,OAAO,CAAC,UAAAC,KAAA,EAAyB;cAAA,IAAtBC,EAAE,GAAAD,KAAA,CAAFC,EAAE;gBAAEC,WAAW,GAAAF,KAAA,CAAXE,WAAW;cACzCnB,OAAO,CAAC;gBAAEoB,IAAI,EAAED,WAAW;gBAAEE,GAAG,mBAAAC,MAAA,CAAmBJ,EAAE;cAAG,CAAC,EAAExB,UAAU,CAAC;YACxE,CAAC,CAAC;UAAC;UAAA;YAAA,OAAAY,QAAA,CAAAiB,IAAA;QAAA;MAAA,GAAAxB,OAAA;IAAA,CACJ;IAAA,iBAAAyB,EAAA;MAAA,OAAA7B,IAAA,CAAA8B,KAAA,OAAAC,SAAA;IAAA;EAAA;AACH;AAAC,IAAAC,QAAA,GAEcnC,sBAAsB;AAAAoC,OAAA,cAAAD,QAAA"}
+{"version":3,"file":"add-content-menu-items.js","names":["_adminUiUtils","require","_require","MENU_PERMISSIONS","getAddContentMenuItems","app","_ref2","_asyncToGenerator2","_regenerator","mark","_callee","_ref","addConfig","client","_yield$client$query","getEntitySchemas","menuItems","sectionMenuItems","menuConfig","wrap","_callee$","_context","prev","next","getClient","query","getQuery","variables","canDoActions","sent","data","length","abrupt","content","forEach","_ref3","id","displayName","displayProperties","_displayProperties$ad","adminMenu","_displayProperties$ad2","_displayProperties$ad3","sectionKey","sectionItems","label","uri","concat","main","items","loadOpen","order","Object","entries","_ref4","_ref5","_slicedToArray2","sectionConfig","_ref6","stop","_x","apply","arguments","_default","exports"],"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":"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"}

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

@@ -6,15 +6,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-require("core-js/modules/es.array.join.js");
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+require("core-js/modules/es.array.join.js");
 var _client = require("@apollo/client");
 var _coreErrors = require("@blaze-cms/core-errors");
+var _adminUiUtils = require("@blaze-cms/admin-ui-utils");
 var _templateObject;
-function buildListingQuery(entitySchema) {
+var buildAdminSearchQuery = function buildAdminSearchQuery(entitySchema) {
+  var _ref = entitySchema || {},
+    _ref$listingPropertie = _ref.listingProperties,
+    listingProperties = _ref$listingPropertie === void 0 ? [] : _ref$listingPropertie;
+  var parsedProperties = "id, ".concat(listingProperties.join(' ') || 'id name');
+  return (0, _adminUiUtils.getDynamicQuery)('ADMIN_SEARCH')([entitySchema], parsedProperties, true);
+};
+function buildListingQuery(entitySchema, isSearchQuery) {
   if (!entitySchema.actions || !entitySchema.actions.getAll || !entitySchema.listingProperties) {
     throw new _coreErrors.BlazeError('Listing query requires getAll action and listingProperties from entity schema');
   }
+  if (isSearchQuery) return buildAdminSearchQuery(entitySchema);
   var sortType = entitySchema.actions.getAll[0].toUpperCase() + entitySchema.actions.getAll.substr(1);
   return (0, _client.gql)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n    query ", "($where: JSON, $limit: Int, $offset:Int, $sort: [", "SortItem]) {\n      listingData: ", "(where: $where, limit: $limit, offset:$offset, sort:$sort){\n        id,\n        ", "\n      }\n    }\n  "])), entitySchema.actions.getAll, sortType, entitySchema.actions.getAll, entitySchema.listingProperties.join(',\n'));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"build-listing-query.js","names":["_client","require","_coreErrors","_templateObject","buildListingQuery","entitySchema","actions","getAll","listingProperties","BlazeError","sortType","toUpperCase","substr","gql","_taggedTemplateLiteral2","join","_default","exports"],"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,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAAoD,IAAAE,eAAA;AAEpD,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,IAAIC,sBAAU,CAClB,+EACF,CAAC;EACH;EAEA,IAAMC,QAAQ,GACZL,YAAY,CAACC,OAAO,CAACC,MAAM,CAAC,CAAC,CAAC,CAACI,WAAW,CAAC,CAAC,GAAGN,YAAY,CAACC,OAAO,CAACC,MAAM,CAACK,MAAM,CAAC,CAAC,CAAC;EAEtF,WAAOC,WAAG,EAAAV,eAAA,KAAAA,eAAA,OAAAW,uBAAA,yOAENT,YAAY,CAACC,OAAO,CAACC,MAAM,EACuBG,QAAQ,EAExDL,YAAY,CAACC,OAAO,CAACC,MAAM,EAGzBF,YAAY,CAACG,iBAAiB,CAACO,IAAI,CAAC,KAAK,CAAC;AAIpD;AAAC,IAAAC,QAAA,GAEcZ,iBAAiB;AAAAa,OAAA,cAAAD,QAAA"}
+{"version":3,"file":"build-listing-query.js","names":["_client","require","_coreErrors","_adminUiUtils","_templateObject","buildAdminSearchQuery","entitySchema","_ref","_ref$listingPropertie","listingProperties","parsedProperties","concat","join","getDynamicQuery","buildListingQuery","isSearchQuery","actions","getAll","BlazeError","sortType","toUpperCase","substr","gql","_taggedTemplateLiteral2","_default","exports"],"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,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AAA4D,IAAAG,eAAA;AAE5D,IAAMC,qBAAqB,GAAG,SAAxBA,qBAAqBA,CAAGC,YAAY,EAAI;EAC5C,IAAAC,IAAA,GAAmCD,YAAY,IAAI,CAAC,CAAC;IAAAE,qBAAA,GAAAD,IAAA,CAA7CE,iBAAiB;IAAjBA,iBAAiB,GAAAD,qBAAA,cAAG,EAAE,GAAAA,qBAAA;EAC9B,IAAME,gBAAgB,UAAAC,MAAA,CAAUF,iBAAiB,CAACG,IAAI,CAAC,GAAG,CAAC,IAAI,SAAS,CAAE;EAE1E,OAAO,IAAAC,6BAAe,EAAC,cAAc,CAAC,CAAC,CAACP,YAAY,CAAC,EAAEI,gBAAgB,EAAE,IAAI,CAAC;AAChF,CAAC;AAED,SAASI,iBAAiBA,CAACR,YAAY,EAAES,aAAa,EAAE;EACtD,IAAI,CAACT,YAAY,CAACU,OAAO,IAAI,CAACV,YAAY,CAACU,OAAO,CAACC,MAAM,IAAI,CAACX,YAAY,CAACG,iBAAiB,EAAE;IAC5F,MAAM,IAAIS,sBAAU,CAClB,+EACF,CAAC;EACH;EAEA,IAAIH,aAAa,EAAE,OAAOV,qBAAqB,CAACC,YAAY,CAAC;EAE7D,IAAMa,QAAQ,GACZb,YAAY,CAACU,OAAO,CAACC,MAAM,CAAC,CAAC,CAAC,CAACG,WAAW,CAAC,CAAC,GAAGd,YAAY,CAACU,OAAO,CAACC,MAAM,CAACI,MAAM,CAAC,CAAC,CAAC;EAEtF,WAAOC,WAAG,EAAAlB,eAAA,KAAAA,eAAA,OAAAmB,uBAAA,yOAENjB,YAAY,CAACU,OAAO,CAACC,MAAM,EACuBE,QAAQ,EAExDb,YAAY,CAACU,OAAO,CAACC,MAAM,EAGzBX,YAAY,CAACG,iBAAiB,CAACG,IAAI,CAAC,KAAK,CAAC;AAIpD;AAAC,IAAAY,QAAA,GAEcV,iBAAiB;AAAAW,OAAA,cAAAD,QAAA"}