From 198f25dfee0021b45181b7717002264782d60e70 Mon Sep 17 00:00:00 2001
From: NataliaTepluhina <tarya.se@gmail.com>
Date: Thu, 3 Jun 2021 12:41:26 +0200
Subject: [PATCH] Added a check for user: null
Changelog: changed
---
.../vue_shared/components/user_select/user_select.vue | 4 +++-
ee/app/assets/javascripts/boards/stores/actions.js | 5 +++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/app/assets/javascripts/vue_shared/components/user_select/user_select.vue b/app/assets/javascripts/vue_shared/components/user_select/user_select.vue
index 94166d74c1ab..028e19a6f947 100644
--- a/app/assets/javascripts/vue_shared/components/user_select/user_select.vue
+++ b/app/assets/javascripts/vue_shared/components/user_select/user_select.vue
@@ -113,7 +113,9 @@ export default {
update(data) {
// TODO Remove null filter (BE fix required)
// https://gitlab.com/gitlab-org/gitlab/-/issues/329750
- return data.workspace?.users?.nodes.filter((x) => x).map(({ user }) => user) || [];
+ const users = data.workspace?.users?.nodes.filter((x) => x).map(({ user }) => user) || [];
+ // User field is nullable and we only want to display non-null users
+ return users.filter((u) => u);
},
debounce: ASSIGNEES_DEBOUNCE_DELAY,
error({ graphQLErrors }) {
diff --git a/ee/app/assets/javascripts/boards/stores/actions.js b/ee/app/assets/javascripts/boards/stores/actions.js
index a18a31f25845..cd2de986cbad 100644
--- a/ee/app/assets/javascripts/boards/stores/actions.js
+++ b/ee/app/assets/javascripts/boards/stores/actions.js
@@ -535,14 +535,15 @@ export default {
})
.then(({ data }) => {
const [firstError] = data.workspace.errors || [];
- const assignees = data.workspace.assignees.nodes;
+ const assignees = data.workspace.assignees.nodes.map(({ user }) => user);
if (firstError) {
throw new Error(firstError);
}
commit(
types.RECEIVE_ASSIGNEES_SUCCESS,
- assignees.map(({ user }) => user),
+ // User field is nullable and we only want to display non-null users
+ assignees.filter((u) => u),
);
})
.catch((e) => {
--
GitLab