Merge pull request #430 from bcgov/develop

promote

.gitignore

@@ -18,6 +18,9 @@
 # Mono auto generated files
 mono_crash.*
 
+# intellij
+.idea
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file. See [versionize](https://github.com/versionize/versionize) for commit guidelines.
 
+<a name="1.0.11"></a>
+## [1.0.11](https://www.github.com/bcgov/JAG-JPIDP/releases/tag/v1.0.11) (2024-1-31)
+
 <a name="1.0.9"></a>
 ## [1.0.9](https://www.github.com/bcgov/JAG-JPIDP/releases/tag/v1.0.9) (2024-1-6)
 

backend/ApprovalFlow/ApprovalFlow.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>1.0.9</Version>
+    <Version>1.0.11</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 

backend/NotificationService/NotificationService.csproj

@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>0932d320-0272-4127-af4d-01fae4f7c4c8</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <Version>1.0.9</Version>
+    <Version>1.0.11</Version>
   </PropertyGroup>
 
    <PropertyGroup>

backend/common/Common.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <Version>1.0.9</Version>
+    <Version>1.0.11</Version>
   </PropertyGroup>
   <ItemGroup>
 

backend/edt.casemanagement/edt.casemanagement.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>1.0.9</Version>
+    <Version>1.0.11</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 

backend/edt.disclosure/edt.disclosure.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <Version>1.0.9</Version>
+    <Version>1.0.11</Version>
   </PropertyGroup>
 
 

backend/jumwebapi/jumwebapi.csproj

@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>b2b3aeca-3282-4224-bc2c-ae504c17e682</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <Version>1.0.9</Version>
+    <Version>1.0.11</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

backend/service.edt/edt.service.csproj

@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>c27750f6-c52b-45f1-b040-e4c09f34fc0d</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <Version>1.0.9</Version>
+    <Version>1.0.11</Version>
   </PropertyGroup>
 
   <ItemGroup>

backend/webapi/pidp.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Pidp</RootNamespace>
     <UserSecretsId>5c2dc965-00b4-4531-9ff0-9b37193ead9b</UserSecretsId>
-    <Version>1.0.9</Version>
+    <Version>1.0.11</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="logs\**" />

charts/frontend/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/frontend/templates/config-map.yaml

@@ -23,7 +23,8 @@ data:
       "applicationUrl": "https://{{ .Values.global.vanityURL }}",
       "caseManagement": {
         "showAUFLink": true,
-        "showCaseImportLink": false
+        "showCaseImportLink": false,
+        "stickyAgencyCodes": [ "RCMP","FAKE"]
       },
       "demsImportURL": "{{ .Values.settings.edtURL }}",
       "keycloakConfig": {

charts/pidp/Chart.lock

@@ -29,5 +29,5 @@ dependencies:
 - name: nginx
   repository: file://../nginx
   version: 9.7.3
-digest: sha256:0c3d7bc9574ccc040700db2e71ceab47837480cdb5a0937a8bca50ec751a16a8
-generated: "2023-12-05T10:20:44.8734122-08:00"
+digest: sha256:bdbbbc47c53e39e3411994f1becd71247bab4073331173df63fa09949903f3d3
+generated: "2024-01-31T16:23:06.4562199-08:00"

charts/pidp/Chart.yaml

@@ -35,7 +35,7 @@ dependencies:
 #    condition: postgresql.enabled
   - name: frontend
     repository: "file://../frontend"
-    version: "0.1.2"
+    version: "0.1.3"
   - name: admin-frontend
     repository: "file://../admin-frontend"
     version: "0.2.0"

charts/webapi/values.yaml

@@ -78,11 +78,11 @@ ingress:
 
 resources: 
   limits:
-    cpu: 100m
-    memory: 128Mi
+    cpu: 500m
+    memory: 512Mi
   requests:
-    cpu: 75m
-    memory: 50Mi
+    cpu: 125m
+    memory: 128Mi
 
 autoscaling:
   enabled: false

workspace/apps/pidp/src/app/features/access/pages/digital-evidence/case-management/digital-evidence-case-management.page.html

@@ -126,7 +126,8 @@
             granted.</sub></i></span><br />
       <span class="legend">
         <mat-icon>info_outline</mat-icon>= Show case info
-        <mat-icon *ngIf="showCaseImportLink" class="ms-2">file_upload</mat-icon>= Access DEMS upload for this case
+        <mat-icon *ngIf="showCaseImportLink" class="ms-2">file_upload</mat-icon>
+        <div *ngIf="showCaseImportLink">= Access DEMS upload for this case</div>
         <mat-icon class="ms-2">delete_outline</mat-icon>= Remove access to case
       </span>
     </ng-container>

workspace/apps/pidp/src/app/features/access/pages/digital-evidence/case-management/digital-evidence-case-management.page.ts

@@ -131,6 +131,7 @@ export class DigitalEvidenceCaseManagementPage
   ) {
     super(dialog, formUtilsService);
     const routeData = this.route.snapshot.data;
+    const AGENCY_CODE = "agencyCode";
     this.title = routeData.title;
     this.organizationType = new OrganizationUserType();
     const partyId = this.partyService.partyId;
@@ -157,9 +158,29 @@ export class DigitalEvidenceCaseManagementPage
       this.organizationType.participantId = data['participantId'];
       this.organizationType.organizationName = data['organizationName'];
       this.organizationType.submittingAgencyCode = data['submittingAgencyCode'];
-      this.formState.agencyCode.patchValue(
-        this.organizationType.submittingAgencyCode
-      );
+
+
+      // sticky agency codes if org in the sticky list
+      if (this.organizationType.submittingAgencyCode && this.config.caseManagement.stickyAgencyCodes.includes(this.organizationType.submittingAgencyCode)) {
+        // no local code set but we have the agency code
+        if (!localStorage.getItem(AGENCY_CODE) && this.organizationType.submittingAgencyCode) {
+          if (this.organizationType.submittingAgencyCode && this.formState.agencyCode.value) {
+            localStorage.setItem(AGENCY_CODE, this.organizationType.submittingAgencyCode);
+          }
+
+        } else if (localStorage.getItem(AGENCY_CODE)) {
+          this.organizationType.submittingAgencyCode = localStorage.getItem(AGENCY_CODE) || "";
+          this.formState.agencyCode.patchValue(
+            this.organizationType.submittingAgencyCode
+          );
+        }
+      } else {
+
+        this.formState.agencyCode.patchValue(
+          this.organizationType.submittingAgencyCode
+        );
+      }
+
     });
     this.collectionNotice =
       documentService.getDigitalEvidenceCollectionNotice();
@@ -205,6 +226,8 @@ export class DigitalEvidenceCaseManagementPage
     });
   }
 
+
+
   public checkCaseInput(): boolean {
     if (this.formState.caseName.value)
       this.formState.caseName.setValue(this.formState.caseName.value.trim());
@@ -297,6 +320,12 @@ export class DigitalEvidenceCaseManagementPage
       return;
     }
 
+    if (this.organizationType.submittingAgencyCode && this.config.caseManagement.stickyAgencyCodes.includes(this.organizationType.submittingAgencyCode)) {
+      if (this.formState.agencyCode.value) {
+        localStorage.setItem("agencyCode", this.formState.agencyCode.value);
+      }
+    }
+
     this.requestedCase = null;
     this.requestedCaseNotFound = false;
     this.requestedCaseInactive = false;

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

@@ -14,10 +14,8 @@ import { DigitalEvidencePortalSection } from './access/digital-evidence-portal-s
 import { DriverFitnessPortalSection } from './access/driver-fitness-portal-section.class';
 import { HcimAccountTransferPortalSection } from './access/hcim-account-transfer-portal-section.class';
 import { HcimEnrolmentPortalSection } from './access/hcim-enrolment-portal-section.class';
-import { MsTeamsPortalSection } from './access/ms-teams-portal-section.class';
 import { SaEformsPortalSection } from './access/sa-eforms-portal-section.class';
 import { SitePrivacySecurityPortalSection } from './access/site-privacy-security-checklist-portal-section.class';
-import { UciPortalSection } from './access/uci-portal-section.class';
 import { AdministratorPortalSection } from './admin/admin-panel-portal-section.class';
 import { TransactionsPortalSection } from './history/transactions-portal-section.class';
 import { AdministratorInfoPortalSection } from './organization/administrator-information-portal-section';
@@ -197,18 +195,6 @@ export class PortalStateBuilder {
           new DigitalEvidenceCounselPortalSection(profileStatus, this.router),
         ]
       ),
-      ...ArrayUtils.insertResultIf<IPortalSection>(
-        // TODO remove permissions when ready for production
-        this.permissionsService.hasRole([Role.FEATURE_PIDP_DEMO]) ||
-        this.insertSection('msTeams', profileStatus),
-        () => [new MsTeamsPortalSection(profileStatus, this.router)]
-      ),
-      ...ArrayUtils.insertResultIf<IPortalSection>(
-        // TODO remove permissions when ready for production
-        this.permissionsService.hasRole([Role.FEATURE_PIDP_DEMO]) &&
-        this.insertSection('uci', profileStatus),
-        () => [new UciPortalSection(profileStatus, this.router)]
-      ),
     ];
   }
 

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

@@ -15,7 +15,8 @@ export interface AppEnvironment extends EnvironmentConfig {
   production: boolean;
   caseManagement: {
     showAUFLink: boolean,
-    showCaseImportLink: boolean
+    showCaseImportLink: boolean,
+    stickyAgencyCodes: string[]
   },
   emails: {
     providerIdentitySupport: string;

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

@@ -33,7 +33,10 @@ export const environment: AppEnvironment = {
   authRealm: 'BCPS',
   caseManagement: {
     showAUFLink: true,
-    showCaseImportLink: false
+    showCaseImportLink: false,
+    stickyAgencyCodes: [
+      "FAKE"
+    ]
   },
   environmentName: EnvironmentName.LOCAL,
   applicationUrl: 'http://localhost:4200',