2.0.4 Removed Lodash.js. Fixed Add New.

raagin · raagin · commit f1d593a9fc50 · 2023-04-02T14:59:08.000+03:00
diff --git a/README.md b/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.3
+Stable version: 2.0.4
 
 [Major changes (1.4.5 > 2)](changes2.0.md)
 
diff --git a/frontend/package.json b/frontend/package.json
@@ -12,6 +12,7 @@
   "license": "ISC",
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",
+    "@vue/compiler-sfc": "^3.2.47",
     "axios": "^1.3.4",
     "babel-loader": "^9.1.2",
     "clean-webpack-plugin": "^4.0.0",
@@ -20,7 +21,6 @@
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.5.0",
     "js-cookie": "^3.0.1",
-    "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^2.7.5",
     "sass": "^1.60.0",
     "sass-loader": "^13.2.2",
@@ -29,6 +29,7 @@
     "terser-webpack-plugin": "^5.3.7",
     "vue-loader": "^17.0.1",
     "vuedraggable": "^4.1.0",
+    "webpack": "^5.77.0",
     "webpack-cli": "^5.0.1"
   }
 }
diff --git a/frontend/src/components/AbstractBlock.vue b/frontend/src/components/AbstractBlock.vue
@@ -19,7 +19,7 @@
                 return '/streamfield/abstract-block/' + this.model_name_lower + '/';
             },
             getContent() {
-                let block = _.find(this.$root.stream, ['unique_id', this.block.unique_id]);
+                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) => {
                     this.$root.blocks[this.block.model_name] = response.data;
                 });
diff --git a/frontend/src/components/App.vue b/frontend/src/components/App.vue
@@ -1,47 +1,49 @@
 <script type="text/javascript">
-	import {isEmpty, isArray} from 'lodash'
-	import draggable from 'vuedraggable'
+    import draggable from 'vuedraggable'
+    import {isArray, isEmpty} from '@/utils.js'
     import StreamBlock from '@/components/StreamBlock.vue'
     import AbstractBlock from '@/components/AbstractBlock.vue'
 
-	let 
-		text_area,
-		delete_blocks_from_db,
-		popup_size;
+    // const _ = require('lodash');
 
-	function id_to_windowname(text) {
+    let 
+        text_area,
+        delete_blocks_from_db,
+        popup_size;
+
+    function id_to_windowname(text) {
         text = text.replace(/\./g, '__dot__');
         text = text.replace(/\-/g, '__dash__');
         return text;
     }
 
-	export default {
-		props: ['app_node'],
-		components: {
+    export default {
+        props: ['app_node'],
+        components: {
             draggable,
             StreamBlock,
             AbstractBlock
         },
         data () {
           return {
-          	blocks: {}, // save content of all instances
-	        show_help: false,
-	        show_add_block: false,
-	        will_removed: [], // blocks that will be removed from db
-	        stream: [], // [{model_name: ..., id: ...}, ...]
-	        model_info: {}, // {'model_name': model.__doc__},
+            blocks: {}, // save content of all instances
+            show_help: false,
+            show_add_block: false,
+            will_removed: [], // blocks that will be removed from db
+            stream: [], // [{model_name: ..., id: ...}, ...]
+            model_info: {}, // {'model_name': model.__doc__},
             base_admin_url: "",
-	        stream_texts: window.stream_texts
+            stream_texts: window.stream_texts
           }
         },
         beforeMount: function() {
-        	text_area = this.app_node.querySelector('textarea')
-		    delete_blocks_from_db = Boolean(text_area.hasAttribute('delete_blocks_from_db'))
-		    popup_size = text_area.dataset.popup_size ? JSON.parse(text_area.dataset.popup_size) : [1000, 500]
+            text_area = this.app_node.querySelector('textarea')
+            delete_blocks_from_db = Boolean(text_area.hasAttribute('delete_blocks_from_db'))
+            popup_size = text_area.dataset.popup_size ? JSON.parse(text_area.dataset.popup_size) : [1000, 500]
 
             this.base_admin_url = text_area.getAttribute('base_admin_url')
-		    this.stream = JSON.parse(text_area.innerHTML)
-	        this.model_info = JSON.parse(text_area.getAttribute('model_list_info'))
+            this.stream = JSON.parse(text_area.innerHTML)
+            this.model_info = JSON.parse(text_area.getAttribute('model_list_info'))
 
             if (this.stream.length && !this.stream[0].hasOwnProperty('collapsed')) {
                 this.setAllCollapsed(false)
@@ -89,7 +91,7 @@
             isEmpty: isEmpty,
             isArray: isArray,
             setAllCollapsed: function(value) {
-                _.forEach(this.stream, (v, k) => {
+                this.stream.forEach((v, k) => {
                     v.collapsed = value
                 })
             },
@@ -102,7 +104,7 @@
                 
             },
             getBlockIndex: function(block_unique_id) {
-                const block = _.find(this.stream, ['unique_id', block_unique_id])
+                const block = this.stream.find(function(o) {return o.unique_id = block_unique_id})
                 const index = this.stream.indexOf(block)
                 return [index, block]
             },
@@ -124,7 +126,6 @@
                         }
                     }    
                 }
-                
             },
             deleteInstance: function(block_unique_id, instance_id) {
                 let [block_index, block]  = this.getBlockIndex(block_unique_id)
@@ -151,7 +152,7 @@
                 let options = {};
                 let new_block;
 
-                _.forEach(this.model_info[model_name].options, (option, key) => {
+                Object.entries(this.model_info[model_name].options).forEach(([key, option],index) => {
                     options[key] = option.default;
                 });
                 new_block = {
@@ -181,19 +182,19 @@
         },
         watch: {
             stream: {
-            	handler(nv) {
-	            	text_area.innerHTML = JSON.stringify(nv.map(function(i){
-	                    // return only fields that in initial data
-	                    return {
+                handler(nv) {
+                    text_area.innerHTML = JSON.stringify(nv.map(function(i){
+                        // return only fields that in initial data
+                        return {
                             unique_id: i.unique_id,
                             model_name: i.model_name, 
                             id: i.id,
                             options: i.options,
                             collapsed: i.collapsed
                         };
-	                }));	
-				},
-				deep: true	
+                    }));    
+                },
+                deep: true    
             }
         }
     }
@@ -212,10 +213,10 @@
 
         <div class="streamfield-models">
             <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"/>
+                <template #item="{element: block}">
+                    <StreamBlock v-if="!isAbstract(block)" :block="block" :ref="block.unique_id"/>
                     <AbstractBlock v-else :block="block" />
-	            </template>
+                </template>
             </draggable>
             <div class="stream-insert-new-block">
                 <div class="add-new-block-button" @click="show_add_block=!show_add_block" v-text="stream_texts['AddNewBlock']"></div>
diff --git a/frontend/src/components/BlockOptions.vue b/frontend/src/components/BlockOptions.vue
@@ -1,5 +1,4 @@
 <script>
-    import {isEmpty} from 'lodash'
     export default {
         props: ['block']
     }
diff --git a/frontend/src/components/StreamBlock.vue b/frontend/src/components/StreamBlock.vue
@@ -12,7 +12,7 @@
         },
         components: { draggable, BlockOptions, BlockHeader, AddBlockHere },
         beforeMount: function() {
-            if (_.isArray(this.block.id)) {
+            if (this.$root.isArray(this.block.id)) {
                 for (var j = this.block.id.length - 1; j >= 0; j--) {
                     this.updateBlock(this.block.id[j].toString());
                 }
@@ -37,7 +37,7 @@
                         '&app_id=' + this.$root.app_node.id;
             },
             getBlockTitle: function(block, item_id) {
-                if (!_.isNumber(item_id) && _.isNumber(item_id[0])) {
+                if (!Number.isInteger(item_id) && Number.isInteger(item_id[0])) {
                     item_id = item_id[0]
                 }
                 let block_data = this.$root.blocks[this.instance_unique_id(block, item_id)]
@@ -62,12 +62,12 @@
 
                 // if added new instance – add new instance id to block list
                 let instance_id_int = parseInt(instance_id)
-                if (_.isArray(this.block.id) &&  this.block.id.indexOf(instance_id_int) == -1) {
+                if (this.$root.isArray(this.block.id) &&  this.block.id.indexOf(instance_id_int) == -1) {
                     this.block.id.push(instance_id_int);
                 }
 
                 // if added new instance to block without list
-                if ( !_.isArray(this.block.id) && this.block.id == -1 ) {
+                if ( !this.$root.isArray(this.block.id) && this.block.id == -1 ) {
                     this.block.id = instance_id_int;
                 }
 
@@ -143,7 +143,7 @@
                     <template v-else>
                         <a class="stream-btn" 
                         :id="'add_id_' + block.unique_id"
-                        title="$root.stream_texts['AddContent']"
+                        :title="$root.stream_texts['AddContent']"
                         :href="get_add_model_link(block)"
                         @click.prevent="$root.openPopup"
                         v-text="'+' + $root.stream_texts['AddContent']"
diff --git a/frontend/src/utils.js b/frontend/src/utils.js
@@ -0,0 +1,4 @@
+const isArray = Array.isArray;
+const isEmpty = obj => [Object, Array].includes((obj || {}).constructor) && !Object.entries((obj || {})).length;
+
+export {isArray, isEmpty}
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="django-streamfield",
-    version="2.0.3",
+    version="2.0.4",
     author="Yury Lapshinov",
     author_email="y.raagin@gmail.com",
     description="StreamField for native Django Admin or with Grappelli",
diff --git a/streamfield/__init__.py b/streamfield/__init__.py
@@ -1,2 +1,2 @@
 name = "streamfield"
-VERSION = "2.0.3"
+VERSION = "2.0.4"
diff --git a/streamfield/fields.py b/streamfield/fields.py
@@ -57,7 +57,9 @@ class Media:
 # form field
 class StreamFormField(forms.JSONField):
     def prepare_value(self, value):
-        return super().prepare_value(value.value)
+        if isinstance(value, StreamObject):
+            value = value.value
+        return super().prepare_value(value)
 
 # main field
 class StreamField(Field):
diff --git a/streamfield/static/streamfield/streamfield_widget.js b/streamfield/static/streamfield/streamfield_widget.js

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<script>`
`2`		`- import {isEmpty} from 'lodash'`
`3`	`2`	`export default {`
`4`	`3`	`props: ['block']`
`5`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`name = "streamfield"`
`2`		`-VERSION = "2.0.3"`
	`2`	`+VERSION = "2.0.4"`