Merge pull request #447 from bcgov/BCPSDEMS-1731-links

UI Changes for launch button

backend/webapi/Data/PidpDbContext.cs

@@ -3,6 +3,7 @@ namespace Pidp.Data;
 using AppAny.Quartz.EntityFrameworkCore.Migrations;
 using AppAny.Quartz.EntityFrameworkCore.Migrations.PostgreSQL;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
 using NodaTime;
 using Pidp.Models;
 using Pidp.Models.Lookups;
@@ -26,9 +27,9 @@ public class PidpDbContext : DbContext
     public DbSet<Facility> Facilities { get; set; } = default!;
     public DbSet<FutureUserChangeEvent> FutureUserChangeEvents { get; set; } = default!;
 
-    public DbSet<Models.HcimAccountTransfer> HcimAccountTransfers { get; set; } = default!;
-    public DbSet<Models.HcimEnrolment> HcimEnrolments { get; set; } = default!;
-    public DbSet<Models.DigitalEvidence> DigitalEvidences { get; set; } = default!;
+    public DbSet<HcimAccountTransfer> HcimAccountTransfers { get; set; } = default!;
+    public DbSet<HcimEnrolment> HcimEnrolments { get; set; } = default!;
+    public DbSet<DigitalEvidence> DigitalEvidences { get; set; } = default!;
     public DbSet<DigitalEvidenceDisclosure> DigitalEvidenceDisclosures { get; set; } = default!;
     public DbSet<Models.DigitalEvidenceDefence> DigitalEvidenceDefences { get; set; } = default!;
 
@@ -69,10 +70,18 @@ public override async Task<int> SaveChangesAsync(CancellationToken cancellationT
     }
 
 
+
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         base.OnModelCreating(modelBuilder);
 
+        modelBuilder.Entity<DigitalEvidence>().Property(x => x.AssignedRegions).
+            HasConversion(
+                          v => JsonConvert.SerializeObject(v, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }),
+                v => JsonConvert.DeserializeObject<List<AssignedRegion>>(v, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore })
+
+            );
+
         modelBuilder.Entity<IdempotentConsumer>()
             .ToTable("IdempotentConsumers")
             .HasKey(x => new { x.MessageId, x.Consumer });

workspace/apps/pidp/src/app/app.module.ts

@@ -1,13 +1,20 @@
-import { NgModule } from '@angular/core';
+import { NgModule, Injector } from '@angular/core';
 
 import { AppRoutingModule } from '@app/app-routing.module';
 import { AppComponent } from '@app/app.component';
 
 import { CoreModule } from '@core/core.module';
+export let AppInjector: Injector;
 
 @NgModule({
   declarations: [AppComponent],
   imports: [AppRoutingModule, CoreModule],
-  bootstrap: [AppComponent],
+  bootstrap: [AppComponent]
+
 })
-export class AppModule {}
+export class AppModule {
+  // eslint-disable-next-line @typescript-eslint/explicit-member-accessibility
+  constructor(private injector: Injector) {
+    AppInjector = this.injector;
+  }
+}

workspace/apps/pidp/src/app/features/portal/base-portal-section.ts

@@ -4,4 +4,5 @@ export class BasePortalSection {
   public GetOrder(profileStatus: Section): number {
     return profileStatus.order;
   }
+
 }

workspace/apps/pidp/src/app/features/portal/portal.page.html

@@ -78,6 +78,8 @@ <h2>Hello {{ firstName | titlecase }},</h2>
         </ui-page-section-subheader>
 
         <ui-card-summary *ngFor="let section of (state$ | async)?.access" [heading]="section.heading"
+          [launchString]="section.launch?.label" [launchURL]="section.launch?.url"
+          [launchHidden]="section.launch?.hidden" [launchDisabled]="section.launch?.disabled"
           [statusType]="section.statusType" [status]="section.status" [actionLabel]="section.action.label"
           [order]="section.order" [actionDisabled]="section.action.disabled" (action)="onCardAction(section)">
           <ng-container uiCardSummaryHint>{{ section.hint }}</ng-container>

workspace/apps/pidp/src/app/features/portal/portal.page.ts

@@ -18,7 +18,7 @@ import { PortalState } from './state/portal-state.builder';
 @Component({
   selector: 'app-portal',
   templateUrl: './portal.page.html',
-  styleUrls: ['./portal.page.scss'],
+  styleUrls: ['./portal.page.scss']
 })
 export class PortalPage implements OnInit {
   /**

workspace/apps/pidp/src/app/features/portal/state/access/digital-evidence-portal-section.class.ts

@@ -13,15 +13,20 @@ import { ProfileStatus } from '../../models/profile-status.model';
 import { PortalSectionAction } from '../portal-section-action.model';
 import { PortalSectionKey } from '../portal-section-key.type';
 import { IPortalSection } from '../portal-section.model';
+import { PortalSectionLaunchAction } from '../portal-section-launch-action.model';
+import { AppInjector } from '@app/app.module';
+import { APP_CONFIG } from '@app/app.config';
 
 export class DigitalEvidencePortalSection
   extends BasePortalSection
   implements IPortalSection {
+
   public readonly key: PortalSectionKey;
   public heading: string;
   public description: string;
   public order: number;
 
+
   public constructor(
     private profileStatus: ProfileStatus,
     private router: Router,
@@ -32,8 +37,6 @@ export class DigitalEvidencePortalSection
     this.heading = 'Digital Evidence and Disclosure Management System (DEMS)';
     this.description = this.getDescription();
     this.order = this.GetOrder(this.profileStatus.status.digitalEvidence);
-
-
   }
 
   public get hint(): string {
@@ -77,6 +80,21 @@ export class DigitalEvidencePortalSection
     };
   }
 
+  public get launch(): PortalSectionLaunchAction {
+
+    const config = AppInjector.get(APP_CONFIG);
+
+    const label = this.getOrgName() === "Justice Sector" ? "Launch BCPS DEMS" : this.getOrgName() === "BC Law Society" ? "Launch Disclosure Portal" : this.isSubAgency() ? "Launch Agency Upload Portal" : undefined;
+    const url = this.getOrgName() === "BC Law Society" ? config.urls.bcLawDiscPortalUrl : this.getOrgName() === "Justice Sector" ? config.urls.bcpsDemsPortalUrl : config.urls.subAgencyAufPortalUrl;
+    return {
+      hidden: false,
+      label: label,
+      newWindow: true,
+      url: url,
+      disabled: this.getStatusCode() !== StatusCode.COMPLETED
+    }
+  }
+
   public getDescription(): string {
     return this.getStatusCode() === StatusCode.COMPLETED
       ? 'Your enrolment is complete. You can view the terms of enrolment by clicking the View button'
@@ -147,4 +165,13 @@ export class DigitalEvidencePortalSection
   private getStatusCode(): StatusCode {
     return this.profileStatus.status.digitalEvidence.statusCode;
   }
+
+  private getOrgName(): string {
+    return this.profileStatus.status.organizationDetails.orgName;
+  }
+
+  private isSubAgency(): boolean {
+    return this.profileStatus.status.organizationDetails.submittingAgency;
+  }
+
 }

workspace/apps/pidp/src/app/features/portal/state/portal-section-launch-action.model.ts

@@ -0,0 +1,32 @@
+/**
+ * @description
+ * Properties of a portal section launch action.
+ */
+export interface PortalSectionLaunchAction {
+  /**
+   * Label of the action, such as Update,
+   * View, or Request.
+   */
+  label?: string;
+  /**
+   * @description
+   * Route the action will navigate to
+   * when invoked.
+   */
+  url?: string;
+
+  newWindow: boolean;
+  /**
+   * @description
+   * Whether the action is enable or disabled
+   * typically based on state.
+   */
+  disabled: boolean;
+
+  /**
+   * @description
+   * Whether the action is hidden
+   * typically based on state.
+   */
+  hidden?: boolean;
+}

workspace/apps/pidp/src/app/features/portal/state/portal-section.model.ts

@@ -5,6 +5,7 @@ import { AlertType } from '@bcgov/shared/ui';
 import { PortalSectionAction } from './portal-section-action.model';
 import { PortalSectionKey } from './portal-section-key.type';
 import { PortalSectionProperty } from './portal-section-property.model';
+import { PortalSectionLaunchAction } from './portal-section-launch-action.model';
 
 /**
  * @description
@@ -33,6 +34,13 @@ export interface IPortalSection {
    */
   description: string;
 
+  /**
+   * @description
+   * A url for launching an app once a request is complete
+   */
+  launch?: PortalSectionLaunchAction;
+
+
   /**
    * Order in which processing is required
    */

workspace/apps/pidp/src/app/features/portal/state/portal-state.builder.ts

@@ -27,6 +27,9 @@ import { CollegeCertificationPortalSection } from './profile/college-certificati
 import { DemographicsPortalSection } from './profile/demographics-portal-section.class';
 import { UserAccessAgreementPortalSection } from './profile/user-access-agreement-portal-section.class';
 import { ComplianceTrainingPortalSection } from './training/compliance-training-portal-section.class';
+import { AuthorizedUserService } from '@app/features/auth/services/authorized-user.service';
+import { Inject } from '@angular/core';
+import { APP_CONFIG, AppConfig } from '@app/app.config';
 
 /**
  * @description

workspace/apps/pidp/src/environments/environment.model.ts

@@ -34,5 +34,8 @@ export interface AppEnvironment extends EnvironmentConfig {
     bcscMobileSetup: string;
     specialAuthority: string;
     doctorsTechnologyOffice: string;
+    bcLawDiscPortalUrl: string;
+    subAgencyAufPortalUrl: string;
+    bcpsDemsPortalUrl: string;
   };
 }

workspace/apps/pidp/src/environments/environment.prod.ts

@@ -28,7 +28,7 @@ import { AppEnvironment, EnvironmentName } from './environment.model';
 export const environment: AppEnvironment = {
   production: true,
   apiEndpoint: 'http://localhost:5050',
-  configEndpoint: 'http://localhost:8080',
+  configEndpoint: 'http://localhost:5259',
   authEndpoint: 'https://dev.common-sso.justice.gov.bc.ca',
   authRealm: 'BCPS',
   caseManagement: {
@@ -58,6 +58,9 @@ export const environment: AppEnvironment = {
     bcscMobileSetup: 'https://id.gov.bc.ca/account',
     specialAuthority: specialAuthorityUrl,
     doctorsTechnologyOffice: doctorsTechnologyOfficeUrl,
+    bcLawDiscPortalUrl: 'https://dev.disclosure.bcprosecution.gov.bc.ca/',
+    bcpsDemsPortalUrl: 'https://dems.dev.jag.gov.bc.ca/',
+    subAgencyAufPortalUrl: 'https://auf.dev.justice.gov.bc.ca/'
   },
   keycloakConfig: {
     config: {

workspace/libs/shared/ui/src/lib/components/card-summary/card-summary.component.html

@@ -15,13 +15,22 @@
     <ng-container uiCardContent>
       <ng-content select="[uiCardSummaryContent]"></ng-content>
     </ng-container>
-    <ng-container uiCardActions *ngIf="hasActions()">
-      <span>
-        <button *ngIf="actionLabel" mat-stroked-button type="button" color="primary" [disabled]="actionDisabled"
-          (click)="onAction()">
-          {{ actionLabel }}
-        </button>
-      </span>
+
+    <ng-container uiCardActions>
+      <div class="d-flex">
+        <div class="col-md-6 col-sm-12" *ngIf="launchString">
+          <button mat-stroked-button type="button" color="primary" [disabled]="launchDisabled" *ngIf="!launchHidden"
+            (click)="onLaunch()">
+            {{ launchString }}&nbsp;<mat-icon>launch_outline</mat-icon>
+          </button>
+        </div>
+        <div [ngClass]="launchString ? 'col-md-6' : 'col-md-12'" class="text-md-end" *ngIf="hasActions()">
+          <button *ngIf="actionLabel" mat-stroked-button type="button" color="primary" [disabled]="actionDisabled"
+            (click)="onAction()">
+            {{ actionLabel }}
+          </button>
+        </div>
+      </div>
     </ng-container>
   </ui-card>
 </ng-template>

workspace/libs/shared/ui/src/lib/components/card-summary/card-summary.component.ts

@@ -18,14 +18,16 @@ export class CardSummaryComponent {
   @Input() public icon?: string;
   @Input() public heading!: string;
   @Input() public order?: number;
-
   @Input() public statusType?: AlertType;
   @Input() public child?: boolean;
-
   @Input() public status?: string;
   @Input() public actionLabel?: string;
   @Input() public actionDisabled?: boolean;
   @Input() public panelHidden?: boolean;
+  @Input() public launchURL?: string;
+  @Input() public launchString?: string;
+  @Input() public launchDisabled?: boolean;
+  @Input() public launchHidden?: boolean;
 
   @Output() public action: EventEmitter<void>;
 
@@ -37,11 +39,20 @@ export class CardSummaryComponent {
     return (this.actionLabel && this.actionLabel?.length > 0) || false;
   }
 
+  public hasLaunchAction(): boolean {
+    return (this.launchURL && this.launchURL?.length > 0) || false;
+
+  }
+
   public getStatusTypeClass(): string {
     const isChild = (this.order && this.order % 1 !== 0) || 0;
     return isChild ? this.statusType + ' indent' : '' + this.statusType;
   }
 
+  public onLaunch(): void {
+    window.open(this.launchURL, "_blank");
+  }
+
   public onAction(): void {
     this.action.emit();
   }