2 files changed, 43 insertions, 47 deletions

diff --git a/client/src/app/videos/shared/video.service.ts b/client/src/app/videos/shared/video.service.ts
index 7658d8ff0..dc12c0637 100644
--- a/client/src/app/videos/shared/video.service.ts
+++ b/client/src/app/videos/shared/video.service.ts
@@ -16,7 +16,13 @@ import {
   UserService
 } from '../../shared'
 import { Video } from './video.model'
-import { UserVideoRate, VideoRateType } from '../../../../../shared'
+import {
+  UserVideoRate,
+  VideoRateType,
+  VideoUpdate,
+  VideoAbuseCreate,
+  UserVideoRateUpdate
+} from '../../../../../shared'
 
 @Injectable()
 export class VideoService {
@@ -35,42 +41,15 @@ export class VideoService {
   ) {}
 
   loadVideoCategories () {
-    return this.http.get(VideoService.BASE_VIDEO_URL + 'categories')
-                    .map(this.restExtractor.extractDataGet)
-                    .subscribe(data => {
-                      Object.keys(data).forEach(categoryKey => {
-                        this.videoCategories.push({
-                          id: parseInt(categoryKey, 10),
-                          label: data[categoryKey]
-                        })
-                      })
-                    })
+    return this.loadVideoAttributeEnum('categories', this.videoCategories)
   }
 
   loadVideoLicences () {
-    return this.http.get(VideoService.BASE_VIDEO_URL + 'licences')
-                    .map(this.restExtractor.extractDataGet)
-                    .subscribe(data => {
-                      Object.keys(data).forEach(licenceKey => {
-                        this.videoLicences.push({
-                          id: parseInt(licenceKey, 10),
-                          label: data[licenceKey]
-                        })
-                      })
-                    })
+    return this.loadVideoAttributeEnum('licences', this.videoLicences)
   }
 
   loadVideoLanguages () {
-    return this.http.get(VideoService.BASE_VIDEO_URL + 'languages')
-                    .map(this.restExtractor.extractDataGet)
-                    .subscribe(data => {
-                      Object.keys(data).forEach(languageKey => {
-                        this.videoLanguages.push({
-                          id: parseInt(languageKey, 10),
-                          label: data[languageKey]
-                        })
-                      })
-                    })
+    return this.loadVideoAttributeEnum('languages', this.videoLanguages)
   }
 
   getVideo (id: string): Observable<Video> {
@@ -83,13 +62,14 @@ export class VideoService {
   updateVideo (video: Video) {
     const language = video.language ? video.language : null
 
-    const body = {
+    const body: VideoUpdate = {
       name: video.name,
       category: video.category,
       licence: video.licence,
       language,
       description: video.description,
-      tags: video.tags
+      tags: video.tags,
+      nsfw: video.nsfw
     }
 
     const headers = new Headers({ 'Content-Type': 'application/json' })
@@ -128,7 +108,7 @@ export class VideoService {
 
   reportVideo (id: string, reason: string) {
     const url = VideoService.BASE_VIDEO_URL + id + '/abuse'
-    const body = {
+    const body: VideoAbuseCreate = {
       reason
     }
 
@@ -161,7 +141,7 @@ export class VideoService {
 
   private setVideoRate (id: string, rateType: VideoRateType) {
     const url = VideoService.BASE_VIDEO_URL + id + '/rate'
-    const body = {
+    const body: UserVideoRateUpdate = {
       rating: rateType
     }
 
@@ -180,4 +160,17 @@ export class VideoService {
 
     return { videos, totalVideos }
   }
+
+  private loadVideoAttributeEnum (attributeName: 'categories' | 'licences' | 'languages', hashToPopulate: { id: number, label: string }[]) {
+    return this.http.get(VideoService.BASE_VIDEO_URL + attributeName)
+                    .map(this.restExtractor.extractDataGet)
+                    .subscribe(data => {
+                      Object.keys(data).forEach(dataKey => {
+                        hashToPopulate.push({
+                          id: parseInt(dataKey, 10),
+                          label: data[dataKey]
+                        })
+                      })
+                    })
+  }
 }
diff --git a/client/src/app/videos/video-edit/video-add.component.ts b/client/src/app/videos/video-edit/video-add.component.ts
index 0653f5ac4..5d6c0e0c7 100644
--- a/client/src/app/videos/video-edit/video-add.component.ts
+++ b/client/src/app/videos/video-edit/video-add.component.ts
@@ -16,6 +16,7 @@ import {
   VIDEO_TAGS
 } from '../../shared'
 import { VideoService } from '../shared'
+import { VideoCreate } from '../../../../../shared'
 
 @Component({
   selector: 'my-videos-add',
@@ -98,23 +99,25 @@ export class VideoAddComponent extends FormReactive implements OnInit {
       removeAfterUpload: true
     })
 
-    this.uploader.onBuildItemForm = (item, form) => {
-      const name = this.form.value['name']
-      const nsfw = this.form.value['nsfw']
-      const category = this.form.value['category']
-      const licence = this.form.value['licence']
-      const language = this.form.value['language']
-      const description = this.form.value['description']
-      const tags = this.form.value['tags']
+    this.uploader.onBuildItemForm = (item, form: FormData) => {
+      const formValue: VideoCreate = this.form.value
+
+      const name = formValue.name
+      const nsfw = formValue.nsfw
+      const category = formValue.category
+      const licence = formValue.licence
+      const language = formValue.language
+      const description = formValue.description
+      const tags = formValue.tags
 
       form.append('name', name)
-      form.append('category', category)
-      form.append('nsfw', nsfw)
-      form.append('licence', licence)
+      form.append('category', '' + category)
+      form.append('nsfw', '' + nsfw)
+      form.append('licence', '' + licence)
 
       // Language is optional
       if (language) {
-        form.append('language', language)
+        form.append('language', '' + language)
       }
 
       form.append('description', description)