fix js find method

Author: raagin

README.md

@@ -1,7 +1,7 @@
 # Django StreamField
 
 This is a simple realisation of StreamField's idea of Wagtail CMS for plain Django admin or with Grappelli skin.
-Stable version: 2.0.4
+Stable version: 2.0.5
 
 [Major changes (1.4.5 > 2)](changes2.0.md)
 

frontend/src/components/AbstractBlock.vue

@@ -1,4 +1,5 @@
 <script>
+    import {find} from '@/utils.js'
     import BlockHeader from '@/components/BlockHeader.vue'
     import BlockOptions from '@/components/BlockOptions.vue'
     import AddBlockHere from '@/components/AddBlockHere.vue'
@@ -19,10 +20,11 @@
                 return '/streamfield/abstract-block/' + this.model_name_lower + '/';
             },
             getContent() {
-                const block = this.$root.stream.find((o) => {return o.unique_id = this.block.unique_id})
-                window.ax.get(this.render_url(this.block)).then((response) => {
+                const block = find(this.$root.stream, {'unique_id': this.block.unique_id })
+                window.ax.get(this.render_url(block)).then((response) => {
                     this.$root.blocks[this.block.model_name] = response.data;
                 });
+
             }
         }
     }

frontend/src/components/App.vue

@@ -1,11 +1,9 @@
 <script type="text/javascript">
     import draggable from 'vuedraggable'
-    import {isArray, isEmpty} from '@/utils.js'
+    import {isArray, isEmpty, find} from '@/utils.js'
     import StreamBlock from '@/components/StreamBlock.vue'
     import AbstractBlock from '@/components/AbstractBlock.vue'
 
-    // const _ = require('lodash');
-
     let 
         text_area,
         delete_blocks_from_db,
@@ -100,11 +98,11 @@
                 if (this.model_info[block.model_name]) {
                     title = this.model_info[block.model_name].model_doc
                 }
-                return title;
+                return title
                 
             },
             getBlockIndex: function(block_unique_id) {
-                const block = this.stream.find(function(o) {return o.unique_id = block_unique_id})
+                const block = find(this.stream, {"unique_id": block_unique_id})
                 const index = this.stream.indexOf(block)
                 return [index, block]
             },
@@ -215,7 +213,7 @@
             <draggable v-model="stream" group="stream" handle=".block-move" item-key="unique_id">
                 <template #item="{element: block}">
                     <StreamBlock v-if="!isAbstract(block)" :block="block" :ref="block.unique_id"/>
-                    <AbstractBlock v-else :block="block" />
+                    <AbstractBlock v-else :block="block" :ref="block.unique_id" />
                 </template>
             </draggable>
             <div class="stream-insert-new-block">

frontend/src/utils.js

@@ -1,4 +1,9 @@
 const isArray = Array.isArray;
 const isEmpty = obj => [Object, Array].includes((obj || {}).constructor) && !Object.entries((obj || {})).length;
+const find = function(arr, obj) {
+  return arr.find((elem) => {
+    return obj && Object.keys(obj).every(key => elem[key] === obj[key]);
+  }) || arr[0];
+}
 
-export {isArray, isEmpty}
+export {isArray, isEmpty, find}

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="django-streamfield",
-    version="2.0.4",
+    version="2.0.5",
     author="Yury Lapshinov",
     author_email="y.raagin@gmail.com",
     description="StreamField for native Django Admin or with Grappelli",

streamfield/__init__.py

@@ -1,2 +1,2 @@
 name = "streamfield"
-VERSION = "2.0.4"
+VERSION = "2.0.5"