diff options
Diffstat (limited to 'app/assets/javascripts/invite_members/utils/response_message_parser.js')
-rw-r--r-- | app/assets/javascripts/invite_members/utils/response_message_parser.js | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/app/assets/javascripts/invite_members/utils/response_message_parser.js b/app/assets/javascripts/invite_members/utils/response_message_parser.js index 52ec3be3205..db8ac303dc4 100644 --- a/app/assets/javascripts/invite_members/utils/response_message_parser.js +++ b/app/assets/javascripts/invite_members/utils/response_message_parser.js @@ -1,28 +1,15 @@ import { isString } from 'lodash'; -import { API_MESSAGES } from '~/invite_members/constants'; function responseKeyedMessageParsed(keyedMessage) { try { const keys = Object.keys(keyedMessage); const msg = keyedMessage[keys[0]]; - if (msg === API_MESSAGES.EMAIL_ALREADY_INVITED) { - return ''; - } return msg; } catch { return ''; } } -function responseMessageStringForMultiple(message) { - return message.includes(':'); -} -function responseMessageStringFirstPart(message) { - const firstPart = message.split(':')[1]; - const firstMsg = firstPart.split(/ and [\w-]*$/)[0].trim(); - - return firstMsg; -} export function responseMessageFromError(response) { if (!response?.response?.data) { @@ -33,36 +20,25 @@ export function responseMessageFromError(response) { response: { data }, } = response; - return ( - data.error || - data.message?.user?.[0] || - data.message?.access_level?.[0] || - data.message?.error || - data.message || - '' - ); + return data.error || data.message?.error || data.message || ''; } export function responseMessageFromSuccess(response) { - if (!response?.[0]?.data) { + if (!response?.data) { return ''; } - const { data } = response[0]; + const { data } = response; - if (data.message && !data.message.user) { + if (data.message) { const { message } = data; if (isString(message)) { - if (responseMessageStringForMultiple(message)) { - return responseMessageStringFirstPart(message); - } - return message; } return responseKeyedMessageParsed(message); } - return data.message || data.message?.user || data.error || ''; + return data.error || ''; } |