From 61269634b958c5ca78f3717bffe47ff5595517ff Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 11 Sep 2023 13:53:22 -0700 Subject: [PATCH 01/77] add menu item and page code - wip --- .../admin-nrpti/src/app/app-routing.module.ts | 13 +++++++ .../admin-nrpti/src/app/app.module.ts | 2 + .../src/app/home/home.component.spec.ts | 1 + .../src/app/services/keycloak.service.ts | 3 ++ .../src/app/sidebar/sidebar.component.html | 8 ++++ .../src/app/sidebar/sidebar.component.spec.ts | 2 + .../update-issuing-agency.component.html | 3 ++ .../update-issuing-agency.component.scss | 2 + .../update-issuing-agency.component.ts | 15 +++++++ .../update-issuing-agency.module.ts | 39 +++++++++++++++++++ .../update-issuing-agency.resolver.ts | 12 ++++++ .../src/app/utils/constants/misc.ts | 3 +- 12 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html create mode 100644 angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.scss create mode 100644 angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts create mode 100644 angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.module.ts create mode 100644 angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.resolver.ts diff --git a/angular/projects/admin-nrpti/src/app/app-routing.module.ts b/angular/projects/admin-nrpti/src/app/app-routing.module.ts index fafe4cacb..d70124e06 100644 --- a/angular/projects/admin-nrpti/src/app/app-routing.module.ts +++ b/angular/projects/admin-nrpti/src/app/app-routing.module.ts @@ -8,6 +8,8 @@ import { NewsResolver } from './news/news-resolver'; import { NewsListComponent } from './news/news-list.component'; import { CommunicationsComponent } from './communications/communications.component'; import { LngMapInfoResolver } from './communications/lng-map-info/lng-map-info-resolver'; +import { UpdateIssuingAgencyComponent } from './update-issuing-agency/update-issuing-agency.component'; +import { UpdateIssuingAgencyResolver } from './update-issuing-agency/update-issuing-agency.resolver'; const routes: Routes = [ { @@ -60,6 +62,17 @@ const routes: Routes = [ } ] }, + { + path: 'update-issuing-agency', + pathMatch: 'full', + component: UpdateIssuingAgencyComponent, + resolve: { + records: UpdateIssuingAgencyResolver + }, + data: { + breadcrumb: 'Update Issuing Agency' + } + }, { // wildcard default route path: '**', diff --git a/angular/projects/admin-nrpti/src/app/app.module.ts b/angular/projects/admin-nrpti/src/app/app.module.ts index 017b2327e..d4c6ec1f0 100644 --- a/angular/projects/admin-nrpti/src/app/app.module.ts +++ b/angular/projects/admin-nrpti/src/app/app.module.ts @@ -19,6 +19,7 @@ import { RecordsModule } from './records/records.module'; import { NewsModule } from './news/news.module'; import { MinesModule } from './mines/mines.module'; import { CommunicationsModule } from './communications/communications.module'; +import { UpdateIssuingAgencyModule } from './update-issuing-agency/update-issuing-agency.module'; import { ToastrModule } from 'ngx-toastr'; // components @@ -98,6 +99,7 @@ export function overlayScrollFactory(overlay: Overlay): () => CloseScrollStrateg NewsModule, MinesModule, CommunicationsModule, + UpdateIssuingAgencyModule, AppRoutingModule, // <-- module import order matters - https://angular.io/guide/router#module-import-order-matters NgbModule.forRoot(), NgxPaginationModule, diff --git a/angular/projects/admin-nrpti/src/app/home/home.component.spec.ts b/angular/projects/admin-nrpti/src/app/home/home.component.spec.ts index 28102c81d..30620d708 100644 --- a/angular/projects/admin-nrpti/src/app/home/home.component.spec.ts +++ b/angular/projects/admin-nrpti/src/app/home/home.component.spec.ts @@ -33,6 +33,7 @@ describe('HomeComponent', () => { case Constants.Menus.ENTITIES: retVal = false; break; case Constants.Menus.IMPORTS: retVal = true; break; case Constants.Menus.COMMUNICATIONS: retVal = true; break; + case Constants.Menus.UPDATE_ISSUING_AGENCY: retVal = true; break; } return retVal; } diff --git a/angular/projects/admin-nrpti/src/app/services/keycloak.service.ts b/angular/projects/admin-nrpti/src/app/services/keycloak.service.ts index 9c401d2c0..e9c59c209 100644 --- a/angular/projects/admin-nrpti/src/app/services/keycloak.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/keycloak.service.ts @@ -161,6 +161,9 @@ export class KeycloakService { roles.includes(Constants.ApplicationRoles.ADMIN_LNG) || roles.includes(Constants.ApplicationRoles.ADMIN_NRCED) || roles.includes(Constants.ApplicationRoles.ADMIN_BCMI); + + this.menus[Constants.Menus.UPDATE_ISSUING_AGENCY] = + roles.includes(Constants.ApplicationRoles.ADMIN) } buildAddRecordDropdownCache(roles) { diff --git a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html index 167ee20d4..7da3bd911 100644 --- a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html +++ b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html @@ -102,5 +102,13 @@ chat Communications + + notifications_active + Update Issuing Agency + \ No newline at end of file diff --git a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.spec.ts b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.spec.ts index 2bd67d897..05648b88e 100644 --- a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.spec.ts +++ b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.spec.ts @@ -38,6 +38,7 @@ describe('SidebarComponent', () => { case Constants.Menus.ENTITIES: retVal = false; break; case Constants.Menus.IMPORTS: retVal = true; break; case Constants.Menus.COMMUNICATIONS: retVal = true; break; + case Constants.Menus.UPDATE_ISSUING_AGENCY: retVal = true; break; } return retVal; } @@ -70,6 +71,7 @@ describe('SidebarComponent', () => { expect(component.keycloakService.isMenuEnabled(Constants.Menus.ENTITIES)).toEqual(false); expect(component.keycloakService.isMenuEnabled(Constants.Menus.IMPORTS)).toEqual(true); expect(component.keycloakService.isMenuEnabled(Constants.Menus.COMMUNICATIONS)).toEqual(true); + expect(component.keycloakService.isMenuEnabled(Constants.Menus.UPDATE_ISSUING_AGENCY)).toEqual(true); expect(component.keycloakService.isMenuEnabled('Something Not Here')).toEqual(false); expect(component).toBeTruthy(); diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html new file mode 100644 index 000000000..025bd3233 --- /dev/null +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html @@ -0,0 +1,3 @@ +
+

Hello

+
\ No newline at end of file diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.scss b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.scss new file mode 100644 index 000000000..b5ec26e80 --- /dev/null +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.scss @@ -0,0 +1,2 @@ +@import "assets/styles/base/base.scss"; +@import "assets/styles/components/add-edit.scss"; diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts new file mode 100644 index 000000000..58d311765 --- /dev/null +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts @@ -0,0 +1,15 @@ + +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-update-issuing-agency', + templateUrl: './update-issuing-agency.component.html', + styleUrls: ['./update-issuing-agency.component.scss'] +}) +export class UpdateIssuingAgencyComponent implements OnInit { + public loading = false; + + ngOnInit(): void { + console.log("UpdateIssuingAgencyComponent.ngOnInit()") + } +} diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.module.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.module.ts new file mode 100644 index 000000000..21d5f6955 --- /dev/null +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.module.ts @@ -0,0 +1,39 @@ +// modules +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { BrowserModule } from '@angular/platform-browser'; +import { EditorModule } from '@tinymce/tinymce-angular'; +import { GlobalModule } from 'nrpti-angular-components'; + +import { CommonModule as NrptiCommonModule } from '../../../../common/src/app/common.module'; +import { UpdateIssuingAgencyComponent } from './update-issuing-agency.component'; +import { UpdateIssuingAgencyResolver } from './update-issuing-agency.resolver'; + + +@NgModule({ + imports: [ + BrowserModule, + EditorModule, + FormsModule, + ReactiveFormsModule, + CommonModule, + GlobalModule, + NrptiCommonModule, + RouterModule, + NgbModule, + ], + declarations: [ + UpdateIssuingAgencyComponent + ], + providers: [ + UpdateIssuingAgencyResolver + ], + entryComponents: [ + UpdateIssuingAgencyComponent + ], + exports: [] +}) +export class UpdateIssuingAgencyModule {} diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.resolver.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.resolver.ts new file mode 100644 index 000000000..90c2e2f7b --- /dev/null +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.resolver.ts @@ -0,0 +1,12 @@ +import { Injectable } from '@angular/core'; +import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { Observable } from 'rxjs/Observable'; + + +@Injectable() +export class UpdateIssuingAgencyResolver implements Resolve> { + resolve(route: ActivatedRouteSnapshot): Observable { + console.log("UpdateIssuingAgencyResolver.resolve()") + return null; + } +} diff --git a/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts b/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts index 0a61e760b..ff73372b1 100644 --- a/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts +++ b/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts @@ -48,7 +48,8 @@ export class Constants { MAP: 'Map', ENTITIES: 'Entities', IMPORTS: 'Imports', - COMMUNICATIONS: 'Communications' + COMMUNICATIONS: 'Communications', + UPDATE_ISSUING_AGENCY: 'Update Issuing Agency' }; public static readonly RecordTypes: any = { From 32f14a4182bc0689451904a43c87a9e124fa7bd9 Mon Sep 17 00:00:00 2001 From: Christopher-walsh22 <106549296+Christopher-walsh22@users.noreply.github.com> Date: Mon, 11 Sep 2023 16:50:37 -0700 Subject: [PATCH 02/77] Updated the front end to display list of agencies from drop down and update values from that list with value from a text box. --- .../update-issuing-agency.component.html | 28 +++++++++++++++-- .../update-issuing-agency.component.ts | 30 +++++++++++++++---- .../projects/global/src/lib/utils/utils.ts | 16 ++++++++++ 3 files changed, 66 insertions(+), 8 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html index 025bd3233..864439593 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html @@ -1,3 +1,25 @@ -
-

Hello

-
\ No newline at end of file +
+

Update Issuing Agency

+ + +
+
+ +
+ + +
+ + +
+ + + + + +
+

Selected Agency: {{ agencies[selectedAgency] }}

+
+
diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts index 58d311765..70508238a 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts @@ -1,15 +1,35 @@ - import { Component, OnInit } from '@angular/core'; - +import utils from 'esri/widgets/smartMapping/support/utils'; +import { ApplicationAgencyList } from '../../../../global/src/lib/utils/utils'; @Component({ selector: 'app-update-issuing-agency', templateUrl: './update-issuing-agency.component.html', styleUrls: ['./update-issuing-agency.component.scss'] }) export class UpdateIssuingAgencyComponent implements OnInit { - public loading = false; + public loading = false; + selectedAgency = 'Select an Agency'; // Set the initial selected value + choiceMade = false; + newAgency = ''; // Initialize the new agency input field + + agencies: {} = ApplicationAgencyList; - ngOnInit(): void { - console.log("UpdateIssuingAgencyComponent.ngOnInit()") + onSelected(value: string): void { + this.selectedAgency = value; + this.choiceMade = true; + } + + updateSelectedAgency(): void { + if (this.newAgency.trim() !== '') { + // Only update the selected agency if the new agency input is not empty + this.agencies[this.selectedAgency] = this.newAgency; + this.selectedAgency = this.newAgency; // Update the selected value + this.newAgency = ''; // Clear the input field + this.choiceMade = true; } + } + + ngOnInit(): void { + console.log('UpdateIssuingAgencyComponent.ngOnInit()'); + } } diff --git a/angular/projects/global/src/lib/utils/utils.ts b/angular/projects/global/src/lib/utils/utils.ts index c70929750..6ba5f429a 100644 --- a/angular/projects/global/src/lib/utils/utils.ts +++ b/angular/projects/global/src/lib/utils/utils.ts @@ -15,6 +15,22 @@ const ApplicationAgencies = { AGENCY_WLRS: 'Ministry of Water, Land and Resource Stewardship', }; +export var ApplicationAgencyList = { + AGENCY_ALC: 'Agricultural Land Commission', + AGENCY_WF: 'BC Wildfire Service', + AGENCY_ENV_COS: 'Conservation Officer Service', + AGENCY_EAO: 'Environmental Assessment Office', + AGENCY_EMLI: 'Ministry of Energy Mines and Low Carbon Innovation', + AGENCY_ENV: 'Ministry of Environment and Climate Change Strategy', + AGENCY_ENV_BCPARKS: 'BC Parks', + AGENCY_OGC: 'BC Energy Regulator', + AGENCY_ENV_EPD: 'Ministry of Environment and Climate Change Strategy', + AGENCY_LNG: 'LNG Secretariat', + AGENCY_AGRI: 'Ministry of Agriculture and Food', + AGENCY_FLNRO: 'Ministry of Forests', + AGENCY_FLNR_NRO: 'Natural Resource Officers', + AGENCY_WLRS: 'Ministry of Water, Land and Resource Stewardship', +}; /** * General purpose utils. * From 346cf1b7266eeda95891fab0d6a59cf6646667a0 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 11 Sep 2023 16:56:12 -0700 Subject: [PATCH 03/77] create model and migration for agencies --- ...30911220312-addApplicationAgenciesModel.js | 66 +++++++++++++++++++ api/src/models/master/applicationAgency.js | 15 +++++ 2 files changed, 81 insertions(+) create mode 100644 api/migrations/20230911220312-addApplicationAgenciesModel.js create mode 100644 api/src/models/master/applicationAgency.js diff --git a/api/migrations/20230911220312-addApplicationAgenciesModel.js b/api/migrations/20230911220312-addApplicationAgenciesModel.js new file mode 100644 index 000000000..1fe7ef743 --- /dev/null +++ b/api/migrations/20230911220312-addApplicationAgenciesModel.js @@ -0,0 +1,66 @@ +'use strict'; +const ApplicationAgency = require('../src/models/master/applicationAgency'); +const mongoose = require('mongoose'); + +var dbm; +var type; +var seed; + +exports.setup = function(options, seedLink) { + dbm = options.dbmigrate; + type = dbm.dataType; + seed = seedLink; +}; + +exports.up = async function (db) { + console.log('**** Adding ApplicationAgencies constants to nrpti collection ****'); + + // Connect to the database + mongoose.connect(db.connectionString, { useNewUrlParser: true, useUnifiedTopology: true }); + const dbConnection = mongoose.connection; + + dbConnection.on('error', console.error.bind(console, 'MongoDB connection error:')); + dbConnection.once('open', async function () { + const agencies = { + AGENCY_ALC: 'Agricultural Land Commission', + AGENCY_WF: 'BC Wildfire Service', + AGENCY_ENV_COS: 'Conservation Officer Service', + AGENCY_EAO: 'Environmental Assessment Office', + AGENCY_EMLI: 'Ministry of Energy Mines and Low Carbon Innovation', + AGENCY_ENV: 'Ministry of Environment and Climate Change Strategy', + AGENCY_ENV_BCPARKS: 'BC Parks', + AGENCY_OGC: 'BC Energy Regulator', + AGENCY_ENV_EPD: 'Ministry of Environment and Climate Change Strategy', + AGENCY_LNG: 'LNG Secretariat', + AGENCY_AGRI: 'Ministry of Agriculture and Food', + AGENCY_FLNRO: 'Ministry of Forests', + AGENCY_FLNR_NRO: 'Natural Resource Officers', + AGENCY_WLRS: 'Ministry of Water, Land and Resource Stewardship', + }; + + // Create and insert documents for each agency + const agencyInsertPromises = Object.entries(agencies).map(([code, name]) => + ApplicationAgency.create({ agencyCode: code, agencyName: name }) + .catch(error => { + console.error(`Error inserting agency ${code}:`, error); + }) + ); + + try { + // await Promise.all(agencyInsertPromises); + console.log('Migration completed successfully'); + } catch (error) { + console.error('Migration failed:', error); + } + }); + + mongoose.connection.close(); +}; + +exports.down = function(db) { + return null; +}; + +exports._meta = { + "version": 1 +}; \ No newline at end of file diff --git a/api/src/models/master/applicationAgency.js b/api/src/models/master/applicationAgency.js new file mode 100644 index 000000000..2c0b66759 --- /dev/null +++ b/api/src/models/master/applicationAgency.js @@ -0,0 +1,15 @@ +module.exports = require('../../utils/model-schema-generator')( + 'ApplicationAgencies', + { + _schemaName: { type: String, default: 'ApplicationAgency', index: true }, + agencyCode: { type: String, default: null }, + agencyName: { type: String, default: null }, + read: [{ type: String, trim: true, default: 'sysadmin' }], + write: [{ type: String, trim: true, default: 'sysadmin' }], + dateAdded: { type: Date, default: Date.now() }, + dateUpdated: { type: Date, default: null }, + addedBy: { type: String, default: '' }, + updatedBy: { type: String, default: '' }, + }, + 'nrpti' + ); \ No newline at end of file From f424e3979aacfb0ddae5e9b182708dee7b86aaee Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 11 Sep 2023 17:00:32 -0700 Subject: [PATCH 04/77] fix to model and migration - wip --- api/migrations/20230911220312-addApplicationAgenciesModel.js | 2 +- api/src/models/master/applicationAgency.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/migrations/20230911220312-addApplicationAgenciesModel.js b/api/migrations/20230911220312-addApplicationAgenciesModel.js index 1fe7ef743..30298b4f8 100644 --- a/api/migrations/20230911220312-addApplicationAgenciesModel.js +++ b/api/migrations/20230911220312-addApplicationAgenciesModel.js @@ -47,7 +47,7 @@ exports.up = async function (db) { ); try { - // await Promise.all(agencyInsertPromises); + await Promise.all(agencyInsertPromises); console.log('Migration completed successfully'); } catch (error) { console.error('Migration failed:', error); diff --git a/api/src/models/master/applicationAgency.js b/api/src/models/master/applicationAgency.js index 2c0b66759..ae292ce90 100644 --- a/api/src/models/master/applicationAgency.js +++ b/api/src/models/master/applicationAgency.js @@ -2,8 +2,8 @@ module.exports = require('../../utils/model-schema-generator')( 'ApplicationAgencies', { _schemaName: { type: String, default: 'ApplicationAgency', index: true }, - agencyCode: { type: String, default: null }, - agencyName: { type: String, default: null }, + agencyCode: { type: String, default: null, unique: true }, + agencyName: { type: String, default: null, required: true }, read: [{ type: String, trim: true, default: 'sysadmin' }], write: [{ type: String, trim: true, default: 'sysadmin' }], dateAdded: { type: Date, default: Date.now() }, From 1d99fe53a0d6941e8c06b4fd167c5506aa857b80 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Tue, 12 Sep 2023 11:40:40 -0700 Subject: [PATCH 05/77] update agency code migration, add update issuingAgency --- ...30911220312-addApplicationAgenciesModel.js | 19 ++++- ...0230912181649-updateIssuingAgencyToCode.js | 78 +++++++++++++++++++ 2 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 api/migrations/20230912181649-updateIssuingAgencyToCode.js diff --git a/api/migrations/20230911220312-addApplicationAgenciesModel.js b/api/migrations/20230911220312-addApplicationAgenciesModel.js index 30298b4f8..ccebabcb1 100644 --- a/api/migrations/20230911220312-addApplicationAgenciesModel.js +++ b/api/migrations/20230911220312-addApplicationAgenciesModel.js @@ -40,7 +40,14 @@ exports.up = async function (db) { // Create and insert documents for each agency const agencyInsertPromises = Object.entries(agencies).map(([code, name]) => - ApplicationAgency.create({ agencyCode: code, agencyName: name }) + ApplicationAgency.create( + { + agencyCode: code, + agencyName: name, + read: ['sysadmin'], + write: ['sysadmin'], + } + ) .catch(error => { console.error(`Error inserting agency ${code}:`, error); }) @@ -51,10 +58,16 @@ exports.up = async function (db) { console.log('Migration completed successfully'); } catch (error) { console.error('Migration failed:', error); + } finally { + mongoose.connection.close(() => { + mongoose.connection.close(); + console.log('Database connection closed'); + process.exit(0); + }); + + return null } }); - - mongoose.connection.close(); }; exports.down = function(db) { diff --git a/api/migrations/20230912181649-updateIssuingAgencyToCode.js b/api/migrations/20230912181649-updateIssuingAgencyToCode.js new file mode 100644 index 000000000..f87ac1a49 --- /dev/null +++ b/api/migrations/20230912181649-updateIssuingAgencyToCode.js @@ -0,0 +1,78 @@ +'use strict'; + +var dbm; +var type; +var seed; + +/** + * We receive the dbmigrate dependency from dbmigrate initially. + * This enables us to not have to rely on NODE_PATH. + */ +exports.setup = function(options, seedLink) { + dbm = options.dbmigrate; + type = dbm.dataType; + seed = seedLink; +}; + + +exports.up = async function (db) { + const mClient = await db.connection.connect(db.connectionString, { + native_parser: true, + }); + + const agencies = [ + { agencyCode: "AGENCY_ALC", agencyName: 'Agricultural Land Commission' }, + { agencyCode: "AGENCY_WF", agencyName: 'BC Wildfire Service' }, + { agencyCode: "AGENCY_ENV_COS", agencyName: 'Conservation Officer Service' }, + { agencyCode: "AGENCY_EAO", agencyName: 'Environmental Assessment Office' }, + { agencyCode: "AGENCY_EMLI", agencyName: 'Ministry of Energy Mines and Low Carbon Innovation' }, + { agencyCode: "AGENCY_ENV", agencyName: 'Ministry of Environment and Climate Change Strategy' }, + { agencyCode: "AGENCY_ENV_BCPARKS", agencyName: 'BC Parks' }, + { agencyCode: "AGENCY_OGC", agencyName: 'BC Energy Regulator' }, + { agencyCode: "AGENCY_ENV_EPD", agencyName: 'Ministry of Environment and Climate Change Strategy' }, + { agencyCode: "AGENCY_LNG", agencyName: 'LNG Secretariat' }, + { agencyCode: "AGENCY_AGRI", agencyName: 'Ministry of Agriculture and Food' }, + { agencyCode: "AGENCY_FLNRO", agencyName: 'Ministry of Forests' }, + { agencyCode: "AGENCY_FLNR_NRO", agencyName: 'Natural Resource Officers' }, + { agencyCode: "AGENCY_WLRS", agencyName: 'Ministry of Water, Land and Resource Stewardship' }, + ] + + const collections = ['nrpti', 'redacted_record_subset']; + + try { + for (let collection of collections) { + console.log(`***** Collection: ${collection} *****`); + + for (const agency of agencies) { + try { + let currentCollection = await mClient.collection(collection); + + await currentCollection.updateMany( + { issuingAgency: agency['agencyName'] }, + { $set: { issuingAgency: agency['agencyCode'] } } + ); + + console.log(` ***** Updated collection: ${collection} for agency: ${agency['agencyName']} *****`); + } catch (err) { + console.log(` ***** Error updating collection: ${collection} for agency: ${agency['agencyName']} *****`, err); + } + } + } + } catch (err) { + console.error('Error connecting to the database:', err); + } finally { + if (mClient) { + await mClient.close(); + } + } + + return null; +}; + +exports.down = function(db) { + return null; +}; + +exports._meta = { + "version": 1 +}; From 7e356ceb1cd408150c1d3f3872363aaf0aa89ca5 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:22:38 -0700 Subject: [PATCH 06/77] update model to only add to nrpti collection --- ...30911220312-addApplicationAgenciesModel.js | 102 +++++++++--------- 1 file changed, 53 insertions(+), 49 deletions(-) diff --git a/api/migrations/20230911220312-addApplicationAgenciesModel.js b/api/migrations/20230911220312-addApplicationAgenciesModel.js index ccebabcb1..609fab420 100644 --- a/api/migrations/20230911220312-addApplicationAgenciesModel.js +++ b/api/migrations/20230911220312-addApplicationAgenciesModel.js @@ -16,58 +16,62 @@ exports.up = async function (db) { console.log('**** Adding ApplicationAgencies constants to nrpti collection ****'); // Connect to the database - mongoose.connect(db.connectionString, { useNewUrlParser: true, useUnifiedTopology: true }); - const dbConnection = mongoose.connection; - - dbConnection.on('error', console.error.bind(console, 'MongoDB connection error:')); - dbConnection.once('open', async function () { - const agencies = { - AGENCY_ALC: 'Agricultural Land Commission', - AGENCY_WF: 'BC Wildfire Service', - AGENCY_ENV_COS: 'Conservation Officer Service', - AGENCY_EAO: 'Environmental Assessment Office', - AGENCY_EMLI: 'Ministry of Energy Mines and Low Carbon Innovation', - AGENCY_ENV: 'Ministry of Environment and Climate Change Strategy', - AGENCY_ENV_BCPARKS: 'BC Parks', - AGENCY_OGC: 'BC Energy Regulator', - AGENCY_ENV_EPD: 'Ministry of Environment and Climate Change Strategy', - AGENCY_LNG: 'LNG Secretariat', - AGENCY_AGRI: 'Ministry of Agriculture and Food', - AGENCY_FLNRO: 'Ministry of Forests', - AGENCY_FLNR_NRO: 'Natural Resource Officers', - AGENCY_WLRS: 'Ministry of Water, Land and Resource Stewardship', - }; - - // Create and insert documents for each agency - const agencyInsertPromises = Object.entries(agencies).map(([code, name]) => - ApplicationAgency.create( - { - agencyCode: code, - agencyName: name, - read: ['sysadmin'], - write: ['sysadmin'], - } - ) - .catch(error => { - console.error(`Error inserting agency ${code}:`, error); - }) - ); + const mClient = await db.connection.connect(db.connectionString, { + native_parser: true, + }); - try { - await Promise.all(agencyInsertPromises); - console.log('Migration completed successfully'); - } catch (error) { - console.error('Migration failed:', error); - } finally { - mongoose.connection.close(() => { - mongoose.connection.close(); - console.log('Database connection closed'); - process.exit(0); - }); + const agencies = [ + { agencyCode: "AGENCY_ALC", agencyName: 'Agricultural Land Commission' }, + { agencyCode: "AGENCY_WF", agencyName: 'BC Wildfire Service' }, + { agencyCode: "AGENCY_ENV_COS", agencyName: 'Conservation Officer Service' }, + { agencyCode: "AGENCY_EAO", agencyName: 'Environmental Assessment Office' }, + { agencyCode: "AGENCY_EMLI", agencyName: 'Ministry of Energy Mines and Low Carbon Innovation' }, + { agencyCode: "AGENCY_ENV", agencyName: 'Ministry of Environment and Climate Change Strategy' }, + { agencyCode: "AGENCY_ENV_BCPARKS", agencyName: 'BC Parks' }, + { agencyCode: "AGENCY_OGC", agencyName: 'BC Energy Regulator' }, + { agencyCode: "AGENCY_ENV_EPD", agencyName: 'Ministry of Environment and Climate Change Strategy' }, + { agencyCode: "AGENCY_LNG", agencyName: 'LNG Secretariat' }, + { agencyCode: "AGENCY_AGRI", agencyName: 'Ministry of Agriculture and Food' }, + { agencyCode: "AGENCY_FLNRO", agencyName: 'Ministry of Forests' }, + { agencyCode: "AGENCY_FLNR_NRO", agencyName: 'Natural Resource Officers' }, + { agencyCode: "AGENCY_WLRS", agencyName: 'Ministry of Water, Land and Resource Stewardship' }, + ] + + try { + let currentCollection = await mClient.collection('nrpti'); + + for (const agency of agencies) { + const existingAgency = await currentCollection.findOne({ _schemaName: 'ApplicationAgency', agencyCode: agency['agencyCode'] }); - return null + if (!existingAgency) { + await currentCollection.insertOne( + { + _schemaName: 'ApplicationAgency', + agencyCode: agency['agencyCode'], + agencyName: agency['agencyName'], + read: ['sysadmin'], + write: ['sysadmin'], + dateAdded: new Date(), + dateUpdated: null, + addedBy: '', + updatedBy: '', + } + ); + console.log(` **** Add the ApplicationAgency code ${agency['agencyCode']} into nrpti collection ****`); + } else { + console.log(' **** ApplicationAgency code already exists in nrpti collection ****') + } } - }); + } catch (err) { + console.log(` **** Error updating nrpti collection for agency: ${agency['agencyName']} ****`, err); + } finally { + if (mClient) { + console.log(' **** Closing connection to nrpti collection ****') + await mClient.close(); + } + } + + return null; }; exports.down = function(db) { From 8cf29f91cfae76061fcaedfa3c7242ffcf95263d Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Tue, 12 Sep 2023 16:28:30 -0700 Subject: [PATCH 07/77] sample api added - list-agencies WIP --- api/src/controllers/agencies.js | 66 +++++++++++++++++++++++++++++++++ api/src/swagger/swagger.yaml | 14 ++++++- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 api/src/controllers/agencies.js diff --git a/api/src/controllers/agencies.js b/api/src/controllers/agencies.js new file mode 100644 index 000000000..be3ec5df1 --- /dev/null +++ b/api/src/controllers/agencies.js @@ -0,0 +1,66 @@ +const QueryActions = require('../utils/query-actions'); +const { metric: Metric } = require('../models/index'); + +exports.protectedOptions = function (args, res, next) { + res.status(200).send(); +}; + +exports.publicGetConfig = async function (args, res, next) { + // protected by swagger route by the scope +// const agg = [ +// { +// $match: { +// _schemaName: "Metric" +// } +// }, +// { +// $project: { +// code: 1 +// } +// } +// ]; + +// const metrics = await Metric.aggregate(agg); +let metrics = 'hello from publicGet' + + QueryActions.sendResponse(res, 200, metrics); +}; + +exports.protectedGet = async function (args, res, next) { +// if (!args.swagger.params.code) { +// return QueryActions.sendResponse(res, 400, {}); +// } + +// const query = { +// _schemaName: "Metric", +// code: args.swagger.params.code.value +// }; + +// const metric = await Metric.find(query); + + QueryActions.sendResponse(res, 200, 'hello from protectedGet'); +}; + +exports.protectedGetData = async function (args, res, next) { + const query = { + _schemaName: "Metric", + code: args.swagger.params.code.value + }; + + // Future: Set read/write roles on metric, guard against execution at this point. + const metric = await Metric.findOne(query); + + if (!metric.operation) { + return QueryActions.sendResponse(res, 400, {}); + } + + try { + const aggregateOperation = JSON.parse(metric.operation); + + const data = await Metric.aggregate(aggregateOperation); + + QueryActions.sendResponse(res, 200, data); + } catch (e) { + QueryActions.sendResponse(res, 400, e); + } +}; diff --git a/api/src/swagger/swagger.yaml b/api/src/swagger/swagger.yaml index e2a463954..868743adc 100644 --- a/api/src/swagger/swagger.yaml +++ b/api/src/swagger/swagger.yaml @@ -2053,4 +2053,16 @@ paths: '403': description: 'Access Denied' schema: - $ref: '#/definitions/Error' \ No newline at end of file + $ref: '#/definitions/Error' + /list-agencies: + get: + x-swagger-router-controller: agencies + tags: + - agencies-list + summary: 'list agencies' + operationId: publicGetConfig + responses: + '200': + description: "Success" + '403': + description: 'Access Denied' \ No newline at end of file From 5d55424798e695fc2b7cddf7dd17df592ee33672 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Wed, 13 Sep 2023 09:26:26 -0700 Subject: [PATCH 08/77] added api to list agencies, schema type --- .../update-issuing-agency.component.ts | 2 +- api/src/controllers/agencies.js | 75 +++++-------------- api/src/utils/constants/record-type-enum.js | 6 ++ 3 files changed, 25 insertions(+), 58 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts index 70508238a..dbd05e6c5 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import utils from 'esri/widgets/smartMapping/support/utils'; +//import utils from 'esri/widgets/smartMapping/support/utils'; import { ApplicationAgencyList } from '../../../../global/src/lib/utils/utils'; @Component({ selector: 'app-update-issuing-agency', diff --git a/api/src/controllers/agencies.js b/api/src/controllers/agencies.js index be3ec5df1..43952a7a8 100644 --- a/api/src/controllers/agencies.js +++ b/api/src/controllers/agencies.js @@ -1,66 +1,27 @@ const QueryActions = require('../utils/query-actions'); -const { metric: Metric } = require('../models/index'); - -exports.protectedOptions = function (args, res, next) { - res.status(200).send(); -}; +const mongodb = require('../utils/mongodb'); +const RECORD_TYPE = require('../utils/constants/record-type-enum'); exports.publicGetConfig = async function (args, res, next) { - // protected by swagger route by the scope -// const agg = [ -// { -// $match: { -// _schemaName: "Metric" -// } -// }, -// { -// $project: { -// code: 1 -// } -// } -// ]; - -// const metrics = await Metric.aggregate(agg); -let metrics = 'hello from publicGet' - - QueryActions.sendResponse(res, 200, metrics); -}; - -exports.protectedGet = async function (args, res, next) { -// if (!args.swagger.params.code) { -// return QueryActions.sendResponse(res, 400, {}); -// } -// const query = { -// _schemaName: "Metric", -// code: args.swagger.params.code.value -// }; +const db = mongodb.connection.db(process.env.MONGODB_DATABASE || 'nrpti-dev'); +const collectionDB = db.collection('nrpti'); -// const metric = await Metric.find(query); - - QueryActions.sendResponse(res, 200, 'hello from protectedGet'); -}; - -exports.protectedGetData = async function (args, res, next) { - const query = { - _schemaName: "Metric", - code: args.swagger.params.code.value - }; - - // Future: Set read/write roles on metric, guard against execution at this point. - const metric = await Metric.findOne(query); - - if (!metric.operation) { - return QueryActions.sendResponse(res, 400, {}); - } + let agencyList; try { - const aggregateOperation = JSON.parse(metric.operation); - - const data = await Metric.aggregate(aggregateOperation); - - QueryActions.sendResponse(res, 200, data); - } catch (e) { - QueryActions.sendResponse(res, 400, e); + //Obtain documents with Application Agency Schema + let agencyDocuments = await collectionDB.find({_schemaName: RECORD_TYPE.ApplicationAgency._schemaName}).toArray(); + //Using map function to iterate through the original array and creates a new array with objects containing only the _id, agencyCode, and agencyName properties. + agencyList = agencyDocuments.map(item => ({ + _id: item._id, + agencyCode: item.agencyCode, + agencyName: item.agencyName + })); + } catch (error) { + console.log(error) + throw error; } + + QueryActions.sendResponse(res, 200, agencyList); }; diff --git a/api/src/utils/constants/record-type-enum.js b/api/src/utils/constants/record-type-enum.js index 58b976107..f1a4629bb 100644 --- a/api/src/utils/constants/record-type-enum.js +++ b/api/src/utils/constants/record-type-enum.js @@ -142,6 +142,12 @@ const RECORD_TYPE = Object.freeze({ displayName: 'Warning', recordControllerName: 'warnings', flavours: { lng: { _schemaName: 'WarningLNG' }, nrced: { _schemaName: 'WarningNRCED' } } + }, + ApplicationAgency: { + _schemaName: 'ApplicationAgency', + displayName: 'ApplicationAgency', + recordControllerName: 'agencies', + flavours: {} } }); module.exports = RECORD_TYPE; From 23044bbcf46ae482261cc7f63a8b9e74ed2b2866 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Wed, 13 Sep 2023 10:22:15 -0700 Subject: [PATCH 09/77] added get api --- api/src/controllers/agencies.js | 57 ++++++++++++++++++++++++++++++++- api/src/swagger/swagger.yaml | 2 +- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/api/src/controllers/agencies.js b/api/src/controllers/agencies.js index 43952a7a8..47c3eaa5e 100644 --- a/api/src/controllers/agencies.js +++ b/api/src/controllers/agencies.js @@ -2,7 +2,7 @@ const QueryActions = require('../utils/query-actions'); const mongodb = require('../utils/mongodb'); const RECORD_TYPE = require('../utils/constants/record-type-enum'); -exports.publicGetConfig = async function (args, res, next) { +exports.publicGet = async function (args, res, next) { const db = mongodb.connection.db(process.env.MONGODB_DATABASE || 'nrpti-dev'); const collectionDB = db.collection('nrpti'); @@ -18,6 +18,7 @@ const collectionDB = db.collection('nrpti'); agencyCode: item.agencyCode, agencyName: item.agencyName })); + console.log('hello from publicGet') } catch (error) { console.log(error) throw error; @@ -25,3 +26,57 @@ const collectionDB = db.collection('nrpti'); QueryActions.sendResponse(res, 200, agencyList); }; + +// exports.protectedPost = async function (args, res, next) { +// // Confirm user has correct role for this type of record. +// // if (!userHasValidRoles([utils.ApplicationRoles.ADMIN, utils.ApplicationRoles.ADMIN_BCMI], args.swagger.params.auth_payload.client_roles)) { +// // throw new Error('Missing valid user role.'); +// // } + +// // let incomingObj = {}; +// // if (args.swagger.params.collection && args.swagger.params.collection.value) { +// // incomingObj = args.swagger.params.collection.value +// // } else { +// // defaultLog.info(`protectedPost - you must provide an id to post`); +// // queryActions.sendResponse(res, 400, {}); +// // next(); +// // } + +// // let obj = null; +// // try { +// // // Need to determine the published state of the mine and make the new collection match. +// // const minePublished = await isMinePublished(incomingObj); +// // if (minePublished) { +// // incomingObj.addRole = 'public'; +// // } + +// // obj = await createCollection(incomingObj, args.swagger.params.auth_payload.displayName); +// // } catch (error) { +// // defaultLog.info(`protectedPost - error inserting collection: ${incomingObj}`); +// // defaultLog.debug(error); +// // return queryActions.sendResponse(res, 400, {}); +// // } +// let promises = []; +// const collectionDB = db.collection('nrpti'); +// promises.push(collectionDB.findOneAndUpdate( +// { agencyCode: args.agencyCode }, +// { +// $set: { +// agencyName: args.agencyName +// }, +// $pull: { read: 'public' } +// } +// )); + + +// try { +// await Promise.all(promises); +// } catch (error) { +// defaultLog.info(`protectedPut - collection controller - error updating records with: ${collectionId}`); +// defaultLog.debug(error); +// throw error; +// } + +// queryActions.sendResponse(res, 200, obj.ops[0]); +// next(); +// } \ No newline at end of file diff --git a/api/src/swagger/swagger.yaml b/api/src/swagger/swagger.yaml index 868743adc..2a71f30cc 100644 --- a/api/src/swagger/swagger.yaml +++ b/api/src/swagger/swagger.yaml @@ -2060,7 +2060,7 @@ paths: tags: - agencies-list summary: 'list agencies' - operationId: publicGetConfig + operationId: publicGet responses: '200': description: "Success" From 8fe57851f02d2b61854a9ef0ae6832446a504c41 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Wed, 13 Sep 2023 14:02:21 -0700 Subject: [PATCH 10/77] put api added for updating agencies --- api/src/controllers/agencies.js | 121 +++++++++++++++----------------- api/src/swagger/swagger.yaml | 28 ++++++++ 2 files changed, 85 insertions(+), 64 deletions(-) diff --git a/api/src/controllers/agencies.js b/api/src/controllers/agencies.js index 47c3eaa5e..8d867efc9 100644 --- a/api/src/controllers/agencies.js +++ b/api/src/controllers/agencies.js @@ -1,82 +1,75 @@ -const QueryActions = require('../utils/query-actions'); +const queryActions = require('../utils/query-actions'); const mongodb = require('../utils/mongodb'); const RECORD_TYPE = require('../utils/constants/record-type-enum'); +const defaultLog = require('../utils/logger')('record'); -exports.publicGet = async function (args, res, next) { - -const db = mongodb.connection.db(process.env.MONGODB_DATABASE || 'nrpti-dev'); -const collectionDB = db.collection('nrpti'); +exports.publicGet = async function(args, res, next) { + const db = mongodb.connection.db(process.env.MONGODB_DATABASE || 'nrpti-dev'); + const collectionDB = db.collection('nrpti'); let agencyList; try { //Obtain documents with Application Agency Schema - let agencyDocuments = await collectionDB.find({_schemaName: RECORD_TYPE.ApplicationAgency._schemaName}).toArray(); - //Using map function to iterate through the original array and creates a new array with objects containing only the _id, agencyCode, and agencyName properties. - agencyList = agencyDocuments.map(item => ({ + let agencyDocuments = await collectionDB.find({ _schemaName: RECORD_TYPE.ApplicationAgency._schemaName }).toArray(); + //Using map function to iterate through the original array and creates a new array with objects containing only the _id, agencyCode, and agencyName properties. + agencyList = agencyDocuments.map(item => ({ _id: item._id, agencyCode: item.agencyCode, agencyName: item.agencyName })); - console.log('hello from publicGet') } catch (error) { - console.log(error) + defaultLog.log(error); throw error; } - QueryActions.sendResponse(res, 200, agencyList); + queryActions.sendResponse(res, 200, agencyList); }; +/** +* @param {*} args +* @param {*} res +* @param {*} next +* @param {*} incomingObj see example +* @returns edited lng order record +* Example of args.swagger.params.data.value + { + "agencies": + [ + { + "agencyCode": "AGENCY_ALC", + "agencyName": "Agricultural Land Commission_1" + } + ] + } +*/ -// exports.protectedPost = async function (args, res, next) { -// // Confirm user has correct role for this type of record. -// // if (!userHasValidRoles([utils.ApplicationRoles.ADMIN, utils.ApplicationRoles.ADMIN_BCMI], args.swagger.params.auth_payload.client_roles)) { -// // throw new Error('Missing valid user role.'); -// // } - -// // let incomingObj = {}; -// // if (args.swagger.params.collection && args.swagger.params.collection.value) { -// // incomingObj = args.swagger.params.collection.value -// // } else { -// // defaultLog.info(`protectedPost - you must provide an id to post`); -// // queryActions.sendResponse(res, 400, {}); -// // next(); -// // } - -// // let obj = null; -// // try { -// // // Need to determine the published state of the mine and make the new collection match. -// // const minePublished = await isMinePublished(incomingObj); -// // if (minePublished) { -// // incomingObj.addRole = 'public'; -// // } - -// // obj = await createCollection(incomingObj, args.swagger.params.auth_payload.displayName); -// // } catch (error) { -// // defaultLog.info(`protectedPost - error inserting collection: ${incomingObj}`); -// // defaultLog.debug(error); -// // return queryActions.sendResponse(res, 400, {}); -// // } -// let promises = []; -// const collectionDB = db.collection('nrpti'); -// promises.push(collectionDB.findOneAndUpdate( -// { agencyCode: args.agencyCode }, -// { -// $set: { -// agencyName: args.agencyName -// }, -// $pull: { read: 'public' } -// } -// )); - - -// try { -// await Promise.all(promises); -// } catch (error) { -// defaultLog.info(`protectedPut - collection controller - error updating records with: ${collectionId}`); -// defaultLog.debug(error); -// throw error; -// } - -// queryActions.sendResponse(res, 200, obj.ops[0]); -// next(); -// } \ No newline at end of file +exports.protectedPut = async function(args, res, next) { + const db = mongodb.connection.db(process.env.MONGODB_DATABASE || 'nrpti-dev'); + let promises = []; + let result = null; + let incomingObj = args.swagger.params.data.value; + const collectionDB = db.collection('nrpti'); + for (let agency of incomingObj['agencies']) { + promises.push( + collectionDB.findOneAndUpdate( + { agencyCode: agency['agencyCode'] }, + { + $set: { + agencyName: agency['agencyName'] + } + } + ) + ); + } + try { + await Promise.all(promises); + result = 'Success'; + } catch (error) { + defaultLog.info(`protectedPut - agencies controller - error updating record: ${incomingObj}`); + defaultLog.debug(error); + result = 'Error'; + return queryActions.sendResponse(res, 400, {}); + } + queryActions.sendResponse(res, 200, result); + next(); +}; diff --git a/api/src/swagger/swagger.yaml b/api/src/swagger/swagger.yaml index 2a71f30cc..46f0441bf 100644 --- a/api/src/swagger/swagger.yaml +++ b/api/src/swagger/swagger.yaml @@ -238,6 +238,9 @@ definitions: message: type: string + UpdateAgencyObject: + type: object + paths: /config: x-swagger-router-controller: config @@ -2061,6 +2064,31 @@ paths: - agencies-list summary: 'list agencies' operationId: publicGet + responses: + '200': + description: "Success" + '403': + description: 'Access Denied' + /update-agencies: + put: + x-swagger-router-controller: agencies + tags: + - agencies-update + summary: 'update agencies' + # security: + # - Bearer: [] + # x-security-scopes: + # - sysadmin + # - admin:lng + # - admin:wlrs + operationId: protectedPut + parameters: + - in: body + name: data + description: 'Agency info to be updated' + required: true + schema: + $ref: '#/definitions/UpdateAgencyObject' responses: '200': description: "Success" From 8711ada2545ec0de464c460b3c9124e3738cf117 Mon Sep 17 00:00:00 2001 From: Christopher-walsh22 <106549296+Christopher-walsh22@users.noreply.github.com> Date: Thu, 14 Sep 2023 09:04:53 -0700 Subject: [PATCH 11/77] New component to make request to new endpoint for issuing agencies --- .../src/app/services/issuingagency.service.ts | 19 ++++++++ .../update-issuing-agency.component.html | 9 +++- .../update-issuing-agency.component.ts | 43 ++++++++++++++----- 3 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts diff --git a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts new file mode 100644 index 000000000..298bbcd4a --- /dev/null +++ b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; + +import { ApiService } from './api.service'; + +@Injectable({ providedIn: 'root' }) +export class IssuingAgencyService { + constructor(public apiService: ApiService, public http: HttpClient) { } + + public getIssuingAgencies(): Promise { + + return this.http.get(`${this.apiService.pathAPI}/list-agencies`) + .toPromise() + .catch((error) => { + console.error('API call error:', error); + throw error; // Rethrow the error to propagate it further + }); + } +} diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html index 864439593..c21a78817 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html @@ -5,7 +5,7 @@

Update Issuing Agency


@@ -22,4 +22,11 @@

Update Issuing Agency

Selected Agency: {{ agencies[selectedAgency] }}

+ +
+

Agencies

+

+ {{ key }}: {{ agencies[key] }} +

+
diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts index dbd05e6c5..722664ccf 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts @@ -1,6 +1,8 @@ import { Component, OnInit } from '@angular/core'; -//import utils from 'esri/widgets/smartMapping/support/utils'; -import { ApplicationAgencyList } from '../../../../global/src/lib/utils/utils'; +import { IssuingAgencyService } from '../services/issuingagency.service'; +import { LoggerService } from 'nrpti-angular-components'; +import { Observable, of } from 'rxjs'; + @Component({ selector: 'app-update-issuing-agency', templateUrl: './update-issuing-agency.component.html', @@ -8,11 +10,15 @@ import { ApplicationAgencyList } from '../../../../global/src/lib/utils/utils'; }) export class UpdateIssuingAgencyComponent implements OnInit { public loading = false; - selectedAgency = 'Select an Agency'; // Set the initial selected value + selectedAgency: string = ''; // Initialize the selectedAgency choiceMade = false; - newAgency = ''; // Initialize the new agency input field + newAgency: string = ''; // Initialize the new agency input field + agencies$: Observable<{ [key: string]: string }> = of({"Kyle": "Williams"}); // Initialize agencies as an Observable - agencies: {} = ApplicationAgencyList; + constructor( + private issuingAgencyService: IssuingAgencyService, + private logger: LoggerService + ) {} onSelected(value: string): void { this.selectedAgency = value; @@ -22,14 +28,31 @@ export class UpdateIssuingAgencyComponent implements OnInit { updateSelectedAgency(): void { if (this.newAgency.trim() !== '') { // Only update the selected agency if the new agency input is not empty - this.agencies[this.selectedAgency] = this.newAgency; - this.selectedAgency = this.newAgency; // Update the selected value - this.newAgency = ''; // Clear the input field - this.choiceMade = true; + this.agencies$.subscribe(agencies => { + agencies[this.selectedAgency] = this.newAgency; + this.selectedAgency = this.newAgency; // Update the selected value + this.newAgency = ''; // Clear the input field + this.choiceMade = true; + }); } } ngOnInit(): void { - console.log('UpdateIssuingAgencyComponent.ngOnInit()'); + this.issuingAgencyService.getIssuingAgencies() + .then(response => { + const agencies = {}; + if (response && Array.isArray(response)) { + response.forEach(agency => { + agencies[agency._id] = agency.agencyName; + }); + } + this.agencies$ = of(agencies); // Assign the agencies object as an Observable + console.log("IS IT IN THE CONSOLE?") + alert(JSON.stringify(this.agencies$)) + }) + .catch(error => { + console.error('API call error:', error); + }); + this.logger.level = 0; } } From de0f22c6033f97330e1977410e2520f00292ca31 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Thu, 14 Sep 2023 09:38:04 -0700 Subject: [PATCH 12/77] Options added --- api/src/swagger/swagger.yaml | 37 ++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/api/src/swagger/swagger.yaml b/api/src/swagger/swagger.yaml index 46f0441bf..8707c3abf 100644 --- a/api/src/swagger/swagger.yaml +++ b/api/src/swagger/swagger.yaml @@ -2058,8 +2058,18 @@ paths: schema: $ref: '#/definitions/Error' /list-agencies: + x-swagger-router-controller: agencies + options: + tags: + - agencies-list + summary: 'list agencies' + operationId: publicGet + responses: + '200': + description: "Success" + '403': + description: 'Access Denied' get: - x-swagger-router-controller: agencies tags: - agencies-list summary: 'list agencies' @@ -2070,8 +2080,31 @@ paths: '403': description: 'Access Denied' /update-agencies: + x-swagger-router-controller: agencies + options: + tags: + - agencies-update + summary: 'update agencies' + # security: + # - Bearer: [] + # x-security-scopes: + # - sysadmin + # - admin:lng + # - admin:wlrs + operationId: protectedPut + parameters: + - in: body + name: data + description: 'Agency info to be updated' + required: true + schema: + $ref: '#/definitions/UpdateAgencyObject' + responses: + '200': + description: "Success" + '403': + description: 'Access Denied' put: - x-swagger-router-controller: agencies tags: - agencies-update summary: 'update agencies' From 1b8b7b0246c06f12bf08254ebbba80d90f519fb6 Mon Sep 17 00:00:00 2001 From: Christopher-walsh22 <106549296+Christopher-walsh22@users.noreply.github.com> Date: Thu, 14 Sep 2023 09:58:24 -0700 Subject: [PATCH 13/77] Fixed component to properly display the information returned from get request --- .../update-issuing-agency.component.html | 15 ++++------- .../update-issuing-agency.component.ts | 25 +++++++++++++------ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html index c21a78817..bb87f599a 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html @@ -4,8 +4,8 @@

Update Issuing Agency


- +
@@ -20,13 +20,8 @@

Update Issuing Agency

-

Selected Agency: {{ agencies[selectedAgency] }}

-
- -
-

Agencies

-

- {{ key }}: {{ agencies[key] }} -

+

Selected Agency: {{ selectedAgency }}

+ + diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts index 722664ccf..d2756efe4 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts @@ -13,7 +13,8 @@ export class UpdateIssuingAgencyComponent implements OnInit { selectedAgency: string = ''; // Initialize the selectedAgency choiceMade = false; newAgency: string = ''; // Initialize the new agency input field - agencies$: Observable<{ [key: string]: string }> = of({"Kyle": "Williams"}); // Initialize agencies as an Observable + agencies: { [key: string]: string } = {"Kyle": "Williams"}; + agencyList = [] constructor( private issuingAgencyService: IssuingAgencyService, @@ -27,15 +28,15 @@ export class UpdateIssuingAgencyComponent implements OnInit { updateSelectedAgency(): void { if (this.newAgency.trim() !== '') { - // Only update the selected agency if the new agency input is not empty - this.agencies$.subscribe(agencies => { - agencies[this.selectedAgency] = this.newAgency; + + this.agencies[this.selectedAgency] = this.newAgency; this.selectedAgency = this.newAgency; // Update the selected value this.newAgency = ''; // Clear the input field this.choiceMade = true; - }); + }; + alert(this.agencies) } - } + ngOnInit(): void { this.issuingAgencyService.getIssuingAgencies() @@ -46,9 +47,17 @@ export class UpdateIssuingAgencyComponent implements OnInit { agencies[agency._id] = agency.agencyName; }); } - this.agencies$ = of(agencies); // Assign the agencies object as an Observable + this.agencies = agencies; // Assign the agencies object as an Observable console.log("IS IT IN THE CONSOLE?") - alert(JSON.stringify(this.agencies$)) + alert(JSON.stringify(this.agencies)) + + for (const key in agencies) { + if (agencies.hasOwnProperty(key)) { + this.agencyList.push(agencies[key]); + } + } + alert(this.agencyList) + }) .catch(error => { console.error('API call error:', error); From 30be5315687ae5ef177c708c080fafb214c47e76 Mon Sep 17 00:00:00 2001 From: Christopher-walsh22 <106549296+Christopher-walsh22@users.noreply.github.com> Date: Thu, 14 Sep 2023 12:19:08 -0700 Subject: [PATCH 14/77] Update the agencyList array with selection from drop down menu. Create the object which will be sent to the api for updating the agencyList. Also worth noting the alerts are being used here for console debugging. My local settings are preventing logging, when I find the reason I will update readme to document process --- .../update-issuing-agency.component.html | 2 +- .../update-issuing-agency.component.ts | 44 ++++++++++++++----- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html index bb87f599a..7aaeaf0d4 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html @@ -18,7 +18,7 @@

Update Issuing Agency

- +

Selected Agency: {{ selectedAgency }}

diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts index d2756efe4..2b05dd513 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts @@ -14,8 +14,10 @@ export class UpdateIssuingAgencyComponent implements OnInit { choiceMade = false; newAgency: string = ''; // Initialize the new agency input field agencies: { [key: string]: string } = {"Kyle": "Williams"}; - agencyList = [] - + agencyList: string[] = ["-Select-"]; // Use a string array for agencyList + updatedData: any = { + "agencies": [] + }; constructor( private issuingAgencyService: IssuingAgencyService, private logger: LoggerService @@ -28,15 +30,34 @@ export class UpdateIssuingAgencyComponent implements OnInit { updateSelectedAgency(): void { if (this.newAgency.trim() !== '') { + // Find the agency code that matches the selected agency name + const matchingCode = Object.keys(this.agencies).find( + key => this.agencies[key] === this.selectedAgency + ); + + if (matchingCode) { + // Update the agencyList with the new value at the same index + const index = this.agencyList.indexOf(this.selectedAgency); + if (index !== -1) { + this.agencyList[index] = this.newAgency; + } + + // Update the selectedAgency with the new value + this.selectedAgency = this.newAgency; - this.agencies[this.selectedAgency] = this.newAgency; - this.selectedAgency = this.newAgency; // Update the selected value - this.newAgency = ''; // Clear the input field + // Clear the input field + this.newAgency = ''; this.choiceMade = true; - }; - alert(this.agencies) - } + // Update the updatedData object to match the desired layout + this.updatedData.agencies.push({ + "agencyCode": matchingCode, + "agencyName": this.selectedAgency + }); + } + } + alert(JSON.stringify(this.updatedData)) + } ngOnInit(): void { this.issuingAgencyService.getIssuingAgencies() @@ -44,19 +65,18 @@ export class UpdateIssuingAgencyComponent implements OnInit { const agencies = {}; if (response && Array.isArray(response)) { response.forEach(agency => { - agencies[agency._id] = agency.agencyName; + agencies[agency.agencyCode] = agency.agencyName; }); } this.agencies = agencies; // Assign the agencies object as an Observable - console.log("IS IT IN THE CONSOLE?") - alert(JSON.stringify(this.agencies)) + alert(JSON.stringify(this.agencies)); for (const key in agencies) { if (agencies.hasOwnProperty(key)) { this.agencyList.push(agencies[key]); } } - alert(this.agencyList) + alert(this.agencyList); }) .catch(error => { From 8e41013503ffed1841f64814121a4feda1a80073 Mon Sep 17 00:00:00 2001 From: Christopher-walsh22 <106549296+Christopher-walsh22@users.noreply.github.com> Date: Thu, 14 Sep 2023 14:36:06 -0700 Subject: [PATCH 15/77] First steps of patch logic to the update agency service --- .../src/app/services/issuingagency.service.ts | 13 +++++++++++++ .../update-issuing-agency.component.ts | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts index 298bbcd4a..892610b38 100644 --- a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts @@ -16,4 +16,17 @@ export class IssuingAgencyService { throw error; // Rethrow the error to propagate it further }); } + + public updateAgency(agencyCode: string, agencyName: any): Promise { + const apiUrl = `${this.apiService.pathAPI}/update-agencies`; + let updatedAgency = { "agencies": [{"agencyCode": agencyCode, "agencyName": agencyName}]} + console.log(updatedAgency) + alert(updatedAgency) + return this.http.put(apiUrl, updatedAgency) + .toPromise() + .catch((error) => { + console.error('API call error:', error); + throw error; // Rethrow the error to propagate it further + }); +} } diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts index 2b05dd513..8dcf921cc 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts @@ -27,7 +27,9 @@ export class UpdateIssuingAgencyComponent implements OnInit { this.selectedAgency = value; this.choiceMade = true; } - + putRecords(agencyCode: any, agencyName: any){ + this.issuingAgencyService.updateAgency(agencyCode, agencyName) + } updateSelectedAgency(): void { if (this.newAgency.trim() !== '') { // Find the agency code that matches the selected agency name @@ -54,9 +56,11 @@ export class UpdateIssuingAgencyComponent implements OnInit { "agencyCode": matchingCode, "agencyName": this.selectedAgency }); + this.putRecords(this.updatedData.agencies["agencyCode"], this.updatedData.agencies["agencyName"]) + alert(JSON.stringify(this.updatedData)) + this.updatedData.agencies = [] } } - alert(JSON.stringify(this.updatedData)) } ngOnInit(): void { From 58a0f7d091a999a7642086db8bb9c8a3363b1bde Mon Sep 17 00:00:00 2001 From: Christopher-walsh22 <106549296+Christopher-walsh22@users.noreply.github.com> Date: Thu, 14 Sep 2023 16:36:32 -0700 Subject: [PATCH 16/77] Front end component updates entries in for agency issuers through new endpoint. --- .../src/app/services/issuingagency.service.ts | 9 +++--- .../update-issuing-agency.component.ts | 11 +------ api/src/controllers/agencies.js | 32 ++++++++++++------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts index 892610b38..ee77310de 100644 --- a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts @@ -19,14 +19,15 @@ export class IssuingAgencyService { public updateAgency(agencyCode: string, agencyName: any): Promise { const apiUrl = `${this.apiService.pathAPI}/update-agencies`; - let updatedAgency = { "agencies": [{"agencyCode": agencyCode, "agencyName": agencyName}]} - console.log(updatedAgency) - alert(updatedAgency) + let updatedAgency = { "agencies": [{"agencyCode": agencyCode, "agencyName": agencyName}]}; // Wrap the array in an object + console.log(JSON.stringify(updatedAgency)); + alert(updatedAgency); return this.http.put(apiUrl, updatedAgency) .toPromise() .catch((error) => { console.error('API call error:', error); throw error; // Rethrow the error to propagate it further }); + } } -} + diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts index 8dcf921cc..171fd0d0e 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts @@ -36,28 +36,23 @@ export class UpdateIssuingAgencyComponent implements OnInit { const matchingCode = Object.keys(this.agencies).find( key => this.agencies[key] === this.selectedAgency ); - if (matchingCode) { // Update the agencyList with the new value at the same index const index = this.agencyList.indexOf(this.selectedAgency); if (index !== -1) { this.agencyList[index] = this.newAgency; } - // Update the selectedAgency with the new value this.selectedAgency = this.newAgency; - // Clear the input field this.newAgency = ''; this.choiceMade = true; - // Update the updatedData object to match the desired layout this.updatedData.agencies.push({ "agencyCode": matchingCode, "agencyName": this.selectedAgency }); - this.putRecords(this.updatedData.agencies["agencyCode"], this.updatedData.agencies["agencyName"]) - alert(JSON.stringify(this.updatedData)) + this.putRecords(matchingCode, this.selectedAgency); this.updatedData.agencies = [] } } @@ -73,15 +68,11 @@ export class UpdateIssuingAgencyComponent implements OnInit { }); } this.agencies = agencies; // Assign the agencies object as an Observable - alert(JSON.stringify(this.agencies)); - for (const key in agencies) { if (agencies.hasOwnProperty(key)) { this.agencyList.push(agencies[key]); } } - alert(this.agencyList); - }) .catch(error => { console.error('API call error:', error); diff --git a/api/src/controllers/agencies.js b/api/src/controllers/agencies.js index 8d867efc9..4159d36f1 100644 --- a/api/src/controllers/agencies.js +++ b/api/src/controllers/agencies.js @@ -44,23 +44,31 @@ exports.publicGet = async function(args, res, next) { */ exports.protectedPut = async function(args, res, next) { + const db = mongodb.connection.db(process.env.MONGODB_DATABASE || 'nrpti-dev'); let promises = []; let result = null; let incomingObj = args.swagger.params.data.value; - const collectionDB = db.collection('nrpti'); - for (let agency of incomingObj['agencies']) { - promises.push( - collectionDB.findOneAndUpdate( - { agencyCode: agency['agencyCode'] }, - { - $set: { - agencyName: agency['agencyName'] - } + console.log("iiiiiiiiiiiiiiiiiiiii ---->" + JSON.stringify(incomingObj)) + + const agencies = incomingObj['agencies']; + if (agencies && agencies.length > 0) { + const agencyCode = agencies[0]['agencyCode']; + const agencyName = agencies[0]['agencyName']; + + + const collectionDB = db.collection('nrpti'); + + promises.push( + collectionDB.findOneAndUpdate( + { agencyCode: agencyCode }, + { + $set: { + agencyName: agencyName } - ) - ); - } + } + ) + );} try { await Promise.all(promises); result = 'Success'; From 70c61224e0d84763be651d03ab818691e0cda3ee Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 15 Sep 2023 08:51:21 -0700 Subject: [PATCH 17/77] security token enabled, alerts removed, compile issue fixed --- .../src/app/services/issuingagency.service.ts | 1 - .../update-issuing-agency.component.ts | 2 +- api/src/swagger/swagger.yaml | 18 ++++++------------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts index ee77310de..b24e05ee8 100644 --- a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts @@ -21,7 +21,6 @@ export class IssuingAgencyService { const apiUrl = `${this.apiService.pathAPI}/update-agencies`; let updatedAgency = { "agencies": [{"agencyCode": agencyCode, "agencyName": agencyName}]}; // Wrap the array in an object console.log(JSON.stringify(updatedAgency)); - alert(updatedAgency); return this.http.put(apiUrl, updatedAgency) .toPromise() .catch((error) => { diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts index 171fd0d0e..4a1d101a4 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { IssuingAgencyService } from '../services/issuingagency.service'; import { LoggerService } from 'nrpti-angular-components'; -import { Observable, of } from 'rxjs'; +// import { Observable, of } from 'rxjs'; @Component({ selector: 'app-update-issuing-agency', diff --git a/api/src/swagger/swagger.yaml b/api/src/swagger/swagger.yaml index 8707c3abf..865bdb07d 100644 --- a/api/src/swagger/swagger.yaml +++ b/api/src/swagger/swagger.yaml @@ -2085,12 +2085,6 @@ paths: tags: - agencies-update summary: 'update agencies' - # security: - # - Bearer: [] - # x-security-scopes: - # - sysadmin - # - admin:lng - # - admin:wlrs operationId: protectedPut parameters: - in: body @@ -2108,12 +2102,12 @@ paths: tags: - agencies-update summary: 'update agencies' - # security: - # - Bearer: [] - # x-security-scopes: - # - sysadmin - # - admin:lng - # - admin:wlrs + security: + - Bearer: [] + x-security-scopes: + - sysadmin + - admin:lng + - admin:wlrs operationId: protectedPut parameters: - in: body From c118d7fc222b28fdfa809131b104ce2fb2940342 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 15 Sep 2023 09:52:57 -0700 Subject: [PATCH 18/77] toast added --- .../update-issuing-agency.component.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts index 4a1d101a4..1ac5a20f6 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts @@ -1,6 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { IssuingAgencyService } from '../services/issuingagency.service'; import { LoggerService } from 'nrpti-angular-components'; +import { Constants } from '../utils/constants/misc'; +import { ToastService } from '../services/toast.service'; // import { Observable, of } from 'rxjs'; @Component({ @@ -20,7 +22,8 @@ export class UpdateIssuingAgencyComponent implements OnInit { }; constructor( private issuingAgencyService: IssuingAgencyService, - private logger: LoggerService + private logger: LoggerService, + private toastService: ToastService ) {} onSelected(value: string): void { @@ -31,6 +34,7 @@ export class UpdateIssuingAgencyComponent implements OnInit { this.issuingAgencyService.updateAgency(agencyCode, agencyName) } updateSelectedAgency(): void { + try{ if (this.newAgency.trim() !== '') { // Find the agency code that matches the selected agency name const matchingCode = Object.keys(this.agencies).find( @@ -55,8 +59,17 @@ export class UpdateIssuingAgencyComponent implements OnInit { this.putRecords(matchingCode, this.selectedAgency); this.updatedData.agencies = [] } + this.toastService.addMessage('Agency Successfully Updated', 'Success Updated', Constants.ToastTypes.SUCCESS); } } +catch (error) { + this.toastService.addMessage( + 'An error has occured while saving', + 'Save unsuccessful', + Constants.ToastTypes.ERROR + ); +} + } ngOnInit(): void { this.issuingAgencyService.getIssuingAgencies() From 5688d7264d94d4c6db30caea86412df499482ee5 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 15 Sep 2023 09:55:51 -0700 Subject: [PATCH 19/77] button style updated --- .../update-issuing-agency/update-issuing-agency.component.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html index 7aaeaf0d4..6ff80c8f2 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html @@ -16,7 +16,8 @@

Update Issuing Agency

- + +
From edca104c720902854c11302493f0605ee78f3543 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 15 Sep 2023 10:27:56 -0700 Subject: [PATCH 20/77] Style added to dropdown --- .../update-issuing-agency.component.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html index 6ff80c8f2..211b51234 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html @@ -4,9 +4,14 @@

Update Issuing Agency


- +
From 8c5876676162cc672e230770bf4766756bef67dc Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 15 Sep 2023 10:29:23 -0700 Subject: [PATCH 21/77] current selected agency removed --- .../update-issuing-agency.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html index 211b51234..6b242a720 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html @@ -25,9 +25,9 @@

Update Issuing Agency

-
+
From d6982c3a9d1e5eb34f8e9a0e07c387d820a28b56 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Fri, 15 Sep 2023 11:52:07 -0700 Subject: [PATCH 22/77] wip - add agency service to app_init, change displayName --- .../admin-nrpti/src/app/app.module.ts | 11 ++-- .../inspection-add-edit.component.ts | 4 +- .../app/services/applicationAgency.service.ts | 55 +++++++++++++++++++ .../src/app/services/factory.service.ts | 17 ++++++ .../projects/global/src/lib/utils/utils.ts | 16 ++---- 5 files changed, 85 insertions(+), 18 deletions(-) create mode 100644 angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts diff --git a/angular/projects/admin-nrpti/src/app/app.module.ts b/angular/projects/admin-nrpti/src/app/app.module.ts index d4c6ec1f0..659ac1ee5 100644 --- a/angular/projects/admin-nrpti/src/app/app.module.ts +++ b/angular/projects/admin-nrpti/src/app/app.module.ts @@ -44,6 +44,7 @@ import { RecordService } from './services/record.service'; import { TaskService } from './services/task.service'; import { ConfigService, LoggerService } from 'nrpti-angular-components'; import { NewsService } from './services/news.service'; +import { ApplicationAgencyService } from './services/applicationAgency.service'; // resolvers import { ImportListResolver } from './import/import-list-resolver'; @@ -60,12 +61,13 @@ import { RecordUtils } from './records/utils/record-utils'; import { CollectionService } from './services/collection.service'; -export function initConfig(configService: ConfigService, keycloakService: KeycloakService) { +export function initConfig(configService: ConfigService, keycloakService: KeycloakService, applicationAgency: ApplicationAgencyService) { return async () => { await configService.init(); await keycloakService.init(); - }; -} + await applicationAgency.init(); + } +}; export function overlayScrollFactory(overlay: Overlay): () => CloseScrollStrategy { return () => overlay.scrollStrategies.close(); @@ -110,7 +112,7 @@ export function overlayScrollFactory(overlay: Overlay): () => CloseScrollStrateg { provide: APP_INITIALIZER, useFactory: initConfig, - deps: [ConfigService, KeycloakService], + deps: [ConfigService, KeycloakService, ApplicationAgencyService], multi: true }, { @@ -131,6 +133,7 @@ export function overlayScrollFactory(overlay: Overlay): () => CloseScrollStrateg NewsService, CollectionService, KeycloakService, + ApplicationAgencyService, LoggerService, TaskService, ImportListResolver, diff --git a/angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts index 4b6a46a62..adb64a0c3 100644 --- a/angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts @@ -514,8 +514,8 @@ export class InspectionAddEditComponent implements OnInit, OnDestroy { return Utils.convertAcronyms(acronym); } - displayName(agency) { - return Utils.displayNameFull(agency); + displayName(agencyCode) { + return Utils.displayNameFull(agencyCode); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts b/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts new file mode 100644 index 000000000..08cd91eff --- /dev/null +++ b/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts @@ -0,0 +1,55 @@ +import { Injectable } from '@angular/core'; +import { ConfigService } from 'nrpti-angular-components'; +import { Observable } from 'rxjs'; +import { HttpClient } from '@angular/common/http'; +// import { Utils } from '../../../../global/src/lib/utils/utils'; + +@Injectable() +export class ApplicationAgencyService { + private api: string; + + constructor( + private configService: ConfigService, + public http: HttpClient + ) {} + + async init() { + this.api = `${this.configService.config['API_LOCATION']}${this.configService.config['API_PATH']}`; + + // Start the initial agencies retrieval. + await this.refreshAgencies().toPromise(); + } + + // ... Other methods ... + refreshAgencies(): Observable { + return new Observable(observer => { + console.log("refreshAgencies here"); + + // Construct the full API endpoint URL + const apiEndpoint = `${this.api}/list-agencies`; + + // Make the HTTP GET request + const getAgencies = this.http.get(apiEndpoint); + + // Subscribe to the HTTP request and handle the response + getAgencies.subscribe( + (response) => { + // Update the agency list by calling the updateAgencyList function + // Utils.setAgencyList(response); + + observer.next(); + observer.complete(); + }, + (error) => { + console.error("HTTP Request Error: ", error); + + // You can handle errors here if needed + // ... + + // Notify the observer about the error + observer.error(error); + } + ); + }); + } +} diff --git a/angular/projects/admin-nrpti/src/app/services/factory.service.ts b/angular/projects/admin-nrpti/src/app/services/factory.service.ts index 2f136d1b0..823e88b28 100644 --- a/angular/projects/admin-nrpti/src/app/services/factory.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/factory.service.ts @@ -13,6 +13,7 @@ import { NewsService } from './news.service'; import { CollectionService } from './collection.service'; import { MineService } from './mine.service'; import { MapLayerInfoService } from './map-layer-info.service'; +import { ApplicationAgencyService } from './applicationAgency.service'; /** * Facade service for all admin-nrpti services. @@ -35,6 +36,7 @@ export class FactoryService { private _documentService: DocumentService; private _configService: ConfigService; private _mapLayerInfoService: MapLayerInfoService; + private _applicationAgencyService: ApplicationAgencyService; constructor(private injector: Injector) { // The following items are loaded by a file that is only present on cluster builds. @@ -625,4 +627,19 @@ export class FactoryService { public updateMapLayerInfo(mapLayerInfo): Promise { return this.mapLayerInfoService.updateMapLayerInfo(mapLayerInfo); } + + /** + * Inject agencies service if it hasn't already been injected. + * + * @readonly + * @type {ApplicationAgencyService} + * @memberof FactoryService + */ + public get applicationAgencyService(): ApplicationAgencyService { + if (!this._applicationAgencyService) { + this._applicationAgencyService = this.injector.get(ApplicationAgencyService); + } + + return this._applicationAgencyService; + } } diff --git a/angular/projects/global/src/lib/utils/utils.ts b/angular/projects/global/src/lib/utils/utils.ts index 6ba5f429a..7f00f9b26 100644 --- a/angular/projects/global/src/lib/utils/utils.ts +++ b/angular/projects/global/src/lib/utils/utils.ts @@ -1,4 +1,4 @@ -const ApplicationAgencies = { +const ApplicationAgencies: any = { AGENCY_ALC: 'Agricultural Land Commission', AGENCY_WF: 'BC Wildfire Service', AGENCY_ENV_COS: 'Conservation Officer Service', @@ -150,17 +150,9 @@ export class Utils { } - static displayNameFull(agency): string { - switch (agency) { - case ApplicationAgencies.AGENCY_AGRI: - return 'Ministry of Agriculture and Food'; - case ApplicationAgencies.AGENCY_EMLI: - return 'Ministry of Energy, Mines, and Low Carbon Innovation'; - case ApplicationAgencies.AGENCY_FLNRO: - return 'Ministry of Forests'; - default: - return agency; - } + static displayNameFull(agencyCode): string { + const agencyList = ApplicationAgencyList; + return agencyList[agencyCode] || agencyCode; } static displayNameAcronym(agency): string { From bf4856d3ca450a34b0c826405cdff528b85c09f6 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 15 Sep 2023 15:13:33 -0700 Subject: [PATCH 23/77] error message added --- .../update-issuing-agency.component.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts index 1ac5a20f6..4a874d546 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts @@ -60,6 +60,12 @@ export class UpdateIssuingAgencyComponent implements OnInit { this.updatedData.agencies = [] } this.toastService.addMessage('Agency Successfully Updated', 'Success Updated', Constants.ToastTypes.SUCCESS); + }else{ + this.toastService.addMessage( + 'Updated Agency Name Cannot be Empty', + 'Save unsuccessful', + Constants.ToastTypes.ERROR + ); } } catch (error) { From d8ec256beb83ccfa6c3ce81b9db16b774289ccb1 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Mon, 18 Sep 2023 11:48:33 -0700 Subject: [PATCH 24/77] removed logging and fixed indentation --- api/src/controllers/agencies.js | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/api/src/controllers/agencies.js b/api/src/controllers/agencies.js index 4159d36f1..cd631b4d7 100644 --- a/api/src/controllers/agencies.js +++ b/api/src/controllers/agencies.js @@ -44,31 +44,26 @@ exports.publicGet = async function(args, res, next) { */ exports.protectedPut = async function(args, res, next) { - const db = mongodb.connection.db(process.env.MONGODB_DATABASE || 'nrpti-dev'); let promises = []; let result = null; let incomingObj = args.swagger.params.data.value; - console.log("iiiiiiiiiiiiiiiiiiiii ---->" + JSON.stringify(incomingObj)) - const agencies = incomingObj['agencies']; if (agencies && agencies.length > 0) { const agencyCode = agencies[0]['agencyCode']; const agencyName = agencies[0]['agencyName']; - - const collectionDB = db.collection('nrpti'); - - promises.push( - collectionDB.findOneAndUpdate( - { agencyCode: agencyCode }, - { - $set: { - agencyName: agencyName + promises.push( + collectionDB.findOneAndUpdate( + { agencyCode: agencyCode }, + { + $set: { + agencyName: agencyName + } } - } - ) - );} + ) + ); + } try { await Promise.all(promises); result = 'Success'; From b5a1fc3ad08bec6dec2166f101ea9fad30503052 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Mon, 18 Sep 2023 12:08:12 -0700 Subject: [PATCH 25/77] replaced hardcoded agency names with api calls --- .../inspection-detail.component.ts | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts index 5903a178a..26d7b2b9b 100644 --- a/angular/projects/admin-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { IssuingAgencyService } from '../../../services/issuingagency.service'; @Component({ selector: 'app-inspection-detail', @@ -19,11 +19,14 @@ export class InspectionDetailComponent extends RecordDetailComponent implements public legislationString = ''; + public issuingAgencyMap = {}; + constructor( public route: ActivatedRoute, public router: Router, public changeDetectionRef: ChangeDetectorRef, - public factoryService: FactoryService + public factoryService: FactoryService, + private issuingAgencyService: IssuingAgencyService ) { super(factoryService); } @@ -50,6 +53,7 @@ export class InspectionDetailComponent extends RecordDetailComponent implements this.disableEdit(); this.changeDetectionRef.detectChanges(); + this.getIssuingAgencyList(); }); } @@ -64,11 +68,27 @@ export class InspectionDetailComponent extends RecordDetailComponent implements } displayName(agency) { - return Utils.displayNameFull(agency); + return this.issuingAgencyMap[agency]; } ngOnDestroy() { this.ngUnsubscribe.next(); this.ngUnsubscribe.complete(); } + + getIssuingAgencyList = () => { + this.issuingAgencyService + .getIssuingAgencies() + .then(response => { + if (response && Array.isArray(response)) { + this.issuingAgencyMap = response.reduce((result, item) => { + result[item.agencyCode] = item.agencyName; + return result; + }, {}); + } + }) + .catch(error => { + console.error('API call error:', error); + }); + }; } From 99674dff8bc178ebd4a29d16f362dc2bf2fc826d Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Mon, 18 Sep 2023 15:44:49 -0700 Subject: [PATCH 26/77] api call moved to service layer --- .../inspection-detail.component.ts | 23 ++++------- .../src/app/services/issuingagency.service.ts | 40 +++++++++++++------ 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts index 26d7b2b9b..cfd6860da 100644 --- a/angular/projects/admin-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts @@ -53,8 +53,8 @@ export class InspectionDetailComponent extends RecordDetailComponent implements this.disableEdit(); this.changeDetectionRef.detectChanges(); - this.getIssuingAgencyList(); }); + this.getIssuingAgencyMap(); } populateTextFields() { @@ -75,20 +75,11 @@ export class InspectionDetailComponent extends RecordDetailComponent implements this.ngUnsubscribe.next(); this.ngUnsubscribe.complete(); } - - getIssuingAgencyList = () => { - this.issuingAgencyService - .getIssuingAgencies() - .then(response => { - if (response && Array.isArray(response)) { - this.issuingAgencyMap = response.reduce((result, item) => { - result[item.agencyCode] = item.agencyName; - return result; - }, {}); - } - }) - .catch(error => { - console.error('API call error:', error); - }); + getIssuingAgencyMap = async () => { + try { + this.issuingAgencyMap = await this.issuingAgencyService.getIssuingAgencyMap(); + } catch (error) { + console.error(' getIssuingAgencyMap() API call error'); + } }; } diff --git a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts index b24e05ee8..19c10f30b 100644 --- a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts @@ -5,28 +5,44 @@ import { ApiService } from './api.service'; @Injectable({ providedIn: 'root' }) export class IssuingAgencyService { - constructor(public apiService: ApiService, public http: HttpClient) { } + constructor(public apiService: ApiService, public http: HttpClient) {} public getIssuingAgencies(): Promise { - - return this.http.get(`${this.apiService.pathAPI}/list-agencies`) - .toPromise() - .catch((error) => { - console.error('API call error:', error); - throw error; // Rethrow the error to propagate it further - }); + return this.http + .get(`${this.apiService.pathAPI}/list-agencies`) + .toPromise() + .catch(error => { + console.error('API call error:', error); + throw error; // Rethrow the error to propagate it further + }); } public updateAgency(agencyCode: string, agencyName: any): Promise { const apiUrl = `${this.apiService.pathAPI}/update-agencies`; - let updatedAgency = { "agencies": [{"agencyCode": agencyCode, "agencyName": agencyName}]}; // Wrap the array in an object + let updatedAgency = { agencies: [{ agencyCode: agencyCode, agencyName: agencyName }] }; // Wrap the array in an object console.log(JSON.stringify(updatedAgency)); - return this.http.put(apiUrl, updatedAgency) + return this.http + .put(apiUrl, updatedAgency) .toPromise() - .catch((error) => { + .catch(error => { console.error('API call error:', error); throw error; // Rethrow the error to propagate it further }); } -} + public async getIssuingAgencyMap() { + try { + const response = await this.getIssuingAgencies(); + const issuingAgencyMap: { [key: string]: string } = {}; + if (response && Array.isArray(response)) { + response.forEach(agency => { + issuingAgencyMap[agency.agencyCode] = agency.agencyName; + }); + } + return issuingAgencyMap; + } catch (error) { + console.error('getIssuingAgencyMap() API call error:', error); + throw error; + } + } +} From 6c93abd50a80646f3b36b9e6420a4a120b01da04 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Tue, 19 Sep 2023 08:56:12 -0700 Subject: [PATCH 27/77] issuing agency in add order replaced with api calls --- .../order-add-edit.component.ts | 18 +++++++++++++++--- .../src/app/utils/constants/misc.ts | 14 ++++++++++++++ .../common/src/app/utils/record-constants.ts | 19 +++++++++++++++++++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts index 68877ef24..c2e78b7d3 100644 --- a/angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, StoreService, LoggerService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { IssuingAgencyService } from '../../../services/issuingagency.service'; @Component({ selector: 'app-order-add-edit', @@ -33,7 +34,7 @@ export class OrderAddEditComponent implements OnInit, OnDestroy { // Pick lists public orderSubtypePicklist = Picklists.orderSubtypePicklist; - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; public authors = Picklists.authorPicklist; public outcomeStatuses = Picklists.outcomeStatusPicklist; private defaultAgency = ''; @@ -45,6 +46,7 @@ export class OrderAddEditComponent implements OnInit, OnDestroy { public datepickerMinDate = Constants.DatepickerMinDate; public datepickerMaxDate = Constants.DatepickerMaxDate; + public issuingAgencyMap = {}; constructor( public route: ActivatedRoute, @@ -55,7 +57,8 @@ export class OrderAddEditComponent implements OnInit, OnDestroy { private logger: LoggerService, private loadingScreenService: LoadingScreenService, private utils: Utils, - private _changeDetectionRef: ChangeDetectorRef + private _changeDetectionRef: ChangeDetectorRef, + private issuingAgencyService: IssuingAgencyService ) { } ngOnInit() { @@ -81,6 +84,7 @@ export class OrderAddEditComponent implements OnInit, OnDestroy { this.loading = false; this._changeDetectionRef.detectChanges(); }); + this.getIssuingAgencyMap(); } private populateTextFields() { @@ -522,9 +526,17 @@ export class OrderAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + return this.issuingAgencyMap[agency] || agency; } + getIssuingAgencyMap = async () => { + try { + this.issuingAgencyMap = await this.issuingAgencyService.getIssuingAgencyMap(); + } catch (error) { + console.error(' getIssuingAgencyMap() API call error'); + } + }; + cancel() { const shouldCancel = confirm( 'Leaving this page will discard unsaved changes. Are you sure you would like to continue?' diff --git a/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts b/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts index ff73372b1..4687d0e78 100644 --- a/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts +++ b/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts @@ -333,6 +333,20 @@ export class Constants { [Constants.ApplicationRoles.ADMIN_WLRS]: ['Ministry of Water, Land and Resource Stewardship'] }; + public static readonly RoleAgencyCodePickList: any = { + [Constants.ApplicationRoles.ADMIN_WF]: ['AGENCY_WF'], + [Constants.ApplicationRoles.ADMIN_FLNRO]: [ + 'AGENCY_ENV' + ], + [Constants.ApplicationRoles.ADMIN_FLNR_NRO]: ['AGENCY_FLNR_NRO'], + [Constants.ApplicationRoles.ADMIN_AGRI]: ['AGENCY_AGRI'], + [Constants.ApplicationRoles.ADMIN_ENV_EPD]: ['AGENCY_ENV_EPD'], + [Constants.ApplicationRoles.ADMIN_ENV_COS]: ['AGENCY_ENV_COS'], + [Constants.ApplicationRoles.ADMIN_ENV_BCPARKS]: ['AGENCY_ENV_BCPARKS'], + [Constants.ApplicationRoles.ADMIN_ALC]: ['AGENCY_ALC'], + [Constants.ApplicationRoles.ADMIN_WLRS]: ['AGENCY_WLRS'] + }; + public static readonly LngSectionPickList: string[] = [ 'Section 1', 'Section 2', diff --git a/angular/projects/common/src/app/utils/record-constants.ts b/angular/projects/common/src/app/utils/record-constants.ts index ecaaf8e1c..c135db175 100644 --- a/angular/projects/common/src/app/utils/record-constants.ts +++ b/angular/projects/common/src/app/utils/record-constants.ts @@ -178,6 +178,25 @@ export class Picklists { 'Natural Resource Officers', ]; + public static readonly agencyCodePicklist = [ + 'AGENCY_ALC', + 'AGENCY_OGC', + 'AGENCY_ENV_BCPARKS', + 'AGENCY_WF', + 'Climate Action Secretariat', + 'AGENCY_ENV_COS', + 'AGENCY_EAO', + 'AGENCY_LNG', + 'AGENCY_AGRI', + 'AGENCY_EMLI', + 'AGENCY_ENV', + 'AGENCY_FLNRO', + 'AGENCY_WLRS', + 'AGENCY_FLNR_NRO', + ]; + + + public static readonly entityTypePicklist = ['Company', 'Individual']; public static readonly authorPicklist = ['BC Government', 'Proponent', 'Other']; From 95608e655eb627bf09d83b8e90c76a42c7933853 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Thu, 21 Sep 2023 11:42:57 -0700 Subject: [PATCH 28/77] add climate action secretariat to migrations --- api/migrations/20230911220312-addApplicationAgenciesModel.js | 1 + api/migrations/20230912181649-updateIssuingAgencyToCode.js | 1 + 2 files changed, 2 insertions(+) diff --git a/api/migrations/20230911220312-addApplicationAgenciesModel.js b/api/migrations/20230911220312-addApplicationAgenciesModel.js index 609fab420..9a450b2f3 100644 --- a/api/migrations/20230911220312-addApplicationAgenciesModel.js +++ b/api/migrations/20230911220312-addApplicationAgenciesModel.js @@ -35,6 +35,7 @@ exports.up = async function (db) { { agencyCode: "AGENCY_FLNRO", agencyName: 'Ministry of Forests' }, { agencyCode: "AGENCY_FLNR_NRO", agencyName: 'Natural Resource Officers' }, { agencyCode: "AGENCY_WLRS", agencyName: 'Ministry of Water, Land and Resource Stewardship' }, + { agencyCode: "AGENCY_CAS", agencyName: 'Climate Action Secretariat' }, ] try { diff --git a/api/migrations/20230912181649-updateIssuingAgencyToCode.js b/api/migrations/20230912181649-updateIssuingAgencyToCode.js index f87ac1a49..5036cc5c6 100644 --- a/api/migrations/20230912181649-updateIssuingAgencyToCode.js +++ b/api/migrations/20230912181649-updateIssuingAgencyToCode.js @@ -35,6 +35,7 @@ exports.up = async function (db) { { agencyCode: "AGENCY_FLNRO", agencyName: 'Ministry of Forests' }, { agencyCode: "AGENCY_FLNR_NRO", agencyName: 'Natural Resource Officers' }, { agencyCode: "AGENCY_WLRS", agencyName: 'Ministry of Water, Land and Resource Stewardship' }, + { agencyCode: "AGENCY_CAS", agencyName: 'Climate Action Secretariat' } ] const collections = ['nrpti', 'redacted_record_subset']; From 9376f16edf682537f352c276a3efc2df84bf31a9 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Fri, 22 Sep 2023 16:32:52 -0700 Subject: [PATCH 29/77] wip - agencies are updated in factory, prelim update to components --- .../inspection-detail.component.ts | 16 ++-------- .../order-add-edit.component.ts | 16 ++-------- .../permit-detail/permit-detail.component.ts | 5 ++-- .../app/services/applicationAgency.service.ts | 30 ++++++++----------- .../src/app/services/factory.service.ts | 22 ++++++++------ .../src/lib/utils/agency-data-service.ts | 13 ++++++++ 6 files changed, 47 insertions(+), 55 deletions(-) create mode 100644 angular/projects/global/src/lib/utils/agency-data-service.ts diff --git a/angular/projects/admin-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts index cfd6860da..feb86b3ac 100644 --- a/angular/projects/admin-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { IssuingAgencyService } from '../../../services/issuingagency.service'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-inspection-detail', @@ -19,14 +19,11 @@ export class InspectionDetailComponent extends RecordDetailComponent implements public legislationString = ''; - public issuingAgencyMap = {}; - constructor( public route: ActivatedRoute, public router: Router, public changeDetectionRef: ChangeDetectorRef, public factoryService: FactoryService, - private issuingAgencyService: IssuingAgencyService ) { super(factoryService); } @@ -54,7 +51,6 @@ export class InspectionDetailComponent extends RecordDetailComponent implements this.changeDetectionRef.detectChanges(); }); - this.getIssuingAgencyMap(); } populateTextFields() { @@ -68,18 +64,12 @@ export class InspectionDetailComponent extends RecordDetailComponent implements } displayName(agency) { - return this.issuingAgencyMap[agency]; + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { this.ngUnsubscribe.next(); this.ngUnsubscribe.complete(); } - getIssuingAgencyMap = async () => { - try { - this.issuingAgencyMap = await this.issuingAgencyService.getIssuingAgencyMap(); - } catch (error) { - console.error(' getIssuingAgencyMap() API call error'); - } - }; } diff --git a/angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts index c2e78b7d3..c0d4511a9 100644 --- a/angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts @@ -10,7 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, StoreService, LoggerService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; -import { IssuingAgencyService } from '../../../services/issuingagency.service'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-order-add-edit', @@ -46,7 +46,6 @@ export class OrderAddEditComponent implements OnInit, OnDestroy { public datepickerMinDate = Constants.DatepickerMinDate; public datepickerMaxDate = Constants.DatepickerMaxDate; - public issuingAgencyMap = {}; constructor( public route: ActivatedRoute, @@ -58,7 +57,6 @@ export class OrderAddEditComponent implements OnInit, OnDestroy { private loadingScreenService: LoadingScreenService, private utils: Utils, private _changeDetectionRef: ChangeDetectorRef, - private issuingAgencyService: IssuingAgencyService ) { } ngOnInit() { @@ -84,7 +82,6 @@ export class OrderAddEditComponent implements OnInit, OnDestroy { this.loading = false; this._changeDetectionRef.detectChanges(); }); - this.getIssuingAgencyMap(); } private populateTextFields() { @@ -526,17 +523,10 @@ export class OrderAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return this.issuingAgencyMap[agency] || agency; + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } - getIssuingAgencyMap = async () => { - try { - this.issuingAgencyMap = await this.issuingAgencyService.getIssuingAgencyMap(); - } catch (error) { - console.error(' getIssuingAgencyMap() API call error'); - } - }; - cancel() { const shouldCancel = confirm( 'Leaving this page will discard unsaved changes. Are you sure you would like to continue?' diff --git a/angular/projects/admin-nrpti/src/app/records/permits/permit-detail/permit-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/permits/permit-detail/permit-detail.component.ts index f8162642a..682e1beb0 100644 --- a/angular/projects/admin-nrpti/src/app/records/permits/permit-detail/permit-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/permits/permit-detail/permit-detail.component.ts @@ -8,7 +8,7 @@ import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; import { StoreService } from 'nrpti-angular-components'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-permit-detail', @@ -68,7 +68,8 @@ export class PermitDetailComponent extends RecordDetailComponent implements OnIn } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts b/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts index 08cd91eff..634a3191f 100644 --- a/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts @@ -2,11 +2,11 @@ import { Injectable } from '@angular/core'; import { ConfigService } from 'nrpti-angular-components'; import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; -// import { Utils } from '../../../../global/src/lib/utils/utils'; @Injectable() export class ApplicationAgencyService { private api: string; + private agencies: { [key: string]: string } = {}; constructor( private configService: ConfigService, @@ -15,41 +15,35 @@ export class ApplicationAgencyService { async init() { this.api = `${this.configService.config['API_LOCATION']}${this.configService.config['API_PATH']}`; - - // Start the initial agencies retrieval. await this.refreshAgencies().toPromise(); } - // ... Other methods ... refreshAgencies(): Observable { return new Observable(observer => { - console.log("refreshAgencies here"); - - // Construct the full API endpoint URL const apiEndpoint = `${this.api}/list-agencies`; + const getAgencies = this.http.get<{ [key: string]: string }>(apiEndpoint); - // Make the HTTP GET request - const getAgencies = this.http.get(apiEndpoint); - - // Subscribe to the HTTP request and handle the response getAgencies.subscribe( (response) => { - // Update the agency list by calling the updateAgencyList function - // Utils.setAgencyList(response); + // Data transformation to make the data easier to work with + const agencyList = {} + for (const record in response) { + agencyList[response[record]["agencyCode"]] = response[record]["agencyName"] + } + this.agencies = agencyList; observer.next(); observer.complete(); }, (error) => { console.error("HTTP Request Error: ", error); - - // You can handle errors here if needed - // ... - - // Notify the observer about the error observer.error(error); } ); }); } + + getAgencies(): { [key: string]: string } { + return this.agencies; + } } diff --git a/angular/projects/admin-nrpti/src/app/services/factory.service.ts b/angular/projects/admin-nrpti/src/app/services/factory.service.ts index 823e88b28..34f88f0fd 100644 --- a/angular/projects/admin-nrpti/src/app/services/factory.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/factory.service.ts @@ -36,7 +36,7 @@ export class FactoryService { private _documentService: DocumentService; private _configService: ConfigService; private _mapLayerInfoService: MapLayerInfoService; - private _applicationAgencyService: ApplicationAgencyService; + private agencies: { [key: string]: string } = {}; constructor(private injector: Injector) { // The following items are loaded by a file that is only present on cluster builds. @@ -629,17 +629,21 @@ export class FactoryService { } /** - * Inject agencies service if it hasn't already been injected. + * Get agency data. If data is not cached, fetch it from the ApplicationAgencyService. * * @readonly - * @type {ApplicationAgencyService} + * @type {{ [key: string]: string }} * @memberof FactoryService */ - public get applicationAgencyService(): ApplicationAgencyService { - if (!this._applicationAgencyService) { - this._applicationAgencyService = this.injector.get(ApplicationAgencyService); - } - - return this._applicationAgencyService; + public get agencyData(): { [key: string]: string } { + if (Object.keys(this.agencies).length === 0) { + // Data is not in the cache, fetch it from the ApplicationAgencyService. + const applicationAgencyService = this.injector.get(ApplicationAgencyService); + applicationAgencyService.refreshAgencies().subscribe(() => { + // Once data is fetched and updated in the service, retrieve it and store it in the cache. + this.agencies = applicationAgencyService.getAgencies(); + }); } + return this.agencies; + } } diff --git a/angular/projects/global/src/lib/utils/agency-data-service.ts b/angular/projects/global/src/lib/utils/agency-data-service.ts new file mode 100644 index 000000000..f8df2fe14 --- /dev/null +++ b/angular/projects/global/src/lib/utils/agency-data-service.ts @@ -0,0 +1,13 @@ +import { FactoryService } from '../../../../admin-nrpti/src/app/services/factory.service'; + +export class AgencyDataService { + constructor( + private factoryService: FactoryService, + ) {} + + displayNameFull(agencyCode): string { + // Access cached agency data from FactoryService + const agencyList = this.factoryService.agencyData; + return agencyList[agencyCode] || agencyCode; + } +} From d4d0ccd521355dc300dc4e9782ea0f852fd2d0f4 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:21:35 -0700 Subject: [PATCH 30/77] wip - update picklist to allow dynamic update (admin penalty only) --- ...ministrative-penalty-add-edit.component.ts | 3 +- .../common/src/app/utils/record-constants.ts | 38 +++++++++++-------- .../src/lib/utils/agency-data-service.ts | 10 +++++ 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts index 61ddbcd82..1cca2f97b 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts @@ -11,7 +11,6 @@ import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, LoggerService, StoreService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; - @Component({ selector: 'app-administrative-penalty-add-edit', templateUrl: './administrative-penalty-add-edit.component.html', @@ -37,7 +36,7 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy public bcmiPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.getAgencyNames(this.factoryService); public authors = Picklists.authorPicklist; public defaultAgency = ''; diff --git a/angular/projects/common/src/app/utils/record-constants.ts b/angular/projects/common/src/app/utils/record-constants.ts index c135db175..716d220a8 100644 --- a/angular/projects/common/src/app/utils/record-constants.ts +++ b/angular/projects/common/src/app/utils/record-constants.ts @@ -1,5 +1,7 @@ import { Utils } from './utils'; import { Legislation } from '../models/master/common-models/legislation'; +import { AgencyDataService } from '../../../../../projects/global/src/lib/utils/agency-data-service'; +import { FactoryService } from '../../../../../projects/admin-nrpti/src/app/services/factory.service'; export class EpicProjectIds { public static readonly lngCanadaId = '588511d0aaecd9001b826192'; @@ -136,6 +138,7 @@ export enum StateStatus { * @class Picklists */ export class Picklists { + public static readonly orderSubtypePicklist = ['None', 'Cease', 'Remedy', 'Stop Work', 'Other']; public static readonly permitSubtypePicklist = ['Ancillary Site', 'General', 'Investigative Use', 'Road', 'Water']; public static readonly certificateSubtypePicklist = [ @@ -162,28 +165,33 @@ export class Picklists { public static readonly penaltyTypePicklist = ['Years', 'Days', 'Dollars', 'Hours', 'Other']; public static readonly agencyPicklist = [ - 'Agricultural Land Commission', - 'BC Energy Regulator', - 'BC Parks', - 'BC Wildfire Service', - 'Climate Action Secretariat', - 'Conservation Officer Service', - 'Environmental Assessment Office', - 'LNG Secretariat', - 'Ministry of Agriculture and Food', - 'Ministry of Energy Mines and Low Carbon Innovation', - 'Ministry of Environment and Climate Change Strategy', - 'Ministry of Forests', - 'Ministry of Water, Land and Resource Stewardship', - 'Natural Resource Officers', + 'Agricultural Land Commission 1', + 'BC Energy Regulator 1', + 'BC Parks 1', + 'BC Wildfire Service 1', + 'Climate Action Secretariat 1', + 'Conservation Officer Service 1', + 'Environmental Assessment Office 1', + 'LNG Secretariat 1', + 'Ministry of Agriculture and Food 1', + 'Ministry of Energy Mines and Low Carbon Innovation 1', + 'Ministry of Environment and Climate Change Strategy 1', + 'Ministry of Forests 1', + 'Ministry of Wate 1r, Land and Resource Stewardship 1', + 'Natural Resource Officers 1', ]; + public static getAgencyNames(factoryService: FactoryService) { + const agencyDataService = new AgencyDataService(factoryService); + return agencyDataService.getAgencyNames(); + } + public static readonly agencyCodePicklist = [ 'AGENCY_ALC', 'AGENCY_OGC', 'AGENCY_ENV_BCPARKS', 'AGENCY_WF', - 'Climate Action Secretariat', + 'AGENCY_CAS', 'AGENCY_ENV_COS', 'AGENCY_EAO', 'AGENCY_LNG', diff --git a/angular/projects/global/src/lib/utils/agency-data-service.ts b/angular/projects/global/src/lib/utils/agency-data-service.ts index f8df2fe14..5c812ec37 100644 --- a/angular/projects/global/src/lib/utils/agency-data-service.ts +++ b/angular/projects/global/src/lib/utils/agency-data-service.ts @@ -10,4 +10,14 @@ export class AgencyDataService { const agencyList = this.factoryService.agencyData; return agencyList[agencyCode] || agencyCode; } + + getAgencyCodes(): string[] { + const agencyList = this.factoryService.agencyData; + return Object.keys(agencyList); + } + + getAgencyNames(): string[] { + const agencyList = this.factoryService.agencyData; + return Object.values(agencyList); + } } From c63f17b34af2b904cd50ebc5744ceeb728104247 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 25 Sep 2023 10:36:29 -0700 Subject: [PATCH 31/77] wip - make buildForm for admin penalty async --- ...administrative-penalty-add-edit.component.ts | 2 +- ...administrative-penalty-add-edit.component.ts | 17 +++++++++++++++-- .../common/src/app/utils/record-constants.ts | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.ts index f9a6b8e3f..91ace92cd 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.ts @@ -45,7 +45,7 @@ export class MinesAdministrativePenaltyAddEditComponent extends AdministrativePe ); } - ngOnInit() { + async ngOnInit() { this.route.data.pipe(takeUntil(this.ngUnsubscribe)).subscribe((res: any) => { this.isEditing = res.breadcrumb !== 'Add Administrative Penalty'; if (this.isEditing) { diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts index 1cca2f97b..524c3028d 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts @@ -61,7 +61,7 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy protected storeService: StoreService, ) { } - ngOnInit() { + async ngOnInit() { this.route.data.pipe(takeUntil(this.ngUnsubscribe)).subscribe((res: any) => { this.isEditing = res.breadcrumb !== 'Add Administrative Penalty'; if (this.isEditing) { @@ -79,11 +79,24 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy }; } - this.buildForm(); this.subscribeToFormControlChanges(); this.loading = false; this._changeDetectionRef.detectChanges(); + + this.route.data.pipe(takeUntil(this.ngUnsubscribe)).subscribe(async (res: any) => { + this.agencies = await this.fetchAgencies(); + this.buildForm(); + }); + }); + } + + private async fetchAgencies(): Promise { + return new Promise((resolve) => { + setTimeout(() => { + const agenciesData = Picklists.getAgencyNames(this.factoryService); + resolve(agenciesData); + }, 1000); }); } diff --git a/angular/projects/common/src/app/utils/record-constants.ts b/angular/projects/common/src/app/utils/record-constants.ts index 716d220a8..497b07ef3 100644 --- a/angular/projects/common/src/app/utils/record-constants.ts +++ b/angular/projects/common/src/app/utils/record-constants.ts @@ -177,7 +177,7 @@ export class Picklists { 'Ministry of Energy Mines and Low Carbon Innovation 1', 'Ministry of Environment and Climate Change Strategy 1', 'Ministry of Forests 1', - 'Ministry of Wate 1r, Land and Resource Stewardship 1', + 'Ministry of Water, Land and Resource Stewardship 1', 'Natural Resource Officers 1', ]; From 318a46967a9506724be7581423dec8473354f0d1 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 25 Sep 2023 10:59:13 -0700 Subject: [PATCH 32/77] wip - update to factory service, fix buildForm in admin penalty --- ...ministrative-penalty-add-edit.component.ts | 2 ++ .../src/app/services/factory.service.ts | 33 ++++++++++++------- .../src/lib/utils/agency-data-service.ts | 6 ++-- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts index 524c3028d..99cc2cb93 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts @@ -79,6 +79,8 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy }; } + this.buildForm(); + this.subscribeToFormControlChanges(); this.loading = false; diff --git a/angular/projects/admin-nrpti/src/app/services/factory.service.ts b/angular/projects/admin-nrpti/src/app/services/factory.service.ts index 34f88f0fd..e725dd190 100644 --- a/angular/projects/admin-nrpti/src/app/services/factory.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/factory.service.ts @@ -36,7 +36,7 @@ export class FactoryService { private _documentService: DocumentService; private _configService: ConfigService; private _mapLayerInfoService: MapLayerInfoService; - private agencies: { [key: string]: string } = {}; + private _applicationAgencyService: ApplicationAgencyService constructor(private injector: Injector) { // The following items are loaded by a file that is only present on cluster builds. @@ -90,6 +90,20 @@ export class FactoryService { return this._apiService; } + /** + * Inject agency service if it hasn't already been injected. + * + * @readonly + * @type {ApiService} + * @memberof FactoryService + */ + public get applicationAgencyService(): ApplicationAgencyService { + if (!this._applicationAgencyService) { + this._applicationAgencyService = this.injector.get(ApplicationAgencyService); + } + return this._applicationAgencyService; + } + /** * Inject record service if it hasn't already been injected. * @@ -635,15 +649,12 @@ export class FactoryService { * @type {{ [key: string]: string }} * @memberof FactoryService */ - public get agencyData(): { [key: string]: string } { - if (Object.keys(this.agencies).length === 0) { - // Data is not in the cache, fetch it from the ApplicationAgencyService. - const applicationAgencyService = this.injector.get(ApplicationAgencyService); - applicationAgencyService.refreshAgencies().subscribe(() => { - // Once data is fetched and updated in the service, retrieve it and store it in the cache. - this.agencies = applicationAgencyService.getAgencies(); - }); - } - return this.agencies; + public getApplicationAgencyService(): Observable { + if (Object.keys(this.applicationAgencyService.getAgencies).length === 0) { + this.applicationAgencyService.refreshAgencies().subscribe(() => { + this.applicationAgencyService.getAgencies(); + }); + } + return this.applicationAgencyService.refreshAgencies(); } } diff --git a/angular/projects/global/src/lib/utils/agency-data-service.ts b/angular/projects/global/src/lib/utils/agency-data-service.ts index 5c812ec37..664df6832 100644 --- a/angular/projects/global/src/lib/utils/agency-data-service.ts +++ b/angular/projects/global/src/lib/utils/agency-data-service.ts @@ -7,17 +7,17 @@ export class AgencyDataService { displayNameFull(agencyCode): string { // Access cached agency data from FactoryService - const agencyList = this.factoryService.agencyData; + const agencyList = this.factoryService.applicationAgencyService.getAgencies(); return agencyList[agencyCode] || agencyCode; } getAgencyCodes(): string[] { - const agencyList = this.factoryService.agencyData; + const agencyList = this.factoryService.applicationAgencyService.getAgencies(); return Object.keys(agencyList); } getAgencyNames(): string[] { - const agencyList = this.factoryService.agencyData; + const agencyList = this.factoryService.applicationAgencyService.getAgencies(); return Object.values(agencyList); } } From f564dfa36d1c47ff2e1ac8636147731e49f0c83c Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:13:58 -0700 Subject: [PATCH 33/77] refresh agencies after they are updated --- .../src/app/services/applicationAgency.service.ts | 1 - .../update-issuing-agency.component.ts | 14 +++++++++++--- .../update-issuing-agency.resolver.ts | 1 - 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts b/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts index 634a3191f..81fd692df 100644 --- a/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts @@ -31,7 +31,6 @@ export class ApplicationAgencyService { agencyList[response[record]["agencyCode"]] = response[record]["agencyName"] } this.agencies = agencyList; - observer.next(); observer.complete(); }, diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts index 4a874d546..f1a649b72 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts @@ -3,7 +3,7 @@ import { IssuingAgencyService } from '../services/issuingagency.service'; import { LoggerService } from 'nrpti-angular-components'; import { Constants } from '../utils/constants/misc'; import { ToastService } from '../services/toast.service'; -// import { Observable, of } from 'rxjs'; +import { FactoryService } from '../../../../admin-nrpti/src/app/services/factory.service'; @Component({ selector: 'app-update-issuing-agency', @@ -23,15 +23,23 @@ export class UpdateIssuingAgencyComponent implements OnInit { constructor( private issuingAgencyService: IssuingAgencyService, private logger: LoggerService, - private toastService: ToastService + private toastService: ToastService, + private factoryService: FactoryService, ) {} onSelected(value: string): void { this.selectedAgency = value; this.choiceMade = true; } - putRecords(agencyCode: any, agencyName: any){ + putRecords(agencyCode: any, agencyName: any) { this.issuingAgencyService.updateAgency(agencyCode, agencyName) + .then(() => { + // Once record is updated, refresh the agencies + this.refreshAgencies(); + }); + } + refreshAgencies (){ + this.factoryService.applicationAgencyService.refreshAgencies().subscribe(); } updateSelectedAgency(): void { try{ diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.resolver.ts b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.resolver.ts index 90c2e2f7b..d86e79004 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.resolver.ts +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.resolver.ts @@ -6,7 +6,6 @@ import { Observable } from 'rxjs/Observable'; @Injectable() export class UpdateIssuingAgencyResolver implements Resolve> { resolve(route: ActivatedRouteSnapshot): Observable { - console.log("UpdateIssuingAgencyResolver.resolve()") return null; } } From 370fcee2afb1ac5008d7d5b31805e3c351023be9 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:23:50 -0700 Subject: [PATCH 34/77] remove async ngOnInit, no longer needed --- .../administrative-penalty-add-edit.component.ts | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts index 99cc2cb93..2c80fc2ce 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts @@ -61,7 +61,7 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy protected storeService: StoreService, ) { } - async ngOnInit() { + ngOnInit() { this.route.data.pipe(takeUntil(this.ngUnsubscribe)).subscribe((res: any) => { this.isEditing = res.breadcrumb !== 'Add Administrative Penalty'; if (this.isEditing) { @@ -85,20 +85,6 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy this.loading = false; this._changeDetectionRef.detectChanges(); - - this.route.data.pipe(takeUntil(this.ngUnsubscribe)).subscribe(async (res: any) => { - this.agencies = await this.fetchAgencies(); - this.buildForm(); - }); - }); - } - - private async fetchAgencies(): Promise { - return new Promise((resolve) => { - setTimeout(() => { - const agenciesData = Picklists.getAgencyNames(this.factoryService); - resolve(agenciesData); - }, 1000); }); } From 9ab27bb5042004b2c31e12376f0e5fd6d2644c7f Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:45:59 -0700 Subject: [PATCH 35/77] update to more relevant terminology --- angular/projects/admin-nrpti/src/app/app-routing.module.ts | 2 +- .../admin-nrpti/src/app/home/home.component.spec.ts | 2 +- .../admin-nrpti/src/app/services/keycloak.service.ts | 2 +- .../admin-nrpti/src/app/sidebar/sidebar.component.html | 6 +++--- .../admin-nrpti/src/app/sidebar/sidebar.component.spec.ts | 4 ++-- .../update-issuing-agency.component.html | 2 +- .../projects/admin-nrpti/src/app/utils/constants/misc.ts | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/app-routing.module.ts b/angular/projects/admin-nrpti/src/app/app-routing.module.ts index d70124e06..8e3f33b4e 100644 --- a/angular/projects/admin-nrpti/src/app/app-routing.module.ts +++ b/angular/projects/admin-nrpti/src/app/app-routing.module.ts @@ -70,7 +70,7 @@ const routes: Routes = [ records: UpdateIssuingAgencyResolver }, data: { - breadcrumb: 'Update Issuing Agency' + breadcrumb: 'Agencies' } }, { diff --git a/angular/projects/admin-nrpti/src/app/home/home.component.spec.ts b/angular/projects/admin-nrpti/src/app/home/home.component.spec.ts index 30620d708..e7e1a2bcf 100644 --- a/angular/projects/admin-nrpti/src/app/home/home.component.spec.ts +++ b/angular/projects/admin-nrpti/src/app/home/home.component.spec.ts @@ -33,7 +33,7 @@ describe('HomeComponent', () => { case Constants.Menus.ENTITIES: retVal = false; break; case Constants.Menus.IMPORTS: retVal = true; break; case Constants.Menus.COMMUNICATIONS: retVal = true; break; - case Constants.Menus.UPDATE_ISSUING_AGENCY: retVal = true; break; + case Constants.Menus.AGENCIES: retVal = true; break; } return retVal; } diff --git a/angular/projects/admin-nrpti/src/app/services/keycloak.service.ts b/angular/projects/admin-nrpti/src/app/services/keycloak.service.ts index e9c59c209..2d5f672fe 100644 --- a/angular/projects/admin-nrpti/src/app/services/keycloak.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/keycloak.service.ts @@ -162,7 +162,7 @@ export class KeycloakService { roles.includes(Constants.ApplicationRoles.ADMIN_NRCED) || roles.includes(Constants.ApplicationRoles.ADMIN_BCMI); - this.menus[Constants.Menus.UPDATE_ISSUING_AGENCY] = + this.menus[Constants.Menus.AGENCIES] = roles.includes(Constants.ApplicationRoles.ADMIN) } diff --git a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html index 7da3bd911..d8f432e57 100644 --- a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html +++ b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html @@ -103,12 +103,12 @@ Communications - notifications_active - Update Issuing Agency + edit + Agencies \ No newline at end of file diff --git a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.spec.ts b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.spec.ts index 05648b88e..d18c43403 100644 --- a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.spec.ts +++ b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.spec.ts @@ -38,7 +38,7 @@ describe('SidebarComponent', () => { case Constants.Menus.ENTITIES: retVal = false; break; case Constants.Menus.IMPORTS: retVal = true; break; case Constants.Menus.COMMUNICATIONS: retVal = true; break; - case Constants.Menus.UPDATE_ISSUING_AGENCY: retVal = true; break; + case Constants.Menus.AGENCIES: retVal = true; break; } return retVal; } @@ -71,7 +71,7 @@ describe('SidebarComponent', () => { expect(component.keycloakService.isMenuEnabled(Constants.Menus.ENTITIES)).toEqual(false); expect(component.keycloakService.isMenuEnabled(Constants.Menus.IMPORTS)).toEqual(true); expect(component.keycloakService.isMenuEnabled(Constants.Menus.COMMUNICATIONS)).toEqual(true); - expect(component.keycloakService.isMenuEnabled(Constants.Menus.UPDATE_ISSUING_AGENCY)).toEqual(true); + expect(component.keycloakService.isMenuEnabled(Constants.Menus.AGENCIES)).toEqual(true); expect(component.keycloakService.isMenuEnabled('Something Not Here')).toEqual(false); expect(component).toBeTruthy(); diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html index 6b242a720..90c138878 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html +++ b/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html @@ -1,5 +1,5 @@
-

Update Issuing Agency

+

Update Agencies

diff --git a/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts b/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts index 4687d0e78..579c6943d 100644 --- a/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts +++ b/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts @@ -49,7 +49,7 @@ export class Constants { ENTITIES: 'Entities', IMPORTS: 'Imports', COMMUNICATIONS: 'Communications', - UPDATE_ISSUING_AGENCY: 'Update Issuing Agency' + AGENCIES: 'Agencies' }; public static readonly RecordTypes: any = { From c6528bf6d5637738b2517e5fa61e322c7696630e Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 25 Sep 2023 15:02:11 -0700 Subject: [PATCH 36/77] update to agencies in components and modules --- .../agencies.component.html} | 0 .../agencies.component.scss} | 0 .../agencies.component.ts} | 10 +++++----- .../agencies.module.ts} | 12 ++++++------ .../agencies.resolver.ts} | 2 +- .../admin-nrpti/src/app/app-routing.module.ts | 10 +++++----- angular/projects/admin-nrpti/src/app/app.module.ts | 4 ++-- .../src/app/sidebar/sidebar.component.html | 8 ++++---- 8 files changed, 23 insertions(+), 23 deletions(-) rename angular/projects/admin-nrpti/src/app/{update-issuing-agency/update-issuing-agency.component.html => agencies/agencies.component.html} (100%) rename angular/projects/admin-nrpti/src/app/{update-issuing-agency/update-issuing-agency.component.scss => agencies/agencies.component.scss} (100%) rename angular/projects/admin-nrpti/src/app/{update-issuing-agency/update-issuing-agency.component.ts => agencies/agencies.component.ts} (91%) rename angular/projects/admin-nrpti/src/app/{update-issuing-agency/update-issuing-agency.module.ts => agencies/agencies.module.ts} (73%) rename angular/projects/admin-nrpti/src/app/{update-issuing-agency/update-issuing-agency.resolver.ts => agencies/agencies.resolver.ts} (75%) diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html b/angular/projects/admin-nrpti/src/app/agencies/agencies.component.html similarity index 100% rename from angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.html rename to angular/projects/admin-nrpti/src/app/agencies/agencies.component.html diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.scss b/angular/projects/admin-nrpti/src/app/agencies/agencies.component.scss similarity index 100% rename from angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.scss rename to angular/projects/admin-nrpti/src/app/agencies/agencies.component.scss diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts b/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts similarity index 91% rename from angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts rename to angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts index f1a649b72..3c857232d 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.component.ts +++ b/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts @@ -3,14 +3,14 @@ import { IssuingAgencyService } from '../services/issuingagency.service'; import { LoggerService } from 'nrpti-angular-components'; import { Constants } from '../utils/constants/misc'; import { ToastService } from '../services/toast.service'; -import { FactoryService } from '../../../../admin-nrpti/src/app/services/factory.service'; +import { FactoryService } from '../services/factory.service'; @Component({ - selector: 'app-update-issuing-agency', - templateUrl: './update-issuing-agency.component.html', - styleUrls: ['./update-issuing-agency.component.scss'] + selector: 'app-agencies', + templateUrl: './agencies.component.html', + styleUrls: ['./agencies.component.scss'] }) -export class UpdateIssuingAgencyComponent implements OnInit { +export class AgenciesComponent implements OnInit { public loading = false; selectedAgency: string = ''; // Initialize the selectedAgency choiceMade = false; diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.module.ts b/angular/projects/admin-nrpti/src/app/agencies/agencies.module.ts similarity index 73% rename from angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.module.ts rename to angular/projects/admin-nrpti/src/app/agencies/agencies.module.ts index 21d5f6955..fad361202 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.module.ts +++ b/angular/projects/admin-nrpti/src/app/agencies/agencies.module.ts @@ -9,8 +9,8 @@ import { EditorModule } from '@tinymce/tinymce-angular'; import { GlobalModule } from 'nrpti-angular-components'; import { CommonModule as NrptiCommonModule } from '../../../../common/src/app/common.module'; -import { UpdateIssuingAgencyComponent } from './update-issuing-agency.component'; -import { UpdateIssuingAgencyResolver } from './update-issuing-agency.resolver'; +import { AgenciesComponent } from './agencies.component'; +import { AgenciesResolver } from './agencies.resolver'; @NgModule({ @@ -26,14 +26,14 @@ import { UpdateIssuingAgencyResolver } from './update-issuing-agency.resolver'; NgbModule, ], declarations: [ - UpdateIssuingAgencyComponent + AgenciesComponent ], providers: [ - UpdateIssuingAgencyResolver + AgenciesResolver ], entryComponents: [ - UpdateIssuingAgencyComponent + AgenciesComponent ], exports: [] }) -export class UpdateIssuingAgencyModule {} +export class AgenciesModule {} diff --git a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.resolver.ts b/angular/projects/admin-nrpti/src/app/agencies/agencies.resolver.ts similarity index 75% rename from angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.resolver.ts rename to angular/projects/admin-nrpti/src/app/agencies/agencies.resolver.ts index d86e79004..9ff8a6b31 100644 --- a/angular/projects/admin-nrpti/src/app/update-issuing-agency/update-issuing-agency.resolver.ts +++ b/angular/projects/admin-nrpti/src/app/agencies/agencies.resolver.ts @@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable'; @Injectable() -export class UpdateIssuingAgencyResolver implements Resolve> { +export class AgenciesResolver implements Resolve> { resolve(route: ActivatedRouteSnapshot): Observable { return null; } diff --git a/angular/projects/admin-nrpti/src/app/app-routing.module.ts b/angular/projects/admin-nrpti/src/app/app-routing.module.ts index 8e3f33b4e..78c1fdb61 100644 --- a/angular/projects/admin-nrpti/src/app/app-routing.module.ts +++ b/angular/projects/admin-nrpti/src/app/app-routing.module.ts @@ -8,8 +8,8 @@ import { NewsResolver } from './news/news-resolver'; import { NewsListComponent } from './news/news-list.component'; import { CommunicationsComponent } from './communications/communications.component'; import { LngMapInfoResolver } from './communications/lng-map-info/lng-map-info-resolver'; -import { UpdateIssuingAgencyComponent } from './update-issuing-agency/update-issuing-agency.component'; -import { UpdateIssuingAgencyResolver } from './update-issuing-agency/update-issuing-agency.resolver'; +import { AgenciesComponent } from './agencies/agencies.component'; +import { AgenciesResolver } from './agencies/agencies.resolver'; const routes: Routes = [ { @@ -63,11 +63,11 @@ const routes: Routes = [ ] }, { - path: 'update-issuing-agency', + path: 'agencies', pathMatch: 'full', - component: UpdateIssuingAgencyComponent, + component: AgenciesComponent, resolve: { - records: UpdateIssuingAgencyResolver + records: AgenciesResolver }, data: { breadcrumb: 'Agencies' diff --git a/angular/projects/admin-nrpti/src/app/app.module.ts b/angular/projects/admin-nrpti/src/app/app.module.ts index 659ac1ee5..870eb6de2 100644 --- a/angular/projects/admin-nrpti/src/app/app.module.ts +++ b/angular/projects/admin-nrpti/src/app/app.module.ts @@ -19,7 +19,7 @@ import { RecordsModule } from './records/records.module'; import { NewsModule } from './news/news.module'; import { MinesModule } from './mines/mines.module'; import { CommunicationsModule } from './communications/communications.module'; -import { UpdateIssuingAgencyModule } from './update-issuing-agency/update-issuing-agency.module'; +import { AgenciesModule } from './agencies/agencies.module'; import { ToastrModule } from 'ngx-toastr'; // components @@ -101,7 +101,7 @@ export function overlayScrollFactory(overlay: Overlay): () => CloseScrollStrateg NewsModule, MinesModule, CommunicationsModule, - UpdateIssuingAgencyModule, + AgenciesModule, AppRoutingModule, // <-- module import order matters - https://angular.io/guide/router#module-import-order-matters NgbModule.forRoot(), NgxPaginationModule, diff --git a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html index d8f432e57..a014c6dc9 100644 --- a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html +++ b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html @@ -102,11 +102,11 @@ chat Communications - + [ngClass]="{ active: mainRoute === 'agencies' }" + id="agencies" + [routerLink]="['/agencies']"> edit Agencies From d231282a0808481b0b429291a7f70dd42bee47c6 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Mon, 25 Sep 2023 15:41:31 -0700 Subject: [PATCH 37/77] agency name translated to agency code on admin penalty save --- .../administrative-penalty-add-edit.component.ts | 5 +++-- .../projects/common/src/app/utils/record-constants.ts | 5 +++++ .../projects/global/src/lib/utils/agency-data-service.ts | 9 +++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts index 2c80fc2ce..4cf7d903a 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts @@ -86,7 +86,7 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy this.loading = false; this._changeDetectionRef.detectChanges(); }); - } + } protected populateTextFields() { if (this.currentRecord.dateUpdated) { @@ -475,7 +475,8 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy this.myForm.get('dateIssued').value )); (this.myForm.controls.issuingAgency.dirty || this.defaultAgency) && - (administrativePenalty['issuingAgency'] = this.myForm.controls.issuingAgency.value); + (administrativePenalty['issuingAgency'] = Picklists.getAgencyCode(this.factoryService, this.myForm.controls.issuingAgency.value)); + //(administrativePenalty['issuingAgency'] = this.myForm.controls.issuingAgency.value); this.myForm.controls.author.dirty && (administrativePenalty['author'] = this.myForm.controls.author.value); if ( diff --git a/angular/projects/common/src/app/utils/record-constants.ts b/angular/projects/common/src/app/utils/record-constants.ts index 497b07ef3..4572a8824 100644 --- a/angular/projects/common/src/app/utils/record-constants.ts +++ b/angular/projects/common/src/app/utils/record-constants.ts @@ -186,6 +186,11 @@ export class Picklists { return agencyDataService.getAgencyNames(); } + public static getAgencyCode(factoryService: FactoryService, agencyName) { + const agencyDataService = new AgencyDataService(factoryService); + return agencyDataService.getAgencyCode(agencyName); + } + public static readonly agencyCodePicklist = [ 'AGENCY_ALC', 'AGENCY_OGC', diff --git a/angular/projects/global/src/lib/utils/agency-data-service.ts b/angular/projects/global/src/lib/utils/agency-data-service.ts index 664df6832..835f9da6e 100644 --- a/angular/projects/global/src/lib/utils/agency-data-service.ts +++ b/angular/projects/global/src/lib/utils/agency-data-service.ts @@ -20,4 +20,13 @@ export class AgencyDataService { const agencyList = this.factoryService.applicationAgencyService.getAgencies(); return Object.values(agencyList); } + + getAgencyCode(agencyName: string): string { + const agencyList = this.factoryService.applicationAgencyService.getAgencies(); + for (const key in agencyList) { + if (agencyList.hasOwnProperty(key) && agencyList[key] === agencyName) { + return key; // Return the key if the value matches + } + } + } } From a5e456ecdd7a2b456f96e01cd8bed2c08afb5e4a Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 25 Sep 2023 16:30:02 -0700 Subject: [PATCH 38/77] update admin penalty to show agency; linting updates --- .../src/app/agencies/agencies.component.html | 19 +-- .../src/app/agencies/agencies.component.ts | 91 +++++++-------- .../src/app/agencies/agencies.module.ts | 15 +-- .../src/app/agencies/agencies.resolver.ts | 1 - .../admin-nrpti/src/app/app.module.ts | 13 ++- ...nistrative-penalty-add-edit.component.html | 37 +++--- ...trative-penalty-add-edit.component.spec.ts | 13 ++- ...ministrative-penalty-add-edit.component.ts | 108 +++++++++--------- ...tive-penalty-bcmi-detail.component.spec.ts | 14 ++- ...istrative-penalty-bcmi-detail.component.ts | 6 +- ...ministrative-penalty-detail.component.html | 4 +- ...administrative-penalty-detail.component.ts | 5 +- .../app/services/applicationAgency.service.ts | 67 ++++++----- .../src/app/services/factory.service.ts | 27 +++-- .../src/app/services/import.service.ts | 42 ++----- .../src/app/services/issuingagency.service.ts | 2 +- .../src/app/services/keycloak.service.ts | 2 +- .../src/app/sidebar/sidebar.component.html | 104 ++++++++++------- .../src/app/sidebar/sidebar.component.spec.ts | 44 ++++--- .../app/utils/constants/ams-csv-constants.ts | 7 +- .../src/app/utils/constants/misc.ts | 8 +- .../common/src/app/utils/record-constants.ts | 71 ++++++------ .../src/app/services/api.service.ts | 15 +-- 23 files changed, 368 insertions(+), 347 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/agencies/agencies.component.html b/angular/projects/admin-nrpti/src/app/agencies/agencies.component.html index 90c138878..67d7605e1 100644 --- a/angular/projects/admin-nrpti/src/app/agencies/agencies.component.html +++ b/angular/projects/admin-nrpti/src/app/agencies/agencies.component.html @@ -3,31 +3,36 @@

Update Agencies

-
+ +
- - -
- +
- + - diff --git a/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts b/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts index 3c857232d..e37c3a823 100644 --- a/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts +++ b/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts @@ -12,19 +12,19 @@ import { FactoryService } from '../services/factory.service'; }) export class AgenciesComponent implements OnInit { public loading = false; - selectedAgency: string = ''; // Initialize the selectedAgency + selectedAgency = ''; // Initialize the selectedAgency choiceMade = false; - newAgency: string = ''; // Initialize the new agency input field - agencies: { [key: string]: string } = {"Kyle": "Williams"}; - agencyList: string[] = ["-Select-"]; // Use a string array for agencyList + newAgency = ''; // Initialize the new agency input field + agencies: { [key: string]: string } = { 'Kyle': 'Williams' }; + agencyList: string[] = ['-Select-']; // Use a string array for agencyList updatedData: any = { - "agencies": [] + agencies: [] }; constructor( private issuingAgencyService: IssuingAgencyService, private logger: LoggerService, private toastService: ToastService, - private factoryService: FactoryService, + private factoryService: FactoryService ) {} onSelected(value: string): void { @@ -32,61 +32,58 @@ export class AgenciesComponent implements OnInit { this.choiceMade = true; } putRecords(agencyCode: any, agencyName: any) { - this.issuingAgencyService.updateAgency(agencyCode, agencyName) - .then(() => { - // Once record is updated, refresh the agencies - this.refreshAgencies(); - }); + this.issuingAgencyService.updateAgency(agencyCode, agencyName).then(() => { + // Once record is updated, refresh the agencies + this.refreshAgencies(); + }); } - refreshAgencies (){ + refreshAgencies() { this.factoryService.applicationAgencyService.refreshAgencies().subscribe(); } updateSelectedAgency(): void { - try{ - if (this.newAgency.trim() !== '') { - // Find the agency code that matches the selected agency name - const matchingCode = Object.keys(this.agencies).find( - key => this.agencies[key] === this.selectedAgency - ); - if (matchingCode) { - // Update the agencyList with the new value at the same index - const index = this.agencyList.indexOf(this.selectedAgency); - if (index !== -1) { - this.agencyList[index] = this.newAgency; + try { + if (this.newAgency.trim() !== '') { + // Find the agency code that matches the selected agency name + const matchingCode = Object.keys(this.agencies).find(key => this.agencies[key] === this.selectedAgency); + if (matchingCode) { + // Update the agencyList with the new value at the same index + const index = this.agencyList.indexOf(this.selectedAgency); + if (index !== -1) { + this.agencyList[index] = this.newAgency; + } + // Update the selectedAgency with the new value + this.selectedAgency = this.newAgency; + // Clear the input field + this.newAgency = ''; + this.choiceMade = true; + // Update the updatedData object to match the desired layout + this.updatedData.agencies.push({ + agencyCode: matchingCode, + agencyName: this.selectedAgency + }); + this.putRecords(matchingCode, this.selectedAgency); + this.updatedData.agencies = []; } - // Update the selectedAgency with the new value - this.selectedAgency = this.newAgency; - // Clear the input field - this.newAgency = ''; - this.choiceMade = true; - // Update the updatedData object to match the desired layout - this.updatedData.agencies.push({ - "agencyCode": matchingCode, - "agencyName": this.selectedAgency - }); - this.putRecords(matchingCode, this.selectedAgency); - this.updatedData.agencies = [] + this.toastService.addMessage('Agency Successfully Updated', 'Success Updated', Constants.ToastTypes.SUCCESS); + } else { + this.toastService.addMessage( + 'Updated Agency Name Cannot be Empty', + 'Save unsuccessful', + Constants.ToastTypes.ERROR + ); } - this.toastService.addMessage('Agency Successfully Updated', 'Success Updated', Constants.ToastTypes.SUCCESS); - }else{ + } catch (error) { this.toastService.addMessage( - 'Updated Agency Name Cannot be Empty', + 'An error has occured while saving', 'Save unsuccessful', Constants.ToastTypes.ERROR ); } } -catch (error) { - this.toastService.addMessage( - 'An error has occured while saving', - 'Save unsuccessful', - Constants.ToastTypes.ERROR - ); -} - } ngOnInit(): void { - this.issuingAgencyService.getIssuingAgencies() + this.issuingAgencyService + .getIssuingAgencies() .then(response => { const agencies = {}; if (response && Array.isArray(response)) { diff --git a/angular/projects/admin-nrpti/src/app/agencies/agencies.module.ts b/angular/projects/admin-nrpti/src/app/agencies/agencies.module.ts index fad361202..e7fe1d8d8 100644 --- a/angular/projects/admin-nrpti/src/app/agencies/agencies.module.ts +++ b/angular/projects/admin-nrpti/src/app/agencies/agencies.module.ts @@ -12,7 +12,6 @@ import { CommonModule as NrptiCommonModule } from '../../../../common/src/app/co import { AgenciesComponent } from './agencies.component'; import { AgenciesResolver } from './agencies.resolver'; - @NgModule({ imports: [ BrowserModule, @@ -23,17 +22,11 @@ import { AgenciesResolver } from './agencies.resolver'; GlobalModule, NrptiCommonModule, RouterModule, - NgbModule, - ], - declarations: [ - AgenciesComponent - ], - providers: [ - AgenciesResolver - ], - entryComponents: [ - AgenciesComponent + NgbModule ], + declarations: [AgenciesComponent], + providers: [AgenciesResolver], + entryComponents: [AgenciesComponent], exports: [] }) export class AgenciesModule {} diff --git a/angular/projects/admin-nrpti/src/app/agencies/agencies.resolver.ts b/angular/projects/admin-nrpti/src/app/agencies/agencies.resolver.ts index 9ff8a6b31..c2bfd86e8 100644 --- a/angular/projects/admin-nrpti/src/app/agencies/agencies.resolver.ts +++ b/angular/projects/admin-nrpti/src/app/agencies/agencies.resolver.ts @@ -2,7 +2,6 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; import { Observable } from 'rxjs/Observable'; - @Injectable() export class AgenciesResolver implements Resolve> { resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/angular/projects/admin-nrpti/src/app/app.module.ts b/angular/projects/admin-nrpti/src/app/app.module.ts index 870eb6de2..604a75d2e 100644 --- a/angular/projects/admin-nrpti/src/app/app.module.ts +++ b/angular/projects/admin-nrpti/src/app/app.module.ts @@ -60,14 +60,17 @@ import { TokenInterceptor } from './utils/token-interceptor'; import { RecordUtils } from './records/utils/record-utils'; import { CollectionService } from './services/collection.service'; - -export function initConfig(configService: ConfigService, keycloakService: KeycloakService, applicationAgency: ApplicationAgencyService) { +export function initConfig( + configService: ConfigService, + keycloakService: KeycloakService, + applicationAgency: ApplicationAgencyService +) { return async () => { await configService.init(); await keycloakService.init(); await applicationAgency.init(); - } -}; + }; +} export function overlayScrollFactory(overlay: Overlay): () => CloseScrollStrategy { return () => overlay.scrollStrategies.close(); @@ -141,7 +144,7 @@ export function overlayScrollFactory(overlay: Overlay): () => CloseScrollStrateg NewsListResolver, CanActivateGuard, CanDeactivateGuard, - RecordUtils, + RecordUtils ], entryComponents: [ConfirmComponent, HomeComponent, ImportComponent, ImportTableRowsComponent], bootstrap: [AppComponent] diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.html b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.html index efcf27000..c32acf728 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.html +++ b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.html @@ -39,8 +39,8 @@

Basic Information

[control]="myForm.controls.dateIssued" [isValidate]="true" [minDate]="datepickerMinDate" - [maxDate]="datepickerMaxDate"> - + [maxDate]="datepickerMaxDate" + >
@@ -51,7 +51,8 @@

Basic Information

id="recordType" type="text" value="Administrative Penalty" - class="form-control" /> + class="form-control" + />
@@ -79,8 +80,7 @@

Basic Information

[mines]="this.storeService.getItem('mines')" [epicProjects]="this.storeService.getItem('epicProjects')" [minesOnly]="false" - > - + >
@@ -115,7 +115,8 @@

Issued To

id="coastalGaslink" value="Coastal Gaslink" formControlName="projectName" - name="projectName" /> + name="projectName" + />
@@ -150,10 +151,12 @@

Location Details

Documents

+ (documentsToDelete)="documentsToDelete = $event" + > + (documentsChanged)="documents = $event" + >
@@ -169,7 +172,8 @@

BCMI Site Content

formControlName="publishBcmi" (change)="togglePublish($event, 'bcmi')" [checked]="myForm.controls.publishBcmi.value" - ngDefaultControl> + ngDefaultControl + > {{ myForm.controls.publishBcmi.value ? 'Published' : 'Unpublished' }} *Changes made will take effect once you click "Update Record" @@ -184,7 +188,8 @@

BCMI Site Content

type="text" formControlName="bcmiSummary" class="form-control" - rows="5"> + rows="5" + >
@@ -202,7 +207,8 @@

LNG Site Content

formControlName="publishLng" (change)="togglePublish($event, 'lng')" [checked]="myForm.controls.publishLng.value" - ngDefaultControl> + ngDefaultControl + > {{ myForm.controls.publishLng.value ? 'Published' : 'Unpublished' }} *Changes made will take effect once you click "Update Record" @@ -217,7 +223,8 @@

LNG Site Content

type="text" formControlName="lngDescription" class="form-control" - rows="5"> + rows="5" + > @@ -235,7 +242,8 @@

NRCED Site Content

formControlName="publishNrced" (change)="togglePublish($event, 'nrced')" [checked]="myForm.controls.publishNrced.value" - ngDefaultControl> + ngDefaultControl + > {{ myForm.controls.publishNrced.value ? 'Published' : 'Unpublished' }} *Changes made will take effect once you click "Update Record" @@ -250,7 +258,8 @@

NRCED Site Content

type="text" formControlName="nrcedSummary" class="form-control" - rows="5"> + rows="5" + > diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.spec.ts b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.spec.ts index f0fe6d698..9d1c1d6b7 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.spec.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.spec.ts @@ -19,7 +19,14 @@ import { EventEmitter } from '@angular/core'; describe('AdministrativePenaltyAddEditComponent', () => { const testBedHelper = new TestBedHelper(AdministrativePenaltyAddEditComponent); - const mockFactoryService = jasmine.createSpyObj('FactoryService', ['userInLngRole', 'userInBcmiRole', 'userInNrcedRole', 'userOnlyInLimitedRole', 'userInRole', 'isFlavourEditEnabled']); + const mockFactoryService = jasmine.createSpyObj('FactoryService', [ + 'userInLngRole', + 'userInBcmiRole', + 'userInNrcedRole', + 'userOnlyInLimitedRole', + 'userInRole', + 'isFlavourEditEnabled' + ]); mockFactoryService.userInLngRole.and.returnValue(true); mockFactoryService.userInBcmiRole.and.returnValue(true); mockFactoryService.userInNrcedRole.and.returnValue(true); @@ -43,7 +50,7 @@ describe('AdministrativePenaltyAddEditComponent', () => { } }; - beforeEach((() => { + beforeEach(() => { TestBed.configureTestingModule({ imports: [ RouterTestingModule, @@ -68,7 +75,7 @@ describe('AdministrativePenaltyAddEditComponent', () => { ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }).compileComponents(); - })); + }); it('should create', () => { const { component } = testBedHelper.createComponent(); diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts index 4cf7d903a..e550f2a32 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, LoggerService, StoreService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-administrative-penalty-add-edit', @@ -58,8 +59,8 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy protected utils: Utils, protected _changeDetectionRef: ChangeDetectorRef, // @ts-ignore used by record-association component - protected storeService: StoreService, - ) { } + protected storeService: StoreService + ) {} ngOnInit() { this.route.data.pipe(takeUntil(this.ngUnsubscribe)).subscribe((res: any) => { @@ -86,7 +87,7 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy this.loading = false; this._changeDetectionRef.detectChanges(); }); - } + } protected populateTextFields() { if (this.currentRecord.dateUpdated) { @@ -158,31 +159,32 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy // Master recordName: new FormControl({ value: (this.currentRecord && this.currentRecord.recordName) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') && - !this.factoryService.userInLngRole() + disabled: + this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' && !this.factoryService.userInLngRole() }), dateIssued: new FormControl({ - value: (this.currentRecord && - this.currentRecord.dateIssued && - this.utils.convertJSDateToNGBDate(new Date(this.currentRecord.dateIssued))) || + value: + (this.currentRecord && + this.currentRecord.dateIssued && + this.utils.convertJSDateToNGBDate(new Date(this.currentRecord.dateIssued))) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), issuingAgency: new FormControl({ value: (this.currentRecord && this.currentRecord.issuingAgency) || this.defaultAgency, - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), author: new FormControl({ value: (this.currentRecord && this.currentRecord.author) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), association: new FormGroup({ _epicProjectId: new FormControl({ - value: this.currentRecord && this.currentRecord._epicProjectId || null, + value: (this.currentRecord && this.currentRecord._epicProjectId) || null, disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), mineGuid: new FormControl({ - value: this.currentRecord && this.currentRecord.mineGuid || null, + value: (this.currentRecord && this.currentRecord.mineGuid) || null, disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), unlistedMine: new FormControl({ @@ -197,56 +199,57 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy issuedTo: new FormGroup({ type: new FormControl({ value: (this.currentRecord && this.currentRecord.issuedTo && this.currentRecord.issuedTo.type) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), companyName: new FormControl({ value: (this.currentRecord && this.currentRecord.issuedTo && this.currentRecord.issuedTo.companyName) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), firstName: new FormControl({ value: (this.currentRecord && this.currentRecord.issuedTo && this.currentRecord.issuedTo.firstName) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), middleName: new FormControl({ value: (this.currentRecord && this.currentRecord.issuedTo && this.currentRecord.issuedTo.middleName) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), lastName: new FormControl({ value: (this.currentRecord && this.currentRecord.issuedTo && this.currentRecord.issuedTo.lastName) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), fullName: new FormControl({ value: (this.currentRecord && this.currentRecord.issuedTo && this.currentRecord.issuedTo.fullName) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), dateOfBirth: new FormControl({ - value: (this.currentRecord && - this.currentRecord.issuedTo && - this.currentRecord.issuedTo.dateOfBirth && - this.utils.convertJSDateToNGBDate(new Date(this.currentRecord.issuedTo.dateOfBirth))) || + value: + (this.currentRecord && + this.currentRecord.issuedTo && + this.currentRecord.issuedTo.dateOfBirth && + this.utils.convertJSDateToNGBDate(new Date(this.currentRecord.issuedTo.dateOfBirth))) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), anonymous: new FormControl({ value: (this.currentRecord && this.currentRecord.issuedTo && this.currentRecord.issuedTo.anonymous) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }) }), projectName: new FormControl({ value: (this.currentRecord && this.currentRecord.projectName) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), location: new FormControl({ value: (this.currentRecord && this.currentRecord.location) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), latitude: new FormControl({ value: (this.currentRecord && this.currentRecord.centroid && this.currentRecord.centroid[1]) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), longitude: new FormControl({ value: (this.currentRecord && this.currentRecord.centroid && this.currentRecord.centroid[0]) || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), legislations: new FormArray(this.getLegislationsFormGroups()), @@ -303,27 +306,27 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy new FormGroup({ act: new FormControl({ value: leg.act || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), regulation: new FormControl({ value: leg.regulation || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), section: new FormControl({ value: leg.section || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), subSection: new FormControl({ value: leg.subSection || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), paragraph: new FormControl({ value: leg.paragraph || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), offence: new FormControl({ value: leg.offence || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }) }) ); @@ -331,7 +334,6 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy return legislations; } - /** * Parses an array of legislations FormGroups into objects expected by the API. * @@ -379,21 +381,21 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy new FormGroup({ type: new FormControl({ value: penalty.type || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), penalty: new FormGroup({ type: new FormControl({ value: penalty.penalty.type || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }), value: new FormControl({ value: penalty.penalty.value || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }) }), description: new FormControl({ value: penalty.description || '', - disabled: (this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti') + disabled: this.currentRecord && this.currentRecord.sourceSystemRef !== 'nrpti' }) }) ); @@ -449,7 +451,7 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy case 'nrced': this.myForm.controls.publishNrced.setValue(event.checked); break; - case 'bcmi': + case 'bcmi': this.myForm.controls.publishBcmi.setValue(event.checked); break; default: @@ -475,13 +477,14 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy this.myForm.get('dateIssued').value )); (this.myForm.controls.issuingAgency.dirty || this.defaultAgency) && - (administrativePenalty['issuingAgency'] = Picklists.getAgencyCode(this.factoryService, this.myForm.controls.issuingAgency.value)); - //(administrativePenalty['issuingAgency'] = this.myForm.controls.issuingAgency.value); + (administrativePenalty['issuingAgency'] = Picklists.getAgencyCode( + this.factoryService, + this.myForm.controls.issuingAgency.value + )); + // (administrativePenalty['issuingAgency'] = this.myForm.controls.issuingAgency.value); this.myForm.controls.author.dirty && (administrativePenalty['author'] = this.myForm.controls.author.value); - if ( - this.myForm.get('association._epicProjectId').dirty - ) { + if (this.myForm.get('association._epicProjectId').dirty) { administrativePenalty['_epicProjectId'] = this.myForm.get('association._epicProjectId').value; } @@ -537,11 +540,12 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy this.myForm.controls.location.dirty && (administrativePenalty['location'] = this.myForm.controls.location.value); administrativePenalty['centroid'] = []; if (this.myForm.controls.latitude.value && this.myForm.controls.longitude.value) { - (administrativePenalty['centroid'] = [this.myForm.controls.longitude.value, this.myForm.controls.latitude.value]); + administrativePenalty['centroid'] = [this.myForm.controls.longitude.value, this.myForm.controls.latitude.value]; } // tslint:disable-next-line:max-line-length - this.myForm.get('legislations').dirty && (administrativePenalty['legislation'] = this.parseLegislationsFormGroups()); + this.myForm.get('legislations').dirty && + (administrativePenalty['legislation'] = this.parseLegislationsFormGroups()); this.myForm.get('penalties').dirty && (administrativePenalty['penalties'] = this.parsePenaltiesFormGroups()); @@ -573,9 +577,8 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy if (this.myForm.controls.bcmiSummary.dirty || this.myForm.controls.publishBcmi.dirty) { administrativePenalty['AdministrativePenaltyBCMI'] = {}; } - this.myForm.controls.bcmiSummary.dirty && ( - administrativePenalty['AdministrativePenaltyBCMI']['summary'] = this.myForm.controls.bcmiSummary.value - ); + this.myForm.controls.bcmiSummary.dirty && + (administrativePenalty['AdministrativePenaltyBCMI']['summary'] = this.myForm.controls.bcmiSummary.value); if (this.myForm.controls.publishBcmi.dirty && this.myForm.controls.publishBcmi.value) { administrativePenalty['AdministrativePenaltyBCMI']['addRole'] = 'public'; } else if (this.myForm.controls.publishBcmi.dirty && !this.myForm.controls.publishBcmi.value) { @@ -662,7 +665,8 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-bcmi-detail/administrative-penalty-bcmi-detail.component.spec.ts b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-bcmi-detail/administrative-penalty-bcmi-detail.component.spec.ts index 7cfa09432..da8ef1ebb 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-bcmi-detail/administrative-penalty-bcmi-detail.component.spec.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-bcmi-detail/administrative-penalty-bcmi-detail.component.spec.ts @@ -17,17 +17,23 @@ describe('AdministrativePenaltyBCMIDetailComponent', () => { const mockRouter = jasmine.createSpyObj('Router', ['navigate']); const mockActivatedRoute = new ActivatedRouteStub(); - const mockFactoryService = jasmine.createSpyObj('FactoryService', ['userInLngRole', 'userInBcmiRole', 'userInNrcedRole', 'userOnlyInLimitedRole', 'userInRole']); + const mockFactoryService = jasmine.createSpyObj('FactoryService', [ + 'userInLngRole', + 'userInBcmiRole', + 'userInNrcedRole', + 'userOnlyInLimitedRole', + 'userInRole' + ]); mockFactoryService.userInLngRole.and.returnValue(true); mockFactoryService.userInBcmiRole.and.returnValue(true); mockFactoryService.userInNrcedRole.and.returnValue(true); const mockStoreService = { - getItem: () => { }, + getItem: () => {}, stateChange: new EventEmitter() }; - beforeEach((() => { + beforeEach(() => { TestBed.configureTestingModule({ imports: [RouterTestingModule, GlobalModule], declarations: [AdministrativePenaltyBCMIDetailComponent], @@ -39,7 +45,7 @@ describe('AdministrativePenaltyBCMIDetailComponent', () => { { provide: FactoryService, useValue: mockFactoryService } ] }).compileComponents(); - })); + }); it('should create', () => { const { component } = testBedHelper.createComponent(); diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-bcmi-detail/administrative-penalty-bcmi-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-bcmi-detail/administrative-penalty-bcmi-detail.component.ts index 5a3612894..130c77822 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-bcmi-detail/administrative-penalty-bcmi-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-bcmi-detail/administrative-penalty-bcmi-detail.component.ts @@ -25,7 +25,7 @@ export class AdministrativePenaltyBCMIDetailComponent extends RecordComponent im public factoryService: FactoryService, private logger: LoggerService, public changeDetectionRef: ChangeDetectorRef, - public datePipe: DatePipe, + public datePipe: DatePipe ) { super(); } @@ -54,7 +54,9 @@ export class AdministrativePenaltyBCMIDetailComponent extends RecordComponent im const requiredRoles = Constants.FlavourEditRequiredRoles.ADMINISTRATIVE_PENALTY.BCMI; for (const role of requiredRoles) { - if (this.factoryService.userInRole(role) && this.data.write && this.data.write.includes(role)) { return true; } + if (this.factoryService.userInRole(role) && this.data.write && this.data.write.includes(role)) { + return true; + } } return false; diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.html b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.html index 0994e0655..fb718d000 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.html +++ b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.html @@ -87,7 +87,9 @@

Shared Data [Master]

- {{ data && data._master.centroid ? data._master.centroid[1] + '/' + data._master.centroid[0]: '-' }} + + {{ data && data._master.centroid ? data._master.centroid[1] + '/' + data._master.centroid[0] : '-' }} +
diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.ts index f5c4bfc24..b1c1ffa13 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-administrative-penalty-detail', @@ -60,7 +60,8 @@ export class AdministrativePenaltyDetailComponent extends RecordDetailComponent } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } navigateToEditPage() { diff --git a/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts b/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts index 81fd692df..e19925ae0 100644 --- a/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts @@ -5,44 +5,41 @@ import { HttpClient } from '@angular/common/http'; @Injectable() export class ApplicationAgencyService { - private api: string; - private agencies: { [key: string]: string } = {}; + private api: string; + private agencies: { [key: string]: string } = {}; - constructor( - private configService: ConfigService, - public http: HttpClient - ) {} + constructor(private configService: ConfigService, public http: HttpClient) {} - async init() { - this.api = `${this.configService.config['API_LOCATION']}${this.configService.config['API_PATH']}`; - await this.refreshAgencies().toPromise(); - } + async init() { + this.api = `${this.configService.config['API_LOCATION']}${this.configService.config['API_PATH']}`; + await this.refreshAgencies().toPromise(); + } - refreshAgencies(): Observable { - return new Observable(observer => { - const apiEndpoint = `${this.api}/list-agencies`; - const getAgencies = this.http.get<{ [key: string]: string }>(apiEndpoint); + refreshAgencies(): Observable { + return new Observable(observer => { + const apiEndpoint = `${this.api}/list-agencies`; + const getAgencies = this.http.get<{ [key: string]: string }>(apiEndpoint); - getAgencies.subscribe( - (response) => { - // Data transformation to make the data easier to work with - const agencyList = {} - for (const record in response) { - agencyList[response[record]["agencyCode"]] = response[record]["agencyName"] - } - this.agencies = agencyList; - observer.next(); - observer.complete(); - }, - (error) => { - console.error("HTTP Request Error: ", error); - observer.error(error); - } - ); - }); - } + getAgencies.subscribe( + response => { + // Data transformation to make the data easier to work with + const agencyList = {}; + for (const record in response) { + agencyList[response[record]['agencyCode']] = response[record]['agencyName']; + } + this.agencies = agencyList; + observer.next(); + observer.complete(); + }, + error => { + console.error('HTTP Request Error: ', error); + observer.error(error); + } + ); + }); + } - getAgencies(): { [key: string]: string } { - return this.agencies; - } + getAgencies(): { [key: string]: string } { + return this.agencies; + } } diff --git a/angular/projects/admin-nrpti/src/app/services/factory.service.ts b/angular/projects/admin-nrpti/src/app/services/factory.service.ts index e725dd190..32254de16 100644 --- a/angular/projects/admin-nrpti/src/app/services/factory.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/factory.service.ts @@ -36,7 +36,7 @@ export class FactoryService { private _documentService: DocumentService; private _configService: ConfigService; private _mapLayerInfoService: MapLayerInfoService; - private _applicationAgencyService: ApplicationAgencyService + private _applicationAgencyService: ApplicationAgencyService; constructor(private injector: Injector) { // The following items are loaded by a file that is only present on cluster builds. @@ -256,7 +256,6 @@ export class FactoryService { } isFlavourEditEnabled(requiredRoles: string[]) { - for (const role of requiredRoles) { if (this.userInRole(role)) { return true; @@ -618,13 +617,13 @@ export class FactoryService { return isInsert ? this.recordService - .createRecord(dataPackage) - .pipe(catchError(error => this.apiService.handleError(error))) - .toPromise() + .createRecord(dataPackage) + .pipe(catchError(error => this.apiService.handleError(error))) + .toPromise() : this.recordService - .editRecord(dataPackage) - .pipe(catchError(error => this.apiService.handleError(error))) - .toPromise(); + .editRecord(dataPackage) + .pipe(catchError(error => this.apiService.handleError(error))) + .toPromise(); } public createConfigData(configData, application): Promise { @@ -650,11 +649,11 @@ export class FactoryService { * @memberof FactoryService */ public getApplicationAgencyService(): Observable { - if (Object.keys(this.applicationAgencyService.getAgencies).length === 0) { - this.applicationAgencyService.refreshAgencies().subscribe(() => { - this.applicationAgencyService.getAgencies(); - }); - } - return this.applicationAgencyService.refreshAgencies(); + if (Object.keys(this.applicationAgencyService.getAgencies).length === 0) { + this.applicationAgencyService.refreshAgencies().subscribe(() => { + this.applicationAgencyService.getAgencies(); + }); + } + return this.applicationAgencyService.refreshAgencies(); } } diff --git a/angular/projects/admin-nrpti/src/app/services/import.service.ts b/angular/projects/admin-nrpti/src/app/services/import.service.ts index bd9dd34aa..513b8a709 100644 --- a/angular/projects/admin-nrpti/src/app/services/import.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/import.service.ts @@ -16,7 +16,7 @@ export class ImportService { private configService: ConfigService, private eventService: EventService ) { - this.data = new BehaviorSubject(new SearchResult); + this.data = new BehaviorSubject(new SearchResult()); this.fetchDataConfig = this.configService.config['DEFAULT_IMPORT_TABLE_QUERY_PARAMS']; } @@ -49,7 +49,6 @@ export class ImportService { pageSize: number = 20, sortBy: string = null ) { - // Caching for later this.fetchDataConfig = { pathAPI: pathAPI, @@ -63,26 +62,13 @@ export class ImportService { let res = null; try { - res = await this.factoryService.searchService.getSearchResults( - pathAPI, - keys, - dataset, - fields, - pageNum, - pageSize, - sortBy - ).toPromise(); + res = await this.factoryService.searchService + .getSearchResults(pathAPI, keys, dataset, fields, pageNum, pageSize, sortBy) + .toPromise(); } catch (error) { - this.eventService.setError( - new EventObject( - EventKeywords.ERROR, - error, - 'Import Service' - ) - ); + this.eventService.setError(new EventObject(EventKeywords.ERROR, error, 'Import Service')); } - // tslint:disable-next-line: prefer-const let searchResult = new SearchResult(); @@ -91,31 +77,19 @@ export class ImportService { searchResult.data = res[0].data.searchResults; } else { this.eventService.setError( - new EventObject( - EventKeywords.ERROR, - 'Search results were empty.', - 'Import Service' - ) + new EventObject(EventKeywords.ERROR, 'Search results were empty.', 'Import Service') ); } if (res[0].data.meta[0] && res[0].data.meta[0].searchResultsTotal) { searchResult.totalSearchCount = res[0].data.meta[0].searchResultsTotal; } else { this.eventService.setError( - new EventObject( - EventKeywords.ERROR, - 'Total search results count was not returned.', - 'Import Service' - ) + new EventObject(EventKeywords.ERROR, 'Total search results count was not returned.', 'Import Service') ); } } else { this.eventService.setError( - new EventObject( - EventKeywords.ERROR, - 'No data was returned from the server.', - 'Import Service' - ) + new EventObject(EventKeywords.ERROR, 'No data was returned from the server.', 'Import Service') ); } this.setValue(searchResult); diff --git a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts index 19c10f30b..c139d5d37 100644 --- a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts @@ -19,7 +19,7 @@ export class IssuingAgencyService { public updateAgency(agencyCode: string, agencyName: any): Promise { const apiUrl = `${this.apiService.pathAPI}/update-agencies`; - let updatedAgency = { agencies: [{ agencyCode: agencyCode, agencyName: agencyName }] }; // Wrap the array in an object + const updatedAgency = { agencies: [{ agencyCode: agencyCode, agencyName: agencyName }] }; // Wrap the array in an object console.log(JSON.stringify(updatedAgency)); return this.http .put(apiUrl, updatedAgency) diff --git a/angular/projects/admin-nrpti/src/app/services/keycloak.service.ts b/angular/projects/admin-nrpti/src/app/services/keycloak.service.ts index 2d5f672fe..b241a3880 100644 --- a/angular/projects/admin-nrpti/src/app/services/keycloak.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/keycloak.service.ts @@ -163,7 +163,7 @@ export class KeycloakService { roles.includes(Constants.ApplicationRoles.ADMIN_BCMI); this.menus[Constants.Menus.AGENCIES] = - roles.includes(Constants.ApplicationRoles.ADMIN) + roles.includes(Constants.ApplicationRoles.ADMIN); } buildAddRecordDropdownCache(roles) { diff --git a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html index a014c6dc9..9d5bbd699 100644 --- a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html +++ b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html @@ -1,114 +1,136 @@
- -
- + + (click)="activateLoading(['/mines'])" + > view_list All Mines
-
+
- + [routerLink]="['mines', 'enforcement-actions']" + > description Enforcement Actions - + [routerLink]="['mines', currentMineId, 'detail']" + > Mine Details - + [routerLink]="['mines', currentMineId, 'records']" + > description Mine Records - + [routerLink]="['mines', currentMineId, 'collections']" + > collections_bookmark Mine Collections
-
- + + (click)="activateLoading(['/records'])" + > view_list All Records - + [routerLink]="['/news']" + > notifications_active News List - + [routerLink]="['/analytics']" + > assessment Analytics - + [routerLink]="['/map']" + > map Map - + [routerLink]="['/entities']" + > people Entities - + [routerLink]="['/imports']" + > import_export Imports - + [routerLink]="['/communications', 'BCMI']" + > chat Communications - + [routerLink]="['/agencies']" + > edit Agencies
-
\ No newline at end of file + diff --git a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.spec.ts b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.spec.ts index d18c43403..a0810ab8c 100644 --- a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.spec.ts +++ b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.spec.ts @@ -16,7 +16,7 @@ describe('SidebarComponent', () => { const mockStoreService = { change: of(), - toggleSideNave: () => { } + toggleSideNave: () => {} }; const mockLoadingScreenService = { @@ -27,24 +27,42 @@ describe('SidebarComponent', () => { }; const mockKeyCloakService = { - isMenuEnabled: (menuName) => { + isMenuEnabled: menuName => { let retVal = false; switch (menuName) { - case Constants.Menus.ALL_MINES: retVal = true; break; - case Constants.Menus.ALL_RECORDS: retVal = true; break; - case Constants.Menus.NEWS_LIST: retVal = true; break; - case Constants.Menus.ANALYTICS: retVal = false; break; - case Constants.Menus.MAP: retVal = false; break; - case Constants.Menus.ENTITIES: retVal = false; break; - case Constants.Menus.IMPORTS: retVal = true; break; - case Constants.Menus.COMMUNICATIONS: retVal = true; break; - case Constants.Menus.AGENCIES: retVal = true; break; + case Constants.Menus.ALL_MINES: + retVal = true; + break; + case Constants.Menus.ALL_RECORDS: + retVal = true; + break; + case Constants.Menus.NEWS_LIST: + retVal = true; + break; + case Constants.Menus.ANALYTICS: + retVal = false; + break; + case Constants.Menus.MAP: + retVal = false; + break; + case Constants.Menus.ENTITIES: + retVal = false; + break; + case Constants.Menus.IMPORTS: + retVal = true; + break; + case Constants.Menus.COMMUNICATIONS: + retVal = true; + break; + case Constants.Menus.AGENCIES: + retVal = true; + break; } return retVal; } }; - beforeEach((() => { + beforeEach(() => { TestBed.configureTestingModule({ imports: [RouterTestingModule], declarations: [SidebarComponent], @@ -55,7 +73,7 @@ describe('SidebarComponent', () => { { provide: KeycloakService, useValue: mockKeyCloakService } ] }).compileComponents(); - })); + }); it('sidebar menu should render properly', () => { const routerMock = TestBed.get(Router); diff --git a/angular/projects/admin-nrpti/src/app/utils/constants/ams-csv-constants.ts b/angular/projects/admin-nrpti/src/app/utils/constants/ams-csv-constants.ts index e5ee5b936..d632a5d25 100644 --- a/angular/projects/admin-nrpti/src/app/utils/constants/ams-csv-constants.ts +++ b/angular/projects/admin-nrpti/src/app/utils/constants/ams-csv-constants.ts @@ -20,12 +20,7 @@ export const amsOrdersCsvRequiredHeaders = [ * Required fields for AMS Order csv. * */ -export const amsOrdersCsvRequiredFields = [ - 'AuthNumber', - 'ClientName', - 'IssueDate', - 'AuthorizationType', -]; +export const amsOrdersCsvRequiredFields = ['AuthNumber', 'ClientName', 'IssueDate', 'AuthorizationType']; /** * Fields for AMS Order csv that have a required format. diff --git a/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts b/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts index 579c6943d..7d147f425 100644 --- a/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts +++ b/angular/projects/admin-nrpti/src/app/utils/constants/misc.ts @@ -321,9 +321,7 @@ export class Constants { public static readonly RoleAgencyPickList: any = { [Constants.ApplicationRoles.ADMIN_WF]: ['BC Wildfire Service'], - [Constants.ApplicationRoles.ADMIN_FLNRO]: [ - 'Ministry of Environment and Climate Change Strategy' - ], + [Constants.ApplicationRoles.ADMIN_FLNRO]: ['Ministry of Environment and Climate Change Strategy'], [Constants.ApplicationRoles.ADMIN_FLNR_NRO]: ['Natural Resource Officers'], [Constants.ApplicationRoles.ADMIN_AGRI]: ['Ministry of Agriculture and Food'], [Constants.ApplicationRoles.ADMIN_ENV_EPD]: ['Ministry of Environment and Climate Change Strategy'], @@ -335,9 +333,7 @@ export class Constants { public static readonly RoleAgencyCodePickList: any = { [Constants.ApplicationRoles.ADMIN_WF]: ['AGENCY_WF'], - [Constants.ApplicationRoles.ADMIN_FLNRO]: [ - 'AGENCY_ENV' - ], + [Constants.ApplicationRoles.ADMIN_FLNRO]: ['AGENCY_ENV'], [Constants.ApplicationRoles.ADMIN_FLNR_NRO]: ['AGENCY_FLNR_NRO'], [Constants.ApplicationRoles.ADMIN_AGRI]: ['AGENCY_AGRI'], [Constants.ApplicationRoles.ADMIN_ENV_EPD]: ['AGENCY_ENV_EPD'], diff --git a/angular/projects/common/src/app/utils/record-constants.ts b/angular/projects/common/src/app/utils/record-constants.ts index 4572a8824..35c791f68 100644 --- a/angular/projects/common/src/app/utils/record-constants.ts +++ b/angular/projects/common/src/app/utils/record-constants.ts @@ -23,11 +23,9 @@ export class SearchSubsets { } export class Constants { - // Datepicker is off by one so add one to the desired year. public static readonly DatepickerMinDate = new Date('1901'); public static readonly DatepickerMaxDate = new Date(); - } /** * Schema lists for search. @@ -138,7 +136,6 @@ export enum StateStatus { * @class Picklists */ export class Picklists { - public static readonly orderSubtypePicklist = ['None', 'Cease', 'Remedy', 'Stop Work', 'Other']; public static readonly permitSubtypePicklist = ['Ancillary Site', 'General', 'Investigative Use', 'Road', 'Water']; public static readonly certificateSubtypePicklist = [ @@ -178,7 +175,7 @@ export class Picklists { 'Ministry of Environment and Climate Change Strategy 1', 'Ministry of Forests 1', 'Ministry of Water, Land and Resource Stewardship 1', - 'Natural Resource Officers 1', + 'Natural Resource Officers 1' ]; public static getAgencyNames(factoryService: FactoryService) { @@ -205,11 +202,9 @@ export class Picklists { 'AGENCY_ENV', 'AGENCY_FLNRO', 'AGENCY_WLRS', - 'AGENCY_FLNR_NRO', + 'AGENCY_FLNR_NRO' ]; - - public static readonly entityTypePicklist = ['Company', 'Individual']; public static readonly authorPicklist = ['BC Government', 'Proponent', 'Other']; @@ -299,7 +294,11 @@ export class Picklists { 'Report' ]; - public static readonly collectionAgencyPicklist = ['Environmental Assessment Office', 'Ministry of Energy Mines and Low Carbon Innovation', 'Ministry of Environment and Climate Change Strategy']; + public static readonly collectionAgencyPicklist = [ + 'Environmental Assessment Office', + 'Ministry of Energy Mines and Low Carbon Innovation', + 'Ministry of Environment and Climate Change Strategy' + ]; /** * Contains a mapping of acts to regulations. @@ -832,7 +831,7 @@ export class Picklists { * @memberof Picklists * @returns {string[]} sorted array of acts */ - public static getAllActs = function (): string[] { + public static getAllActs = function(): string[] { return Object.keys(this.legislationActsMappedToRegulations).sort((a, b) => a.localeCompare(b)); }; @@ -843,7 +842,7 @@ export class Picklists { * @memberof Picklists * @returns {string[]} sorted array of regulations */ - public static getAllRegulations = function (): string[] { + public static getAllRegulations = function(): string[] { const regulations = []; Object.keys(this.legislationActsMappedToRegulations).forEach(act => @@ -867,7 +866,7 @@ export class Picklists { * @memberof Picklists * @returns {{ [key: string]: string[] }} */ - public static getLegislationRegulationsMappedToActs = function (): { [key: string]: string[] } { + public static getLegislationRegulationsMappedToActs = function(): { [key: string]: string[] } { const regulations = {}; Object.keys(this.legislationActsMappedToRegulations).forEach(act => @@ -1274,8 +1273,7 @@ export class Picklists { 'Park Act': { '9': { '1': { - description: - 'For use of natural resource without valid park permit' + description: 'For use of natural resource without valid park permit' } }, '16': { @@ -1952,12 +1950,12 @@ export class Picklists { 'Park Act': { '17': { description: 'Park Act Order' - }, // nrpti-1085: Add new legislation description for orders - 'Park, Conservancy and Recreation Area Regulation' : { - '9': { - description: 'Order to leave a park, conservancy or recreation area' + }, // nrpti-1085: Add new legislation description for orders + 'Park, Conservancy and Recreation Area Regulation': { + '9': { + description: 'Order to leave a park, conservancy or recreation area' + } } - } }, 'Wildfire Act': { '7': { @@ -2540,7 +2538,7 @@ export class Picklists { }, '3': { description: 'Fail to submit separate fee' - }, + } }, '32': { '1': { @@ -2555,7 +2553,7 @@ export class Picklists { }, d: { description: 'Fail to ensure facility is of sound construction' - }, + } }, '2': { a: { @@ -2563,7 +2561,7 @@ export class Picklists { }, b: { description: 'Fail to have adequate ventilation' - }, + } }, '3': { description: 'Fail to have appropriate waste disposal system' @@ -2609,7 +2607,7 @@ export class Picklists { }, f: { description: 'Fail to review food safety plan annually or if required' - }, + } }, '3': { description: 'Fail to have a food safety plan in writing', @@ -2630,7 +2628,7 @@ export class Picklists { }, f: { description: 'Fail to keep appropriate records' - }, + } }, '4': { description: 'Fail to change food safety plan as directed' @@ -2657,7 +2655,7 @@ export class Picklists { }, d: { description: 'Fail to make sanitation plan/records available' - }, + } }, '2': { description: 'Fail to have sanitation plan in writing', @@ -2666,7 +2664,7 @@ export class Picklists { }, b: { description: 'Fail to identify cleaning/sanitizing agents and pesticides used' - }, + } } }, '42': { @@ -2676,7 +2674,7 @@ export class Picklists { }, b: { description: 'Fail to have pest proof containers' - }, + } }, '43': { '1': { @@ -2688,14 +2686,14 @@ export class Picklists { }, c: { description: 'Conduct activities that lead to unsafe food' - }, + } }, '2': { description: 'Fail to ensure handwashing' }, '3': { description: 'Fail to ensure tobacco/vapour products not used in facility' - }, + } }, '44': { description: 'Permit food contact by ill persons' @@ -2706,7 +2704,7 @@ export class Picklists { }, b: { description: 'Fail to keep fish as permitted by inspector' - }, + } }, '46': { a: { @@ -2714,7 +2712,7 @@ export class Picklists { }, b: { description: 'Fail to label chemicals/cleaners' - }, + } }, '47': { description: 'Fail to properly store/label' @@ -2731,7 +2729,7 @@ export class Picklists { }, '2': { description: 'Receive marine cultured fish from unacceptable source' - }, + } }, '51': { description: 'Process dead lobster/crab' @@ -2763,7 +2761,7 @@ export class Picklists { }, '3': { description: 'Fail to properly label carton of sport caught fish' - }, + } }, '55': { '1': { @@ -2778,7 +2776,7 @@ export class Picklists { }, c: { description: 'Fail to have system that verifies fish returned to sport fisher' - }, + } } }, '56': { @@ -2849,7 +2847,7 @@ export class Picklists { description: 'Fail to submit report' } } - }, + } }, 'Fisheries Act (Canada)': { 'Fishing (General) Regulations': { @@ -5157,8 +5155,7 @@ export class Picklists { * @static * @returns {string} legislation description or null */ - public static getLegislationDescription = function (recordType: string, legislation: Legislation): string { - + public static getLegislationDescription = function(recordType: string, legislation: Legislation): string { if (!recordType || (!legislation && !legislation.act && !legislation.section)) { return null; } @@ -5213,7 +5210,7 @@ export class Picklists { * @param {string[]} paths properties to descend, in order, through the object. * @returns the value found at the end of the path, or null */ - public static traverseObject = function (obj: object, paths: string[]) { + public static traverseObject = function(obj: object, paths: string[]) { if (!obj || !paths || !paths.length) { return null; } diff --git a/angular/projects/public-nrpti/src/app/services/api.service.ts b/angular/projects/public-nrpti/src/app/services/api.service.ts index 45625f980..623525c85 100644 --- a/angular/projects/public-nrpti/src/app/services/api.service.ts +++ b/angular/projects/public-nrpti/src/app/services/api.service.ts @@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http'; import { Observable, throwError } from 'rxjs'; import { Document } from '../../../../common/src/app/models/document'; -import { Utils, ConfigService , LoggerService} from 'nrpti-angular-components'; +import { Utils, ConfigService, LoggerService } from 'nrpti-angular-components'; /** * TODO: populate this documentation @@ -19,17 +19,12 @@ export class ApiService { pathAPI: string; env: 'local' | 'dev' | 'test' | 'prod'; - constructor( - public http: HttpClient, - private configService: ConfigService, - private logger: LoggerService - ) { - this.isMS = window.navigator.msSaveOrOpenBlob ? true : false; + constructor(public http: HttpClient, private configService: ConfigService, private logger: LoggerService) { + this.isMS = window.navigator.msSaveOrOpenBlob ? true : false; - this.env = this.configService.config['ENVIRONMENT']; + this.env = this.configService.config['ENVIRONMENT']; - this.pathAPI = this.configService.config['API_LOCATION'] - + this.configService.config['API_PUBLIC_PATH']; + this.pathAPI = this.configService.config['API_LOCATION'] + this.configService.config['API_PUBLIC_PATH']; } /** From 7f085376d69929cfcc17101ceffd284662311375 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 25 Sep 2023 16:42:14 -0700 Subject: [PATCH 39/77] linting updates --- angular/projects/admin-nrpti/src/app/app.module.ts | 2 +- ...plicationAgency.service.ts => application-agency.service.ts} | 0 .../projects/admin-nrpti/src/app/services/factory.service.ts | 2 +- angular/projects/global/src/lib/utils/utils.ts | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename angular/projects/admin-nrpti/src/app/services/{applicationAgency.service.ts => application-agency.service.ts} (100%) diff --git a/angular/projects/admin-nrpti/src/app/app.module.ts b/angular/projects/admin-nrpti/src/app/app.module.ts index 604a75d2e..ed57b295b 100644 --- a/angular/projects/admin-nrpti/src/app/app.module.ts +++ b/angular/projects/admin-nrpti/src/app/app.module.ts @@ -44,7 +44,7 @@ import { RecordService } from './services/record.service'; import { TaskService } from './services/task.service'; import { ConfigService, LoggerService } from 'nrpti-angular-components'; import { NewsService } from './services/news.service'; -import { ApplicationAgencyService } from './services/applicationAgency.service'; +import { ApplicationAgencyService } from './services/application-agency.service'; // resolvers import { ImportListResolver } from './import/import-list-resolver'; diff --git a/angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts b/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts similarity index 100% rename from angular/projects/admin-nrpti/src/app/services/applicationAgency.service.ts rename to angular/projects/admin-nrpti/src/app/services/application-agency.service.ts diff --git a/angular/projects/admin-nrpti/src/app/services/factory.service.ts b/angular/projects/admin-nrpti/src/app/services/factory.service.ts index 32254de16..1c87a3759 100644 --- a/angular/projects/admin-nrpti/src/app/services/factory.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/factory.service.ts @@ -13,7 +13,7 @@ import { NewsService } from './news.service'; import { CollectionService } from './collection.service'; import { MineService } from './mine.service'; import { MapLayerInfoService } from './map-layer-info.service'; -import { ApplicationAgencyService } from './applicationAgency.service'; +import { ApplicationAgencyService } from './application-agency.service'; /** * Facade service for all admin-nrpti services. diff --git a/angular/projects/global/src/lib/utils/utils.ts b/angular/projects/global/src/lib/utils/utils.ts index 7f00f9b26..bc6bc7a0f 100644 --- a/angular/projects/global/src/lib/utils/utils.ts +++ b/angular/projects/global/src/lib/utils/utils.ts @@ -15,7 +15,7 @@ const ApplicationAgencies: any = { AGENCY_WLRS: 'Ministry of Water, Land and Resource Stewardship', }; -export var ApplicationAgencyList = { +export const ApplicationAgencyList = { AGENCY_ALC: 'Agricultural Land Commission', AGENCY_WF: 'BC Wildfire Service', AGENCY_ENV_COS: 'Conservation Officer Service', From afea3a50ba9e39f1d4162d63f69a55dd2fb3fc2e Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 25 Sep 2023 16:49:32 -0700 Subject: [PATCH 40/77] linting updates --- .../src/app/services/application-agency.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts b/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts index e19925ae0..cc7e467b4 100644 --- a/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts @@ -25,7 +25,9 @@ export class ApplicationAgencyService { // Data transformation to make the data easier to work with const agencyList = {}; for (const record in response) { - agencyList[response[record]['agencyCode']] = response[record]['agencyName']; + if (response.hasOwnProperty(record)) { + agencyList[response[record]['agencyCode']] = response[record]['agencyName']; + } } this.agencies = agencyList; observer.next(); From 0aeedfbdbc526f2364683e15486e4234491316f9 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 29 Sep 2023 09:13:32 -0700 Subject: [PATCH 41/77] API unit tests fix --- .../src/lib/utils/agency-data-service.ts | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/angular/projects/global/src/lib/utils/agency-data-service.ts b/angular/projects/global/src/lib/utils/agency-data-service.ts index 835f9da6e..86d24831e 100644 --- a/angular/projects/global/src/lib/utils/agency-data-service.ts +++ b/angular/projects/global/src/lib/utils/agency-data-service.ts @@ -7,26 +7,39 @@ export class AgencyDataService { displayNameFull(agencyCode): string { // Access cached agency data from FactoryService - const agencyList = this.factoryService.applicationAgencyService.getAgencies(); - return agencyList[agencyCode] || agencyCode; + const agencyService = this.factoryService.applicationAgencyService; + const agencyList = agencyService ? agencyService.getAgencies() : null; + + return agencyList && agencyList[agencyCode] ? agencyList[agencyCode] : agencyCode; } getAgencyCodes(): string[] { - const agencyList = this.factoryService.applicationAgencyService.getAgencies(); - return Object.keys(agencyList); + const agencyService = this.factoryService.applicationAgencyService; + const agencyList = agencyService ? agencyService.getAgencies() : null; + + return agencyList ? Object.keys(agencyList) : []; } getAgencyNames(): string[] { - const agencyList = this.factoryService.applicationAgencyService.getAgencies(); - return Object.values(agencyList); + const agencyService = this.factoryService.applicationAgencyService; + const agencyList = agencyService ? agencyService.getAgencies() : null; + + return agencyList ? Object.values(agencyList) : []; } getAgencyCode(agencyName: string): string { - const agencyList = this.factoryService.applicationAgencyService.getAgencies(); - for (const key in agencyList) { - if (agencyList.hasOwnProperty(key) && agencyList[key] === agencyName) { - return key; // Return the key if the value matches + const agencyService = this.factoryService.applicationAgencyService; + const agencyList = agencyService ? agencyService.getAgencies() : null; + + if (agencyList) { + for (const key in agencyList) { + if (agencyList.hasOwnProperty(key) && agencyList[key] === agencyName) { + return key; // Return the key if the value matches + } } } + // Return a default value or handle the case where agencyList is undefined or empty + return ''; } -} + +} \ No newline at end of file From af9720294ba87ac598abcb326990ae12de97e972 Mon Sep 17 00:00:00 2001 From: Dave <62899351+davidclaveau@users.noreply.github.com> Date: Fri, 29 Sep 2023 09:52:11 -0700 Subject: [PATCH 42/77] linting fix for agency-data-service --- angular/projects/global/src/lib/utils/agency-data-service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angular/projects/global/src/lib/utils/agency-data-service.ts b/angular/projects/global/src/lib/utils/agency-data-service.ts index 86d24831e..777690e9d 100644 --- a/angular/projects/global/src/lib/utils/agency-data-service.ts +++ b/angular/projects/global/src/lib/utils/agency-data-service.ts @@ -42,4 +42,4 @@ export class AgencyDataService { return ''; } -} \ No newline at end of file +} From 88749927de3fbfb50d08f8d9f8705c7429704409 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 29 Sep 2023 11:01:22 -0700 Subject: [PATCH 43/77] Agencies icon changed --- .../projects/admin-nrpti/src/app/sidebar/sidebar.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html index 9d5bbd699..50864f03b 100644 --- a/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html +++ b/angular/projects/admin-nrpti/src/app/sidebar/sidebar.component.html @@ -129,7 +129,7 @@ id="agencies" [routerLink]="['/agencies']" > - edit + computer Agencies From 612536c67527189fa27de5c0ddaf27e8bfbec916 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 29 Sep 2023 11:43:04 -0700 Subject: [PATCH 44/77] agency code updated --- .../records/orders/order-detail/order-detail.component.ts | 5 +++-- .../warnings/warning-add-edit/warning-add-edit.component.ts | 6 ++++-- .../warnings/warning-detail/warning-detail.component.ts | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/records/orders/order-detail/order-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/orders/order-detail/order-detail.component.ts index 3abeeece7..f5412d01d 100644 --- a/angular/projects/admin-nrpti/src/app/records/orders/order-detail/order-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/orders/order-detail/order-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-order-detail', @@ -64,7 +64,8 @@ export class OrderDetailComponent extends RecordDetailComponent implements OnIni } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/admin-nrpti/src/app/records/warnings/warning-add-edit/warning-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/warnings/warning-add-edit/warning-add-edit.component.ts index 1509bdc6e..ed6a1ea2a 100644 --- a/angular/projects/admin-nrpti/src/app/records/warnings/warning-add-edit/warning-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/warnings/warning-add-edit/warning-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, LoggerService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-warning-add-edit', @@ -32,7 +33,7 @@ export class WarningAddEditComponent implements OnInit, OnDestroy { public nrcedPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; public authors = Picklists.authorPicklist; public outcomeStatuses = Picklists.outcomeStatusPicklist; private defaultAgency = ''; @@ -474,7 +475,8 @@ export class WarningAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/warnings/warning-detail/warning-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/warnings/warning-detail/warning-detail.component.ts index 17de72a6d..35b52b0d3 100644 --- a/angular/projects/admin-nrpti/src/app/records/warnings/warning-detail/warning-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/warnings/warning-detail/warning-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-warning-detail', @@ -64,7 +64,8 @@ export class WarningDetailComponent extends RecordDetailComponent implements OnI } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { From 0b51cf19be3b51d6df11fe9a5d1df2b74ca8c8f9 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 29 Sep 2023 11:52:29 -0700 Subject: [PATCH 45/77] agency code updated --- .../self-report-add-edit/self-report-add-edit.component.ts | 6 ++++-- .../self-report-detail/self-report-detail.component.ts | 5 +++-- .../tickets/ticket-add-edit/ticket-add-edit.component.ts | 6 ++++-- .../tickets/ticket-detail/ticket-detail.component.ts | 5 +++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.ts index bae2505b7..dbd2c7449 100644 --- a/angular/projects/admin-nrpti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, LoggerService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-self-report-add-edit', @@ -30,7 +31,7 @@ export class SelfReportAddEditComponent implements OnInit, OnDestroy { public lngPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; public authors = Picklists.authorPicklist; // Documents @@ -358,7 +359,8 @@ export class SelfReportAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/self-reports/self-report-detail/self-report-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/self-reports/self-report-detail/self-report-detail.component.ts index 0fab58896..c56a64f44 100644 --- a/angular/projects/admin-nrpti/src/app/records/self-reports/self-report-detail/self-report-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/self-reports/self-report-detail/self-report-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-self-report-detail', @@ -64,7 +64,8 @@ export class SelfReportDetailComponent extends RecordDetailComponent implements } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/admin-nrpti/src/app/records/tickets/ticket-add-edit/ticket-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/tickets/ticket-add-edit/ticket-add-edit.component.ts index 9086782c9..a8cbfd0af 100644 --- a/angular/projects/admin-nrpti/src/app/records/tickets/ticket-add-edit/ticket-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/tickets/ticket-add-edit/ticket-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, LoggerService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-ticket-add-edit', @@ -32,7 +33,7 @@ export class TicketAddEditComponent implements OnInit, OnDestroy { public nrcedPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; public authors = Picklists.authorPicklist; private defaultAgency = ''; @@ -541,7 +542,8 @@ export class TicketAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/tickets/ticket-detail/ticket-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/tickets/ticket-detail/ticket-detail.component.ts index e3d38de6a..502f6dd11 100644 --- a/angular/projects/admin-nrpti/src/app/records/tickets/ticket-detail/ticket-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/tickets/ticket-detail/ticket-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-ticket-detail', @@ -64,7 +64,8 @@ export class TicketDetailComponent extends RecordDetailComponent implements OnIn } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { From 0573f4217ba772ddbaffbf3c004023a5c04ec36a Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 29 Sep 2023 15:26:22 -0700 Subject: [PATCH 46/77] issuing agency replaced with api call --- .../administrative-sanction-add-edit.component.ts | 6 ++++-- .../administrative-sanction-detail.component.ts | 5 +++-- .../annual-report-add-edit.component.ts | 6 ++++-- .../annual-report-detail.component.ts | 5 +++-- .../certificate-amendments-add-edit.component.ts | 6 ++++-- .../certificate-amendments-detail.component.ts | 5 +++-- .../certificate-add-edit.component.ts | 6 ++++-- .../certificate-detail/certificate-detail.component.ts | 5 +++-- .../construction-plan-add-edit.component.ts | 6 ++++-- .../construction-plan-detail.component.ts | 5 +++-- .../correspondence-add-edit.component.ts | 6 ++++-- .../correspondence-detail.component.ts | 5 +++-- .../court-conviction-add-edit.component.ts | 6 ++++-- .../court-conviction-detail.component.ts | 5 +++-- .../dam-safety-inspection-add-edit.component.ts | 6 ++++-- .../dam-safety-inspection-detail.component.ts | 5 +++-- .../inspection-add-edit.component.ts | 8 +++++--- .../management-plan-add-edit.component.ts | 6 ++++-- .../management-plan-detail.component.ts | 10 +++++++--- .../permit-add-edit/permit-add-edit.component.ts | 6 ++++-- .../report-add-edit/report-add-edit.component.ts | 6 ++++-- .../reports/report-detail/report-detail.component.ts | 5 +++-- .../restorative-justice-add-edit.component.ts | 6 ++++-- .../restorative-justice-detail.component.ts | 5 +++-- 24 files changed, 90 insertions(+), 50 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-add-edit/administrative-sanction-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-add-edit/administrative-sanction-add-edit.component.ts index c6cc1b37a..f6b1b280e 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-add-edit/administrative-sanction-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-add-edit/administrative-sanction-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, LoggerService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-administrative-sanction-add-edit', @@ -32,7 +33,7 @@ export class AdministrativeSanctionAddEditComponent implements OnInit, OnDestroy public nrcedPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; public authors = Picklists.authorPicklist; private defaultAgency = ''; @@ -546,7 +547,8 @@ export class AdministrativeSanctionAddEditComponent implements OnInit, OnDestroy } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-detail/administrative-sanction-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-detail/administrative-sanction-detail.component.ts index c51923589..e65052557 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-detail/administrative-sanction-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-detail/administrative-sanction-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-administrative-sanction-detail', @@ -60,7 +60,8 @@ export class AdministrativeSanctionDetailComponent extends RecordDetailComponent } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } navigateToEditPage() { diff --git a/angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-add-edit/annual-report-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-add-edit/annual-report-add-edit.component.ts index ddac22488..0bf7fd1b9 100644 --- a/angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-add-edit/annual-report-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-add-edit/annual-report-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, StoreService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-annual-report-add-edit', @@ -30,7 +31,7 @@ export class AnnualReportAddEditComponent implements OnInit, OnDestroy { public bcmiPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; public datepickerMinDate = Constants.DatepickerMinDate; public datepickerMaxDate = Constants.DatepickerMaxDate; @@ -414,7 +415,8 @@ export class AnnualReportAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-detail/annual-report-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-detail/annual-report-detail.component.ts index ac040825c..c85df69c0 100644 --- a/angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-detail/annual-report-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-detail/annual-report-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-annual-report-detail', @@ -64,7 +64,8 @@ export class AnnualReportDetailComponent extends RecordDetailComponent implement } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-add-edit/certificate-amendments-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-add-edit/certificate-amendments-add-edit.component.ts index 7e97e1672..7ca86b85f 100644 --- a/angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-add-edit/certificate-amendments-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-add-edit/certificate-amendments-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, StoreService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-certificate-amendment-add-edit', @@ -33,7 +34,7 @@ export class CertificateAmendmentAddEditComponent implements OnInit, OnDestroy { // Pick lists public certificateSubtypes = Picklists.certificateSubtypePicklist; - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; public datepickerMinDate = Constants.DatepickerMinDate; public datepickerMaxDate = Constants.DatepickerMaxDate; @@ -482,7 +483,8 @@ export class CertificateAmendmentAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-detail/certificate-amendments-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-detail/certificate-amendments-detail.component.ts index eaa68c522..ac4478584 100644 --- a/angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-detail/certificate-amendments-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-detail/certificate-amendments-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-certificate-amendment-detail', @@ -64,7 +64,8 @@ export class CertificateAmendmentDetailComponent extends RecordDetailComponent i } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/admin-nrpti/src/app/records/certificates/certificate-add-edit/certificate-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/certificates/certificate-add-edit/certificate-add-edit.component.ts index 5950c2b68..70ea1dc4d 100644 --- a/angular/projects/admin-nrpti/src/app/records/certificates/certificate-add-edit/certificate-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/certificates/certificate-add-edit/certificate-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, StoreService, LoggerService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-certificate-add-edit', @@ -31,7 +32,7 @@ export class CertificateAddEditComponent implements OnInit, OnDestroy { // Pick lists public certificateSubtypes = Picklists.certificateSubtypePicklist; - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; public datepickerMinDate = Constants.DatepickerMinDate; public datepickerMaxDate = Constants.DatepickerMaxDate; @@ -390,7 +391,8 @@ export class CertificateAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy(): void { diff --git a/angular/projects/admin-nrpti/src/app/records/certificates/certificate-detail/certificate-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/certificates/certificate-detail/certificate-detail.component.ts index 298668b27..9e3d02ffb 100644 --- a/angular/projects/admin-nrpti/src/app/records/certificates/certificate-detail/certificate-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/certificates/certificate-detail/certificate-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-certificate-detail', @@ -64,7 +64,8 @@ export class CertificateDetailComponent extends RecordDetailComponent implements } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-add-edit/construction-plan-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-add-edit/construction-plan-add-edit.component.ts index 39ad0bcb7..23b1814ef 100644 --- a/angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-add-edit/construction-plan-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-add-edit/construction-plan-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, StoreService, LoggerService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-construction-plan-add-edit', @@ -30,7 +31,7 @@ export class ConstructionPlanAddEditComponent implements OnInit, OnDestroy { public lngPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; // Documents public documents = []; @@ -305,7 +306,8 @@ export class ConstructionPlanAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-detail/construction-plan-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-detail/construction-plan-detail.component.ts index 4781517cf..9d232f766 100644 --- a/angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-detail/construction-plan-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-detail/construction-plan-detail.component.ts @@ -6,7 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-construction-plan-detail', @@ -54,7 +54,8 @@ export class ConstructionPlanDetailComponent extends RecordDetailComponent imple } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-add-edit/correspondence-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-add-edit/correspondence-add-edit.component.ts index 293090893..3de9d0edc 100644 --- a/angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-add-edit/correspondence-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-add-edit/correspondence-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, StoreService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-correspondence-add-edit', @@ -32,7 +33,7 @@ export class CorrespondenceAddEditComponent implements OnInit, OnDestroy { public bcmiPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; // Documents public documents = []; @@ -477,7 +478,8 @@ export class CorrespondenceAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-detail/correspondence-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-detail/correspondence-detail.component.ts index aea343150..e810532cb 100644 --- a/angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-detail/correspondence-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-detail/correspondence-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-correspondence-detail', @@ -64,7 +64,8 @@ export class CorrespondenceDetailComponent extends RecordDetailComponent impleme } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-add-edit/court-conviction-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-add-edit/court-conviction-add-edit.component.ts index 6034f690d..72b417415 100644 --- a/angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-add-edit/court-conviction-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-add-edit/court-conviction-add-edit.component.ts @@ -9,6 +9,7 @@ import { Utils, LoadingScreenService, LoggerService, StoreService } from 'nrpti- import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { RecordUtils } from '../../utils/record-utils'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-court-conviction-add-edit', @@ -33,7 +34,7 @@ export class CourtConvictionAddEditComponent implements OnInit, OnDestroy { public bcmiPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; public authors = Picklists.authorPicklist; public courtConvictionSubtypes = Picklists.courtConvictionSubtypePicklist; protected defaultAgency = ''; @@ -636,7 +637,8 @@ export class CourtConvictionAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-detail/court-conviction-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-detail/court-conviction-detail.component.ts index bfb373cef..e2f64fb5f 100644 --- a/angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-detail/court-conviction-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-detail/court-conviction-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-court-conviction-detail', @@ -64,7 +64,8 @@ export class CourtConvictionDetailComponent extends RecordDetailComponent implem } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-add-edit/dam-safety-inspection-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-add-edit/dam-safety-inspection-add-edit.component.ts index bb760afe2..5ebee5cd2 100644 --- a/angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-add-edit/dam-safety-inspection-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-add-edit/dam-safety-inspection-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, StoreService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-dam-safety-inspection-add-edit', @@ -32,7 +33,7 @@ export class DamSafetyInspectionAddEditComponent implements OnInit, OnDestroy { public bcmiPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; // Documents public documents = []; @@ -492,7 +493,8 @@ export class DamSafetyInspectionAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy(): void { diff --git a/angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-detail/dam-safety-inspection-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-detail/dam-safety-inspection-detail.component.ts index 03505382a..58297c1e5 100644 --- a/angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-detail/dam-safety-inspection-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-detail/dam-safety-inspection-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-dam-safety-inspection-detail', @@ -64,7 +64,8 @@ export class DamSafetyInspectionDetailComponent extends RecordDetailComponent im } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts index adb64a0c3..07a6cfd0f 100644 --- a/angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, StoreService, LoggerService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-inspection-add-edit', @@ -32,7 +33,7 @@ export class InspectionAddEditComponent implements OnInit, OnDestroy { public nrcedPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; public authors = Picklists.authorPicklist; public outcomeStatuses = Picklists.outcomeStatusPicklist; private defaultAgency = ''; @@ -514,8 +515,9 @@ export class InspectionAddEditComponent implements OnInit, OnDestroy { return Utils.convertAcronyms(acronym); } - displayName(agencyCode) { - return Utils.displayNameFull(agencyCode); + displayName(agency) { + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-add-edit/management-plan-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-add-edit/management-plan-add-edit.component.ts index 2c74fd446..1ccb362fb 100644 --- a/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-add-edit/management-plan-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-add-edit/management-plan-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, StoreService, LoggerService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-management-plan-add-edit', @@ -30,7 +31,7 @@ export class ManagementPlanAddEditComponent implements OnInit, OnDestroy { public lngPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; // Documents public documents = []; @@ -306,7 +307,8 @@ export class ManagementPlanAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-detail/management-plan-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-detail/management-plan-detail.component.ts index 895ac2ba6..12b600c0e 100644 --- a/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-detail/management-plan-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-detail/management-plan-detail.component.ts @@ -5,7 +5,8 @@ import { Subject } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; import { RecordComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; +import { FactoryService } from '../../../services/factory.service'; @Component({ selector: 'app-management-plan-detail', @@ -15,8 +16,10 @@ import { Utils } from 'nrpti-angular-components'; export class ManagementPlanDetailComponent extends RecordComponent implements OnInit, OnDestroy { private ngUnsubscribe: Subject = new Subject(); - constructor(public route: ActivatedRoute, public router: Router, public changeDetectionRef: ChangeDetectorRef) { + constructor(public route: ActivatedRoute, public router: Router, public changeDetectionRef: ChangeDetectorRef + ,public factoryService: FactoryService) { super(); + } ngOnInit() { @@ -46,7 +49,8 @@ export class ManagementPlanDetailComponent extends RecordComponent implements On } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/admin-nrpti/src/app/records/permits/permit-add-edit/permit-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/permits/permit-add-edit/permit-add-edit.component.ts index b94839cae..924a48bf6 100644 --- a/angular/projects/admin-nrpti/src/app/records/permits/permit-add-edit/permit-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/permits/permit-add-edit/permit-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, StoreService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-permit-add-edit', @@ -31,7 +32,7 @@ export class PermitAddEditComponent implements OnInit, OnDestroy { // Pick lists public permitSubtypes = Picklists.permitSubtypePicklist; - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; private defaultAgency = ''; // Documents @@ -376,7 +377,8 @@ export class PermitAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/reports/report-add-edit/report-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/reports/report-add-edit/report-add-edit.component.ts index 8ec105758..2921e8483 100644 --- a/angular/projects/admin-nrpti/src/app/records/reports/report-add-edit/report-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/reports/report-add-edit/report-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, StoreService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-report-add-edit', @@ -32,7 +33,7 @@ export class ReportAddEditComponent implements OnInit, OnDestroy { public bcmiPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; // Documents public documents = []; @@ -479,7 +480,8 @@ export class ReportAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/reports/report-detail/report-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/reports/report-detail/report-detail.component.ts index 78c8033da..76beee24b 100644 --- a/angular/projects/admin-nrpti/src/app/records/reports/report-detail/report-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/reports/report-detail/report-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-report-detail', @@ -64,7 +64,8 @@ export class ReportDetailComponent extends RecordDetailComponent implements OnIn } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-add-edit/restorative-justice-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-add-edit/restorative-justice-add-edit.component.ts index e014b2048..efb52c90e 100644 --- a/angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-add-edit/restorative-justice-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-add-edit/restorative-justice-add-edit.component.ts @@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti import { RecordUtils } from '../../utils/record-utils'; import { LoadingScreenService, LoggerService } from 'nrpti-angular-components'; import { Constants } from '../../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-restorative-justice-add-edit', @@ -32,7 +33,7 @@ export class RestorativeJusticeAddEditComponent implements OnInit, OnDestroy { public nrcedPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyPicklist; + public agencies = Picklists.agencyCodePicklist; public authors = Picklists.authorPicklist; private defaultAgency = ''; @@ -543,7 +544,8 @@ export class RestorativeJusticeAddEditComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-detail/restorative-justice-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-detail/restorative-justice-detail.component.ts index ed8b7b143..5469f9a69 100644 --- a/angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-detail/restorative-justice-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-detail/restorative-justice-detail.component.ts @@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component'; import { RecordUtils } from '../../utils/record-utils'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { FactoryService } from '../../../services/factory.service'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-restorative-justice-detail', @@ -64,7 +64,8 @@ export class RestorativeJusticeDetailComponent extends RecordDetailComponent imp } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { From e5bfc3a3bd238f983e515b81d8999012bf237174 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Fri, 29 Sep 2023 16:03:55 -0700 Subject: [PATCH 47/77] update migration to change 'author' name to code; separate agency_env_epd --- ...0230912181649-updateIssuingAgencyToCode.js | 83 ++++++++++++++----- 1 file changed, 60 insertions(+), 23 deletions(-) diff --git a/api/migrations/20230912181649-updateIssuingAgencyToCode.js b/api/migrations/20230912181649-updateIssuingAgencyToCode.js index 5036cc5c6..43330912b 100644 --- a/api/migrations/20230912181649-updateIssuingAgencyToCode.js +++ b/api/migrations/20230912181649-updateIssuingAgencyToCode.js @@ -1,28 +1,30 @@ 'use strict'; var dbm; -var type; var seed; /** - * We receive the dbmigrate dependency from dbmigrate initially. - * This enables us to not have to rely on NODE_PATH. - */ -exports.setup = function(options, seedLink) { + * We receive the dbmigrate dependency from dbmigrate initially. + * This enables us to not have to rely on NODE_PATH. + */ +exports.setup = function (options, seedLink) { dbm = options.dbmigrate; - type = dbm.dataType; seed = seedLink; }; - exports.up = async function (db) { const mClient = await db.connection.connect(db.connectionString, { native_parser: true, }); + const LegislationActs = { + ACT_Env_Management: 'Environmental Management Act', + ACT_Int_Pest_Management: 'Integrated Pest Management Act', + }; + const agencies = [ - { agencyCode: "AGENCY_ALC", agencyName: 'Agricultural Land Commission' }, - { agencyCode: "AGENCY_WF", agencyName: 'BC Wildfire Service' }, + { agencyCode: 'AGENCY_ALC', agencyName: 'Agricultural Land Commission' }, + { agencyCode: 'AGENCY_WF', agencyName: 'BC Wildfire Service' }, { agencyCode: "AGENCY_ENV_COS", agencyName: 'Conservation Officer Service' }, { agencyCode: "AGENCY_EAO", agencyName: 'Environmental Assessment Office' }, { agencyCode: "AGENCY_EMLI", agencyName: 'Ministry of Energy Mines and Low Carbon Innovation' }, @@ -36,27 +38,49 @@ exports.up = async function (db) { { agencyCode: "AGENCY_FLNR_NRO", agencyName: 'Natural Resource Officers' }, { agencyCode: "AGENCY_WLRS", agencyName: 'Ministry of Water, Land and Resource Stewardship' }, { agencyCode: "AGENCY_CAS", agencyName: 'Climate Action Secretariat' } - ] + ]; const collections = ['nrpti', 'redacted_record_subset']; try { for (let collection of collections) { console.log(`***** Collection: ${collection} *****`); + console.log(`***** Updating ocers-csv records *****`); + + try { + let currentCollection = await mClient.collection(collection); + + // Update issuingAgency to 'AGENCY_ENV_EPD' for specific records + await currentCollection.updateMany( + { + $and: [ + { issuingAgency: 'Ministry of Environment and Climate Change Strategy' }, + { 'legislation.act': { $in: [LegislationActs.ACT_Env_Management, LegislationActs.ACT_Int_Pest_Management] } } + ] + }, + { $set: { issuingAgency: 'AGENCY_ENV_EPD' } } + ); - for (const agency of agencies) { - try { - let currentCollection = await mClient.collection(collection); + console.log(` ***** Updated records in collection: ${collection} *****`); + } catch (err) { + console.error(` ***** Error updating collection: ${collection} *****`, err); + } + + console.log(`***** Updating all other records records *****`); + try { + let currentCollection = await mClient.collection(collection); - await currentCollection.updateMany( - { issuingAgency: agency['agencyName'] }, - { $set: { issuingAgency: agency['agencyCode'] } } - ); + for (const agency of agencies) { + // Update issuingAgency and author fields for the agency + await currentCollection.updateMany( + { issuingAgency: agency['agencyName'] }, + { $set: { issuingAgency: agency['agencyCode'] } } + ); - console.log(` ***** Updated collection: ${collection} for agency: ${agency['agencyName']} *****`); - } catch (err) { - console.log(` ***** Error updating collection: ${collection} for agency: ${agency['agencyName']} *****`, err); - } + console.log(` ***** Updated collection: ${collection} for agency: ${agency['agencyName']} *****`); + } + } catch (err) { + console.error(` ***** Error updating collection: ${collection} for agency: ${agency['agencyName']} *****`, err); } } } catch (err) { @@ -70,10 +94,23 @@ exports.up = async function (db) { return null; }; -exports.down = function(db) { +exports.down = function (db) { return null; }; exports._meta = { - "version": 1 + version: 1 }; + +/** + * Update a record in the collection with a new agency code. + * @param {Collection} collection - MongoDB collection. + * @param {string} recordId - The ID of the record to update. + * @param {string} newAgencyCode - The new agency code. + */ +async function updateRecord(collection, recordId, newAgencyCode) { + await collection.updateOne( + { _id: recordId }, + { $set: { 'legislation.act': newAgencyCode } } + ); +} From 2f01e1d56b4c2e3ef3ff40cf850ee59c8a7f5fd7 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Mon, 2 Oct 2023 11:01:06 -0700 Subject: [PATCH 48/77] update migration for ENV_EPD and update authors --- .../20230912181649-updateIssuingAgencyToCode.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/api/migrations/20230912181649-updateIssuingAgencyToCode.js b/api/migrations/20230912181649-updateIssuingAgencyToCode.js index 43330912b..35516c35f 100644 --- a/api/migrations/20230912181649-updateIssuingAgencyToCode.js +++ b/api/migrations/20230912181649-updateIssuingAgencyToCode.js @@ -55,10 +55,11 @@ exports.up = async function (db) { { $and: [ { issuingAgency: 'Ministry of Environment and Climate Change Strategy' }, + { author: 'Ministry of Environment and Climate Change Strategy' }, { 'legislation.act': { $in: [LegislationActs.ACT_Env_Management, LegislationActs.ACT_Int_Pest_Management] } } ] }, - { $set: { issuingAgency: 'AGENCY_ENV_EPD' } } + { $set: { issuingAgency: 'AGENCY_ENV_EPD', author: 'AGENCY_ENV_EPD' } } ); console.log(` ***** Updated records in collection: ${collection} *****`); @@ -73,8 +74,13 @@ exports.up = async function (db) { for (const agency of agencies) { // Update issuingAgency and author fields for the agency await currentCollection.updateMany( - { issuingAgency: agency['agencyName'] }, - { $set: { issuingAgency: agency['agencyCode'] } } + { + $and: [ + { issuingAgency: agency['agencyName'] }, + { author: agency['agencyName'] } + ] + }, + { $set: { issuingAgency: agency['agencyCode'], author: agency['agencyCode'] } } ); console.log(` ***** Updated collection: ${collection} for agency: ${agency['agencyName']} *****`); From d05a8c91451707f26475ccd602ea392f7a009537 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Tue, 3 Oct 2023 07:44:26 -0700 Subject: [PATCH 49/77] linting: white space added --- .../management-plan-detail/management-plan-detail.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-detail/management-plan-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-detail/management-plan-detail.component.ts index 12b600c0e..dd31b9c7a 100644 --- a/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-detail/management-plan-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-detail/management-plan-detail.component.ts @@ -58,3 +58,4 @@ export class ManagementPlanDetailComponent extends RecordComponent implements On this.ngUnsubscribe.complete(); } } + From 661d35100556fc746338e44d12d2853a7330019b Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Tue, 3 Oct 2023 07:58:14 -0700 Subject: [PATCH 50/77] linting --- .../management-plan-detail/management-plan-detail.component.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-detail/management-plan-detail.component.ts b/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-detail/management-plan-detail.component.ts index dd31b9c7a..8d40a3875 100644 --- a/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-detail/management-plan-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-detail/management-plan-detail.component.ts @@ -17,9 +17,8 @@ export class ManagementPlanDetailComponent extends RecordComponent implements On private ngUnsubscribe: Subject = new Subject(); constructor(public route: ActivatedRoute, public router: Router, public changeDetectionRef: ChangeDetectorRef - ,public factoryService: FactoryService) { + , public factoryService: FactoryService) { super(); - } ngOnInit() { From 5d0f1e206ec6670458714ab72ff96890d4cbdbe2 Mon Sep 17 00:00:00 2001 From: Sanjay Babu <111102886+sanjaytkbabu@users.noreply.github.com> Date: Tue, 3 Oct 2023 10:35:46 -0700 Subject: [PATCH 51/77] Update api/src/models/master/applicationAgency.js Co-authored-by: Matthew Logan <62873746+LocalNewsTV@users.noreply.github.com> --- api/src/models/master/applicationAgency.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/models/master/applicationAgency.js b/api/src/models/master/applicationAgency.js index ae292ce90..b5bebba03 100644 --- a/api/src/models/master/applicationAgency.js +++ b/api/src/models/master/applicationAgency.js @@ -12,4 +12,4 @@ module.exports = require('../../utils/model-schema-generator')( updatedBy: { type: String, default: '' }, }, 'nrpti' - ); \ No newline at end of file + ); From 29ac60753b4eb800466af23e05099e7a66f47e1d Mon Sep 17 00:00:00 2001 From: Sanjay Babu <111102886+sanjaytkbabu@users.noreply.github.com> Date: Tue, 3 Oct 2023 10:36:49 -0700 Subject: [PATCH 52/77] Update api/src/swagger/swagger.yaml crlf Co-authored-by: Matthew Logan <62873746+LocalNewsTV@users.noreply.github.com> --- api/src/swagger/swagger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/swagger/swagger.yaml b/api/src/swagger/swagger.yaml index 865bdb07d..4dcf6156b 100644 --- a/api/src/swagger/swagger.yaml +++ b/api/src/swagger/swagger.yaml @@ -2120,4 +2120,4 @@ paths: '200': description: "Success" '403': - description: 'Access Denied' \ No newline at end of file + description: 'Access Denied' From 9f5ff8d95a4f4a7cc2fe0f2889d3b7b09d4b7782 Mon Sep 17 00:00:00 2001 From: Sanjay Babu <111102886+sanjaytkbabu@users.noreply.github.com> Date: Tue, 3 Oct 2023 10:37:15 -0700 Subject: [PATCH 53/77] Update api/migrations/20230911220312-addApplicationAgenciesModel.js crlf Co-authored-by: Matthew Logan <62873746+LocalNewsTV@users.noreply.github.com> --- api/migrations/20230911220312-addApplicationAgenciesModel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/migrations/20230911220312-addApplicationAgenciesModel.js b/api/migrations/20230911220312-addApplicationAgenciesModel.js index 9a450b2f3..dab7a5d42 100644 --- a/api/migrations/20230911220312-addApplicationAgenciesModel.js +++ b/api/migrations/20230911220312-addApplicationAgenciesModel.js @@ -81,4 +81,4 @@ exports.down = function(db) { exports._meta = { "version": 1 -}; \ No newline at end of file +}; From 2bed5558cf4d1af35841293c990f8c1bb81a1568 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Tue, 3 Oct 2023 11:29:03 -0700 Subject: [PATCH 54/77] comments added, unused function removed --- .../services/application-agency.service.ts | 4 ++++ .../src/app/services/issuingagency.service.ts | 20 +++---------------- ...30911220312-addApplicationAgenciesModel.js | 4 ++++ ...0230912181649-updateIssuingAgencyToCode.js | 3 +-- api/src/controllers/agencies.js | 5 +++++ 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts b/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts index cc7e467b4..b172cd75d 100644 --- a/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts @@ -3,6 +3,10 @@ import { ConfigService } from 'nrpti-angular-components'; import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; +/* +Service Layer for fetching issuing agencies and storing them in app_initializer +*/ + @Injectable() export class ApplicationAgencyService { private api: string; diff --git a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts index c139d5d37..f2d810894 100644 --- a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts @@ -2,7 +2,9 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { ApiService } from './api.service'; - +/* +Service Layer for agencies component. Used for fetching issuing agencies and storing them in database +*/ @Injectable({ providedIn: 'root' }) export class IssuingAgencyService { constructor(public apiService: ApiService, public http: HttpClient) {} @@ -29,20 +31,4 @@ export class IssuingAgencyService { throw error; // Rethrow the error to propagate it further }); } - - public async getIssuingAgencyMap() { - try { - const response = await this.getIssuingAgencies(); - const issuingAgencyMap: { [key: string]: string } = {}; - if (response && Array.isArray(response)) { - response.forEach(agency => { - issuingAgencyMap[agency.agencyCode] = agency.agencyName; - }); - } - return issuingAgencyMap; - } catch (error) { - console.error('getIssuingAgencyMap() API call error:', error); - throw error; - } - } } diff --git a/api/migrations/20230911220312-addApplicationAgenciesModel.js b/api/migrations/20230911220312-addApplicationAgenciesModel.js index dab7a5d42..b0d048a25 100644 --- a/api/migrations/20230911220312-addApplicationAgenciesModel.js +++ b/api/migrations/20230911220312-addApplicationAgenciesModel.js @@ -6,6 +6,10 @@ var dbm; var type; var seed; +/* +Migration file for adding agency codes and agency values to the nrpti collection +*/ + exports.setup = function(options, seedLink) { dbm = options.dbmigrate; type = dbm.dataType; diff --git a/api/migrations/20230912181649-updateIssuingAgencyToCode.js b/api/migrations/20230912181649-updateIssuingAgencyToCode.js index 35516c35f..b2a35065a 100644 --- a/api/migrations/20230912181649-updateIssuingAgencyToCode.js +++ b/api/migrations/20230912181649-updateIssuingAgencyToCode.js @@ -4,8 +4,7 @@ var dbm; var seed; /** - * We receive the dbmigrate dependency from dbmigrate initially. - * This enables us to not have to rely on NODE_PATH. + * Migration file for updating all existing records to use agency code instead of agency value */ exports.setup = function (options, seedLink) { dbm = options.dbmigrate; diff --git a/api/src/controllers/agencies.js b/api/src/controllers/agencies.js index cd631b4d7..dc224cfbe 100644 --- a/api/src/controllers/agencies.js +++ b/api/src/controllers/agencies.js @@ -3,6 +3,11 @@ const mongodb = require('../utils/mongodb'); const RECORD_TYPE = require('../utils/constants/record-type-enum'); const defaultLog = require('../utils/logger')('record'); +/* +APIs for Update Issuing Agency page +Includes Get and Put apis to load and update agency names from the database +*/ + exports.publicGet = async function(args, res, next) { const db = mongodb.connection.db(process.env.MONGODB_DATABASE || 'nrpti-dev'); const collectionDB = db.collection('nrpti'); From 35e17d855ee6b65d0dc25fb9a1c97a4df0d0559a Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:51:18 -0700 Subject: [PATCH 55/77] revert migration update --- .../20230912181649-updateIssuingAgencyToCode.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/api/migrations/20230912181649-updateIssuingAgencyToCode.js b/api/migrations/20230912181649-updateIssuingAgencyToCode.js index b2a35065a..2a2b14ee2 100644 --- a/api/migrations/20230912181649-updateIssuingAgencyToCode.js +++ b/api/migrations/20230912181649-updateIssuingAgencyToCode.js @@ -73,13 +73,8 @@ exports.up = async function (db) { for (const agency of agencies) { // Update issuingAgency and author fields for the agency await currentCollection.updateMany( - { - $and: [ - { issuingAgency: agency['agencyName'] }, - { author: agency['agencyName'] } - ] - }, - { $set: { issuingAgency: agency['agencyCode'], author: agency['agencyCode'] } } + { issuingAgency: agency['agencyName'] }, + { $set: { issuingAgency: agency['agencyCode'] } } ); console.log(` ***** Updated collection: ${collection} for agency: ${agency['agencyName']} *****`); From 8eaa957b803d785de7baabec885156db8c2309e8 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:04:12 -0700 Subject: [PATCH 56/77] revert migration; update NRPTI agency filter --- .../mines-records-list.component.ts | 19 +++++++++++---- .../records-list/records-list.component.ts | 11 +++++---- ...30911220312-addApplicationAgenciesModel.js | 1 - ...0230912181649-updateIssuingAgencyToCode.js | 24 ------------------- 4 files changed, 21 insertions(+), 34 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-records-list/mines-records-list.component.ts b/angular/projects/admin-nrpti/src/app/mines/mines-records-list/mines-records-list.component.ts index 2b0e8dab5..fd36e0638 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-records-list/mines-records-list.component.ts +++ b/angular/projects/admin-nrpti/src/app/mines/mines-records-list/mines-records-list.component.ts @@ -19,6 +19,8 @@ import { FilterObject, FilterType, DateFilterDefinition, CheckOrRadioFilterDefin import { SubsetsObject, SubsetOption } from '../../../../../common/src/app/search-filter-template/subset-object'; import { Mine } from '../../../../../common/src/app/models/bcmi/mine'; import { MiscUtils } from '../../utils/constants/misc'; +import { FactoryService } from '../../services/factory.service'; +import { AgencyDataService } from '../../../../../global/src/lib/utils/agency-data-service'; /** * Mine list page component. @@ -121,7 +123,8 @@ export class MinesRecordsListComponent implements OnInit, OnDestroy { public storeService: StoreService, private loadingScreenService: LoadingScreenService, private tableTemplateUtils: TableTemplateUtils, - private _changeDetectionRef: ChangeDetectorRef + private _changeDetectionRef: ChangeDetectorRef, + private factoryService: FactoryService ) { // setup the subset configuration const subsetOptions = [ @@ -155,10 +158,16 @@ export class MinesRecordsListComponent implements OnInit, OnDestroy { 'agency', FilterType.MultiSelect, 'Responsible Agency', - new MultiSelectDefinition(Picklists.agencyPicklist.map(value => { - const displayValue = Utils.displayNameFull(value); - return { value: value, displayValue: displayValue, selected: false, display: true }; - }), 'Begin typing to filter agencies...', '') + new MultiSelectDefinition( + Picklists.getAgencyNames(this.factoryService).map(value => { + const agencyDataService = new AgencyDataService(this.factoryService); + const displayValue = agencyDataService.displayNameFull(value); + const picklistCodes = Picklists.getAgencyCode(this.factoryService, value) + return { value: picklistCodes, displayValue: displayValue, selected: false, display: true }; + }), + 'Begin typing to filter agencies...', + '' + ) ); const sourceSystemFilter = new FilterObject( diff --git a/angular/projects/admin-nrpti/src/app/records/records-list/records-list.component.ts b/angular/projects/admin-nrpti/src/app/records/records-list/records-list.component.ts index f505ca74e..30dee78d4 100644 --- a/angular/projects/admin-nrpti/src/app/records/records-list/records-list.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/records-list/records-list.component.ts @@ -28,6 +28,7 @@ import { RadioOptionItem } from '../../../../../common/src/app/search-filter-template/filter-object'; import { FactoryService } from '../../services/factory.service'; +import { AgencyDataService } from '../../../../../global/src/lib/utils/agency-data-service'; /** * List page component. @@ -113,7 +114,7 @@ export class RecordsListComponent implements OnInit, OnDestroy { private loadingScreenService: LoadingScreenService, private tableTemplateUtils: TableTemplateUtils, private _changeDetectionRef: ChangeDetectorRef, - public factoryService: FactoryService + private factoryService: FactoryService, ) { // setup the subset configuration const subsetOptions = [ @@ -195,9 +196,11 @@ export class RecordsListComponent implements OnInit, OnDestroy { FilterType.MultiSelect, 'Responsible Agency', new MultiSelectDefinition( - Picklists.agencyPicklist.map(value => { - const displayValue = Utils.displayNameFull(value); - return { value: value, displayValue: displayValue, selected: false, display: true }; + Picklists.getAgencyNames(this.factoryService).map(value => { + const agencyDataService = new AgencyDataService(this.factoryService); + const displayValue = agencyDataService.displayNameFull(value); + const picklistCodes = Picklists.getAgencyCode(this.factoryService, value) + return { value: picklistCodes, displayValue: displayValue, selected: false, display: true }; }), 'Begin typing to filter agencies...', '' diff --git a/api/migrations/20230911220312-addApplicationAgenciesModel.js b/api/migrations/20230911220312-addApplicationAgenciesModel.js index b0d048a25..ea25e0624 100644 --- a/api/migrations/20230911220312-addApplicationAgenciesModel.js +++ b/api/migrations/20230911220312-addApplicationAgenciesModel.js @@ -33,7 +33,6 @@ exports.up = async function (db) { { agencyCode: "AGENCY_ENV", agencyName: 'Ministry of Environment and Climate Change Strategy' }, { agencyCode: "AGENCY_ENV_BCPARKS", agencyName: 'BC Parks' }, { agencyCode: "AGENCY_OGC", agencyName: 'BC Energy Regulator' }, - { agencyCode: "AGENCY_ENV_EPD", agencyName: 'Ministry of Environment and Climate Change Strategy' }, { agencyCode: "AGENCY_LNG", agencyName: 'LNG Secretariat' }, { agencyCode: "AGENCY_AGRI", agencyName: 'Ministry of Agriculture and Food' }, { agencyCode: "AGENCY_FLNRO", agencyName: 'Ministry of Forests' }, diff --git a/api/migrations/20230912181649-updateIssuingAgencyToCode.js b/api/migrations/20230912181649-updateIssuingAgencyToCode.js index 2a2b14ee2..cb15d83a9 100644 --- a/api/migrations/20230912181649-updateIssuingAgencyToCode.js +++ b/api/migrations/20230912181649-updateIssuingAgencyToCode.js @@ -30,7 +30,6 @@ exports.up = async function (db) { { agencyCode: "AGENCY_ENV", agencyName: 'Ministry of Environment and Climate Change Strategy' }, { agencyCode: "AGENCY_ENV_BCPARKS", agencyName: 'BC Parks' }, { agencyCode: "AGENCY_OGC", agencyName: 'BC Energy Regulator' }, - { agencyCode: "AGENCY_ENV_EPD", agencyName: 'Ministry of Environment and Climate Change Strategy' }, { agencyCode: "AGENCY_LNG", agencyName: 'LNG Secretariat' }, { agencyCode: "AGENCY_AGRI", agencyName: 'Ministry of Agriculture and Food' }, { agencyCode: "AGENCY_FLNRO", agencyName: 'Ministry of Forests' }, @@ -44,29 +43,6 @@ exports.up = async function (db) { try { for (let collection of collections) { console.log(`***** Collection: ${collection} *****`); - console.log(`***** Updating ocers-csv records *****`); - - try { - let currentCollection = await mClient.collection(collection); - - // Update issuingAgency to 'AGENCY_ENV_EPD' for specific records - await currentCollection.updateMany( - { - $and: [ - { issuingAgency: 'Ministry of Environment and Climate Change Strategy' }, - { author: 'Ministry of Environment and Climate Change Strategy' }, - { 'legislation.act': { $in: [LegislationActs.ACT_Env_Management, LegislationActs.ACT_Int_Pest_Management] } } - ] - }, - { $set: { issuingAgency: 'AGENCY_ENV_EPD', author: 'AGENCY_ENV_EPD' } } - ); - - console.log(` ***** Updated records in collection: ${collection} *****`); - } catch (err) { - console.error(` ***** Error updating collection: ${collection} *****`, err); - } - - console.log(`***** Updating all other records records *****`); try { let currentCollection = await mClient.collection(collection); From de6633e9bf188ce5ce756d580eb2c38b7594cc99 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Wed, 4 Oct 2023 14:42:28 -0700 Subject: [PATCH 57/77] mine record page updated to use agency code --- .../mines-record-add/mines-record-add.component.ts | 6 ++++-- .../mines-records-edit.component.ts | 6 ++++-- .../common/src/app/utils/record-constants.ts | 12 +++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-record-add/mines-record-add.component.ts b/angular/projects/admin-nrpti/src/app/mines/mines-record-add/mines-record-add.component.ts index e45791627..296c46cb1 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-record-add/mines-record-add.component.ts +++ b/angular/projects/admin-nrpti/src/app/mines/mines-record-add/mines-record-add.component.ts @@ -6,6 +6,7 @@ import { Picklists } from '../../../../../common/src/app/utils/record-constants' import { FactoryService } from '../../services/factory.service'; import { RecordUtils } from '../../records/utils/record-utils'; import { Constants } from '../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-mines-record-add', @@ -38,7 +39,7 @@ export class MinesRecordAddComponent implements OnInit, OnDestroy { ); // Pick lists - public recordAgencies = Picklists.collectionAgencyPicklist; + public recordAgencies = Picklists.collectionAgencyCodePicklist; public recordTypeNamesBCMI = Object.values(Picklists.bcmiRecordTypePicklist).map(item => { return item.displayName; }).sort(); @@ -176,7 +177,8 @@ export class MinesRecordAddComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy(): void { diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-records-edit/mines-records-edit.component.ts b/angular/projects/admin-nrpti/src/app/mines/mines-records-edit/mines-records-edit.component.ts index e3b761506..828864b5d 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-records-edit/mines-records-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/mines/mines-records-edit/mines-records-edit.component.ts @@ -12,6 +12,7 @@ import { ConfirmComponent } from '../../confirm/confirm.component'; import { takeUntil, catchError } from 'rxjs/operators'; import { Constants } from '../../utils/constants/misc'; import { ToastService } from '../../services/toast.service'; +import { AgencyDataService } from '../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-mines-records-edit', @@ -49,7 +50,7 @@ export class MinesRecordsEditComponent implements OnInit { }).sort(); public permitTypes = ['OGP', 'AMD']; - public recordAgencies = Picklists.collectionAgencyPicklist; + public recordAgencies = Picklists.collectionAgencyCodePicklist;; // record add edit state public recordState = null; @@ -286,7 +287,8 @@ export class MinesRecordsEditComponent implements OnInit { } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } /** diff --git a/angular/projects/common/src/app/utils/record-constants.ts b/angular/projects/common/src/app/utils/record-constants.ts index 35c791f68..d45ad2200 100644 --- a/angular/projects/common/src/app/utils/record-constants.ts +++ b/angular/projects/common/src/app/utils/record-constants.ts @@ -295,9 +295,15 @@ export class Picklists { ]; public static readonly collectionAgencyPicklist = [ - 'Environmental Assessment Office', - 'Ministry of Energy Mines and Low Carbon Innovation', - 'Ministry of Environment and Climate Change Strategy' + 'Environmental Assessment Office 2', + 'Ministry of Energy Mines and Low Carbon Innovation 2', + 'Ministry of Environment and Climate Change Strategy 2' + ]; + + public static readonly collectionAgencyCodePicklist = [ + 'AGENCY_EAO', + 'AGENCY_EMLI', + 'AGENCY_ENV' ]; /** From ce7426cb1d0b4b664fffb7bbc94936e20768d276 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Wed, 4 Oct 2023 14:53:24 -0700 Subject: [PATCH 58/77] mines collection updated to use agency code --- .../mines-collections-add-edit.component.html | 4 ++-- .../mines-collections-add-edit.component.ts | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-collections-add-edit/mines-collections-add-edit.component.html b/angular/projects/admin-nrpti/src/app/mines/mines-collections-add-edit/mines-collections-add-edit.component.html index 65159265b..257625151 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-collections-add-edit/mines-collections-add-edit.component.html +++ b/angular/projects/admin-nrpti/src/app/mines/mines-collections-add-edit/mines-collections-add-edit.component.html @@ -74,7 +74,7 @@

{{ (isEditing && 'Edit') || (!isEditing && 'Add') }} C @@ -243,4 +243,4 @@

Associated Records

- \ No newline at end of file + diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-collections-add-edit/mines-collections-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/mines/mines-collections-add-edit/mines-collections-add-edit.component.ts index 9eb45e874..7fc3066ca 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-collections-add-edit/mines-collections-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/mines/mines-collections-add-edit/mines-collections-add-edit.component.ts @@ -14,6 +14,7 @@ import { ConfirmComponent } from '../../confirm/confirm.component'; import { FactoryService } from '../../services/factory.service'; import { RecordUtils } from '../../records/utils/record-utils'; import { Constants } from '../../utils/constants/misc'; +import { AgencyDataService } from '../../../../../../projects/global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-mines-collections-add-edit', @@ -39,7 +40,7 @@ export class MinesCollectionsAddEditComponent implements OnInit, OnDestroy { // Pick lists public collectionTypes = Picklists.collectionTypePicklist; - public collectionAgencies = Picklists.collectionAgencyPicklist; + public collectionAgencies = Picklists.collectionAgencyCodePicklist; // collection add edit state public collectionState = null; @@ -541,6 +542,11 @@ export class MinesCollectionsAddEditComponent implements OnInit, OnDestroy { return Utils.convertAcronyms(acronym); } + displayName(agency) { + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); + } + ngOnDestroy(): void { // When the component is destroying, if collectionAddEdit state exists, but the user hadn't clicked the // 'addRecordsToCollection' button, then remove the collection state from the store. From 0aae880fcb9dc0c1ffe055e7f4b9ad990c8f15a1 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Wed, 4 Oct 2023 15:26:54 -0700 Subject: [PATCH 59/77] update importers to use agencyCodes --- api/src/importers/alc/inspections-utils.js | 4 ++-- api/src/importers/alc/inspections-utils.test.js | 8 ++++---- api/src/importers/ams/orders-utils.js | 4 ++-- api/src/importers/ams/orders-utils.test.js | 8 ++++---- api/src/importers/cmdb/inspection-utils.js | 4 ++-- api/src/importers/cmdb/inspection-utils.test.js | 6 +++--- api/src/importers/coors/admin-sanction-utils.js | 2 +- api/src/importers/coors/admin-sanction-utils.test.js | 8 ++++---- api/src/importers/coors/court-conviction-utils.test.js | 4 ++-- api/src/importers/coors/tickets-utils.test.js | 4 ++-- api/src/importers/era/tickets-utils.js | 4 ++-- api/src/importers/era/tickets-utils.test.js | 8 ++++---- api/src/importers/flnr/inspections-utils.js | 4 ++-- api/src/importers/flnr/inspections-utils.test.js | 8 ++++---- api/src/importers/mis/inspection-utils.js | 4 ++-- api/src/importers/mis/inspection-utils.test.js | 4 ++-- api/src/utils/constants/misc.js | 6 +++--- 17 files changed, 45 insertions(+), 45 deletions(-) diff --git a/api/src/importers/alc/inspections-utils.js b/api/src/importers/alc/inspections-utils.js index 68ed1943d..0a2b74d67 100644 --- a/api/src/importers/alc/inspections-utils.js +++ b/api/src/importers/alc/inspections-utils.js @@ -38,8 +38,8 @@ class Inspections extends BaseRecordUtils { inspection['recordType'] = 'Inspection'; inspection['dateIssued'] = csvRow['date'] || null; - inspection['issuingAgency'] = 'Agricultural Land Commission'; - inspection['author'] = 'Agricultural Land Commission'; + inspection['issuingAgency'] = 'AGENCY_ALC'; + inspection['author'] = 'AGENCY_ALC'; inspection['recordName'] = (csvRow['record id'] && `ALC Inspection - Record ${csvRow['record id']}`) || '-'; inspection['description'] = (csvRow['reason'] && `Activity Inspected: ${csvRow['reason']}`) || '-'; diff --git a/api/src/importers/alc/inspections-utils.test.js b/api/src/importers/alc/inspections-utils.test.js index 955cb2382..c2a05b62d 100644 --- a/api/src/importers/alc/inspections-utils.test.js +++ b/api/src/importers/alc/inspections-utils.test.js @@ -17,12 +17,12 @@ describe('transformRecord', () => { _sourceRefStringId: '', recordType: 'Inspection', - author: 'Agricultural Land Commission', + author: 'AGENCY_ALC', dateIssued: null, issuedTo: { dateOfBirth: null, firstName: '', lastName: '', middleName: '', type: 'Individual' }, description: '-', sourceSystemRef: 'alc-csv', - issuingAgency: 'Agricultural Land Commission', + issuingAgency: 'AGENCY_ALC', legislation: [ { act: 'Agricultural Land Commission Act', @@ -55,7 +55,7 @@ describe('transformRecord', () => { recordType: 'Inspection', recordName: 'ALC Inspection - Record 123', - author: 'Agricultural Land Commission', + author: 'AGENCY_ALC', description: 'Activity Inspected: reason', summary: 'Activity Inspected: reason', dateIssued: expect.any(String), @@ -66,7 +66,7 @@ describe('transformRecord', () => { middleName: '', type: MiscConstants.IssuedToEntityTypes.Individual }, - issuingAgency: 'Agricultural Land Commission', + issuingAgency: 'AGENCY_ALC', legislation: [ { act: 'Agricultural Land Commission Act', diff --git a/api/src/importers/ams/orders-utils.js b/api/src/importers/ams/orders-utils.js index 5e08b46a0..320c4b72c 100644 --- a/api/src/importers/ams/orders-utils.js +++ b/api/src/importers/ams/orders-utils.js @@ -38,8 +38,8 @@ class Orders extends BaseRecordUtils { order['recordType'] = 'Order'; order['dateIssued'] = csvRow['issuedate'] || null; - order['issuingAgency'] = 'Ministry of Environment and Climate Change Strategy'; - order['author'] = 'Ministry of Environment and Climate Change Strategy'; + order['issuingAgency'] = 'AGENCY_ENV'; + order['author'] = 'AGENCY_ENV'; order['recordName'] = (csvRow['authnumber'] && `AMS Authorization # ${csvRow['authnumber']}`) || '-'; diff --git a/api/src/importers/ams/orders-utils.test.js b/api/src/importers/ams/orders-utils.test.js index afc82be35..9da29d2f3 100644 --- a/api/src/importers/ams/orders-utils.test.js +++ b/api/src/importers/ams/orders-utils.test.js @@ -17,11 +17,11 @@ describe('transformRecord', () => { _sourceRefStringId: '', recordType: 'Order', - author: 'Ministry of Environment and Climate Change Strategy', + author: 'AGENCY_ENV', dateIssued: null, issuedTo: { type: MiscConstants.IssuedToEntityTypes.Company, companyName: '' }, sourceSystemRef: 'ams-csv', - issuingAgency: 'Ministry of Environment and Climate Change Strategy', + issuingAgency: 'AGENCY_ENV', legislation: [{ act: 'Environmental Management Act' }], location: 'British Columbia', recordName: '-', @@ -47,14 +47,14 @@ describe('transformRecord', () => { recordType: 'Order', recordName: 'AMS Authorization # 123', - author: 'Ministry of Environment and Climate Change Strategy', + author: 'AGENCY_ENV', summary: 'Authorization Number: 123', dateIssued: expect.any(String), issuedTo: { companyName: 'ABC Company', type: MiscConstants.IssuedToEntityTypes.Company }, - issuingAgency: 'Ministry of Environment and Climate Change Strategy', + issuingAgency: 'AGENCY_ENV', legislation: [ { act: 'Environmental Management Act', diff --git a/api/src/importers/cmdb/inspection-utils.js b/api/src/importers/cmdb/inspection-utils.js index f5ce8afd1..ef87221a5 100644 --- a/api/src/importers/cmdb/inspection-utils.js +++ b/api/src/importers/cmdb/inspection-utils.js @@ -39,8 +39,8 @@ class Inspections extends BaseRecordUtils { inspection['recordType'] = 'Inspection'; inspection['dateIssued'] = csvRow['date issued'] || null; - inspection['issuingAgency'] = 'Ministry of Agriculture and Food'; - inspection['author'] = 'Ministry of Agriculture'; + inspection['issuingAgency'] = 'AGENCY_AGRI'; + inspection['author'] = 'AGENCY_AGRI'; inspection['recordName'] = csvRow['inspection type'] || ''; diff --git a/api/src/importers/cmdb/inspection-utils.test.js b/api/src/importers/cmdb/inspection-utils.test.js index ae844a32d..37826882a 100644 --- a/api/src/importers/cmdb/inspection-utils.test.js +++ b/api/src/importers/cmdb/inspection-utils.test.js @@ -19,7 +19,7 @@ describe('transformRecord', () => { _sourceRefAgriCmdbId: '', recordType: 'Inspection', - author: 'Ministry of Agriculture', + author: 'AGENCY_AGRI', dateIssued: null, issuedTo: { type: MiscConstants.IssuedToEntityTypes.Company, @@ -28,7 +28,7 @@ describe('transformRecord', () => { description: descriptionString, outcomeDescription: '', sourceSystemRef: 'agri-cmdb-csv', - issuingAgency: 'Ministry of Agriculture and Food', + issuingAgency: 'AGENCY_AGRI', legislation: [ { act: 'Fish and Seafood Act', @@ -67,7 +67,7 @@ describe('transformRecord', () => { companyName: 'Company 5', type: MiscConstants.IssuedToEntityTypes.Company }, - issuingAgency: 'Ministry of Agriculture and Food', + issuingAgency: 'AGENCY_AGRI', legislation: [ { act: 'Fish and Seafood Act', diff --git a/api/src/importers/coors/admin-sanction-utils.js b/api/src/importers/coors/admin-sanction-utils.js index 37514c827..bb717b719 100644 --- a/api/src/importers/coors/admin-sanction-utils.js +++ b/api/src/importers/coors/admin-sanction-utils.js @@ -42,7 +42,7 @@ class AdminSanctions extends BaseRecordUtils { adminSanction['recordType'] = 'Administrative Sanction'; adminSanction['recordName'] = (csvRow['case_no'] && `Case No. ${csvRow['case_no']}`) || ''; - const ministry = 'Ministry of Forests'; + const ministry = 'AGENCY_FLNRO'; adminSanction['issuingAgency'] = ministry; adminSanction['author'] = ministry; adminSanction['dateIssued'] = csvRow['effective_date'] || null; diff --git a/api/src/importers/coors/admin-sanction-utils.test.js b/api/src/importers/coors/admin-sanction-utils.test.js index 713815706..c42e9c31e 100644 --- a/api/src/importers/coors/admin-sanction-utils.test.js +++ b/api/src/importers/coors/admin-sanction-utils.test.js @@ -46,8 +46,8 @@ describe('transformRecord', () => { companyName: 'businessName123', type: 'Company' }, - issuingAgency: 'Ministry of Forests', - author: 'Ministry of Forests', + issuingAgency: 'AGENCY_FLNRO', + author: 'AGENCY_FLNRO', legislation: [ { act: 'Wildlife Act', @@ -108,8 +108,8 @@ describe('transformRecord', () => { companyName: 'businessName123', type: 'Company' }, - issuingAgency: 'Ministry of Forests', - author: 'Ministry of Forests', + issuingAgency: 'AGENCY_FLNRO', + author: 'AGENCY_FLNRO', legislation: [ { act: 'Wildlife Act', diff --git a/api/src/importers/coors/court-conviction-utils.test.js b/api/src/importers/coors/court-conviction-utils.test.js index 31771e7ba..e62bc10ce 100644 --- a/api/src/importers/coors/court-conviction-utils.test.js +++ b/api/src/importers/coors/court-conviction-utils.test.js @@ -58,8 +58,8 @@ describe('transformRecord', () => { companyName: 'businessName123', type: 'Company' }, - issuingAgency: 'BC Parks', - author: 'BC Parks', + issuingAgency: 'AGENCY_ENV_BCPARKS', + author: 'AGENCY_ENV_BCPARKS', legislation: [ { act: 'Fisheries Canada', diff --git a/api/src/importers/coors/tickets-utils.test.js b/api/src/importers/coors/tickets-utils.test.js index a92dab6cd..bf064afaa 100644 --- a/api/src/importers/coors/tickets-utils.test.js +++ b/api/src/importers/coors/tickets-utils.test.js @@ -56,8 +56,8 @@ describe('transformRecord', () => { companyName: 'businessName123', type: 'Company' }, - issuingAgency: 'BC Parks', - author: 'BC Parks', + issuingAgency: 'AGENCY_ENV_BCPARKS', + author: 'AGENCY_ENV_BCPARKS', legislation: [ { act: 'Fisheries Canada', diff --git a/api/src/importers/era/tickets-utils.js b/api/src/importers/era/tickets-utils.js index 8486c68ef..93676f538 100644 --- a/api/src/importers/era/tickets-utils.js +++ b/api/src/importers/era/tickets-utils.js @@ -40,8 +40,8 @@ class tickets extends BaseRecordUtils { } ticket['recordName'] = csvRow['article_description'] || ''; - ticket['issuingAgency'] = 'Natural Resource Officers'; - ticket['author'] = 'Natural Resource Officers'; + ticket['issuingAgency'] = 'AGENCY_FLNR_NRO'; + ticket['author'] = 'AGENCY_FLNR_NRO'; ticket['recordType'] = 'Ticket'; ticket['dateIssued'] = csvRow['service_date'] || null; diff --git a/api/src/importers/era/tickets-utils.test.js b/api/src/importers/era/tickets-utils.test.js index 97b5de411..dc7f07799 100644 --- a/api/src/importers/era/tickets-utils.test.js +++ b/api/src/importers/era/tickets-utils.test.js @@ -18,8 +18,8 @@ describe('transformRecord', () => { recordName: '', recordType: 'Ticket', - issuingAgency: 'Natural Resource Officers', - author: 'Natural Resource Officers', + issuingAgency: 'AGENCY_FLNR_NRO', + author: 'AGENCY_FLNR_NRO', location: '', dateIssued: null, @@ -55,8 +55,8 @@ describe('transformRecord', () => { recordName: 'bad manners', location: 'somewhere', recordType: 'Ticket', - issuingAgency: 'Natural Resource Officers', - author: 'Natural Resource Officers', + issuingAgency: 'AGENCY_FLNR_NRO', + author: 'AGENCY_FLNR_NRO', dateIssued: '02/24/2021', penalties: [ diff --git a/api/src/importers/flnr/inspections-utils.js b/api/src/importers/flnr/inspections-utils.js index cafb046ef..3e3e51744 100644 --- a/api/src/importers/flnr/inspections-utils.js +++ b/api/src/importers/flnr/inspections-utils.js @@ -40,8 +40,8 @@ class Inspections extends BaseRecordUtils { inspection['recordType'] = 'Inspection'; inspection['dateIssued'] = csvRow['date'] || null; - inspection['issuingAgency'] = 'Natural Resource Officers'; - inspection['author'] = 'Natural Resource Officers'; + inspection['issuingAgency'] = 'AGENCY_FLNR_NRO'; + inspection['author'] = 'AGENCY_FLNR_NRO'; inspection['recordName'] = (csvRow['record id'] && `NRO Inspection - Record ${csvRow['record id']}`) || '-'; inspection['description'] = (csvRow['activity'] && `Activity Inspected: ${csvRow['activity']}`) || '-'; diff --git a/api/src/importers/flnr/inspections-utils.test.js b/api/src/importers/flnr/inspections-utils.test.js index 709576f22..cd0ae4ba1 100644 --- a/api/src/importers/flnr/inspections-utils.test.js +++ b/api/src/importers/flnr/inspections-utils.test.js @@ -19,12 +19,12 @@ describe('transformRecord', () => { _sourceRefNrisId: '', recordType: 'Inspection', - author: 'Natural Resource Officers', + author: 'AGENCY_FLNR_NRO', dateIssued: null, issuedTo: { dateOfBirth: null, firstName: '', lastName: '', middleName: '', type: 'Individual', companyName: '' }, description: '-', sourceSystemRef: 'nris-flnr-csv', - issuingAgency: 'Natural Resource Officers', + issuingAgency: 'AGENCY_FLNR_NRO', legislation: [{ legislationDescription: 'Inspection to verify compliance with regulatory requirement' }], location: null, outcomeDescription: 'undefined - undefined', @@ -53,7 +53,7 @@ describe('transformRecord', () => { recordType: 'Inspection', recordName: 'NRO Inspection - Record 123', - author: 'Natural Resource Officers', + author: 'AGENCY_FLNR_NRO', description: 'Activity Inspected: Road - Maintenance', summary: 'Activity Inspected: Road - Maintenance', dateIssued: expect.any(String), @@ -61,7 +61,7 @@ describe('transformRecord', () => { companyName: 'LNG Canada Development Inc.', type: MiscConstants.IssuedToEntityTypes.Company }, - issuingAgency: 'Natural Resource Officers', + issuingAgency: 'AGENCY_FLNR_NRO', legislation: [ { legislationDescription: 'Inspection to verify compliance with regulatory requirement' diff --git a/api/src/importers/mis/inspection-utils.js b/api/src/importers/mis/inspection-utils.js index 8c6f147b0..2c57ac8b6 100644 --- a/api/src/importers/mis/inspection-utils.js +++ b/api/src/importers/mis/inspection-utils.js @@ -39,8 +39,8 @@ class Inspections extends BaseRecordUtils { inspection['recordType'] = 'Inspection'; inspection['dateIssued'] = csvRow['created '] || null; - inspection['issuingAgency'] = 'Ministry of Agriculture and Food'; - inspection['author'] = 'Ministry of Agriculture'; + inspection['issuingAgency'] = 'AGENCY_AGRI'; + inspection['author'] = 'AGENCY_AGRI'; inspection['recordName'] = (csvRow['issue no.'] && `Compliance issue ${csvRow['issue no.']}`) || ''; inspection['description'] = 'Inspection to verify compliance with regulatory requirement'; diff --git a/api/src/importers/mis/inspection-utils.test.js b/api/src/importers/mis/inspection-utils.test.js index 6554f7aef..89f5baea1 100644 --- a/api/src/importers/mis/inspection-utils.test.js +++ b/api/src/importers/mis/inspection-utils.test.js @@ -28,7 +28,7 @@ describe('transformRecord', () => { description: descriptionString, outcomeDescription: '', sourceSystemRef: 'agri-mis-csv', - issuingAgency: 'Ministry of Agriculture and Food', + issuingAgency: 'AGENCY_AGRI', legislation: [ { act: 'Food Safety Act', @@ -66,7 +66,7 @@ describe('transformRecord', () => { companyName: 'ACME Meat', type: MiscConstants.IssuedToEntityTypes.Company }, - issuingAgency: 'Ministry of Agriculture and Food', + issuingAgency: 'AGENCY_AGRI', legislation: [ { act: 'Food Safety Act', diff --git a/api/src/utils/constants/misc.js b/api/src/utils/constants/misc.js index 57465b82a..e64a617f5 100644 --- a/api/src/utils/constants/misc.js +++ b/api/src/utils/constants/misc.js @@ -69,9 +69,9 @@ exports.IssuedToEntityTypes = { }; exports.CoorsCsvIssuingAgencies = { - BC_Parks: 'BC Parks', - Conservation_Officer_Service: 'Conservation Officer Service', - Water_Sustainability_Act: 'BC Energy Regulator' + BC_Parks: 'AGENCY_ENV_BCPARKS', + Conservation_Officer_Service: 'AGENCY_ENV_COS', + Water_Sustainability_Act: 'AGENCY_OGC' }; exports.EpicProjectIds = { From 90c51ddd21a5df140e3b4aa205310a8368a530a7 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Wed, 4 Oct 2023 15:36:30 -0700 Subject: [PATCH 60/77] update importer integrations to use agencyCodes --- .../integrations/bcogc/administrative-penalties-utils.js | 4 ++-- api/src/integrations/bcogc/inspections-utils.js | 4 ++-- api/src/integrations/bcogc/inspections-utils.test.js | 8 ++++---- api/src/integrations/bcogc/orders-utils.js | 4 ++-- api/src/integrations/bcogc/warnings-utils.js | 4 ++-- api/src/integrations/bcogc/warnings-utils.test.js | 8 ++++---- api/src/integrations/core/datasource.js | 2 +- api/src/integrations/core/permit-utils.js | 2 +- api/src/integrations/epic/certificates-amendment-utils.js | 2 +- api/src/integrations/epic/certificates-utils.js | 2 +- api/src/integrations/epic/inspections-utils.js | 2 +- api/src/integrations/epic/orders-utils.js | 2 +- api/src/integrations/nris-emli/datasource.js | 2 +- api/src/integrations/nris-epd/datasource.js | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/api/src/integrations/bcogc/administrative-penalties-utils.js b/api/src/integrations/bcogc/administrative-penalties-utils.js index cbd466da4..727800d79 100644 --- a/api/src/integrations/bcogc/administrative-penalties-utils.js +++ b/api/src/integrations/bcogc/administrative-penalties-utils.js @@ -39,8 +39,8 @@ class AdministrativePenalty extends BaseRecordUtils { penalty['recordType'] = RECORD_TYPE.AdministrativePenalty.displayName; penalty['_sourceRefOgcPenaltyId'] = csvRow['Title']; - penalty['author'] = 'BC Energy Regulator'; - penalty['issuingAgency'] = 'BC Energy Regulator'; + penalty['author'] = 'AGENCY_OGC'; + penalty['issuingAgency'] = 'AGENCY_OGC'; penalty['recordName'] = csvRow['Title']; penalty['dateIssued'] = new Date(csvRow['Date Issued']); penalty['location'] = 'British Columbia'; diff --git a/api/src/integrations/bcogc/inspections-utils.js b/api/src/integrations/bcogc/inspections-utils.js index b91406199..a3341368e 100644 --- a/api/src/integrations/bcogc/inspections-utils.js +++ b/api/src/integrations/bcogc/inspections-utils.js @@ -51,8 +51,8 @@ class Inspections extends BaseRecordUtils { defaultLog.debug(error); inspection['dateIssued'] = null; } - inspection['issuingAgency'] = 'BC Energy Regulator'; - inspection['author'] = 'BC Energy Regulator'; + inspection['issuingAgency'] = 'AGENCY_OGC'; + inspection['author'] = 'AGENCY_OGC'; inspection['recordName'] = (csvRow['inspection number'] && `Inspection Number ${csvRow['inspection number']}`) || '-'; diff --git a/api/src/integrations/bcogc/inspections-utils.test.js b/api/src/integrations/bcogc/inspections-utils.test.js index a8e459a21..614a8b437 100644 --- a/api/src/integrations/bcogc/inspections-utils.test.js +++ b/api/src/integrations/bcogc/inspections-utils.test.js @@ -20,8 +20,8 @@ describe('transformRecord', () => { recordType: 'Inspection', dateIssued: null, issuedTo: { companyName: '', type: 'Company' }, - issuingAgency: 'BC Energy Regulator', - author: 'BC Energy Regulator', + issuingAgency: 'AGENCY_OGC', + author: 'AGENCY_OGC', recordName: '-', legislation: [{ act: 'Oil and Gas Activities Act', section: '57', subSection: '4', legislationDescription: 'Inspection to verify compliance with regulatory requirement' }], location: 'British Columbia', @@ -56,8 +56,8 @@ describe('transformRecord', () => { recordType: 'Inspection', dateIssued: expect.any(Date), issuedTo: { companyName: 'Coastal GasLink Pipeline Ltd.', type: 'Company' }, - issuingAgency: 'BC Energy Regulator', - author: 'BC Energy Regulator', + issuingAgency: 'AGENCY_OGC', + author: 'AGENCY_OGC', recordName: 'Inspection Number 123456', legislation: [ { diff --git a/api/src/integrations/bcogc/orders-utils.js b/api/src/integrations/bcogc/orders-utils.js index 93f2f1d71..a51bcc531 100644 --- a/api/src/integrations/bcogc/orders-utils.js +++ b/api/src/integrations/bcogc/orders-utils.js @@ -40,8 +40,8 @@ class Orders extends BaseRecordUtils { order['recordType'] = RECORD_TYPE.Order.displayName; order['_sourceRefOgcOrderId'] = csvRow['Title']; - order['author'] = 'BC Energy Regulator'; - order['issuingAgency'] = 'BC Energy Regulator'; + order['author'] = 'AGENCY_OGC'; + order['issuingAgency'] = 'AGENCY_OGC'; order['recordName'] = csvRow['Title']; try { diff --git a/api/src/integrations/bcogc/warnings-utils.js b/api/src/integrations/bcogc/warnings-utils.js index 7085368af..0a777efa2 100644 --- a/api/src/integrations/bcogc/warnings-utils.js +++ b/api/src/integrations/bcogc/warnings-utils.js @@ -40,8 +40,8 @@ class Warning extends BaseRecordUtils { warning['recordType'] = RECORD_TYPE.Warning.displayName; warning['_sourceRefOgcWarningId'] = csvRow['Title']; - warning['author'] = 'BC Energy Regulator'; - warning['issuingAgency'] = 'BC Energy Regulator'; + warning['author'] = 'AGENCY_OGC'; + warning['issuingAgency'] = 'AGENCY_OGC'; warning['recordName'] = csvRow['Filename']; try { warning['dateIssued'] = csvRow['Date Issued'] ? moment.tz(csvRow['Date Issued'], "MM/DD/YYYY", "America/Vancouver").toDate() : null; diff --git a/api/src/integrations/bcogc/warnings-utils.test.js b/api/src/integrations/bcogc/warnings-utils.test.js index 470284c14..e71ffd8e1 100644 --- a/api/src/integrations/bcogc/warnings-utils.test.js +++ b/api/src/integrations/bcogc/warnings-utils.test.js @@ -23,8 +23,8 @@ describe('transformRecord', () => { url: undefined }, issuedTo: { companyName: '', type: 'Company' }, - issuingAgency: 'BC Energy Regulator', - author: 'BC Energy Regulator', + issuingAgency: 'AGENCY_OGC', + author: 'AGENCY_OGC', location: 'British Columbia', recordName: undefined, sourceSystemRef: 'bcogc' @@ -52,8 +52,8 @@ describe('transformRecord', () => { url: 'https://www.bc-er.ca/some/file/Warning-letter-sample.pdf' }, issuedTo: { companyName: 'Coastal GasLink Pipeline Ltd.', type: 'Company' }, - issuingAgency: 'BC Energy Regulator', - author: 'BC Energy Regulator', + issuingAgency: 'AGENCY_OGC', + author: 'AGENCY_OGC', location: 'British Columbia', recordName: 'Warning-letter-sample.pdf', projectName: 'Coastal Gaslink', diff --git a/api/src/integrations/core/datasource.js b/api/src/integrations/core/datasource.js index 40dcd9086..55ec9dbc6 100644 --- a/api/src/integrations/core/datasource.js +++ b/api/src/integrations/core/datasource.js @@ -541,7 +541,7 @@ class CoreDataSource { name: amendment.description !== null ? amendment.description : 'Permit Documents', date: amendment.issue_date ? new Date(amendment.issue_date) : null, type: amendment.permit_amendment_type_code === 'OGP' ? 'Permit' : 'Permit Amendment', - agency: 'Ministry of Energy Mines and Low Carbon Innovation', + agency: 'AGENCY_EMLI', records: (existingPermits && existingPermits.map(permit => permit._id)) || [] }; diff --git a/api/src/integrations/core/permit-utils.js b/api/src/integrations/core/permit-utils.js index 30c98ed20..928d6ceb5 100644 --- a/api/src/integrations/core/permit-utils.js +++ b/api/src/integrations/core/permit-utils.js @@ -76,7 +76,7 @@ class Permits extends BaseRecordUtils { projectName: mineRecord.name || '', centroid: (mineRecord.location && mineRecord.location.coordinates) || [], - issuingAgency: 'Ministry of Energy Mines and Low Carbon Innovation' + issuingAgency: 'AGENCY_EMLI' }); } } diff --git a/api/src/integrations/epic/certificates-amendment-utils.js b/api/src/integrations/epic/certificates-amendment-utils.js index 78f9f195a..aa91543c2 100644 --- a/api/src/integrations/epic/certificates-amendment-utils.js +++ b/api/src/integrations/epic/certificates-amendment-utils.js @@ -34,7 +34,7 @@ class CertificatesAmendment extends BaseRecordUtils { return { ...(await super.transformRecord(epicRecord)), - issuingAgency: 'Environmental Assessment Office', + issuingAgency: 'AGENCY_EAO', legislation: [ { act: (epicRecord.project && epicRecord.project.legislation) || '' diff --git a/api/src/integrations/epic/certificates-utils.js b/api/src/integrations/epic/certificates-utils.js index 66aa0abb4..fc0985a5b 100644 --- a/api/src/integrations/epic/certificates-utils.js +++ b/api/src/integrations/epic/certificates-utils.js @@ -34,7 +34,7 @@ class Certificates extends BaseRecordUtils { return { ...(await super.transformRecord(epicRecord)), - issuingAgency: 'Environmental Assessment Office', + issuingAgency: 'AGENCY_EAO', legislation: [{ act: (epicRecord.project && epicRecord.project.legislation) || '' }] diff --git a/api/src/integrations/epic/inspections-utils.js b/api/src/integrations/epic/inspections-utils.js index 6d673ab6c..696dd06cb 100644 --- a/api/src/integrations/epic/inspections-utils.js +++ b/api/src/integrations/epic/inspections-utils.js @@ -53,7 +53,7 @@ class Inspections extends BaseRecordUtils { return { ...(await super.transformRecord(epicRecord)), - issuingAgency: 'Environmental Assessment Office', + issuingAgency: 'AGENCY_EAO', author: epicRecord.documentAuthor || '', legislation: [legislation], issuedTo: { diff --git a/api/src/integrations/epic/orders-utils.js b/api/src/integrations/epic/orders-utils.js index f673875c5..1939538b7 100644 --- a/api/src/integrations/epic/orders-utils.js +++ b/api/src/integrations/epic/orders-utils.js @@ -51,7 +51,7 @@ class Orders extends BaseRecordUtils { return { ...(await super.transformRecord(epicRecord)), - issuingAgency: 'Environmental Assessment Office', + issuingAgency: 'AGENCY_EAO', author: epicRecord.documentAuthor || '', legislation: [legislation], issuedTo: { diff --git a/api/src/integrations/nris-emli/datasource.js b/api/src/integrations/nris-emli/datasource.js index 1bc78903d..ebecd0f10 100644 --- a/api/src/integrations/nris-emli/datasource.js +++ b/api/src/integrations/nris-emli/datasource.js @@ -239,7 +239,7 @@ class NrisDataSource { defaultLog.debug(error); newRecord.dateIssued = null; } - newRecord.issuingAgency = 'Ministry of Energy Mines and Low Carbon Innovation'; + newRecord.issuingAgency = 'AGENCY_EMLI'; newRecord.author = 'EMLI'; newRecord.legislation = [{ ...legislation }]; newRecord.dateAdded = new Date(); diff --git a/api/src/integrations/nris-epd/datasource.js b/api/src/integrations/nris-epd/datasource.js index 96fb14b78..7c2805dd9 100644 --- a/api/src/integrations/nris-epd/datasource.js +++ b/api/src/integrations/nris-epd/datasource.js @@ -201,7 +201,7 @@ class NrisDataSource { // Re-write the issuing agency from Environmental Protection Office => Ministry of Environment and Climate Change Strategy stringTransformEPOtoEPD(agency) { - return agency === 'Environmental Protection Office' ? 'Ministry of Environment and Climate Change Strategy' : agency; + return agency === 'Environmental Protection Office' ? 'AGENCY_ENV' : agency; } stringTransformExpandAMP(inspctResponse) { From 89c2526eb8fb8a01fd251b27de2dedcba0d625f4 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Wed, 4 Oct 2023 16:14:09 -0700 Subject: [PATCH 61/77] fix some failing tests --- api/src/importers/cmdb/inspection-utils.test.js | 2 +- api/src/importers/coors/utils/csv-utils.js | 12 ++++-------- api/src/importers/coors/utils/csv-utils.test.js | 4 ++-- api/src/importers/mis/inspection-utils.test.js | 4 ++-- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/api/src/importers/cmdb/inspection-utils.test.js b/api/src/importers/cmdb/inspection-utils.test.js index 37826882a..05db504af 100644 --- a/api/src/importers/cmdb/inspection-utils.test.js +++ b/api/src/importers/cmdb/inspection-utils.test.js @@ -60,7 +60,7 @@ describe('transformRecord', () => { recordType: 'Inspection', recordName: 'Higher Risk Inspection', - author: 'Ministry of Agriculture', + author: 'AGENCY_AGRI', description: descriptionString, dateIssued: expect.any(String), issuedTo: { diff --git a/api/src/importers/coors/utils/csv-utils.js b/api/src/importers/coors/utils/csv-utils.js index fe85c07fe..26b7428f4 100644 --- a/api/src/importers/coors/utils/csv-utils.js +++ b/api/src/importers/coors/utils/csv-utils.js @@ -42,20 +42,16 @@ exports.getIssuingAgency = function(csvRow) { if (caseNum.toLowerCase().startsWith('p-')) { return MiscConstants.CoorsCsvIssuingAgencies.BC_Parks; } - - let act = ''; - if (csvRow['act']) { - act = csvRow['act']; - } else { - return null; - } + + // Provide a default value ('') if 'act' is missing. + let act = csvRow['act'] || ''; // Act == Water Sustainability Act, in which case Issuing Agency = BC Energy Regulator if (act.toLowerCase() == 'water sustainability act') { return MiscConstants.CoorsCsvIssuingAgencies.Water_Sustainability_Act; } - // Otherwise the issuing agency defaults to Conservation Officer Service + // Otherwise, the issuing agency defaults to Conservation Officer Service return MiscConstants.CoorsCsvIssuingAgencies.Conservation_Officer_Service; }; diff --git a/api/src/importers/coors/utils/csv-utils.test.js b/api/src/importers/coors/utils/csv-utils.test.js index 585cc8c74..16eb84929 100644 --- a/api/src/importers/coors/utils/csv-utils.test.js +++ b/api/src/importers/coors/utils/csv-utils.test.js @@ -40,13 +40,13 @@ describe('getIssuingAgency', () => { expect(result).toBe(null); }); - it('returns "BC Parks" if csvRow "case_number" starts with a "P-"', async () => { + it('returns "AGENCY_ENV_BCPARKS" if csvRow "case_number" starts with a "P-"', async () => { const result = await CsvUtils.getIssuingAgency({ case_number: 'P-123123' }); expect(result).toEqual(MiscConstants.CoorsCsvIssuingAgencies.BC_Parks); }); - it('returns "Conservation Officer Service" if csvRow "case_number" does not start with a "P-"', async () => { + it('returns "AGENCY_ENV_COS" if csvRow "case_number" does not start with a "P-"', async () => { const result = await CsvUtils.getIssuingAgency({ case_number: '123123' }); expect(result).toEqual(MiscConstants.CoorsCsvIssuingAgencies.Conservation_Officer_Service); diff --git a/api/src/importers/mis/inspection-utils.test.js b/api/src/importers/mis/inspection-utils.test.js index 89f5baea1..0dc4f1e7a 100644 --- a/api/src/importers/mis/inspection-utils.test.js +++ b/api/src/importers/mis/inspection-utils.test.js @@ -19,7 +19,7 @@ describe('transformRecord', () => { _sourceRefAgriMisId: '', recordType: 'Inspection', - author: 'Ministry of Agriculture', + author: 'AGENCY_AGRI', dateIssued: null, issuedTo: { type: MiscConstants.IssuedToEntityTypes.Company, @@ -59,7 +59,7 @@ describe('transformRecord', () => { recordType: 'Inspection', recordName: 'Compliance issue 123.4', - author: 'Ministry of Agriculture', + author: 'AGENCY_AGRI', description: descriptionString, dateIssued: expect.any(String), issuedTo: { From 9c8133d0a60291bc8e8135dbd64851b01e881f0a Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Thu, 5 Oct 2023 11:08:43 -0700 Subject: [PATCH 62/77] refactoring --- .../administrative-sanction-add-edit.component.ts | 2 +- .../annual-report-add-edit.component.ts | 2 +- .../certificate-amendments-add-edit.component.ts | 2 +- .../certificate-add-edit/certificate-add-edit.component.ts | 2 +- .../construction-plan-add-edit.component.ts | 2 +- .../correspondence-add-edit.component.ts | 2 +- .../court-conviction-add-edit.component.ts | 2 +- .../dam-safety-inspection-add-edit.component.ts | 2 +- .../inspection-add-edit/inspection-add-edit.component.ts | 2 +- .../management-plan-add-edit.component.ts | 2 +- .../orders/order-add-edit/order-add-edit.component.ts | 2 +- .../permits/permit-add-edit/permit-add-edit.component.ts | 2 +- .../reports/report-add-edit/report-add-edit.component.ts | 2 +- .../restorative-justice-add-edit.component.ts | 2 +- .../self-report-add-edit/self-report-add-edit.component.ts | 2 +- .../tickets/ticket-add-edit/ticket-add-edit.component.ts | 2 +- .../warnings/warning-add-edit/warning-add-edit.component.ts | 2 +- angular/projects/common/src/app/utils/record-constants.ts | 5 +++++ 18 files changed, 22 insertions(+), 17 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-add-edit/administrative-sanction-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-add-edit/administrative-sanction-add-edit.component.ts index f6b1b280e..a1b2c74e8 100644 --- a/angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-add-edit/administrative-sanction-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-add-edit/administrative-sanction-add-edit.component.ts @@ -33,7 +33,7 @@ export class AdministrativeSanctionAddEditComponent implements OnInit, OnDestroy public nrcedPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); public authors = Picklists.authorPicklist; private defaultAgency = ''; diff --git a/angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-add-edit/annual-report-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-add-edit/annual-report-add-edit.component.ts index 0bf7fd1b9..ca976451b 100644 --- a/angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-add-edit/annual-report-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-add-edit/annual-report-add-edit.component.ts @@ -31,7 +31,7 @@ export class AnnualReportAddEditComponent implements OnInit, OnDestroy { public bcmiPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); public datepickerMinDate = Constants.DatepickerMinDate; public datepickerMaxDate = Constants.DatepickerMaxDate; diff --git a/angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-add-edit/certificate-amendments-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-add-edit/certificate-amendments-add-edit.component.ts index 7ca86b85f..6ab29d0a0 100644 --- a/angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-add-edit/certificate-amendments-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-add-edit/certificate-amendments-add-edit.component.ts @@ -34,7 +34,7 @@ export class CertificateAmendmentAddEditComponent implements OnInit, OnDestroy { // Pick lists public certificateSubtypes = Picklists.certificateSubtypePicklist; - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); public datepickerMinDate = Constants.DatepickerMinDate; public datepickerMaxDate = Constants.DatepickerMaxDate; diff --git a/angular/projects/admin-nrpti/src/app/records/certificates/certificate-add-edit/certificate-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/certificates/certificate-add-edit/certificate-add-edit.component.ts index 70ea1dc4d..2c29f39f0 100644 --- a/angular/projects/admin-nrpti/src/app/records/certificates/certificate-add-edit/certificate-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/certificates/certificate-add-edit/certificate-add-edit.component.ts @@ -32,7 +32,7 @@ export class CertificateAddEditComponent implements OnInit, OnDestroy { // Pick lists public certificateSubtypes = Picklists.certificateSubtypePicklist; - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); public datepickerMinDate = Constants.DatepickerMinDate; public datepickerMaxDate = Constants.DatepickerMaxDate; diff --git a/angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-add-edit/construction-plan-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-add-edit/construction-plan-add-edit.component.ts index 23b1814ef..332e998a1 100644 --- a/angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-add-edit/construction-plan-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-add-edit/construction-plan-add-edit.component.ts @@ -31,7 +31,7 @@ export class ConstructionPlanAddEditComponent implements OnInit, OnDestroy { public lngPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); // Documents public documents = []; diff --git a/angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-add-edit/correspondence-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-add-edit/correspondence-add-edit.component.ts index 3de9d0edc..27397817e 100644 --- a/angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-add-edit/correspondence-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-add-edit/correspondence-add-edit.component.ts @@ -33,7 +33,7 @@ export class CorrespondenceAddEditComponent implements OnInit, OnDestroy { public bcmiPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); // Documents public documents = []; diff --git a/angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-add-edit/court-conviction-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-add-edit/court-conviction-add-edit.component.ts index 72b417415..07dadaa66 100644 --- a/angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-add-edit/court-conviction-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-add-edit/court-conviction-add-edit.component.ts @@ -34,7 +34,7 @@ export class CourtConvictionAddEditComponent implements OnInit, OnDestroy { public bcmiPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); public authors = Picklists.authorPicklist; public courtConvictionSubtypes = Picklists.courtConvictionSubtypePicklist; protected defaultAgency = ''; diff --git a/angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-add-edit/dam-safety-inspection-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-add-edit/dam-safety-inspection-add-edit.component.ts index 5ebee5cd2..afa95a927 100644 --- a/angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-add-edit/dam-safety-inspection-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-add-edit/dam-safety-inspection-add-edit.component.ts @@ -33,7 +33,7 @@ export class DamSafetyInspectionAddEditComponent implements OnInit, OnDestroy { public bcmiPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); // Documents public documents = []; diff --git a/angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts index 07a6cfd0f..f9d1d0329 100644 --- a/angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts @@ -33,7 +33,7 @@ export class InspectionAddEditComponent implements OnInit, OnDestroy { public nrcedPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); public authors = Picklists.authorPicklist; public outcomeStatuses = Picklists.outcomeStatusPicklist; private defaultAgency = ''; diff --git a/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-add-edit/management-plan-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-add-edit/management-plan-add-edit.component.ts index 1ccb362fb..bfbca43d2 100644 --- a/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-add-edit/management-plan-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/management-plans/management-plan-add-edit/management-plan-add-edit.component.ts @@ -31,7 +31,7 @@ export class ManagementPlanAddEditComponent implements OnInit, OnDestroy { public lngPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); // Documents public documents = []; diff --git a/angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts index c0d4511a9..554ab8a3b 100644 --- a/angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts @@ -34,7 +34,7 @@ export class OrderAddEditComponent implements OnInit, OnDestroy { // Pick lists public orderSubtypePicklist = Picklists.orderSubtypePicklist; - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); public authors = Picklists.authorPicklist; public outcomeStatuses = Picklists.outcomeStatusPicklist; private defaultAgency = ''; diff --git a/angular/projects/admin-nrpti/src/app/records/permits/permit-add-edit/permit-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/permits/permit-add-edit/permit-add-edit.component.ts index 924a48bf6..34151a10b 100644 --- a/angular/projects/admin-nrpti/src/app/records/permits/permit-add-edit/permit-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/permits/permit-add-edit/permit-add-edit.component.ts @@ -32,7 +32,7 @@ export class PermitAddEditComponent implements OnInit, OnDestroy { // Pick lists public permitSubtypes = Picklists.permitSubtypePicklist; - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); private defaultAgency = ''; // Documents diff --git a/angular/projects/admin-nrpti/src/app/records/reports/report-add-edit/report-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/reports/report-add-edit/report-add-edit.component.ts index 2921e8483..65783fc04 100644 --- a/angular/projects/admin-nrpti/src/app/records/reports/report-add-edit/report-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/reports/report-add-edit/report-add-edit.component.ts @@ -33,7 +33,7 @@ export class ReportAddEditComponent implements OnInit, OnDestroy { public bcmiPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); // Documents public documents = []; diff --git a/angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-add-edit/restorative-justice-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-add-edit/restorative-justice-add-edit.component.ts index efb52c90e..77e95537b 100644 --- a/angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-add-edit/restorative-justice-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-add-edit/restorative-justice-add-edit.component.ts @@ -33,7 +33,7 @@ export class RestorativeJusticeAddEditComponent implements OnInit, OnDestroy { public nrcedPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); public authors = Picklists.authorPicklist; private defaultAgency = ''; diff --git a/angular/projects/admin-nrpti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.ts index dbd2c7449..b14af9795 100644 --- a/angular/projects/admin-nrpti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.ts @@ -31,7 +31,7 @@ export class SelfReportAddEditComponent implements OnInit, OnDestroy { public lngPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); public authors = Picklists.authorPicklist; // Documents diff --git a/angular/projects/admin-nrpti/src/app/records/tickets/ticket-add-edit/ticket-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/tickets/ticket-add-edit/ticket-add-edit.component.ts index a8cbfd0af..b03fd01e4 100644 --- a/angular/projects/admin-nrpti/src/app/records/tickets/ticket-add-edit/ticket-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/tickets/ticket-add-edit/ticket-add-edit.component.ts @@ -33,7 +33,7 @@ export class TicketAddEditComponent implements OnInit, OnDestroy { public nrcedPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); public authors = Picklists.authorPicklist; private defaultAgency = ''; diff --git a/angular/projects/admin-nrpti/src/app/records/warnings/warning-add-edit/warning-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/records/warnings/warning-add-edit/warning-add-edit.component.ts index ed6a1ea2a..68608dd87 100644 --- a/angular/projects/admin-nrpti/src/app/records/warnings/warning-add-edit/warning-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/records/warnings/warning-add-edit/warning-add-edit.component.ts @@ -33,7 +33,7 @@ export class WarningAddEditComponent implements OnInit, OnDestroy { public nrcedPublishSubtext = 'Not published'; // Pick lists - public agencies = Picklists.agencyCodePicklist; + public agencies = Picklists.getAgencyCodes(this.factoryService); public authors = Picklists.authorPicklist; public outcomeStatuses = Picklists.outcomeStatusPicklist; private defaultAgency = ''; diff --git a/angular/projects/common/src/app/utils/record-constants.ts b/angular/projects/common/src/app/utils/record-constants.ts index d45ad2200..45b2679fa 100644 --- a/angular/projects/common/src/app/utils/record-constants.ts +++ b/angular/projects/common/src/app/utils/record-constants.ts @@ -188,6 +188,11 @@ export class Picklists { return agencyDataService.getAgencyCode(agencyName); } + public static getAgencyCodes(factoryService: FactoryService) { + const agencyDataService = new AgencyDataService(factoryService); + return agencyDataService.getAgencyCodes(); + } + public static readonly agencyCodePicklist = [ 'AGENCY_ALC', 'AGENCY_OGC', From 10dc4e7630e0954ae64eaa5717802fb944427474 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Thu, 5 Oct 2023 11:38:16 -0700 Subject: [PATCH 63/77] add documentation to new files and migrations; minor code cleanup --- .../services/application-agency.service.ts | 30 ++++++++-- .../src/app/services/factory.service.ts | 4 +- .../src/app/services/issuingagency.service.ts | 32 ++++++++-- .../src/lib/utils/agency-data-service.ts | 33 +++++++++++ ...30911220312-addApplicationAgenciesModel.js | 31 ++++++---- ...0230912181649-updateIssuingAgencyToCode.js | 41 ++++--------- api/src/controllers/agencies.js | 59 +++++++++++-------- 7 files changed, 155 insertions(+), 75 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts b/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts index b172cd75d..e40a8b303 100644 --- a/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/application-agency.service.ts @@ -1,24 +1,42 @@ +/** + * @description This service provides methods to fetch and store issuing agencies. + * @class ApplicationAgencyService + */ + import { Injectable } from '@angular/core'; import { ConfigService } from 'nrpti-angular-components'; import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; -/* -Service Layer for fetching issuing agencies and storing them in app_initializer -*/ - +/** + * @class + * @description Service for managing issuing agencies. + */ @Injectable() export class ApplicationAgencyService { private api: string; private agencies: { [key: string]: string } = {}; + /** + * @constructor + * @param {ConfigService} configService - The configuration service. + * @param {HttpClient} http - The HTTP client for making API requests. + */ constructor(private configService: ConfigService, public http: HttpClient) {} + /** + * Initialize the service by setting the API endpoint and refreshing agencies. + * @async + */ async init() { this.api = `${this.configService.config['API_LOCATION']}${this.configService.config['API_PATH']}`; await this.refreshAgencies().toPromise(); } + /** + * Refresh the list of agencies from the API. + * @returns {Observable} An observable that completes when agencies are refreshed. + */ refreshAgencies(): Observable { return new Observable(observer => { const apiEndpoint = `${this.api}/list-agencies`; @@ -45,6 +63,10 @@ export class ApplicationAgencyService { }); } + /** + * Get the list of agencies. + * @returns {Object} A dictionary of agency codes and names. + */ getAgencies(): { [key: string]: string } { return this.agencies; } diff --git a/angular/projects/admin-nrpti/src/app/services/factory.service.ts b/angular/projects/admin-nrpti/src/app/services/factory.service.ts index 1c87a3759..e5d14e518 100644 --- a/angular/projects/admin-nrpti/src/app/services/factory.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/factory.service.ts @@ -643,9 +643,7 @@ export class FactoryService { /** * Get agency data. If data is not cached, fetch it from the ApplicationAgencyService. - * - * @readonly - * @type {{ [key: string]: string }} + * @returns {Observable} An observable that resolves when agency data is fetched. * @memberof FactoryService */ public getApplicationAgencyService(): Observable { diff --git a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts index f2d810894..6758fe54b 100644 --- a/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts +++ b/angular/projects/admin-nrpti/src/app/services/issuingagency.service.ts @@ -1,24 +1,46 @@ +/** + * @description This service is used for fetching issuing agencies and storing them in the database. + * @class IssuingAgencyService + */ + import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { ApiService } from './api.service'; -/* -Service Layer for agencies component. Used for fetching issuing agencies and storing them in database -*/ + +/** + * @class + * @description Service for managing issuing agencies. + */ @Injectable({ providedIn: 'root' }) export class IssuingAgencyService { + /** + * @constructor + * @param {ApiService} apiService - The API service for handling API requests. + * @param {HttpClient} http - The HTTP client for making API requests. + */ constructor(public apiService: ApiService, public http: HttpClient) {} + /** + * Get the list of issuing agencies from the API. + * @returns {Promise} A promise that resolves with the list of issuing agencies. + */ public getIssuingAgencies(): Promise { return this.http .get(`${this.apiService.pathAPI}/list-agencies`) .toPromise() .catch(error => { console.error('API call error:', error); - throw error; // Rethrow the error to propagate it further + throw error; }); } + /** + * Update an agency's information in the database. + * @param {string} agencyCode - The code of the agency to update. + * @param {any} agencyName - The updated agency name. + * @returns {Promise} A promise that resolves with the result of the update operation. + */ public updateAgency(agencyCode: string, agencyName: any): Promise { const apiUrl = `${this.apiService.pathAPI}/update-agencies`; const updatedAgency = { agencies: [{ agencyCode: agencyCode, agencyName: agencyName }] }; // Wrap the array in an object @@ -28,7 +50,7 @@ export class IssuingAgencyService { .toPromise() .catch(error => { console.error('API call error:', error); - throw error; // Rethrow the error to propagate it further + throw error; }); } } diff --git a/angular/projects/global/src/lib/utils/agency-data-service.ts b/angular/projects/global/src/lib/utils/agency-data-service.ts index 777690e9d..93d4ece40 100644 --- a/angular/projects/global/src/lib/utils/agency-data-service.ts +++ b/angular/projects/global/src/lib/utils/agency-data-service.ts @@ -1,10 +1,30 @@ +/** + * @summary service for accessing issuing agencies. + * @description the service provides methods for getting agency codes and names from ApplicationAgencyService. + * @class AgencyDataService + */ + import { FactoryService } from '../../../../admin-nrpti/src/app/services/factory.service'; +/** + * @class + * @description Service for accessing issuing agencies from ApplicationAgencyService. + */ export class AgencyDataService { + /** + * @constructor + * @param {FactoryService} factoryService - the factory service for accessing application agency data. + */ constructor( private factoryService: FactoryService, ) {} + /** + * Get the full name of the agency based on the agency's code + * retrieved from the agency data using the FactoryService. + * @param {string} agencyCode - an agency's code + * @returns {string} - the agency's full name + */ displayNameFull(agencyCode): string { // Access cached agency data from FactoryService const agencyService = this.factoryService.applicationAgencyService; @@ -13,6 +33,10 @@ export class AgencyDataService { return agencyList && agencyList[agencyCode] ? agencyList[agencyCode] : agencyCode; } + /** + * Get an array of agency codes. + * @returns {string[]} - an array of agency codes + */ getAgencyCodes(): string[] { const agencyService = this.factoryService.applicationAgencyService; const agencyList = agencyService ? agencyService.getAgencies() : null; @@ -20,6 +44,10 @@ export class AgencyDataService { return agencyList ? Object.keys(agencyList) : []; } + /** + * Get an array of agency names. + * @returns {string[]} - an array of agency names + */ getAgencyNames(): string[] { const agencyService = this.factoryService.applicationAgencyService; const agencyList = agencyService ? agencyService.getAgencies() : null; @@ -27,6 +55,11 @@ export class AgencyDataService { return agencyList ? Object.values(agencyList) : []; } + /** + * Get the agency code based on the agency's name + * @param {string} agencyName - the name of an agency + * @returns {string} - the agency's code + */ getAgencyCode(agencyName: string): string { const agencyService = this.factoryService.applicationAgencyService; const agencyList = agencyService ? agencyService.getAgencies() : null; diff --git a/api/migrations/20230911220312-addApplicationAgenciesModel.js b/api/migrations/20230911220312-addApplicationAgenciesModel.js index ea25e0624..8b7aee0f6 100644 --- a/api/migrations/20230911220312-addApplicationAgenciesModel.js +++ b/api/migrations/20230911220312-addApplicationAgenciesModel.js @@ -1,21 +1,22 @@ -'use strict'; -const ApplicationAgency = require('../src/models/master/applicationAgency'); -const mongoose = require('mongoose'); - -var dbm; -var type; -var seed; - -/* -Migration file for adding agency codes and agency values to the nrpti collection -*/ +/** + * @summary Adds agency/ministry codes and names as ApplicationAgency constants to the nrpti collection in the database. + */ +/** + * @param {Object} options - Migration options. + * @param {string} seedLink - Seed link. + * @description Sets up the migration by initializing variables. + */ exports.setup = function(options, seedLink) { dbm = options.dbmigrate; type = dbm.dataType; seed = seedLink; }; +/** + * @param {Object} db - Database connection object. + * @description Adds _schemaName:ApplicationAgency constants to the nrpti collection in the database. + */ exports.up = async function (db) { console.log('**** Adding ApplicationAgencies constants to nrpti collection ****'); @@ -78,10 +79,18 @@ exports.up = async function (db) { return null; }; +/** + * @param {Object} db - Database connection object. + * @description Performs the reverse migration (not implemented in this script). + */ exports.down = function(db) { return null; }; +/** + * @property {Object} _meta + * @property {number} _meta.version - The version of the migration script. + */ exports._meta = { "version": 1 }; diff --git a/api/migrations/20230912181649-updateIssuingAgencyToCode.js b/api/migrations/20230912181649-updateIssuingAgencyToCode.js index cb15d83a9..3c3d3a4a2 100644 --- a/api/migrations/20230912181649-updateIssuingAgencyToCode.js +++ b/api/migrations/20230912181649-updateIssuingAgencyToCode.js @@ -1,26 +1,16 @@ -'use strict'; - -var dbm; -var seed; - /** - * Migration file for updating all existing records to use agency code instead of agency value + * @summary Updates existing records in nrpti and redacted_record_subset to use agency/ministry codes instead of names. */ -exports.setup = function (options, seedLink) { - dbm = options.dbmigrate; - seed = seedLink; -}; +/** + * @param {Object} db - Database connection object. + * @description Updates records in specified collections to use agency codes instead of agency values. + */ exports.up = async function (db) { const mClient = await db.connection.connect(db.connectionString, { native_parser: true, }); - const LegislationActs = { - ACT_Env_Management: 'Environmental Management Act', - ACT_Int_Pest_Management: 'Integrated Pest Management Act', - }; - const agencies = [ { agencyCode: 'AGENCY_ALC', agencyName: 'Agricultural Land Commission' }, { agencyCode: 'AGENCY_WF', agencyName: 'BC Wildfire Service' }, @@ -70,23 +60,18 @@ exports.up = async function (db) { return null; }; +/** + * @param {Object} db - Database connection object. + * @description Performs the reverse migration (not implemented in this script). + */ exports.down = function (db) { return null; }; +/** + * @property {Object} _meta + * @property {number} _meta.version - The version of the migration script. + */ exports._meta = { version: 1 }; - -/** - * Update a record in the collection with a new agency code. - * @param {Collection} collection - MongoDB collection. - * @param {string} recordId - The ID of the record to update. - * @param {string} newAgencyCode - The new agency code. - */ -async function updateRecord(collection, recordId, newAgencyCode) { - await collection.updateOne( - { _id: recordId }, - { $set: { 'legislation.act': newAgencyCode } } - ); -} diff --git a/api/src/controllers/agencies.js b/api/src/controllers/agencies.js index dc224cfbe..a6a5140ae 100644 --- a/api/src/controllers/agencies.js +++ b/api/src/controllers/agencies.js @@ -1,13 +1,20 @@ +/** + * @summary APIs for the Update Issuing Agency page. + * @description This file contains API endpoints for loading and updating agency names from the database. + */ + const queryActions = require('../utils/query-actions'); const mongodb = require('../utils/mongodb'); const RECORD_TYPE = require('../utils/constants/record-type-enum'); const defaultLog = require('../utils/logger')('record'); -/* -APIs for Update Issuing Agency page -Includes Get and Put apis to load and update agency names from the database -*/ - +/** + * @async + * @param {Object} args - Request arguments. + * @param {Object} res - Response object. + * @param {Function} next - Next function in the middleware chain. + * @description Get API for retrieving agency code and names from the database. + */ exports.publicGet = async function(args, res, next) { const db = mongodb.connection.db(process.env.MONGODB_DATABASE || 'nrpti-dev'); const collectionDB = db.collection('nrpti'); @@ -15,9 +22,10 @@ exports.publicGet = async function(args, res, next) { let agencyList; try { - //Obtain documents with Application Agency Schema + // Obtain documents with Application Agency Schema let agencyDocuments = await collectionDB.find({ _schemaName: RECORD_TYPE.ApplicationAgency._schemaName }).toArray(); - //Using map function to iterate through the original array and creates a new array with objects containing only the _id, agencyCode, and agencyName properties. + // Using map function to iterate through the original array and creates + // a new array with objects containing only the _id, agencyCode, and agencyName properties. agencyList = agencyDocuments.map(item => ({ _id: item._id, agencyCode: item.agencyCode, @@ -30,24 +38,27 @@ exports.publicGet = async function(args, res, next) { queryActions.sendResponse(res, 200, agencyList); }; -/** -* @param {*} args -* @param {*} res -* @param {*} next -* @param {*} incomingObj see example -* @returns edited lng order record -* Example of args.swagger.params.data.value - { - "agencies": - [ - { - "agencyCode": "AGENCY_ALC", - "agencyName": "Agricultural Land Commission_1" - } - ] - } -*/ +/** + * @async + * @param {Object} args - Request arguments. + * @param {Object} res - Response object. + * @param {Function} next - Next function in the middleware chain. + * @description Put API for updating agency names in the database. + * @param {Object} incomingObj - Incoming object with agency code and the new name to update. + * @returns {string} - Result message ('Success' or 'Error'). + * @example + * // Example of args.swagger.params.data.value + * { + * "agencies": + * [ + * { + * "agencyCode": "AGENCY_ALC", + * "agencyName": "Agricultural Land Commission_1" + * } + * ] + * } + */ exports.protectedPut = async function(args, res, next) { const db = mongodb.connection.db(process.env.MONGODB_DATABASE || 'nrpti-dev'); let promises = []; From 435da7ccea2fbf93e5b30712f4d5f5381c9efb0b Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Thu, 5 Oct 2023 16:09:50 -0700 Subject: [PATCH 64/77] migration added for bcmi --- ...005223753-updateBCMIIssuingAgencyToCode.js | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 api/migrations/20231005223753-updateBCMIIssuingAgencyToCode.js diff --git a/api/migrations/20231005223753-updateBCMIIssuingAgencyToCode.js b/api/migrations/20231005223753-updateBCMIIssuingAgencyToCode.js new file mode 100644 index 000000000..e8d8bcc00 --- /dev/null +++ b/api/migrations/20231005223753-updateBCMIIssuingAgencyToCode.js @@ -0,0 +1,77 @@ +/** + * @summary Updates existing records in nrpti and redacted_record_subset to use agency/ministry codes instead of names. + */ + +/** + * @param {Object} db - Database connection object. + * @description Updates records in specified collections to use agency codes instead of agency values. + */ +exports.up = async function (db) { + const mClient = await db.connection.connect(db.connectionString, { + native_parser: true, + }); + + const agencies = [ + { agencyCode: 'AGENCY_ALC', agencyName: 'Agricultural Land Commission' }, + { agencyCode: 'AGENCY_WF', agencyName: 'BC Wildfire Service' }, + { agencyCode: "AGENCY_ENV_COS", agencyName: 'Conservation Officer Service' }, + { agencyCode: "AGENCY_EAO", agencyName: 'Environmental Assessment Office' }, + { agencyCode: "AGENCY_EMLI", agencyName: 'Ministry of Energy Mines and Low Carbon Innovation' }, + { agencyCode: "AGENCY_ENV", agencyName: 'Ministry of Environment and Climate Change Strategy' }, + { agencyCode: "AGENCY_ENV_BCPARKS", agencyName: 'BC Parks' }, + { agencyCode: "AGENCY_OGC", agencyName: 'BC Energy Regulator' }, + { agencyCode: "AGENCY_LNG", agencyName: 'LNG Secretariat' }, + { agencyCode: "AGENCY_AGRI", agencyName: 'Ministry of Agriculture and Food' }, + { agencyCode: "AGENCY_FLNRO", agencyName: 'Ministry of Forests' }, + { agencyCode: "AGENCY_FLNR_NRO", agencyName: 'Natural Resource Officers' }, + { agencyCode: "AGENCY_WLRS", agencyName: 'Ministry of Water, Land and Resource Stewardship' }, + { agencyCode: "AGENCY_CAS", agencyName: 'Climate Action Secretariat' } + ]; + + const collections = ['nrpti', 'redacted_record_subset']; + + try { + for (let collection of collections) { + console.log(`***** Collection: ${collection} *****`); + try { + let currentCollection = await mClient.collection(collection); + + for (const agency of agencies) { + // Update issuingAgency and author fields for the agency + await currentCollection.updateMany( + { agency: agency['agencyName'] }, + { $set: { agency: agency['agencyCode'] } } + ); + + console.log(` ***** Updated collection: ${collection} for agency: ${agency['agencyName']} *****`); + } + } catch (err) { + console.error(` ***** Error updating collection: ${collection} for agency: ${agency['agencyName']} *****`, err); + } + } + } catch (err) { + console.error('Error connecting to the database:', err); + } finally { + if (mClient) { + await mClient.close(); + } + } + + return null; +}; + +/** + * @param {Object} db - Database connection object. + * @description Performs the reverse migration (not implemented in this script). + */ +exports.down = function (db) { + return null; +}; + +/** + * @property {Object} _meta + * @property {number} _meta.version - The version of the migration script. + */ +exports._meta = { + version: 1 +}; From 329ac932dd5025090b2bff52b7190e0d5e5e29df Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Thu, 5 Oct 2023 17:07:35 -0700 Subject: [PATCH 65/77] fix missing agency codes in integrations; add epic test --- .../search/redactedRecordSubset.test.js | 6 +++--- .../integrations/epic/base-record-utils.js | 1 + .../epic/management-plans-utils.js | 2 +- .../epic/management-plans-utils.test.js | 19 +++++++++++++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 api/src/integrations/epic/management-plans-utils.test.js diff --git a/api/materialized_views/search/redactedRecordSubset.test.js b/api/materialized_views/search/redactedRecordSubset.test.js index 35d0af33a..8bae9a36b 100644 --- a/api/materialized_views/search/redactedRecordSubset.test.js +++ b/api/materialized_views/search/redactedRecordSubset.test.js @@ -44,7 +44,7 @@ describe('Record Individual issuedTo redaction test', () => { const testRecord = new TestModel({ issuedTo: generateIssuedTo( false, true, false ), _schemaName: 'Schema', - issuingAgency: 'BC Parks' + issuingAgency: 'AGENCY_ENV_BCPARKS' }); await nrptiCollection.insertOne(testRecord); @@ -62,7 +62,7 @@ describe('Record Individual issuedTo redaction test', () => { const testRecord = new TestModel({ issuedTo: generateIssuedTo( true, false, false ), _schemaName: 'Schema', - issuingAgency: 'BC Parks' + issuingAgency: 'AGENCY_ENV_BCPARKS' }); await nrptiCollection.insertOne(testRecord); @@ -120,4 +120,4 @@ describe('Record Individual issuedTo redaction test', () => { const redacted = await redacted_record_subset.findOne(); expect(redacted.issuedTo.companyName).toEqual(testRecord.issuedTo.companyName); }); -}); \ No newline at end of file +}); diff --git a/api/src/integrations/epic/base-record-utils.js b/api/src/integrations/epic/base-record-utils.js index 80270501d..dbf5500b0 100644 --- a/api/src/integrations/epic/base-record-utils.js +++ b/api/src/integrations/epic/base-record-utils.js @@ -130,6 +130,7 @@ class BaseRecordUtils { _sourceRefId: new ObjectID(epicRecord._id) || '', _epicMilestoneId: epicRecord.milestone || '', mineGuid: (mineRecord && mineRecord._sourceRefId) || null, + issuingAgency: 'AGENCY_EAO', recordName: epicRecord.displayName || '', recordType: this.recordType.displayName, diff --git a/api/src/integrations/epic/management-plans-utils.js b/api/src/integrations/epic/management-plans-utils.js index b0e07a98f..83231951f 100644 --- a/api/src/integrations/epic/management-plans-utils.js +++ b/api/src/integrations/epic/management-plans-utils.js @@ -35,7 +35,7 @@ class ManagementPlans extends BaseRecordUtils { return { ...(await super.transformRecord(epicRecord)), - issuingAgency: 'Environmental Assessment Office', + issuingAgency: 'AGENCY_EAO', author: epicRecord.documentAuthor || '' }; } diff --git a/api/src/integrations/epic/management-plans-utils.test.js b/api/src/integrations/epic/management-plans-utils.test.js new file mode 100644 index 000000000..ced2f67a2 --- /dev/null +++ b/api/src/integrations/epic/management-plans-utils.test.js @@ -0,0 +1,19 @@ +const ManagementPlans = require('./management-plans-utils'); +const RECORD_TYPE = require('../../utils/constants/record-type-enum'); + +describe('ManagementPlans', () => { + describe('transformRecord', () => { + it('transforms an epic management plan record correctly', async () => { + const epicRecord = {'recordName': 'test abc'} + const managementPlans = new ManagementPlans({}, RECORD_TYPE.ManagementPlan); + const transformedRecord = await managementPlans.transformRecord(epicRecord); + + expect(transformedRecord.issuingAgency).toEqual('AGENCY_EAO'); + }); + + it('throws an error if epic record is not provided', async () => { + const managementPlans = new ManagementPlans({}, RECORD_TYPE.ManagementPlan); + await expect(managementPlans.transformRecord(null)).rejects.toThrow('transformRecord - required record must be non-null.'); + }); + }); +}); From 822c8f08efad1906c8e3828ae3e99aebb562fdec Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Thu, 12 Oct 2023 16:36:30 -0700 Subject: [PATCH 66/77] wip - nrced agency swap --- .../lib/utils/agency-data-service-nrced.ts | 80 +++++++++++++++++++ .../public-nrpti/src/app/app.module.ts | 9 ++- .../inspection-detail.component.ts | 6 +- .../services/application-agency.service.ts | 75 +++++++++++++++++ .../src/app/services/factory.service.ts | 32 +++++++- 5 files changed, 196 insertions(+), 6 deletions(-) create mode 100644 angular/projects/global/src/lib/utils/agency-data-service-nrced.ts create mode 100644 angular/projects/public-nrpti/src/app/services/application-agency.service.ts diff --git a/angular/projects/global/src/lib/utils/agency-data-service-nrced.ts b/angular/projects/global/src/lib/utils/agency-data-service-nrced.ts new file mode 100644 index 000000000..b83d92232 --- /dev/null +++ b/angular/projects/global/src/lib/utils/agency-data-service-nrced.ts @@ -0,0 +1,80 @@ +/** + * @summary service for accessing issuing agencies. + * @description the service provides methods for getting agency codes and names from ApplicationAgencyService. + * @class AgencyDataService + */ + +// import { Console } from 'console'; +import { FactoryService } from '../../../../public-nrpti/src/app/services/factory.service'; + +/** + * @class + * @description Service for accessing issuing agencies from ApplicationAgencyService. + */ +export class AgencyDataService { + /** + * @constructor + * @param {FactoryService} factoryService - the factory service for accessing application agency data. + */ + constructor( + private factoryService: FactoryService, + ) {} + + /** + * Get the full name of the agency based on the agency's code + * retrieved from the agency data using the FactoryService. + * @param {string} agencyCode - an agency's code + * @returns {string} - the agency's full name + */ + displayNameFull(agencyCode): string { + // Access cached agency data from FactoryService + const agencyService = this.factoryService.applicationAgencyService; + const agencyList = agencyService ? agencyService.getAgencies() : null; + console.log("agency>>>" + agencyCode); + console.log("agencyList>>>" + JSON.stringify(agencyList)); + return agencyList && agencyList[agencyCode] ? agencyList[agencyCode] : agencyCode; + } + + /** + * Get an array of agency codes. + * @returns {string[]} - an array of agency codes + */ + getAgencyCodes(): string[] { + const agencyService = this.factoryService.applicationAgencyService; + const agencyList = agencyService ? agencyService.getAgencies() : null; + + return agencyList ? Object.keys(agencyList) : []; + } + + /** + * Get an array of agency names. + * @returns {string[]} - an array of agency names + */ + getAgencyNames(): string[] { + const agencyService = this.factoryService.applicationAgencyService; + const agencyList = agencyService ? agencyService.getAgencies() : null; + + return agencyList ? Object.values(agencyList) : []; + } + + /** + * Get the agency code based on the agency's name + * @param {string} agencyName - the name of an agency + * @returns {string} - the agency's code + */ + getAgencyCode(agencyName: string): string { + const agencyService = this.factoryService.applicationAgencyService; + const agencyList = agencyService ? agencyService.getAgencies() : null; + + if (agencyList) { + for (const key in agencyList) { + if (agencyList.hasOwnProperty(key) && agencyList[key] === agencyName) { + return key; // Return the key if the value matches + } + } + } + // Return a default value or handle the case where agencyList is undefined or empty + return ''; + } + +} diff --git a/angular/projects/public-nrpti/src/app/app.module.ts b/angular/projects/public-nrpti/src/app/app.module.ts index 1b8bd45c4..469be2436 100644 --- a/angular/projects/public-nrpti/src/app/app.module.ts +++ b/angular/projects/public-nrpti/src/app/app.module.ts @@ -29,12 +29,14 @@ import { ApiService } from './services/api.service'; import { DocumentService } from './services/document.service'; import { FactoryService } from './services/factory.service'; import { ConfigService, LoggerService } from 'nrpti-angular-components'; +import { ApplicationAgencyService } from './services/application-agency.service'; export function overlayScrollFactory(overlay: Overlay): () => CloseScrollStrategy { return () => overlay.scrollStrategies.close(); } -export function initConfig(configService: ConfigService) { +export function initConfig(configService: ConfigService, + applicationAgency: ApplicationAgencyService) { return () => configService.init(); } @@ -60,7 +62,7 @@ export function initConfig(configService: ConfigService) { { provide: APP_INITIALIZER, useFactory: initConfig, - deps: [ConfigService], + deps: [ConfigService, ApplicationAgencyService], multi: true }, { @@ -72,7 +74,8 @@ export function initConfig(configService: ConfigService) { ApiService, DocumentService, FactoryService, - LoggerService + LoggerService, + ApplicationAgencyService ], entryComponents: [ConfirmComponent, HomeComponent], bootstrap: [AppComponent] diff --git a/angular/projects/public-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts b/angular/projects/public-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts index b71f1bb32..1fdc32f7f 100644 --- a/angular/projects/public-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts +++ b/angular/projects/public-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts @@ -6,7 +6,7 @@ import { InspectionNRCED, Document } from '../../../../../../common/src/app/mode import { FactoryService } from '../../../services/factory.service'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { Utils as GlobalUtils } from 'nrpti-angular-components'; - +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service-nrced'; @Component({ selector: 'app-inspection-detail', templateUrl: './inspection-detail.component.html', @@ -90,7 +90,9 @@ export class InspectionDetailComponent implements OnInit, OnChanges, OnDestroy { } displayName(agency) { - return GlobalUtils.displayNameFull(agency); + //return GlobalUtils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/public-nrpti/src/app/services/application-agency.service.ts b/angular/projects/public-nrpti/src/app/services/application-agency.service.ts new file mode 100644 index 000000000..94a737d1a --- /dev/null +++ b/angular/projects/public-nrpti/src/app/services/application-agency.service.ts @@ -0,0 +1,75 @@ +/** + * @description This service provides methods to fetch and store issuing agencies. + * @class ApplicationAgencyService + */ + +import { Injectable } from '@angular/core'; +import { ConfigService } from 'nrpti-angular-components'; +import { Observable } from 'rxjs'; +import { HttpClient } from '@angular/common/http'; + +/** + * @class + * @description Service for managing issuing agencies. + */ +@Injectable() +export class ApplicationAgencyService { + private api: string; + private agencies: { [key: string]: string } = {}; + + /** + * @constructor + * @param {ConfigService} configService - The configuration service. + * @param {HttpClient} http - The HTTP client for making API requests. + */ + constructor(private configService: ConfigService, public http: HttpClient) {} + + /** + * Initialize the service by setting the API endpoint and refreshing agencies. + * @async + */ + async init() { + this.api = `${this.configService.config['API_LOCATION']}${this.configService.config['API_PATH']}`; + await this.refreshAgencies().toPromise(); + } + + /** + * Refresh the list of agencies from the API. + * @returns {Observable} An observable that completes when agencies are refreshed. + */ + refreshAgencies(): Observable { + return new Observable(observer => { + const apiEndpoint = `${this.api}/list-agencies`; + const getAgencies = this.http.get<{ [key: string]: string }>(apiEndpoint); + + getAgencies.subscribe( + response => { + // Data transformation to make the data easier to work with + console.log('response>>>>>>' + JSON.stringify(response)); + const agencyList = {}; + for (const record in response) { + if (response.hasOwnProperty(record)) { + agencyList[response[record]['agencyCode']] = response[record]['agencyName']; + console.log('agencylist>>>>>>' + JSON.stringify(agencyList)); + } + } + this.agencies = agencyList; + observer.next(); + observer.complete(); + }, + error => { + console.error('HTTP Request Error: ', error); + observer.error(error); + } + ); + }); + } + + /** + * Get the list of agencies. + * @returns {Object} A dictionary of agency codes and names. + */ + getAgencies(): { [key: string]: string } { + return this.agencies; + } +} diff --git a/angular/projects/public-nrpti/src/app/services/factory.service.ts b/angular/projects/public-nrpti/src/app/services/factory.service.ts index 1c526fc4d..0238c2936 100644 --- a/angular/projects/public-nrpti/src/app/services/factory.service.ts +++ b/angular/projects/public-nrpti/src/app/services/factory.service.ts @@ -2,7 +2,7 @@ import { Injectable, Injector, ViewContainerRef, Type, ComponentRef } from '@ang import { Observable, of } from 'rxjs'; import { ApiService } from './api.service'; import { SearchService, SearchResults, InjectComponentService } from 'nrpti-angular-components'; - +import { ApplicationAgencyService } from './application-agency.service'; /** * Facade service for all public-nrced services. * @@ -16,6 +16,7 @@ export class FactoryService { private _apiService: ApiService; private _searchService: SearchService; private _injectComponentService: InjectComponentService; + private _applicationAgencyService: ApplicationAgencyService; constructor(private injector: Injector) { // The following items are loaded by a file that is only present on cluster builds. @@ -68,6 +69,21 @@ export class FactoryService { return this._injectComponentService; } + /** + * Inject agency service if it hasn't already been injected. + * + * @readonly + * @type {ApiService} + * @memberof FactoryService + */ + public get applicationAgencyService(): ApplicationAgencyService { + if (!this._applicationAgencyService) { + this._applicationAgencyService = this.injector.get(ApplicationAgencyService); + console.log("called>>>"); + } + return this._applicationAgencyService; + } + /** * Return the record for the given _id. * @@ -204,4 +220,18 @@ export class FactoryService { public injectComponentIntoView(viewContainerRef: ViewContainerRef, comonentToInject: Type): ComponentRef { return this.injectComponentService.injectComponentIntoView(viewContainerRef, comonentToInject); } + + /** + * Get agency data. If data is not cached, fetch it from the ApplicationAgencyService. + * @returns {Observable} An observable that resolves when agency data is fetched. + * @memberof FactoryService + */ + public getApplicationAgencyService(): Observable { + if (Object.keys(this.applicationAgencyService.getAgencies).length === 0) { + this.applicationAgencyService.refreshAgencies().subscribe(() => { + this.applicationAgencyService.getAgencies(); + }); + } + return this.applicationAgencyService.refreshAgencies(); + } } From 3f60bc08749e97815d129144b8d9c93df0792da1 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:53:31 -0700 Subject: [PATCH 67/77] fix to call agency data service on init in nrced --- .../global/src/lib/utils/agency-data-service-nrced.ts | 3 --- angular/projects/public-nrpti/src/app/app.module.ts | 11 ++++++++--- .../inspection-detail/inspection-detail.component.ts | 1 - .../src/app/services/application-agency.service.ts | 2 -- .../public-nrpti/src/app/services/factory.service.ts | 1 - .../20230911220312-addApplicationAgenciesModel.js | 6 +++--- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/angular/projects/global/src/lib/utils/agency-data-service-nrced.ts b/angular/projects/global/src/lib/utils/agency-data-service-nrced.ts index b83d92232..8ce70a8ac 100644 --- a/angular/projects/global/src/lib/utils/agency-data-service-nrced.ts +++ b/angular/projects/global/src/lib/utils/agency-data-service-nrced.ts @@ -4,7 +4,6 @@ * @class AgencyDataService */ -// import { Console } from 'console'; import { FactoryService } from '../../../../public-nrpti/src/app/services/factory.service'; /** @@ -30,8 +29,6 @@ export class AgencyDataService { // Access cached agency data from FactoryService const agencyService = this.factoryService.applicationAgencyService; const agencyList = agencyService ? agencyService.getAgencies() : null; - console.log("agency>>>" + agencyCode); - console.log("agencyList>>>" + JSON.stringify(agencyList)); return agencyList && agencyList[agencyCode] ? agencyList[agencyCode] : agencyCode; } diff --git a/angular/projects/public-nrpti/src/app/app.module.ts b/angular/projects/public-nrpti/src/app/app.module.ts index 469be2436..5667e21af 100644 --- a/angular/projects/public-nrpti/src/app/app.module.ts +++ b/angular/projects/public-nrpti/src/app/app.module.ts @@ -35,9 +35,14 @@ export function overlayScrollFactory(overlay: Overlay): () => CloseScrollStrateg return () => overlay.scrollStrategies.close(); } -export function initConfig(configService: ConfigService, - applicationAgency: ApplicationAgencyService) { - return () => configService.init(); +export function initConfig( + configService: ConfigService, + applicationAgency: ApplicationAgencyService +) { + return async () => { + await configService.init(); + await applicationAgency.init(); + }; } @NgModule({ diff --git a/angular/projects/public-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts b/angular/projects/public-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts index 1fdc32f7f..6cfe065e7 100644 --- a/angular/projects/public-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts +++ b/angular/projects/public-nrpti/src/app/records/inspections/inspection-detail/inspection-detail.component.ts @@ -90,7 +90,6 @@ export class InspectionDetailComponent implements OnInit, OnChanges, OnDestroy { } displayName(agency) { - //return GlobalUtils.displayNameFull(agency); const agencyDataService = new AgencyDataService(this.factoryService); return agencyDataService.displayNameFull(agency); } diff --git a/angular/projects/public-nrpti/src/app/services/application-agency.service.ts b/angular/projects/public-nrpti/src/app/services/application-agency.service.ts index 94a737d1a..e40a8b303 100644 --- a/angular/projects/public-nrpti/src/app/services/application-agency.service.ts +++ b/angular/projects/public-nrpti/src/app/services/application-agency.service.ts @@ -45,12 +45,10 @@ export class ApplicationAgencyService { getAgencies.subscribe( response => { // Data transformation to make the data easier to work with - console.log('response>>>>>>' + JSON.stringify(response)); const agencyList = {}; for (const record in response) { if (response.hasOwnProperty(record)) { agencyList[response[record]['agencyCode']] = response[record]['agencyName']; - console.log('agencylist>>>>>>' + JSON.stringify(agencyList)); } } this.agencies = agencyList; diff --git a/angular/projects/public-nrpti/src/app/services/factory.service.ts b/angular/projects/public-nrpti/src/app/services/factory.service.ts index 0238c2936..eb8a20c1a 100644 --- a/angular/projects/public-nrpti/src/app/services/factory.service.ts +++ b/angular/projects/public-nrpti/src/app/services/factory.service.ts @@ -79,7 +79,6 @@ export class FactoryService { public get applicationAgencyService(): ApplicationAgencyService { if (!this._applicationAgencyService) { this._applicationAgencyService = this.injector.get(ApplicationAgencyService); - console.log("called>>>"); } return this._applicationAgencyService; } diff --git a/api/migrations/20230911220312-addApplicationAgenciesModel.js b/api/migrations/20230911220312-addApplicationAgenciesModel.js index 8b7aee0f6..39a726184 100644 --- a/api/migrations/20230911220312-addApplicationAgenciesModel.js +++ b/api/migrations/20230911220312-addApplicationAgenciesModel.js @@ -8,9 +8,9 @@ * @description Sets up the migration by initializing variables. */ exports.setup = function(options, seedLink) { - dbm = options.dbmigrate; - type = dbm.dataType; - seed = seedLink; + let dbm = options.dbmigrate; + let type = dbm.dataType; + let seed = seedLink; }; /** From b4f0a0d0ff91decb3d44bbfe879560155fc664d1 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 13 Oct 2023 09:49:17 -0700 Subject: [PATCH 68/77] NRCED records updated with agency api call --- .../administrative-penalty-detail.component.ts | 4 +++- .../administrative-sanction-detail.component.ts | 4 +++- .../court-conviction-detail.component.ts | 4 +++- .../records/orders/order-detail/order-detail.component.ts | 4 +++- .../restorative-justice-detail.component.ts | 4 +++- .../records/tickets/ticket-detail/ticket-detail.component.ts | 4 +++- .../warnings/warning-detail/warning-detail.component.ts | 5 ++++- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/angular/projects/public-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.ts b/angular/projects/public-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.ts index 154a738b4..346866527 100644 --- a/angular/projects/public-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.ts +++ b/angular/projects/public-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.ts @@ -6,6 +6,7 @@ import { AdministrativePenaltyNRCED, Document } from '../../../../../../common/s import { FactoryService } from '../../../services/factory.service'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { Utils as GlobalUtils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service-nrced'; @Component({ selector: 'app-administrative-penalty-detail', @@ -104,7 +105,8 @@ export class AdministrativePenaltyDetailComponent implements OnInit, OnChanges, } displayName(agency) { - return GlobalUtils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/public-nrpti/src/app/records/administrative-sanctions/administrative-sanction-detail/administrative-sanction-detail.component.ts b/angular/projects/public-nrpti/src/app/records/administrative-sanctions/administrative-sanction-detail/administrative-sanction-detail.component.ts index ee06cbe26..2b6c78f20 100644 --- a/angular/projects/public-nrpti/src/app/records/administrative-sanctions/administrative-sanction-detail/administrative-sanction-detail.component.ts +++ b/angular/projects/public-nrpti/src/app/records/administrative-sanctions/administrative-sanction-detail/administrative-sanction-detail.component.ts @@ -6,6 +6,7 @@ import { AdministrativeSanctionNRCED, Document } from '../../../../../../common/ import { FactoryService } from '../../../services/factory.service'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { Utils as GlobalUtils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service-nrced'; @Component({ selector: 'app-administrative-sanction-detail', @@ -90,7 +91,8 @@ export class AdministrativeSanctionDetailComponent implements OnInit, OnChanges, } displayName(agency) { - return GlobalUtils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/public-nrpti/src/app/records/court-convictions/court-conviction-detail/court-conviction-detail.component.ts b/angular/projects/public-nrpti/src/app/records/court-convictions/court-conviction-detail/court-conviction-detail.component.ts index 6ffabc480..8d39ff805 100644 --- a/angular/projects/public-nrpti/src/app/records/court-convictions/court-conviction-detail/court-conviction-detail.component.ts +++ b/angular/projects/public-nrpti/src/app/records/court-convictions/court-conviction-detail/court-conviction-detail.component.ts @@ -6,6 +6,7 @@ import { CourtConvictionNRCED, Document } from '../../../../../../common/src/app import { FactoryService } from '../../../services/factory.service'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { Utils as GlobalUtils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service-nrced'; @Component({ selector: 'app-court-conviction-detail', @@ -107,7 +108,8 @@ export class CourtConvictionDetailComponent implements OnInit, OnDestroy { } displayName(agency) { - return GlobalUtils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/public-nrpti/src/app/records/orders/order-detail/order-detail.component.ts b/angular/projects/public-nrpti/src/app/records/orders/order-detail/order-detail.component.ts index d9ab42ca5..33cebc594 100644 --- a/angular/projects/public-nrpti/src/app/records/orders/order-detail/order-detail.component.ts +++ b/angular/projects/public-nrpti/src/app/records/orders/order-detail/order-detail.component.ts @@ -6,6 +6,7 @@ import { OrderNRCED, Document } from '../../../../../../common/src/app/models'; import { FactoryService } from '../../../services/factory.service'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { Utils as GlobalUtils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service-nrced'; @Component({ selector: 'app-order-detail', @@ -96,7 +97,8 @@ export class OrderDetailComponent implements OnInit, OnChanges, OnDestroy { } displayName(agency) { - return GlobalUtils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/public-nrpti/src/app/records/restorative-justices/restorative-justice-detail/restorative-justice-detail.component.ts b/angular/projects/public-nrpti/src/app/records/restorative-justices/restorative-justice-detail/restorative-justice-detail.component.ts index a7d95ef01..e13d7251d 100644 --- a/angular/projects/public-nrpti/src/app/records/restorative-justices/restorative-justice-detail/restorative-justice-detail.component.ts +++ b/angular/projects/public-nrpti/src/app/records/restorative-justices/restorative-justice-detail/restorative-justice-detail.component.ts @@ -6,6 +6,7 @@ import { RestorativeJusticeNRCED, Document } from '../../../../../../common/src/ import { FactoryService } from '../../../services/factory.service'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { Utils as GlobalUtils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service-nrced'; @Component({ selector: 'app-restorative-justice-detail', @@ -90,7 +91,8 @@ export class RestorativeJusticeDetailComponent implements OnInit, OnChanges, OnD } displayName(agency) { - return GlobalUtils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/public-nrpti/src/app/records/tickets/ticket-detail/ticket-detail.component.ts b/angular/projects/public-nrpti/src/app/records/tickets/ticket-detail/ticket-detail.component.ts index f112bdb04..f7d89a7b7 100644 --- a/angular/projects/public-nrpti/src/app/records/tickets/ticket-detail/ticket-detail.component.ts +++ b/angular/projects/public-nrpti/src/app/records/tickets/ticket-detail/ticket-detail.component.ts @@ -6,6 +6,7 @@ import { TicketNRCED, Document } from '../../../../../../common/src/app/models'; import { FactoryService } from '../../../services/factory.service'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { Utils as GlobalUtils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service-nrced'; @Component({ selector: 'app-ticket-detail', @@ -90,7 +91,8 @@ export class TicketDetailComponent implements OnInit, OnChanges, OnDestroy { } displayName(agency) { - return GlobalUtils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { diff --git a/angular/projects/public-nrpti/src/app/records/warnings/warning-detail/warning-detail.component.ts b/angular/projects/public-nrpti/src/app/records/warnings/warning-detail/warning-detail.component.ts index fe093a1b6..adefd8e1c 100644 --- a/angular/projects/public-nrpti/src/app/records/warnings/warning-detail/warning-detail.component.ts +++ b/angular/projects/public-nrpti/src/app/records/warnings/warning-detail/warning-detail.component.ts @@ -6,6 +6,7 @@ import { WarningNRCED, Document } from '../../../../../../common/src/app/models' import { FactoryService } from '../../../services/factory.service'; import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils'; import { Utils as GlobalUtils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service-nrced'; @Component({ selector: 'app-warning-detail', @@ -95,9 +96,11 @@ export class WarningDetailComponent implements OnInit, OnChanges, OnDestroy { } displayName(agency) { - return GlobalUtils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } + convertAcronyms(acronym) { return GlobalUtils.convertAcronyms(acronym); } From f712d7e4e74c10c564e8df95cf6ff46715ee65b9 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:47:19 -0700 Subject: [PATCH 69/77] fix agency code transformation for nris-epd, fix tests --- .../integrations/epic/base-record-utils.js | 2 +- .../epic/base-record-utils.test.js | 1 + .../epic/management-plans-utils.js | 1 - api/src/integrations/nris-epd/datasource.js | 15 +++- .../integrations/nris-epd/datasource.test.js | 76 +++++++++++++++++++ 5 files changed, 91 insertions(+), 4 deletions(-) diff --git a/api/src/integrations/epic/base-record-utils.js b/api/src/integrations/epic/base-record-utils.js index dbf5500b0..a4897ebfa 100644 --- a/api/src/integrations/epic/base-record-utils.js +++ b/api/src/integrations/epic/base-record-utils.js @@ -130,7 +130,7 @@ class BaseRecordUtils { _sourceRefId: new ObjectID(epicRecord._id) || '', _epicMilestoneId: epicRecord.milestone || '', mineGuid: (mineRecord && mineRecord._sourceRefId) || null, - issuingAgency: 'AGENCY_EAO', + issuingAgency: 'AGENCY_EAO' || '', recordName: epicRecord.displayName || '', recordType: this.recordType.displayName, diff --git a/api/src/integrations/epic/base-record-utils.test.js b/api/src/integrations/epic/base-record-utils.test.js index a54b679b7..adf4e5476 100644 --- a/api/src/integrations/epic/base-record-utils.test.js +++ b/api/src/integrations/epic/base-record-utils.test.js @@ -36,6 +36,7 @@ describe('BaseRecordUtils', () => { _epicProjectId: '', _sourceRefId: expect.any(Object), _epicMilestoneId: '', + issuingAgency: 'AGENCY_EAO', recordName: '', recordType: RECORD_TYPE.Order.displayName, diff --git a/api/src/integrations/epic/management-plans-utils.js b/api/src/integrations/epic/management-plans-utils.js index 83231951f..fb43f19d9 100644 --- a/api/src/integrations/epic/management-plans-utils.js +++ b/api/src/integrations/epic/management-plans-utils.js @@ -35,7 +35,6 @@ class ManagementPlans extends BaseRecordUtils { return { ...(await super.transformRecord(epicRecord)), - issuingAgency: 'AGENCY_EAO', author: epicRecord.documentAuthor || '' }; } diff --git a/api/src/integrations/nris-epd/datasource.js b/api/src/integrations/nris-epd/datasource.js index 7c2805dd9..978f78917 100644 --- a/api/src/integrations/nris-epd/datasource.js +++ b/api/src/integrations/nris-epd/datasource.js @@ -312,7 +312,7 @@ class NrisDataSource { ]; if (record.requirementSource === 'Greenhouse Gas Industrial Reporting and Control Act') { - newRecord.issuingAgency = 'Climate Action Secretariat'; + newRecord.issuingAgency = 'AGENCY_CAS'; } else { if (record.authorization && record.authorization.sourceId) { descriptions.splice(1, 0, `Authorization Number: ${record.authorization.sourceId}`); @@ -322,9 +322,20 @@ class NrisDataSource { descriptions.push(`Waste Discharge Type: ${record.wasteType.join(', ')}`); } } - + newRecord.description = descriptions.join('; '); + + // Catch any other issuing agencies that haven't been transformed. + // Update the issuing agency based on the mapping. + const agencyMapping = { + 'FLNRO': 'AGENCY_FLNRO', + 'Environmental Assessment Office': 'AGENCY_EAO' + }; + if (newRecord.issuingAgency in agencyMapping || record.issuingAgency in agencyMapping) { + newRecord.issuingAgency = agencyMapping[record.issuingAgency]; + } + defaultLog.info('Processed:', record.assessmentId); return newRecord; } diff --git a/api/src/integrations/nris-epd/datasource.test.js b/api/src/integrations/nris-epd/datasource.test.js index a1d853ff0..69eb61168 100644 --- a/api/src/integrations/nris-epd/datasource.test.js +++ b/api/src/integrations/nris-epd/datasource.test.js @@ -1,4 +1,62 @@ const NrisDataSource = require('./datasource'); +const mockingoose = require('mockingoose'); + +const _nrisInspectionDocument = { + _id: '507f191e810c19729de860ea', + attachment: [], + assessmentId: 1234, + requirementSource: 'Greenhouse Gas Industrial Reporting and Control Act', + authorization: { + sourceId: 1234 + }, + inspection: { + inspctReportSentDate: new Date(), + inspectionType: ['Electrical'] + }, + location: { + locationName: 'My location', + latitude: 48.407326, + longitude: -123.329773 + } +}; + +const _nrisInspectionDocument_FLNRO = { + _id: '507f191e810c19729de860ea', + attachment: [], + assessmentId: 1234, + issuingAgency: 'FLNRO', + authorization: { + sourceId: 1234 + }, + inspection: { + inspctReportSentDate: new Date(), + inspectionType: ['Electrical'] + }, + location: { + locationName: 'My location', + latitude: 48.407326, + longitude: -123.329773 + } +}; + +const _nrisInspectionDocument_EAO = { + _id: '507f191e810c19729de860ea', + attachment: [], + assessmentId: 1234, + issuingAgency: 'Environmental Assessment Office', + authorization: { + sourceId: 1234 + }, + inspection: { + inspctReportSentDate: new Date(), + inspectionType: ['Electrical'] + }, + location: { + locationName: 'My location', + latitude: 48.407326, + longitude: -123.329773 + } +}; describe('NrisDataSource', () => { describe('constructor', () => { @@ -22,4 +80,22 @@ describe('NrisDataSource', () => { expect(dataSource).toEqual({ auth_payload: undefined, params: {} }); }); }); + + describe('transformRecord', () => { + it.each([ + [_nrisInspectionDocument, 'AGENCY_CAS'], + [_nrisInspectionDocument_FLNRO, 'AGENCY_FLNRO'], + [_nrisInspectionDocument_EAO, 'AGENCY_EAO'] + ])('should return the appropriate agency code', async (record, expectedAgency) => { + dataSource = new NrisDataSource(); + // eslint-disable-next-line no-unused-vars + Inspection = require('../../models/master/inspection'); + + mockingoose('Inspection').toReturn(record, 'findOne'); + const doc = await dataSource.transformRecord(record); + expect(doc.fileName).toEqual(record.fileName); + expect(doc.issuingAgency).toEqual(expectedAgency); + }); + }); + }); From 877568fe2dc6d352509dede2a4304a2efa7496a2 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Fri, 13 Oct 2023 15:26:41 -0700 Subject: [PATCH 70/77] fix issuing agency for nris-epd integration --- api/src/integrations/nris-epd/datasource.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/src/integrations/nris-epd/datasource.js b/api/src/integrations/nris-epd/datasource.js index 978f78917..80dcd5833 100644 --- a/api/src/integrations/nris-epd/datasource.js +++ b/api/src/integrations/nris-epd/datasource.js @@ -332,7 +332,9 @@ class NrisDataSource { 'Environmental Assessment Office': 'AGENCY_EAO' }; - if (newRecord.issuingAgency in agencyMapping || record.issuingAgency in agencyMapping) { + if (newRecord.issuingAgency in agencyMapping) { + newRecord.issuingAgency = agencyMapping[newRecord.issuingAgency]; + } else if (record.issuingAgency in agencyMapping) { newRecord.issuingAgency = agencyMapping[record.issuingAgency]; } From 6f7ab07d960d77ec0641929da79004021a180abf Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Fri, 13 Oct 2023 15:28:56 -0700 Subject: [PATCH 71/77] update to show ministry name on mines table --- .../mines-records-rows/mines-records-table-row.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-records-rows/mines-records-table-row.component.ts b/angular/projects/admin-nrpti/src/app/mines/mines-records-rows/mines-records-table-row.component.ts index 868291d08..21a66540b 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-records-rows/mines-records-table-row.component.ts +++ b/angular/projects/admin-nrpti/src/app/mines/mines-records-rows/mines-records-table-row.component.ts @@ -3,7 +3,7 @@ import { FactoryService } from '../../services/factory.service'; import { TableRowComponent } from 'nrpti-angular-components'; import { Router, ActivatedRoute } from '@angular/router'; import { Entity } from '../../../../../common/src/app/models/master/common-models/entity'; -import { Utils } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../global/src/lib/utils/agency-data-service'; @Component({ selector: 'tr[app-mines-records-table-row]', @@ -39,7 +39,8 @@ export class MinesRecordsTableRowComponent extends TableRowComponent implements } displayName(agency) { - return Utils.displayNameAcronym(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } private isDisableEdit() { From 7c881878f5ea3a4f8336fbc9f75ceb28b2077581 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Fri, 13 Oct 2023 15:39:22 -0700 Subject: [PATCH 72/77] sonarcloud fixes --- api/migrations/20230911220312-addApplicationAgenciesModel.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/api/migrations/20230911220312-addApplicationAgenciesModel.js b/api/migrations/20230911220312-addApplicationAgenciesModel.js index 39a726184..65c19af47 100644 --- a/api/migrations/20230911220312-addApplicationAgenciesModel.js +++ b/api/migrations/20230911220312-addApplicationAgenciesModel.js @@ -9,8 +9,6 @@ */ exports.setup = function(options, seedLink) { let dbm = options.dbmigrate; - let type = dbm.dataType; - let seed = seedLink; }; /** From a3f4470c43a51471b13ac9b0e9e6f42448f1715a Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Fri, 13 Oct 2023 16:39:35 -0700 Subject: [PATCH 73/77] fix to show agency name in mines detail components --- .../mines-records-detail.component.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-records-detail/mines-records-detail.component.ts b/angular/projects/admin-nrpti/src/app/mines/mines-records-detail/mines-records-detail.component.ts index 37fc0509b..abfc929fc 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-records-detail/mines-records-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/mines/mines-records-detail/mines-records-detail.component.ts @@ -4,8 +4,8 @@ import { Subject } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; import moment from 'moment'; import { CollectionBCMI } from '../../../../../common/src/app/models/bcmi'; -import { Utils } from 'nrpti-angular-components'; - +import { AgencyDataService } from '../../../../../global/src/lib/utils/agency-data-service'; +import { FactoryService } from '../../services/factory.service'; @Component({ selector: 'app-mines-records-detail', templateUrl: './mines-records-detail.component.html', @@ -22,7 +22,8 @@ export class MinesRecordDetailComponent implements OnInit, OnDestroy { constructor( public route: ActivatedRoute, public router: Router, - public changeDetectionRef: ChangeDetectorRef + public changeDetectionRef: ChangeDetectorRef, + public factoryService: FactoryService ) { } isDisableEdit() { @@ -73,7 +74,8 @@ export class MinesRecordDetailComponent implements OnInit, OnDestroy { } displayName(agency) { - return Utils.displayNameAcronym(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } ngOnDestroy() { From b1e00d4fb8af42113e4301719bfd6a4e5224d784 Mon Sep 17 00:00:00 2001 From: David <62899351+davidclaveau@users.noreply.github.com> Date: Fri, 13 Oct 2023 17:01:28 -0700 Subject: [PATCH 74/77] show correct agency names in mines enforcement components --- .../mines-administrative-penalty-add-edit.component.html | 2 +- .../mines-administrative-penalty-add-edit.component.ts | 6 ++++-- .../mines-administrative-penalty-detail.component.ts | 6 ++++-- .../mines-court-convictions-add-edit.component.html | 2 +- .../mines-court-convictions-add-edit.component.ts | 8 +++++++- .../mines-court-convictions-detail.component.ts | 6 ++++-- api/src/integrations/nris-epd/datasource.test.js | 4 ++-- 7 files changed, 23 insertions(+), 11 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.html b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.html index 61bfb06de..7a28b95ec 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.html +++ b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.html @@ -60,7 +60,7 @@

Basic Information

name="issuingAgency" id="issuingAgency" type="text" - value="{{ this.convertAcronyms(defaultAgency) }}" + value="{{ this.displayName(defaultAgency) }}" class="form-control" />
diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.ts index 91ace92cd..6f9887507 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.ts @@ -7,6 +7,7 @@ import { LoadingScreenService, LoggerService } from 'nrpti-angular-components'; import { Utils, StoreService } from 'nrpti-angular-components'; import { ChangeDetectorRef } from '@angular/core'; import { takeUntil } from 'rxjs/operators'; +import { AgencyDataService } from '../../../../../../global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-mines-administrative-penalty-add-edit', @@ -16,7 +17,7 @@ import { takeUntil } from 'rxjs/operators'; export class MinesAdministrativePenaltyAddEditComponent extends AdministrativePenaltyAddEditComponent implements OnInit { public componentTitle = 'BCMI Administrative Penalty Record'; - public defaultAgency = 'Ministry of Energy Mines and Low Carbon Innovation'; + public defaultAgency = 'AGENCY_EMLI'; public defaultAuthor = 'BC Government'; public currentRecord = null; @@ -103,7 +104,8 @@ export class MinesAdministrativePenaltyAddEditComponent extends AdministrativePe } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } cancel() { diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-detail/mines-administrative-penalty-detail.component.ts b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-detail/mines-administrative-penalty-detail.component.ts index deca7f917..93806e8a8 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-detail/mines-administrative-penalty-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-detail/mines-administrative-penalty-detail.component.ts @@ -5,7 +5,8 @@ import { takeUntil } from 'rxjs/operators'; import { AdministrativePenaltyDetailComponent } from '../../../records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component'; import { RecordUtils } from '../../../records/utils/record-utils'; import { FactoryService } from '../../../services/factory.service'; -import { StoreService, Utils } from 'nrpti-angular-components'; +import { StoreService } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-mines-administrative-penalty-detail', @@ -65,7 +66,8 @@ export class MinesAdministrativePenaltyDetailComponent extends AdministrativePen } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } navigateToEditPage() { diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-add-edit/mines-court-convictions-add-edit.component.html b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-add-edit/mines-court-convictions-add-edit.component.html index 118d99514..e0f9f792e 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-add-edit/mines-court-convictions-add-edit.component.html +++ b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-add-edit/mines-court-convictions-add-edit.component.html @@ -60,7 +60,7 @@

Basic Information

name="recordType" id="recordType" type="text" - [value]="this.convertAcronyms(this.myForm.get('issuingAgency').value)" + [value]="this.displayName(this.myForm.get('issuingAgency').value)" class="form-control" />
diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-add-edit/mines-court-convictions-add-edit.component.ts b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-add-edit/mines-court-convictions-add-edit.component.ts index 4c9740f28..bafe4f491 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-add-edit/mines-court-convictions-add-edit.component.ts +++ b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-add-edit/mines-court-convictions-add-edit.component.ts @@ -7,6 +7,7 @@ import { LoadingScreenService, LoggerService } from 'nrpti-angular-components'; import { Utils, StoreService } from 'nrpti-angular-components'; import { ChangeDetectorRef } from '@angular/core'; import { takeUntil } from 'rxjs/operators'; +import { AgencyDataService } from '../../../../../../../global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-mines-court-convictions-add-edit', @@ -17,7 +18,7 @@ import { takeUntil } from 'rxjs/operators'; }) export class MinesCourtConvictionsAddEditComponent extends CourtConvictionAddEditComponent implements OnInit { public componentTitle = 'BCMI Administrative Penalty Record'; - public defaultAgency = 'Ministry of Energy Mines and Low Carbon Innovation'; + public defaultAgency = 'AGENCY_EMLI'; public defaultAuthor = 'BC Government'; public currentRecord = null; @@ -152,6 +153,11 @@ export class MinesCourtConvictionsAddEditComponent extends CourtConvictionAddEdi } } + displayName(agency) { + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); + } + cancel() { const shouldCancel = confirm( 'Leaving this page will discard unsaved changes. Are you sure you would like to continue?' diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-detail/mines-court-convictions-detail.component.ts b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-detail/mines-court-convictions-detail.component.ts index 6af8ec1a3..c2b2016ad 100644 --- a/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-detail/mines-court-convictions-detail.component.ts +++ b/angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-detail/mines-court-convictions-detail.component.ts @@ -5,7 +5,8 @@ import { takeUntil } from 'rxjs/operators'; import { CourtConvictionDetailComponent } from '../../../../records/court-convictions/court-conviction-detail/court-conviction-detail.component'; import { RecordUtils } from '../../../../records/utils/record-utils'; import { FactoryService } from '../../../../services/factory.service'; -import { StoreService, Utils } from 'nrpti-angular-components'; +import { StoreService } from 'nrpti-angular-components'; +import { AgencyDataService } from '../../../../../../../global/src/lib/utils/agency-data-service'; @Component({ selector: 'app-mines-court-convictions-detail', @@ -64,7 +65,8 @@ export class MinesCourtConvictionsDetailComponent extends CourtConvictionDetailC } displayName(agency) { - return Utils.displayNameFull(agency); + const agencyDataService = new AgencyDataService(this.factoryService); + return agencyDataService.displayNameFull(agency); } navigateToEditPage() { diff --git a/api/src/integrations/nris-epd/datasource.test.js b/api/src/integrations/nris-epd/datasource.test.js index 69eb61168..3adbeb40a 100644 --- a/api/src/integrations/nris-epd/datasource.test.js +++ b/api/src/integrations/nris-epd/datasource.test.js @@ -87,9 +87,9 @@ describe('NrisDataSource', () => { [_nrisInspectionDocument_FLNRO, 'AGENCY_FLNRO'], [_nrisInspectionDocument_EAO, 'AGENCY_EAO'] ])('should return the appropriate agency code', async (record, expectedAgency) => { - dataSource = new NrisDataSource(); + const dataSource = new NrisDataSource(); // eslint-disable-next-line no-unused-vars - Inspection = require('../../models/master/inspection'); + const Inspection = require('../../models/master/inspection'); mockingoose('Inspection').toReturn(record, 'findOne'); const doc = await dataSource.transformRecord(record); From b8556587f006afd125f29063e3a2389943d9f2b4 Mon Sep 17 00:00:00 2001 From: LocalNewsTV <62873746+LocalNewsTV@users.noreply.github.com> Date: Mon, 16 Oct 2023 10:56:28 -0700 Subject: [PATCH 75/77] removed unneeded conditional --- api/src/integrations/epic/base-record-utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/integrations/epic/base-record-utils.js b/api/src/integrations/epic/base-record-utils.js index a4897ebfa..dbf5500b0 100644 --- a/api/src/integrations/epic/base-record-utils.js +++ b/api/src/integrations/epic/base-record-utils.js @@ -130,7 +130,7 @@ class BaseRecordUtils { _sourceRefId: new ObjectID(epicRecord._id) || '', _epicMilestoneId: epicRecord.milestone || '', mineGuid: (mineRecord && mineRecord._sourceRefId) || null, - issuingAgency: 'AGENCY_EAO' || '', + issuingAgency: 'AGENCY_EAO', recordName: epicRecord.displayName || '', recordType: this.recordType.displayName, From e0ff32ac4b30ee5e2f982dbbd4edaecda6c187a4 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Mon, 16 Oct 2023 14:17:11 -0700 Subject: [PATCH 76/77] page now refreshes after agency update to prevent multiple saves at once --- .../admin-nrpti/src/app/agencies/agencies.component.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts b/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts index e37c3a823..322d0695a 100644 --- a/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts +++ b/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts @@ -65,6 +65,9 @@ export class AgenciesComponent implements OnInit { this.updatedData.agencies = []; } this.toastService.addMessage('Agency Successfully Updated', 'Success Updated', Constants.ToastTypes.SUCCESS); + setTimeout(() => { + location.reload(); + }, 1 * 1000); } else { this.toastService.addMessage( 'Updated Agency Name Cannot be Empty', From 3d16f630dfed6f8b6649fcfb13be7570e8d22d1e Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Mon, 16 Oct 2023 14:26:19 -0700 Subject: [PATCH 77/77] bug fixes --- .../admin-nrpti/src/app/agencies/agencies.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts b/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts index 322d0695a..cedcab9ac 100644 --- a/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts +++ b/angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts @@ -41,13 +41,13 @@ export class AgenciesComponent implements OnInit { this.factoryService.applicationAgencyService.refreshAgencies().subscribe(); } updateSelectedAgency(): void { + const index = this.agencyList.indexOf(this.selectedAgency); try { - if (this.newAgency.trim() !== '') { + if (this.newAgency.trim() !== '' && index !== -1) { // Find the agency code that matches the selected agency name const matchingCode = Object.keys(this.agencies).find(key => this.agencies[key] === this.selectedAgency); if (matchingCode) { // Update the agencyList with the new value at the same index - const index = this.agencyList.indexOf(this.selectedAgency); if (index !== -1) { this.agencyList[index] = this.newAgency; } @@ -67,10 +67,10 @@ export class AgenciesComponent implements OnInit { this.toastService.addMessage('Agency Successfully Updated', 'Success Updated', Constants.ToastTypes.SUCCESS); setTimeout(() => { location.reload(); - }, 1 * 1000); + }, 1500); } else { this.toastService.addMessage( - 'Updated Agency Name Cannot be Empty', + 'Updating/Updated Agency Name Cannot be Empty', 'Save unsuccessful', Constants.ToastTypes.ERROR );