Fixed unit test

Author: j1032w

Dockerfile

@@ -5,10 +5,11 @@ FROM node:22-alpine AS build
 WORKDIR /ng-app
 # Add project into container, install dependencies
 
-ADD .yarn yarn.lock package.json angular.json tsconfig.json  tsconfig.app.json /ng-app/
-ADD src/ /ng-app/src/
+COPY .yarn yarn.lock package.json angular.json tsconfig.json  tsconfig.app.json /ng-app/
+COPY src/ /ng-app/src/
 RUN yarn install --update-checksums --no-progress --non-interactive --ignore-scripts
 
+
 # Build application
 RUN yarn --ignore-scripts build:prod
 

Dockerfile-lint

@@ -0,0 +1,18 @@
+# Dockerfile.test
+FROM node:22-alpine
+
+WORKDIR /app
+
+# Copy necessary files and install dependencies
+# COPY package.json yarn.lock eslint.config.js angular.json cypress.config.ts jest.config.ts tsconfig.app.json tsconfig.json tsconfig.spec.json ./src ./
+
+COPY package.json yarn.lock ./
+
+
+RUN yarn install
+
+# Copy the rest of the application files
+COPY . .
+
+# Run the tests
+CMD ["yarn", "lint"]

Dockerfile-test

@@ -0,0 +1,18 @@
+# Dockerfile.test
+FROM node:22-alpine
+
+WORKDIR /app
+
+# Copy necessary files and install dependencies
+# COPY package.json yarn.lock eslint.config.js angular.json cypress.config.ts jest.config.ts tsconfig.app.json tsconfig.json tsconfig.spec.json ./src ./
+
+COPY package.json yarn.lock ./
+
+
+RUN yarn install
+
+# Copy the rest of the application files
+COPY . .
+
+# Run the tests
+CMD ["yarn", "test"]

README.md

@@ -107,6 +107,12 @@ docker image build --progress=plain --tag das-ui:develop
 docker container run -d -p 4201:80 --rm das-ui:develop
 ```  
 
+### Run test and lint with Docker cli
+```
+docker compose -f docker-compose.test.yml up test --build
+
+docker compose -f docker-compose.test.yml up lint --build
+```
 
 # GitLab CI/CD
 https://gitlab.com/j1032w/dashboard-starter/-/pipelines

docker-compose.test.yml

@@ -0,0 +1,20 @@
+version: '3.8'
+
+services:
+  test:
+    build:
+      context: .
+      dockerfile: Dockerfile-test
+    volumes:
+      - .:/app
+    environment:
+      - NODE_ENV=test
+
+  lint:
+    build:
+      context: .
+      dockerfile: Dockerfile-lint
+    volumes:
+      - .:/app
+    environment:
+      - NODE_ENV=test

docker-compose.yml

@@ -16,8 +16,6 @@ services:
     ports:
       - "4201:80"
 
-
-
 volumes:
   nginx_config:
   nginx_html:

package.json

@@ -16,9 +16,12 @@
     "build:prod": "ng build --aot --configuration production",
     "build:analyze": "ng build --configuration production --stats-json && ng analyze",
     "analyze": "webpack-bundle-analyzer ./dist/analyze-result.json",
-    "clean": "rimraf dist node_modules .angular/cache .sonar",
+    "clean": "rimraf dist node_modules .angular/cache .sonar && yarn cache clean && jest --clearCache",
     "cypr": "cross-env CYPRESS_REMOTE_DEBUGGING_PORT=9299 cypress open",
-    "lint": "ng lint"
+    "lint": "ng lint",
+    "docker:test": "docker compose -f docker-compose.test.yml up test --build",
+    "docker:lint": "docker compose -f docker-compose.test.yml up lint --build"
+
   },
   "dependencies": {
     "@angular/animations": "^18.2.0",

src/app/views/dashboard/housing-market-widget/housing-market-widget-pie/dv-housing-market-widget-pie.component.ts

@@ -1,5 +1,19 @@
-import { Component, ElementRef, Input, ViewChild } from '@angular/core';
-import { BubbleDataPoint, ChartConfiguration, ChartData, ChartType, Point } from 'chart.js';
+import {
+  Component,
+  ElementRef,
+  Input,
+  OnInit,
+  ViewChild
+} from '@angular/core';
+import {
+  BubbleDataPoint,
+  Chart,
+  ChartConfiguration,
+  ChartData,
+  ChartType,
+  Point
+} from 'chart.js';
+import DataLabelsPlugin from 'chartjs-plugin-datalabels';
 import {BaseChartDirective} from 'ng2-charts';
 
 import { ElementSizeInterface } from '../../../../common/components/das-auto-size/das-auto-size.component';
@@ -11,7 +25,7 @@ import { DasWidgetContentBaseComponent } from '../../../../common/components/das
   templateUrl: './dv-housing-market-widget-pie.component.html',
   styleUrls: ['./dv-housing-market-widget-pie.component.scss']
 })
-export class DvHousingMarketWidgetPieComponent extends DasWidgetContentBaseComponent {
+export class DvHousingMarketWidgetPieComponent extends DasWidgetContentBaseComponent implements OnInit  {
   @ViewChild('pieChart') pieChartComponent: BaseChartDirective | undefined;
 
   @Input() pieChartData: ChartData<'pie', number[], string>;
@@ -65,6 +79,12 @@ export class DvHousingMarketWidgetPieComponent extends DasWidgetContentBaseCompo
     super(elementRef, dashboardCoreService);
   }
 
+
+  override ngOnInit() {
+    super.ngOnInit();
+    Chart.register(DataLabelsPlugin);
+  }
+
   protected override readonly repaintComponent = () => {
     this.pieChartComponent?.render();
   };