Fix expandable disable on summary issue

the-deep · Nov 9, 2023 · 763b2ed · 763b2ed
1 parent 8b505d0
commit 763b2ed
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/...EditAry/AssessmentRegistryForm/SummaryForm/AddSummaryIssue/AddSummaryIssueModal/index.tsx b/...EditAry/AssessmentRegistryForm/SummaryForm/AddSummaryIssue/AddSummaryIssueModal/index.tsx
@@ -3,7 +3,6 @@ import {
     Button,
     Container,
     TextInput,
-    Footer,
     useAlert,
 } from '@the-deep/deep-ui';
 import { gql, useMutation } from '@apollo/client';
@@ -52,10 +51,10 @@ type Props = {
     refetch: () => void;
 } & ({
     type: 'pillar';
-    subPillar?: AssessmentRegistrySummarySubPillarTypeEnum | null;
+    subPillar?: AssessmentRegistrySummarySubPillarTypeEnum;
 } | {
     type: 'dimension';
-    subDimension?: AssessmentRegistrySummarySubDimensionTypeEnum | null;
+    subDimension?: AssessmentRegistrySummarySubDimensionTypeEnum;
 })
 
 function AddSummaryIssueModal(props: Props) {

diff --git a/app/views/EditAry/AssessmentRegistryForm/SummaryForm/AddSummaryIssue/IssueItem/index.tsx b/app/views/EditAry/AssessmentRegistryForm/SummaryForm/AddSummaryIssue/IssueItem/index.tsx
@@ -81,12 +81,12 @@ const keySelector = (d: SummaryIssueType) => d.id;
 function IssueItem(props: Props) {
     const {
         name,
-        data,
+        data: newData,
         subPillar,
         subDimension,
         type,
     } = props;
-
+    const data = removeNull(newData);
     const [
         showAddIssue,
         setShowAddIssueTrue,
@@ -204,19 +204,21 @@ function IssueItem(props: Props) {
             spacing="compact"
             disabled={data.level === 3 || data.childCount === 0}
         >
-            <ListView
-                className={styles.subIssue}
-                data={response?.results}
-                keySelector={keySelector}
-                renderer={IssueItem}
-                rendererParams={issueParams}
-                errored={false}
-                filtered={false}
-                pending={false}
-                messageShown
-                emptyIcon
-                emptyMessage="No issue found!"
-            />
+            {data.childCount > 0 && (
+                <ListView
+                    className={styles.subIssue}
+                    data={response?.results}
+                    keySelector={keySelector}
+                    renderer={IssueItem}
+                    rendererParams={issueParams}
+                    errored={false}
+                    filtered={false}
+                    pending={false}
+                    messageShown
+                    emptyIcon
+                    emptyMessage="No issue found!"
+                />
+            )}
             {showAddIssue && (
                 <AddSummaryIssueModal
                     type={type}

diff --git a/app/views/EditAry/AssessmentRegistryForm/SummaryForm/PillarItem/SubPillarItem/index.tsx b/app/views/EditAry/AssessmentRegistryForm/SummaryForm/PillarItem/SubPillarItem/index.tsx
@@ -266,7 +266,7 @@ function SubPillarItem(props: Props) {
                             spacing="compact"
                             onClick={setShowAddIssueTrue}
                         >
-                            Add a Subpillar
+                            ADD A SUBPILLAR
                         </Button>
                     )}
                 >