From 8f7b20e81da17ea67f3bcba306182d45a5d23d24 Mon Sep 17 00:00:00 2001 From: Brandon Clayton <bclayton@usgs.gov> Date: Tue, 17 Dec 2024 13:22:19 -0700 Subject: [PATCH] switch to main content --- .../exceedance-explorer.spec.ts | 2 +- .../integration/hazard/disagg/disagg.spec.ts | 20 +++++++++---------- .../cypress/utils/nshmp-template.utils.ts | 18 ++++++++--------- .../cypress/utils/plot-lib.utils.ts | 2 +- projects/nshmp-apps/cypress/utils/utils.ts | 2 +- .../app/designmaps/rtgm/app.component.html | 4 ++-- .../src/app/designmaps/rtgm/app.component.ts | 4 ++-- .../hanging-wall-effects/app.component.html | 4 ++-- .../gmm/hanging-wall-effects/app.component.ts | 4 ++-- .../hazard/dynamic-compare/app.component.html | 4 ++-- .../hazard/dynamic-compare/app.component.ts | 4 ++-- .../exceedance-explorer/app.component.html | 4 ++-- .../math/exceedance-explorer/app.component.ts | 4 ++-- .../src/app/gmm/distance/app.component.html | 4 ++-- .../src/app/gmm/distance/app.component.ts | 4 ++-- .../src/app/gmm/magnitude/app.component.html | 4 ++-- .../src/app/gmm/magnitude/app.component.ts | 4 ++-- .../src/app/gmm/spectra/app.component.html | 4 ++-- .../src/app/gmm/spectra/app.component.ts | 4 ++-- .../src/app/hazard/disagg/app.component.html | 4 ++-- .../src/app/hazard/disagg/app.component.ts | 4 ++-- .../src/app/hazard/dynamic/app.component.html | 4 ++-- .../src/app/hazard/dynamic/app.component.ts | 4 ++-- .../src/app/hazard/static/app.component.html | 4 ++-- .../src/app/hazard/static/app.component.ts | 4 ++-- .../aws/check-haz-jobs/app.component.html | 4 ++-- .../aws/check-haz-jobs/app.component.ts | 4 ++-- .../aws/haz-job-history/app.component.html | 4 ++-- .../aws/haz-job-history/app.component.ts | 4 ++-- .../geophysical-profiles/app.component.html | 4 ++-- .../ncm/geophysical-profiles/app.component.ts | 4 ++-- .../src/app/source/mfd/app.component.html | 4 ++-- .../src/app/source/mfd/app.component.ts | 4 ++-- .../app/source/model-maps/app.component.html | 4 ++-- .../app/source/model-maps/app.component.ts | 4 ++-- .../src/app/source/rates/app.component.html | 4 ++-- .../src/app/source/rates/app.component.ts | 4 ++-- 37 files changed, 86 insertions(+), 86 deletions(-) diff --git a/projects/nshmp-apps/cypress/integration/dev/math/exceedance-explorer/exceedance-explorer.spec.ts b/projects/nshmp-apps/cypress/integration/dev/math/exceedance-explorer/exceedance-explorer.spec.ts index 909653115..f3f644ecb 100644 --- a/projects/nshmp-apps/cypress/integration/dev/math/exceedance-explorer/exceedance-explorer.spec.ts +++ b/projects/nshmp-apps/cypress/integration/dev/math/exceedance-explorer/exceedance-explorer.spec.ts @@ -20,7 +20,7 @@ describe('Exceedance Explorer Application', () => { utils.changePlotSettings('.exceedance-plot', '.exceedance-settings'); it('Has default plot', () => { - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find('plotly-plot') .should('be.visible'); }); diff --git a/projects/nshmp-apps/cypress/integration/hazard/disagg/disagg.spec.ts b/projects/nshmp-apps/cypress/integration/hazard/disagg/disagg.spec.ts index ade920cfa..ec8be6590 100644 --- a/projects/nshmp-apps/cypress/integration/hazard/disagg/disagg.spec.ts +++ b/projects/nshmp-apps/cypress/integration/hazard/disagg/disagg.spec.ts @@ -34,7 +34,7 @@ describe('Disagg Application', () => { plotClass: 'hazard-lib-disagg-plot', }); - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find('.export-button') .scrollIntoView() .click(); @@ -47,7 +47,7 @@ describe('Disagg Application', () => { plotClass: 'hazard-lib-disagg-plot', }); - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find('.summary') .find('.summary-report') .scrollIntoView() @@ -68,25 +68,25 @@ describe('Disagg Application', () => { cy.get('.cdk-overlay-container').as('overlay'); - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find('.component-select') .find('mat-select') .should('be.visible') .click(); cy.get('@overlay').find('mat-option').should('not.exist'); - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find('.export-button') .should('be.visible') .should('not.be.enabled'); - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find('.summary') .find('app-disagg-summary') .scrollIntoView() .should('not.be.visible'); - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find('.summary') .find('app-disagg-contributors') .scrollIntoView() @@ -96,7 +96,7 @@ describe('Disagg Application', () => { plotClass: 'hazard-lib-disagg-plot', }); - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find('.component-select') .scrollIntoView() .find('mat-select') @@ -105,20 +105,20 @@ describe('Disagg Application', () => { cy.get('@overlay').find('mat-option').should('have.length.above', 1); utils.selectMatOption('Total'); - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find('.export-button') .scrollIntoView() .should('be.visible') .should('be.enabled') .click(); - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find('.summary') .find('app-disagg-summary') .scrollIntoView() .should('be.visible'); - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find('.summary') .find('app-disagg-contributors') .scrollIntoView() diff --git a/projects/nshmp-apps/cypress/utils/nshmp-template.utils.ts b/projects/nshmp-apps/cypress/utils/nshmp-template.utils.ts index 86f9982fd..18cd9977a 100644 --- a/projects/nshmp-apps/cypress/utils/nshmp-template.utils.ts +++ b/projects/nshmp-apps/cypress/utils/nshmp-template.utils.ts @@ -121,7 +121,7 @@ export function hasNshmpTemplate(navList: NavigationList[]) { export function hasPlotContent() { it('Has plot content', () => { - cy.get('nshmp-template-plot-content').should('exist'); + cy.get('nshmp-template-main-content').should('exist'); }); } @@ -129,7 +129,7 @@ export function submitFormCheckPlot(options: CheckPlot) { options.intercept = options.intercept === undefined ? true : options.intercept; - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find(options.plotClass) .then(originalPlot => { if (options.intercept) { @@ -145,7 +145,7 @@ export function submitFormCheckPlot(options: CheckPlot) { cy.wait('@service-call'); } - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find(options.plotClass) .should(updatedPlot => { expect(originalPlot).to.not.equal(updatedPlot); @@ -157,10 +157,10 @@ export function submitFormCheckPlots(options: CheckPlots) { options.intercept = options.intercept === undefined ? true : options.intercept; - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find(options.firstPlotClass) .then(originalFirstPlot => { - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find(options.secondPlotClass) .then(originalSecondPlot => { if (options.intercept) { @@ -178,12 +178,12 @@ export function submitFormCheckPlots(options: CheckPlots) { }); } - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find(options.firstPlotClass) .should(updatedFirstPlot => { expect(originalFirstPlot).to.not.equal(updatedFirstPlot); }); - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find(options.secondPlotClass) .should(updatedSecondPlot => { expect(originalSecondPlot).to.not.equal(updatedSecondPlot); @@ -214,9 +214,9 @@ export function togglePlotPanel() { .should('be.enabled') .as('plot-button'); - cy.get('nshmp-template-plot-content').should('exist'); + cy.get('nshmp-template-main-content').should('exist'); cy.get('@plot-button').click(); - cy.get('nshmp-template-plot-content').should('not.exist'); + cy.get('nshmp-template-main-content').should('not.exist'); }); } diff --git a/projects/nshmp-apps/cypress/utils/plot-lib.utils.ts b/projects/nshmp-apps/cypress/utils/plot-lib.utils.ts index 3aa50136d..7bd671a79 100644 --- a/projects/nshmp-apps/cypress/utils/plot-lib.utils.ts +++ b/projects/nshmp-apps/cypress/utils/plot-lib.utils.ts @@ -14,7 +14,7 @@ export function changePlotSettings(plotClass: string, settingsClass: string) { .find(settingsClass) .scrollIntoView() .as('plot-settings'); - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find(plotClass) .scrollIntoView() .as('plot'); diff --git a/projects/nshmp-apps/cypress/utils/utils.ts b/projects/nshmp-apps/cypress/utils/utils.ts index d71198b4e..c5fbc4f1e 100644 --- a/projects/nshmp-apps/cypress/utils/utils.ts +++ b/projects/nshmp-apps/cypress/utils/utils.ts @@ -1,7 +1,7 @@ import 'cypress'; export function hasApplicationTab(tabClass: string) { - cy.get('nshmp-template-plot-content') + cy.get('nshmp-template-main-content') .find('mat-tab-group') .find(tabClass) .should('be.visible') diff --git a/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.html b/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.html index cdf8fb7e3..464fe56b0 100644 --- a/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.html +++ b/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> <nshmp-template-settings> <app-plot-settings-panel /> diff --git a/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.ts b/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.ts index 6131c2f82..b306d8a4a 100644 --- a/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.ts +++ b/projects/nshmp-apps/src/app/designmaps/rtgm/app.component.ts @@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; @@ -21,7 +21,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateControlPanelComponent, NshmpTemplateContentContainerComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpLibNgAboutPageComponent, NshmpTemplateSettingsComponent, ControlPanelComponent, diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.html b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.html index ef6d2a880..996e7c48b 100644 --- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.html +++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.html @@ -6,9 +6,9 @@ </nshmp-template-control-panel> <!-- Plots --> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> <!-- Settings --> <nshmp-template-settings> diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.ts b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.ts index e892e8917..199bd29b0 100644 --- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.ts +++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/app.component.ts @@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; import {devApps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; @@ -21,7 +21,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, NshmpLibNgAboutPageComponent, ControlPanelComponent, diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.html b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.html index 375b90fa6..e86be1762 100644 --- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.html +++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.html @@ -6,9 +6,9 @@ </nshmp-template-control-panel> <!-- Plots --> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> <!-- Settings --> <nshmp-template-settings> diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.ts index f239fca48..22774c738 100644 --- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.ts +++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.ts @@ -5,7 +5,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; import {devApps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; @@ -22,7 +22,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, NshmpLibNgHazardProvisionalModelComponent, NshmpLibNgAboutPageComponent, diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.html b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.html index 5e121fa46..3e40d662b 100644 --- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.html +++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-plot /> - </nshmp-template-plot-content> + </nshmp-template-main-content> <nshmp-template-settings> <app-plot-settings-panel /> diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.ts b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.ts index 6fd5c89d2..578861498 100644 --- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.ts +++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/app.component.ts @@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; import {devApps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; @@ -25,7 +25,7 @@ import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot- NshmpLibNgTemplateComponent, NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, NshmpLibNgAboutPageComponent, ControlPanelComponent, diff --git a/projects/nshmp-apps/src/app/gmm/distance/app.component.html b/projects/nshmp-apps/src/app/gmm/distance/app.component.html index cdf8fb7e3..464fe56b0 100644 --- a/projects/nshmp-apps/src/app/gmm/distance/app.component.html +++ b/projects/nshmp-apps/src/app/gmm/distance/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> <nshmp-template-settings> <app-plot-settings-panel /> diff --git a/projects/nshmp-apps/src/app/gmm/distance/app.component.ts b/projects/nshmp-apps/src/app/gmm/distance/app.component.ts index 9c546cadf..92ff39db7 100644 --- a/projects/nshmp-apps/src/app/gmm/distance/app.component.ts +++ b/projects/nshmp-apps/src/app/gmm/distance/app.component.ts @@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; @@ -28,7 +28,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, NshmpLibNgAboutPageComponent, ControlPanelComponent, diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.html b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.html index cdf8fb7e3..464fe56b0 100644 --- a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.html +++ b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> <nshmp-template-settings> <app-plot-settings-panel /> diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.ts b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.ts index 8e288d5cb..1d80636ca 100644 --- a/projects/nshmp-apps/src/app/gmm/magnitude/app.component.ts +++ b/projects/nshmp-apps/src/app/gmm/magnitude/app.component.ts @@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; @@ -28,7 +28,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateControlPanelComponent, NshmpTemplateContentContainerComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, NshmpLibNgAboutPageComponent, ControlPanelComponent, diff --git a/projects/nshmp-apps/src/app/gmm/spectra/app.component.html b/projects/nshmp-apps/src/app/gmm/spectra/app.component.html index cdf8fb7e3..464fe56b0 100644 --- a/projects/nshmp-apps/src/app/gmm/spectra/app.component.html +++ b/projects/nshmp-apps/src/app/gmm/spectra/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> <nshmp-template-settings> <app-plot-settings-panel /> diff --git a/projects/nshmp-apps/src/app/gmm/spectra/app.component.ts b/projects/nshmp-apps/src/app/gmm/spectra/app.component.ts index d1b310367..ed3a8c451 100644 --- a/projects/nshmp-apps/src/app/gmm/spectra/app.component.ts +++ b/projects/nshmp-apps/src/app/gmm/spectra/app.component.ts @@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; @@ -28,7 +28,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateControlPanelComponent, NshmpTemplateContentContainerComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, NshmpLibNgAboutPageComponent, ControlPanelComponent, diff --git a/projects/nshmp-apps/src/app/hazard/disagg/app.component.html b/projects/nshmp-apps/src/app/hazard/disagg/app.component.html index c38decbf2..12181bf4b 100644 --- a/projects/nshmp-apps/src/app/hazard/disagg/app.component.html +++ b/projects/nshmp-apps/src/app/hazard/disagg/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> </nshmp-template-content-container> <!-- Provisional model warning --> diff --git a/projects/nshmp-apps/src/app/hazard/disagg/app.component.ts b/projects/nshmp-apps/src/app/hazard/disagg/app.component.ts index 048c8b8be..8b970cb29 100644 --- a/projects/nshmp-apps/src/app/hazard/disagg/app.component.ts +++ b/projects/nshmp-apps/src/app/hazard/disagg/app.component.ts @@ -5,7 +5,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, } from '@ghsc/nshmp-template'; import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; import {navigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils'; @@ -23,7 +23,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateControlPanelComponent, NshmpTemplateContentContainerComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpLibNgAboutPageComponent, NshmpLibNgHazardProvisionalModelComponent, ControlPanelComponent, diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html index 03bdde34c..b7c70d9bd 100644 --- a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html +++ b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> <nshmp-template-settings> <app-plot-settings-panel /> diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts index 084042bc4..b1ea4cd94 100644 --- a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts +++ b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts @@ -5,7 +5,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; @@ -25,7 +25,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateControlPanelComponent, NshmpTemplateContentContainerComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpLibNgAboutPageComponent, NshmpLibNgHazardProvisionalModelComponent, NshmpTemplateSettingsComponent, diff --git a/projects/nshmp-apps/src/app/hazard/static/app.component.html b/projects/nshmp-apps/src/app/hazard/static/app.component.html index cdf8fb7e3..464fe56b0 100644 --- a/projects/nshmp-apps/src/app/hazard/static/app.component.html +++ b/projects/nshmp-apps/src/app/hazard/static/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> <nshmp-template-settings> <app-plot-settings-panel /> diff --git a/projects/nshmp-apps/src/app/hazard/static/app.component.ts b/projects/nshmp-apps/src/app/hazard/static/app.component.ts index 04a4ef74d..903650eab 100644 --- a/projects/nshmp-apps/src/app/hazard/static/app.component.ts +++ b/projects/nshmp-apps/src/app/hazard/static/app.component.ts @@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; @@ -24,7 +24,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateControlPanelComponent, NshmpTemplateContentContainerComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpLibNgAboutPageComponent, NshmpTemplateSettingsComponent, ControlPanelComponent, diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.html index 9e5ed1e20..30ea230dc 100644 --- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.html +++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> </nshmp-template-content-container> <!-- About page --> diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.ts index 0cbfa4c25..3c9c639c2 100644 --- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.ts +++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/app.component.ts @@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, } from '@ghsc/nshmp-template'; import {internalApps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; import {internalNavigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils'; @@ -27,7 +27,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpLibNgAboutPageComponent, ControlPanelComponent, ContentComponent, diff --git a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.html index 9e5ed1e20..30ea230dc 100644 --- a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.html +++ b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> </nshmp-template-content-container> <!-- About page --> diff --git a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.ts index 464e02855..c40822124 100644 --- a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.ts +++ b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/app.component.ts @@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, } from '@ghsc/nshmp-template'; import {internalApps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; import {internalNavigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils'; @@ -25,7 +25,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpLibNgAboutPageComponent, ControlPanelComponent, ContentComponent, diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.html b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.html index 7b42a2066..3f2a7bef6 100644 --- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.html +++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> <nshmp-template-settings> <app-plot-settings-panel /> diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.ts b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.ts index 32e2387a5..c1327eec0 100644 --- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.ts +++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/app.component.ts @@ -4,7 +4,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; @@ -21,7 +21,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateControlPanelComponent, NshmpTemplateContentContainerComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpLibNgAboutPageComponent, NshmpTemplateSettingsComponent, ControlPanelComponent, diff --git a/projects/nshmp-apps/src/app/source/mfd/app.component.html b/projects/nshmp-apps/src/app/source/mfd/app.component.html index 03bdde34c..b7c70d9bd 100644 --- a/projects/nshmp-apps/src/app/source/mfd/app.component.html +++ b/projects/nshmp-apps/src/app/source/mfd/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> <nshmp-template-settings> <app-plot-settings-panel /> diff --git a/projects/nshmp-apps/src/app/source/mfd/app.component.ts b/projects/nshmp-apps/src/app/source/mfd/app.component.ts index 4caa9b025..509376c6d 100644 --- a/projects/nshmp-apps/src/app/source/mfd/app.component.ts +++ b/projects/nshmp-apps/src/app/source/mfd/app.component.ts @@ -5,7 +5,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateService, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; @@ -29,7 +29,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, NshmpLibNgHazardProvisionalModelComponent, NshmpLibNgAboutPageComponent, diff --git a/projects/nshmp-apps/src/app/source/model-maps/app.component.html b/projects/nshmp-apps/src/app/source/model-maps/app.component.html index 8c5371544..85fc7ab01 100644 --- a/projects/nshmp-apps/src/app/source/model-maps/app.component.html +++ b/projects/nshmp-apps/src/app/source/model-maps/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-map-content> + <nshmp-template-main-content> <app-map /> - </nshmp-template-map-content> + </nshmp-template-main-content> <nshmp-template-settings> <app-plot-settings-panel /> diff --git a/projects/nshmp-apps/src/app/source/model-maps/app.component.ts b/projects/nshmp-apps/src/app/source/model-maps/app.component.ts index b893795ad..7fc0ed3d6 100644 --- a/projects/nshmp-apps/src/app/source/model-maps/app.component.ts +++ b/projects/nshmp-apps/src/app/source/model-maps/app.component.ts @@ -6,7 +6,7 @@ import { AppControlsService, NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplateMapContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; @@ -33,7 +33,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplateMapContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, NshmpLibNgHazardProvisionalModelComponent, NshmpLibNgAboutPageComponent, diff --git a/projects/nshmp-apps/src/app/source/rates/app.component.html b/projects/nshmp-apps/src/app/source/rates/app.component.html index 03bdde34c..b7c70d9bd 100644 --- a/projects/nshmp-apps/src/app/source/rates/app.component.html +++ b/projects/nshmp-apps/src/app/source/rates/app.component.html @@ -4,9 +4,9 @@ <app-control-panel /> </nshmp-template-control-panel> - <nshmp-template-plot-content> + <nshmp-template-main-content> <app-content /> - </nshmp-template-plot-content> + </nshmp-template-main-content> <nshmp-template-settings> <app-plot-settings-panel /> diff --git a/projects/nshmp-apps/src/app/source/rates/app.component.ts b/projects/nshmp-apps/src/app/source/rates/app.component.ts index 637796ffe..7cfe96535 100644 --- a/projects/nshmp-apps/src/app/source/rates/app.component.ts +++ b/projects/nshmp-apps/src/app/source/rates/app.component.ts @@ -5,7 +5,7 @@ import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp'; import { NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, } from '@ghsc/nshmp-template'; import {apps} from 'projects/nshmp-apps/src/shared/utils/applications.utils'; @@ -22,7 +22,7 @@ import {AppService} from './services/app.service'; NshmpLibNgTemplateComponent, NshmpTemplateContentContainerComponent, NshmpTemplateControlPanelComponent, - NshmpTemplatePlotContentComponent, + NshmpTemplateMainContentComponent, NshmpTemplateSettingsComponent, NshmpLibNgHazardProvisionalModelComponent, NshmpLibNgAboutPageComponent, -- GitLab