feat: optimize member list (code review and more fixes)

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>

Author: Koc

src/components/Member/MemberPicker.vue

@@ -87,6 +87,11 @@ export default {
 	},
 
 	props: {
+		isLoading: {
+			type: Boolean,
+			default: false,
+		},
+
 		searchWithoutQuery: {
 			type: Boolean,
 			default: false,
@@ -169,7 +174,7 @@ export default {
 		},
 
 		showCurrentSkeleton() {
-			return this.showCurrent && this.currentMembers.length === 0
+			return this.showCurrent && (this.currentMembers.length === 0 || this.isLoading)
 		},
 	},
 

src/components/Nav/CollectiveMembersModal.vue

@@ -25,6 +25,7 @@
 				:circleId="collective.circleId"
 				:currentUserIsAdmin
 				:currentMembers="circleMembersSorted(collective.circleId)"
+				:isLoading="isLoadingMembers"
 				:onClickSearched />
 		</div>
 	</NcModal>
@@ -63,7 +64,7 @@ export default {
 	],
 
 	computed: {
-		...mapState(useCirclesStore, ['circleMembersSorted']),
+		...mapState(useCirclesStore, ['circleMembersSorted', 'currentCircleMembersFullyLoaded']),
 		...mapState(useCollectivesStore, ['isCollectiveAdmin']),
 		...mapState(useRootStore, ['isPublic']),
 
@@ -82,6 +83,10 @@ export default {
 		showTeamLink() {
 			return this.hasContactsApp && !this.isPublic
 		},
+
+		isLoadingMembers() {
+			return !this.currentCircleMembersFullyLoaded
+		},
 	},
 
 	beforeMount() {