@solidxai/core 0.1.11-beta.0 → 0.1.11-beta.11

package/src/seeders/seed-data/solid-core-metadata.json

@@ -1077,15 +1077,24 @@
           {
             "name": "type",
             "displayName": "Type",
-            "type": "shortText",
+            "type": "selectionStatic",
             "ormType": "varchar",
+            "length": 256,
             "required": true,
             "unique": false,
             "index": true,
             "private": false,
             "encrypt": false,
             "columnName": "type",
-            "isSystem": true
+            "isSystem": true,
+            "selectionValueType": "string",
+            "selectionStaticValues": [
+              "list:List",
+              "form:Form",
+              "tree:Tree",
+              "kanban:Kanban",
+              "card:Card"
+            ]
           },
           {
             "name": "context",
@@ -1584,7 +1593,7 @@
             "name": "roles",
             "displayName": "Roles",
             "type": "relation",
-            "required": true,
+            "required": false,
             "unique": false,
             "index": true,
             "private": false,
@@ -5244,6 +5253,13 @@
       }
     ]
   },
+  "locales": [
+    {
+      "locale": "en",
+      "displayName": "English",
+      "isDefault": true
+    }
+  ],
   "permissions": [
     "mcp:invoke",
     "agent:invoke",
@@ -8730,12 +8746,15 @@
             48
           ],
           "enableGlobalSearch": true,
-          "create": true,
-          "edit": true,
+          "create": false,
+          "edit": false,
           "delete": true,
+          "import": false,
+          "export": false,
           "allowedViews": [
             "list",
-            "card"
+            "card",
+            "tree"
           ]
         },
         "children": [
@@ -8996,7 +9015,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -10088,15 +10113,11 @@
           "swimlanesCount": 5,
           "recordsInSwimlane": 10,
           "enableGlobalSearch": true,
-          "create": true,
-          "edit": true,
-          "delete": true,
+          "create": false,
+          "edit": false,
+          "delete": false,
           "groupBy": "stage",
-          "draggable": false,
-          "allowedViews": [
-            "list",
-            "kanban"
-          ]
+          "draggable": false
         },
         "children": [
           {
@@ -11922,7 +11943,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13417,7 +13442,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": true,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13492,7 +13523,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13576,7 +13613,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13638,7 +13681,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13707,7 +13756,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": true,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13777,7 +13832,14 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": true,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "card",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13843,11 +13905,14 @@
             50
           ],
           "enableGlobalSearch": true,
-          "create": false,
-          "edit": false,
-          "delete": false,
-          "import": false,
-          "export": false
+          "create": true,
+          "edit": true,
+          "delete": true,
+          "import": true,
+          "export": true,
+          "allowedViews": [
+            "list"
+          ]
         },
         "children": [
           {
@@ -13882,7 +13947,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13944,7 +14013,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14013,7 +14086,11 @@
           "edit": true,
           "delete": true,
           "import": true,
-          "export": true
+          "export": true,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14073,7 +14150,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14133,7 +14214,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14203,7 +14288,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14272,7 +14361,12 @@
           "enableGlobalSearch": true,
           "create": true,
           "edit": true,
-          "delete": true
+          "delete": true,
+          "import": true,
+          "export": true,
+          "allowedViews": [
+            "list"
+          ]
         },
         "children": [
           {

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

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { CRUDService } from 'src/services/crud.service';
@@ -10,6 +10,79 @@ import { ActionMetadata } from '../entities/action-metadata.entity';
 
 @Injectable()
 export class ActionMetadataService extends CRUDService<ActionMetadata> {
+  private readonly logger = new Logger(ActionMetadataService.name);
+  private readonly comparableFields = [
+    'name',
+    'displayName',
+    'type',
+    'domain',
+    'context',
+    'customComponent',
+    'customIsModal',
+    'serverEndpoint',
+    'module',
+    'model',
+    'view',
+  ] as const;
+  private readonly relationCompareFields = new Set(['module', 'model', 'view']);
+  private readonly jsonCompareFields = new Set(['domain', 'context']);
+
+  private normalizeJsonFieldValue(value: any): any {
+    if (typeof value === 'string') {
+      const trimmedValue = value.trim();
+      if (
+        (trimmedValue.startsWith('{') && trimmedValue.endsWith('}')) ||
+        (trimmedValue.startsWith('[') && trimmedValue.endsWith(']'))
+      ) {
+        try {
+          return this.normalizeJsonFieldValue(JSON.parse(trimmedValue));
+        } catch {
+          return value;
+        }
+      }
+      return value;
+    }
+
+    if (Array.isArray(value)) {
+      return value.map((item) => this.normalizeJsonFieldValue(item));
+    }
+
+    if (value && typeof value === 'object') {
+      return Object.keys(value)
+        .sort()
+        .reduce((result, key) => {
+          result[key] = this.normalizeJsonFieldValue(value[key]);
+          return result;
+        }, {} as Record<string, any>);
+    }
+
+    return value;
+  }
+
+  private getCanonicalJsonFieldString(value: any): string {
+    return JSON.stringify(this.normalizeJsonFieldValue(value) ?? null);
+  }
+
+  private hasChanges(existingSolidAction: ActionMetadata, updateSolidActionDto: any): boolean {
+    return this.comparableFields.some((key) => {
+      const value = updateSolidActionDto[key];
+      if (typeof value === 'undefined') {
+        return false;
+      }
+
+      if (this.relationCompareFields.has(key)) {
+        const relationValue = value as any;
+        return (existingSolidAction as any)[key]?.id !== relationValue?.id;
+      }
+
+      if (this.jsonCompareFields.has(key)) {
+        return this.getCanonicalJsonFieldString((existingSolidAction as any)[key]) !== this.getCanonicalJsonFieldString(value);
+      }
+
+      return (existingSolidAction as any)[key] !== value;
+    });
+  }
+
   constructor(
     @InjectEntityManager()
     readonly entityManager: EntityManager,
@@ -37,11 +110,23 @@ export class ActionMetadataService extends CRUDService<ActionMetadata> {
     const existingSolidAction = await this.repo.findOne({
       where: {
         name: updateSolidActionDto.name
-      }
+      },
+      relations: {
+        module: true,
+        model: true,
+        view: true,
+      },
     })
 
     // if found
     if (existingSolidAction) {
+      const hasChanges = this.hasChanges(existingSolidAction, updateSolidActionDto);
+
+      if (!hasChanges) {
+        this.logger.debug(`Skipping action upsert for ${updateSolidActionDto.name}; no changes detected.`);
+        return existingSolidAction;
+      }
+
       const updatedSolidActionDto = { ...existingSolidAction, ...updateSolidActionDto };
       return this.repo.save(updatedSolidActionDto);
     }

package/src/services/api-key.service.ts

@@ -26,53 +26,53 @@ export class ApiKeyService {
         private readonly permissionMetadataService: PermissionMetadataService,
         private readonly authenticationService: AuthenticationService,
         private readonly userRepository: UserRepository,
-    ) {}
+    ) { }
 
-    async generate(userId: number, dto: CreateApiKeyDto): Promise < { apiKey: string; record: UserApiKey } > {
-            const user = await this.apiKeyRepository.manager.findOne(User, {
-                where: { id: userId },
-                select: ['id', 'isAllowedToGenerateApiKeys'],
-            });
+    async generate(userId: number, dto: CreateApiKeyDto): Promise<{ apiKey: string; record: UserApiKey }> {
+        const user = await this.apiKeyRepository.manager.findOne(User, {
+            where: { id: userId },
+            select: ['id', 'isAllowedToGenerateApiKeys'],
+        });
 
-            if(!user?.isAllowedToGenerateApiKeys) {
-                throw new ForbiddenException('You are not allowed to generate API keys');
-            }
+        if (!user?.isAllowedToGenerateApiKeys) {
+            throw new ForbiddenException('You are not allowed to generate API keys');
+        }
 
         const rawKey = 'sldx_' + randomBytes(32).toString('hex');
-            const hashedKey = this.hash(rawKey);
-            const maskedKey = 'sldx_****' + rawKey.slice(-4);
-
-            const record = this.apiKeyRepository.create({
-                name: dto.name,
-                hashedKey,
-                maskedKey,
-                isActive: true,
-                expiresAt: dto.expiresAt ? new Date(dto.expiresAt) : null,
-                user,
-            });
+        const hashedKey = this.hash(rawKey);
+        const maskedKey = 'sldx_****' + rawKey.slice(-4);
+
+        const record = this.apiKeyRepository.create({
+            name: dto.name,
+            hashedKey,
+            maskedKey,
+            isActive: true,
+            expiresAt: dto.expiresAt ? new Date(dto.expiresAt) : null,
+            user,
+        });
 
-            await this.apiKeyRepository.save(record);
+        await this.apiKeyRepository.save(record);
 
-            // Strip hashedKey from the returned record — maskedKey is all the UI needs
-            delete(record as any).hashedKey;
+        // Strip hashedKey from the returned record — maskedKey is all the UI needs
+        delete (record as any).hashedKey;
 
-            return { apiKey: rawKey, record };
-        }
+        return { apiKey: rawKey, record };
+    }
 
-    async validate(rawKey: string): Promise < ActiveUserData > {
-            const hashedKey = this.hash(rawKey);
+    async validate(rawKey: string): Promise<ActiveUserData> {
+        const hashedKey = this.hash(rawKey);
 
-            // Bypass security rules for auth validation — must find the key regardless of caller context
-            const keyRecord = await this.apiKeyRepository.findOne({
-                where: { hashedKey, isActive: true },
-                relations: ['user', 'user.roles'],
-            });
+        // Bypass security rules for auth validation — must find the key regardless of caller context
+        const keyRecord = await this.apiKeyRepository.findOne({
+            where: { hashedKey, isActive: true },
+            relations: ['user', 'user.roles'],
+        });
 
-            if(!keyRecord) {
-                throw new UnauthorizedException();
-            }
+        if (!keyRecord) {
+            throw new UnauthorizedException();
+        }
 
-        if(keyRecord.expiresAt && keyRecord.expiresAt < new Date()) {
+        if (keyRecord.expiresAt && keyRecord.expiresAt < new Date()) {
             throw new UnauthorizedException('API key expired');
         }
 

package/src/services/authentication.service.ts

@@ -1042,13 +1042,15 @@ export class AuthenticationService {
     }
 
     const type = this.resolveLoginType(signInDto);
-    const user = await this.findUserForLogin(type, signInDto.identifier);
-    const dummyOtp = this.getDummyOtpForUser(user);
-    if (!dummyOtp) {
-      await this.assignLoginOtp(user, type);
-      await this.notifyUserOnOtpInititateLogin(user, type);
+    const user = await this.findUserForLoginOrNull(type, signInDto.identifier);
+    if (user) {
+      const dummyOtp = this.getDummyOtpForUser(user);
+      if (!dummyOtp) {
+        await this.assignLoginOtp(user, type);
+        await this.notifyUserOnOtpInititateLogin(user, type);
+      }
     }
-    return this.buildLoginOtpResponse(user, type);
+    return this.buildLoginOtpResponse(type, signInDto.identifier, user);
   }
 
   private resolveLoginType(
@@ -1100,6 +1102,25 @@ export class AuthenticationService {
     return user;
   }
 
+  private async findUserForLoginOrNull(
+    type: PasswordlessLoginValidateWhatSources,
+    identifier: string,
+    options: { withRoles?: boolean } = {},
+  ): Promise<User | null> {
+    try {
+      return await this.findUserForLogin(type, identifier, options);
+    } catch (error) {
+      if (
+        error instanceof UnauthorizedException &&
+        (error.message === ERROR_MESSAGES.USER_NOT_FOUND ||
+          error.message === ERROR_MESSAGES.USER_INACTIVE)
+      ) {
+        return null;
+      }
+      throw error;
+    }
+  }
+
   private async assignLoginOtp(
     user: User,
     type: PasswordlessLoginValidateWhatSources,
@@ -1123,19 +1144,29 @@ export class AuthenticationService {
   }
 
   private buildLoginOtpResponse(
-    user: User,
     type: PasswordlessLoginValidateWhatSources,
+    identifier: string,
+    user?: User | null,
   ) {
-    const maskedIdentifier =
-      type === PasswordlessLoginValidateWhatSources.EMAIL
-        ? { email: this.maskEmail(user.email) }
-        : { mobile: this.maskMobile(user.mobile) };
+    const maskedIdentifier = this.buildMaskedLoginIdentifier(
+      type,
+      user?.email ?? user?.mobile ?? identifier,
+    );
     return {
       message: SUCCESS_MESSAGES.OTP_SENT_SUCCESS_LOGIN,
       user: maskedIdentifier,
     };
   }
 
+  private buildMaskedLoginIdentifier(
+    type: PasswordlessLoginValidateWhatSources,
+    identifier: string,
+  ) {
+    return type === PasswordlessLoginValidateWhatSources.EMAIL
+      ? { email: this.maskEmail(identifier) }
+      : { mobile: this.maskMobile(identifier) };
+  }
+
   private async notifyUserOnOtpInititateLogin(
     user: User,
     loginType: PasswordlessLoginValidateWhatSources,
@@ -1273,9 +1304,12 @@ export class AuthenticationService {
       throw new BadRequestException(ERROR_MESSAGES.INVALID_VERIFICATION_TYPE);
     }
 
-    const user = await this.findUserForLogin(type, identifier, {
+    const user = await this.findUserForLoginOrNull(type, identifier, {
       withRoles: true,
     });
+    if (!user) {
+      throw new UnauthorizedException(ERROR_MESSAGES.INVALID_OTP);
+    }
     this.checkAccountBlocked(user);
     const dummyOtp = this.getDummyOtpForUser(user);
 

package/src/services/computed-fields/entity/alpha-num-external-id-computed-field-provider.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { ComputedFieldProvider } from 'src/decorators/computed-field-provider.decorator';
 import { CommonEntity } from 'src/entities/common.entity';
+import { isEmbeddedDb } from 'src/helpers/environment.helper';
 import { ComputedFieldMetadata } from 'src/helpers/solid-registry';
 import { IEntityPreComputeFieldProvider } from 'src/interfaces';
 import { EntityManager } from 'typeorm';
@@ -45,7 +46,12 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
       }
     }
 
-    const uniqueCode = await this.generateUniqueExternalId(resolvedPrefix, codeLength, computedFieldMetadata.fieldName, entityName);
+    // On embedded PGlite (pool size 1), use the originating transaction's EntityManager
+    // so the uniqueness check runs on the active connection. On regular Postgres, use the
+    // injected EntityManager (original behaviour).
+    const manager = isEmbeddedDb() ? (eventContext?.manager ?? this.entityManager) : this.entityManager;
+
+    const uniqueCode = await this.generateUniqueExternalId(manager, resolvedPrefix, codeLength, computedFieldMetadata.fieldName, entityName);
     const finalExternalId = resolvedPrefix ? `${resolvedPrefix}-${uniqueCode}` : uniqueCode;
 
     triggerEntity[computedFieldMetadata.fieldName] = finalExternalId;
@@ -60,8 +66,8 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
     return result;
   }
 
-  private async isExternalIdUnique(externalId: string, fieldName: string, entityName: string): Promise<boolean> {
-    const count = await this.entityManager.count(entityName as any,
+  private async isExternalIdUnique(manager: EntityManager, externalId: string, fieldName: string, entityName: string): Promise<boolean> {
+    const count = await manager.count(entityName as any,
       {
         where: { [fieldName]: externalId },
       }
@@ -69,7 +75,7 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
     return count === 0;
   }
 
-  private async generateUniqueExternalId(resolvedPrefix: string, codeLength: number, fieldName: string, entityName: string): Promise<string> {
+  private async generateUniqueExternalId(manager: EntityManager, resolvedPrefix: string, codeLength: number, fieldName: string, entityName: string): Promise<string> {
     const maxAttempts = 10;
 
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
@@ -78,7 +84,7 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
 
       const fullId = resolvedPrefix ? `${resolvedPrefix}-${newId}` : newId;
 
-      const isUnique = await this.isExternalIdUnique(fullId, fieldName, entityName);
+      const isUnique = await this.isExternalIdUnique(manager, fullId, fieldName, entityName);
 
       if (isUnique) {
         return newId;