From ddb702de75ce4b16b8a29b872f8e19c7edacb6aa Mon Sep 17 00:00:00 2001 From: Eduardo Date: Tue, 3 Mar 2026 15:07:32 -0700 Subject: [PATCH 1/3] Bump UAT hotfix number - 6.0.1 (#5243) Co-authored-by: Herrera --- source/backend/api/Pims.Api.csproj | 2 +- source/frontend/package-lock.json | 4 ++-- source/frontend/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj index d394d8d55c..fbcd437c3e 100644 --- a/source/backend/api/Pims.Api.csproj +++ b/source/backend/api/Pims.Api.csproj @@ -2,7 +2,7 @@ 0ef6255f-9ea0-49ec-8c65-c172304b4926 - 6.0.0-117.32 + 6.0.1-117.32 6.0.0.117 true {16BC0468-78F6-4C91-87DA-7403C919E646} diff --git a/source/frontend/package-lock.json b/source/frontend/package-lock.json index 4f9e0d3103..ec185229d3 100644 --- a/source/frontend/package-lock.json +++ b/source/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "frontend", - "version": "6.0.0-117.0", + "version": "6.0.1-117.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "frontend", - "version": "6.0.0-117.0", + "version": "6.0.1-117.0", "dependencies": { "@bcgov/bc-sans": "1.0.1", "@bcgov/design-tokens": "3.0.0-rc1", diff --git a/source/frontend/package.json b/source/frontend/package.json index 0375d283bf..6ae30ce761 100644 --- a/source/frontend/package.json +++ b/source/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "6.0.0-117.32", + "version": "6.0.1-117.32", "private": true, "dependencies": { "@bcgov/bc-sans": "1.0.1", From 1312b94f8dcc1da2343894c71232c10442eb1198 Mon Sep 17 00:00:00 2001 From: Alejandro Sanchez Date: Mon, 13 Apr 2026 18:07:49 -0700 Subject: [PATCH 2/3] PSP-11419 HOTFIX: PIMS application goes blank after loading (#5282) * Increment hotfix version * Remove CHES healthcheck from system-check category * PSP-11419 HOTFIX: PIMS application goes blank after loading --- source/backend/api/Pims.Api.csproj | 4 +- source/backend/api/Startup.cs | 4 +- source/frontend/package-lock.json | 2 +- source/frontend/package.json | 2 +- .../Healthcheck/HealthcheckView.test.tsx | 40 ++++++++++++++++++- .../layout/Healthcheck/HealthcheckView.tsx | 9 +++-- .../HealthcheckView.test.tsx.snap | 1 + 7 files changed, 52 insertions(+), 10 deletions(-) diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj index ef76fc27dc..e3a550fcde 100644 --- a/source/backend/api/Pims.Api.csproj +++ b/source/backend/api/Pims.Api.csproj @@ -2,8 +2,8 @@ 0ef6255f-9ea0-49ec-8c65-c172304b4926 - 6.1.0-119.16 - 6.1.0.119 + 6.1.1-119.16 + 6.1.1.119 true {16BC0468-78F6-4C91-87DA-7403C919E646} net8.0 diff --git a/source/backend/api/Startup.cs b/source/backend/api/Startup.cs index 7d59653a05..4a84d6097b 100644 --- a/source/backend/api/Startup.cs +++ b/source/backend/api/Startup.cs @@ -380,7 +380,7 @@ public void ConfigureServices(IServiceCollection services) "Ches", sp => new ChesHealthCheck(sp.GetService()), null, - new string[] { SERVICES, EXTERNAL, SYSTEMCHECK }) + new string[] { SERVICES, EXTERNAL }) { Period = TimeSpan.FromMinutes(allHealthCheckOptions.Ches.Period) }); } @@ -518,7 +518,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IApiVers config.MapControllers(); config.MapHealthChecks("health/system", new HealthCheckOptions() { - Predicate = r => r.Tags.Contains("system-check"), + Predicate = r => r.Tags.Contains(SYSTEMCHECK), ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse, }); diff --git a/source/frontend/package-lock.json b/source/frontend/package-lock.json index a442138c19..07b71584f5 100644 --- a/source/frontend/package-lock.json +++ b/source/frontend/package-lock.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "6.1.0-119.0", + "version": "6.1.1-119.0", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/source/frontend/package.json b/source/frontend/package.json index 15cf739bd9..5694bfb93c 100644 --- a/source/frontend/package.json +++ b/source/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "6.1.0-119.16", + "version": "6.1.1-119.16", "private": true, "dependencies": { "@bcgov/bc-sans": "1.0.1", diff --git a/source/frontend/src/components/layout/Healthcheck/HealthcheckView.test.tsx b/source/frontend/src/components/layout/Healthcheck/HealthcheckView.test.tsx index 45ebec9b03..6f690e7672 100644 --- a/source/frontend/src/components/layout/Healthcheck/HealthcheckView.test.tsx +++ b/source/frontend/src/components/layout/Healthcheck/HealthcheckView.test.tsx @@ -1,5 +1,6 @@ +import { act, render, RenderOptions, userEvent } from '@/utils/test-utils'; + import HealthcheckView, { IHealthCheckIssue, IHealthCheckViewProps } from './HealthcheckView'; -import { act, render, RenderOptions, userEvent, screen } from '@/utils/test-utils'; const mockHealthcheckIssues: IHealthCheckIssue[] = [ { @@ -53,4 +54,41 @@ describe('Healthcheck View component', () => { }); expect(getByTestId('healthcheck-full-list-lnk')).toBeVisible(); }); + + it(`shows modal with full list after clicking the link`, async () => { + const { getByTestId, getByText } = await setup({ + props: { + systemDegraded: true, + systemChecks: [ + ...mockHealthcheckIssues, + { + key: 'Mayan', + msg: 'The PIMS Document server is experiencing service degradation, you will be unable to view, download or upload documents until resolved.', + }, + ], + }, + }); + + const link = getByTestId('healthcheck-full-list-lnk'); + expect(link).toBeVisible(); + await act(() => userEvent.click(link)); + expect( + getByText(/The PIMS Document server is experiencing service degradation/i), + ).toBeVisible(); + }); + + it('works as expected when system is degraded and issues array is empty', async () => { + const { getByLabelText, getByText } = await setup({ + props: { + systemDegraded: true, + systemChecks: [], + }, + }); + expect(getByLabelText('System degraded icon')).toBeVisible(); + expect( + getByText( + 'The system is currently experiencing service degradation, you may experience issues using the application until this is resolved.', + ), + ).toBeVisible(); + }); }); diff --git a/source/frontend/src/components/layout/Healthcheck/HealthcheckView.tsx b/source/frontend/src/components/layout/Healthcheck/HealthcheckView.tsx index f1e2067453..b04ae3842e 100644 --- a/source/frontend/src/components/layout/Healthcheck/HealthcheckView.tsx +++ b/source/frontend/src/components/layout/Healthcheck/HealthcheckView.tsx @@ -5,6 +5,7 @@ import { LinkButton } from '@/components/common/buttons/LinkButton'; import { ModalSize } from '@/components/common/GenericModal'; import { useModalContext } from '@/hooks/useModalContext'; import HealthCheckStyled from '@/layouts/Healthcheck'; +import { firstOrNull } from '@/utils/utils'; export interface IHealthCheckIssue { key: string; @@ -23,17 +24,19 @@ const HealthcheckView: React.FunctionComponent = ({ systemChecks, }) => { const { setModalContent, setDisplayModal } = useModalContext(); + const firstIssue = firstOrNull(systemChecks); return systemChecked && systemDegraded ? ( - + {systemChecks.length > 1 && ( renders as expected 1`] = ` class="c1" >
Date: Mon, 13 Apr 2026 22:42:10 -0600 Subject: [PATCH 3/3] PSP-11411: [HOTFIX] Acquisition Files - When update information on any tab from an Acquisition File, PIMS navigates back to FIle Details instead of staying at the chosen tab - view form (#5280) * Return to fileDetails after updating property without location * increase frontend version * code review changes --------- Co-authored-by: Alejandro Sanchez --- .../mapSideBar/acquisition/AcquisitionContainer.tsx | 6 +++--- .../src/features/mapSideBar/research/ResearchContainer.tsx | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx index 23f0cb8adb..b7e4d98be2 100644 --- a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx +++ b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx @@ -263,9 +263,6 @@ export const AcquisitionContainer: React.FunctionComponent { @@ -308,6 +305,9 @@ export const AcquisitionContainer: React.FunctionComponent { onSuccess(); + if (isValidId(response?.id)) { + pathGenerator.showFile('acquisition', response.id); + } return response; }); }, diff --git a/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx b/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx index 24669f92c3..9e18c4c85d 100644 --- a/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx +++ b/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx @@ -240,6 +240,9 @@ export const ResearchContainer: React.FunctionComponent userOverrideCodes, ).then(response => { onSuccess(); + if (isValidId(response?.id)) { + pathGenerator.showFile('research', response.id); + } return response; }); },