From 28d896b3717c223187248daf0483da6c35ff19ef Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Fri, 14 Sep 2018 02:43:44 +0500
Subject: [PATCH] LIL-645

---
 web/src/components/CourseRedactor.vue      | 12 ++++++------
 web/src/components/blocks/BlockContent.vue | 12 ++++++------
 web/src/components/blocks/BlockImages.vue  |  6 +++---
 web/src/js/modules/api.js                  | 20 ++++++++++++++++++--
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/web/src/components/CourseRedactor.vue b/web/src/components/CourseRedactor.vue
index 0f5ae924..70a8971e 100644
--- a/web/src/components/CourseRedactor.vue
+++ b/web/src/components/CourseRedactor.vue
@@ -761,19 +761,19 @@
                             let remoteDataMapper = {}
                             if (courseData.content) {
                               courseData.content.forEach((contentElement) => {
-                                  remoteUUIDMapper[contentElement.uuid] = contentElement.data.id;
-                                  remoteDataMapper[contentElement.uuid] = contentElement.data;
+                                  remoteUUIDMapper[contentElement.uuid] = contentElement.id;
+                                  remoteDataMapper[contentElement.uuid] = contentElement;
                               })
                             }
 
                             this.course.content.forEach((contentElement, index) => {
-                                if (!contentElement.data.id) {
-                                    this.$set(this.course.content[index].data, 'id', remoteUUIDMapper[contentElement.uuid])
+                                if (!contentElement.id) {
+                                    this.$set(this.course.content[index], 'id', remoteUUIDMapper[contentElement.uuid])
                                 }
 
                                 if(contentElement.type === 'images') {
-                                    remoteDataMapper[contentElement.uuid].images.forEach((image, imageIndex) => {
-                                        this.$set(this.course.content[index].data.images[imageIndex], 'id', image.id)
+                                    remoteDataMapper[contentElement.uuid].gallery_images.forEach((image, imageIndex) => {
+                                        this.$set(this.course.content[index].gallery_images[imageIndex], 'id', image.id)
                                     })
                                 }
                             });
diff --git a/web/src/components/blocks/BlockContent.vue b/web/src/components/blocks/BlockContent.vue
index 08b57f33..eeb88314 100644
--- a/web/src/components/blocks/BlockContent.vue
+++ b/web/src/components/blocks/BlockContent.vue
@@ -5,21 +5,21 @@
       <block-text v-if="block.type === 'text'"
                   :index="index"
                   :title.sync="block.title"
-                  :text.sync="block.text"
+                  :text.sync="block.txt"
                   v-on:remove="onBlockRemoved"/>
       <block-image-text v-if="block.type === 'image-text'"
                         :index="index"
                         :title.sync="block.title"
-                        :text.sync="block.text"
-                        :image-id.sync="block.img.id"
-                        :image-url.sync="block.img.image_thumbnail"
+                        :text.sync="block.txt"
+                        :image-id.sync="block.img_id"
+                        :image-url.sync="block.img_thumbnail"
                         v-on:remove="onBlockRemoved"
                         :access-token="$root.store.accessToken"/>
       <block-image v-if="block.type === 'image'"
                    :index="index"
                    :title.sync="block.title"
-                   :image-id.sync="block.img.id"
-                   :image-url.sync="block.img.image_thumbnail"
+                   :image-id.sync="block.img_id"
+                   :image-url.sync="block.img_thumbnail"
                    v-on:remove="onBlockRemoved"
                    :access-token="$root.store.accessToken"/>
       <block-images v-if="block.type === 'images'"
diff --git a/web/src/components/blocks/BlockImages.vue b/web/src/components/blocks/BlockImages.vue
index 7fb8a004..ba2c14d4 100644
--- a/web/src/components/blocks/BlockImages.vue
+++ b/web/src/components/blocks/BlockImages.vue
@@ -59,12 +59,12 @@
                         console.log('images before before', JSON.stringify(images));
 
                         images.push({
-                            gallery,
+                            // gallery,
                             img_file: reader.result,
-                            img: {
+                            /*img: {
                                 id: null,
                                 image_thumbnail: '',
-                            },
+                            },*/
                             loading: true,
                         });
                         this.$emit('update:images', images);
diff --git a/web/src/js/modules/api.js b/web/src/js/modules/api.js
index 19108e38..9d28c6e2 100644
--- a/web/src/js/modules/api.js
+++ b/web/src/js/modules/api.js
@@ -232,7 +232,7 @@ export const api = {
             }
             return 0;
         }).map(block => {
-            const templates = {
+            /*const templates = {
                 image: {
                     img: {},
                 },
@@ -252,7 +252,23 @@ export const api = {
             }
             return Object.assign({
                 type: '', id: null, uuid: '', title: '',
-            }, templates[block.type], block);
+            }, templates[block.type], block);*/
+            let data = Object.assign({}, block);
+            if(data.type == 'image' || data.type == 'image-text'){
+                data.img_id = data.img.id;
+                data.img_thumbnail = data.img.image_thumbnail;
+                delete data.img;
+            }
+            else if(data.type === 'images'){
+                data.gallery_images = data.gallery_images.map(galleryImage => {
+                    return {
+                        'id': galleryImage.id ? galleryImage.id : null,
+                        'img_id': galleryImage.img.id,
+                        img_thumbnail: galleryImage.img.img_thumbnail,
+                    }
+                });
+            }
+            return data;
         });
     },
     addCourse: (courseJson, accessToken) => {