nova/Chatto
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Added error prompt on empty user search

Browse Source
This commit is contained in:
Rohan Sircar 2020-06-20 13:48:55 +05:30
parent 2addcc1fa8
commit a9d81fce19
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ export class ChatView implements Observer<ChatMessageViewModel> {
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<ChatMessageViewModel> {
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"))

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

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