@blaze-cms/plugin-data-ui 0.139.0-alpha.4 → 0.139.0-alpha.6

package/src/icons/UsersIcon.js

@@ -0,0 +1,37 @@
+import React from 'react';
+import { ICON_SIZE, ICON_COLOR } from '../constants';
+
+function UserIcon({
+  width = ICON_SIZE.WIDTH,
+  height = ICON_SIZE.HEIGHT,
+  stroke = ICON_COLOR.STROKE
+}) {
+  return (
+    <svg
+      width={width}
+      height={height}
+      viewBox="0 0 22 22"
+      version="1.1"
+      xmlns="http://www.w3.org/2000/svg"
+      xmlnsXlink="http://www.w3.org/1999/xlink">
+      <title>user</title>
+      <g
+        id="Page-1"
+        stroke="none"
+        strokeWidth={1}
+        fill="none"
+        fillRule="evenodd"
+        strokeLinecap="round"
+        strokeLinejoin="round">
+        <g id="Group" transform="translate(1, 0.76)" stroke={stroke}>
+          <path
+            d="M2.35666666,16.4488888 C4.68824079,15.1310199 7.32175438,14.4403878 10,14.4444089 C12.7777778,14.4444089 15.3855556,15.1722221 17.6433334,16.4488888 M13.3333334,7.7777776 C13.3333334,9.61872677 11.8409492,11.1111109 10,11.1111109 C8.15905083,11.1111109 6.66666666,9.61872677 6.66666666,7.7777776 C6.66666666,5.93682842 8.15905083,4.44444425 10,4.44444425 C11.8409492,4.44444425 13.3333334,5.93682842 13.3333334,7.7777776 L13.3333334,7.7777776 Z M20,10 C20,13.5726558 18.0940108,16.8739261 15,18.660254 C11.9059893,20.446582 8.09401075,20.446582 5,18.660254 C1.90598917,16.8739261 0,13.5726558 0,10 C0,4.47715239 4.47715258,0 10,0 C15.5228474,0 20,4.47715239 20,10 L20,10 Z"
+            id="Shape"
+          />
+        </g>
+      </g>
+    </svg>
+  );
+}
+
+export default UserIcon;

package/src/icons/index.js

@@ -0,0 +1,6 @@
+import UserIcon from './UsersIcon';
+import TaxonomyIcon from './TaxonomyIcon';
+import ContentIcon from './ContentIcon';
+import SettingsIcon from './SettingsIcon';
+
+export { UserIcon, TaxonomyIcon, ContentIcon, SettingsIcon };

package/src/index.js

@@ -3,6 +3,7 @@ import React from 'react';
 import pkg from '../package.json';
 import { DATA_LISTING_PREFIX, PLUGIN_NAME } from './constants';
 import getAddContentMenuItems from './utils/add-content-menu-items';
+import { UserIcon, TaxonomyIcon, ContentIcon, SettingsIcon } from './icons';
 
 const EntityDataListing = React.lazy(() =>
   import(/* webpackChunkName: 'EntityDataListing' */ './components/EntityDataListing')
@@ -12,14 +13,7 @@ const EntityManager = React.lazy(() =>
 );
 
 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 => {
@@ -31,6 +25,40 @@ export default async function load(app) {
     await app.events.emitAsync('load:custom:field:type', getFormBuilderLookup.addFieldType);
   });
 
+  app.events.once('admin:menu:config:load', ({ addConfig }) => {
+    addConfig({
+      main: {
+        items: {
+          content: {
+            label: 'content',
+            loadOpen: true,
+            items: {},
+            icon: ContentIcon,
+            order: 10
+          },
+          taxonomy: {
+            label: 'Taxonomy',
+            items: {},
+            icon: TaxonomyIcon,
+            order: 40
+          },
+          user: {
+            label: 'User',
+            items: {},
+            icon: UserIcon,
+            order: 90
+          },
+          settings: {
+            label: 'Settings',
+            items: {},
+            icon: SettingsIcon,
+            order: 100
+          }
+        }
+      }
+    });
+  });
+
   const entityDataListingRoute = {
     path: `${DATA_LISTING_PREFIX}/:entityIdentifier`,
     key: 'entityDataListing',

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

@@ -2,8 +2,8 @@ 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: { getEntitySchemas }
@@ -14,9 +14,48 @@ function getAddContentMenuItems(app, sectionKey) {
         canDoActions: MENU_PERMISSIONS
       }
     });
+
+    if (!getEntitySchemas || !getEntitySchemas.length) return; // no items so don't add section
+
+    const menuItems = {};
+    const sectionMenuItems = { settings: {} };
+
+    getEntitySchemas.forEach(({ id, displayName, displayProperties }) => {
+      if (!displayProperties) return null;
+
+      const { adminMenu: { sectionKey = 'settings' } = {} } = displayProperties;
+      const sectionItems = sectionMenuItems[sectionKey] || {};
+      sectionItems[id] = {
+        label: displayName,
+        uri: `/data-listing/${id}`
+      };
+      sectionMenuItems[sectionKey] = sectionItems;
+    });
+
+    const menuConfig = {
+      main: {
+        items: {
+          settings: {
+            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, uri: `/data-listing/${id}` }, sectionKey);
+      menuItems[id] = {
+        label: displayName,
+        uri: `/data-listing/${id}`
+      };
     });
+
+    addConfig(menuConfig);
   };
 }
 

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

@@ -1,13 +1,23 @@
 import { gql } from '@apollo/client';
 import { BlazeError } from '@blaze-cms/core-errors';
+import { getDynamicQuery } from '@blaze-cms/admin-ui-utils';
 
-function buildListingQuery(entitySchema) {
+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);
 

package/src/utils/get-default-query-params.js

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