@appsemble/utils 0.32.1-test.14 → 0.32.1-test.16

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.32.1-test.14/config/assets/logo.svg) Appsemble Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.32.1-test.16/config/assets/logo.svg) Appsemble Utilities
 
 > Internal utility functions used across multiple Appsemble projects.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/utils)](https://www.npmjs.com/package/@appsemble/utils)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.32.1-test.14/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.32.1-test.14)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.32.1-test.16/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.32.1-test.16)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -26,5 +26,5 @@ not guaranteed.
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.32.1-test.14/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.32.1-test.16/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/api/components/schemas/ResourceDefinition.js

@@ -87,6 +87,15 @@ name of the resource and how it should behave.
             default: false,
             description: 'Whether to enable position column for the instances of this resource. This is used for keeping an ordered list to enable custom sorting of the data using drag and drop features.',
         },
+        enforceOrderingGroupByFields: {
+            type: 'array',
+            pattern: '^[a-zA-Z0-9]*$',
+            description: 'Group resources by fields when handling resource positions',
+            items: {
+                type: 'string',
+            },
+            minItems: 1,
+        },
         url: {
             type: 'string',
             default: '/api/apps/{appId}/{resource}',

package/api/paths/apps/appId/resources/resourceType/resourceId/positions.js

@@ -3,6 +3,8 @@ export const pathItems = {
         { $ref: '#/components/parameters/appId' },
         { $ref: '#/components/parameters/resourceType' },
         { $ref: '#/components/parameters/resourceId' },
+        { $ref: '#/components/parameters/selectedGroupId' },
+        { $ref: '#/components/parameters/$filter' },
     ],
     put: {
         tags: ['app', 'resource', 'positioning', 'custom-sort'],

package/objectCache.d.ts

@@ -1,7 +1,7 @@
 /**
  * Create a function for memoizing values.
  *
- * The cache accepts a favtory function which is used for creating a value. If cache is called with
+ * The cache accepts a factory function which is used for creating a value. If cache is called with
  * the value, the factory is called and the returned value is memoized. If the cache is called with
  * the same value again, the memoized value is returned.
  *

package/objectCache.js

@@ -1,7 +1,7 @@
 /**
  * Create a function for memoizing values.
  *
- * The cache accepts a favtory function which is used for creating a value. If cache is called with
+ * The cache accepts a factory function which is used for creating a value. If cache is called with
  * the value, the factory is called and the returned value is memoized. If the cache is called with
  * the same value again, the memoized value is returned.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/utils",
-  "version": "0.32.1-test.14",
+  "version": "0.32.1-test.16",
   "description": "Utility functions used in Appsemble internally",
   "keywords": [
     "app",
@@ -39,7 +39,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.32.1-test.14",
+    "@appsemble/types": "0.32.1-test.16",
     "@odata/parser": "^0.2.14",
     "axios": "^1.0.0",
     "cron-parser": "^4.0.0",

package/validation.js

@@ -111,8 +111,22 @@ function validateResourceSchemas(definition, report) {
         if (!resource?.schema) {
             continue;
         }
-        const { schema } = resource;
+        const { enforceOrderingGroupByFields, positioning, schema } = resource;
         const prefix = ['resources', resourceName, 'schema'];
+        if (!positioning && enforceOrderingGroupByFields?.length) {
+            report(enforceOrderingGroupByFields, 'must set positioning to true', [
+                'resources',
+                resourceName,
+                'enforceOrderingGroupByFields',
+            ]);
+        }
+        if (enforceOrderingGroupByFields?.some((item) => !item.match('^[a-zA-Z0-9]*$'))) {
+            report(enforceOrderingGroupByFields, 'must be alphanumeric', [
+                'resources',
+                resourceName,
+                'enforceOrderingGroupByFields',
+            ]);
+        }
         const reservedKeywords = new Set([
             'created',
             'updated',