@solidxai/core 0.1.11-beta.4 → 0.1.11-beta.6

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

@@ -8746,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": [
@@ -9012,7 +9015,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -10104,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": [
           {
@@ -11938,7 +11943,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13433,7 +13442,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": true,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13508,7 +13523,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13592,7 +13613,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13654,7 +13681,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13723,7 +13756,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": true,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13793,7 +13832,14 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": true,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "card",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13859,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": [
           {
@@ -13898,7 +13947,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13960,7 +14013,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14029,7 +14086,11 @@
           "edit": true,
           "delete": true,
           "import": true,
-          "export": true
+          "export": true,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14089,7 +14150,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14149,7 +14214,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14219,7 +14288,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14288,7 +14361,12 @@
           "enableGlobalSearch": true,
           "create": true,
           "edit": true,
-          "delete": true
+          "delete": true,
+          "import": true,
+          "export": true,
+          "allowedViews": [
+            "list"
+          ]
         },
         "children": [
           {

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/computed-fields/entity/concat-entity-computed-field-provider.service.ts

@@ -1,21 +1,29 @@
+import dayjs from "dayjs";
 import { Injectable } from "@nestjs/common";
 import { kebabCase, get } from "lodash";
 import { ComputedFieldProvider } from "src/decorators/computed-field-provider.decorator";
 import { CommonEntity } from "src/entities/common.entity";
 import { ComputedFieldMetadata } from "src/helpers/solid-registry";
 import { IEntityPreComputeFieldProvider } from "src/interfaces";
+import { SettingService } from "src/services/setting.service";
+import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
 
 export interface ConcatComputedFieldContext {
     separator: string; // The separator to use between concatenated values
     fields: string[]; // The fields to concatenate
     slugify?: boolean; // Optional: if true, slugify each field value before concatenation
+    dateFormat?: string; // Optional: format to use for Date values. Defaults to the configured dateFormat setting
 }
 
 @ComputedFieldProvider()
 @Injectable()
 export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implements IEntityPreComputeFieldProvider<T, ConcatComputedFieldContext> {
 
+    constructor(
+        private readonly settingService: SettingService,
+    ) { }
+
     name(): string {
         return "ConcatEntityComputedFieldProvider";
     }
@@ -29,6 +37,8 @@ export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implement
         const separator = computedFieldValueProviderCtxt.separator ?? ' ';
         const fields: string[] = computedFieldValueProviderCtxt.fields ?? [];
         const slugify = computedFieldValueProviderCtxt.slugify ?? false;
+        const dateFormat = computedFieldValueProviderCtxt.dateFormat
+            ?? this.settingService.getConfigValue<SolidCoreSetting>("dateFormat");
 
         const parts: string[] = [];
 
@@ -38,6 +48,10 @@ export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implement
             // normalize to string (skip null/undefined)
             if (val == null) continue;
 
+            if (val instanceof Date) {
+                val = dayjs(val).format(dateFormat);
+            }
+
             if (typeof val !== 'string') {
                 val = String(val);
             }
@@ -58,4 +72,4 @@ export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implement
         (triggerEntity as any)[computedFieldMetadata.fieldName] = concatenatedString;
     }
 
-}
+}

package/src/services/crud.service.ts

@@ -34,6 +34,7 @@ import { SelectionDynamicFieldCrudManager } from "../helpers/field-crud-managers
 import { SelectionStaticFieldCrudManager } from "../helpers/field-crud-managers/SelectionStaticFieldCrudManager";
 import { ShortTextFieldCrudManager } from "../helpers/field-crud-managers/ShortTextFieldCrudManager";
 import { UUIDFieldCrudManager } from "../helpers/field-crud-managers/UUIDFieldCrudManager";
+import { ModelMetadataHelperService } from "src/helpers/model-metadata-helper.service";
 import { FieldCrudManager, MediaWithFullUrl } from "../interfaces";
 import { CrudHelperService, FilterCombinator, UserIdFields } from "./crud-helper.service";
 import { HashingService } from "./hashing.service";
@@ -42,6 +43,7 @@ import { getMediaStorageProvider } from "./mediaStorageProviders";
 import { ModelMetadataService } from "./model-metadata.service";
 import { RequestContextService } from "./request-context.service";
 
+const AUDIT_BEFORE_SNAPSHOT = '__auditBeforeSnapshot';
 
 export class CRUDService<T extends CommonEntity> { // Add two generic value i.e Person,CreatePersonDto, so we get the proper types in our service
 
@@ -185,7 +187,7 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
         }));
     }
 
-    //TODO: Will the updates be partial i.e PATCH or full i.e PUT
+ //TODO: Will the updates be partial i.e PATCH or full i.e PUT
     async update(id: number, updateDto: any, files: Express.Multer.File[] = [], isPartialUpdate: boolean = false, solidRequestContext: any = {}, isUpdate: boolean = false): Promise<T> {
         if (!id) {
             throw new Error(ERROR_MESSAGES.ID_REQUIRED_FOR_UPDATE);
@@ -213,16 +215,8 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
             );
         }
 
-        // // In some instances for legacy tables sometimes id is mapped as a bigint. 
-        // // in these cases the update method ends up attempting to insert records due to some type orm type mismatch issue.
-        // const idFieldMetadata = model.fields.find(f => f.name === 'id');
-        // updateDto.id = idFieldMetadata?.type === 'bigint' ? BigInt(id) : id;
-
-        // 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
-        // 1. Fire a query and load all the fields in the provided model name for a particular module
-        // FIXME This can be optimized to take in module name i.e (handle scenario wherein same model exists in multiple modules)
+        // Capture pre-update many-to-many relation state for audit tracking
+        await this.prepareManyToManyAuditSnapshot(entity,id,model.singularName);
         let hasMediaFields = false;
 
         const fieldsToProcess = [...model.fields];
@@ -249,6 +243,37 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
         return savedEntity;
     }
 
+/**
+ * Captures the current state of audit-enabled many-to-many relations
+ * before the entity is updated. The snapshot is attached to the entity
+ * and can be used later for audit comparison.
+ */
+private async prepareManyToManyAuditSnapshot(entity: T,id: number,modelSingularName: string): Promise<void> {
+   const modelMetadataHelperService = this.moduleRef.get(ModelMetadataHelperService, { strict: false });
+        const auditRelationFields = (await modelMetadataHelperService.loadFieldHierarchy(modelSingularName)).filter(field =>
+            field.enableAuditTracking &&
+            field.type === 'relation' &&
+            field.relationType !== 'one-to-many'
+        );
+        if (auditRelationFields.length > 0) {
+            const relations: any = {};
+            auditRelationFields.forEach(field => relations[field.name] = true);
+            const auditBeforeEntity = await this.repo.findOne({
+                where: {
+                    id: id,
+                } as unknown as FindOptionsWhere<T>,
+                relations: relations as any,
+            });
+            if (auditBeforeEntity) {
+                Object.defineProperty(entity, AUDIT_BEFORE_SNAPSHOT, {
+                    configurable: true,
+                    enumerable: false,
+                    value: auditBeforeEntity,
+                    writable: true,
+                });
+            }
+        }
+    }
     //TODO: Will the updates be partial i.e PATCH or full i.e PUT
     async delete(id: number, solidRequestContext: any = {}) {
         if (!id) {

package/src/services/datasource-introspection.service.ts

@@ -157,7 +157,7 @@ const DATASOURCE_TYPE_FAMILY_ALIASES: Record<DatasourceTypeFamily, string[]> = {
     int: ["int", "integer", "smallint", "tinyint"],
     numeric: ["numeric"],
     decimal: ["decimal", "money", "smallmoney"],
-    float: ["float", "double", "real"],
+    float: ["float", "double", "double precision", "real", "float4", "float8"],
     date: ["date"],
     time: ["time", "time without time zone", "time with time zone"],
     datetime: ["datetime", "datetime2", "smalldatetime", "timestamp", "timestamp without time zone"],
@@ -818,6 +818,14 @@ export class DatasourceIntrospectionService {
         return rest;
     }
 
+    private sanitizeConfiguredFieldPayload(fieldConfig: Record<string, any> | undefined) {
+        if (!fieldConfig || typeof fieldConfig !== "object" || Array.isArray(fieldConfig)) {
+            return {};
+        }
+
+        return this.sanitizeExistingFieldPayload(fieldConfig);
+    }
+
     private normalizeReviewedMetadataModel(
         reviewedModel: Record<string, any> | undefined,
         mappingDto: DatasourceIntrospectionMappingDto,
@@ -972,34 +980,39 @@ export class DatasourceIntrospectionService {
         existingField?: any,
     ) {
         const preserved = existingField ? this.sanitizeExistingFieldPayload(existingField) : {};
+        const configured = this.sanitizeConfiguredFieldPayload(column.fieldConfig);
+        const merged = {
+            ...preserved,
+            ...configured,
+        };
         const maxLength =
             column.characterMaximumLength && ["shortText", "longText"].includes(column.solidFieldType)
                 ? column.characterMaximumLength
-                : preserved.max;
+                : merged.max;
 
         return {
-            ...preserved,
+            ...merged,
             ...(column.fieldId ? { id: column.fieldId } : {}),
             name: column.fieldName,
-            displayName: column.displayName?.trim() || preserved.displayName || startCase(column.fieldName),
-            description: preserved.description ?? "",
+            displayName: column.displayName?.trim() || merged.displayName || startCase(column.fieldName),
+            description: merged.description ?? "",
             type: column.solidFieldType,
             ormType: column.ormType,
-            length: preserved.length ?? column.characterMaximumLength ?? undefined,
-            defaultValue: preserved.defaultValue ?? column.defaultValue ?? undefined,
-            required: preserved.required ?? (!column.nullable || column.isPrimaryKey),
-            unique: preserved.unique ?? false,
-            encrypt: preserved.encrypt ?? false,
-            index: preserved.index ?? false,
+            length: merged.length ?? column.characterMaximumLength ?? undefined,
+            defaultValue: merged.defaultValue ?? column.defaultValue ?? undefined,
+            required: merged.required ?? (!column.nullable || column.isPrimaryKey),
+            unique: merged.unique ?? false,
+            encrypt: merged.encrypt ?? false,
+            index: merged.index ?? false,
             max: maxLength ?? undefined,
-            min: preserved.min ?? undefined,
-            private: preserved.private ?? false,
-            isSystem: preserved.isSystem ?? false,
+            min: merged.min ?? undefined,
+            private: merged.private ?? false,
+            isSystem: merged.isSystem ?? false,
             isMarkedForRemoval: false,
             columnName: column.columnName,
             isUserKey: mappingDto.userKeyField === column.fieldName,
-            enableAuditTracking: preserved.enableAuditTracking ?? mappingDto.enableAuditTracking,
-            isMultiSelect: preserved.isMultiSelect ?? false,
+            enableAuditTracking: merged.enableAuditTracking ?? mappingDto.enableAuditTracking,
+            isMultiSelect: merged.isMultiSelect ?? false,
             isPrimaryKey: column.isPrimaryKey,
         };
     }

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

@@ -204,6 +204,11 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
 
     // Iterate through the fields and populate the standard instructions
     for (const field of allFields) {
+
+      // Skip Computed fields
+      if (field.type === SolidFieldType.computed) {
+        continue;
+      }
       // Skip system fields
       if (systemFieldNames.includes(field.name)) {
         continue;

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

@@ -27,6 +27,7 @@ import { PermissionMetadata } from '../entities/permission-metadata.entity';
 import { RoleMetadata } from '../entities/role-metadata.entity';
 import { ViewMetadata } from '../entities/view-metadata.entity';
 import { CommandService } from '../helpers/command.service';
+import { startNodemonHeartbeat } from '../helpers/nodemon-heartbeat';
 import {
   REFRESH_MODEL_COMMAND,
   REMOVE_FIELDS_COMMAND,
@@ -967,6 +968,26 @@ export class ModelMetadataService {
   @DisallowInProduction()
   async generateCodeViaCtl(modelId: number): Promise<string> {
     const model = await this.findOne(modelId);
+    const isEmbedded = process.env.DEFAULT_DATABASE_DRIVER === 'pglite';
+
+    // When using an embedded PGlite database, the single-connection limit means
+    // a spawned `solid refresh-model` subprocess cannot get its own DB connection
+    // while the API server is already holding it. Fall back to in-process code
+    // generation (which reuses the existing connection).
+    if (isEmbedded) {
+      this.logger.log('Embedded database detected — generating API code in-process');
+      // Prevent nodemon from restarting the server while schematics write files.
+      const heartbeat = startNodemonHeartbeat(path.join(process.cwd(), 'src'));
+      try {
+        return await this.handleGenerateCode({
+          modelUserKey: model.singularName,
+          dryRun: false,
+        });
+      } finally {
+        heartbeat.stop();
+      }
+    }
+
     return this.commandService.executeCommandWithArgs({
       command: 'npx',
       args: ['@solidxai/solidctl@latest', 'generate', 'model', `--name=${model.singularName}`],
@@ -1478,7 +1499,7 @@ export class ModelMetadataService {
     //Filter out the fields by id
     const fieldsForRemoval = model.fields.filter((field) => options.fieldIdsForRemoval.includes(+field.id));
     const removeOutput = await this.executeRemoveFieldsCommand(model, fieldsForRemoval, options.dryRun);
-
+    const migrationOutput = await this.executeMigrationRemoveFieldsCommand(model, fieldsForRemoval, options.dryRun);
     // Remove the fields from the database as well. This also checks, if the field is marked for removal
     for (const field of fieldsForRemoval) {
       if (field.isMarkedForRemoval) {
@@ -1515,6 +1536,13 @@ export class ModelMetadataService {
 
     return removeOutput;
   }
+  // model-metadata.service.ts mein naya method add karo
+  // async executeRemoveFieldsWithModel(model: ModelMetadata, fieldNames: string[], dryRun = false,) {
+  //   const fieldsForRemoval = model.fields.filter(
+  //     field => fieldNames.includes(field.name)
+  //   );
+  //   return this.executeRemoveFieldsCommand(model, fieldsForRemoval, dryRun);
+  // }
 
   async generateModelCode(options: CodeGenerationOptions): Promise<string> {
     if (!options.modelId && !options.modelUserKey) {
@@ -1563,6 +1591,22 @@ export class ModelMetadataService {
     return output;
   }
 
+  private async executeMigrationRemoveFieldsCommand(model: ModelMetadata, fieldsForRemoval: FieldMetadata[], dryRun: boolean = false,): Promise<string> {
+    if (!fieldsForRemoval || fieldsForRemoval.length === 0) {
+      return "";
+    }
+
+    const output = await this.commandService.executeCommandWithArgs({
+      command: 'npx',
+      args: ['@solidxai/solidctl@latest', 'migration', '-n', model.singularName, 'remove-field', ...(dryRun ? [] : ['--apply'])],
+      cwd: path.join(process.cwd(), '..'),
+    });
+
+    this.logger.debug(`Schematic output : ${output}`);
+    return output;
+  }
+
+
   async updateUserKey(data: any) {
     const { modelName, fieldName } = data;