@solidxai/core 0.1.9-beta.0 → 0.1.9-beta.10

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 '@angular-devkit/core/src/utils/strings';
-import { CHATTER_MESSAGE_SUBTYPE, CHATTER_MESSAGE_TYPE } from 'src/constants/chatter-message.constants';
+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;
@@ -228,7 +246,6 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             }
         }
 
-
         const allChangedFields = [
             ...changedNonRelationFields.map(field => ({
                 field,
@@ -247,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;
@@ -310,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;
@@ -413,7 +432,6 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             }
         }
 
-
         return value.toString();
     }
 

package/src/services/computed-fields/entity/sequence-num-computed-field-provider.ts

@@ -1,4 +1,4 @@
-import { classify } from "@angular-devkit/core/src/utils/strings";
+import { classify } from '../../../helpers/string.helper';
 import { Injectable } from "@nestjs/common";
 import { InjectDataSource } from "@nestjs/typeorm";
 import { ComputedFieldTriggerOperation } from "src/dtos/create-field-metadata.dto";
@@ -9,7 +9,6 @@ import { ComputedFieldMetadata } from "src/helpers/solid-registry";
 import { IEntityPostComputeFieldProvider } from "src/interfaces";
 import { DataSource, EntityManager } from "typeorm";
 
-
 export interface SequenceNumComputedFieldContext {
     sequenceName: string;
     /**

package/src/services/crud-helper.service.ts

@@ -1,6 +1,6 @@
 import { Brackets, SelectQueryBuilder, WhereExpressionBuilder } from "typeorm";
 import { BasicFilterDto } from "../dtos/basic-filters.dto";
-import { classify } from "@angular-devkit/core/src/utils/strings";
+import { classify } from '../helpers/string.helper';
 import { ActiveUserData } from "src/interfaces/active-user-data.interface";
 import { SolidRegistry } from "src/helpers/solid-registry";
 import { BadRequestException, Logger } from "@nestjs/common";
@@ -287,7 +287,6 @@ export class CrudHelperService {
             }
         }
 
-
         if (showSoftDeleted === 'inclusive') {
             qb.withDeleted();
         }
@@ -744,6 +743,4 @@ export class CrudHelperService {
         return matchingPermssions.length > 0
     }
 
-
-
 }

package/src/services/crud.service.ts

@@ -1,7 +1,10 @@
-import { BadRequestException, NotFoundException } from "@nestjs/common";
+import { BadRequestException, InternalServerErrorException, NotFoundException } from "@nestjs/common";
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { isArray } from "class-validator";
-import { CommonEntity, SettingService, SolidBaseRepository, User } from "src";
+import { CommonEntity } from "../entities/common.entity";
+import { User } from "../entities/user.entity";
+import { SolidBaseRepository } from "../repository/solid-base.repository";
+import { SettingService } from "./setting.service";
 import { ERROR_MESSAGES } from "src/constants/error-messages";
 import { SUCCESS_MESSAGES } from "src/constants/success-messages";
 import { EntityManager, FindOptionsWhere, In, IsNull, Not, QueryFailedError, SelectQueryBuilder } from "typeorm";
@@ -34,6 +37,7 @@ import { UUIDFieldCrudManager } from "../helpers/field-crud-managers/UUIDFieldCr
 import { FieldCrudManager, MediaWithFullUrl } from "../interfaces";
 import { CrudHelperService, FilterCombinator, UserIdFields } from "./crud-helper.service";
 import { HashingService } from "./hashing.service";
+import { SolidRegistry } from "src/helpers/solid-registry";
 import { getMediaStorageProvider } from "./mediaStorageProviders";
 import { ModelMetadataService } from "./model-metadata.service";
 import { RequestContextService } from "./request-context.service";
@@ -72,7 +76,23 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
         return this._settingService ??= this.moduleRef.get(SettingService, { strict: false });
     }
 
+    private async tryCreateAsExtensionUser(createDto: any): Promise<T | null> {
+        if (this.repo.metadata?.parentEntityMetadata?.target !== User) return null;
+        const registry = this.moduleRef.get(SolidRegistry, { strict: false });
+        if (!registry?.getExtensionUserCreationProvider()) {
+            throw new InternalServerErrorException(
+                `No ExtensionUserCreationProvider registered. Register one to create ${this.repo.metadata.name} entities.`,
+            );
+        }
+        const { AuthenticationService } = await import('./authentication.service');
+        const authService = this.moduleRef.get(AuthenticationService, { strict: false });
+        return authService.signUp(createDto) as unknown as T;
+    }
+
     async create(createDto: any, files: Express.Multer.File[] = [], solidRequestContext: any = {}): Promise<T> {
+        const asExtensionUser = await this.tryCreateAsExtensionUser(createDto);
+        if (asExtensionUser !== null) return asExtensionUser;
+
         // This class will be extended by the generated service class i.e PersonService
         // The data required to identify the model and module name will be passed from the generate CrudService subclass
         //TODO: Algorithm to create the entity

package/src/services/dashboard-question.service.ts

@@ -11,7 +11,7 @@ import { SolidRegistry } from 'src/helpers/solid-registry';
 import { DashboardQuestion } from '../entities/dashboard-question.entity';
 import { SqlExpression, SqlExpressionOperator } from './question-data-providers/chartjs-sql-data-provider.service';
 import { DashboardQuestionRepository } from 'src/repository/dashboard-question.repository';
-import { QuestionSqlDataProviderContext } from 'src';
+import { QuestionSqlDataProviderContext } from '../interfaces';
 
 enum SOURCE_TYPE {
   SQL = 'sql',

package/src/services/export-transaction.service.ts

@@ -5,8 +5,8 @@ import { EntityManager } from 'typeorm';
 
 import { CRUDService } from 'src/services/crud.service';
 
-
-import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
+import { kebabCase } from 'lodash';
+import { classify } from '../helpers/string.helper';
 import { InstanceWrapper } from '@nestjs/core/injector/instance-wrapper';
 import { validate } from 'class-validator';
 import { BasicFilterDto } from 'src/dtos/basic-filters.dto';
@@ -196,7 +196,7 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
 
   private getFileName(templateName: string, exportTransactionUUID: string, fileFormat: string): string {
     const extension = (fileFormat === ExportFormat.EXCEL) ? 'xlsx' : 'csv';
-    return `${dasherize(templateName)}-${exportTransactionUUID}.${extension}`;
+    return `${kebabCase(templateName)}-${exportTransactionUUID}.${extension}`;
   }
 
   private getMimeType(fileFormat: string): string {
@@ -237,7 +237,6 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
       }
     }
 
-
     return async (chunkIndex: number, chunkSize: number) => {
       const offset = chunkIndex * chunkSize;
       const recordFilterDto: BasicFilterDto = {

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

@@ -1,4 +1,4 @@
-import { classify } from '@angular-devkit/core/src/utils/strings';
+import { classify } from '../helpers/string.helper';
 import { Injectable, Logger, NotFoundException, OnApplicationBootstrap } from '@nestjs/common';
 import { InjectDataSource } from '@nestjs/typeorm';
 import * as fs from 'fs/promises'; // Use the Promise-based version of fs for async/await
@@ -21,7 +21,6 @@ import { MediaStorageProviderMetadataRepository } from 'src/repository/media-sto
 import { S3FileService } from './file';
 import { MediaStorageProviderMetadata } from 'src/entities/media-storage-provider-metadata.entity';
 
-
 @Injectable()
 export class FieldMetadataService implements OnApplicationBootstrap {
     constructor(
@@ -806,7 +805,6 @@ export class FieldMetadataService implements OnApplicationBootstrap {
                     "columnName"
                 ];
 
-
             case SolidFieldType.json:
                 return [
                     "name",
@@ -1194,7 +1192,6 @@ export class FieldMetadataService implements OnApplicationBootstrap {
         const parsedFormValues = typeof formValues === 'string' ? qs.parse(formValues, { allowDots: true }) : formValues;
         selectionDynamicProviderCtxt['formValues'] = parsedFormValues;
 
-
         // 3. get hold of the provider instance from the SolidRegistry
         const selectionProviderInstance = this.solidRegistry.getSelectionProviderInstance(selectionDynamicProvider);
         if (!selectionProviderInstance) {

package/src/services/fixtures.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, Logger } from "@nestjs/common";
 import { SolidIntrospectService } from "./solid-introspect.service";
 import { ModuleMetadataHelperService } from "src/helpers/module-metadata-helper.service";
-import { classify } from "@angular-devkit/core/src/utils/strings";
+import { classify } from '../helpers/string.helper';
 
 interface ScenarioFixture {
     name: string;

package/src/services/genai/mcp-handlers/mcp-handler-factory.service.ts

@@ -1,10 +1,9 @@
 import { Injectable, Logger } from '@nestjs/common';
 
-import { classify } from '@angular-devkit/core/src/utils/strings';
+import { classify } from '../../../helpers/string.helper';
 import { IMcpToolResponseHandler } from 'src/interfaces';
 import { SolidIntrospectService } from '../../solid-introspect.service';
 
-
 @Injectable()
 export class McpHandlerFactory {
     private readonly logger = new Logger(McpHandlerFactory.name);

package/src/services/import-transaction.service.ts

@@ -6,7 +6,6 @@ import { EntityManager } from 'typeorm';
 import { CRUDService } from 'src/services/crud.service';
 
 
-import { classify } from '@angular-devkit/core/src/utils/strings';
 import { HttpService } from '@nestjs/axios';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
 import { RelationFieldsCommand, RelationType, SolidFieldType } from 'src/dtos/create-field-metadata.dto';
@@ -27,6 +26,7 @@ import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.se
 import { getUserExcludedFields } from 'src/helpers/user-helper';
 import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
 import {upperFirst, camelCase} from 'lodash';
+import { classify } from '../helpers/string.helper';
 
 interface ImportTemplateFileInfo {
   stream: NodeJS.ReadableStream;

package/src/services/menu-item-metadata.service.ts

@@ -9,7 +9,7 @@ import { MenuItemMetadata } from '../entities/menu-item-metadata.entity';
 import { UpdateMenuItemMetadataDto } from '../dtos/update-menu-item-metadata.dto';
 import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
 import { ModuleMetadata } from '../entities/module-metadata.entity';
-import { dasherize } from '@angular-devkit/core/src/utils/strings';
+import { kebabCase } from 'lodash';
 import { MenuItemMetadataRepository } from 'src/repository/menu-item-metadata.repository';
 import { SavedFiltersRepository } from 'src/repository/saved-filters.repository';
 
@@ -191,7 +191,7 @@ export class MenuItemMetadataService extends CRUDService<MenuItemMetadata> {
             // TODO: Here we are assuming that we will always take the user to collection view of a model. 
             // We can make provision to take them other views also in the future. 
             // path = `/admin/core/${rootItem.module.name}/${rootItem.action.model.singularName}/${rootItem.action.view.name}`;
-            path = `/admin/core/${rootItem.module.name}/${dasherize(rootItem.action?.model?.singularName ?? 'unknown')}/${rootItem.action?.view?.type ?? 'list'}?menuItemId=${menuItemId}&menuItemName=${menuItemName}&actionId=${actionId}&actionName=${actionName}${savedFilterId ? `&savedQuery=${savedFilterId}` : ''}`;
+            path = `/admin/core/${rootItem.module.name}/${kebabCase(rootItem.action?.model?.singularName ?? 'unknown')}/${rootItem.action?.view?.type ?? 'list'}?menuItemId=${menuItemId}&menuItemName=${menuItemName}&actionId=${actionId}&actionName=${actionName}${savedFilterId ? `&savedQuery=${savedFilterId}` : ''}`;
 
           }
         }

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

@@ -7,7 +7,8 @@ import { CreateModelMetadataDto } from '../dtos/create-model-metadata.dto';
 import { ModelMetadata } from '../entities/model-metadata.entity';
 import { ModuleMetadata } from '../entities/module-metadata.entity';
 
-import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
+import { kebabCase } from 'lodash';
+import { classify } from '../helpers/string.helper';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
 import { DisallowInProduction } from 'src/decorators/disallow-in-production.decorator';
 import { SolidFieldType } from 'src/dtos/create-field-metadata.dto';
@@ -586,32 +587,32 @@ export class ModelMetadataService {
 
       const filesToDelete = [];
       // <singularName>.entity.ts | The TypeORM model that needs to be deleted. | Automatic
-      const entityFilePath = `${modulePath}/entities/${dasherize(modelEntity.singularName)}.entity.ts`;
+      const entityFilePath = `${modulePath}/entities/${kebabCase(modelEntity.singularName)}.entity.ts`;
       filesToDelete.push(entityFilePath);
       this.logger.log(`About to delete entity file path: ${entityFilePath}`);
 
       // <singularName>.create.dto.ts | The TypeORM model that needs to be deleted. | Automatic
-      const createDtoFilePath = `${modulePath}/dtos/create-${dasherize(modelEntity.singularName)}.dto.ts`;
+      const createDtoFilePath = `${modulePath}/dtos/create-${kebabCase(modelEntity.singularName)}.dto.ts`;
       filesToDelete.push(createDtoFilePath);
       this.logger.log(`About to delete create DTO file path: ${createDtoFilePath}`);
 
       // <singularName>.update.dto.ts | The TypeORM model that needs to be deleted. | Automatic
-      const updateDtoFilePath = `${modulePath}/dtos/update-${dasherize(modelEntity.singularName)}.dto.ts`;
+      const updateDtoFilePath = `${modulePath}/dtos/update-${kebabCase(modelEntity.singularName)}.dto.ts`;
       filesToDelete.push(updateDtoFilePath);
       this.logger.log(`About to delete update DTO file path: ${updateDtoFilePath}`);
 
       // <singularName>.repository.ts | The TypeORM model that needs to be deleted. | Automatic
-      const repositoryFilePath = `${modulePath}/repositories/${dasherize(modelEntity.singularName)}.repository.ts`;
+      const repositoryFilePath = `${modulePath}/repositories/${kebabCase(modelEntity.singularName)}.repository.ts`;
       filesToDelete.push(repositoryFilePath);
       this.logger.log(`About to delete repository file path: ${repositoryFilePath}`);
 
       // <singularName>.service.ts | The TypeORM model that needs to be deleted. | Automatic
-      const serviceFilePath = `${modulePath}/services/${dasherize(modelEntity.singularName)}.service.ts`;
+      const serviceFilePath = `${modulePath}/services/${kebabCase(modelEntity.singularName)}.service.ts`;
       filesToDelete.push(serviceFilePath);
       this.logger.log(`About to delete service file path: ${serviceFilePath}`);
 
       // <singularName>.controller.ts | The TypeORM model that needs to be deleted. | Automatic
-      const controllerFilePath = `${modulePath}/controllers/${dasherize(modelEntity.singularName)}.controller.ts`;
+      const controllerFilePath = `${modulePath}/controllers/${kebabCase(modelEntity.singularName)}.controller.ts`;
       filesToDelete.push(controllerFilePath);
       this.logger.log(`About to delete controller file path: ${controllerFilePath}`);
 
@@ -713,11 +714,11 @@ export class ModelMetadataService {
 
     // <moduleName>.module.ts | Remove all references and imports of the deleted model files. | Automatic
     if (modulePath) {
-      const moduleFilePath = path.resolve(modulePath, `${dasherize(modelEntity.module?.name)}.module.ts`);
+      const moduleFilePath = path.resolve(modulePath, `${kebabCase(modelEntity.module?.name)}.module.ts`);
       this.logger.log(`Removing model '${modelEntity.singularName}' references from module file: ${moduleFilePath}`);
       try {
         this.solidTsMorphService.begin();
-        const modelPathSegment = `/${dasherize(modelEntity.singularName)}.`;
+        const modelPathSegment = `/${kebabCase(modelEntity.singularName)}.`;
         const { removedIdentifiers } = this.solidTsMorphService.removeImports(
           moduleFilePath,
           spec => spec.includes(modelPathSegment)
@@ -836,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`;
@@ -930,7 +931,6 @@ export class ModelMetadataService {
       }
     };
 
-
     const modelFormView = {
       name: formViewName,
       displayName: `${model.displayName}`,
@@ -1415,7 +1415,6 @@ export class ModelMetadataService {
     const currentOffset = (meta.currentPage - 1) * meta.perPage;
     const currentIndexGlobal = currentOffset + index + 1;
 
-
     let prev: { record: any; offset: number; limit: number } | null = null;
     let next: { record: any; offset: number; limit: number } | null = null;
 
@@ -1517,5 +1516,4 @@ export class ModelMetadataService {
     };
   }
 
-
 }

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

@@ -6,7 +6,7 @@ import { DataSource, EntityManager, SelectQueryBuilder } from 'typeorm';
 import { CreateModuleMetadataDto } from '../dtos/create-module-metadata.dto';
 import { ModuleMetadata } from '../entities/module-metadata.entity';
 
-import { classify } from '@angular-devkit/core/src/utils/strings';
+import { classify } from '../helpers/string.helper';
 import { ConfigService } from '@nestjs/config';
 import * as fs from 'fs/promises'; // Use the Promise-based version of fs for async/await
 import * as path from 'path'; // To handle file paths
@@ -278,7 +278,6 @@ export class ModuleMetadataService {
         };
       }
 
-
       metaData.moduleMetadata.name = module?.name;
       metaData.moduleMetadata.displayName = module?.displayName;
       metaData.moduleMetadata.description = module?.description;

package/src/services/queues/database-subscriber.service.ts

@@ -34,7 +34,7 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
         return this._loggerInstance;
     }
 
-    abstract subscribe(message: QueueMessage<T>);
+    abstract subscribe(message: QueueMessage<T>): Promise<any>;
 
     abstract options(): QueuesModuleOptions;
 

package/src/services/queues/publisher-factory.service.ts

@@ -2,10 +2,9 @@ import { forwardRef, Inject, Logger } from '@nestjs/common';
 import { Injectable } from '@nestjs/common';
 
 import { QueueMessage, QueuePublisher } from 'src/interfaces/mq';
-import { classify } from '@angular-devkit/core/src/utils/strings';
+import { classify } from '../../helpers/string.helper';
 import { SolidIntrospectService } from '../solid-introspect.service';
 
-
 @Injectable()
 export class PublisherFactory<T> {
     private readonly logger = new Logger(PublisherFactory.name);

package/src/services/queues/rabbitmq-subscriber.service.ts

@@ -52,7 +52,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         return this._loggerInstance;
     }
 
-    abstract subscribe(message: QueueMessage<T>);
+    abstract subscribe(message: QueueMessage<T>): Promise<any>;
 
     abstract options(): QueuesModuleOptions;
 
@@ -458,16 +458,18 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         // Main subscriber work promise.
         // If timeout has already fired, suppress rethrow to avoid unhandled rejection noise
         // (the timeout error is already the authoritative failure we track).
-        const subscribePromise = this.subscribe(message).catch((error) => {
-            if (timedOut) {
-                this.logger.error(
-                    `Subscriber promise rejected after timeout for queue ${queueName} and messageId ${messageId}: ${(error as Error)?.message || String(error)}`,
-                    (error as Error)?.stack,
-                );
-                return undefined;
-            }
-            throw error;
-        });
+        const subscribePromise = Promise.resolve()
+            .then(() => this.subscribe(message))
+            .catch((error) => {
+                if (timedOut) {
+                    this.logger.error(
+                        `Subscriber promise rejected after timeout for queue ${queueName} and messageId ${messageId}: ${(error as Error)?.message || String(error)}`,
+                        (error as Error)?.stack,
+                    );
+                    return undefined;
+                }
+                throw error;
+            });
 
         // Timeout promise rejects after timeoutMs with an explicit domain-specific error.
         const timeoutPromise = new Promise<never>((_, reject) => {

package/src/services/queues/redis-subscriber.service.ts

@@ -23,7 +23,7 @@ export abstract class RedisSubscriber<T> implements OnModuleInit, OnModuleDestro
         }
     }
 
-    abstract subscribe(message: QueueMessage<T>): void;
+    abstract subscribe(message: QueueMessage<T>): Promise<any>;
 
     abstract options(): QueuesModuleOptions;
 
@@ -205,4 +205,4 @@ export abstract class RedisSubscriber<T> implements OnModuleInit, OnModuleDestro
             this.logger.error(err.message, err.stack);
         }
     }
-}
+}

package/src/services/security-rule.service.ts

@@ -8,7 +8,7 @@ import { CRUDService } from 'src/services/crud.service';
 
 import { SecurityRule } from '../entities/security-rule.entity';
 import { SolidRegistry } from 'src/helpers/solid-registry';
-import { SecurityRuleRepository } from 'src';
+import { SecurityRuleRepository } from '../repository/security-rule.repository';
 
 @Injectable()
 export class SecurityRuleService extends CRUDService<SecurityRule> implements OnApplicationBootstrap {

package/src/services/selection-providers/pseudo-foreign-key-selection-provider.service.ts

@@ -4,7 +4,7 @@ import { BadRequestException, Injectable } from "@nestjs/common";
 import { ISelectionProvider, ISelectionProviderContext, ISelectionProviderValues } from "../../interfaces";
 import { BasicFilterDto } from "src/dtos/basic-filters.dto";
 import { SolidIntrospectService } from "../solid-introspect.service";
-import { classify } from "@angular-devkit/core/src/utils/strings";
+import { classify } from '../../helpers/string.helper';
 import { CRUDService } from "../crud.service";
 
 interface PseudoForeignKeySelectionProviderContext extends ISelectionProviderContext {

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 getSystemAdminReadonlyAndAboveSettings(): Promise<Record<any, any>> {
-    const finalSettings: Record<any, any> = {};
-    const systemAdminReadonlyAndAboveSettings = this.settings.filter(i => i.level !== "system-env");
-    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 };
   }
 
   /**