Merge branch 'master' of https://github.com/AdFabConnect/abejs into r…

…eference-editor

# Conflicts:
#	src/cli/core/manager/Manager.js

src/cli/cms/data/file.js

@@ -11,12 +11,19 @@ import {
 } from '../../'
 
 export function getAbeMeta(fileObject, json) {
+  const fileStatusIsPublish = cmsData.fileAttr.get(fileObject.cleanPath)
+
   if(json.abe_meta.latest.date != null) {
     fileObject.date = json.abe_meta.latest.date
     fileObject.cleanDate = moment(json.abe_meta.latest.date).format('YYYY/MM/DD HH:MM:ss')
   }
 
   if(json.abe_meta != null) {
+    if (json.abe_meta.status === 'publish') {
+      fileObject.htmlPath = path.join(config.root, config.publish.url, path.join('/', fileObject.filePath.replace(/\.json/, `.${config.files.templates.extension}`)))
+    }else {
+      fileObject.htmlPath = path.join(config.root, config.draft.url, path.join('/', fileObject.filePath.replace(/\.json/, `.${config.files.templates.extension}`)))
+    }
     var date = null
     if (json.abe_meta.latest.date !== null) {
       date = json.abe_meta.latest.date
@@ -28,9 +35,12 @@ export function getAbeMeta(fileObject, json) {
       type: (json.abe_meta.type != null) ? json.abe_meta.type : null,
       link: (json.abe_meta.link != null) ? json.abe_meta.link : null,
       template: (json.abe_meta.template != null) ? json.abe_meta.template : null,
-      status: (json.abe_meta.status != null) ? json.abe_meta.status : null,
       cleanName: (json.abe_meta.cleanName != null) ? json.abe_meta.cleanName : null,
-      cleanFilename: (json.abe_meta.cleanFilename != null) ? json.abe_meta.cleanFilename : null
+      cleanFilename: (json.abe_meta.cleanFilename != null) ? json.abe_meta.cleanFilename : null,
+      status: (json.abe_meta.status != null) ? json.abe_meta.status : null
+    }
+    if(fileStatusIsPublish.s != null && json.abe_meta.status === 'publish') {
+      fileObject.abe_meta.status = 'draft'
     }
   }
 
@@ -45,9 +55,8 @@ export function getAllWithKeys(withKeys) {
   let filesArr = []
 
   Array.prototype.forEach.call(files, (pathFile) => {
-    let fileObject = cmsData.file.getFileObject(pathFile)
     const json = cmsData.file.get(pathFile)
-
+    let fileObject = cmsData.file.getFileObject(pathFile)
     fileObject = cmsData.file.getAbeMeta(fileObject, json)
 
     Array.prototype.forEach.call(withKeys, (key) => {
@@ -163,6 +172,7 @@ export function getFilesByType(pathFile, type = null) {
 export function getFileObject(pathFile) {
   const pathData = path.join(config.root, config.data.url)
   const extension = '.json'
+  const templateExtension = '.' + config.files.templates.extension
 
   const name = path.basename(pathFile)
   const relativePath = pathFile.replace(pathData + '/', '')
@@ -182,6 +192,8 @@ export function getFileObject(pathFile) {
 
   const fileDate = moment(date)
   const duration = moment.duration(moment(fileDate).diff(new Date())).humanize(true)
+
+  const htmlUrl = path.join('/', relativePath.replace(extension, templateExtension))
 
   let fileObject = {
     'name': name,
@@ -192,7 +204,8 @@ export function getFileObject(pathFile) {
     'cleanDate': fileDate.format('YYYY/MM/DD HH:MM:ss'),
     'duration': duration,
     'cleanName': parentName,
-    'parentRelativePath': parentRelativePath
+    'parentRelativePath': parentRelativePath,
+    'html': htmlUrl
   }
 
   return fileObject

src/cli/cms/data/revision.js

@@ -103,6 +103,7 @@ export function getDocumentRevision(docPath) {
       result = revisions[0]
     }
   }
+
   return result
 }
 
@@ -135,24 +136,11 @@ export function filePathInfos(pathFolder) {
   }
 }
 
-export function getFilesMerged(files) {
-  var merged = {}
-  var arMerged = []
+export function mergeRevisions(files) {
+  let merged = {}
 
   Array.prototype.forEach.call(files, (file) => {
-    var parentRelativePath = file.parentRelativePath
-
-    var fileStatusIsPublish = cmsData.fileAttr.get(file.cleanPath)
-    if(fileStatusIsPublish.s != null && file.abe_meta.status === 'publish') {
-      file.abe_meta.status = 'draft'
-    }
-
-    file.html = path.join('/', file.filePath.replace(/\.json/, `.${config.files.templates.extension}`))
-    if (file.abe_meta.status === 'publish') {
-      file.htmlPath = path.join(config.root, config.publish.url, path.join('/', file.filePath.replace(/\.json/, `.${config.files.templates.extension}`)))
-    }else {
-      file.htmlPath = path.join(config.root, config.draft.url, path.join('/', file.filePath.replace(/\.json/, `.${config.files.templates.extension}`)))
-    }
+    const parentRelativePath = file.parentRelativePath
 
     if(merged[parentRelativePath] == null) {
       merged[parentRelativePath] = {
@@ -167,11 +155,15 @@ export function getFilesMerged(files) {
         revisions: []
       }
     }
-
     merged[parentRelativePath].revisions.push(JSON.parse(JSON.stringify(file)))
   })
 
-  // return merged
+  return merged
+}
+
+export function sortRevisions(merged) {
+  let sortedArray = []
+
   Array.prototype.forEach.call(Object.keys(merged), (key) => {
     var revisions = merged[key].revisions
 
@@ -203,8 +195,14 @@ export function getFilesMerged(files) {
     merged[key].duration = revisions[0].duration
     merged[key].abe_meta = revisions[0].abe_meta
 
-    arMerged.push(merged[key])
+    sortedArray.push(merged[key])
   })
 
-  return arMerged
+  return sortedArray
+}
+
+export function getFilesMerged(files) {
+  const revisions = cmsData.revision.mergeRevisions(files)
+
+  return cmsData.revision.sortRevisions(revisions)
 }

src/cli/cms/operations/create.js

@@ -13,11 +13,10 @@ var create = function(template, pathCreate, name, req, forceJson = {}, duplicate
   var p = new Promise((resolve, reject) => {
     abeExtend.hooks.instance.trigger('beforeCreate', template, pathCreate, name, req, forceJson)
 
-    var templatePath = path.join(template.replace(config.root, ''), config.templates.url, `${template}.${config.files.templates.extension}`)
+    var templatePath = path.join(config.root, config.templates.url, `${template}.${config.files.templates.extension}`)
     var filePath = path.join(pathCreate, name)
     filePath = coreUtils.slug.clean(filePath)
     filePath = path.join(config.root, config.draft.url, filePath.replace(config.root))
-
     if(templatePath !== null && filePath !== null) {
       var tplUrl = cmsData.file.fromUrl(filePath)
 
@@ -36,15 +35,15 @@ var create = function(template, pathCreate, name, req, forceJson = {}, duplicate
 
         abeExtend.hooks.instance.trigger('afterCreate', json, text, pathCreate, name, req, forceJson)
         cmsOperations.save.save(filePath, template, json, text, 'draft', null, 'draft')
-            .then((resSave) => {
-              Manager.instance.updateList()
-              filePath = resSave.htmlPath
-              tplUrl = cmsData.file.fromUrl(filePath)
-              resolve(resSave.json)
-            }).catch(function(e) {
-              reject()
-              console.error(e)
-            })
+          .then((resSave) => {
+            Manager.instance.addPostInList(resSave.jsonPath)
+            filePath = resSave.htmlPath
+            tplUrl = cmsData.file.fromUrl(filePath)
+            resolve(resSave.json)
+          }).catch(function(e) {
+            reject()
+            console.error(e)
+          })
       }else {
         json = cmsData.file.get(tplUrl.json.path)
         resolve(json, tplUrl.json.path)

src/cli/cms/operations/post.js

@@ -27,7 +27,7 @@ export function draft(filePath, tplPath, json, workflow = 'draft', type = 'draft
         }else if(typeof resSave.reject !== 'undefined' && resSave.reject !== null){
           result = resSave
         }else if(typeof resSave.json !== 'undefined' && resSave.json !== null){
-          Manager.instance.updateList()
+          Manager.instance.updatePostInList(resSave.jsonPath)
           result = {
             success: 1,
             json: resSave.json
@@ -84,7 +84,7 @@ export function publish(filePath, tplPath, json) {
             }
           }
           abeExtend.hooks.instance.trigger('afterPublish', result)
-          Manager.instance.updateList()
+          Manager.instance.updatePostInList(resSave.jsonPath)
           resolve(result)
         }).catch(function(e) {
           console.error('post.js', e)
@@ -128,10 +128,10 @@ export function unpublish(filePath) {
       null,
       'reject'
     )
-    .then(() => {
+    .then((resSave) => {
       cmsOperations.remove.removeFile(tplUrl.publish.path, tplUrl.publish.json)
       abeExtend.hooks.instance.trigger('afterUnpublish', tplUrl.publish.path, tplUrl.publish.json)
-      Manager.instance.updateList()
+      Manager.instance.updatePostInList(resSave.jsonPath)
     })
   }
 }
@@ -181,7 +181,7 @@ export function reject(filePath, tplPath, json) {
             }
           }
           abeExtend.hooks.instance.trigger('afterReject', result)
-          Manager.instance.updateList()
+          Manager.instance.updatePostInList(resSave.jsonPath)
           resolve(result)
         })
     }).catch(function(e) {

src/cli/cms/operations/remove.js

@@ -21,7 +21,7 @@ export function remove(filePath) {
     cmsOperations.remove.removeFile(revision.path, revision.htmlPath)
   })
 
-  Manager.instance.updateList()
+  Manager.instance.removePostInList(filePath)
 }
 
 export function removeFile(file, json) {

src/cli/core/manager/Manager.js

@@ -36,6 +36,7 @@ class Manager {
     this._pathTemplate = path.join(config.root, config.templates.url)
     this._pathStructure = path.join(config.root, config.structure.url)
     this._pathReference = path.join(config.root, config.reference.url)
+    this._pathData = path.join(config.root, config.data.url)
     this._watchersStart()
 
     this.updateStructureAndTemplates()
@@ -195,6 +196,54 @@ class Manager {
     return this
   }
 
+  addPostInList(pathFile){
+    const parentRelativePath = cmsData.fileAttr.delete(pathFile).replace(config.root, '').replace(/^\/?.+?\//, '')
+    const json = cmsData.file.get(pathFile)
+    let merged = {}
+    let rev = []
+    let revision = cmsData.file.getFileObject(pathFile)
+
+    revision = cmsData.file.getAbeMeta(revision, json)
+    Array.prototype.forEach.call(this._whereKeys, (key) => {
+      var keyFirst = key.split('.')[0]
+      revision[keyFirst] = json[keyFirst]
+    })
+    rev.push(revision)
+    merged = cmsData.revision.mergeRevisions(rev)
+    const sortedResult = cmsData.revision.sortRevisions(merged)
+    this._list.push(sortedResult[0])
+    this._list.sort(coreUtils.sort.predicatBy('date', -1))
+  }
+
+  updatePostInList(pathFile){
+    const parentRelativePath = cmsData.fileAttr.delete(pathFile).replace(config.root, '').replace(/^\/?.+?\//, '')
+    const found = coreUtils.array.find(this._list, 'parentRelativePath', parentRelativePath)
+    if(found.length > 0){
+      const index = found[0]
+      const json = cmsData.file.get(pathFile)
+      let merged = {}
+      merged[parentRelativePath] = this._list[index]
+      let revision = cmsData.file.getFileObject(pathFile)
+      revision = cmsData.file.getAbeMeta(revision, json)
+      Array.prototype.forEach.call(this._whereKeys, (key) => {
+        var keyFirst = key.split('.')[0]
+        revision[keyFirst] = json[keyFirst]
+      })
+      merged[parentRelativePath].revisions.push(JSON.parse(JSON.stringify(revision)))
+      const sortedResult = cmsData.revision.sortRevisions(merged)          
+      this._list[index] = sortedResult[0]
+      this._list.sort(coreUtils.sort.predicatBy('date', -1))
+    }
+  }
+
+  removePostInList(pathFile){
+    const parentRelativePath = cmsData.fileAttr.delete(pathFile).replace(config.root, '').replace(/^\/?.+?\//, '')
+    const found = coreUtils.array.find(this._list, 'parentRelativePath', parentRelativePath)
+    if(found.length > 0){
+      console.log('ok found')
+    }
+  }
+
   updateList() {
     this._list = cmsData.file.getAllWithKeys(this._whereKeys)
     this._list.sort(coreUtils.sort.predicatBy('date', -1))

src/cli/core/utils/array.js

@@ -0,0 +1,43 @@
+/**
+ * Highly efficient filter on a value in an object
+ * @param  {Array} arr   the array of objects
+ * @param  {string} key   the key to filter on
+ * @param  {mixed} value the value to compare
+ * @return {Array}       the filtered array
+ */
+export function filter(arr, key, value) {
+  var result = []
+  var i = 0
+  var len = arr.length
+
+  for (; i < len; i += 1) {
+    var elt = arr[i]
+
+    if (elt[key] == value) {
+      result.push(element)
+    }
+  }
+  return result
+}
+
+/**
+ * Highly efficient find indexes on a value in an property of an object
+ * @param  {Array} arr   the array of objects
+ * @param  {string} key   the key to filter on
+ * @param  {mixed} value the value to compare
+ * @return {Array}       the filtered array of indexes
+ */
+export function find(arr, key, value) {
+  var result = []
+  var i = 0
+  var len = arr.length
+
+  for (; i < len; i += 1) {
+    var elt = arr[i]
+
+    if (elt[key] == value) {
+      result.push(i)
+    }
+  }
+  return result
+}

src/cli/core/utils/index.js

@@ -1,13 +1,15 @@
+import * as array from './array'
 import * as sort from './sort'
 import * as text from './text'
 import locales from './locales'
 import * as slug from './slug'
 import * as file from './file'
 
 export {
-	sort
-	,text
-	,locales
-	,slug
-	,file
+  array,
+	sort,
+  text,
+  locales,
+  slug,
+  file
 }

src/server/views/partials/create-form-template.html

@@ -5,12 +5,12 @@
       <option></option>
       {{#each manager.list.templates}}
         {{#if isHome}}
-        <option value="{{path}}" clean-value="{{website}}">{{name}}</option>
+        <option value="{{name}}" clean-value="{{website}}">{{name}}</option>
         {{else}}
           {{#ifCond @root.json.abe_meta.template name}}
-          <option value="{{path}}" clean-value="{{website}}" selected="selected">{{name}}</option>
+          <option value="{{name}}" clean-value="{{website}}" selected="selected">{{name}}</option>
           {{else}}
-          <option value="{{path}}" clean-value="{{website}}">{{name}}</option>
+          <option value="{{name}}" clean-value="{{website}}">{{name}}</option>
           {{/ifCond}}
         {{/if}}
       {{/each}}