@solidstarters/solid-core 1.2.46 → 1.2.47

package/src/services/user-view-metadata.service.ts

@@ -0,0 +1,54 @@
+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 { UserViewMetadata } from '../entities/user-view-metadata.entity';
+import { UpsertUserViewMetadataDto } from 'src/dtos/upsert-user-view-metadata.dto';
+
+@Injectable()
+export class UserViewMetadataService extends CRUDService<UserViewMetadata> {
+  constructor(
+    readonly modelMetadataService: ModelMetadataService,
+    readonly moduleMetadataService: ModuleMetadataService,
+    readonly configService: ConfigService,
+    readonly fileService: FileService,
+    readonly discoveryService: DiscoveryService,
+    readonly crudHelperService: CrudHelperService,
+    @InjectEntityManager()
+    readonly entityManager: EntityManager,
+    @InjectRepository(UserViewMetadata, 'default')
+    readonly repo: Repository<UserViewMetadata>,
+    readonly moduleRef: ModuleRef
+
+  ) {
+    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'userViewMetadata', 'solid-core', moduleRef);
+  }
+
+  async upsert(query: UpsertUserViewMetadataDto) {
+    const existing = await this.repo.findOne({
+      where: { user: { id: query.userId }, viewMetadata: { id: query.viewMetadataId } }
+    });
+
+    if (existing) {
+      existing.layout = JSON.parse(query.layout);
+      return await this.repo.save(existing);
+    } else {
+      const newEntry = this.repo.create({
+        user: { id: query.userId },
+        viewMetadata: { id: query.viewMetadataId },
+        layout: JSON.parse(query.layout)
+      });
+      return await this.repo.save(newEntry);
+    }
+  }
+
+}

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

@@ -17,6 +17,7 @@ import { ViewMetadata } from '../entities/view-metadata.entity';
 import { ActionMetadataService } from './action-metadata.service';
 import { SolidIntrospectService } from './solid-introspect.service';
 import { BasicFilterDto } from 'src/dtos/basic-filters.dto';
+import { UserViewMetadataService } from './user-view-metadata.service';
 
 @Injectable()
 export class ViewMetadataService extends CRUDService<ViewMetadata> {
@@ -29,6 +30,7 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
     readonly crudHelperService: CrudHelperService,
     readonly actionMetadataService: ActionMetadataService,
     readonly introspectService: SolidIntrospectService,
+    readonly userViewMetadataService: UserViewMetadataService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
     @InjectRepository(ViewMetadata, 'default')
@@ -45,7 +47,7 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
 
   // START: Custom Service Methods
   async getLayout(query) {
-    let { modelName, moduleName, viewType, populate } = query;
+    let { modelName, moduleName, viewType, populate, userId } = query;
 
     // modelName = camelize(modelName);
 
@@ -68,8 +70,27 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
       throw new BadRequestException(`Unable to identify view for module: ${moduleName}, model: ${modelName} and viewType: ${viewType}`);
     }
 
+    if (!userId) {
+      throw new BadRequestException(`Unable to identify user for module: ${moduleName}, model: ${modelName} and viewType: ${viewType}`);
+    }
+
+    const userLayout = await this.userViewMetadataService.repo.findOne({
+      where: {
+        user: { id: userId },
+        viewMetadata: { id: entity.id },
+      },
+    });
+
+
+    if (userLayout) {
+      entity.layout = JSON.parse(userLayout.layout);
+    } else {
+      entity.layout = JSON.parse(entity.layout);
+    }
+
+
     // If view entity found then convert layout from "string" to "json".
-    entity.layout = JSON.parse(entity.layout);
+    //pass user id 
     if (entity?.layout?.attrs?.createAction) {
       const actionName: string = entity.layout.attrs.createAction;
       entity.layout.attrs.createAction = await this.actionMetadataService.findOneByUserKey(actionName)

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 { UserViewMetadata } from './entities/user-view-metadata.entity';
+import { UserViewMetadataService } from './services/user-view-metadata.service';
+import { UserViewMetadataController } from './controllers/user-view-metadata.controller';
 
 
 @Global()
@@ -185,6 +188,7 @@ import { ViewMetadataSubsciber } from './subscribers/view-metadata.subscriber';
     HttpModule,
     ConfigModule,
     TypeOrmModule.forFeature([Setting]),
+    TypeOrmModule.forFeature([UserViewMetadata]),
     // TypeOrmModule.forFeature([User]),
   ],
   controllers: [
@@ -210,6 +214,7 @@ import { ViewMetadataSubsciber } from './subscribers/view-metadata.subscriber';
     RoleMetadataController,
     UserController,
     SettingController,
+    UserViewMetadataController,
   ],
   providers: [
     {
@@ -303,7 +308,8 @@ import { ViewMetadataSubsciber } from './subscribers/view-metadata.subscriber';
     FileStorageProvider,
     FileS3StorageProvider,
     MediaRepository,
-    ViewMetadataSubsciber
+    ViewMetadataSubsciber,
+    UserViewMetadataService
   ],
   exports: [
     ModuleMetadataService,