Merge pull request #278 from IFRCGo/fix/per-calculation

Fix PER calculation

Author: tnagorra

src/components/domain/PerAssessmentSummary/index.tsx

@@ -141,7 +141,7 @@ function PerAssessmentSummary(props: Props) {
             const filteredComponents = areaResponse?.component_responses?.filter(
                 (component) => isDefined(component?.rating_details)
                     && isDefined(component.rating_details.value)
-                    && component.rating_details?.value > 1,
+                    && component.rating_details?.value !== 0,
             ) ?? [];
 
             if (filteredComponents.length === 0) {

src/views/CountryPreparedness/index.tsx

@@ -16,6 +16,7 @@ import {
 } from '@togglecorp/fujs';
 
 import Button from '#components/Button';
+import BlockLoading from '#components/BlockLoading';
 import Container from '#components/Container';
 import Heading from '#components/Heading';
 import KeyFigure from '#components/KeyFigure';
@@ -196,7 +197,7 @@ export function Component() {
              */
             const filteredComponents = componentList.filter(
                 (component) => isDefined(component)
-                    && isDefined(component.rating) && component.rating.value > 1,
+                    && isDefined(component.rating) && component.rating.value !== 0,
             );
 
             const ratingByArea = mapToList(
@@ -335,15 +336,25 @@ export function Component() {
         && perOptionsResponse
         && perFormAreaResponse;
 
-    const pending = pendingLatestPerResponse
-        || formAnswerPending
+    const pending = formAnswerPending
         || perOptionsPending
         || perFormAreaPending
         || perProcessStatusPending
         || assessmentResponsePending
         || prioritizationResponsePending;
 
-    if (isNotDefined(countryId) || (!pending && isDefined(latestPerResponseError))) {
+    if (pendingLatestPerResponse) {
+        return (
+            <Message
+                className={styles.pendingMessage}
+                pending
+                description={strings.componentFetchingData}
+            />
+        );
+    }
+
+    if (isNotDefined(countryId)
+        || (!pendingLatestPerResponse && isDefined(latestPerResponseError))) {
         return (
             <Message
                 className={styles.countryPreparedness}
@@ -365,16 +376,6 @@ export function Component() {
         );
     }
 
-    if (pending) {
-        return (
-            <Message
-                className={styles.pendingMessage}
-                pending
-                description={strings.componentFetchingData}
-            />
-        );
-    }
-
     return (
         <Container
             className={styles.countryPreparedness}
@@ -434,6 +435,9 @@ export function Component() {
                     </Link>
                 </div>
             </div>
+            {pending && (
+                <BlockLoading className={styles.pendingMessage} />
+            )}
             {hasRatingCounts && (
                 <Container
                     heading={strings.perAssessmentHeading}
@@ -480,7 +484,7 @@ export function Component() {
                     />
                 </Container>
             )}
-            {hasPrevAssessments && (
+            {!pending && hasPrevAssessments && (
                 <Container
                     heading={strings.NSResponseHeading}
                     withHeaderBorder
@@ -581,15 +585,15 @@ export function Component() {
                     )}
                 </Container>
             )}
-            {!limitedAccess && !hasAssessmentStats && (
+            {!pending && !limitedAccess && !hasAssessmentStats && (
                 <Message
                     className={styles.emptyMessage}
                     icon={<AnalyzingIcon />}
                     title={strings.componentChartNotAvailable}
                     description={strings.componentChartNotAvailableDescription}
                 />
             )}
-            {limitedAccess && (
+            {!pending && limitedAccess && (
                 <div className={styles.limitedAccess}>
                     <PublicCountryPreparedness perId={perId} />
                     <Message