remult 3.2.2-next.2 → 3.2.3

package/server/remult-admin.d.ts

@@ -30,12 +30,14 @@ export interface FieldUIInfo {
     caption: string;
     type: FieldUIInfoType;
     inputType: string;
+    allowNull: boolean;
     relationToOne?: FieldRelationToOneInfo;
 }
 export interface FieldRelationToOneInfo extends RelationFields {
     entityKey: string;
     idField: string;
     captionField: string;
+    allowNull: boolean;
     where?: any;
 }
 export interface AdminEntitiesOptions {

package/server/remult-admin.js

@@ -65,7 +65,7 @@ function buildEntityInfo(options) {
                             }
                         }
                         if (relRepo.metadata.apiReadAllowed) {
-                            relation = tslib_1.__assign(tslib_1.__assign({}, relInfo), { where: where, entityKey: relRepo.metadata.key, idField: idField_1, captionField: (_b = relRepo.metadata.fields
+                            relation = tslib_1.__assign(tslib_1.__assign({}, relInfo), { allowNull: x.allowNull, where: where, entityKey: relRepo.metadata.key, idField: idField_1, captionField: (_b = relRepo.metadata.fields
                                     .toArray()
                                     .find(function (x) { return x.key != idField_1 && x.valueType == String; })) === null || _b === void 0 ? void 0 : _b.key });
                         }
@@ -85,6 +85,7 @@ function buildEntityInfo(options) {
                     caption: x.label,
                     relationToOne: relation,
                     inputType: x.inputType,
+                    allowNull: x.allowNull,
                     type: x.inputType === inputTypes_js_1.InputTypes.json
                         ? 'json'
                         : x.valueType === Number

package/src/remult3/RepositoryImplementation.d.ts

@@ -6,7 +6,7 @@ import type { EntityOptions } from '../entity.js';
 import { Filter } from '../filter/filter-interfaces.js';
 import { type GroupByOptions, type GroupByResult, type ControllerRef, type ControllerRefForControllerBase, type EntityFilter, type EntityMetadata, type EntityOrderBy, type EntityRef, type EntityRefForEntityBase, type FieldRef, type FieldsMetadata, type FieldsRef, type FieldsRefForEntityBase, type FindFirstOptions, type FindFirstOptionsBase, type FindOptions, type IdMetadata, type LiveQuery, type LoadOptions, type MembersOnly, type NumericKeys, type Repository, type RepositoryRelations, type idType } from './remult3.js';
 import type { QueryOptions, RefSubscriber, UpsertOptions } from './remult3.js';
-import type { entityEventListener } from '../__EntityValueProvider.js';
+import type { entityEventListener, packedRowInfo } from '../__EntityValueProvider.js';
 import { type DataProvider, type EntityDataProvider, type EntityDataProviderGroupByOptions, type EntityDataProviderFindOptions, type ErrorInfo, EntityError } from '../data-interfaces.js';
 import type { Unsubscribe } from '../live-query/SubscriptionChannel.js';
 import { RelationLoader } from './relation-loader.js';
@@ -136,6 +136,7 @@ export declare class rowHelperImplementation<T> extends rowHelperBase<T> impleme
     private repo;
     private edp;
     private _isNew;
+    _updateResultsFromServerAction(rowInfo: packedRowInfo): Promise<void>;
     constructor(info: EntityFullInfo<T>, instance: T, repo: RepositoryImplementation<T>, edp: EntityDataProvider, remult: Remult, _isNew: boolean, excludeRelationMembers?: Set<string>);
     repository: Repository<unknown>;
     clone(): T;

package/src/remult3/RepositoryImplementation.js

@@ -2273,6 +2273,24 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             context_js_1.Remult.entityRefInit(_this, instance);
         return _this;
     }
+    rowHelperImplementation.prototype._updateResultsFromServerAction = function (rowInfo) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this._updateEntityBasedOnApi(rowInfo.data, true)];
+                    case 1:
+                        _a.sent();
+                        if (this._isNew != rowInfo.isNewRow) {
+                            this._isNew = rowInfo.isNewRow;
+                            this.originalId = rowInfo.id;
+                        }
+                        if (!rowInfo.wasChanged)
+                            this.originalValues = this.copyDataToObject();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     rowHelperImplementation.prototype.clone = function () {
         var data = this.toApiJson(true, true);
         return this.repo.fromJson(data, this.isNew());

package/src/server-action.js

@@ -295,7 +295,7 @@ function BackendMethod(options) {
                     reg(controllerOptions.key +
                         '/' +
                         ((options === null || options === void 0 ? void 0 : options.apiPrefix) ? options.apiPrefix + '/' : '') +
-                        key, options ? (_b = options.queue) !== null && _b !== void 0 ? _b : false : false, options.allowed, function (d, req, res) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        key, options ? ((_b = options.queue) !== null && _b !== void 0 ? _b : false) : false, options.allowed, function (d, req, res) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                         var allowed, remult_1, r_1, err_3;
                         var _this = this;
                         return tslib_1.__generator(this, function (_a) {
@@ -475,7 +475,7 @@ function BackendMethod(options) {
                                     http])];
                             case 4:
                                 r = _k.sent();
-                                return [4 /*yield*/, defs._updateEntityBasedOnApi(r.rowInfo.data, true)];
+                                return [4 /*yield*/, defs._updateResultsFromServerAction(r.rowInfo)];
                             case 5:
                                 _k.sent();
                                 return [2 /*return*/, r.result];