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 01/15] 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
From 471cae90c03566c6ccfa3ab6fb5605c4b8d1835c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 17 Dec 2024 13:24:44 -0700
Subject: [PATCH 02/15] update deps
---
.npmrc | 1 +
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/.npmrc b/.npmrc
index fcdbb5524..c717fa022 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,2 @@
@ghsc:registry=https://code.usgs.gov/api/v4/packages/npm/
+//code.usgs.gov/api/v4/packages/npm/:_authToken=${CI_JOB_TOKEN}
diff --git a/package-lock.json b/package-lock.json
index be43e15d3..45295cf9a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^19.0.0",
- "@ghsc/nshmp-template": "^19.1.1",
+ "@ghsc/nshmp-lib-ng": "^20.0.0",
+ "@ghsc/nshmp-template": "^20.0.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "19.0.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12416/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-19.0.0.tgz",
- "integrity": "sha1-bkwGldODNQFdbEMnMhOxFf8mp50=",
+ "version": "20.0.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.0.0.tgz",
+ "integrity": "sha1-fm65gLh4m1jfipF1UnAGRyt/eGE=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4864,9 +4864,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "19.1.1",
- "resolved": "https://code.usgs.gov/api/v4/projects/1416/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-19.1.1.tgz",
- "integrity": "sha1-p55HT0oEhcSv9ogKZJ33/2CoJc4=",
+ "version": "20.0.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.0.0.tgz",
+ "integrity": "sha1-mdA6U3Dq8SgpBIYdMAPkuF1esjQ=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 23890c4e6..03eb09590 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^19.0.0",
- "@ghsc/nshmp-template": "^19.1.1",
+ "@ghsc/nshmp-lib-ng": "^20.0.0",
+ "@ghsc/nshmp-template": "^20.0.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From 3e2d22bca48af8752235a5f01fe7b38c803ced9b Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 17 Dec 2024 15:14:00 -0700
Subject: [PATCH 03/15] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 45295cf9a..601abdb1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.0.0",
- "@ghsc/nshmp-template": "^20.0.0",
+ "@ghsc/nshmp-lib-ng": "^20.2.0",
+ "@ghsc/nshmp-template": "^20.1.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "20.0.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.0.0.tgz",
- "integrity": "sha1-fm65gLh4m1jfipF1UnAGRyt/eGE=",
+ "version": "20.2.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.2.0.tgz",
+ "integrity": "sha1-L9kUzY7HOqistFihyDie93a+rC0=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4864,9 +4864,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.0.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.0.0.tgz",
- "integrity": "sha1-mdA6U3Dq8SgpBIYdMAPkuF1esjQ=",
+ "version": "20.1.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.1.0.tgz",
+ "integrity": "sha1-PVpcqRcHucOuZk9FgkNHLvyFhWw=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 03eb09590..87a2cc15c 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.0.0",
- "@ghsc/nshmp-template": "^20.0.0",
+ "@ghsc/nshmp-lib-ng": "^20.2.0",
+ "@ghsc/nshmp-template": "^20.1.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From eebf291163e1b7f9a9602dc028449e7c295b3cc6 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 17 Dec 2024 15:14:13 -0700
Subject: [PATCH 04/15] fix style
---
projects/nshmp-apps/src/styles/_forms.scss | 2 +-
projects/nshmp-apps/src/styles/_settings-panel.scss | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/projects/nshmp-apps/src/styles/_forms.scss b/projects/nshmp-apps/src/styles/_forms.scss
index c1f793ac6..b0816e9b0 100644
--- a/projects/nshmp-apps/src/styles/_forms.scss
+++ b/projects/nshmp-apps/src/styles/_forms.scss
@@ -6,7 +6,7 @@
@use '@ghsc/nshmp-template/styles/variables';
nshmp-template-control-panel form {
- padding-bottom: 3em;
+ padding: 0 0.5em 4em;
}
/* Form buttons */
diff --git a/projects/nshmp-apps/src/styles/_settings-panel.scss b/projects/nshmp-apps/src/styles/_settings-panel.scss
index 5255f646a..af4f946e3 100644
--- a/projects/nshmp-apps/src/styles/_settings-panel.scss
+++ b/projects/nshmp-apps/src/styles/_settings-panel.scss
@@ -2,11 +2,11 @@
* Styling for plot settings side panel
*/
-.app-content .app-content--side-panel,
+.app-content .side-panel,
.settings {
/* Plot settings */
.settings-section {
- .settings-section--label {
+ .label {
font-weight: 900;
font-size: 18px;
}
--
GitLab
From 4ab8e1c20b7b6eab30b39db328caba3980d9af54 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 17 Dec 2024 15:14:22 -0700
Subject: [PATCH 05/15] fix mat-icon
---
.../disagg-contributors.component.html | 8 ++---
.../components/content/content.component.html | 12 +++----
.../snack-bar/snack-bar.component.html | 4 +--
.../components/form/form.component.html | 36 +++++++++----------
.../components/history/history.component.html | 4 +--
.../components/content/content.component.html | 2 +-
.../control-panel.component.html | 4 +--
.../components/content/content.component.html | 16 ++++-----
.../control-panel.component.html | 2 +-
.../plot-settings-panel.component.html | 2 +-
10 files changed, 40 insertions(+), 50 deletions(-)
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
index f055f198d..7367b3299 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
@@ -26,11 +26,9 @@
<tr>
<th nowrap>
Source Set
- <mat-icon
- class="down-arrow"
- aria-label="Down arrow icon"
- fontIcon="subdirectory_arrow_right"
- />
+ <mat-icon class="down-arrow" aria-label="Down arrow icon">
+ subdirectory_arrow_right
+ </mat-icon>
Source
</th>
<th nowrap>Type</th>
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html
index e3d7925dd..d5e18ca03 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html
@@ -27,19 +27,15 @@
<span class="logs-toolbar-item">
<mat-button-toggle-group>
<mat-button-toggle matTooltip="Scroll to Top" (click)="scrollTop()">
- <mat-icon
- aria-label="Scroll to top"
- fontIcon="vertical_align_top"
- />
+ <mat-icon aria-label="Scroll to top"> vertical_align_top </mat-icon>
</mat-button-toggle>
<mat-button-toggle
matTooltip="Scroll to Bottom"
(click)="scrollBottom()"
>
- <mat-icon
- aria-label="Scroll to bottom"
- fontIcon="vertical_align_bottom"
- />
+ <mat-icon aria-label="Scroll to bottom">
+ vertical_align_bottom
+ </mat-icon>
</mat-button-toggle>
</mat-button-toggle-group>
</span>
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.html
index d39af3952..d5fca73b5 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.html
@@ -15,7 +15,7 @@
class="download-button"
(click)="download()"
>
- <mat-icon aria-label="Download from cloud" fontIcon="cloud_download" />
+ <mat-icon aria-label="Download from cloud"> cloud_download </mat-icon>
</button>
<button
@@ -24,6 +24,6 @@
matTooltip="Click to dismiss"
(click)="dismiss()"
>
- <mat-icon aria-label="Close" fontIcon="close" />
+ <mat-icon aria-label="Close"> close </mat-icon>
</button>
</span>
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
index a702754e0..83b088897 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
@@ -63,7 +63,7 @@
"
/>
<span matPrefix>
- <mat-icon aria-label="Memory icon" fontIcon="memory" />
+ <mat-icon aria-label="Memory icon">memory</mat-icon>
</span>
<a
matSuffix
@@ -73,7 +73,7 @@
target="__blank"
color="primary"
>
- <mat-icon aria-label="Info icon" fontIcon="info" />
+ <mat-icon aria-label="Info icon">info</mat-icon>
</a>
<mat-hint> The AWS EC2 instance type </mat-hint>
<mat-error>Must not contain spaces</mat-error>
@@ -110,7 +110,7 @@
[formControl]="form.controls.nshmpConfig.controls.email"
/>
<span matPrefix>
- <mat-icon aria-label="Email icon" fontIcon="email" />
+ <mat-icon aria-label="Email icon">email</mat-icon>
</span>
<mat-error>Must be a valid USGS email</mat-error>
<mat-hint>Email to recieve notifications from AWS</mat-hint>
@@ -138,7 +138,7 @@
"
/>
<span matPrefix>
- <mat-icon aria-label="Code icon" fontIcon="code" />
+ <mat-icon aria-label="Code icon">code</mat-icon>
</span>
<a
matSuffix
@@ -148,7 +148,7 @@
target="__blank"
color="primary"
>
- <mat-icon aria-label="Info icon" fontIcon="info" />
+ <mat-icon aria-label="Info icon">info</mat-icon>
</a>
<mat-error>
Must be a valid URL ending in <code>.git</code>
@@ -170,7 +170,7 @@
"
/>
<span matPrefix>
- <mat-icon aria-label="Code icon" fontIcon="code" />
+ <mat-icon aria-label="Code icon">code</mat-icon>
</span>
<mat-hint>
The branch, tag, or commit of the nshmp-haz repository
@@ -195,7 +195,7 @@
}
</mat-select>
<span matPrefix>
- <mat-icon aria-label="Code icon" fontIcon="code" />
+ <mat-icon aria-label="Code icon">code</mat-icon>
</span>
<a
matSuffix
@@ -205,7 +205,7 @@
target="__blank"
color="primary"
>
- <mat-icon aria-label="Info icon" fontIcon="info" />
+ <mat-icon aria-label="Info icon">info</mat-icon>
</a>
<mat-hint>Java class name of class to run</mat-hint>
</mat-form-field>
@@ -238,7 +238,7 @@
"
/>
<span matPrefix>
- <mat-icon aria-label="Code icon" fontIcon="code" />
+ <mat-icon aria-label="Code icon">code</mat-icon>
</span>
<a
matSuffix
@@ -248,7 +248,7 @@
target="__blank"
color="primary"
>
- <mat-icon aria-label="Info icon" fontIcon="info" />
+ <mat-icon aria-label="Info icon">info</mat-icon>
</a>
<mat-error>
Must be a valid URL ending in <code>.git</code>
@@ -276,7 +276,7 @@
"
/>
<span matPrefix>
- <mat-icon aria-label="Code icon" fontIcon="code" />
+ <mat-icon aria-label="Code icon">code</mat-icon>
</span>
<mat-error>
Must be a valid URL ending in <code>.git</code>
@@ -311,7 +311,7 @@
"
/>
<span matPrefix>
- <mat-icon aria-label="Plot icon" fontIcon="show_chart" />
+ <mat-icon aria-label="Plot icon">show_chart</mat-icon>
</span>
<a
matSuffix
@@ -321,7 +321,7 @@
target="__blank"
color="primary"
>
- <mat-icon aria-label="Info icon" fontIcon="info" />
+ <mat-icon aria-label="Info icon">info</mat-icon>
</a>
<mat-hint>The Git URL to the NSHM repository</mat-hint>
<mat-error>
@@ -343,9 +343,7 @@
"
/>
<span matPrefix>
- <mat-icon aria-label="Code icon" fontIcon="code"
- >code</mat-icon
- >
+ <mat-icon aria-label="Code icon">code</mat-icon>
</span>
<mat-error>Must not contain spaces</mat-error>
<mat-hint>
@@ -366,7 +364,7 @@
"
/>
<span matPrefix>
- <mat-icon aria-label="Folder icon" fontIcon="folder" />
+ <mat-icon aria-label="Folder icon">folder</mat-icon>
</span>
<mat-error>Must not contain spaces</mat-error>
<mat-hint>Path inside tarball to model</mat-hint>
@@ -412,7 +410,7 @@
"
/>
<span matPrefix>
- <mat-icon aria-label="Note icon" fontIcon="note_add" />
+ <mat-icon aria-label="Note icon">note_add</mat-icon>
</span>
<a
matSuffix
@@ -422,7 +420,7 @@
target="__blank"
color="primary"
>
- <mat-icon aria-label="Info icon" fontIcon="info" />
+ <mat-icon aria-label="Info icon">info</mat-icon>
</a>
<mat-error> Must be a valid URL </mat-error>
<mat-hint
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
index 100d4e3db..c3018fa9a 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
@@ -70,7 +70,7 @@
matTooltip="Download the configuration file"
(click)="downloadConfiguration(serviceResponse)"
>
- <mat-icon fontIcon="download" aria-label="Download icon" />
+ <mat-icon aria-label="Download icon">download</mat-icon>
</button>
<button
@@ -81,7 +81,7 @@
service.clearHistory(serviceResponse.response.jobId)
"
>
- <mat-icon fontIcon="delete" aria-label="Delete icon" />
+ <mat-icon aria-label="Delete icon">delete</mat-icon>
</button>
</div>
</mat-card-actions>
diff --git a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html
index c227eda60..a741a9566 100644
--- a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html
@@ -11,7 +11,7 @@
<mat-label>Job ID <span class="form-required">*</span></mat-label>
<input matInput type="text" [formControl]="form.controls.id" />
<div matSuffix matTooltip="The id of the running job to terminate">
- <mat-icon aria-label="Info icon" fontIcon="info" />
+ <mat-icon aria-label="Info icon">info</mat-icon>
</div>
<mat-hint>The id of the running job to terminate</mat-hint>
</mat-form-field>
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
index e09567342..74f774163 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
@@ -81,7 +81,7 @@
class="margin-0 margin-top-neg-105"
(click)="removeLocation(index)"
>
- <mat-icon fontIcon="remove" />
+ <mat-icon>remove</mat-icon>
</button>
</span>
}
@@ -122,7 +122,7 @@
type="button"
color="secondary"
>
- <mat-icon fontIcon="add" />
+ <mat-icon>add</mat-icon>
Add additional location
</button>
diff --git a/projects/nshmp-apps/src/app/services/components/content/content.component.html b/projects/nshmp-apps/src/app/services/components/content/content.component.html
index fd7dbe5e0..c381cbe8b 100644
--- a/projects/nshmp-apps/src/app/services/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/services/components/content/content.component.html
@@ -30,17 +30,15 @@
>
@if (sidenavCollapsed === false) {
<div class="icon-text">
- <mat-icon
- aria-label="Left arrow icon"
- fontIcon="keyboard_double_arrow_left"
- />
+ <mat-icon aria-label="Left arrow icon">
+ keyboard_double_arrow_left
+ </mat-icon>
<span>Collapse sidebar</span>
</div>
} @else {
- <mat-icon
- aria-label="Right arrow icon"
- fontIcon="keyboard_double_arrow_right"
- />
+ <mat-icon aria-label="Right arrow icon">
+ keyboard_double_arrow_right
+ </mat-icon>
}
</button>
</div>
@@ -60,7 +58,7 @@
mat-icon-button
(click)="onLinkIconClick(serviceGroup.id)"
>
- <mat-icon aria-label="Link Icon" fontIcon="link" />
+ <mat-icon aria-label="Link Icon">link</mat-icon>
</button>
{{ serviceGroup.title }}
</div>
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html
index 67e0d3417..47f433ac4 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html
@@ -1,6 +1,6 @@
<form [formGroup]="formGroup" class="height-full overflow-auto">
<div class="settings-section">
- <mat-label class="settings-section--label">Model Layers</mat-label>
+ <mat-label class="label">Model Layers</mat-label>
<div class="settings-subsection padding-top-1">
<div class="settings-subsection--section">
<nshmp-lib-ng-hazard-model-form
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.html
index a9c8dbb79..9b096a51c 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.html
@@ -1,6 +1,6 @@
<div class="height-full overflow-auto">
<div class="settings-section">
- <mat-label class="settings-section--label">Map Settings</mat-label>
+ <mat-label class="label">Map Settings</mat-label>
<div class="padding-x-2">
<div class="padding-top-2">
--
GitLab
From 0b08649543042154af36a03d60a4446bc6d0cf6a Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 17 Dec 2024 15:34:38 -0700
Subject: [PATCH 06/15] switch image
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2c108618..44d8108be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ variables:
IMAGE_NAME: ${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
UPSTREAM_PATH: ghsc/nshmp/nshmp-apps
-image: ${CI_REGISTRY}/devops/images/usgs/node:20
+image: ${CI_REGISTRY}/devops/images/usgs/node:latest
# Do not run for merge requests
workflow:
--
GitLab
From 8f70661364fa2a4c26097f66459c33dcb6e538d2 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 17 Dec 2024 15:39:56 -0700
Subject: [PATCH 07/15] change image
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 44d8108be..609fbccf5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ variables:
IMAGE_NAME: ${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
UPSTREAM_PATH: ghsc/nshmp/nshmp-apps
-image: ${CI_REGISTRY}/devops/images/usgs/node:latest
+image: ${CI_REGISTRY}/devops/images/usgs/node:lts
# Do not run for merge requests
workflow:
--
GitLab
From 0321409b8e2b42e952834fcd06a756d0b09287ed Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 18 Dec 2024 15:58:30 -0700
Subject: [PATCH 08/15] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 601abdb1c..9c03fc72d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.2.0",
- "@ghsc/nshmp-template": "^20.1.0",
+ "@ghsc/nshmp-lib-ng": "^20.6.0",
+ "@ghsc/nshmp-template": "^20.3.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "20.2.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.2.0.tgz",
- "integrity": "sha1-L9kUzY7HOqistFihyDie93a+rC0=",
+ "version": "20.6.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.6.0.tgz",
+ "integrity": "sha1-B5AQu40YIFC8qNQl98lK8Qi/irI=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4864,9 +4864,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.1.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.1.0.tgz",
- "integrity": "sha1-PVpcqRcHucOuZk9FgkNHLvyFhWw=",
+ "version": "20.3.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.3.0.tgz",
+ "integrity": "sha1-vtvBgvDKZTY+e1qNZE1PiekDq7M=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 87a2cc15c..053e35ef9 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.2.0",
- "@ghsc/nshmp-template": "^20.1.0",
+ "@ghsc/nshmp-lib-ng": "^20.6.0",
+ "@ghsc/nshmp-template": "^20.3.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From 9d14f129e82b2a1e400c2c7bc1d7f27c183a6991 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 18 Dec 2024 15:58:45 -0700
Subject: [PATCH 09/15] change to signal
---
.../components/plots/plots.component.html | 4 +--
.../components/plots/plots.component.ts | 26 +++++++---------
.../control-panel.component.html | 4 ++-
.../control-panel/control-panel.component.ts | 2 ++
.../control-panel.component.html | 4 ++-
.../control-panel/control-panel.component.ts | 2 ++
.../app/source/model-maps/app.component.ts | 30 +++++++++++--------
projects/nshmp-apps/src/styles/_forms.scss | 6 +---
8 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.html b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.html
index 143182239..895ed83f7 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.html
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.html
@@ -6,8 +6,8 @@
<div
class="grid-col-12 plots-panel widescreen:grid-col-6"
[ngClass]="{
- 'panels-opened': panelsOpened$ | async,
- 'desktop-lg:grid-col-6': panelsClosed$ | async,
+ 'panels-opened': panelsOpened(),
+ 'desktop-lg:grid-col-6': panelsClosed(),
}"
>
<mat-accordion>
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.ts
index 21c9fae9e..2b3fbd277 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.ts
@@ -13,9 +13,8 @@ import {
NshmpLibNgPlotComponent,
NshmpLibNgPlotsContainerComponent,
} from '@ghsc/nshmp-lib-ng/plot';
-import {AppControlsService} from '@ghsc/nshmp-template';
+import {HeaderService} from '@ghsc/nshmp-template';
import {PlotlyPlot} from '@ghsc/nshmp-utils-ts/libs/plotly';
-import {map} from 'rxjs';
import {Plots} from '../../models/state.model';
import {AppService} from '../../services/app.service';
@@ -50,7 +49,6 @@ interface PlotInfo {
MatExpansionPanelTitle,
MatDivider,
ParameterSummaryComponent,
- AsyncPipe,
],
selector: 'app-plots',
styleUrl: './plots.component.scss',
@@ -88,21 +86,17 @@ export class PlotsComponent {
);
/** Wheather both the control and settings panels are closed */
- panelsClosed$ = this.controlsService.controlsChanged.pipe(
- map(
- () =>
- !this.controlsService.controlPanelIsSelected &&
- !this.controlsService.settingsIsSelected,
- ),
+ panelsClosed = computed(
+ () =>
+ !this.headerService.controlPanelSelected() &&
+ !this.headerService.settingsSelected(),
);
/** Wheather both the control and settings panels are opened */
- panelsOpened$ = this.controlsService.controlsChanged.pipe(
- map(
- () =>
- this.controlsService.controlPanelIsSelected &&
- this.controlsService.settingsIsSelected,
- ),
+ panelsOpened = computed(
+ () =>
+ this.headerService.controlPanelSelected() &&
+ this.headerService.settingsSelected(),
);
/** The plots */
@@ -132,6 +126,6 @@ export class PlotsComponent {
constructor(
private service: AppService,
- private controlsService: AppControlsService,
+ private headerService: HeaderService,
) {}
}
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html
index 71038f642..d5ded724e 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html
@@ -7,7 +7,9 @@
<!-- Buttons -->
<div
class="form-buttons form-buttons--left grid-row"
- [ngClass]="nshmpService.controlPanelButtonClass$ | async"
+ [ngClass]="{
+ 'full-width': (nshmpTemplateService.isSmallScreen$ | async) === true,
+ }"
>
<div class="grid-col-6 padding-x-1">
<button
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.ts
index af369d2ad..d828dff8c 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.ts
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.ts
@@ -5,6 +5,7 @@ import {MatButton} from '@angular/material/button';
import {MatFormField, MatLabel} from '@angular/material/form-field';
import {MatInput} from '@angular/material/input';
import {NshmpService} from '@ghsc/nshmp-lib-ng/nshmp';
+import {NshmpTemplateService} from '@ghsc/nshmp-template';
import {AppService} from '../../services/app.service';
@@ -36,6 +37,7 @@ export class ControlPanelComponent {
constructor(
public service: AppService,
public nshmpService: NshmpService,
+ public nshmpTemplateService: NshmpTemplateService,
) {}
/**
diff --git a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html
index 314f2f13c..905b0609c 100644
--- a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html
@@ -21,7 +21,9 @@
<!-- Buttons -->
<div
class="form-buttons form-buttons--left grid-row"
- [ngClass]="nshmpService.controlPanelButtonClass$ | async"
+ [ngClass]="{
+ 'full-width': (nshmpTemplateService.isSmallScreen$ | async) === true,
+ }"
>
<div class="grid-col-12 padding-x-1">
<button
diff --git a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.ts b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.ts
index fc4f64264..00b5e267f 100644
--- a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.ts
+++ b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.ts
@@ -8,6 +8,7 @@ import {MatInput} from '@angular/material/input';
import {MatSelect} from '@angular/material/select';
import {JobStatus} from '@ghsc/nshmp-lib-ng/aws';
import {NshmpService, nshmpUtils} from '@ghsc/nshmp-lib-ng/nshmp';
+import {NshmpTemplateService} from '@ghsc/nshmp-template';
import {Subscription} from 'rxjs';
import {AppService} from '../../services/app.service';
@@ -43,6 +44,7 @@ export class ControlPanelComponent implements OnInit, OnDestroy {
constructor(
public nshmpService: NshmpService,
+ public nshmpTemplateService: NshmpTemplateService,
private service: AppService,
) {}
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 7fc0ed3d6..ead3d47b6 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
@@ -1,9 +1,15 @@
-import {Component, OnDestroy, OnInit, ViewEncapsulation} from '@angular/core';
+import {
+ Component,
+ effect,
+ OnDestroy,
+ OnInit,
+ ViewEncapsulation,
+} from '@angular/core';
import {NshmpLibNgAboutPageComponent} from '@ghsc/nshmp-lib-ng/about';
import {NshmpLibNgHazardProvisionalModelComponent} from '@ghsc/nshmp-lib-ng/hazard';
import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
import {
- AppControlsService,
+ HeaderService,
NshmpTemplateContentContainerComponent,
NshmpTemplateControlPanelComponent,
NshmpTemplateMainContentComponent,
@@ -47,7 +53,7 @@ import {AppService} from './services/app.service';
styleUrl: './app.component.scss',
templateUrl: './app.component.html',
})
-export class AppComponent implements OnInit, OnDestroy {
+export class AppComponent implements OnInit {
/** Subscirption on controls change */
controlsSubscription: Subscription;
/** Navigation list for meny */
@@ -57,18 +63,16 @@ export class AppComponent implements OnInit, OnDestroy {
constructor(
public service: AppService,
- private controlsService: AppControlsService,
- ) {}
+ private headerService: HeaderService,
+ ) {
+ effect(() => {
+ this.headerService.controlPanelSelected();
+ this.headerService.settingsSelected();
+ this.service.mapRedraw();
+ });
+ }
ngOnInit() {
this.service.init();
-
- this.controlsSubscription = this.controlsService.controlsChanged.subscribe(
- () => this.service.mapRedraw(),
- );
- }
-
- ngOnDestroy(): void {
- this.controlsSubscription?.unsubscribe();
}
}
diff --git a/projects/nshmp-apps/src/styles/_forms.scss b/projects/nshmp-apps/src/styles/_forms.scss
index b0816e9b0..83c47be20 100644
--- a/projects/nshmp-apps/src/styles/_forms.scss
+++ b/projects/nshmp-apps/src/styles/_forms.scss
@@ -6,7 +6,7 @@
@use '@ghsc/nshmp-template/styles/variables';
nshmp-template-control-panel form {
- padding: 0 0.5em 4em;
+ padding: 1em 0.5em 4em;
}
/* Form buttons */
@@ -24,10 +24,6 @@ nshmp-template-control-panel form {
width: 100%;
}
-.form-buttons.half-width {
- width: 50%;
-}
-
.form-buttons--left {
left: 0;
}
--
GitLab
From aa3fecedcf97d1ebaecb3dfc28dc43bb43392ad7 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 18 Dec 2024 16:13:47 -0700
Subject: [PATCH 10/15] lint fix
---
.../dynamic-compare/components/plots/plots.component.ts | 2 +-
.../nshmp-apps/src/app/source/model-maps/app.component.ts | 8 +-------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.ts
index 2b3fbd277..bec0fcca3 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.ts
@@ -1,4 +1,4 @@
-import {AsyncPipe, NgClass} from '@angular/common';
+import {NgClass} from '@angular/common';
import {Component, computed, Signal} from '@angular/core';
import {MatDivider} from '@angular/material/divider';
import {
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 ead3d47b6..8e75d6ec5 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
@@ -1,10 +1,4 @@
-import {
- Component,
- effect,
- OnDestroy,
- OnInit,
- ViewEncapsulation,
-} from '@angular/core';
+import {Component, effect, OnInit, ViewEncapsulation} from '@angular/core';
import {NshmpLibNgAboutPageComponent} from '@ghsc/nshmp-lib-ng/about';
import {NshmpLibNgHazardProvisionalModelComponent} from '@ghsc/nshmp-lib-ng/hazard';
import {NshmpLibNgTemplateComponent} from '@ghsc/nshmp-lib-ng/nshmp';
--
GitLab
From 63eb843d82ae26088d67de036373437d6f41d9bb Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 18 Dec 2024 16:35:13 -0700
Subject: [PATCH 11/15] update deps
---
.npmrc | 1 -
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/.npmrc b/.npmrc
index c717fa022..fcdbb5524 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,2 +1 @@
@ghsc:registry=https://code.usgs.gov/api/v4/packages/npm/
-//code.usgs.gov/api/v4/packages/npm/:_authToken=${CI_JOB_TOKEN}
diff --git a/package-lock.json b/package-lock.json
index 9c03fc72d..70b436c62 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.6.0",
- "@ghsc/nshmp-template": "^20.3.0",
+ "@ghsc/nshmp-lib-ng": "^19.1.0",
+ "@ghsc/nshmp-template": "^19.2.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "20.6.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.6.0.tgz",
- "integrity": "sha1-B5AQu40YIFC8qNQl98lK8Qi/irI=",
+ "version": "19.1.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12416/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-19.1.0.tgz",
+ "integrity": "sha1-va+xPRwVSJfE+MqBQzPr9cgd4GY=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4864,9 +4864,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.3.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.3.0.tgz",
- "integrity": "sha1-vtvBgvDKZTY+e1qNZE1PiekDq7M=",
+ "version": "19.2.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/1416/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-19.2.0.tgz",
+ "integrity": "sha1-GWzVMHsUqJeQ1uzvJ994rgfPUtk=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 053e35ef9..1487858eb 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.6.0",
- "@ghsc/nshmp-template": "^20.3.0",
+ "@ghsc/nshmp-lib-ng": "^19.1.0",
+ "@ghsc/nshmp-template": "^19.2.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From 719f6e67924ffcd5d51602084a0c49fe024a376b Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 19 Dec 2024 14:59:58 -0700
Subject: [PATCH 12/15] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 70b436c62..52e209421 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^19.1.0",
- "@ghsc/nshmp-template": "^19.2.0",
+ "@ghsc/nshmp-lib-ng": "^19.2.2",
+ "@ghsc/nshmp-template": "^19.2.4",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "19.1.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12416/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-19.1.0.tgz",
- "integrity": "sha1-va+xPRwVSJfE+MqBQzPr9cgd4GY=",
+ "version": "19.2.2",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12416/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-19.2.2.tgz",
+ "integrity": "sha1-qRBBKQrd6vYmo+IGz73WI9QIjM8=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4864,9 +4864,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "19.2.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/1416/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-19.2.0.tgz",
- "integrity": "sha1-GWzVMHsUqJeQ1uzvJ994rgfPUtk=",
+ "version": "19.2.4",
+ "resolved": "https://code.usgs.gov/api/v4/projects/1416/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-19.2.4.tgz",
+ "integrity": "sha1-YniUKBo7ycH/P7YuVE57oo2EWWQ=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 1487858eb..c03496b4b 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^19.1.0",
- "@ghsc/nshmp-template": "^19.2.0",
+ "@ghsc/nshmp-lib-ng": "^19.2.2",
+ "@ghsc/nshmp-template": "^19.2.4",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From ba3d5e307d2c28a60b2d4dcf36a3365100a7b796 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 19 Dec 2024 15:00:06 -0700
Subject: [PATCH 13/15] chang to warn
---
tsconfig.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tsconfig.json b/tsconfig.json
index 6b0b78324..4789584f6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -27,7 +27,7 @@
"strictStandalone": true,
"extendedDiagnostics": {
"checks": {
- "unusedStandaloneImports": "error"
+ "unusedStandaloneImports": "warning"
}
}
},
--
GitLab
From c9ffa99b2da3fdc43ca9a0aee7e61c0c951ded31 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 19 Dec 2024 15:00:25 -0700
Subject: [PATCH 14/15] change to 100 width
---
.../control-panel-hazard.component.scss | 5 +++++
.../control-panel-input/control-panel-input.component.scss | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-hazard/control-panel-hazard.component.scss b/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-hazard/control-panel-hazard.component.scss
index e69de29bb..2de7e2145 100644
--- a/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-hazard/control-panel-hazard.component.scss
+++ b/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-hazard/control-panel-hazard.component.scss
@@ -0,0 +1,5 @@
+body.small-screen :host ::ng-deep {
+ .form-buttons {
+ width: 100%;
+ }
+}
diff --git a/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-input/control-panel-input.component.scss b/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-input/control-panel-input.component.scss
index 479ce114e..32da3bdb5 100644
--- a/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-input/control-panel-input.component.scss
+++ b/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-input/control-panel-input.component.scss
@@ -1,3 +1,9 @@
.hint {
font-size: 10.9px;
}
+
+body.small-screen :host ::ng-deep {
+ .form-buttons {
+ width: 100%;
+ }
+}
--
GitLab
From a1177010d79b3b837d8b892443c73074d9df24f8 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 19 Dec 2024 15:00:52 -0700
Subject: [PATCH 15/15] add function
---
.../control-panel-input.component.html | 2 +-
.../control-panel-input.component.ts | 18 +++++++-
.../snack-bar/snack-bar.component.ts | 2 +
.../control-panel.component.html | 2 +-
.../control-panel/control-panel.component.ts | 11 ++++-
.../control-panel/control-panel.component.ts | 43 +++++++++++--------
projects/nshmp-apps/src/styles/_forms.scss | 29 +------------
7 files changed, 56 insertions(+), 51 deletions(-)
diff --git a/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-input/control-panel-input.component.html b/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-input/control-panel-input.component.html
index 4ac652ac5..cacbe9755 100644
--- a/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-input/control-panel-input.component.html
+++ b/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-input/control-panel-input.component.html
@@ -1,7 +1,7 @@
<form
[formGroup]="formGroup"
class="height-full overflow-auto padding-top-1"
- (submit)="service.callService()"
+ (submit)="onSubmit()"
>
<!-- Building code -->
<app-building-code-control [control]="formGroup.controls.buildingCode" />
diff --git a/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-input/control-panel-input.component.ts b/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-input/control-panel-input.component.ts
index 019168b78..58e0d805a 100644
--- a/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-input/control-panel-input.component.ts
+++ b/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel-input/control-panel-input.component.ts
@@ -3,7 +3,10 @@ import {ReactiveFormsModule} from '@angular/forms';
import {MatButtonModule} from '@angular/material/button';
import {MatError, MatHint, MatInputModule} from '@angular/material/input';
import {MatFormField, MatSelectModule} from '@angular/material/select';
-import {NshmpLibNgControlPanelButtonsComponent} from '@ghsc/nshmp-lib-ng/nshmp';
+import {
+ NshmpLibNgControlPanelButtonsComponent,
+ NshmpService,
+} from '@ghsc/nshmp-lib-ng/nshmp';
import {Subscription} from 'rxjs';
import {AppService} from '../../services/app.service';
@@ -32,7 +35,10 @@ export class ControlPanelInputComponent implements OnInit, OnDestroy {
subs: Subscription[] = [];
- constructor(public service: AppService) {}
+ constructor(
+ public service: AppService,
+ private nshmpService: NshmpService,
+ ) {}
ngOnInit(): void {
const controls = this.formGroup.controls;
@@ -55,4 +61,12 @@ export class ControlPanelInputComponent implements OnInit, OnDestroy {
ngOnDestroy(): void {
this.subs.forEach(sub => sub.unsubscribe());
}
+
+ /**
+ * On form submit.
+ */
+ onSubmit(): void {
+ this.service.callService();
+ this.nshmpService.selectPlotControl();
+ }
}
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.ts b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.ts
index 1fb833f5f..e031177e5 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.ts
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.ts
@@ -9,6 +9,7 @@ import {
MatSnackBarLabel,
} from '@angular/material/snack-bar';
import {MatTooltip} from '@angular/material/tooltip';
+import {NSHMP_TEMPLATE_PROVIDERS} from '@ghsc/nshmp-template';
/**
* Angular material snackbar to show link to download results.
@@ -24,6 +25,7 @@ import {MatTooltip} from '@angular/material/tooltip';
MatSnackBarAction,
MatIcon,
],
+ providers: [NSHMP_TEMPLATE_PROVIDERS],
selector: 'app-snack-bar',
styleUrl: './snack-bar.component.scss',
templateUrl: './snack-bar.component.html',
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
index 74f774163..1defdd802 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
@@ -2,7 +2,7 @@
<form
class="height-full overflow-auto padding-top-1"
[formGroup]="formGroup"
- (submit)="service.callService()"
+ (submit)="onSubmit()"
>
@let depths = parameters()?.depths;
@let location = parameters()?.location;
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.ts b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.ts
index 89484208d..9a76a3dc0 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.ts
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.ts
@@ -13,6 +13,7 @@ import {
import {
FormGroupControls,
NshmpLibNgControlPanelButtonsComponent,
+ NshmpService,
} from '@ghsc/nshmp-lib-ng/nshmp';
import {NcmUsageParameter} from '@ghsc/nshmp-utils-ts/libs/ncm/geophysical';
import {Location} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/geo';
@@ -61,7 +62,10 @@ export class ControlPanelComponent implements OnInit, OnDestroy {
private subs: Subscription[] = [];
- constructor(public service: AppService) {}
+ constructor(
+ public service: AppService,
+ private nshmpService: NshmpService,
+ ) {}
ngOnInit(): void {
const controls = this.formGroup.controls;
@@ -86,6 +90,11 @@ export class ControlPanelComponent implements OnInit, OnDestroy {
this.subs.forEach(sub => sub.unsubscribe());
}
+ onSubmit(): void {
+ this.service.callService();
+ this.nshmpService.selectPlotControl();
+ }
+
removeLocation(index: number): void {
this.formGroup.controls.locations.removeAt(index);
}
diff --git a/projects/nshmp-apps/src/app/source/rates/components/control-panel/control-panel.component.ts b/projects/nshmp-apps/src/app/source/rates/components/control-panel/control-panel.component.ts
index 2cdb72325..93c1b8534 100644
--- a/projects/nshmp-apps/src/app/source/rates/components/control-panel/control-panel.component.ts
+++ b/projects/nshmp-apps/src/app/source/rates/components/control-panel/control-panel.component.ts
@@ -10,7 +10,10 @@ import {
NshmpLibNgMapSelectSiteComponent,
SelectSiteDialogData,
} from '@ghsc/nshmp-lib-ng/map';
-import {NshmpLibNgControlPanelButtonsComponent} from '@ghsc/nshmp-lib-ng/nshmp';
+import {
+ NshmpLibNgControlPanelButtonsComponent,
+ NshmpService,
+} from '@ghsc/nshmp-lib-ng/nshmp';
import {Location} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/geo';
import {environment} from 'projects/nshmp-apps/src/environments/environment';
import {Subscription} from 'rxjs';
@@ -55,7 +58,10 @@ export class ControlPanelComponent implements OnInit, OnDestroy {
private subs: Subscription[] = [];
- constructor(public service: AppService) {}
+ constructor(
+ public service: AppService,
+ private nshmpService: NshmpService,
+ ) {}
ngOnInit(): void {
const controls = this.formGroup.controls;
@@ -83,6 +89,23 @@ export class ControlPanelComponent implements OnInit, OnDestroy {
this.subs.forEach(sub => sub.unsubscribe());
}
+ onSubmit(): void {
+ this.service.callService();
+ this.nshmpService.selectPlotControl();
+ }
+
+ /**
+ * Set the location form fields.
+ *
+ * @param location The location
+ */
+ setLocation(location: Location): void {
+ this.formGroup.patchValue({
+ latitude: location.latitude,
+ longitude: location.longitude,
+ });
+ }
+
private onModelChange(): void {
const {latitude, longitude} = this.formGroup.getRawValue();
const latitudeBounds = this.service.usage().response.latitude;
@@ -106,20 +129,4 @@ export class ControlPanelComponent implements OnInit, OnDestroy {
this.formGroup.controls.longitude.markAsPristine();
this.service.resetState();
}
-
- onSubmit(): void {
- this.service.callService();
- }
-
- /**
- * Set the location form fields.
- *
- * @param location The location
- */
- setLocation(location: Location): void {
- this.formGroup.patchValue({
- latitude: location.latitude,
- longitude: location.longitude,
- });
- }
}
diff --git a/projects/nshmp-apps/src/styles/_forms.scss b/projects/nshmp-apps/src/styles/_forms.scss
index 83c47be20..bb6488c38 100644
--- a/projects/nshmp-apps/src/styles/_forms.scss
+++ b/projects/nshmp-apps/src/styles/_forms.scss
@@ -6,32 +6,5 @@
@use '@ghsc/nshmp-template/styles/variables';
nshmp-template-control-panel form {
- padding: 1em 0.5em 4em;
-}
-
-/* Form buttons */
-.form-buttons {
- bottom: 0;
- padding: 1em 0 0 0;
- position: absolute;
- width: variables.$side-panel-width;
- z-index: 10;
- background-color: mat.m2-get-color-from-palette(variables.$nshmp-accent);
- box-shadow: 0 0 1px rgba(0, 0, 0, 0.8);
-}
-
-.form-buttons.full-width {
- width: 100%;
-}
-
-.form-buttons--left {
- left: 0;
-}
-
-.form-buttons--right {
- right: 0;
-}
-
-body.dark-mode .form-buttons {
- background-color: mat.m2-get-color-from-palette(variables.$nshmp-accent, 800);
+ padding: 1em 0.5em 1em;
}
--
GitLab