fixed DataLayerColorService overrides callback functions

elimuinformatics · Mar 18, 2024 · 0e7391b · 0e7391b
1 parent 95c2080
commit 0e7391b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/libs/ngx-charts-on-fhir/src/lib/data-layer/data-layer-color.service.spec.ts b/libs/ngx-charts-on-fhir/src/lib/data-layer/data-layer-color.service.spec.ts
@@ -83,6 +83,23 @@ describe('DataLayerColorService', () => {
       service.chooseColorsFromPalette(layer);
       expect(layer.annotations[0].backgroundColor).toEqual('rgba(0, 0, 0, 0.2)');
     }));
+
+    it('should ignore datasets that use a callback function for borderColor', inject([DataLayerColorService], (service: DataLayerColorService) => {
+      const borderColor = () => '#000000';
+      const layer: any = {
+        datasets: [{ label: 'One', borderColor }],
+      };
+      service.chooseColorsFromPalette(layer);
+      expect(layer.datasets[0].borderColor).toBe(borderColor);
+    }));
+    it('should ignore datasets that use a callback function for pointBackgroundColor', inject([DataLayerColorService], (service: DataLayerColorService) => {
+      const pointBackgroundColor = () => '#000000';
+      const layer: any = {
+        datasets: [{ label: 'One', pointBackgroundColor }],
+      };
+      service.chooseColorsFromPalette(layer);
+      expect(layer.datasets[0].pointBackgroundColor).toBe(pointBackgroundColor);
+    }));
   });
 
   describe('addTransparency', () => {
@@ -93,7 +110,7 @@ describe('DataLayerColorService', () => {
   });
 
   describe('getColor', () => {
-    it('should get correct annotation color by calling getColor', inject([DataLayerColorService], (service: DataLayerColorService) => {
+    it('should get the borderColor of a dataset', inject([DataLayerColorService], (service: DataLayerColorService) => {
       const dataset: any = {
         label: 'Diastolic Blood Pressure',
         yAxisID: 'mm[Hg]',
@@ -105,7 +122,7 @@ describe('DataLayerColorService', () => {
   });
 
   describe('setColor', () => {
-    it('should setColor function called', inject([DataLayerColorService], (service: DataLayerColorService) => {
+    it('should set the borderColor of a dataset', inject([DataLayerColorService], (service: DataLayerColorService) => {
       const dataset: any = { borderColor: '#e41a1c' };
       service.setColor(dataset, '#e41a1c');
       expect(dataset.borderColor).toEqual('#e41a1c');

diff --git a/libs/ngx-charts-on-fhir/src/lib/data-layer/data-layer-color.service.ts b/libs/ngx-charts-on-fhir/src/lib/data-layer/data-layer-color.service.ts
@@ -39,7 +39,7 @@ export class DataLayerColorService {
   /** Chooses colors for all of the datasets and annotations in the Layer by cycling through the palette */
   chooseColorsFromPalette(layer: DataLayer): void {
     for (let dataset of layer.datasets) {
-      if (!this.getColor(dataset)) {
+      if (!this.hasColor(dataset)) {
         const colorIndex = this.getMatchingDatasetColorIndex(layer, dataset) ?? this.getNextPaletteIndex();
         const palette = this.getPalette(dataset);
         const color = palette[colorIndex];
@@ -127,6 +127,11 @@ export class DataLayerColorService {
     return undefined;
   }
 
+  hasColor(dataset: Dataset) {
+    const line = dataset as Dataset<'line'>;
+    return line.borderColor || line.backgroundColor || line.pointBorderColor || line.pointBackgroundColor;
+  }
+
   /** build a CSS linear gradient that includes colors from all datasets in the layer */
   getColorGradient(layer: DataLayer) {
     const percent = (i: number) => Math.floor((100 * i) / layer.datasets.length);