Merge remote-tracking branch 'upstream/test' into backmerge_test_to_dev

bcgov · Feb 22, 2024 · 4a201a6 · 4a201a6
2 parents a217f43 + 11fc7ef
commit 4a201a6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj
@@ -2,9 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>5.0.0-74.5</Version>
-    <Version>5.0.0-74.5</Version>
-    <AssemblyVersion>5.0.0.74</AssemblyVersion>
+    <Version>5.0.1-74.5</Version>
+    <Version>5.0.1-74.5</Version>
+    <AssemblyVersion>5.0.1.74</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>
     <TargetFramework>net8.0</TargetFramework>

diff --git a/source/backend/dal/Repositories/UserRepository.cs b/source/backend/dal/Repositories/UserRepository.cs
@@ -206,10 +206,7 @@ public Paged<PimsUser> GetAllByFilter(UserFilter filter = null)
 
             if (filter != null)
             {
-                if (filter.Page < 1)
-                {
-                    filter.Page = 1;
-                }
+                filter.Page = 1;
 
                 if (filter.Quantity < 1)
                 {

diff --git a/source/frontend/package-lock.json b/source/frontend/package-lock.json
diff --git a/source/frontend/package.json b/source/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "5.0.0-74.5",
+  "version": "5.0.1-74.5",
   "private": true,
   "dependencies": {
     "@bcgov/bc-sans": "1.0.1",

diff --git a/...e/frontend/src/features/mapSideBar/acquisition/tabs/agreement/update/AgreementSubForm.tsx b/...e/frontend/src/features/mapSideBar/acquisition/tabs/agreement/update/AgreementSubForm.tsx
@@ -41,13 +41,15 @@ export const AgreementSubForm: React.FunctionComponent<IAgreementSubFormProps> =
 
   const agreementStatusOptions = getOptionsByType(API.AGREEMENT_STATUS_TYPES);
   const agreement = getIn(formikProps.values, nameSpace);
+  const touched = getIn(formikProps.touched, nameSpace);
+  const initialAgreement = getIn(formikProps.initialValues, nameSpace);
 
   const { setDisplayModal, setModalContent } = useModalContext();
   const setFieldValue = formikProps.setFieldValue;
   useEffect(() => {
     if (
-      agreement.agreementStatusTypeCode !== ApiGen_CodeTypes_AgreementStatusTypes.CANCELLED &&
-      !!agreement.cancellationNote
+      agreement?.agreementStatusTypeCode !== ApiGen_CodeTypes_AgreementStatusTypes.CANCELLED &&
+      !!agreement?.cancellationNote
     ) {
       setModalContent({
         variant: 'warning',
@@ -70,7 +72,15 @@ export const AgreementSubForm: React.FunctionComponent<IAgreementSubFormProps> =
       });
       setDisplayModal(true);
     }
-  }, [agreement, setFieldValue, nameSpace, setDisplayModal, setModalContent]);
+  }, [
+    agreement,
+    setFieldValue,
+    nameSpace,
+    setDisplayModal,
+    setModalContent,
+    touched?.agreementStatusTypeCode,
+    initialAgreement?.agreementStatusTypeCode,
+  ]);
 
   return (
     <>

diff --git a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
@@ -247,7 +247,7 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
           )
           .then(response => {
             history.push(`${stripTrailingSlash(match.url)}`);
-            onSuccess(true);
+            onSuccess(true, true);
             return response;
           });
       },