remult 2.7.29 → 2.7.31

package/esm/server/remult-admin.js

@@ -3,9 +3,11 @@ import { Filter } from '../src/filter/filter-interfaces.js';
 import { getHtml } from './get-remult-admin-html.js';
 import { getValueList } from '../src/remult3/RepositoryImplementation.js';
 export default function remultAdminHtml(options) {
-    let { remult, entities, ...optionsFromServer } = { ...options };
-    return getHtml().replace('<!--PLACE_HERE-->', `<script>
-  const optionsFromServer = ${JSON.stringify(optionsFromServer)}
+    const { rootPath, head } = options;
+    return getHtml()
+        .replace('<!--PLACE_HERE_HEAD-->', head)
+        .replace('<!--PLACE_HERE_BODY-->', `<script>
+  window.optionsFromServer = ${JSON.stringify({ rootPath })}
 </script>`);
 }
 export function buildEntityInfo(options) {
@@ -59,6 +61,8 @@ export function buildEntityInfo(options) {
                                 ...relInfo,
                                 where,
                                 entityKey: relRepo.metadata.key,
+                                key: x.key,
+                                caption: x.caption,
                             });
                         }
                         continue;
@@ -89,9 +93,17 @@ export function buildEntityInfo(options) {
             }
         }
         if (metadata.apiReadAllowed) {
+            let superKey = metadata.key;
+            let caption = metadata.caption;
+            const nbOfEntities = entities.filter(e => e.key === metadata.key).length;
+            if (nbOfEntities > 0) {
+                superKey = metadata.key + '_ext_' + nbOfEntities;
+                caption = metadata.caption + '*'.repeat(nbOfEntities);
+            }
             entities.push({
+                superKey,
                 key: metadata.key,
-                caption: metadata.caption,
+                caption,
                 ids,
                 fields,
                 relations,

package/esm/server/remult-api-server.js

@@ -204,7 +204,10 @@ export class RemultServerImplementation {
                 }, r);
             if (this.options.admin !== undefined && this.options.admin !== false) {
                 const admin = () => this.process(async (remult, req, res, orig, origResponse) => {
-                    if (remult.isAllowed(this.options.admin)) {
+                    const allowed = isOfType(this.options.admin, 'allow')
+                        ? this.options.admin.allow
+                        : this.options.admin;
+                    if (remult.isAllowed(allowed)) {
                         if (orig?.params?.id === '__entities-metadata') {
                             res.success(buildEntityInfo({
                                 remult,
@@ -212,10 +215,14 @@ export class RemultServerImplementation {
                             }));
                         }
                         else {
+                            let head = '<title>Admin</title>';
+                            if (isOfType(this.options.admin, 'allow') &&
+                                this.options.admin.customHtmlHead) {
+                                head = this.options.admin.customHtmlHead(remult);
+                            }
                             origResponse.send(remultAdminHtml({
-                                remult: remult,
-                                entities: this.options.entities,
-                                baseUrl: this.options.rootPath + '/admin',
+                                rootPath: this.options.rootPath ?? '/api',
+                                head,
                             }));
                         }
                     }

package/esm/src/filter/filter-interfaces.js

@@ -720,8 +720,13 @@ export function buildFilterFromRequestParameters(entity, filterInfo) {
                     }),
                 });
         }
-        if (not.length == 1 && !where.$not) {
-            where = not[0];
+        if (not.length == 1) {
+            if (!where.$not) {
+                where.$not = not[0].$not;
+            }
+            else {
+                where.$not.push(not[0].$not);
+            }
         }
         else {
             addAnd({

package/esm/src/valueConverters.js

@@ -136,7 +136,9 @@ export class ValueConverters {
         toJson: (value) => ValueConverters.Number.toDb(value),
         fromInput: (x, type) => {
             let r = +x;
-            if (x === null || x === undefined)
+            if (x === null)
+                return null;
+            if (x === undefined)
                 return undefined;
             return r;
         },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "2.7.29",
+    "version": "2.7.31",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {