@strapi/admin 4.5.2 → 4.6.0-alpha.0

package/admin/src/core/apis/CustomFields.js

@@ -19,6 +19,40 @@ const ALLOWED_TYPES = [
   'uid',
 ];
 
+const ALLOWED_ROOT_LEVEL_OPTIONS = [
+  'min',
+  'minLength',
+  'max',
+  'maxLength',
+  'required',
+  'regex',
+  'enum',
+  'unique',
+  'private',
+  'default',
+];
+
+const optionValidationsReducer = (acc, option) => {
+  if (option.items) {
+    return option.items.reduce(optionValidationsReducer, acc);
+  }
+
+  if (!option.name) {
+    acc.push({
+      isValidOptionPath: false,
+      errorMessage: "The 'name' property is required on an options object",
+    });
+  } else {
+    acc.push({
+      isValidOptionPath:
+        ALLOWED_ROOT_LEVEL_OPTIONS.includes(option.name) || option.name.startsWith('options'),
+      errorMessage: `'${option.name}' must be prefixed with 'options.'`,
+    });
+  }
+
+  return acc;
+};
+
 class CustomFields {
   constructor() {
     this.customFields = {};
@@ -32,7 +66,8 @@ class CustomFields {
       });
     } else {
       // Handle individual custom field
-      const { name, pluginId, type, intlLabel, intlDescription, components } = customFields;
+      const { name, pluginId, type, intlLabel, intlDescription, components, options } =
+        customFields;
 
       // Ensure required attributes are provided
       invariant(name, 'A name must be provided');
@@ -55,6 +90,16 @@ class CustomFields {
         `Custom field name: '${name}' is not a valid object key`
       );
 
+      // Ensure options have valid name paths
+      const allFormOptions = [...(options?.base || []), ...(options?.advanced || [])];
+
+      if (allFormOptions.length) {
+        const optionPathValidations = allFormOptions.reduce(optionValidationsReducer, []);
+        optionPathValidations.forEach(({ isValidOptionPath, errorMessage }) => {
+          invariant(isValidOptionPath, errorMessage);
+        });
+      }
+
       // When no plugin is specified, default to the global namespace
       const uid = pluginId ? `plugin::${pluginId}.${name}` : `global::${name}`;
 

package/admin/src/pages/MarketplacePage/components/SortSelect/index.js

@@ -37,6 +37,26 @@ const SortSelect = ({ sortQuery, handleSelectChange }) => {
         defaultMessage: 'Newest',
       },
     },
+    'githubStars:desc': {
+      selected: {
+        id: 'admin.pages.MarketPlacePage.sort.githubStars.selected',
+        defaultMessage: 'Sort by GitHub stars',
+      },
+      option: {
+        id: 'admin.pages.MarketPlacePage.sort.githubStars',
+        defaultMessage: 'Number of GitHub stars',
+      },
+    },
+    'npmDownloads:desc': {
+      selected: {
+        id: 'admin.pages.MarketPlacePage.sort.npmDownloads.selected',
+        defaultMessage: 'Sort by npm downloads',
+      },
+      option: {
+        id: 'admin.pages.MarketPlacePage.sort.npmDownloads',
+        defaultMessage: 'Number of downloads',
+      },
+    },
   };
 
   return (

package/admin/src/translations/en.json

@@ -290,6 +290,10 @@
   "admin.pages.MarketPlacePage.sort.newest": "Newest",
   "admin.pages.MarketPlacePage.sort.alphabetical.selected": "Sort by alphabetical order",
   "admin.pages.MarketPlacePage.sort.newest.selected": "Sort by newest",
+  "admin.pages.MarketPlacePage.sort.githubStars": "Number of GitHub stars",
+  "admin.pages.MarketPlacePage.sort.githubStars.selected": "Sort by GitHub stars",
+  "admin.pages.MarketPlacePage.sort.npmDownloads": "Number of downloads",
+  "admin.pages.MarketPlacePage.sort.npmDownloads.selected": "Sort by npm downloads",
   "admin.pages.MarketPlacePage.filters.collections": "Collections",
   "admin.pages.MarketPlacePage.filters.collectionsSelected": "{count, plural, =0 {No collections} one {# collection} other {# collections}} selected",
   "admin.pages.MarketPlacePage.filters.categories": "Categories",