Merge pull request #2485 from devinleighsmith/psp-4999

HOTFIX: Psp-4999
bcgov · Nov 29, 2022 · 781306d · 781306d
2 parents 5fcbbbb + c3238db
commit 781306d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 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>3.0.0-40.34</Version>
-    <Version>3.0.0-40.34</Version>
-    <AssemblyVersion>3.0.0.40</AssemblyVersion>
+    <Version>3.0.1-40.34</Version>
+    <Version>3.0.1-40.34</Version>
+    <AssemblyVersion>3.0.1.40</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>
   </PropertyGroup>

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

diff --git a/source/frontend/src/features/mapSideBar/MotiInventoryContainer.tsx b/source/frontend/src/features/mapSideBar/MotiInventoryContainer.tsx
@@ -32,7 +32,7 @@ export const MotiInventoryContainer: React.FunctionComponent<
 
   const composedProperty = useComposedProperties({
     id: props.id,
-    pid: props.pid !== undefined ? +props.pid : undefined,
+    pid: props?.pid === undefined || isNaN(+props.pid) ? undefined : +props.pid,
     propertyTypes: [
       PROPERTY_TYPES.ASSOCIATIONS,
       PROPERTY_TYPES.LTSA,

diff --git a/source/frontend/src/hooks/useBcAssessmentLayer.ts b/source/frontend/src/hooks/useBcAssessmentLayer.ts
@@ -31,7 +31,7 @@ export const useBcAssessmentLayer = (
     setModalContent({
       title: 'SiteMinder Session Expired',
       message:
-        'Your SiteMinder Session has expired. In order to access BC Assessment data, you will need to logout and log back in to the application.',
+        'Your SiteMinder Session has expired, you have not been authorized to access BC Assessment, or BC Assessment is offline. In order to access BC Assessment data, you may try to logout and log back in to the application. If you continue to see this error, contact an administrator',
       okButtonText: 'Log out',
       cancelButtonText: 'Continue working',
       handleOk: () => {
@@ -102,8 +102,13 @@ export const useBcAssessmentLayer = (
       } catch (e: any) {
         if (axios.isAxiosError(e)) {
           const axiosError = e as AxiosError<IApiError>;
-          if (axiosError.response === undefined) {
-            setDisplayModal(true);
+          try {
+            // Test to see if the service is at all available.
+            await axios.get(url, { withCredentials: true });
+          } catch (err) {
+            if (axiosError.response === undefined && axiosError.code === undefined) {
+              setDisplayModal(true);
+            }
           }
         }
       }
@@ -185,6 +190,7 @@ export const useBcAssessmentLayer = (
       getSales,
       getLegalDescriptions,
       setDisplayModal,
+      url,
     ],
   );
 
@@ -198,7 +204,7 @@ export const useBcAssessmentLayer = (
 };
 
 export const LAYER_UNAVAILABLE = [
-  'The BC Assessment map layers used in this application are unavailable at this time.',
+  'Error returned from BC Assessment.',
   'Please notify ',
   '[email protected]',
   ' if this problem persists.',