From 4b54f1360ebb5b1aeb70544981f2721e9a03f0bb Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 31 Aug 2018 17:32:35 +0200
Subject: [PATCH] Fix videos overview tags section

---
 client/src/app/menu/menu.component.scss             |  8 ++++----
 .../videos/video-list/video-overview.component.html |  4 ++--
 server/models/utils.ts                              | 13 ++++++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 8539c0e56..f8c7d8519 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -137,7 +137,7 @@ menu {
 
         &.icon-videos-subscriptions {
           position: relative;
-          top: -2px;
+          top: -1px;
           background-image: url('../../assets/images/menu/subscriptions.svg');
         }
 
@@ -148,23 +148,23 @@ menu {
 
         &.icon-videos-trending {
           position: relative;
-          top: -2px;
+          top: -1px;
           background-image: url('../../assets/images/menu/trending.svg');
         }
 
         &.icon-videos-recently-added {
           width: 23px;
           height: 23px;
-          position: relative;
-          top: -1px;
           background-image: url('../../assets/images/menu/recently-added.svg');
         }
 
         &.icon-videos-local {
           width: 23px;
           height: 23px;
+
           position: relative;
           top: -1px;
+
           background-image: url('../../assets/images/menu/home.svg');
         }
 
diff --git a/client/src/app/videos/video-list/video-overview.component.html b/client/src/app/videos/video-list/video-overview.component.html
index 84a4c70ee..be9db3d90 100644
--- a/client/src/app/videos/video-list/video-overview.component.html
+++ b/client/src/app/videos/video-list/video-overview.component.html
@@ -4,7 +4,7 @@
 
   <div class="section" *ngFor="let object of overview.categories">
     <div class="section-title" i18n>
-      <a routerLink="/search" [queryParams]="{ categoryOneOf: [ object.category.id ] }">Category {{ object.category.label }}</a>
+      <a routerLink="/search" [queryParams]="{ categoryOneOf: [ object.category.id ] }">{{ object.category.label }}</a>
     </div>
 
     <div>
@@ -14,7 +14,7 @@
 
   <div class="section" *ngFor="let object of overview.tags">
     <div class="section-title" i18n>
-      <a routerLink="/search" [queryParams]="{ categoryOneOf: [ object.category.id ] }">Tag {{ object.tag }}</a>
+      <a routerLink="/search" [queryParams]="{ tagOneOf: [ object.tag ] }">{{ object.tag }}</a>
     </div>
 
     <div>
diff --git a/server/models/utils.ts b/server/models/utils.ts
index edb8e1161..e0bf091ad 100644
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -4,7 +4,11 @@ type SortType = { sortModel: any, sortValue: string }
 
 // Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ]
 function getSort (value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
-  const { direction, field } = buildDirectionAndField(value)
+  let { direction, field } = buildDirectionAndField(value)
+
+  if (field.toLowerCase() === 'match') { // Search
+    field = Sequelize.col('similarity')
+  }
 
   return [ [ field, direction ], lastSort ]
 }
@@ -13,10 +17,9 @@ function getVideoSort (value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
   let { direction, field } = buildDirectionAndField(value)
 
   // Alias
-  if (field.toLowerCase() === 'match') field = Sequelize.col('similarity')
-
-  // Sort by aggregation
-  if (field.toLowerCase() === 'trending') {
+  if (field.toLowerCase() === 'match') { // Search
+    field = Sequelize.col('similarity')
+  } else if (field.toLowerCase() === 'trending') { // Sort by aggregation
     return [
       [ Sequelize.fn('COALESCE', Sequelize.fn('SUM', Sequelize.col('VideoViews.views')), '0'), direction ],