Merge remote-tracking branch 'upstream/develop' into localization-2

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [4.3.1](https://github.com/Ombi-app/Ombi/compare/v4.3.0...v4.3.1) (2021-10-27)
+
+
+### Bug Fixes
+
+* :bug: Hides no results message during search. ([#4375](https://github.com/Ombi-app/Ombi/issues/4375)) ([b819b0e](https://github.com/Ombi-app/Ombi/commit/b819b0e007e578bf3d8425f19591f87029c64d06))
+
+
+
 # [4.3.0](https://github.com/Ombi-app/Ombi/compare/v4.2.13...v4.3.0) (2021-10-20)
 
 
@@ -53,12 +62,3 @@
 
 
 
-## [4.2.10](https://github.com/Ombi-app/Ombi/compare/v4.2.9...v4.2.10) (2021-10-15)
-
-
-### Bug Fixes
-
-* :bug: Really really fix it this time? ([543d36e](https://github.com/Ombi-app/Ombi/commit/543d36e5615341bc8378cac377b843a3dbc1ef99))
-
-
-

src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.html

@@ -1,14 +1,13 @@
 <div class="small-middle-container" >
-
     <div *ngIf="loadingFlag" class="row justify-content-md-center top-spacing loading-spinner">
         <mat-spinner [color]="'accent'"></mat-spinner>
     </div>
-    <div *ngIf="discoverResults && discoverResults.length > 0" class="row full-height discoverResults col" >
+    <div *ngIf="discoverResults.length > 0" class="row full-height discoverResults col" >
         <div id="searchResults" class="col-xl-2 col-lg-3 col-md-3 col-6 col-sm-4 small-padding" *ngFor="let result of discoverResults" data-test="searchResultsCount" attr.search-count="{{discoverResults.length}}">
             <discover-card [isAdmin]="isAdmin" [result]="result"></discover-card>
         </div>
     </div>
-    <div *ngIf="!discoverResults || discoverResults.length === 0">
+    <div *ngIf="!loadingFlag && discoverResults.length === 0">
         <div class="row justify-content-md-center top-spacing loading-spinner">
             <h1 id="noSearchResult"> {{'Discovery.NoSearch' | translate}} <i class="far fa-frown" aria-hidden="true"></i></h1>
         </div>

src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.ts

@@ -50,7 +50,6 @@ export class DiscoverSearchResultsComponent implements OnInit {
             this.clear();
             this.loadAdvancedData();
         });
-
     }
 
     public async ngOnInit() {
@@ -79,8 +78,7 @@ export class DiscoverSearchResultsComponent implements OnInit {
         await this.search();
     }
 
-    public createInitalModel() {
-        this.finishLoading();
+    private createInitialModel() {
         this.results.forEach(m => {
 
             let mediaType = RequestType.movie;
@@ -119,6 +117,7 @@ export class DiscoverSearchResultsComponent implements OnInit {
                 tvMovieDb: mediaType === RequestType.tvShow ? true : false
             });
         });
+        this.finishLoading();
     }
 
     private loading() {
@@ -180,6 +179,6 @@ export class DiscoverSearchResultsComponent implements OnInit {
         this.clear();
         this.results = await this.searchService
             .multiSearch(this.searchTerm, this.filter).toPromise();
-        this.createInitalModel();
+        this.createInitialModel();
     }
 }

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "4.3.0"
+  "version": "4.3.1"
 }