Merge branch 'dev' into users/mtherien/LEGLINK-294-bad-response

Author: MikeAtPinnacle

.github/workflows/tests.yaml

@@ -170,6 +170,7 @@ jobs:
         shell: bash
         run: |
           set -o pipefail
+          export ADHOC_REPORT_TEST_DOWNLOAD_PATH=adhoc-report
           mkdir -p ./Tests/BackendE2ETests/TestResults
           mkdir -p ./test-logs
 
@@ -262,7 +263,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: adhoc-report-submission-zip
-          path: ./Tests/BackendE2ETests/TestResults/adhoc-report-test-submission.zip
+          path: ./Tests/BackendE2ETests/bin/**/adhoc-report-test-submission.zip
           if-no-files-found: ignore
 
       - name: Tear down services

Web/Admin.UI/angular.json

@@ -95,7 +95,9 @@
           "builder": "@angular/build:karma",
           "options": {
             "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "src/polyfills.ts"
+            ],
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
             "assets": [
@@ -104,8 +106,14 @@
             ],
             "styles": [
               "@angular/material/prebuilt-themes/indigo-pink.css",
-              "src/styles.css"
+              "src/styles.scss"
             ],
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "src",
+                "src/styles"
+              ]
+            },
             "scripts": []
           }
         }

Web/Admin.UI/src/app/components/core/donut-chart/donut-chart.component.ts

@@ -22,6 +22,8 @@ export class DonutChartComponent implements AfterViewInit, OnChanges, OnDestroy
 
   @Input() data: Record<string, number> = {};
   @Input() enableSelection: boolean = false;
+  /** Optional label → color (hex/CSS) map. Labels not present fall back to the default palette. */
+  @Input() colorMap?: Record<string, string>;
   @Output() sliceSelected = new EventEmitter<string>();
   @ViewChild('container', { static: true }) container!: ElementRef;
   @ViewChild('chart', { static: true }) chart!: ElementRef<SVGSVGElement>;
@@ -61,7 +63,8 @@ export class DonutChartComponent implements AfterViewInit, OnChanges, OnDestroy
       .attr('transform', `translate(${width / 2}, ${height / 2})`);
 
     const dataEntries = Object.entries(this.data);
-    const color = d3.scaleOrdinal(d3.schemeTableau10);
+    const fallbackColor = d3.scaleOrdinal(d3.schemeTableau10);
+    const color = (label: string): string => this.colorMap?.[label] ?? fallbackColor(label);
 
     const pie = d3.pie<any>().value(d => d[1]);
     const arc = d3.arc<d3.PieArcDatum<[string, number]>>()

Web/Admin.UI/src/app/components/data-acquisition/query-plan-config/query-plan-config.component.spec.ts

@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { QueryPlanConfigComponent } from './query-plan-config.component';
+import { QueryPlanConfigFormComponent } from './query-plan-config.component';
 
-describe('QueryPlanConfigComponent', () => {
-  let component: QueryPlanConfigComponent;
-  let fixture: ComponentFixture<QueryPlanConfigComponent>;
+describe('QueryPlanConfigFormComponent', () => {
+  let component: QueryPlanConfigFormComponent;
+  let fixture: ComponentFixture<QueryPlanConfigFormComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [QueryPlanConfigComponent]
+      imports: [QueryPlanConfigFormComponent]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(QueryPlanConfigComponent);
+    fixture = TestBed.createComponent(QueryPlanConfigFormComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

Web/Admin.UI/src/app/components/query-dispatch/query-dispatch-config-dialog/query-dispatch-config-dialog.component.spec.ts

@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { QueryConfigDialogComponent } from './query-dispatch-config-dialog.component';
+import { QueryDispatchConfigDialogComponent } from './query-dispatch-config-dialog.component';
 
 describe('CensusConfigDialogComponent', () => {
-  let component: QueryConfigDialogComponent;
-  let fixture: ComponentFixture<QueryConfigDialogComponent>;
+  let component: QueryDispatchConfigDialogComponent;
+  let fixture: ComponentFixture<QueryDispatchConfigDialogComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [ QueryConfigDialogComponent ]
+      imports: [ QueryDispatchConfigDialogComponent ]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(QueryConfigDialogComponent);
+    fixture = TestBed.createComponent(QueryDispatchConfigDialogComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

Web/Admin.UI/src/app/components/query-dispatch/query-dispatch-config-form/query-dispatch-config-form.component.spec.ts

@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { QueryConfigFormComponent } from './query-dispatch-config-form.component';
+import { QueryDispatchConfigFormComponent } from './query-dispatch-config-form.component';
 
 describe('CensusConfigFormComponent', () => {
-  let component: QueryConfigFormComponent;
-  let fixture: ComponentFixture<QueryConfigFormComponent>;
+  let component: QueryDispatchConfigFormComponent;
+  let fixture: ComponentFixture<QueryDispatchConfigFormComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [ QueryConfigFormComponent ]
+      imports: [ QueryDispatchConfigFormComponent ]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(QueryConfigFormComponent);
+    fixture = TestBed.createComponent(QueryDispatchConfigFormComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

Web/Admin.UI/src/app/components/tenant/acquisition-log/acquisition-log-view/acquisition-log-view.component.ts

@@ -148,7 +148,7 @@ export class AcquisitionLogViewComponent implements OnInit {
   selectedPriorityFilter: string = 'Any';
   queryPhaseFilterOptions: string[] = [ "Initial", "Supplemental", "Referential", "Polling", "Monitoring" ];
   selectedQueryPhaseFilter: string = 'Any';
-  queryTypeFilterOptions: string[] = [ "Read", "Search", "BulkDataRequest", "BulkDataPoll" ];
+  queryTypeFilterOptions: string[] = [ "Read", "Search", "SearchPost", "BulkDataRequest", "BulkDataPoll" ];
   selectedQueryTypeFilter: string = 'Any';
   statusFilterOptions: string[] = [ "Pending", "Ready", "Processing", "Completed", "Failed", "Cancelled", "MaxRetriesReached", "ConfigurationMissing", "Skipped", "Queued"];
   selectedStatusFilter: string[] = [];

Web/Admin.UI/src/app/components/tenant/facility-view/view-report/view-report.component.html

@@ -112,17 +112,19 @@
     </div>
     <div class="report-chart-row">
       <div class="report-chart-cell">
-        <app-donut-chart [data]="measureIpCountsData"></app-donut-chart>
+        <app-donut-chart [data]="measureIpCountsData" [colorMap]="measureIpColors"></app-donut-chart>
       </div>
       <div class="report-chart-cell">
         <app-donut-chart
           [data]="reportStatusData"
+          [colorMap]="reportStatusColors"
           [enableSelection]="true"
           (sliceSelected)="onReportStatusSliceSelected($event)"></app-donut-chart>
       </div>
       <div class="report-chart-cell">
         <app-donut-chart
           [data]="submissionStatusData"
+          [colorMap]="submissionStatusColors"
           [enableSelection]="true"
           (sliceSelected)="onSubmissionStatusSliceSelected($event)"></app-donut-chart>
       </div>

Web/Admin.UI/src/app/components/tenant/facility-view/view-report/view-report.component.ts

@@ -34,6 +34,7 @@ import {
   faXmark
 } from '@fortawesome/free-solid-svg-icons';
 import {LoadingService} from 'src/app/services/loading.service';
+import {ChartColorService} from 'src/app/services/chart-color.service';
 import {DonutChartComponent} from 'src/app/components/core/donut-chart/donut-chart.component';
 import {ViewReportTableCommandComponent} from './table-command/view-report-table-command.component';
 import {AcquisitionLogService} from '../../acquisition-log/acquisition-log.service';
@@ -99,9 +100,30 @@ export class ViewReportComponent implements OnInit {
   // Add summary data for donut charts
   reportEntrySummary: IReportEntrySummary | undefined;
   measureIpCountsData: Record<string, number> = {};
+  // Stable colors per report type, persisted across refreshes via ChartColorService.
+  measureIpColors: Record<string, string> = {};
   reportStatusData: Record<string, number> = {};
   submissionStatusData: Record<string, number> = {};
 
+  // Fixed donut-chart colors keyed by the labels produced by
+  // getReportingStatusText / getSubmissionStatusText. Labels not listed
+  // fall back to the chart's default palette.
+  reportStatusColors: Record<string, string> = {
+    'Patient Identified': '#1f77b4', // blue - in pipeline
+    'Pending Validation': '#ff9800', // amber - in progress
+    'Passed Validation': '#2ca02c',  // green - good
+    'Failed Validation': '#d62728',  // red - bad
+    'Not Reportable': '#9e9e9e',     // grey - neutral
+  };
+  submissionStatusColors: Record<string, string> = {
+    'Pending Validation': '#ff9800', // amber - in progress
+    'Submitting': '#1f77b4',         // blue - in progress
+    'Submitted': '#2ca02c',          // green - good
+    'Failed Submission': '#d62728',  // red - bad
+    'Not Eligible': '#9e9e9e',       // grey - neutral
+    'Pending': '#bdbdbd',            // light grey - neutral
+  };
+
   defaultPageNumber: number = 0
   defaultPageSize: number = 10;
   sortBy: string | null = null;
@@ -142,7 +164,8 @@ export class ViewReportComponent implements OnInit {
     private facilityViewService: FacilityViewService,
     private acquisitionLogService: AcquisitionLogService,
     private loadingService: LoadingService,
-    private reportService: ReportService) { }
+    private reportService: ReportService,
+    private chartColorService: ChartColorService) { }
 
   ngOnInit(): void {
     const savedPageSize = localStorage.getItem(this.PAGE_SIZE_KEY);
@@ -235,6 +258,10 @@ export class ViewReportComponent implements OnInit {
         next: (data) => {
           this.reportEntrySummary = data;
           this.measureIpCountsData = data.reportTypeCounts;
+          this.measureIpColors = this.chartColorService.getColorMap(
+            'measure-report-type',
+            Object.keys(data.reportTypeCounts)
+          );
           this.reportStatusData = Object.entries(data.reportingStatusCounts).reduce((acc, [statusKey, count]) => {
             const statusValue = this.toReportingStatus(statusKey);
             const label = statusValue !== null ? this.getReportingStatusText(statusValue) : statusKey;

Web/Admin.UI/src/app/components/testing/patient-listacquired-form/patient-listacquired-form.component.spec.ts

@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { PatientListacquiredFormComponent } from './patient-listacquired-form.component';
+import { PatientListAcquiredComponent } from './patient-listacquired-form.component';
 
-describe('PatientListacquiredFormComponent', () => {
-  let component: PatientListacquiredFormComponent;
-  let fixture: ComponentFixture<PatientListacquiredFormComponent>;
+describe('PatientListAcquiredComponent', () => {
+  let component: PatientListAcquiredComponent;
+  let fixture: ComponentFixture<PatientListAcquiredComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [PatientListacquiredFormComponent]
+      imports: [PatientListAcquiredComponent]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(PatientListacquiredFormComponent);
+    fixture = TestBed.createComponent(PatientListAcquiredComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });