@ruiapp/rapid-core 0.1.67 → 0.1.69

package/dist/index.js

@@ -2638,7 +2638,7 @@ async function createEntity(server, dataAccessor, options, plugin) {
                 targetRow[property.targetIdColumnName] = targetEntityId;
             }
         }
-        else if (lodash.isNumber(fieldValue)) {
+        else if (lodash.isNumber(fieldValue) || lodash.isString(fieldValue)) {
             // fieldValue is id;
             const targetEntityId = fieldValue;
             const targetEntity = await findById(server, targetDataAccessor, {
@@ -2849,7 +2849,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
                 targetRow[property.targetIdColumnName] = targetEntityId;
             }
         }
-        else if (lodash.isNumber(fieldValue)) {
+        else if (lodash.isNumber(fieldValue) || lodash.isString(fieldValue)) {
             // fieldValue is id;
             const targetEntityId = fieldValue;
             const targetEntity = await findById(server, targetDataAccessor, {
@@ -3348,7 +3348,8 @@ class RapidServer {
     }
     async emitEvent(event) {
         const { eventName, payload, sender, routeContext: routerContext } = event;
-        this.#logger.debug(`Emitting '${eventName}' event.`, { eventName, payload });
+        this.#logger.debug(`Emitting '${eventName}' event.`, { eventName });
+        this.#logger.verbose(`Event payload: `, { payload });
         await this.#eventManager.emit(eventName, sender, payload, routerContext);
         // TODO: should move this logic into metaManager
         // if (
@@ -5854,6 +5855,7 @@ var SystemSettingGroupSetting = {
             name: "items",
             code: "items",
             type: "relation[]",
+            relation: "many",
             targetSingularCode: "system_setting_item_setting",
             selfIdColumnName: "group_id",
         },
@@ -5922,6 +5924,7 @@ var SystemSettingItemSetting = {
             name: "group",
             code: "group",
             type: "relation",
+            relation: "one",
             targetSingularCode: "system_setting_group_setting",
             targetIdColumnName: "group_id",
             required: true,
@@ -6021,6 +6024,7 @@ var UserSettingGroupSetting = {
             name: "items",
             code: "items",
             type: "relation[]",
+            relation: "many",
             targetSingularCode: "user_setting_item_setting",
             selfIdColumnName: "group_id",
         },
@@ -6096,6 +6100,7 @@ var UserSettingItemSetting = {
             name: "group",
             code: "group",
             type: "relation",
+            relation: "one",
             targetSingularCode: "user_setting_group_setting",
             targetIdColumnName: "group_id",
             required: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.67",
+  "version": "0.1.69",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/dataAccess/entityManager.ts

@@ -22,7 +22,7 @@ import { mapDbRowToEntity, mapEntityToDbRow } from "./entityMapper";
 import { mapPropertyNameToColumnName } from "./propertyMapper";
 import { IRpdServer, RapidPlugin } from "~/core/server";
 import { getEntityPartChanges } from "~/helpers/entityHelpers";
-import { filter, find, first, forEach, isArray, isNumber, isObject, keys, map, reject, uniq } from "lodash";
+import { filter, find, first, forEach, isArray, isNumber, isObject, isString, keys, map, reject, uniq } from "lodash";
 import { getEntityPropertiesIncludingBase, getEntityProperty, getEntityPropertyByCode, isRelationProperty } from "../helpers/metaHelper";
 import { ColumnSelectOptions, CountRowOptions, FindRowOptions, FindRowOrderByOptions, RowFilterOptions } from "./dataAccessTypes";
 import { newEntityOperationError } from "~/utilities/errorUtility";
@@ -709,7 +709,7 @@ async function createEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor,
         newEntityOneRelationProps[property.code] = targetEntity;
         targetRow[property.targetIdColumnName!] = targetEntityId;
       }
-    } else if (isNumber(fieldValue)) {
+    } else if (isNumber(fieldValue) || isString(fieldValue)) {
       // fieldValue is id;
       const targetEntityId = fieldValue;
       const targetEntity = await findById(server, targetDataAccessor, {
@@ -942,7 +942,7 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
         updatedEntityOneRelationProps[property.code] = targetEntity;
         targetRow[property.targetIdColumnName!] = targetEntityId;
       }
-    } else if (isNumber(fieldValue)) {
+    } else if (isNumber(fieldValue) || isString(fieldValue)) {
       // fieldValue is id;
       const targetEntityId = fieldValue;
       const targetEntity = await findById(server, targetDataAccessor, {

package/src/plugins/setting/models/SystemSettingGroupSetting.ts

@@ -49,6 +49,7 @@ export default {
       name: "items",
       code: "items",
       type: "relation[]",
+      relation: "many",
       targetSingularCode: "system_setting_item_setting",
       selfIdColumnName: "group_id",
     },

package/src/plugins/setting/models/SystemSettingItemSetting.ts

@@ -21,6 +21,7 @@ export default {
       name: "group",
       code: "group",
       type: "relation",
+      relation: "one",
       targetSingularCode: "system_setting_group_setting",
       targetIdColumnName: "group_id",
       required: true,

package/src/plugins/setting/models/UserSettingGroupSetting.ts

@@ -49,6 +49,7 @@ export default {
       name: "items",
       code: "items",
       type: "relation[]",
+      relation: "many",
       targetSingularCode: "user_setting_item_setting",
       selfIdColumnName: "group_id",
     },

package/src/plugins/setting/models/UserSettingItemSetting.ts

@@ -21,6 +21,7 @@ export default {
       name: "group",
       code: "group",
       type: "relation",
+      relation: "one",
       targetSingularCode: "user_setting_group_setting",
       targetIdColumnName: "group_id",
       required: true,

package/src/server.ts

@@ -259,7 +259,8 @@ export class RapidServer implements IRpdServer {
 
   async emitEvent<TEventName extends keyof RpdServerEventTypes>(event: EmitServerEventOptions<TEventName>) {
     const { eventName, payload, sender, routeContext: routerContext } = event;
-    this.#logger.debug(`Emitting '${eventName}' event.`, { eventName, payload });
+    this.#logger.debug(`Emitting '${eventName}' event.`, { eventName });
+    this.#logger.verbose(`Event payload: `, { payload });
     await this.#eventManager.emit<TEventName>(eventName, sender, payload as any, routerContext);
 
     // TODO: should move this logic into metaManager