Client: fix loading server configurations

7 files changed, 74 insertions, 33 deletions

diff --git a/client/src/app/core/config/config.service.ts b/client/src/app/core/config/config.service.ts
deleted file mode 100644
index 3c479bcb8..000000000
--- a/client/src/app/core/config/config.service.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Injectable } from '@angular/core'
-import { HttpClient } from '@angular/common/http'
-
-import { ServerConfig } from '../../../../../shared'
-
-@Injectable()
-export class ConfigService {
-  private static BASE_CONFIG_URL = API_URL + '/api/v1/config/'
-
-  private config: ServerConfig = {
-    signup: {
-      allowed: false
-    }
-  }
-
-  constructor (private http: HttpClient) {}
-
-  loadConfig () {
-    this.http.get<ServerConfig>(ConfigService.BASE_CONFIG_URL)
-             .subscribe(data => this.config = data)
-  }
-
-  getConfig () {
-    return this.config
-  }
-}
diff --git a/client/src/app/core/config/index.ts b/client/src/app/core/config/index.ts
deleted file mode 100644
index 3724e12f2..000000000
--- a/client/src/app/core/config/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './config.service'
diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index 9ca94dd0e..fd1586f8e 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -8,7 +8,7 @@ import { SimpleNotificationsModule } from 'angular2-notifications'
 import { ModalModule } from 'ngx-bootstrap/modal'
 
 import { AuthService } from './auth'
-import { ConfigService } from './config'
+import { ServerService } from './server'
 import { ConfirmComponent, ConfirmService } from './confirm'
 import { MenuComponent, MenuAdminComponent } from './menu'
 import { throwIfAlreadyLoaded } from './module-import-guard'
@@ -41,7 +41,7 @@ import { throwIfAlreadyLoaded } from './module-import-guard'
   providers: [
     AuthService,
     ConfirmService,
-    ConfigService
+    ServerService
   ]
 })
 export class CoreModule {
diff --git a/client/src/app/core/index.ts b/client/src/app/core/index.ts
index 31322138f..8358261ae 100644
--- a/client/src/app/core/index.ts
+++ b/client/src/app/core/index.ts
@@ -1,5 +1,5 @@
 export * from './auth'
-export * from './config'
+export * from './server'
 export * from './confirm'
 export * from './menu'
 export * from './routing'
diff --git a/client/src/app/core/menu/menu.component.ts b/client/src/app/core/menu/menu.component.ts
index 669fc6572..8f15d8838 100644
--- a/client/src/app/core/menu/menu.component.ts
+++ b/client/src/app/core/menu/menu.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'
 import { Router } from '@angular/router'
 
 import { AuthService, AuthStatus } from '../auth'
-import { ConfigService } from '../config'
+import { ServerService } from '../server'
 
 @Component({
   selector: 'my-menu',
@@ -14,7 +14,7 @@ export class MenuComponent implements OnInit {
 
   constructor (
     private authService: AuthService,
-    private configService: ConfigService,
+    private serverService: ServerService,
     private router: Router
   ) {}
 
@@ -37,7 +37,7 @@ export class MenuComponent implements OnInit {
   }
 
   isRegistrationAllowed () {
-    return this.configService.getConfig().signup.allowed
+    return this.serverService.getConfig().signup.allowed
   }
 
   isUserAdmin () {
diff --git a/client/src/app/core/server/index.ts b/client/src/app/core/server/index.ts
new file mode 100644
index 000000000..224da121a
--- /dev/null
+++ b/client/src/app/core/server/index.ts
@@ -0,0 +1 @@
+export * from './server.service'
diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
new file mode 100644
index 000000000..f24df5a89
--- /dev/null
+++ b/client/src/app/core/server/server.service.ts
@@ -0,0 +1,67 @@
+import { Injectable } from '@angular/core'
+import { HttpClient } from '@angular/common/http'
+
+import { ServerConfig } from '../../../../../shared'
+
+@Injectable()
+export class ServerService {
+  private static BASE_CONFIG_URL = API_URL + '/api/v1/config/'
+  private static BASE_VIDEO_URL = API_URL + '/api/v1/videos/'
+
+  private config: ServerConfig = {
+    signup: {
+      allowed: false
+    }
+  }
+  private videoCategories: Array<{ id: number, label: string }> = []
+  private videoLicences: Array<{ id: number, label: string }> = []
+  private videoLanguages: Array<{ id: number, label: string }> = []
+
+  constructor (private http: HttpClient) {}
+
+  loadConfig () {
+    this.http.get<ServerConfig>(ServerService.BASE_CONFIG_URL)
+             .subscribe(data => this.config = data)
+  }
+
+  loadVideoCategories () {
+    return this.loadVideoAttributeEnum('categories', this.videoCategories)
+  }
+
+  loadVideoLicences () {
+    return this.loadVideoAttributeEnum('licences', this.videoLicences)
+  }
+
+  loadVideoLanguages () {
+    return this.loadVideoAttributeEnum('languages', this.videoLanguages)
+  }
+
+  getConfig () {
+    return this.config
+  }
+
+  getVideoCategories () {
+    return this.videoCategories
+  }
+
+  getVideoLicences () {
+    return this.videoLicences
+  }
+
+  getVideoLanguages () {
+    return this.videoLanguages
+  }
+
+  private loadVideoAttributeEnum (attributeName: 'categories' | 'licences' | 'languages', hashToPopulate: { id: number, label: string }[]) {
+    return this.http.get(ServerService.BASE_VIDEO_URL + attributeName)
+               .subscribe(data => {
+                 Object.keys(data)
+                       .forEach(dataKey => {
+                         hashToPopulate.push({
+                           id: parseInt(dataKey, 10),
+                           label: data[dataKey]
+                         })
+                       })
+               })
+  }
+}