From 6dab962349534be1320d93030f5100ba5d0d1c33 Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Fri, 5 Mar 2021 15:41:31 +0100 Subject: [PATCH] Fix conversation lists --- .../js/components/conversations/interface.js | 7 ++--- assets/js/components/conversations/list.js | 6 ++-- assets/js/pages/conversations/listPane.js | 30 +++++++++---------- assets/js/pages/conversations/main.js | 2 +- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/assets/js/components/conversations/interface.js b/assets/js/components/conversations/interface.js index 2645e192..4ab038d3 100644 --- a/assets/js/components/conversations/interface.js +++ b/assets/js/components/conversations/interface.js @@ -36,7 +36,7 @@ const ConversationsInterface = { var params = {}; //No params required now //Perform the API request - ComunicWeb.common.api.makeAPIrequest(apiURI, params, true, function(results){ + ComunicWeb.common.api.makeAPIrequest(apiURI, params, true, (results) => { //Check for error if(results.error){ @@ -50,7 +50,7 @@ const ConversationsInterface = { //Process the list var conversationsList = {}; for(i in results){ - conversationsList["conversation-"+results[i].ID] = results[i]; + conversationsList["conversation-"+results[i].id] = results[i]; } //Save the list in the cache @@ -61,9 +61,6 @@ const ConversationsInterface = { } }); - - //Success - return true; }, /** diff --git a/assets/js/components/conversations/list.js b/assets/js/components/conversations/list.js index fa88e571..ca737a41 100644 --- a/assets/js/components/conversations/list.js +++ b/assets/js/components/conversations/list.js @@ -212,7 +212,7 @@ const ConversationsList = { /** * Show a conversation entry * - * @param {Object} conversationInfos Informations about the conversation + * @param {Conversation} conversationInfos Informations about the conversation * @param {HTMLElement} entryTarget The target for the entry * @param {Object} listBox HTML elements about the listBox * @return {Boolean} True for a success @@ -242,7 +242,7 @@ const ConversationsList = { //Calculate last conversation activity var currentTime = ComunicWeb.common.date.time(); - lastActivityValueElem.innerHTML = " "+ComunicWeb.common.date.diffToStr(currentTime - conversationInfos.last_active); + lastActivityValueElem.innerHTML = " "+ComunicWeb.common.date.diffToStr(currentTime - conversationInfos.last_activity); //Create the conversation name element @@ -269,7 +269,7 @@ const ConversationsList = { //Specify value var membersNumberValueElem = createElem("span", membersNumberSmallElem); - membersNumberValueElem.innerHTML = (conversationInfos.members.length === 1 ? "1 member" : conversationInfos.members.length + " members"); + membersNumberValueElem.innerHTML = (conversationInfos.members.length === 1 ? tr("1 member") : conversationInfos.members.length + " members"); //Success return true; diff --git a/assets/js/pages/conversations/listPane.js b/assets/js/pages/conversations/listPane.js index 4d387ca6..c76de672 100644 --- a/assets/js/pages/conversations/listPane.js +++ b/assets/js/pages/conversations/listPane.js @@ -4,7 +4,7 @@ * @author Pierre HUBERT */ -ComunicWeb.pages.conversations.listPane = { +const ConversationsPageListPane = { /** * Save current list @@ -52,18 +52,18 @@ ComunicWeb.pages.conversations.listPane = { //Check if box body is still connected if(!boxBody.isConnected){ clearInterval(interval); - ComunicWeb.pages.conversations.listPane._curr_list = null; + ConversationsPageListPane._curr_list = null; return; } //Load the list of conversations - ComunicWeb.pages.conversations.listPane.refresh_list(boxBody); + ConversationsPageListPane.refresh_list(boxBody); }, 5000); //Force load the list of conversations - ComunicWeb.pages.conversations.listPane._curr_list = null; - ComunicWeb.pages.conversations.listPane.refresh_list(boxBody); + ConversationsPageListPane._curr_list = null; + ConversationsPageListPane.refresh_list(boxBody); }, @@ -89,7 +89,7 @@ ComunicWeb.pages.conversations.listPane = { //Perform a request over the interface - ComunicWeb.components.conversations.interface.getList(function(result){ + ConversationsInterface.getList((result) => { //Check for errors if(result.error){ @@ -101,14 +101,14 @@ ComunicWeb.pages.conversations.listPane = { loadingMsg.remove(); //Check if it is required to apply new list - if(JSON.stringify(ComunicWeb.pages.conversations.listPane._curr_list) == JSON.stringify(result)) + if(JSON.stringify(ConversationsPageListPane._curr_list) == JSON.stringify(result)) return; - ComunicWeb.pages.conversations.listPane._curr_list = result; + ConversationsPageListPane._curr_list = result; emptyElem(target); //Remove any previously shown list //Display the list of conversations - ComunicWeb.pages.conversations.listPane._display_list(target, result); + ConversationsPageListPane._display_list(target, result); }); }, @@ -150,7 +150,7 @@ ComunicWeb.pages.conversations.listPane = { * Display a single conversation entry * * @param {HTMLElement} target The target for the conversation - * @param {Object} info Information about the conversation to display + * @param {Conversation} info Information about the conversation to display */ _display_entry: function(target, info) { @@ -168,13 +168,13 @@ ComunicWeb.pages.conversations.listPane = { convLink.addEventListener("click", function(e){ //Force conversation list refresh - ComunicWeb.pages.conversations.listPane._curr_list = {}; + ConversationsPageListPane._curr_list = {}; //Make the choice visible convLink.className += " selected"; //Open the conversation - openPage("conversations/"+info.ID) + openPage("conversations/"+info.id) }); @@ -190,7 +190,7 @@ ComunicWeb.pages.conversations.listPane = { createElem2({ appendTo: lastActivityContainer, type: "span", - innerHTML: ComunicWeb.common.date.timeDiffToStr(info.last_active) + innerHTML: ComunicWeb.common.date.timeDiffToStr(info.last_activity) }); //Add conversation name @@ -199,7 +199,7 @@ ComunicWeb.pages.conversations.listPane = { type: info.saw_last_message ? "span" : "strong", innerHTML: "Loading..." }); - ComunicWeb.components.conversations.utils.getName(info, function(name){ + ConversationsUtils.getName(info, function(name){ conversationName.innerHTML = name; }); @@ -218,7 +218,7 @@ ComunicWeb.pages.conversations.listPane = { createElem2({ appendTo: membersNumberContainerSmall, type: "span", - innerHTML: (info.members.length === 1 ? "1 member" : info.members.length + " members") + innerHTML: (info.members.length === 1 ? tr("1 member") : tr("%1% members", {"1": info.members.length})) }); } diff --git a/assets/js/pages/conversations/main.js b/assets/js/pages/conversations/main.js index b6c42204..618fdeca 100644 --- a/assets/js/pages/conversations/main.js +++ b/assets/js/pages/conversations/main.js @@ -36,7 +36,7 @@ ComunicWeb.pages.conversations.main = { // Otherwise display the list of conversations else { - ComunicWeb.pages.conversations.listPane.display(container); + ConversationsPageListPane.display(container); } },