@blaze-cms/plugin-data-ui 0.139.0-alpha.1 → 0.139.0-project-admin-customisations.0

package/src/icons/TaxonomyIcon.js

@@ -0,0 +1,74 @@
+import React from 'react';
+import { ICON_SIZE } from '../constants';
+
+function TaxonomyIcon({ width = ICON_SIZE.WIDTH, height = ICON_SIZE.HEIGHT }) {
+  return (
+    <svg
+      width={width}
+      height={height}
+      viewBox="0 0 21 21"
+      version="1.1"
+      xmlns="http://www.w3.org/2000/svg"
+      xmlnsXlink="http://www.w3.org/1999/xlink">
+      <title>icons/taxonomy</title>
+      <g id="Symbols" stroke="none" strokeWidth={1} fill="none" fillRule="evenodd">
+        <g id="main-menu/collapsed" transform="translate(-15, -412)">
+          <g id="Group-4" transform="translate(9, 19)">
+            <g id="scheme" transform="translate(0, 386)">
+              <g id="icons/taxonomy" transform="translate(7, 8)">
+                <g
+                  id="Group"
+                  stroke="#63779C"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth="1.5">
+                  <rect
+                    id="Rectangle"
+                    x={0}
+                    y="12.6666667"
+                    width="6.33333333"
+                    height="6.33333333"
+                    rx={2}
+                  />
+                  <rect
+                    id="Rectangle"
+                    x="12.6666667"
+                    y="12.6666667"
+                    width="6.33333333"
+                    height="6.33333333"
+                    rx={2}
+                  />
+                  <rect
+                    id="Rectangle"
+                    x="6.33333333"
+                    y={0}
+                    width="6.33333333"
+                    height="6.33333333"
+                    rx={2}
+                  />
+                  <path
+                    d="M3.16666667,12.6666667 L3.16666667,11.6111111 C3.16666667,10.4451766 4.11184331,9.5 5.27777778,9.5 L13.7222222,9.5 C14.8881567,9.5 15.8333333,10.4451766 15.8333333,11.6111111 L15.8333333,12.6666667"
+                    id="Path"
+                  />
+                  <line x1="9.5" y1="6.33333333" x2="9.5" y2="9.5" id="Path" />
+                </g>
+                <rect
+                  id="Rectangle"
+                  fillOpacity={0}
+                  fill="#000000"
+                  fillRule="nonzero"
+                  x={0}
+                  y={0}
+                  width={19}
+                  height={19}
+                />
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </svg>
+  );
+}
+
+export default TaxonomyIcon;

package/src/icons/UsersIcon.js

@@ -0,0 +1,50 @@
+import React from 'react';
+import { ICON_SIZE } from '../constants';
+
+function UserIcon({ width = ICON_SIZE.WIDTH, height = ICON_SIZE.HEIGHT }) {
+  return (
+    <svg
+      width={width}
+      height={height}
+      viewBox="0 0 21 20"
+      version="1.1"
+      xmlns="http://www.w3.org/2000/svg"
+      xmlnsXlink="http://www.w3.org/1999/xlink">
+      <title>icons/user</title>
+      <g id="Symbols" stroke="none" strokeWidth={1} fill="none" fillRule="evenodd">
+        <g id="main-menu/collapsed" transform="translate(-14, -453)">
+          <g id="Group-4" transform="translate(9, 19)">
+            <g id="Group-15" transform="translate(0, 428)">
+              <g id="icons/user" transform="translate(6, 6)">
+                <g
+                  id="Group"
+                  transform="translate(0, 0.76)"
+                  stroke="#63779C"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth="1.5">
+                  <path
+                    d="M2.23883333,15.0013865 C4.45382875,13.7994901 6.95566666,13.1696336 9.5,13.1733169 C12.1388889,13.1733169 14.6162778,13.8370665 16.7611667,15.0013865 M12.6666667,7.09333314 C12.6666667,8.77227878 11.2489017,10.1333331 9.5,10.1333331 C7.75109829,10.1333331 6.33333333,8.77227878 6.33333333,7.09333314 C6.33333333,5.4143875 7.75109829,4.05333314 9.5,4.05333314 C11.2489017,4.05333314 12.6666667,5.4143875 12.6666667,7.09333314 L12.6666667,7.09333314 Z M19,9.11999981 C19,12.378262 17.1893103,15.3890205 14.25,17.0181516 C11.3106898,18.6472827 7.68931021,18.6472827 4.74999996,17.0181516 C1.81068971,15.3890205 4.68760833e-16,12.378262 4.68760833e-16,9.11999981 C4.68760833e-16,4.08316296 4.25329495,0 9.5,0 C14.746705,0 19,4.08316296 19,9.11999981 L19,9.11999981 Z"
+                    id="Shape"
+                  />
+                </g>
+                <rect
+                  id="Rectangle"
+                  fillOpacity={0}
+                  fill="#000000"
+                  fillRule="nonzero"
+                  x={0}
+                  y={0}
+                  width={19}
+                  height="18.24"
+                />
+              </g>
+            </g>
+          </g>
+        </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 || {};