@solidxai/core 0.1.11-beta.2 → 0.1.11-beta.5

package/src/seeders/module-metadata-seeder.service.ts

@@ -1,5 +1,6 @@
 import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
 import * as fs from 'fs';
+import * as os from 'os';
 import * as path from 'path';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -20,6 +21,7 @@ import { CreateModuleMetadataDto } from '../dtos/create-module-metadata.dto';
 import { getDynamicModuleNamesBasedOnMetadata } from '../helpers/module.helper';
 import { SolidRegistry } from '../helpers/solid-registry';
 import { ActionMetadataService } from '../services/action-metadata.service';
+import { ApiKeyService } from '../services/api-key.service';
 import { FieldMetadataService } from '../services/field-metadata.service';
 import { MediaStorageProviderMetadataService } from '../services/media-storage-provider-metadata.service';
 import { ModelMetadataService } from '../services/model-metadata.service';
@@ -33,6 +35,7 @@ import { ActionMetadata } from '../entities/action-metadata.entity';
 import { MenuItemMetadata } from '../entities/menu-item-metadata.entity';
 import { ModuleMetadata } from '../entities/module-metadata.entity';
 import { RoleMetadata } from '../entities/role-metadata.entity';
+import { User } from '../entities/user.entity';
 import { MENU_ROLE_JOIN_TABLE_NAME, MENU_ROLE_JOIN_TABLE_NAME_MENU_COL, MENU_ROLE_JOIN_TABLE_NAME_ROLE_COL } from '../dtos/create-menu-item-metadata.dto';
 import { DEFAULT_SA_PASSWORD } from '../dtos/create-user.dto';
 import { SignUpDto } from '../dtos/sign-up.dto';
@@ -44,6 +47,7 @@ import { PermissionMetadataRepository } from 'src/repository/permission-metadata
 import { SavedFiltersRepository } from 'src/repository/saved-filters.repository';
 import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 import { SettingRepository } from 'src/repository/setting.repository';
+import { UserApiKeyRepository } from 'src/repository/user-api-key.repository';
 import { CreateModelSequenceDto } from 'src/dtos/create-model-sequence.dto';
 import { ModelSequenceRepository } from 'src/repository/model-sequence.repository';
 import { LocaleRepository } from 'src/repository/locale.repository';
@@ -99,11 +103,13 @@ export class ModuleMetadataSeederService {
         private readonly roleService: RoleMetadataService,
         private readonly userService: UserService,
         private readonly authenticationService: AuthenticationService,
+        private readonly apiKeyService: ApiKeyService,
         private readonly solidActionService: ActionMetadataService,
         private readonly solidViewService: ViewMetadataService,
         private readonly emailTemplateService: EmailTemplateService,
         private readonly smsTemplateService: SmsTemplateService,
         private readonly listOfValuesService: ListOfValuesService,
+        private readonly userApiKeyRepository: UserApiKeyRepository,
         // @InjectRepository(PermissionMetadata)
         // private readonly permissionRepo: Repository<PermissionMetadata>,
         private readonly permissionRepo: PermissionMetadataRepository,
@@ -1364,6 +1370,7 @@ export class ModuleMetadataSeederService {
 
         for (let l = 0; l < users.length; l++) {
             const user: SignUpDto = users[l];
+            const isSystemAdminUser = user.username === 'sa';
             let exisitingUser = await this.timeOperation('user-find-by-username', () => this.userService.findOneByUsername(user.username), {
                 component: 'users',
                 serviceCall: 'userService.findOneByUsername',
@@ -1373,14 +1380,32 @@ export class ModuleMetadataSeederService {
                 if (user.username === 'sa') {
                     user.password = DEFAULT_SA_PASSWORD;
                 }
+                if (isSystemAdminUser) {
+                    (user as SignUpDto & { isAllowedToGenerateApiKeys?: boolean }).isAllowedToGenerateApiKeys = true;
+                }
 
                 exisitingUser = await this.timeOperation('user-sign-up', () => this.authenticationService.signUp(user), {
                     component: 'users',
                     serviceCall: 'authenticationService.signUp',
                     details: `username=${user.username}`,
                 });
+                if (isSystemAdminUser) {
+                    await this.timeOperation('seed-sa-api-key', async () => {
+                        const generatedApiKey = await this.apiKeyService.generate(exisitingUser.id, {
+                            name: 'Default SA API Key',
+                        });
+                        await this.writeSolidxAdminApiKeyConfig(generatedApiKey);
+                    }, {
+                        component: 'users',
+                        serviceCall: 'apiKeyService.generate',
+                        details: `username=${user.username}`,
+                    });
+                }
                 this.logger.log(`Newly created user ${user.username}`);
             }
+            if (isSystemAdminUser) {
+                await this.ensureSystemAdminApiKey(exisitingUser);
+            }
             //FIXME: Create the user roles assignment logic here.
             // now add Roles to user.
             // for (let m = 0; m < roles.length; m++) {
@@ -1390,6 +1415,99 @@ export class ModuleMetadataSeederService {
         }
     }
 
+    private async ensureSystemAdminApiKey(existingUser: { id: number; username: string; isAllowedToGenerateApiKeys?: boolean }) {
+        if (!existingUser?.id) {
+            return;
+        }
+
+        if (!existingUser.isAllowedToGenerateApiKeys) {
+            await this.timeOperation('enable-sa-api-key-generation', () => this.userApiKeyRepository.manager.update(User, { id: existingUser.id }, {
+                isAllowedToGenerateApiKeys: true,
+            }), {
+                component: 'users',
+                serviceCall: 'userRepository.update',
+                details: `username=${existingUser.username}`,
+            });
+            existingUser.isAllowedToGenerateApiKeys = true;
+        }
+
+        const existingDefaultKey = await this.timeOperation('find-sa-default-api-key', () => this.userApiKeyRepository.findOne({
+            where: {
+                user: { id: existingUser.id },
+                name: 'Default SA API Key',
+            },
+            relations: {
+                user: true,
+            },
+        }), {
+            component: 'users',
+            serviceCall: 'userApiKeyRepository.findOne',
+            details: `username=${existingUser.username}`,
+        });
+
+        if (existingDefaultKey) {
+            return;
+        }
+
+        await this.timeOperation('seed-sa-api-key', async () => {
+            const generatedApiKey = await this.apiKeyService.generate(existingUser.id, {
+                name: 'Default SA API Key',
+            });
+            await this.writeSolidxAdminApiKeyConfig(generatedApiKey);
+        }, {
+            component: 'users',
+            serviceCall: 'apiKeyService.generate',
+            details: `username=${existingUser.username}`,
+        });
+    }
+
+    private async writeSolidxAdminApiKeyConfig(generatedApiKey: {
+        apiKey: string;
+        record: {
+            id: number;
+            name: string;
+            maskedKey: string;
+            isActive: boolean;
+            expiresAt: Date | null;
+            createdAt?: Date;
+            updatedAt?: Date;
+        };
+    }) {
+        const solidxDir = path.join(os.homedir(), '.solidx');
+        const configPath = path.join(solidxDir, 'mcp.json');
+        await fs.promises.mkdir(solidxDir, { recursive: true });
+
+        let existingConfig: Record<string, any> = {};
+
+        if (fs.existsSync(configPath)) {
+            const rawConfig = await fs.promises.readFile(configPath, 'utf8');
+            if (rawConfig.trim()) {
+                const parsedConfig = JSON.parse(rawConfig);
+                if (parsedConfig && typeof parsedConfig === 'object' && !Array.isArray(parsedConfig)) {
+                    existingConfig = parsedConfig;
+                } else {
+                    this.logger.warn(`Expected ${configPath} to contain a JSON object. Overwriting with a new object.`);
+                }
+            }
+        }
+
+        const nextConfig = {
+            ...existingConfig,
+            solidxAdminApiKey: {
+                id: generatedApiKey.record.id,
+                name: generatedApiKey.record.name,
+                apiKey: generatedApiKey.apiKey,
+                maskedKey: generatedApiKey.record.maskedKey,
+                isActive: generatedApiKey.record.isActive,
+                expiresAt: generatedApiKey.record.expiresAt,
+                createdAt: generatedApiKey.record.createdAt,
+                updatedAt: generatedApiKey.record.updatedAt,
+            },
+        };
+
+        await fs.promises.writeFile(configPath, `${JSON.stringify(nextConfig, null, 2)}\n`, 'utf8');
+    }
+
     // OK
     private async seedModuleModelFields(moduleMetadata: CreateModuleMetadataDto): Promise<{ pruned: number; upserted: number }> {
         const fieldMetadataRepo = this.dataSource.getRepository(FieldMetadata);

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,
@@ -8737,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": [
@@ -9003,7 +9015,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -10095,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": [
           {
@@ -11929,7 +11943,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13424,7 +13442,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": true,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13499,7 +13523,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13583,7 +13613,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13645,7 +13681,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": false,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13714,7 +13756,13 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": true,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13784,7 +13832,14 @@
           "enableGlobalSearch": true,
           "create": false,
           "edit": false,
-          "delete": false
+          "delete": true,
+          "import": false,
+          "export": false,
+          "allowedViews": [
+            "list",
+            "card",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13850,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": [
           {
@@ -13889,7 +13947,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -13951,7 +14013,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14020,7 +14086,11 @@
           "edit": true,
           "delete": true,
           "import": true,
-          "export": true
+          "export": true,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14080,7 +14150,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14140,7 +14214,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14210,7 +14288,11 @@
           "edit": false,
           "delete": false,
           "import": false,
-          "export": false
+          "export": false,
+          "allowedViews": [
+            "list",
+            "tree"
+          ]
         },
         "children": [
           {
@@ -14279,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;
     }
 
-}
+}