Merge branch 'qa-017-round3' into 'develop'

Qa 017 round3

See merge request !427

front/src/router/index.js

@@ -27,12 +27,10 @@ import Favorites from '@/components/favorites/List'
 import AdminSettings from '@/views/admin/Settings'
 import AdminLibraryBase from '@/views/admin/library/Base'
 import AdminLibraryFilesList from '@/views/admin/library/FilesList'
-import AdminLibraryRequestsList from '@/views/admin/library/RequestsList'
 import AdminUsersBase from '@/views/admin/users/Base'
 import AdminUsersDetail from '@/views/admin/users/UsersDetail'
 import AdminUsersList from '@/views/admin/users/UsersList'
 import AdminInvitationsList from '@/views/admin/users/InvitationsList'
-import MusicRequest from '@/views/library/MusicRequest'
 import FederationBase from '@/views/federation/Base'
 import FederationScan from '@/views/federation/Scan'
 import FederationLibraryDetail from '@/views/federation/LibraryDetail'
@@ -257,11 +255,6 @@ export default new Router({
           path: 'files',
           name: 'manage.library.files',
           component: AdminLibraryFilesList
-        },
-        {
-          path: 'requests',
-          name: 'manage.library.requests',
-          component: AdminLibraryRequestsList
         }
       ]
     },
@@ -292,11 +285,6 @@ export default new Router({
       component: Library,
       children: [
         { path: '', component: LibraryHome, name: 'library.index' },
-        {
-          path: 'requests/',
-          name: 'library.request',
-          component: MusicRequest
-        },
         {
           path: 'artists/',
           name: 'library.artists.browse',

front/src/views/admin/Settings.vue

@@ -79,7 +79,6 @@ export default {
       // somehow, extraction fails if in the return block directly
       let instanceLabel = this.$gettext('Instance information')
       let usersLabel = this.$gettext('Users')
-      let importsLabel = this.$gettext('Imports')
       let playlistsLabel = this.$gettext('Playlists')
       let federationLabel = this.$gettext('Federation')
       let subsonicLabel = this.$gettext('Subsonic')
@@ -105,13 +104,6 @@ export default {
             'users__upload_quota'
           ]
         },
-        {
-          label: importsLabel,
-          id: 'imports',
-          settings: [
-            'providers_youtube__api_key'
-          ]
-        },
         {
           label: playlistsLabel,
           id: 'playlists',

front/src/views/admin/library/Base.vue

@@ -4,15 +4,6 @@
       <router-link
         class="ui item"
         :to="{name: 'manage.library.files'}"><translate>Files</translate></router-link>
-      <router-link
-        class="ui item"
-        :to="{name: 'manage.library.requests'}">
-          <translate>Import requests</translate>
-          <div
-            :class="['ui', {'teal': $store.state.ui.notifications.importRequests > 0}, 'label']"
-            :title="labels.pendingRequests">
-            {{ $store.state.ui.notifications.importRequests }}</div>
-          </router-link>
     </div>
     <router-view :key="$route.fullPath"></router-view>
   </div>
@@ -23,10 +14,8 @@ export default {
   computed: {
     labels () {
       let title = this.$gettext('Manage library')
-      let pendingRequests = this.$gettext('Pending import requests')
       return {
-        title,
-        pendingRequests
+        title
       }
     }
   }

front/src/views/admin/library/RequestsList.vue

-<template>
-  <div v-title="labels.importRequests">
-    <div class="ui vertical stripe segment">
-      <h2 class="ui header"><translate>Import requests</translate></h2>
-      <div class="ui hidden divider"></div>
-      <library-requests-table></library-requests-table>
-    </div>
-  </div>
-</template>
-
-<script>
-import LibraryRequestsTable from '@/components/manage/library/RequestsTable'
-
-export default {
-  components: {
-    LibraryRequestsTable
-  },
-  computed: {
-    labels () {
-      return {
-        importRequests: this.$gettext('Import requests')
-      }
-    }
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>

front/src/views/content/libraries/Card.vue

@@ -36,8 +36,8 @@
           <i class="database icon"></i>
           {{ library.size | humanSize }}
         </span>
-        <i class="music icon"></i>
-        <translate :translate-params="{count: library.uploads_count}" :translate-n="library.uploads_count" translate-plural="%{ count } tracks">1 tracks</translate>
+        <i class="music icon"></i> {{ library.uploads_count }}
+        <translate :translate-params="{count: library.uploads_count}" :translate-n="library.uploads_count" translate-plural="%{ count } tracks">1 track</translate>
       </div>
     </div>
     <div class="ui bottom basic attached buttons">

front/src/views/library/MusicRequest.vue

-<template>
-  <div class="ui vertical stripe segment" v-title="labels.title">
-    <div class="ui small text container">
-      <h2 class="ui header">
-        <translate>Request some music</translate>
-      </h2>
-      <request-form v-if="$store.state.auth.authenticated"></request-form>
-    </div>
-  </div>
-</template>
-
-<script>
-import RequestForm from '@/components/requests/Form'
-
-export default {
-  components: {
-    RequestForm
-  },
-  computed: {
-    labels () {
-      let title = this.$gettext('Request some music')
-      return {
-        title
-      }
-    }
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>