@solidxai/core 0.1.9-beta.7 → 0.1.9

package/src/services/chatter-message.service.ts

@@ -1,11 +1,12 @@
 import { LocalDateTimeTransformer, serializeDate } from 'src/transformers/typeorm/local-date-time-transformer';
-import { forwardRef, Inject, Injectable } from '@nestjs/common';
+import { BadRequestException, forwardRef, Inject, Injectable, NotFoundException } from '@nestjs/common';
 import { ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { Brackets, EntityManager, EntityMetadata } from 'typeorm';
 
-import { classify } from '../helpers/string.helper';
-import { CHATTER_MESSAGE_SUBTYPE, CHATTER_MESSAGE_TYPE } from 'src/constants/chatter-message.constants';
+import { classify } from '@angular-devkit/core/src/utils/strings';
+import { CHATTER_MESSAGE_STATUS, CHATTER_MESSAGE_SUBTYPE, CHATTER_MESSAGE_TYPE } from 'src/constants/chatter-message.constants';
+import { ERROR_MESSAGES } from 'src/constants/error-messages';
 import { PostChatterMessageDto } from 'src/dtos/post-chatter-message.dto';
 import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
 import { lowerFirst } from 'src/helpers/string.helper';
@@ -46,10 +47,26 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         super(entityManager, repo, 'chatterMessage', 'solid-core', moduleRef);
     }
 
+    async markCompleted(id: number) {
+        const activeUser = this.requestContextService.getActiveUser();
+        if (!activeUser) {
+            throw new BadRequestException(ERROR_MESSAGES.FORBIDDEN);
+        }
+
+        const message = await this.repo.findOne({ where: { id } });
+        if (!message) {
+            throw new NotFoundException(`Entity [solid-core.chatterMessage] with id ${id} not found`);
+        }
+
+        message.status = CHATTER_MESSAGE_STATUS.COMPLETED;
+        return this.repo.save(message);
+    }
+
     async postMessage(postDto: PostChatterMessageDto, files: Express.Multer.File[] = []) {
         const chatterMessage = new ChatterMessage();
         chatterMessage.messageType = CHATTER_MESSAGE_TYPE.CUSTOM;
         chatterMessage.messageSubType = postDto.messageSubType || CHATTER_MESSAGE_SUBTYPE.CUSTOM;
+        chatterMessage.status = postDto.status ?? CHATTER_MESSAGE_STATUS.PENDING;
         chatterMessage.messageBody = postDto.messageBody;
         chatterMessage.coModelEntityId = postDto.coModelEntityId;
         chatterMessage.coModelName = postDto.coModelName;
@@ -127,6 +144,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         const chatterMessage = new ChatterMessage();
         chatterMessage.messageType = CHATTER_MESSAGE_TYPE.AUDIT;
         chatterMessage.messageSubType = CHATTER_MESSAGE_SUBTYPE.AUDIT_INSERT;
+        chatterMessage.status = CHATTER_MESSAGE_STATUS.PENDING;
         chatterMessage.coModelEntityId = entity.id;
         chatterMessage.coModelName = model?.singularName;
         chatterMessage.modelDisplayName = model?.displayName;
@@ -246,6 +264,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         const chatterMessage = new ChatterMessage();
         chatterMessage.messageType = CHATTER_MESSAGE_TYPE.AUDIT;
         chatterMessage.messageSubType = CHATTER_MESSAGE_SUBTYPE.AUDIT_UPDATE;
+        chatterMessage.status = CHATTER_MESSAGE_STATUS.PENDING;
         chatterMessage.coModelEntityId = entity?.id;
         chatterMessage.coModelName = model?.singularName;
         chatterMessage.modelDisplayName = model.displayName;
@@ -309,6 +328,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         const chatterMessage = new ChatterMessage();
         chatterMessage.messageType = CHATTER_MESSAGE_TYPE.AUDIT;
         chatterMessage.messageSubType = CHATTER_MESSAGE_SUBTYPE.AUDIT_DELETE;
+        chatterMessage.status = CHATTER_MESSAGE_STATUS.PENDING;
         chatterMessage.coModelEntityId = databaseEntity?.id;
         chatterMessage.coModelName = model?.singularName;
         chatterMessage.modelDisplayName = model?.displayName;

package/src/services/model-metadata.service.ts

@@ -837,7 +837,7 @@ export class ModelMetadataService {
       }
     }
     const actionName = `${model.singularName}-list-action`;
-    const treeViewActionName = `${model.singularName}-tree-view-action`;
+    const treeViewActionName = `${model.singularName}-tree-action`;
     const listViewName = `${model.singularName}-list-view`;
     const treeViewName = `${model.singularName}-tree-view`;
     const formViewName = `${model.singularName}-form-view`;

package/src/services/setting.service.ts

@@ -11,7 +11,7 @@ import { FILE_SERVICE, IFileService, FILE_STORAGE_PATH_BUILDER, IStoragePathBuil
 import { Setting } from '../entities/setting.entity';
 import { RequestContextService } from './request-context.service';
 import { SolidRegistry } from 'src/helpers/solid-registry';
-import { ISettingsProvider, NoInfer, SettingDefinition, SettingLevel } from '../interfaces';
+import { AdminSettingDefinition, AdminSettingsResponse, ISettingsProvider, NoInfer, SettingControlType, SettingDefinition, SettingLevel } from '../interfaces';
 import { ModuleMetadataRepository } from 'src/repository/module-metadata.repository';
 import type { SolidCoreSetting } from './settings/default-settings-provider.service';
 import { Logger } from '@nestjs/common';
@@ -68,6 +68,44 @@ export class SettingService {
     }
   }
 
+  private buildSettingLabel(key: string): string {
+    return key
+      .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+      .replace(/[-_]+/g, ' ')
+      .replace(/\s+/g, ' ')
+      .trim()
+      .replace(/\b\w/g, (match) => match.toUpperCase());
+  }
+
+  private inferControlType(setting: SettingDefinition): SettingControlType {
+    if (setting.controlType) {
+      return setting.controlType;
+    }
+
+    if (setting.options?.length) {
+      return 'selectionStatic';
+    }
+
+    if (typeof setting.value === 'boolean') {
+      return 'boolean';
+    }
+
+    if (typeof setting.value === 'number') {
+      return 'numeric';
+    }
+
+    return 'shortText';
+  }
+
+  private toAdminSettingDefinition(setting: SettingDefinition): AdminSettingDefinition {
+    return {
+      ...setting,
+      label: setting.label ?? this.buildSettingLabel(setting.key),
+      controlType: this.inferControlType(setting),
+      editable: setting.level === SettingLevel.SystemAdminEditable,
+    };
+  }
+
   /**
    * Reads all registered providers and gathers settings from across the running platform.
    * This is the superset of all possible settings. 
@@ -216,13 +254,31 @@ export class SettingService {
    * 
    * @returns 
    */
-  async getNonEncryptedSystemAdminReadonlyAndAboveSettings(): Promise<Record<any, any>> {
-    const finalSettings: Record<any, any> = {};
-    const systemAdminReadonlyAndAboveSettings = this.settings.filter(i => i.level !== "system-env" && !i.encrypted);
-    for (const setting of systemAdminReadonlyAndAboveSettings) {
-      finalSettings[setting.key] = setting.value;
-    }
-    return finalSettings;
+  async getNonEncryptedSystemAdminReadonlyAndAboveSettings(): Promise<AdminSettingsResponse> {
+    const activeUser = this.requestContextService.getActiveUser();
+    const hasViewEncryptedPermission = !!activeUser?.permissions?.includes('settings:view_encrypted');
+
+    const data = this.settings
+      .filter(i => i.level !== "system-env")
+      .filter(i => hasViewEncryptedPermission || !i.encrypted)
+      .filter((setting) => [SettingLevel.SystemAdminReadonly, SettingLevel.SystemAdminEditable].includes(setting.level))
+      .map((setting) => this.toAdminSettingDefinition(setting))
+      .sort((left, right) => {
+        const groupCompare = (left.group ?? '').localeCompare(right.group ?? '');
+        if (groupCompare !== 0) {
+          return groupCompare;
+        }
+
+        const leftSort = left.sortOrder ?? Number.MAX_SAFE_INTEGER;
+        const rightSort = right.sortOrder ?? Number.MAX_SAFE_INTEGER;
+        if (leftSort !== rightSort) {
+          return leftSort - rightSort;
+        }
+
+        return left.label!.localeCompare(right.label!);
+      });
+
+    return { data };
   }
 
   /**