@ruiapp/rapid-core 0.1.68 → 0.1.70

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 (
@@ -6243,12 +6244,14 @@ class SettingService {
             ],
         });
         if (settingItem) {
-            await this.#systemSettingItemManager.updateEntityById({
-                id: settingItem.id,
-                entityToSave: {
-                    value,
-                },
-            });
+            if (settingItem.value !== value) {
+                await this.#systemSettingItemManager.updateEntityById({
+                    id: settingItem.id,
+                    entityToSave: {
+                        value,
+                    },
+                });
+            }
         }
         else {
             await this.#systemSettingItemManager.createEntity({

package/dist/plugins/setting/SettingService.d.ts

@@ -3,6 +3,10 @@ import { SystemSettingItem, UserSettingItem } from "./SettingPluginTypes";
 export interface GetSystemSettingValuesInput {
     groupCode: string;
 }
+export interface SetSystemSettingValuesInput {
+    groupCode: string;
+    values: Record<string, any>;
+}
 export interface GetUserSettingValuesInput {
     groupCode: string;
 }

package/dist/plugins/setting/actionHandlers/setSystemSettingValues.d.ts

@@ -0,0 +1,7 @@
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
+export interface SetSystemSettingValuesOptions {
+    groupCode: string;
+}
+export declare const code = "setSystemSettingValues";
+export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: SetSystemSettingValuesOptions): Promise<void>;

package/dist/plugins/setting/routes/index.d.ts

@@ -3,7 +3,7 @@ declare const _default: {
     name: string;
     code: string;
     type: "RESTful";
-    method: "POST";
+    method: "GET";
     endpoint: string;
     actions: {
         code: string;

package/dist/plugins/setting/routes/setSystemSettingValues.d.ts

@@ -0,0 +1,12 @@
+declare const _default: {
+    namespace: string;
+    name: string;
+    code: string;
+    type: "RESTful";
+    method: "PATCH";
+    endpoint: string;
+    actions: {
+        code: string;
+    }[];
+};
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.68",
+  "version": "0.1.70",
   "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/SettingService.ts

@@ -6,6 +6,11 @@ export interface GetSystemSettingValuesInput {
   groupCode: string;
 }
 
+export interface SetSystemSettingValuesInput {
+  groupCode: string;
+  values: Record<string, any>;
+}
+
 export interface GetUserSettingValuesInput {
   groupCode: string;
 }
@@ -80,12 +85,14 @@ export default class SettingService {
     });
 
     if (settingItem) {
-      await this.#systemSettingItemManager.updateEntityById({
-        id: settingItem.id,
-        entityToSave: {
-          value,
-        },
-      });
+      if (settingItem.value !== value) {
+        await this.#systemSettingItemManager.updateEntityById({
+          id: settingItem.id,
+          entityToSave: {
+            value,
+          },
+        });
+      }
     } else {
       await this.#systemSettingItemManager.createEntity({
         entity: {

package/src/plugins/setting/actionHandlers/setSystemSettingValues.ts

@@ -0,0 +1,30 @@
+import { ActionHandlerContext } from "~/core/actionHandler";
+import { RapidPlugin } from "~/core/server";
+import SettingService, { SetSystemSettingValuesInput } from "../SettingService";
+
+export interface SetSystemSettingValuesOptions {
+  groupCode: string;
+}
+
+export const code = "setSystemSettingValues";
+
+export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: SetSystemSettingValuesOptions) {
+  const { server, routerContext } = ctx;
+  const { response } = routerContext;
+
+  const input: SetSystemSettingValuesInput = ctx.input;
+
+  if (options?.groupCode) {
+    input.groupCode = options.groupCode;
+  }
+
+  if (!input.groupCode) {
+    throw new Error(`Group code is required when setting system setting values.`);
+  }
+
+  const settingService = server.getService<SettingService>("settingService");
+
+  await settingService.setSystemSettingValues(input.groupCode, input.values);
+
+  ctx.output = {};
+}

package/src/plugins/setting/routes/setSystemSettingValues.ts

@@ -0,0 +1,15 @@
+import { RpdRoute } from "~/types";
+
+export default {
+  namespace: "svc",
+  name: "svc.setSystemSettingValues",
+  code: "svc.setSystemSettingValues",
+  type: "RESTful",
+  method: "PATCH",
+  endpoint: "/svc/systemSettingValues",
+  actions: [
+    {
+      code: "setSystemSettingValues",
+    },
+  ],
+} satisfies RpdRoute;

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