switch to signal

projects/nshmp-apps/src/app/hazard/disagg/components/component-summary/component-summary.component.html

@@ -50,14 +50,14 @@
             >
           </mat-expansion-panel-header>
 
-          <app-disagg-summary [componentData]="componentData$ | async" />
+          <app-disagg-summary [componentData]="componentData()" />
         </mat-expansion-panel>
 
         <!-- Contributions -->
         <mat-expansion-panel
           class="contributions print-page-break"
-          [expanded]="(componentData$ | async)?.sources.length > 0"
-          [disabled]="(componentData$ | async)?.sources.length === 0"
+          [expanded]="componentData()?.sources.length > 0"
+          [disabled]="componentData()?.sources.length === 0"
         >
           <mat-expansion-panel-header>
             <mat-panel-title
@@ -66,14 +66,14 @@
             >
           </mat-expansion-panel-header>
 
-          <app-disagg-contributors [componentData]="componentData$ | async" />
+          <app-disagg-contributors [componentData]="componentData()" />
         </mat-expansion-panel>
 
         <!-- Data -->
         <mat-expansion-panel
           class="print-page-break"
-          [expanded]="(componentData$ | async)?.data.length > 0"
-          [disabled]="(componentData$ | async)?.data.length === 0"
+          [expanded]="componentData()?.data.length > 0"
+          [disabled]="componentData()?.data.length === 0"
         >
           <mat-expansion-panel-header>
             <mat-panel-title
@@ -82,7 +82,7 @@
             >
           </mat-expansion-panel-header>
 
-          <app-disagg-data [componentData]="componentData$ | async" />
+          <app-disagg-data [componentData]="componentData()" />
         </mat-expansion-panel>
       </mat-accordion>
     </div>

projects/nshmp-apps/src/app/hazard/disagg/components/component-summary/component-summary.component.ts

@@ -11,7 +11,6 @@ import {
   MatOption,
   MatSelect,
 } from '@angular/material/select';
-import {map} from 'rxjs';
 
 import {AppService} from '../../services/app.service';
 import {DisaggContributorsComponent} from '../disagg-contributors/disagg-contributors.component';
@@ -41,10 +40,7 @@ import {DisaggSummaryComponent} from '../disagg-summary/disagg-summary.component
 })
 export class ComponentSummaryComponent {
   /** Disaggregation component data */
-  componentData$ =
-    this.service.formGroup.controls.disaggComponent.valueChanges.pipe(
-      map(() => this.service.componentData())
-    );
+  componentData = this.service.componentData;
 
   /** Disaggregation data */
   disaggData = this.service.disaggData;

projects/nshmp-apps/src/app/hazard/disagg/components/content/content.component.html

@@ -45,17 +45,13 @@
 
               <div class="print-content-only print-full-page">
                 <mat-expansion-panel class="print-page-break" expanded>
-                  <app-disagg-summary
-                    [componentData]="componentData$ | async"
-                  />
+                  <app-disagg-summary [componentData]="componentData()" />
                 </mat-expansion-panel>
               </div>
 
               <div class="print-content-only print-full-page">
                 <mat-expansion-panel class="print-page-break" expanded>
-                  <app-disagg-contributors
-                    [componentData]="componentData$ | async"
-                  />
+                  <app-disagg-contributors [componentData]="componentData()" />
                 </mat-expansion-panel>
               </div>
 
@@ -79,7 +75,9 @@
   </mat-tab>
 
   <mat-tab label="Component Summary" [disabled]="hasData() === false">
-    <app-component-summary />
+    <ng-template matTabContent>
+      <app-component-summary />
+    </ng-template>
   </mat-tab>
 
   <mat-tab label="Full Summary" [disabled]="hasData() === false">

projects/nshmp-apps/src/app/hazard/disagg/components/content/content.component.ts

@@ -4,7 +4,6 @@ import {MatDivider} from '@angular/material/divider';
 import {MatExpansionModule} from '@angular/material/expansion';
 import {MatTabsModule} from '@angular/material/tabs';
 import {NshmpLibNgAppMetadataComponent} from '@ghsc/nshmp-lib-ng/nshmp';
-import {map} from 'rxjs';
 
 import {AppService} from '../../services/app.service';
 import {ComponentSummaryComponent} from '../component-summary/component-summary.component';
@@ -43,10 +42,7 @@ import {PlotsComponent} from '../plots/plots.component';
   templateUrl: './content.component.html',
 })
 export class ContentComponent {
-  componentData$ =
-    this.service.formGroup.controls.disaggComponent.valueChanges.pipe(
-      map(() => this.service.componentData())
-    );
+  componentData = this.service.componentData;
 
   hasData = computed(() => this.service.serviceResponse() !== null);