@solidstarters/solid-core 1.2.6 → 1.2.9

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

@@ -158,7 +158,6 @@ export class ModelMetadataService {
         relations: {},
       });
     createDto['module'] = resolvedModule;
-
     const { fields: fieldsMetadata, ...modelMetaDataWithoutFields } = createDto;
     const modelMetadata = this.modelMetadataRepo.create(modelMetaDataWithoutFields);
     let model = await manager.save(modelMetadata);
@@ -168,7 +167,6 @@ export class ModelMetadataService {
     const listViewLayout = [];
     const formViewLayout = [];
 
-    const userKeyFieldName = createDto.userKeyFieldUserKey;
     for (let k = 0; k < fieldsMetadata.length; k++) {
       const fieldMetadata = fieldsMetadata[k];
 
@@ -182,7 +180,7 @@ export class ModelMetadataService {
       const fieldMetadataObject = this.fieldMetadataRepo.create(fieldMetadata);
       const affectedField = await manager.save(fieldMetadataObject);
 
-      if (fieldMetadata.name === userKeyFieldName) {
+      if (fieldMetadata.isUserKey) {
         userKeyField = affectedField;
       }
       listViewLayout.push({ type: "field", attrs: { name: `${affectedField.name}`, label: `${affectedField.displayName}`, sortable: true, filterable: true } })
@@ -466,7 +464,7 @@ export class ModelMetadataService {
     const existingFieldIds = existingFields.map((field) => field.id);
 
     // 2. Synchronize fields
-    const userKeyFieldName = updateModelMetaDataDto.userKeyFieldUserKey;
+    // const userKeyFieldName = updateModelMetaDataDto.userKeyFieldUserKey;
     let userKeyField = null;
 
     const fieldsToSave: FieldMetadata[] = [];
@@ -490,14 +488,14 @@ export class ModelMetadataService {
         if (fieldMetadata.mediaStorageProviderId) {
           fieldMetadata['mediaStorageProvider'] = await this.mediaStorageProviderMetadataService.findOne(fieldMetadata.mediaStorageProviderId);
         }
-        const createdField = await this.fieldMetadataRepo.create(fieldMetadata);
+        const createdField = fieldRepo.create(fieldMetadata);
         fieldsToSave.push(createdField);
       }
 
       // Check for userKeyField
-      if (fieldMetadata.name === userKeyFieldName) {
-        userKeyField = fieldMetadata;
-      }
+      // if (fieldMetadata.isUserKey) {
+      //   userKeyField = fieldMetadata;
+      // }
     }
 
     // Fields to delete (not in the payload)
@@ -514,10 +512,37 @@ export class ModelMetadataService {
       // await this.fieldMetadataRepo.remove(fieldsToDelete);
     }
 
+    const finalModel = await modelRepo.findOne({
+      where: { id: updatedModel.id },
+      relations: ["fields", "userKeyField"]
+    });
+
     // 3. Update model with userKeyField if specified
-    if (userKeyField) {
-      updatedModel.userKeyField = userKeyField;
-      await modelRepo.save(updatedModel);
+    const userKeyFields = fieldsMetadata.filter(field => field.isUserKey);
+
+    if (userKeyFields.length > 0) {
+        const newUserKeyField = userKeyFields[userKeyFields.length - 1]; 
+        const savedUserKeyField = await fieldRepo.findOne({ where: { id: newUserKeyField.id } });
+    
+        if (savedUserKeyField) {
+            finalModel.userKeyField = savedUserKeyField;
+            await modelRepo.save(finalModel);
+        }
+    
+        const otherUserKeyFields = userKeyFields.filter(field => field.id !== newUserKeyField.id);
+    
+        for (const field of otherUserKeyFields) {
+            const existingField = await fieldRepo.findOne({ where: { id: field.id } });
+            if (existingField) {
+                existingField.isUserKey = false;
+                await fieldRepo.save(existingField);
+            }
+        }
+    } else {
+        if (finalModel.userKeyField) {
+            finalModel.userKeyField = null;
+            await modelRepo.save(finalModel);
+        }
     }
 
     return updatedModel;

package/src/services/setting.service.ts

@@ -0,0 +1,71 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
+import { DiscoveryService } from "@nestjs/core";
+import { EntityManager, Repository } from 'typeorm';
+
+import { CRUDService } from 'src/services/crud.service';
+import { ModelMetadataService } from 'src/services/model-metadata.service';
+import { ModuleMetadataService } from 'src/services/module-metadata.service';
+import { MediaStorageProviderMetadataService } from 'src/services/media-storage-provider-metadata.service';
+import { ConfigService, ConfigType } from '@nestjs/config';
+import { MediaService } from 'src/services/media.service';
+import { FileService } from 'src/services/file.service';
+import { CrudHelperService } from 'src/services/crud-helper.service';
+
+
+import { Setting } from '../entities/setting.entity';
+import { iamConfig } from 'src/config/iam.config';
+import commonConfig from 'src/config/common.config';
+
+@Injectable()
+export class SettingService extends CRUDService<Setting>{
+  constructor(
+    readonly modelMetadataService: ModelMetadataService,
+    readonly moduleMetadataService: ModuleMetadataService,
+    readonly mediaStorageProviderService: MediaStorageProviderMetadataService,
+    readonly configService: ConfigService,
+    readonly fileService: FileService,
+    readonly mediaService: MediaService,
+    readonly discoveryService: DiscoveryService,
+    readonly crudHelperService: CrudHelperService,
+    @Inject(iamConfig.KEY) private readonly iamConfiguration: ConfigType<typeof iamConfig>,
+    @Inject(commonConfig.KEY)
+            private readonly commonConfiguration: ConfigType<typeof commonConfig>,
+    @InjectEntityManager()
+    readonly entityManager: EntityManager,
+    @InjectRepository(Setting, 'default')
+    readonly repo: Repository<Setting>,
+ ) {
+   super(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService,entityManager, repo, 'setting', 'solid-core'
+   );
+ }
+
+  async getAllSettings(): Promise<Record<string, any>> {
+    const settings: any = await this.repo.find();
+    if (!settings || settings.length === 0) {
+      return this.getDefaultSettings();
+    }
+    return settings;
+  }
+
+  private getDefaultSettings(): Record<string, any> {
+    return {
+      iamAllowPublicRegistration: this.iamConfiguration.allowPublicRegistration,
+      iamPasswordRegistrationEnabled: false,
+      iamPasswordLessRegistrationEnabled: this.iamConfiguration.passwordlessRegistration,
+      iamActivateUserOnRegistration: this.iamConfiguration.activateUserOnRegistration,
+      iamGoogleOAuthEnabled: false,
+      authPagesLayout: "center",
+      authPagesTheme: "light",
+      appTitle: process.env.SOLID_APP_NAME || "Default App",
+      appLogo: "",
+      appDescription: "",
+      appTnc: "",
+      appPrivacyPolicy: "",
+      iamDefaultRole: this.iamConfiguration.defaultRole,
+      shouldQueueEmails: this.commonConfiguration.shouldQueueEmails,
+      shouldQueueSms: this.commonConfiguration.shouldQueueSms
+    };
+  }
+
+}

package/src/solid-core.module.ts

@@ -132,6 +132,9 @@ import { User } from './entities/user.entity';
 import { PermissionMetadataSeederService } from './seeders/permission-metadata-seeder.service';
 import { RoleMetadataService } from './services/role-metadata.service';
 import { UserService } from './services/user.service';
+import { Setting } from './entities/setting.entity';
+import { SettingService } from './services/setting.service';
+import { SettingController } from './controllers/setting.controller';
 
 
 @Global()
@@ -175,6 +178,7 @@ import { UserService } from './services/user.service';
     }),
     HttpModule,
     ConfigModule,
+    TypeOrmModule.forFeature([Setting]),
     // TypeOrmModule.forFeature([User]),
   ],
   controllers: [
@@ -199,6 +203,7 @@ import { UserService } from './services/user.service';
     PermissionMetadataController,
     RoleMetadataController,
     UserController,
+    SettingController,
   ],
   providers: [
     {
@@ -286,6 +291,7 @@ import { UserService } from './services/user.service';
     RoleMetadataService,
     PermissionMetadataSeederService,
     UserService,
+    SettingService,
   ],
   exports: [
     ModuleMetadataService,