@solidstarters/solid-core 1.2.200 → 1.2.202

package/src/repository/model-sequence.repository.ts

@@ -0,0 +1,97 @@
+import { Injectable } from '@nestjs/common';
+import { ModelSequence } from 'src/entities/model-sequence.entity';
+import { RequestContextService } from 'src/services/request-context.service';
+import { DataSource } from 'typeorm';
+import { SecurityRuleRepository } from './security-rule.repository';
+import { SolidBaseRepository } from './solid-base.repository';
+import { CreateModelSequenceDto } from 'src/dtos/create-model-sequence.dto';
+import { ModuleMetadata } from 'src/entities/module-metadata.entity';
+import { ModelMetadata } from 'src/entities/model-metadata.entity';
+import { FieldMetadata } from 'src/entities/field-metadata.entity';
+
+@Injectable()
+export class ModelSequenceRepository extends SolidBaseRepository<ModelSequence> {
+    constructor(
+        readonly dataSource: DataSource,
+        readonly requestContextService: RequestContextService,
+        readonly securityRuleRepository: SecurityRuleRepository,
+    ) {
+        super(ModelSequence, dataSource, requestContextService, securityRuleRepository);
+    }
+
+    async upsertWithDto(createDto: CreateModelSequenceDto) {
+        // Populate the module from moduleId or moduleUserKey
+        const moduleRepository = this.dataSource.getRepository(ModuleMetadata);
+        if (createDto.moduleId) {
+            const module = await moduleRepository.findOne({
+                where: {
+                    id: createDto.moduleId,
+                },
+            });
+            createDto['module'] = module;
+        }
+
+        if (createDto.moduleUserKey) {
+            const module = await moduleRepository.findOne({
+                where: {
+                    name: createDto.moduleUserKey,
+                },
+            });
+            createDto['module'] = module;
+        }
+
+        // Populate the model from modelId or modelUserKey
+        const modelRepository = this.dataSource.getRepository(ModelMetadata);
+        if (createDto.modelId) {
+            const model = await modelRepository.findOne({
+                where: {
+                    id: createDto.modelId,
+                },
+            });
+            createDto['model'] = model;
+        }
+        if (createDto.modelUserKey) {
+            const model = await modelRepository.findOne({
+                where: {
+                    singularName: createDto.modelUserKey,
+                },
+            });
+            createDto['model'] = model;
+        }
+
+        // Populate the field from fieldId or fieldUserKey
+        const fieldRepository = this.dataSource.getRepository(FieldMetadata);
+        if (createDto.fieldId) {
+            const field = await fieldRepository.findOne({
+                where: {
+                    id: createDto.fieldId,
+                },
+            });
+            createDto['field'] = field;
+        }
+        if (createDto.fieldUserKey) {
+            const field = await fieldRepository.findOne({
+                where: {
+                    name: createDto.fieldUserKey,
+                },
+            });
+            createDto['field'] = field;
+        }
+
+        // First check if sequence already exists using name
+        const existingModelSequence = await this.findOne({
+            where: {
+                sequenceName: createDto.sequenceName,
+            },
+        });
+
+        if (existingModelSequence) {
+            const updatedModelSequence = this.merge(existingModelSequence, createDto);
+            return this.save(updatedModelSequence);
+        }
+        else {
+            const modelSequence = this.create(createDto);
+            return this.save(modelSequence);
+        }
+    }
+}

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

@@ -1,18 +1,14 @@
-import { Inject, Injectable, Logger } from '@nestjs/common';
+import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
 import * as fs from 'fs';
 import * as path from 'path';
+import { v4 as uuidv4 } from 'uuid';
 
-import { ConfigType } from '@nestjs/config';
-import { InjectRepository } from '@nestjs/typeorm';
-import commonConfig from 'src/config/common.config';
-import { iamConfig } from 'src/config/iam.config';
 import { CreateDashboardDto } from 'src/dtos/create-dashboard.dto';
 import { CreateEmailTemplateDto } from 'src/dtos/create-email-template.dto';
 import { CreateListOfValuesDto } from 'src/dtos/create-list-of-values.dto';
 import { CreateSecurityRuleDto } from 'src/dtos/create-security-rule.dto';
 import { CreateSettingDto } from 'src/dtos/create-setting.dto';
 import { CreateSmsTemplateDto } from 'src/dtos/create-sms-template.dto';
-import { Setting } from 'src/entities/setting.entity';
 import { DashboardRepository } from 'src/repository/dashboard.repository';
 import { SecurityRuleRepository } from 'src/repository/security-rule.repository';
 import { AuthenticationService } from 'src/services/authentication.service';
@@ -25,14 +21,12 @@ import { DataSource, In, Repository } from 'typeorm';
 import appBuilderConfig from '../config/app-builder.config';
 import { CreateModelMetadataDto } from '../dtos/create-model-metadata.dto';
 import { CreateModuleMetadataDto } from '../dtos/create-module-metadata.dto';
-import { PermissionMetadata } from '../entities/permission-metadata.entity';
-import { getDynamicModuleNames } from '../helpers/module.helper';
+import { getDynamicModuleNames, getDynamicModuleNamesBasedOnMetadata } from '../helpers/module.helper';
 import { SolidRegistry } from '../helpers/solid-registry';
 import { ActionMetadataService } from '../services/action-metadata.service';
 import { FieldMetadataService } from '../services/field-metadata.service';
 import { MediaStorageProviderMetadataSeederService } from '../services/media-storage-provider-metadata-seeder.service';
 import { MediaStorageProviderMetadataService } from '../services/media-storage-provider-metadata.service';
-import { MenuItemMetadataService } from '../services/menu-item-metadata.service';
 import { ModelMetadataService } from '../services/model-metadata.service';
 import { ModuleMetadataService } from '../services/module-metadata.service';
 import { RoleMetadataService } from '../services/role-metadata.service';
@@ -40,14 +34,16 @@ import { ViewMetadataService } from '../services/view-metadata.service';
 import solidCoreMetadata from './seed-data/solid-core-metadata.json';
 import { SystemFieldsSeederService } from './system-fields-seeder.service';
 // import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
-import { ActionMetadata, MENU_ROLE_JOIN_TABLE_NAME, MENU_ROLE_JOIN_TABLE_NAME_MENU_COL, MENU_ROLE_JOIN_TABLE_NAME_ROLE_COL, MenuItemMetadata, ModuleMetadata, RoleMetadata } from 'src';
+import { ActionMetadata, MENU_ROLE_JOIN_TABLE_NAME, MENU_ROLE_JOIN_TABLE_NAME_MENU_COL, MENU_ROLE_JOIN_TABLE_NAME_ROLE_COL, MenuItemMetadata, ModuleMetadata, RoleMetadata, SignUpDto } from 'src';
 import { ADMIN_ROLE_NAME, INTERNAL_ROLE_NAME, INTERNAL_ROLE_PERMISSIONS, PUBLIC_ROLE_NAME } from 'src/dtos/create-role-metadata.dto';
+import { CreateSavedFiltersDto } from 'src/dtos/create-saved-filters.dto';
 import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
-import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 import { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';
-import { SettingRepository } from 'src/repository/setting.repository';
-import { CreateSavedFiltersDto } from 'src/dtos/create-saved-filters.dto';
 import { SavedFiltersRepository } from 'src/repository/saved-filters.repository';
+import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
+import { SettingRepository } from 'src/repository/setting.repository';
+import { CreateModelSequenceDto } from 'src/dtos/create-model-sequence.dto';
+import { ModelSequenceRepository } from 'src/repository/model-sequence.repository';
 
 
 @Injectable()
@@ -57,6 +53,7 @@ export class ModuleMetadataSeederService {
 
     constructor(
         private readonly moduleMetadataService: ModuleMetadataService,
+        @Inject(forwardRef(() => ModelMetadataService))
         private readonly modelMetadataService: ModelMetadataService,
         private readonly fieldMetadataService: FieldMetadataService,
         private readonly mediaStorageProviderMetadataService: MediaStorageProviderMetadataService,
@@ -64,7 +61,6 @@ export class ModuleMetadataSeederService {
         private readonly userService: UserService,
         private readonly authenticationService: AuthenticationService,
         private readonly solidActionService: ActionMetadataService,
-        private readonly solidMenuItemService: MenuItemMetadataService,
         private readonly solidViewService: ViewMetadataService,
         private readonly mediaStorageProviderSeederService: MediaStorageProviderMetadataSeederService,
         private readonly emailTemplateService: EmailTemplateService,
@@ -74,11 +70,6 @@ export class ModuleMetadataSeederService {
         // private readonly permissionRepo: Repository<PermissionMetadata>,
         private readonly permissionRepo: PermissionMetadataRepository,
         private readonly solidRegistry: SolidRegistry,
-        @Inject(appBuilderConfig.KEY)
-        private readonly appBuilderConfiguration: ConfigType<typeof appBuilderConfig>,
-        @Inject(iamConfig.KEY) private readonly iamConfiguration: ConfigType<typeof iamConfig>,
-        @Inject(commonConfig.KEY)
-        private readonly commonConfiguration: ConfigType<typeof commonConfig>,
         private readonly settingService: SettingService,
         // @InjectRepository(Setting, 'default')
         // readonly settingsRepo: Repository<Setting>,
@@ -89,12 +80,14 @@ export class ModuleMetadataSeederService {
         readonly scheduledJobRepository: ScheduledJobRepository,
         readonly savedFiltersRepo: SavedFiltersRepository,
         readonly dataSource: DataSource,
+        readonly modelSequenceRepo: ModelSequenceRepository,
     ) { }
 
     async seed(conf?: any) {
         // Global seeding steps i.e across all modules
         await this.seedGlobalMetadata();
 
+
         // Module specific seeding steps.
         // Get all the module metadata files which needs to be seeded.
         const seedDataFiles = this.seedDataFiles;
@@ -193,6 +186,10 @@ export class ModuleMetadataSeederService {
             this.logger.log(`Seeding Saved Filters`);
             await this.seedSavedFilters(moduleMetadata, overallMetadata);
 
+            // Model Sequences
+            this.logger.log(`Seeding Model Sequences`);
+            await this.seedModelSequences(overallMetadata);
+
             this.logger.debug(`[End] module seed data: ${overallMetadata}`);
         }
 
@@ -328,7 +325,8 @@ export class ModuleMetadataSeederService {
     private get seedDataFiles(): any[] {
         const typedSolidCoreMetadata = structuredClone(solidCoreMetadata);
         const seedDataFiles = [typedSolidCoreMetadata];
-        const enabledModules = getDynamicModuleNames();
+        // const enabledModules = getDynamicModuleNames();
+        const enabledModules = getDynamicModuleNamesBasedOnMetadata();
         for (const enabledModule of enabledModules) {
             const enabledModuleSeedFile = `module-metadata/${enabledModule}/${enabledModule}-metadata.json`;
             const fullPath = path.join(process.cwd(), enabledModuleSeedFile);
@@ -352,6 +350,8 @@ export class ModuleMetadataSeederService {
 
         this.logger.log(`Seeding System Fields Metadata`);
         await this.seedDefaultSystemFields();
+
+        this.logger.debug(`Global metadata seeding completed`);
     }
 
     private async seedDefaultSystemFields() {
@@ -422,6 +422,13 @@ export class ModuleMetadataSeederService {
         this.logger.debug(`[End] Processing Media Storage Provider`);
     }
 
+    private async seedModelSequences(overallMetadata: any) {
+        this.logger.debug(`[Start] Processing model sequences`);
+        const modelSequences: CreateModelSequenceDto[] = overallMetadata.modelSequences;
+        await this.handleSeedModelSequences(modelSequences);
+        this.logger.debug(`[End] Processing model sequences`);
+    }
+
     // OK
     private async handleSeedEmailTemplates(emailTemplates: CreateEmailTemplateDto[], moduleName: string) {
         if (!emailTemplates) {
@@ -434,12 +441,41 @@ export class ModuleMetadataSeederService {
 
             // We need to load the actual template contents. 
             if (moduleName === 'solid-core') {
-                const modulePath = path.dirname(require.resolve('@solidstarters/solid-core'));
-                const seedDataPath = path.join(modulePath, '../src/seeders/seed-data/email-templates');
-                const filePath = path.join(seedDataPath, emailTemplate.body);
-                // this.logger.log(`Seeding email template from solid-core at path: ${filePath}`);
+                let moduleRoot: string | null = null;
+
+                try {
+                    // Always resolve package.json, never the module entry
+                    moduleRoot = path.dirname(
+                        require.resolve('@solidstarters/solid-core/package.json'),
+                    );
+                } catch (err) {
+                    this.logger.debug(
+                        'Could not resolve @solidstarters/solid-core from node_modules, assuming local execution',
+                    );
+                }
+
+                const filePathInternal = 'src/seeders/seed-data/email-templates/';
+                let filePath: string;
+                // Case 1: solid-core installed as dependency
+                if (moduleRoot) {
+                    filePath = path.join(
+                        moduleRoot,
+                        filePathInternal,
+                        emailTemplate.body,
+                    );
+                }
+                else {
+                    // Case 2: running INSIDE solid-core repo
+                    const localCoreRoot = process.cwd(); // or configurable root
+                    filePath = path.join(
+                        localCoreRoot,
+                        filePathInternal,
+                        emailTemplate.body,
+                    );
+                }
+
                 if (fs.existsSync(filePath)) {
-                    emailTemplate.body = fs.readFileSync(filePath, 'utf-8').toString();
+                    emailTemplate.body = fs.readFileSync(filePath, 'utf-8');
                 }
             }
             else {
@@ -471,12 +507,41 @@ export class ModuleMetadataSeederService {
 
             // We need to load the actual template contents. 
             if (moduleName === 'solid-core') {
-                const modulePath = path.dirname(require.resolve('@solidstarters/solid-core'));
-                const seedDataPath = path.join(modulePath, '../src/seeders/seed-data/sms-templates');
-                const filePath = path.join(seedDataPath, smsTemplate.body);
-                // this.logger.log(`Seeding sms template from solid-core at path: ${filePath}`);
+                let moduleRoot: string | null = null;
+
+                try {
+                    // Always resolve package.json, never the module entry
+                    moduleRoot = path.dirname(
+                        require.resolve('@solidstarters/solid-core/package.json'),
+                    );
+                } catch (err) {
+                    this.logger.debug(
+                        'Could not resolve @solidstarters/solid-core from node_modules, assuming local execution',
+                    );
+                }
+
+                const filePathInternal = 'src/seeders/seed-data/sms-templates/';
+                let filePath: string;
+                // Case 1: solid-core installed as dependency
+                if (moduleRoot) {
+                    filePath = path.join(
+                        moduleRoot,
+                        filePathInternal,
+                        smsTemplate.body,
+                    );
+                }
+                else {
+                    // Case 2: running INSIDE solid-core repo
+                    const localCoreRoot = process.cwd(); // or configurable root
+                    filePath = path.join(
+                        localCoreRoot,
+                        filePathInternal,
+                        smsTemplate.body,
+                    );
+                }
+
                 if (fs.existsSync(filePath)) {
-                    smsTemplate.body = fs.readFileSync(filePath, 'utf-8').toString();
+                    smsTemplate.body = fs.readFileSync(filePath, 'utf-8');
                 }
             }
             else {
@@ -535,6 +600,7 @@ export class ModuleMetadataSeederService {
                     action,
                     module,
                     parentMenuItem,
+                    sequenceNumber: m.sequenceNumber
                 };
 
                 // If existing, set its id so save() will perform an update, otherwise insert
@@ -653,12 +719,36 @@ export class ModuleMetadataSeederService {
         }
 
         for (let l = 0; l < users.length; l++) {
-            const user = users[l];
+            const user: SignUpDto = users[l];
             let exisitingUser = await this.userService.findOneByUsername(user.username);
             if (!exisitingUser) {
-                exisitingUser = await this.authenticationService.signUp(user);
+                let generatedAdminPassword: string | null = null;
+                if (user.username === 'sa') {
+                    generatedAdminPassword = uuidv4();
+                    user.password = generatedAdminPassword;
+                }
 
-                this.logger.log(`Newly created user is ${user}`);
+                exisitingUser = await this.authenticationService.signUp(user);
+                this.logger.log(`Newly created user ${user.username}`);
+
+                // Surface the generated SA password clearly to the operator.
+                if (generatedAdminPassword) {
+                    const banner = [
+                        '',
+                        '============================================================',
+                        '  SYSTEM ADMIN USER CREATED',
+                        '------------------------------------------------------------',
+                        '  Username : sa',
+                        `  Password : ${generatedAdminPassword}`,
+                        '',
+                        '  Copy and store this password securely now.',
+                        '  It is shown only once during seeding.',
+                        '============================================================',
+                        ''
+                    ].join('\n');
+                    // Use console.log to ensure visibility even if logger formatting changes.
+                    console.log(banner);
+                }
             }
             //FIXME: Create the user roles assignment logic here.
             // now add Roles to user.
@@ -782,5 +872,14 @@ export class ModuleMetadataSeederService {
             await this.savedFiltersRepo.upsertWithDto({ ...dto, filterQueryJson: JSON.stringify(dto.filterQueryJson) });
         }
     }
+    private async handleSeedModelSequences(modelSequencesDto: CreateModelSequenceDto[]) {
+        if (!modelSequencesDto || modelSequencesDto.length === 0) {
+            this.logger.debug(`No Model Sequences found to seed`);
+            return;
+        }
+        for (const dto of modelSequencesDto) {
+            await this.modelSequenceRepo.upsertWithDto(dto);
+        }
+    }
 
-}
+}

package/src/seeders/seed-data/email-templates/email-on-signup.handlebars.html

@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8" />
+    <title>Welcome to {{ solidAppName }}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+    <style>
+        @import url("https://fonts.googleapis.com/css?family=Nunito+Sans:400,700&display=swap");
+
+        body {
+            margin: 0;
+            padding: 0;
+            background-color: #f4f4f7;
+            font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
+            color: #333;
+        }
+
+        .email-wrapper {
+            max-width: 600px;
+            margin: 0 auto;
+            padding: 20px;
+        }
+
+        .logo {
+            text-align: center;
+            margin-bottom: 20px;
+        }
+
+        .logo img {
+            height: 50px;
+        }
+
+        .content-box {
+            background-color: #ffffff;
+            padding: 40px;
+            border-radius: 8px;
+        }
+
+        .title {
+            font-size: 22px;
+            margin-bottom: 10px;
+        }
+
+        .intro {
+            font-size: 16px;
+            line-height: 1.6;
+            margin: 0 0 12px 0;
+        }
+
+        .credentials {
+            background-color: #f9f9f9;
+            padding: 15px;
+            border-radius: 5px;
+            margin: 18px 0;
+            font-size: 16px;
+        }
+
+        .button-container {
+            text-align: center;
+            margin: 24px 0 30px 0;
+        }
+
+        .button {
+            display: inline-block;
+            padding: 12px 24px;
+            background-color: #722ED1;
+            color: #ffffff;
+            text-decoration: none;
+            font-weight: bold;
+            border-radius: 4px;
+        }
+
+        .footer {
+            text-align: center;
+            font-size: 12px;
+            color: #6b6e76;
+            margin-top: 40px;
+        }
+
+        @media only screen and (max-width: 600px) {
+            .email-wrapper {
+                width: 100% !important;
+                padding: 20px 0 !important;
+                margin: 0;
+            }
+
+            .content-box {
+                padding: 20px !important;
+                border-radius: 0;
+            }
+
+            .title {
+                font-size: 18px !important;
+            }
+
+            .button {
+                padding: 10px !important;
+                font-size: 14px;
+            }
+        }
+    </style>
+</head>
+
+<body>
+    <div class="email-wrapper">
+        {{#if companyLogoUrl}}
+        <div class="logo">
+            <img src="{{companyLogoUrl}}" alt="Company Logo" />
+        </div>
+        {{/if}}
+
+        <div class="content-box">
+            <h2 class="title">Welcome, {{ fullName }}!</h2>
+            <p class="intro">
+                We’re excited to have you on <strong>{{ solidAppName }}</strong>. Your account has been created and is
+                ready to use.
+            </p>
+            <div class="credentials">
+                <p><strong>Username:</strong> {{ userName }}</p>
+                <p><strong>Email:</strong> {{ email }}</p>
+            </div>
+            {{#if frontendLoginPageUrl}}
+            <div class="button-container">
+                <a class="button" href="{{ frontendLoginPageUrl }}" target="_blank" rel="noopener">Go to Login</a>
+            </div>
+            {{/if}}
+            <div class="credentials">
+                <p style="margin:0 0 8px 0;"><strong>How to sign in</strong></p>
+                <p class="intro" style="margin:0 0 8px 0;">
+                    Please check with your system administrator for the login method configured for your account.
+                </p>
+                <ul style="padding-left:20px; margin:0;">
+                    <li class="intro" style="margin-bottom:6px;">If password-based sign-in is enabled, your administrator will share or manage your password separately.</li>
+                    <li class="intro" style="margin-bottom:6px;">If OTP-based sign-in is enabled, you can log in with your email or mobile number and retrieve a one-time code.</li>
+                    <li class="intro" style="margin-bottom:0;">If Google OAuth is enabled, sign in with your Google Workspace credentials.</li>
+                </ul>
+            </div>
+            <p class="intro">
+                If you didn’t request this account, you can safely ignore this email or contact support.
+            </p>
+            <p class="intro">
+                Cheers,<br />
+                The {{ solidAppName }} Team
+            </p>
+        </div>
+
+        <div class="footer">
+            © 2025 <a href="{{ solidAppWebsiteUrl }}" target="_blank">{{ solidAppName }}</a>. All rights reserved.
+        </div>
+    </div>
+</body>
+
+</html>

package/src/seeders/seed-data/sms-templates/text-on-signup.handlebars.txt

@@ -0,0 +1,10 @@
+Welcome to {{ solidAppName }}!
+Your account ({{ userName }} / {{ email }}) is ready.
+
+To sign in, use the login page {{ frontendLoginPageUrl }} (if provided).
+Check with your administrator for your login method:
+- Password sign-in: admin will share/manage your password.
+- OTP sign-in: use your email or mobile to receive a code.
+- Google OAuth: sign in with your Google Workspace account.
+
+If you didn’t request this, ignore this message.