feat(pmp): replace generic table with more specific one

valueadd-poland · Jan 27, 2020 · 1a75eb7 · 1a75eb7
1 parent 31147fd
commit 1a75eb7
Show file tree

Hide file tree

Showing 58 changed files with 284 additions and 338 deletions.
diff --git a/angular.json b/angular.json
@@ -608,42 +608,11 @@
         }
       }
     },
-    "pmp-web-shared-ui-table": {
-      "projectType": "library",
-      "root": "libs/pmp-web/shared/ui-table",
-      "sourceRoot": "libs/pmp-web/shared/ui-table/src",
-      "prefix": "pmp",
-      "architect": {
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "libs/pmp-web/shared/ui-table/tsconfig.lib.json",
-              "libs/pmp-web/shared/ui-table/tsconfig.spec.json"
-            ],
-            "exclude": ["**/node_modules/**", "!libs/pmp-web/shared/ui-table/**"]
-          }
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "options": {
-            "jestConfig": "libs/pmp-web/shared/ui-table/jest.config.js",
-            "tsConfig": "libs/pmp-web/shared/ui-table/tsconfig.spec.json",
-            "setupFile": "libs/pmp-web/shared/ui-table/src/test-setup.ts"
-          }
-        }
-      },
-      "schematics": {
-        "@nrwl/angular:component": {
-          "styleext": "scss"
-        }
-      }
-    },
     "pmp-web-user-users-statistics-feature": {
       "projectType": "library",
       "root": "libs/pmp-web/user/users-statistics/feature",
       "sourceRoot": "libs/pmp-web/user/users-statistics/feature/src",
-      "prefix": "pimp-my-pr",
+      "prefix": "pmp",
       "architect": {
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
@@ -703,7 +672,7 @@
       "projectType": "library",
       "root": "libs/pmp-web/user/data-access",
       "sourceRoot": "libs/pmp-web/user/data-access/src",
-      "prefix": "pimp-my-pr",
+      "prefix": "pmp",
       "architect": {
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
@@ -734,7 +703,7 @@
       "projectType": "library",
       "root": "libs/pmp-web/user/domain",
       "sourceRoot": "libs/pmp-web/user/domain/src",
-      "prefix": "pimp-my-pr",
+      "prefix": "pmp",
       "architect": {
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
@@ -765,7 +734,7 @@
       "projectType": "library",
       "root": "libs/pmp-web/repository/data-access-repository-statistics",
       "sourceRoot": "libs/pmp-web/repository/data-access-repository-statistics/src",
-      "prefix": "pimp-my-pr",
+      "prefix": "pmp",
       "architect": {
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
@@ -825,7 +794,7 @@
       "projectType": "library",
       "root": "libs/pmp-web/user/single-user-statistics/data-access",
       "sourceRoot": "libs/pmp-web/user/single-user-statistics/data-access/src",
-      "prefix": "pimp-my-pr",
+      "prefix": "pmp",
       "architect": {
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
@@ -859,7 +828,7 @@
       "projectType": "library",
       "root": "libs/pmp-web/repository/repositories-statistics/feature",
       "sourceRoot": "libs/pmp-web/repository/repositories-statistics/feature/src",
-      "prefix": "pimp-my-pr",
+      "prefix": "pmp",
       "architect": {
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
@@ -888,6 +857,40 @@
           "styleext": "scss"
         }
       }
+    },
+    "pmp-web-shared-ui-statistics-overview-table": {
+      "projectType": "library",
+      "root": "libs/pmp-web/shared/ui-statistics-overview-table",
+      "sourceRoot": "libs/pmp-web/shared/ui-statistics-overview-table/src",
+      "prefix": "pmp",
+      "architect": {
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "libs/pmp-web/shared/ui-statistics-overview-table/tsconfig.lib.json",
+              "libs/pmp-web/shared/ui-statistics-overview-table/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**",
+              "!libs/pmp-web/shared/ui-statistics-overview-table/**"
+            ]
+          }
+        },
+        "test": {
+          "builder": "@nrwl/jest:jest",
+          "options": {
+            "jestConfig": "libs/pmp-web/shared/ui-statistics-overview-table/jest.config.js",
+            "tsConfig": "libs/pmp-web/shared/ui-statistics-overview-table/tsconfig.spec.json",
+            "setupFile": "libs/pmp-web/shared/ui-statistics-overview-table/src/test-setup.ts"
+          }
+        }
+      },
+      "schematics": {
+        "@nrwl/angular:component": {
+          "styleext": "scss"
+        }
+      }
     }
   },
   "cli": {

diff --git a/...pmp-api/api-service/repository/api/src/lib/interceptors/response-transform.interceptor.ts b/...pmp-api/api-service/repository/api/src/lib/interceptors/response-transform.interceptor.ts
@@ -1,23 +1,12 @@
-import {
-  CallHandler,
-  ExecutionContext,
-  Injectable,
-  NestInterceptor
-} from '@nestjs/common';
+import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from '@nestjs/common';
 import { map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 import { Response } from 'express';
 import { Response as VAResponse } from '@pimp-my-pr/pmp-api/shared/domain';
 
 @Injectable()
-export class ResponseTransformInterceptor<T>
-  implements NestInterceptor<T, Response<T>> {
-  intercept(
-    context: ExecutionContext,
-    next: CallHandler
-  ): Observable<Response<T>> {
-    return next
-      .handle()
-      .pipe(map(data => VAResponse.createSuccessFullResponse(data)));
+export class ResponseTransformInterceptor<T> implements NestInterceptor<T, Response<T>> {
+  intercept(context: ExecutionContext, next: CallHandler): Observable<Response<T>> {
+    return next.handle().pipe(map(data => VAResponse.createSuccessFullResponse(data)));
   }
 }
diff --git a/libs/pmp-api/api-service/repository/core/src/lib/queries/handlers/get-pr-changes.handler.ts b/libs/pmp-api/api-service/repository/core/src/lib/queries/handlers/get-pr-changes.handler.ts
@@ -4,8 +4,7 @@ import { PrDataService } from '@pimp-my-pr/pmp-api/api-service/repository/data-a
 import { GetPrChangesQuery } from '../get-pr-changes.query';
 
 @QueryHandler(GetPrChangesQuery)
-export class GetPrChangesHandler
-  implements IQueryHandler<GetPrChangesQuery, PrChanges> {
+export class GetPrChangesHandler implements IQueryHandler<GetPrChangesQuery, PrChanges> {
   constructor(private prRepository: PrDataService) {}
 
   async execute(query: GetPrChangesQuery): Promise<PrChanges> {

diff --git a/...mp-api/api-service/repository/core/src/lib/queries/handlers/get-repository-prs.handler.ts b/...mp-api/api-service/repository/core/src/lib/queries/handlers/get-repository-prs.handler.ts
@@ -4,8 +4,7 @@ import { RepositoryDataService } from '@pimp-my-pr/pmp-api/api-service/repositor
 import { GetRepositoryPrsQuery } from '../get-repository-prs.query';
 
 @QueryHandler(GetRepositoryPrsQuery)
-export class GetRepositoryPrsHandler
-  implements IQueryHandler<GetRepositoryPrsQuery, PrModel[]> {
+export class GetRepositoryPrsHandler implements IQueryHandler<GetRepositoryPrsQuery, PrModel[]> {
   constructor(private repositoryRepository: RepositoryDataService) {}
 
   async execute(query: GetRepositoryPrsQuery): Promise<PrModel[]> {

diff --git a/libs/pmp-api/api-service/repository/core/src/lib/services/prs.service.ts b/libs/pmp-api/api-service/repository/core/src/lib/services/prs.service.ts
@@ -2,12 +2,9 @@ import { Injectable } from '@nestjs/common';
 import { QueryBus } from '@nestjs/cqrs';
 import {
   PrChanges,
-  PrDetailsModel,
   PrModel,
-  PrStatisticsReadModel,
   PrWithChangesReadModel,
-  RepositoryModel,
-  RepositoryPrsStatisticsReadModel
+  RepositoryModel
 } from '@pimp-my-pr/pmp-api/api-service/repository/domain';
 import { GetPrChangesQuery } from '../queries/get-pr-changes.query';
 

diff --git a/...mp-api/api-service/repository/data-access/src/lib/interceptors/github-auth.interceptor.ts b/...mp-api/api-service/repository/data-access/src/lib/interceptors/github-auth.interceptor.ts
@@ -11,8 +11,7 @@ export class GithubAuthInterceptor {
 
   intercept(req: AxiosRequestConfig): AxiosRequestConfig {
     req.headers = {
-      Authorization:
-        'token ' + this.pmpApiServiceConfigService.getGithubToken(),
+      Authorization: 'token ' + this.pmpApiServiceConfigService.getGithubToken(),
       ...req.headers
     };
     return req;

diff --git a/...api/api-service/repository/domain/src/lib/read-models/repository-statistics.read-model.ts b/...api/api-service/repository/domain/src/lib/read-models/repository-statistics.read-model.ts
@@ -4,9 +4,11 @@ import { BaseRepositoryStatisticsReadModel } from './base-repository-statistics.
 
 export class RepositoryStatisticsReadModel extends BaseRepositoryStatisticsReadModel {
   owner: string;
+  pictureUrl: string;
 
   constructor(repository: RepositoryModel, prs: PrWithChangesReadModel[]) {
     super(repository, prs);
     this.owner = repository.owner;
+    this.pictureUrl = repository.pictureUrl;
   }
 }
diff --git a/...pi-service/repository/domain/src/lib/read-models/repository-user-statistics.read-model.ts b/...pi-service/repository/domain/src/lib/read-models/repository-user-statistics.read-model.ts
@@ -3,7 +3,10 @@ import { PrWithChangesReadModel } from './pr-with-changes.read-model';
 import { UserModel } from '../models/user.model';
 
 export class RepositoryUserStatisticsReadModel extends BaseRepositoryStatisticsReadModel {
+  avatarUrl: string;
+
   constructor(userModel: UserModel, prsModel: PrWithChangesReadModel[]) {
     super(userModel, prsModel);
+    this.avatarUrl = userModel.avatarUrl;
   }
 }
diff --git a/libs/pmp-api/shared/config/src/lib/configs/pmp-api-service.config.ts b/libs/pmp-api/shared/config/src/lib/configs/pmp-api-service.config.ts
@@ -18,14 +18,10 @@ export class PmpApiServiceConfigService {
   }
 
   getRepositoryOwner(): string {
-    return this.configService.get<string>(
-      CONFIG_NAMESPACE + '.repositoryOwner'
-    );
+    return this.configService.get<string>(CONFIG_NAMESPACE + '.repositoryOwner');
   }
 
   getRepositoryTitle(): string {
-    return this.configService.get<string>(
-      CONFIG_NAMESPACE + '.repositoryTitle'
-    );
+    return this.configService.get<string>(CONFIG_NAMESPACE + '.repositoryTitle');
   }
 }
diff --git a/libs/pmp-api/shared/config/src/lib/pmp-api-shared-config.module.ts b/libs/pmp-api/shared/config/src/lib/pmp-api-shared-config.module.ts
@@ -1,8 +1,5 @@
 import { Module } from '@nestjs/common';
-import {
-  pmpApiServiceConfig,
-  PmpApiServiceConfigService
-} from './configs/pmp-api-service.config';
+import { pmpApiServiceConfig, PmpApiServiceConfigService } from './configs/pmp-api-service.config';
 import { ConfigModule } from '@nestjs/config';
 
 @Module({

diff --git a/libs/pmp-api/shared/domain/src/lib/base/response.ts b/libs/pmp-api/shared/domain/src/lib/base/response.ts
@@ -12,9 +12,7 @@ export class Response<T, E> implements IResponse<T, E> {
     return res;
   }
 
-  public static createErrorResponse<E>(
-    error: HttpException
-  ): Response<null, E> {
+  public static createErrorResponse<E>(error: HttpException): Response<null, E> {
     const res = new Response<null, E>();
     res.data = null;
     res.error = error.message.message || error.message.error || null;

diff --git a/libs/pmp-web/repository/data-access-repository-statistics/tslint.json b/libs/pmp-web/repository/data-access-repository-statistics/tslint.json
@@ -2,6 +2,6 @@
   "extends": "../../../../tslint.json",
   "rules": {
     "directive-selector": [true, "attribute", "pimpMyPr", "camelCase"],
-    "component-selector": [true, "element", "pimp-my-pr", "kebab-case"]
+    "component-selector": [true, "element", "pmp", "kebab-case"]
   }
 }
diff --git a/...feature/src/lib/containers/repositories-statistics/repositories-statistics.component.html b/...feature/src/lib/containers/repositories-statistics/repositories-statistics.component.html
@@ -1,4 +1,4 @@
-<pmp-table
+<pmp-statistics-overview-table
   (navigateToItem)="onNavigateToRepository($event)"
-  [tableConfig]="tableConfig"
-></pmp-table>
+  [data]="repositoryStatisticsCollection$ | async"
+></pmp-statistics-overview-table>
diff --git a/...feature/src/lib/containers/repositories-statistics/repositories-statistics.component.scss b/...feature/src/lib/containers/repositories-statistics/repositories-statistics.component.scss
@@ -6,6 +6,6 @@
   align-items: center;
 }
 
-pmp-table {
+pmp-statistics-overview-table {
   width: 80%;
 }
diff --git a/...s/feature/src/lib/containers/repositories-statistics/repositories-statistics.component.ts b/...s/feature/src/lib/containers/repositories-statistics/repositories-statistics.component.ts
@@ -1,43 +1,28 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  OnDestroy,
-  OnInit
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { RepositoryStatisticsFacade } from '@pimp-my-pr/pmp-web/repository/data-access-repository-statistics';
 import { RepositoryStatistics } from '@pimp-my-pr/shared/domain';
-import { TableConfig } from '@pimp-my-pr/pmp-web/shared/domain';
-import { untilDestroyed } from 'ngx-take-until-destroy';
 import { RepositoriesStatisticsPresenter } from './repositories-statistics.presenter';
+import { Observable } from 'rxjs';
 
 @Component({
-  selector: 'pimp-my-pr-repositories-statistics',
+  selector: 'pmp-repositories-statistics',
   templateUrl: './repositories-statistics.component.html',
   styleUrls: ['./repositories-statistics.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [RepositoriesStatisticsPresenter]
 })
 export class RepositoriesStatisticsComponent implements OnInit, OnDestroy {
-  tableConfig: TableConfig<RepositoryStatistics[]>;
+  repositoryStatisticsCollection$: Observable<RepositoryStatistics[]> = this
+    .repositoryStatisticsFacade.repositoryStatisticsCollection$;
 
   constructor(
-    private cdr: ChangeDetectorRef,
     private repositoryStatisticsFacade: RepositoryStatisticsFacade,
     private repositoriesStatisticsPresenter: RepositoriesStatisticsPresenter
   ) {}
 
   ngOnDestroy(): void {}
 
   ngOnInit(): void {
-    this.repositoryStatisticsFacade.repositoryStatisticsCollection$
-      .pipe(untilDestroyed(this))
-      .subscribe(repositoryStatistics => {
-        this.tableConfig = this.repositoriesStatisticsPresenter.initTableConfig(
-          repositoryStatistics
-        );
-        this.cdr.markForCheck();
-      });
     this.repositoryStatisticsFacade.getRepositoryStatisticsCollection();
   }
 

diff --git a/...s/feature/src/lib/containers/repositories-statistics/repositories-statistics.presenter.ts b/...s/feature/src/lib/containers/repositories-statistics/repositories-statistics.presenter.ts
@@ -7,36 +7,6 @@ import { Router } from '@angular/router';
 export class RepositoriesStatisticsPresenter {
   constructor(private router: Router) {}
 
-  initTableConfig(data: RepositoryStatistics[]): TableConfig<RepositoryStatistics[]> {
-    return {
-      columns: [
-        { name: 'repository', property: 'name', label: 'Repository' },
-        {
-          name: 'pendingPrs',
-          property: 'pendingPrs',
-          label: 'Pending PR',
-          isOrderColumn: true
-        },
-        {
-          name: 'sumOfHoursPrsWaiting',
-          property: 'sumOfHoursPrsWaiting',
-          label: 'Sum of time PR waiting'
-        },
-        {
-          name: 'linesOfCodeToCheck',
-          property: 'linesOfCodeToCheck',
-          label: 'To check [lines of code]'
-        },
-        {
-          name: 'longestPrLinesOfCode',
-          property: 'longestPrLinesOfCode',
-          label: 'Longest PR [lines of code]'
-        }
-      ],
-      data: data
-    };
-  }
-
   navigateToRepository(repositoryId: number): void {
     this.router.navigate(['repositories', repositoryId]);
   }

diff --git a/...s-statistics/feature/src/lib/pmp-web-repository-repositories-statistics-feature.module.ts b/...s-statistics/feature/src/lib/pmp-web-repository-repositories-statistics-feature.module.ts
@@ -2,15 +2,15 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RepositoriesStatisticsComponent } from './containers/repositories-statistics/repositories-statistics.component';
 import { PmpWebRepositoryRepositoriesStatisticsRoutingModule } from './pmp-web-repository-repositories-statistics-routing.module';
-import { PmpWebSharedUiTableModule } from '@pimp-my-pr/pmp-web/shared/ui-table';
 import { PmpWebRepositoryStatisticsDataAccessModule } from '@pimp-my-pr/pmp-web/repository/data-access-repository-statistics';
+import { PmpWebSharedUiStatisticsOverviewTableModule } from '@pimp-my-pr/pmp-web/shared/ui-statistics-overview-table';
 
 @NgModule({
   imports: [
     CommonModule,
     PmpWebRepositoryStatisticsDataAccessModule,
     PmpWebRepositoryRepositoriesStatisticsRoutingModule,
-    PmpWebSharedUiTableModule
+    PmpWebSharedUiStatisticsOverviewTableModule
   ],
   declarations: [RepositoriesStatisticsComponent]
 })

diff --git a/libs/pmp-web/repository/repositories-statistics/feature/tslint.json b/libs/pmp-web/repository/repositories-statistics/feature/tslint.json
@@ -2,6 +2,6 @@
   "extends": "../../../../../tslint.json",
   "rules": {
     "directive-selector": [true, "attribute", "pimpMyPr", "camelCase"],
-    "component-selector": [true, "element", "pimp-my-pr", "kebab-case"]
+    "component-selector": [true, "element", "pmp", "kebab-case"]
   }
 }