From 95c4e1716cfc90a4a2bdb1a8e044c18578873b23 Mon Sep 17 00:00:00 2001
From: NataliaTepluhina <tarya.se@gmail.com>
Date: Fri, 4 Jun 2021 11:18:12 +0200
Subject: [PATCH] Added groupMembers checks
---
.../jira_import/components/jira_import_form.vue | 10 ++++++----
.../boards/components/epic_filtered_search.vue | 4 +++-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/app/assets/javascripts/jira_import/components/jira_import_form.vue b/app/assets/javascripts/jira_import/components/jira_import_form.vue
index 6f2fb41ca15e6..e7816f6d18778 100644
--- a/app/assets/javascripts/jira_import/components/jira_import_form.vue
+++ b/app/assets/javascripts/jira_import/components/jira_import_form.vue
@@ -168,10 +168,12 @@ export default {
})
.then(({ data }) => {
this.users =
- data?.project?.projectMembers?.nodes?.map(({ user }) => ({
- ...user,
- id: getIdFromGraphQLId(user.id),
- })) || [];
+ data?.project?.projectMembers?.nodes
+ .filter((x) => x?.user)
+ .map(({ user }) => ({
+ ...user,
+ id: getIdFromGraphQLId(user.id),
+ })) || [];
return this.users;
})
.finally(() => {
diff --git a/ee/app/assets/javascripts/boards/components/epic_filtered_search.vue b/ee/app/assets/javascripts/boards/components/epic_filtered_search.vue
index 29a9b7425a402..882d717962b8c 100644
--- a/ee/app/assets/javascripts/boards/components/epic_filtered_search.vue
+++ b/ee/app/assets/javascripts/boards/components/epic_filtered_search.vue
@@ -60,7 +60,9 @@ export default {
search: authorsSearchTerm,
},
})
- .then(({ data }) => data.group?.groupMembers.nodes.map((item) => item.user));
+ .then(({ data }) =>
+ data.group?.groupMembers.nodes.filter((x) => x?.user).map(({ user }) => user),
+ );
},
fetchLabels(labelSearchTerm) {
return this.$apollo
--
GitLab