r0b08x [chore] 3/8/2024, 2:31:19 PM

patrikx3 · Mar 8, 2024 · cc8390f · cc8390f
1 parent 4d291cb
commit cc8390f
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ https://corifeus.com/redis-ui
 
 
 ---
-# 💿 The p3x-redis-ui-material web interface that connects to the p3x-redis-ui-server via http and socket.io v2024.4.126
+# 💿 The p3x-redis-ui-material web interface that connects to the p3x-redis-ui-server via http and socket.io v2024.4.127
 
 
 
@@ -79,7 +79,7 @@ All my domains ([patrikx3.com](https://patrikx3.com) and [corifeus.com](https://
 
 ---
 
-[**P3X-REDIS-UI-MATERIAL**](https://corifeus.com/redis-ui-material) Build v2024.4.126
+[**P3X-REDIS-UI-MATERIAL**](https://corifeus.com/redis-ui-material) Build v2024.4.127
 
 [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "p3x-redis-ui-material",
-    "version": "2024.4.126",
+    "version": "2024.4.127",
     "description": "💿 The p3x-redis-ui-material web interface that connects to the p3x-redis-ui-server via http and socket.io",
     "corifeus": {
         "icon": "fas fa-database",

diff --git a/src/angular/dialog/p3xr-dialog-connection.js b/src/angular/dialog/p3xr-dialog-connection.js
@@ -197,11 +197,10 @@ p3xr.ng.factory('p3xrDialogConnection', function (p3xrCommon, $mdDialog, p3xrSoc
 
                             try {
 
-                                const cloneDeep = require('lodash/cloneDeep')
                                 const response = await p3xrSocket.request({
                                     action: 'connection-save',
                                     payload: {
-                                        model: cloneDeep($scope.model)
+                                        model: global.p3xr.clone($scope.model)
                                     },
                                 })
                                 p3xrCommon.toast({

diff --git a/src/angular/layout/p3xr-layout.js b/src/angular/layout/p3xr-layout.js
@@ -143,8 +143,7 @@ p3xr.ng.component('p3xrLayout', {
             //p3xr.state.search = '';
 
 
-            const cloneDeep = require('lodash/cloneDeep')
-            connection = cloneDeep(connection)
+            connection = global.p3xr.clone(connection)
             try {
                 const originalStateArr = location.pathname.split('/')
                 originalStateArr.shift()

diff --git a/src/angular/pages/main/key/p3xr-main-key-string.js b/src/angular/pages/main/key/p3xr-main-key-string.js
@@ -15,11 +15,10 @@ p3xr.ng.component('p3xrMainKeyString', {
             p3xrCommon.toast(p3xr.strings.status.dataCopied)
         }
 
-        const cloneDeep = require('lodash/cloneDeep')
         this.editable = false;
         let originalValue
         this.edit = () => {
-            originalValue = cloneDeep(this.p3xrValue)
+            originalValue = angular.copy(this.p3xrValue)
             this.editable = true
         }
 

diff --git a/src/angular/pages/main/p3xr-main-treecontrol.js b/src/angular/pages/main/p3xr-main-treecontrol.js
@@ -102,8 +102,7 @@ p3xr.ng.component('p3xrMainTree', {
                     message: p3xr.strings.confirm.deleteKey
                 })
 
-                // const cloneDeep = require('lodash/cloneDeep')
-                //const expandedNodes = cloneDeep($rootScope.expandedNodes);
+                //const expandedNodes = global.p3xr.clone($rootScope.expandedNodes);
 
                 await p3xrSocket.request({
                     action: 'delete',

diff --git a/src/angular/pages/p3xr-main.js b/src/angular/pages/p3xr-main.js
@@ -375,8 +375,7 @@ p3xr.ng.component('p3xrMain', {
                 withoutParent = false
             }
 
-            const cloneDeep = require('lodash/cloneDeep')
-            let expandedNodes = cloneDeep($rootScope.expandedNodes);
+            let expandedNodes = angular.copy($rootScope.expandedNodes);
 
             try {
                 /*

diff --git a/src/core/clone.js b/src/core/clone.js
@@ -0,0 +1,20 @@
+const cloneDeepWith = require('lodash/cloneDeepWith')
+const isObject = require('lodash/isObject')
+const transform = require('lodash/transform')
+
+function customizer(value) {
+    if (isObject(value)) {
+        // Remove keys that start with '$'
+        return transform(value, (result, val, key) => {
+            if (!key.startsWith('$')) {
+                result[key] = val;
+            }
+        });
+    }
+    // For other types, no custom behavior
+}
+
+p3xr.clone = (value) => {
+    console.warn('clone, executed', value)
+    return cloneDeepWith(value, customizer)
+}
diff --git a/src/main.js b/src/main.js
@@ -30,6 +30,7 @@ require('./core/state')
 require('./core/dom')
 require('./core/sort')
 require('./core/clipboard')
+require('./core/clone')
 
 require('./jquery/overlay')