Browse Source

Added error prompt on empty user search

master
Rohan Sircar 4 years ago
parent
commit
a9d81fce19
  1. 6
      src/main/javascript/ts/src/view/ChatView.ts
  2. 26
      src/main/javascript/ts/src/view/UserView.ts

6
src/main/javascript/ts/src/view/ChatView.ts

@ -175,7 +175,7 @@ export class ChatView implements Observer<ChatMessageViewModel> {
const msgTime = new Date(); const msgTime = new Date();
const context: ChatMessageViewModel = { const context: ChatMessageViewModel = {
fromUser: JsonAPI.principleName, fromUser: JsonAPI.principleName,
toUser: "",
toUser: contactName,
message: messageContent, message: messageContent,
messageTime: msgTime, messageTime: msgTime,
}; };
@ -192,12 +192,12 @@ export class ChatView implements Observer<ChatMessageViewModel> {
fromUser: JsonAPI.principleName, fromUser: JsonAPI.principleName,
toUser: contactName, toUser: contactName,
messageCipher: messageCipher, messageCipher: messageCipher,
messageTime: msgTime,
messageTime: msgTime.toISOString(),
}; };
this._sendMessageAJAX(chatMessageDTO); this._sendMessageAJAX(chatMessageDTO);
} }
private _sendMessageAJAX(chatMessageDTO: ChatMessageDTO): void {
private _sendMessageAJAX(chatMessageDTO: any): void {
let headers = new Headers(); let headers = new Headers();
// console.log("Token = " + btoa("hmm" + ":" + "hmm")) // console.log("Token = " + btoa("hmm" + ":" + "hmm"))

26
src/main/javascript/ts/src/view/UserView.ts

@ -165,17 +165,22 @@ export class UserView implements Observer<ActiveUserViewModel> {
e.preventDefault(); e.preventDefault();
// log.trace(temp); // log.trace(temp);
const searchTerm = this._userSearchInputElement.value; 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<ActiveUserViewModel> {
this._userSearchInputElement.addEventListener("input", (e) => { this._userSearchInputElement.addEventListener("input", (e) => {
e.preventDefault(); e.preventDefault();
if (this._userSearchInputElement.value.length < 2) { if (this._userSearchInputElement.value.length < 2) {
log.debug("inputted");
this._userSearchCancelButton.hidden = false; this._userSearchCancelButton.hidden = false;
} }
}); });

Loading…
Cancel
Save