diff --git a/src/main/javascript/ts/src/view/ChatView.ts b/src/main/javascript/ts/src/view/ChatView.ts index 0a7f184..3bb8fd2 100644 --- a/src/main/javascript/ts/src/view/ChatView.ts +++ b/src/main/javascript/ts/src/view/ChatView.ts @@ -175,7 +175,7 @@ export class ChatView implements Observer { const msgTime = new Date(); const context: ChatMessageViewModel = { fromUser: JsonAPI.principleName, - toUser: "", + toUser: contactName, message: messageContent, messageTime: msgTime, }; @@ -192,12 +192,12 @@ export class ChatView implements Observer { fromUser: JsonAPI.principleName, toUser: contactName, messageCipher: messageCipher, - messageTime: msgTime, + messageTime: msgTime.toISOString(), }; this._sendMessageAJAX(chatMessageDTO); } - private _sendMessageAJAX(chatMessageDTO: ChatMessageDTO): void { + private _sendMessageAJAX(chatMessageDTO: any): void { let headers = new Headers(); // console.log("Token = " + btoa("hmm" + ":" + "hmm")) diff --git a/src/main/javascript/ts/src/view/UserView.ts b/src/main/javascript/ts/src/view/UserView.ts index 1398b5a..483a58a 100644 --- a/src/main/javascript/ts/src/view/UserView.ts +++ b/src/main/javascript/ts/src/view/UserView.ts @@ -165,17 +165,22 @@ export class UserView implements Observer { e.preventDefault(); // log.trace(temp); const searchTerm = this._userSearchInputElement.value; - log.debug("search term value = " + searchTerm); - const list = this._model.activeUsersList; - log.debug("active users"); - log.debug(list); - if (list == null) { - log.error("Users list is null"); - return; + if (searchTerm.length > 0) { + log.debug("search term value = " + searchTerm); + const list = this._model.activeUsersList; + log.debug("active users"); + log.debug(list); + if (!list) { + log.error("Users list is null"); + return; + } + let searchResult = this._searchService.search(list, searchTerm); + this.update({ data: searchResult, op: "" }); + log.debug(searchResult); + } + else { + this._notificationService.error("Please enter a name") } - let searchResult = this._searchService.search(list, searchTerm); - this.update({ data: searchResult, op: "" }); - log.debug(searchResult); }); } @@ -183,7 +188,6 @@ export class UserView implements Observer { this._userSearchInputElement.addEventListener("input", (e) => { e.preventDefault(); if (this._userSearchInputElement.value.length < 2) { - log.debug("inputted"); this._userSearchCancelButton.hidden = false; } });