L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-65134 core_message: Introduce event specific function

Browse Source 
Introduced an event specific formatting function.
Additional catch on render fn calls
This commit is contained in:
Ryan Wyllie
2019-05-02 16:24:13 +08:00
committed by Peter
parent 3a7b1b4d6e
commit 07d60fe334
2 changed files with 57 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/amd/build/message_drawer_view_overview_section.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
message/amd/src/message_drawer_view_overview_section.js
+56 -49
View File
@@ -158,23 +158,36 @@ function(
};
/**
* Reformat the conversations to a common standard because this is linked directly to the ajax response and via
* an event publish which operate on the same fields but in a different format
* @param conversations
* Create a formatted conversation object from the the one we get from events. The new object
* will be in a format that matches what we receive from the server.
*
* @param {Object} conversation
* @return {Object} formatted conversation.
*/
var formatConversationsForRender = function(conversations) {
// Convert the conversation to the standard stored and then cache the conversation.
return conversations.map(function(conversation) {
return Object.keys(conversation).reduce(function(carry, key){
if ($.isArray(conversation[key])) {
carry[key.toLowerCase()] = formatConversationsForRender(conversation[key]);
var formatConversationFromEvent = function(conversation) {
// Recursively lowercase all of the keys for an object.
var recursivelyLowercaseKeys = function(object) {
return Object.keys(object).reduce(function(carry, key) {
if ($.isArray(object[key])) {
carry[key.toLowerCase()] = object[key].map(recursivelyLowercaseKeys);
} else {
carry[key.toLowerCase()] = conversation[key];
carry[key.toLowerCase()] = object[key];
}
return carry;
}, {});
}, []);
};
// Recursively lowercase all of the keys for the conversation.
var formatted = recursivelyLowercaseKeys(conversation);
// Make sure all messages have the useridfrom property set.
formatted.messages = formatted.messages.map(function(message) {
message.useridfrom = message.userfrom.id;
return message;
});
return formatted;
};
/**
@@ -186,7 +199,6 @@ function(
* @return {Object} jQuery promise.
*/
var render = function(conversations, userId) {
conversations = formatConversationsForRender(conversations);
var formattedConversations = conversations.map(function(conversation) {
var lastMessage = conversation.messages.length ? conversation.messages[conversation.messages.length - 1] : null;
@@ -218,7 +230,7 @@ function(
if (conversation.type == MessageDrawerViewConversationContants.CONVERSATION_TYPES.PUBLIC) {
formattedConversation.lastsendername = conversation.members.reduce(function(carry, member) {
if (!carry && member.id == lastMessage.useridfrom) {
if (!carry && lastMessage && member.id == lastMessage.useridfrom) {
carry = member.fullname;
}
return carry;
@@ -380,11 +392,11 @@ function(
*
* @param {Object} root Overview messages container element.
* @param {Object} conversation The conversation.
* @param {Number} userId The logged in user id.
* @return {Object} jQuery promise
*/
var createNewConversation = function(root, conversation) {
var createNewConversationFromEvent = function(root, conversation, userId) {
var existingConversations = root.find(SELECTORS.CONVERSATION);
var text = '';
if (!existingConversations.length) {
// If we didn't have any conversations then we need to show
@@ -394,28 +406,9 @@ function(
LazyLoadList.hideEmptyMessage(listRoot);
}
var messageCount = conversation.messages.length;
var lastMessage = messageCount ? conversation.messages[messageCount - 1] : null;
if (lastMessage) {
text = $(lastMessage.text).text() || lastMessage.text;
conversation.messages[messageCount - 1].useridfrom = lastMessage.userFrom.id;
}
var formattedConversation = {
id: conversation.id,
name: conversation.name,
subname: conversation.subname,
lastmessagedate: lastMessage ? lastMessage.timeCreated : null,
sentfromcurrentuser: lastMessage ? lastMessage.fromLoggedInUser : null,
lastmessage: text,
imageurl: conversation.imageUrl,
};
// Convert the conversation to the standard stored and then cache the conversation.
loadedConversationsById[conversation.id] = formatConversationsForRender([conversation])[0];
return Templates.render(TEMPLATES.CONVERSATIONS_LIST, {conversations: [formattedConversation]})
// Cache the conversation.
loadedConversationsById[conversation.id] = conversation;
return render([conversation], userId)
.then(function(html) {
var contentContainer = LazyLoadList.getContentContainer(root);
return contentContainer.prepend(html);
@@ -478,10 +471,12 @@ function(
root.on('show.bs.collapse', function() {
setExpanded(root);
LazyLoadList.show(listRoot, loadCallback, function(contentContainer, conversations, userId) {
return render(conversations, userId).then(function(html) {
contentContainer.append(html);
return html;
});
return render(conversations, userId)
.then(function(html) {
contentContainer.append(html);
return html;
})
.catch(Notification.exception);
});
});
@@ -512,11 +507,13 @@ function(
return;
}
var loggedInUserId = conversation.loggedInUserId;
var conversationId = conversation.id;
var element = getConversationElement(root, conversationId);
conversation = formatConversationFromEvent(conversation);
if (element.length) {
var contentContainer = LazyLoadList.getContentContainer(root);
render([conversation], conversation.loggedInUserId)
render([conversation], loggedInUserId)
.then(function(html) {
contentContainer.prepend(html);
element.remove();
@@ -524,7 +521,7 @@ function(
})
.catch(Notification.exception);
} else {
createNewConversation(root, conversation);
createNewConversationFromEvent(root, conversation, loggedInUserId);
}
});
@@ -548,7 +545,11 @@ function(
if (includeFavourites && (!type || type == conversation.type)) {
conversationElement = getConversationElement(root, conversation.id);
if (!conversationElement.length) {
createNewConversation(root, conversation);
createNewConversationFromEvent(
root,
formatConversationFromEvent(conversation),
conversation.loggedInUserId
);
}
} else if (type == conversation.type) {
conversationElement = getConversationElement(root, conversation.id);
@@ -568,7 +569,11 @@ function(
} else if (type == conversation.type) {
conversationElement = getConversationElement(root, conversation.id);
if (!conversationElement.length) {
createNewConversation(root, conversation);
createNewConversationFromEvent(
root,
formatConversationFromEvent(conversation),
conversation.loggedInUserId
);
}
}
});
@@ -604,10 +609,12 @@ function(
setExpanded(root);
var listRoot = LazyLoadList.getRoot(root);
LazyLoadList.show(listRoot, loadCallback, function(contentContainer, conversations, userId) {
return render(conversations, userId).then(function(html) {
contentContainer.append(html);
return html;
});
return render(conversations, userId)
.then(function(html) {
contentContainer.append(html);
return html;
})
.catch(Notification.exception);
});
}