From af25634bd2072974a6a666c267be989015114850 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 5 Apr 2019 09:20:17 +0200
Subject: [PATCH] MOBILE-2963 message: Show only one message when no results
 found

---
 scripts/langindex.json                      |  3 --
 src/addon/messages/lang/en.json             |  3 --
 src/addon/messages/pages/search/search.html | 59 +++++++++++----------
 src/addon/messages/pages/search/search.ts   |  3 --
 src/assets/lang/en.json                     |  3 --
 5 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index bd5af73bb..a0eddf6a0 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -216,9 +216,6 @@
   "addon.messages.requests": "moodle",
   "addon.messages.requirecontacttomessage": "message",
   "addon.messages.searchcombined": "message",
-  "addon.messages.searchnocontactsfound": "message",
-  "addon.messages.searchnomessagesfound": "message",
-  "addon.messages.searchnononcontactsfound": "message",
   "addon.messages.selfconversation": "message",
   "addon.messages.selfconversationdefaultmessage": "message",
   "addon.messages.sendcontactrequest": "message",
diff --git a/src/addon/messages/lang/en.json b/src/addon/messages/lang/en.json
index f428c85c7..4767ed3ba 100644
--- a/src/addon/messages/lang/en.json
+++ b/src/addon/messages/lang/en.json
@@ -55,9 +55,6 @@
     "requests": "Requests",
     "requirecontacttomessage": "You need to request {{$a}} to add you as a contact to be able to message them.",
     "searchcombined": "Search people and messages",
-    "searchnocontactsfound": "No contacts found",
-    "searchnomessagesfound": "No messages found",
-    "searchnononcontactsfound": "No non contacts found",
     "selfconversation": "Personal space",
     "selfconversationdefaultmessage": "Save draft messages, links, notes etc. to access later.",
     "sendcontactrequest": "Send contact request",
diff --git a/src/addon/messages/pages/search/search.html b/src/addon/messages/pages/search/search.html
index 4a9ba7621..77dd31713 100644
--- a/src/addon/messages/pages/search/search.html
+++ b/src/addon/messages/pages/search/search.html
@@ -18,42 +18,43 @@
                 <!-- The infinite loading cannot be inside the ng-template, it fails because it doesn't find ion-content. -->
                 <core-infinite-loading [enabled]="messages.canLoadMore" (action)="search(query, 'messages', $event)" [error]="messages.loadMoreError"></core-infinite-loading>
             </ion-list>
+
+            <core-empty-box *ngIf="displayResults && !contacts.results.length && !nonContacts.results.length && !messages.results.length" icon="search" [message]="'core.noresults' | translate"></core-empty-box>
         </core-loading>
     </ion-content>
 </core-split-view>
 
 <!-- Template to render a list of results -->
 <ng-template #resultsTemplate let-item="item">
-    <ion-item-divider text-wrap>{{ item.titleString | translate }}</ion-item-divider>
-    <ion-item text-wrap *ngIf="item.results.length == 0">
-        {{ item.emptyString | translate }}
-    </ion-item>
+    <ng-container *ngIf="item.results.length > 0">
+        <ion-item-divider text-wrap>{{ item.titleString | translate }}</ion-item-divider>
 
-    <!-- List of results -->
-    <a ion-item text-wrap *ngFor="let result of item.results" [title]="result.fullname" (click)="openConversation(result)" [class.core-split-item-selected]="result == selectedResult" class="addon-message-discussion">
-        <ion-avatar item-start core-user-avatar [user]="result" [checkOnline]="true" [linkProfile]="false"></ion-avatar>
-        <h2>
-            <core-format-text [text]="result.fullname"></core-format-text>
-            <core-icon name="fa-ban" *ngIf="result.isblocked" [label]="'addon.messages.contactblocked' | translate"></core-icon>
-        </h2>
-        <ion-note *ngIf="result.lastmessagedate > 0">
-            {{result.lastmessagedate | coreDateDayOrTime}}
-        </ion-note>
-        <p class="addon-message-last-message">
-            <span *ngIf="result.sentfromcurrentuser" class="addon-message-last-message-user">{{ 'addon.messages.you' | translate }}</span>
-            <core-format-text clean="true" singleLine="true" [text]="result.lastmessage" class="addon-message-last-message-text"></core-format-text>
-        </p>
-    </a>
+        <!-- List of results -->
+        <a ion-item text-wrap *ngFor="let result of item.results" [title]="result.fullname" (click)="openConversation(result)" [class.core-split-item-selected]="result == selectedResult" class="addon-message-discussion">
+            <ion-avatar item-start core-user-avatar [user]="result" [checkOnline]="true" [linkProfile]="false"></ion-avatar>
+            <h2>
+                <core-format-text [text]="result.fullname"></core-format-text>
+                <core-icon name="fa-ban" *ngIf="result.isblocked" [label]="'addon.messages.contactblocked' | translate"></core-icon>
+            </h2>
+            <ion-note *ngIf="result.lastmessagedate > 0">
+                {{result.lastmessagedate | coreDateDayOrTime}}
+            </ion-note>
+            <p class="addon-message-last-message">
+                <span *ngIf="result.sentfromcurrentuser" class="addon-message-last-message-user">{{ 'addon.messages.you' | translate }}</span>
+                <core-format-text clean="true" singleLine="true" [text]="result.lastmessage" class="addon-message-last-message-text"></core-format-text>
+            </p>
+        </a>
 
-    <!-- Load more button for contacts and non-contacts -->
-    <ng-container *ngIf="item.type != 'messages'">
-        <div padding-horizontal *ngIf="item.canLoadMore && !item.loadingMore">
-            <button ion-button block color="light" (click)="search(query, item.type)">
-                {{ 'core.loadmore' | translate }}
-            </button>
-        </div>
-        <div *ngIf="item.loadingMore" padding text-center>
-            <ion-spinner></ion-spinner>
-        </div>
+        <!-- Load more button for contacts and non-contacts -->
+        <ng-container *ngIf="item.type != 'messages'">
+            <div padding-horizontal *ngIf="item.canLoadMore && !item.loadingMore">
+                <button ion-button block color="light" (click)="search(query, item.type)">
+                    {{ 'core.loadmore' | translate }}
+                </button>
+            </div>
+            <div *ngIf="item.loadingMore" padding text-center>
+                <ion-spinner></ion-spinner>
+            </div>
+        </ng-container>
     </ng-container>
 </ng-template>
\ No newline at end of file
diff --git a/src/addon/messages/pages/search/search.ts b/src/addon/messages/pages/search/search.ts
index 6e51b1e20..892b26c28 100644
--- a/src/addon/messages/pages/search/search.ts
+++ b/src/addon/messages/pages/search/search.ts
@@ -38,7 +38,6 @@ export class AddonMessagesSearchPage implements OnDestroy {
     contacts = {
         type: 'contacts',
         titleString: 'addon.messages.contacts',
-        emptyString: 'addon.messages.searchnocontactsfound',
         results: [],
         canLoadMore: false,
         loadingMore: false
@@ -46,7 +45,6 @@ export class AddonMessagesSearchPage implements OnDestroy {
     nonContacts = {
         type: 'noncontacts',
         titleString: 'addon.messages.noncontacts',
-        emptyString: 'addon.messages.searchnononcontactsfound',
         results: [],
         canLoadMore: false,
         loadingMore: false
@@ -54,7 +52,6 @@ export class AddonMessagesSearchPage implements OnDestroy {
     messages = {
         type: 'messages',
         titleString: 'addon.messages.messages',
-        emptyString: 'addon.messages.searchnomessagesfound',
         results: [],
         canLoadMore: false,
         loadingMore: false,
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 55d53bf21..c8a128106 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -216,9 +216,6 @@
     "addon.messages.requests": "Requests",
     "addon.messages.requirecontacttomessage": "You need to request {{$a}} to add you as a contact to be able to message them.",
     "addon.messages.searchcombined": "Search people and messages",
-    "addon.messages.searchnocontactsfound": "No contacts found",
-    "addon.messages.searchnomessagesfound": "No messages found",
-    "addon.messages.searchnononcontactsfound": "No non contacts found",
     "addon.messages.selfconversation": "Personal space",
     "addon.messages.selfconversationdefaultmessage": "Save draft messages, links, notes etc. to access later.",
     "addon.messages.sendcontactrequest": "Send contact request",