refactoring: atomic remove object from Manager list

src/cli/cms/data/file.js

@@ -178,7 +178,7 @@ export function getFileObject(pathFile) {
   const relativePath = pathFile.replace(pathData + '/', '')
 
   const parentName = cmsData.fileAttr.delete(name)
-  const parentRelativePath = cmsData.fileAttr.delete(pathFile).replace(config.root, '').replace(/^\/?.+?\//, '')
+  const parentRelativePath = cmsData.fileAttr.delete(pathFile).replace(pathData + '/', '')
 
   const fileData = cmsData.fileAttr.get(name)
 

src/cli/cms/operations/remove.js

@@ -12,7 +12,6 @@ import {
 
 
 export function remove(filePath) {
-  filePath = coreUtils.slug.clean(filePath)
   filePath = abeExtend.hooks.instance.trigger('beforeDeleteFile', filePath)
 
   var revisions = cmsData.revision.getVersions(filePath)
@@ -21,7 +20,7 @@ export function remove(filePath) {
     cmsOperations.remove.removeFile(revision.path, revision.htmlPath)
   })
 
-  Manager.instance.removePostInList(filePath)
+  Manager.instance.removePostFromList(filePath)
 }
 
 export function removeFile(file, json) {

src/cli/core/manager/Manager.js

@@ -196,8 +196,12 @@ class Manager {
     return this
   }
 
+  /**
+   * When a new post is created, this method is called so that the manager updates the list with this new item
+   * @param {String} pathFile The full path to the post
+   */
   addPostInList(pathFile){
-    const parentRelativePath = cmsData.fileAttr.delete(pathFile).replace(config.root, '').replace(/^\/?.+?\//, '')
+    const parentRelativePath = cmsData.fileAttr.delete(pathFile).replace(this._pathData + '/', '')
     const json = cmsData.file.get(pathFile)
     let merged = {}
     let rev = []
@@ -215,8 +219,12 @@ class Manager {
     this._list.sort(coreUtils.sort.predicatBy('date', -1))
   }
 
+  /**
+   * When a post is modified, this method is called so that the manager updates the list with the updated item
+   * @param {String} pathFile The full path to the post
+   */
   updatePostInList(pathFile){
-    const parentRelativePath = cmsData.fileAttr.delete(pathFile).replace(config.root, '').replace(/^\/?.+?\//, '')
+    const parentRelativePath = cmsData.fileAttr.delete(pathFile).replace(this._pathData + '/', '')
     const found = coreUtils.array.find(this._list, 'parentRelativePath', parentRelativePath)
     if(found.length > 0){
       const index = found[0]
@@ -236,14 +244,23 @@ class Manager {
     }
   }
 
-  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')
-    }
+  /**
+   * When a post is deleted, this method is called so that the manager updates the list with the removed item
+   * @param {String} pathFile The full path to the post
+   */
+  removePostFromList(pathFile){
+    let parentRelativePath = cmsData.fileAttr.delete(pathFile)
+    parentRelativePath = (pathFile.indexOf('/') === 0) ? parentRelativePath.substring(1):parentRelativePath
+    parentRelativePath = parentRelativePath.replace('.' + config.files.templates.extension, '.json')
+
+    this._list = coreUtils.array.removeByAttr(this._list, 'parentRelativePath', parentRelativePath)
   }
 
+  /**
+   * This method loads all posts into an array with values used in "select" statements from templates
+   * + abe_meta data
+   * @return {Array} Array of objects representing the posts including their revisions
+   */
   updateList() {
     this._list = cmsData.file.getAllWithKeys(this._whereKeys)
     this._list.sort(coreUtils.sort.predicatBy('date', -1))

src/cli/core/utils/array.js

@@ -1,19 +1,19 @@
 /**
  * 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  {string} attr the attribute to filter on
  * @param  {mixed} value the value to compare
  * @return {Array}       the filtered array
  */
-export function filter(arr, key, value) {
+export function filter(arr, attr, value) {
   var result = []
   var i = 0
   var len = arr.length
 
   for (; i < len; i += 1) {
     var elt = arr[i]
 
-    if (elt[key] == value) {
+    if (elt[attr] == value) {
       result.push(element)
     }
   }
@@ -23,21 +23,43 @@ export function filter(arr, key, value) {
 /**
  * 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  {string} attr the attribute to filter on
  * @param  {mixed} value the value to compare
  * @return {Array}       the filtered array of indexes
  */
-export function find(arr, key, value) {
+export function find(arr, attr, value) {
   var result = []
   var i = 0
   var len = arr.length
 
   for (; i < len; i += 1) {
     var elt = arr[i]
 
-    if (elt[key] == value) {
+    if (elt[attr] == value) {
       result.push(i)
     }
   }
   return result
 }
+
+/**
+ * Remove objects from an array given an attribute value
+ * @param  {Array} arr   the array of objects
+ * @param  {string} attr the attribute to filter on
+ * @param  {mixed} value the value to compare
+ * @return {Array}       the array with corresponding objects removed
+ */
+export function removeByAttr(arr, attr, value){
+  var i = arr.length
+  while (i--){
+    if(  
+      arr[i] && 
+      arr[i].hasOwnProperty(attr) &&
+      (arguments.length > 2 && arr[i][attr] === value )
+    ){
+      arr.splice(i,1)
+    }
+  }
+
+  return arr
+}