@solidstarters/solid-core 1.2.51 → 1.2.53

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

@@ -68,9 +68,9 @@ export class FieldMetadataService {
                     private: false,
                     encrypt: false,
                     model: relationModel,
-                    columnName:null,
+                    columnName: null,
                     relationJoinTableName: null,
-                    id : null,
+                    id: null,
                 }
 
                 // Load the inverse field, 
@@ -98,9 +98,9 @@ export class FieldMetadataService {
                     private: false,
                     encrypt: false,
                     model: relationModel,
-                    columnName:null,
+                    columnName: null,
                     relationJoinTableName: null,
-                    id : null,
+                    id: null,
                 }
 
                 // Load the inverse field, 
@@ -129,10 +129,10 @@ export class FieldMetadataService {
                     private: false,
                     encrypt: false,
                     model: relationModel,
-                    columnName:null,
+                    columnName: null,
                     relationJoinTableName: null,
                     isRelationManyToManyOwner: false,
-                    id : null,
+                    id: null,
                 }
                 const savedField = await this.saveInverseField(fieldRepository, relationModel, inverseFieldManyToMany);
                 return savedField;
@@ -141,7 +141,7 @@ export class FieldMetadataService {
                 throw new Error(`Invalid relation type for field ${field.name} with relation type  ${field.relationType}`);
         }
     }
-    
+
     private async getRelationModel(modelRepository: Repository<ModelMetadata>, field: FieldMetadata, moduleName: string) {
         return await modelRepository.findOne({
             where: {
@@ -750,6 +750,7 @@ export class FieldMetadataService {
                     "columnName",
                     "relationJoinTableName",
                     "isRelationManyToManyOwner",
+                    "relationFieldFixedFilter"
                 ];
 
             case SolidFieldType.mediaSingle:
@@ -1080,7 +1081,7 @@ export class FieldMetadataService {
         fieldsRequiredBasedOnType.forEach((requiredField) => {
             fieldObject[requiredField] = field[requiredField];
         });
-        
+
         if (field.type == "mediaSingle" || field.type == "mediaMultiple") {
             if (field.mediaStorageProvider) {
                 delete fieldObject.mediaStorageProviderId

package/src/services/list-of-values.service.ts

@@ -1,54 +1,62 @@
-import { InjectRepository } from "@nestjs/typeorm";
-import { Repository } from "typeorm";
-import { ListOfValues } from "../entities/list-of-values.entity";
-import { PaginationQueryDto } from "src/dtos/pagination-query.dto";
-import { Injectable, NotFoundException } from "@nestjs/common";
+import { Injectable } from '@nestjs/common';
+import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
+import { EntityManager, Repository } from 'typeorm';
 
-@Injectable()
-export class ListOfValuesService {
-    constructor(
-        @InjectRepository(ListOfValues)
-        private readonly listOfValuesRepo: Repository<ListOfValues>,
-    ) { }
+import { CRUDService } from 'src/services/crud.service';
+import { ModelMetadataService } from 'src/services/model-metadata.service';
+import { ModuleMetadataService } from 'src/services/module-metadata.service';
+import { ConfigService } from '@nestjs/config';
+import { FileService } from 'src/services/file.service';
+import { CrudHelperService } from 'src/services/crud-helper.service';
 
-    findAll(paginationQuery: PaginationQueryDto) {
-        const { limit, offset } = paginationQuery;
-        return this.listOfValuesRepo.find({
-            relations: {},
-            skip: offset,
-            take: limit,
-        });
-    }
 
-    async findOneByValueAndType(lovValue: string, lovType: string) {
-        return await this.listOfValuesRepo.findOne({
-            where: {
-                value: lovValue,
-                type: lovType,
-            },
-        });
-    }
+import { ListOfValues } from '../entities/list-of-values.entity';
 
-    async findOne(id: number, relations = {}) {
-        const lov = await this.listOfValuesRepo.findOne({
-            where: {
-                id: id,
-            },
-            relations: relations,
-        });
-        if (!lov) {
-            throw new NotFoundException(`list of values #${id} not found`);
-        }
-        return lov;
-    }
+@Injectable()
+export class ListOfValuesService extends CRUDService<ListOfValues> {
+  constructor(
+    readonly modelMetadataService: ModelMetadataService,
+    readonly moduleMetadataService: ModuleMetadataService,
+    readonly configService: ConfigService,
+    readonly fileService: FileService,
+    readonly discoveryService: DiscoveryService,
+    readonly crudHelperService: CrudHelperService,
+    @InjectEntityManager()
+    readonly entityManager: EntityManager,
+    @InjectRepository(ListOfValues, 'default')
+    readonly repo: Repository<ListOfValues>,
+    readonly moduleRef: ModuleRef
 
-    async create(createDto: any) {
-        const lov = this.listOfValuesRepo.create(createDto);
-        return this.listOfValuesRepo.save(lov);
-    }
+  ) {
+    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'listOfValues', 'solid-core', moduleRef);
+  }
+  async findOneByValueAndType(lovValue: string, lovType: string) {
+    return await this.repo.findOne({
+      where: {
+        value: lovValue,
+        type: lovType,
+      },
+    });
+  }
+  async upsert(updateListOfValuesDto: any) {
+    // First check if module already exists using name
+    const existingListOfValue = await this.repo.findOne({
+      where: {
+        value: updateListOfValuesDto.value
+      }
+    })
 
-    async remove(id: number) {
-        const lov = await this.findOne(id);
-        return this.listOfValuesRepo.remove(lov);
+    // if found
+    if (existingListOfValue) {
+      const updatedListOfValuesDto = { ...existingListOfValue, ...updateListOfValuesDto };
+      return this.repo.save(updatedListOfValuesDto);
     }
-}
+    // if not found - create new 
+    else {
+      const listOfValue = this.repo.create(updateListOfValuesDto);
+      return this.repo.save(listOfValue);
+    }
+  }
+
+}

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

@@ -184,6 +184,16 @@ export class ModelMetadataService {
         relations: {},
       });
     createDto['module'] = resolvedModule;
+
+    const resolvedParentModel = await this.dataSource
+      .getRepository(ModelMetadata)
+      .findOne({
+        where: {
+          id: createDto['parentModelId'],
+        },
+        relations: {},
+      });
+    createDto['parentModel'] = resolvedParentModel;
     const { fields: fieldsMetadata, ...modelMetaDataWithoutFields } = createDto;
     const modelMetadata = this.modelMetadataRepo.create(modelMetaDataWithoutFields);
     let model = await manager.save(modelMetadata);
@@ -330,7 +340,7 @@ export class ModelMetadataService {
         where: {
           id: modelId,
         },
-        relations: ["fields", "fields.mediaStorageProvider", "module"], //FIXME: Check with jenender and change to relations to avoid confusion
+        relations: ["fields", "fields.mediaStorageProvider", "module", "parentModel"], //FIXME: Check with jenender and change to relations to avoid confusion
       });
 
       const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
@@ -345,6 +355,8 @@ export class ModelMetadataService {
         dataSourceType: model.dataSourceType,
         tableName: model.tableName,
         userKeyFieldUserKey: model.fields.find(field => field.isUserKey)?.name,
+        isChild: model?.isChild,
+        parentModelUserKey: model?.parentModel?.singularName,
         fields: []
       }
 
@@ -595,7 +607,7 @@ export class ModelMetadataService {
         where: {
           id: modelId,
         },
-        relations: ["fields", "fields.mediaStorageProvider", "module"], //FIXME: Check with jenender and change to relations to avoid confusion
+        relations: ["fields", "fields.mediaStorageProvider", "module", "parentModel"], //FIXME: Check with jenender and change to relations to avoid confusion
       });
 
       const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
@@ -610,6 +622,8 @@ export class ModelMetadataService {
         dataSourceType: model.dataSourceType,
         tableName: model.tableName,
         userKeyFieldUserKey: model.fields.find(field => field.isUserKey)?.name,
+        isChild: model.isChild,
+        parentModelUserKey: model.parentModel.singularName,
         fields: []
       }
 
@@ -895,7 +909,7 @@ export class ModelMetadataService {
     }
 
     const query = {
-      populate: ["module", "fields"]
+      populate: ["module", "fields", "parentModel"]
     };
     const model = options.modelId ? await this.findOne(options.modelId, query) : await this.findOneByUserKey(options.modelUserKey, query.populate);
 
@@ -917,7 +931,8 @@ export class ModelMetadataService {
         dataSource: model.dataSource,
         table: model.tableName,
         fields: fieldsForRefresh,
-        modelEnableSoftDelete: model.enableSoftDelete
+        modelEnableSoftDelete: model.enableSoftDelete,
+        parentModel: model.parentModel?.singularName
       },
       dryRun
     );

package/src/services/saved-filters.service.ts

@@ -0,0 +1,34 @@
+import { Injectable } from '@nestjs/common';
+import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
+import { DiscoveryService, ModuleRef  } 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 { ConfigService } from '@nestjs/config';
+import { FileService } from 'src/services/file.service';
+import { CrudHelperService } from 'src/services/crud-helper.service';
+
+
+import { SavedFilters } from '../entities/saved-filters.entity';
+
+@Injectable()
+export class SavedFiltersService extends CRUDService<SavedFilters>{
+  constructor(
+    readonly modelMetadataService: ModelMetadataService,
+    readonly moduleMetadataService: ModuleMetadataService,
+    readonly configService: ConfigService,
+    readonly fileService: FileService,
+    readonly discoveryService: DiscoveryService,
+    readonly crudHelperService: CrudHelperService,
+    @InjectEntityManager()
+    readonly entityManager: EntityManager,
+    @InjectRepository(SavedFilters, 'default')
+    readonly repo: Repository<SavedFilters>,
+    readonly moduleRef: ModuleRef
+
+ ) {
+   super(modelMetadataService, moduleMetadataService,  configService, fileService,  discoveryService, crudHelperService,entityManager, repo, 'savedFilters', 'solid-core', moduleRef);
+ }
+}

package/src/solid-core.module.ts

@@ -141,6 +141,9 @@ import { FileS3StorageProvider } from './services/mediaStorageProviders/file-s3-
 import { FileStorageProvider } from './services/mediaStorageProviders/file-storage-provider';
 import { MediaRepository } from './repository/media.repository';
 import { ViewMetadataSubsciber } from './subscribers/view-metadata.subscriber';
+import { SavedFilters } from './entities/saved-filters.entity';
+import { SavedFiltersService } from './services/saved-filters.service';
+import { SavedFiltersController } from './controllers/saved-filters.controller';
 import { UserViewMetadata } from './entities/user-view-metadata.entity';
 import { UserViewMetadataService } from './services/user-view-metadata.service';
 import { UserViewMetadataController } from './controllers/user-view-metadata.controller';
@@ -150,6 +153,7 @@ import { SecurityRuleController } from './controllers/security-rule.controller';
 import { RequestContextService } from './services/request-context.service';
 import { SecurityRuleRepository } from './repository/security-rule.repository';
 import { SecurityRuleSubscriber } from './subscribers/security-rule.subscriber';
+import { ListOfValuesController } from './controllers/list-of-values.controller';
 
 
 @Global()
@@ -194,8 +198,11 @@ import { SecurityRuleSubscriber } from './subscribers/security-rule.subscriber';
     HttpModule,
     ConfigModule,
     TypeOrmModule.forFeature([Setting]),
+    TypeOrmModule.forFeature([SavedFilters]),
     TypeOrmModule.forFeature([UserViewMetadata]),
     TypeOrmModule.forFeature([SecurityRule]),
+    TypeOrmModule.forFeature([SavedFilters]),
+    TypeOrmModule.forFeature([ListOfValues]),
     // TypeOrmModule.forFeature([User]),
   ],
   controllers: [
@@ -221,8 +228,11 @@ import { SecurityRuleSubscriber } from './subscribers/security-rule.subscriber';
     RoleMetadataController,
     UserController,
     SettingController,
+    SavedFiltersController,
     UserViewMetadataController,
     SecurityRuleController,
+    SavedFiltersController,
+    ListOfValuesController
   ],
   providers: [
     {
@@ -317,11 +327,13 @@ import { SecurityRuleSubscriber } from './subscribers/security-rule.subscriber';
     FileS3StorageProvider,
     MediaRepository,
     ViewMetadataSubsciber,
+    SavedFiltersService,
     UserViewMetadataService,
     SecurityRuleService,
     SecurityRuleRepository,
     SecurityRuleSubscriber,
     RequestContextService,
+    SavedFiltersService
   ],
   exports: [
     ModuleMetadataService,