Automatically reoopen conversations on page reload

This commit is contained in:
Pierre HUBERT 2020-04-10 13:51:36 +02:00
parent 119a6f1626
commit c3226a4fe1
7 changed files with 178 additions and 6 deletions

View File

@ -0,0 +1,27 @@
/**
* Call window
*/
#callsTarget {
position: fixed;
width: 100%;
height: 100%;
top: 0px;
visibility: hidden;
z-index: 1000;
}
.call-window {
width: 300px;
min-width: 300px;
min-height: 174px;
position: absolute;
top: 100px;
right: 10px;
z-index: 100;
border: 1px black solid;
display: flex;
flex-direction: column;
background-color: #000000b3;
visibility: visible;
}

View File

@ -0,0 +1,45 @@
/**
* Base class for events on custom class management
*
* @author Pierre Hubert
*/
class CustomEvents {
constructor() {
/**
* @type {Map<string, Array<(e) => any>>}
*/
this.evts = new Map();
}
/**
* Register to an event
*
* @param {string} evt The name of the event to register to
* @param {(e) => any} cb Callback function
*/
on(evt, cb) {
if(!this.evts.has(evt))
this.evts.set(evt, []);
this.evts.get(evt).push(cb)
}
/**
* Propagate a new event
*
* @param {string} evt The name of the event
* @param {any} data Data associated with the event
*/
emitEvent(evt, data) {
if(!this.evts.has(evt))
this.evts.set(evt, []);
this.evts.get(evt).forEach((e) => {
e(data)
})
}
}

View File

@ -42,7 +42,10 @@ class UserWebSocket {
this.ws = new WebSocket(url); this.ws = new WebSocket(url);
// Wait for connection // Wait for connection
this.ws.addEventListener("open", () => console.log("Connected to websocket!")) this.ws.addEventListener("open", () => {
console.info("Connected to websocket!");
SendEvent("wsOpen")
})
this.ws.addEventListener("error", (e) => this.Error(e)) this.ws.addEventListener("error", (e) => this.Error(e))
this.ws.addEventListener("close", (e) => this.Closed(e)); this.ws.addEventListener("close", (e) => this.Closed(e));

View File

@ -25,6 +25,67 @@ class CallsController {
// Create a new window for the conversation // Create a new window for the conversation
const window = new CallWindow(conv); const window = new CallWindow(conv);
OpenConversations.set(conv.ID, window) OpenConversations.set(conv.ID, window)
this.AddToLocalStorage(conv.ID);
window.on("close", () => {
OpenConversations.delete(conv.ID)
this.RemoveFromLocalStorage(conv.ID)
})
} }
/**
* Add the conversation to local storage
*
* @param {number} convID Target conversation ID
*/
static AddToLocalStorage(convID) {
const list = this.GetListLocalStorage();
if(!list.includes(convID))
list.push(convID)
this.SetListLocalStorage(list)
}
/**
* @param {number} convID Target conversation ID
*/
static RemoveFromLocalStorage(convID) {
this.SetListLocalStorage(
this.GetListLocalStorage().filter(e => e != convID)
)
}
/**
* @return {number[]} The ID of the opened conversations
*/
static GetListLocalStorage() {
const content = localStorage.getItem("calls")
if(content == null)
return []
else
return JSON.parse(content).filter(e => e != null);
}
/**
* Update the list of open calls
*
* @param {number[]} list New list
*/
static SetListLocalStorage(list) {
localStorage.setItem("calls", JSON.stringify(list))
}
} }
document.addEventListener("wsClosed", () => {
// Close all the current conversations
OpenConversations.forEach((v) => v.Close(false))
OpenConversations = new Map();
})
document.addEventListener("wsOpen", () => {
CallsController.GetListLocalStorage().forEach(async c => {
CallsController.Open(await getSingleConversation(c))
})
})

View File

@ -5,7 +5,7 @@
*/ */
class CallWindow { class CallWindow extends CustomEvents {
/** /**
* Create a new call window * Create a new call window
@ -13,6 +13,7 @@ class CallWindow {
* @param {Conversation} conv Information about the target conversation * @param {Conversation} conv Information about the target conversation
*/ */
constructor(conv) { constructor(conv) {
super()
this.construct(conv); this.construct(conv);
} }
@ -48,8 +49,22 @@ class CallWindow {
this.closeButton = createElem2({ this.closeButton = createElem2({
appendTo: windowHead.querySelector(".pull-right"), appendTo: windowHead.querySelector(".pull-right"),
type: "a", type: "a",
innerHTML: "<i class='fa fa-cross'></i>" innerHTML: "<i class='fa fa-cross'></i>",
onclick: () => this.Close()
}) })
} }
/**
* Close this window & cancel the call
*
* @param {boolean} propagate Set to true to propagate
* the event
*/
Close(propagate = true) {
this.rootEl.remove();
if(propagate)
this.emitEvent("closed");
}
} }

View File

@ -4,7 +4,7 @@
* @author Pierre HUBERT * @author Pierre HUBERT
*/ */
ComunicWeb.components.conversations.interface = { const ConversationsInterface = {
/** /**
* @var {Object} __conversationsList Cached list of conversations * @var {Object} __conversationsList Cached list of conversations
@ -486,6 +486,26 @@ ComunicWeb.components.conversations.interface = {
}, },
} }
ComunicWeb.components.conversations.interface = ConversationsInterface;
/**
* Get information about a single conversation
*
* @param {number} convID The ID of the target conversation
*/
async function getSingleConversation(convID) {
return new Promise((res, err) => {
ConversationsInterface.getInfosOne(convID, (info) => {
if(info.error)
err(info.error)
else
res(info)
}, false)
})
}
//Register conversations cache cleaning function //Register conversations cache cleaning function
ComunicWeb.common.cacheManager.registerCacheCleaner("ComunicWeb.components.conversations.interface.emptyCache"); ComunicWeb.common.cacheManager.registerCacheCleaner("ComunicWeb.components.conversations.interface.emptyCache");

View File

@ -223,7 +223,7 @@ class Dev {
"css/components/incognito/ui.css", "css/components/incognito/ui.css",
//Calls component //Calls component
"css/components/calls/window.css",
//Sidebar component //Sidebar component
"css/components/sidebar.css", "css/components/sidebar.css",
@ -299,6 +299,7 @@ class Dev {
//Utilities //Utilities
"js/common/utils.js", "js/common/utils.js",
"js/common/customEvents.js",
//Functions schema //Functions schema
"js/common/functionsSchema.js", "js/common/functionsSchema.js",