@blaze-cms/plugin-data-ui 0.146.0-rc-eagle-3.9 → 0.146.0-rc-eagle-3.11

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

@@ -2,6 +2,13 @@ import { getQuery } from '@blaze-cms/admin-ui-utils';
 
 const { MENU_PERMISSIONS } = require('../constants');
 
+// Menu items label a listing of many records, so they use the plural. The
+// fallback matters: this package and the API are published independently, so an
+// admin bundle can run against an API that does not yet resolve the field.
+function getMenuLabel({ displayName, displayNamePlural }) {
+  return displayNamePlural || displayName || '';
+}
+
 function getAddContentMenuItems(app) {
   return async ({ addConfig }) => {
     const client = app.getClient();
@@ -17,30 +24,31 @@ function getAddContentMenuItems(app) {
 
     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;
+    // Order by the label that is rendered, not by displayName. getEntitySchemas
+    // is sorted on displayName server-side and that order serves every other
+    // consumer, which shows the singular, so the plural ordering belongs here.
+    // The explicit `order` is what MenuSectionItems reads to sort.
+    const orderedEntities = [...getEntitySchemas].sort((entityA, entityB) =>
+      getMenuLabel(entityA).localeCompare(getMenuLabel(entityB))
+    );
+
+    orderedEntities.forEach((entity, order) => {
+      const { id, displayProperties } = entity;
+      if (!displayProperties) return;
 
       const { adminMenu: { sectionKey = 'settings' } = {} } = displayProperties;
       const sectionItems = sectionMenuItems[sectionKey] || {};
       sectionItems[id] = {
-        label: displayName,
+        label: getMenuLabel(entity),
+        order,
         uri: `/data-listing/${id}`
       };
       sectionMenuItems[sectionKey] = sectionItems;
     });
 
-    const menuConfig = {
-      main: {
-        items: {
-          settings: {
-            items: menuItems
-          }
-        }
-      }
-    };
+    const menuConfig = { main: { items: {} } };
 
     Object.entries(sectionMenuItems).forEach(([sectionKey, sectionItems]) => {
       const sectionConfig = menuConfig.main.items[sectionKey] || {};
@@ -48,13 +56,6 @@ function getAddContentMenuItems(app) {
       menuConfig.main.items[sectionKey] = sectionConfig;
     });
 
-    getEntitySchemas.forEach(({ id, displayName }) => {
-      menuItems[id] = {
-        label: displayName,
-        uri: `/data-listing/${id}`
-      };
-    });
-
     addConfig(menuConfig);
   };
 }