From f5bd2852d11c52d298731b2e0aeeb4d07fc09cfb Mon Sep 17 00:00:00 2001 From: Brandon Clayton <bclayton@usgs.gov> Date: Wed, 17 Jul 2024 08:59:30 -0600 Subject: [PATCH] use reactive form --- .../components/content/content.component.html | 8 +++---- .../components/content/content.component.ts | 23 ++++++++----------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html index 24cd5fc76..3fad4144d 100644 --- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html +++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html @@ -10,15 +10,15 @@ <mat-tab labelClass="medians-tab" label="Medians" - [disabled]="(hasData$ | async) === false" + [disabled]="hasData() === false" > <ng-template matTabContent> - <nshmp-lib-ng-export-data-table - [table]="table$ | async" + <nshmp-lib-no-ngrx-export-data-table + [table]="table()" filename="hanging-wall-effects.csv" buttonText="Export to CSV" /> - <nshmp-lib-ng-data-table [table]="table$ | async" /> + <nshmp-lib-no-ngrx-data-table [table]="table()" /> </ng-template> </mat-tab> </mat-tab-group> diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.ts b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.ts index 6178e6285..8d7f13074 100644 --- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.ts +++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.ts @@ -1,12 +1,11 @@ import {AsyncPipe} from '@angular/common'; -import {Component} from '@angular/core'; +import {Component, computed} from '@angular/core'; import {MatTab, MatTabContent, MatTabGroup} from '@angular/material/tabs'; -import {gmmUtils} from '@ghsc/nshmp-lib-ng/gmm'; +import {gmmUtils} from '@ghsc/nshmp-lib-no-ngrx/gmm'; import { NshmpLibNgDataTableComponent, NshmpLibNgExportDataTableComponent, -} from '@ghsc/nshmp-lib-ng/nshmp'; -import {map} from 'rxjs'; +} from '@ghsc/nshmp-lib-no-ngrx/nshmp'; import {AppFacade} from '../../state/app.facade'; import {Plots} from '../../state/app.state'; @@ -34,18 +33,14 @@ export class ContentComponent { exp = true; /** Whether service has been called and data exists */ - hasData$ = this.facade.serviceResponses$.pipe( - map(responses => responses?.length > 0) - ); + hasData = computed(() => this.facade.state().serviceResponses?.length > 0); /** Table data for table */ - table$ = this.facade.plots$.pipe( - map(plots => - gmmUtils.plotToTable( - plots.get(Plots.GROUND_MOTION).plotData, - this.exp, - this.commonXValues - ) + table = computed(() => + gmmUtils.plotToTable( + this.facade.state().plots.get(Plots.GROUND_MOTION).plotData, + this.exp, + this.commonXValues ) ); -- GitLab