#1119 | If a memberSubjectType individual is voided, but its membersh…

…ip isn't, hide it from the membership list of all its groupSubjects
avniproject · Oct 17, 2023 · af2d97f · af2d97f
1 parent 613237f
commit af2d97f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packages/openchs-android/src/views/individual/SubjectDashboardProfileTab.js b/packages/openchs-android/src/views/individual/SubjectDashboardProfileTab.js
@@ -187,12 +187,13 @@ class SubjectDashboardProfileTab extends AbstractComponent {
             label: 'remove',
             fn: (groupSubject) => this.onMemberRemove(groupSubject)
         });
+        const nonVoidedMembersGroupSubjects = _.filter(groupSubjects, (groupSubject) => !groupSubject.memberSubject.voided);
         return (
             <View style={styles.container}>
                 <TouchableOpacity
                     onPress={() => this.dispatchAction(Actions.ON_TOGGLE, {keyName: 'expandMembers'})}>
                     <ObservationsSectionTitle contextActions={this.addMemberActions()}
-                                              title={`${this.I18n.t('members')} (${groupSubjects.length})`}
+                                              title={`${this.I18n.t('members')} (${nonVoidedMembersGroupSubjects.length})`}
                                               titleStyle={Styles.cardTitle}/>
                     <View style={{right: 2, position: 'absolute', alignSelf: 'center'}}>
                         {this.state.expandMembers === false ?
@@ -201,9 +202,9 @@ class SubjectDashboardProfileTab extends AbstractComponent {
                     </View>
                 </TouchableOpacity>
                 <View style={{marginTop: 3}}>
-                    {this.state.expandMembers === true && groupSubjects.length > 0 ?
+                    {this.state.expandMembers === true && nonVoidedMembersGroupSubjects.length > 0 ?
                         <View style={styles.memberCard}>
-                            <Members groupSubjects={groupSubjects}
+                            <Members groupSubjects={nonVoidedMembersGroupSubjects}
                                      onMemberSelection={(memberSubjectUUID) => this.onSubjectSelection(memberSubjectUUID)}
                                      actions={applicableActions}
                                      editAllowed={editAllowed}