Skip to content

Commit

Permalink
Merge pull request #1792 from ORNL-AMO/issue-1790-take-3
Browse files Browse the repository at this point in the history
Issue 1790: update to angular 19
  • Loading branch information
rmroot authored Jan 29, 2025
2 parents 0951128 + 0d99d6f commit 545f3e1
Show file tree
Hide file tree
Showing 395 changed files with 4,473 additions and 3,700 deletions.
5,451 changes: 2,917 additions & 2,534 deletions package-lock.json

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,19 @@
},
"private": true,
"dependencies": {
"@angular/animations": "18.2.6",
"@angular/cdk": "18.2.6",
"@angular/common": "18.2.6",
"@angular/compiler": "18.2.6",
"@angular/core": "18.2.6",
"@angular/forms": "18.2.6",
"@angular/localize": "18.2.6",
"@angular/platform-browser": "18.2.6",
"@angular/platform-browser-dynamic": "18.2.6",
"@angular/router": "18.2.6",
"@fortawesome/angular-fontawesome": "0.15.0",
"@fortawesome/fontawesome-free": "6.6.0",
"@ng-bootstrap/ng-bootstrap": "17.0.1",
"@angular/animations": "19.1.3",
"@angular/cdk": "19.1.1",
"@angular/common": "19.1.3",
"@angular/compiler": "19.1.3",
"@angular/core": "19.1.3",
"@angular/forms": "19.1.3",
"@angular/localize": "19.1.3",
"@angular/platform-browser": "19.1.3",
"@angular/platform-browser-dynamic": "19.1.3",
"@angular/router": "19.1.3",
"@fortawesome/angular-fontawesome": "1.0.0",
"@fortawesome/fontawesome-free": "6.7.2",
"@ng-bootstrap/ng-bootstrap": "18.0.0",
"angular-plotly.js": "6.0.0",
"bootstrap": "5.3.3",
"browserslist": "^4.21.5",
Expand All @@ -88,20 +88,20 @@
"fs-jetpack": "^5.1.0",
"jquery": "^3.6.1",
"jstat": "^1.9.5",
"ngx-indexed-db": "19.0.0",
"ngx-webstorage": "18.0.0",
"plotly.js": "2.35.2",
"ngx-indexed-db": "19.3.2",
"ngx-webstorage": "19.0.1",
"plotly.js": "3.0.0",
"rxjs": "7.8.1",
"tslib": "^1.14.1",
"websocket-extensions": "^0.1.4",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
"zone.js": "0.14.10"
"zone.js": "0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "18.2.12",
"@angular/cli": "18.2.6",
"@angular/compiler-cli": "18.2.6",
"@angular/language-service": "18.2.6",
"@angular-devkit/build-angular": "19.1.5",
"@angular/cli": "19.1.5",
"@angular/compiler-cli": "19.1.3",
"@angular/language-service": "19.1.3",
"@popperjs/core": "^2.11.6",
"@types/jasmine": "5.1.4",
"@types/jasminewd2": "^2.0.10",
Expand All @@ -117,7 +117,7 @@
"karma-jasmine": "5.1.0",
"karma-jasmine-html-reporter": "2.0.0",
"lodash": "^4.17.21",
"papaparse": "^5.4.1",
"papaparse": "5.5.2",
"ts-node": "9.1.1",
"tslint": "6.1.3",
"typescript": "5.5.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysis
import { SharedDataService } from 'src/app/shared/helper-services/shared-data.service';

@Component({
selector: 'app-account-analysis-banner',
templateUrl: './account-analysis-banner.component.html',
styleUrls: ['./account-analysis-banner.component.css']
selector: 'app-account-analysis-banner',
templateUrl: './account-analysis-banner.component.html',
styleUrls: ['./account-analysis-banner.component.css'],
standalone: false
})
export class AccountAnalysisBannerComponent implements OnInit {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import { SharedDataService } from 'src/app/shared/helper-services/shared-data.se
import { Subscription } from 'rxjs';

@Component({
selector: 'app-account-analysis-dashboard-tabs',
templateUrl: './account-analysis-dashboard-tabs.component.html',
styleUrls: ['./account-analysis-dashboard-tabs.component.css']
selector: 'app-account-analysis-dashboard-tabs',
templateUrl: './account-analysis-dashboard-tabs.component.html',
styleUrls: ['./account-analysis-dashboard-tabs.component.css'],
standalone: false
})
export class AccountAnalysisDashboardTabsComponent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import { FacilitydbService } from 'src/app/indexedDB/facility-db.service';
import { IdbFacility } from 'src/app/models/idbModels/facility';

@Component({
selector: 'app-account-analysis-dashboard',
templateUrl: './account-analysis-dashboard.component.html',
styleUrls: ['./account-analysis-dashboard.component.css']
selector: 'app-account-analysis-dashboard',
templateUrl: './account-analysis-dashboard.component.html',
styleUrls: ['./account-analysis-dashboard.component.css'],
standalone: false
})
export class AccountAnalysisDashboardComponent implements OnInit {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import { IdbAccount } from 'src/app/models/idbModels/account';
import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysisItem';

@Component({
selector: 'app-account-analysis-energy-dashboard',
templateUrl: './account-analysis-energy-dashboard.component.html',
styleUrls: ['./account-analysis-energy-dashboard.component.css']
selector: 'app-account-analysis-energy-dashboard',
templateUrl: './account-analysis-energy-dashboard.component.html',
styleUrls: ['./account-analysis-energy-dashboard.component.css'],
standalone: false
})
export class AccountAnalysisEnergyDashboardComponent {
accountAnalysisItemsSub: Subscription;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysis
import { IdbAccountReport } from 'src/app/models/idbModels/accountReport';

@Component({
selector: 'app-account-analysis-item-card',
templateUrl: './account-analysis-item-card.component.html',
styleUrls: ['./account-analysis-item-card.component.css']
selector: 'app-account-analysis-item-card',
templateUrl: './account-analysis-item-card.component.html',
styleUrls: ['./account-analysis-item-card.component.css'],
standalone: false
})
export class AccountAnalysisItemCardComponent implements OnInit {
@Input()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import { IdbAccount } from 'src/app/models/idbModels/account';
import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysisItem';

@Component({
selector: 'app-account-analysis-water-dashboard',
templateUrl: './account-analysis-water-dashboard.component.html',
styleUrls: ['./account-analysis-water-dashboard.component.css']
selector: 'app-account-analysis-water-dashboard',
templateUrl: './account-analysis-water-dashboard.component.html',
styleUrls: ['./account-analysis-water-dashboard.component.css'],
standalone: false
})
export class AccountAnalysisWaterDashboardComponent {
accountAnalysisItemsSub: Subscription;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import { AccountAnalysisService } from '../account-analysis.service';
import { IdbFacility } from 'src/app/models/idbModels/facility';

@Component({
selector: 'app-account-analysis-footer',
templateUrl: './account-analysis-footer.component.html',
styleUrls: ['./account-analysis-footer.component.css']
selector: 'app-account-analysis-footer',
templateUrl: './account-analysis-footer.component.html',
styleUrls: ['./account-analysis-footer.component.css'],
standalone: false
})
export class AccountAnalysisFooterComponent implements OnInit {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import { IdbAnalysisItem } from 'src/app/models/idbModels/analysisItem';
import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysisItem';

@Component({
selector: 'app-account-analysis-facilities-summary',
templateUrl: './account-analysis-facilities-summary.component.html',
styleUrls: ['./account-analysis-facilities-summary.component.css']
selector: 'app-account-analysis-facilities-summary',
templateUrl: './account-analysis-facilities-summary.component.html',
styleUrls: ['./account-analysis-facilities-summary.component.css'],
standalone: false
})
export class AccountAnalysisFacilitiesSummaryComponent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ import { IdbAnalysisItem } from 'src/app/models/idbModels/analysisItem';
import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysisItem';

@Component({
selector: 'app-account-analysis-results',
templateUrl: './account-analysis-results.component.html',
styleUrls: ['./account-analysis-results.component.css']
selector: 'app-account-analysis-results',
templateUrl: './account-analysis-results.component.html',
styleUrls: ['./account-analysis-results.component.css'],
standalone: false
})
export class AccountAnalysisResultsComponent implements OnInit {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import { IdbAccount } from 'src/app/models/idbModels/account';
import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysisItem';

@Component({
selector: 'app-annual-account-analysis',
templateUrl: './annual-account-analysis.component.html',
styleUrls: ['./annual-account-analysis.component.css']
selector: 'app-annual-account-analysis',
templateUrl: './annual-account-analysis.component.html',
styleUrls: ['./annual-account-analysis.component.css'],
standalone: false
})
export class AnnualAccountAnalysisComponent implements OnInit {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import { IdbAccount } from 'src/app/models/idbModels/account';
import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysisItem';

@Component({
selector: 'app-monthly-account-analysis',
templateUrl: './monthly-account-analysis.component.html',
styleUrls: ['./monthly-account-analysis.component.css']
selector: 'app-monthly-account-analysis',
templateUrl: './monthly-account-analysis.component.html',
styleUrls: ['./monthly-account-analysis.component.css'],
standalone: false
})
export class MonthlyAccountAnalysisComponent implements OnInit {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ import { PredictorDbService } from 'src/app/indexedDB/predictor-db.service';
import { IdbPredictor } from 'src/app/models/idbModels/predictor';

@Component({
selector: 'app-account-analysis-setup',
templateUrl: './account-analysis-setup.component.html',
styleUrls: ['./account-analysis-setup.component.css']
selector: 'app-account-analysis-setup',
templateUrl: './account-analysis-setup.component.html',
styleUrls: ['./account-analysis-setup.component.css'],
standalone: false
})
export class AccountAnalysisSetupComponent implements OnInit {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import { AccountAnalysisService } from './account-analysis.service';
import { IdbUtilityMeterData } from 'src/app/models/idbModels/utilityMeterData';

@Component({
selector: 'app-account-analysis',
templateUrl: './account-analysis.component.html',
styleUrls: ['./account-analysis.component.css']
selector: 'app-account-analysis',
templateUrl: './account-analysis.component.html',
styleUrls: ['./account-analysis.component.css'],
standalone: false
})
export class AccountAnalysisComponent implements OnInit {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysis
import { IdbAnalysisItem } from 'src/app/models/idbModels/analysisItem';

@Component({
selector: 'app-select-facility-analysis-items',
templateUrl: './select-facility-analysis-items.component.html',
styleUrls: ['./select-facility-analysis-items.component.css']
selector: 'app-select-facility-analysis-items',
templateUrl: './select-facility-analysis-items.component.html',
styleUrls: ['./select-facility-analysis-items.component.css'],
standalone: false
})
export class SelectFacilityAnalysisItemsComponent implements OnInit {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ import { IdbPredictor } from 'src/app/models/idbModels/predictor';
import { PredictorDbService } from 'src/app/indexedDB/predictor-db.service';
import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysisItem';
@Component({
selector: 'app-select-item-table',
templateUrl: './select-item-table.component.html',
styleUrls: ['./select-item-table.component.css']
selector: 'app-select-item-table',
templateUrl: './select-item-table.component.html',
styleUrls: ['./select-item-table.component.css'],
standalone: false
})
export class SelectItemTableComponent implements OnInit {
@Input()
Expand Down
7 changes: 4 additions & 3 deletions src/app/account/account-banner/account-banner.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import { IdbAccount } from 'src/app/models/idbModels/account';
import { IdbUtilityMeterData } from 'src/app/models/idbModels/utilityMeterData';

@Component({
selector: 'app-account-banner',
templateUrl: './account-banner.component.html',
styleUrls: ['./account-banner.component.css']
selector: 'app-account-banner',
templateUrl: './account-banner.component.html',
styleUrls: ['./account-banner.component.css'],
standalone: false
})
export class AccountBannerComponent implements OnInit {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import { IdbAnalysisItem } from 'src/app/models/idbModels/analysisItem';
import { IdbFacility } from 'src/app/models/idbModels/facility';

@Component({
selector: 'app-account-annual-analysis-table',
templateUrl: './account-annual-analysis-table.component.html',
styleUrls: ['./account-annual-analysis-table.component.css']
selector: 'app-account-annual-analysis-table',
templateUrl: './account-annual-analysis-table.component.html',
styleUrls: ['./account-annual-analysis-table.component.css'],
standalone: false
})
export class AccountAnnualAnalysisTableComponent {
@Input()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import { IdbAccount } from 'src/app/models/idbModels/account';
import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysisItem';

@Component({
selector: 'app-account-energy-card',
templateUrl: './account-energy-card.component.html',
styleUrls: ['./account-energy-card.component.css']
selector: 'app-account-energy-card',
templateUrl: './account-energy-card.component.html',
styleUrls: ['./account-energy-card.component.css'],
standalone: false
})
export class AccountEnergyCardComponent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import { IdbAccount } from 'src/app/models/idbModels/account';
import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysisItem';

@Component({
selector: 'app-account-energy-reduction-goal',
templateUrl: './account-energy-reduction-goal.component.html',
styleUrls: ['./account-energy-reduction-goal.component.css']
selector: 'app-account-energy-reduction-goal',
templateUrl: './account-energy-reduction-goal.component.html',
styleUrls: ['./account-energy-reduction-goal.component.css'],
standalone: false
})
export class AccountEnergyReductionGoalComponent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ import { IdbUtilityMeterData } from 'src/app/models/idbModels/utilityMeterData';
import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysisItem';

@Component({
selector: 'app-account-home-summary',
templateUrl: './account-home-summary.component.html',
styleUrls: ['./account-home-summary.component.css']
selector: 'app-account-home-summary',
templateUrl: './account-home-summary.component.html',
styleUrls: ['./account-home-summary.component.css'],
standalone: false
})
export class AccountHomeSummaryComponent implements OnInit {

Expand Down
7 changes: 4 additions & 3 deletions src/app/account/account-home/account-home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysis
import { IdbAnalysisItem } from 'src/app/models/idbModels/analysisItem';

@Component({
selector: 'app-account-home',
templateUrl: './account-home.component.html',
styleUrls: ['./account-home.component.css']
selector: 'app-account-home',
templateUrl: './account-home.component.html',
styleUrls: ['./account-home.component.css'],
standalone: false
})
export class AccountHomeComponent implements OnInit {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import { IdbAccount } from 'src/app/models/idbModels/account';
import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysisItem';

@Component({
selector: 'app-account-water-card',
templateUrl: './account-water-card.component.html',
styleUrls: ['./account-water-card.component.css']
selector: 'app-account-water-card',
templateUrl: './account-water-card.component.html',
styleUrls: ['./account-water-card.component.css'],
standalone: false
})
export class AccountWaterCardComponent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import { IdbAccount } from 'src/app/models/idbModels/account';
import { IdbAccountAnalysisItem } from 'src/app/models/idbModels/accountAnalysisItem';

@Component({
selector: 'app-account-water-reduction-goal',
templateUrl: './account-water-reduction-goal.component.html',
styleUrls: ['./account-water-reduction-goal.component.css']
selector: 'app-account-water-reduction-goal',
templateUrl: './account-water-reduction-goal.component.html',
styleUrls: ['./account-water-reduction-goal.component.css'],
standalone: false
})
export class AccountWaterReductionGoalComponent {

Expand Down
Loading

0 comments on commit 545f3e1

Please sign in to comment.