r0b08x [chore] 3/24/2024, 8:45:45 AM

patrikx3 · Mar 24, 2024 · df7f31e · df7f31e
1 parent 5a6a949
commit df7f31e
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,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.153
+# 💿 The p3x-redis-ui-material web interface that connects to the p3x-redis-ui-server via http and socket.io v2024.4.154
 
 
 
@@ -77,7 +77,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.153
+[**P3X-REDIS-UI-MATERIAL**](https://corifeus.com/redis-ui-material) Build v2024.4.154
 
 [![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.153",
+    "version": "2024.4.154",
     "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-key-new-or-set.html b/src/angular/dialog/p3xr-dialog-key-new-or-set.html
@@ -130,6 +130,11 @@ <h2 flex md-truncate>
                         {{ $root.p3xr.strings.label.streamValue }}
                     </div>
 
+
+                    <div ng-if="valueType === 'object'" class="p3xr-md-input-container-bottom-info">
+                        {{ $root.p3xr.strings.label.isBuffer }}
+                    </div>
+
                     <md-input-container class="md-block">
                         <label>{{ $root.p3xr.strings.form.key.field.value }}</label>
                         <textarea ng-model="model.value" required p3x-validate-json

diff --git a/src/angular/dialog/p3xr-dialog-key-new-or-set.js b/src/angular/dialog/p3xr-dialog-key-new-or-set.js
@@ -79,6 +79,12 @@ p3xr.ng.factory('p3xrDialogKeyNewOrSet', function (p3xrCommon, $mdDialog, p3xrSo
                             if (options.hasOwnProperty('model')) {
                                 Object.assign($scope.model, options.model)
                             }
+
+                            Object.defineProperty($scope, 'valueType', {
+                                get: () => {
+                                    return typeof $scope.model.value
+                                }
+                            })
                             //console.warn($scope.model)
 
                             // Promise reject

diff --git a/src/angular/pages/main/key/p3xr-main-key-hash.js b/src/angular/pages/main/key/p3xr-main-key-hash.js
@@ -121,7 +121,7 @@ p3xr.ng.component('p3xrMainKeyHash', {
                     $event: options.$event,
                     model: {
                         type: 'hash',
-                        value: value,
+                        value: value.length < p3xr.settings.maxValueAsBuffer ? value : this.p3xrValueBuffer[hashKey],
                         hashKey: hashKey,
                         key: this.p3xrKey
                     }

diff --git a/src/angular/pages/main/key/p3xr-main-key-list.js b/src/angular/pages/main/key/p3xr-main-key-list.js
@@ -98,7 +98,7 @@ p3xr.ng.component('p3xrMainKeyList', {
                     $event: options.$event,
                     model: {
                         type: 'list',
-                        value: value,
+                        value: value.length < p3xr.settings.maxValueAsBuffer ?  value : this.p3xrValueBuffer[index],
                         index: options.index,
                         key: this.p3xrKey
                     }

diff --git a/src/angular/pages/main/key/p3xr-main-key-set.html b/src/angular/pages/main/key/p3xr-main-key-set.html
@@ -42,7 +42,7 @@
             </md-tooltip>
         </md-button>
 
-        <md-button class="md-icon-button md-primary" ng-click="$ctrl.editValue({ value: value, $event: $event})">
+        <md-button class="md-icon-button md-primary" ng-click="$ctrl.editValue({ $index: $index + (($ctrl.page -1) * $root.p3xr.settings.keyPageCount  ), value: value, $event: $event})">
             <md-tooltip>{{ $root.p3xr.strings.intention.edit }}</md-tooltip>
             <md-icon>edit</md-icon>
         </md-button>

diff --git a/src/angular/pages/main/key/p3xr-main-key-set.js b/src/angular/pages/main/key/p3xr-main-key-set.js
@@ -120,7 +120,7 @@ p3xr.ng.component('p3xrMainKeySet', {
                     $event: options.$event,
                     model: {
                         type: 'set',
-                        value: value,
+                        value: value.length < p3xr.settings.maxValueAsBuffer ?  value : this.p3xrValueBuffer[options.$index],
                         key: this.p3xrKey
                     }
                 })

diff --git a/src/angular/pages/main/key/p3xr-main-key-string.html b/src/angular/pages/main/key/p3xr-main-key-string.html
@@ -102,8 +102,15 @@
     <div ng-if="$ctrl.editable">
         <md-input-container class="md-block">
             <label>{{ $root.p3xr.strings.label.edit }}</label>
-            <textarea ng-model="$ctrl.p3xrValue" p3x-validate-json
+            <textarea ng-model="$ctrl.p3xrValue" ng-if="$ctrl.p3xrValue.length < $root.p3xr.settings.maxValueAsBuffer" p3x-validate-json
                       p3x-validate-json-required="validateJson"></textarea>
+            <span  ng-if="$ctrl.p3xrValue.length >= $root.p3xr.settings.maxValueAsBuffer">
+                <div class="p3xr-md-input-container-bottom-info">
+                    {{ $root.p3xr.strings.label.isBuffer }}
+                </div>
+                <textarea ng-model="$ctrl.p3xrValueBuffer" p3x-validate-json
+                    p3x-validate-json-required="validateJson"></textarea>
+            </span>                      
         </md-input-container>
     </div>
 </div>
diff --git a/src/angular/pages/main/key/p3xr-main-key-string.js b/src/angular/pages/main/key/p3xr-main-key-string.js
@@ -90,15 +90,27 @@ p3xr.ng.component('p3xrMainKeyString', {
         }
 
         this.editable = false;
+        this.buffer = false
         let originalValue
         this.edit = () => {
-            originalValue = angular.copy(this.p3xrValue)
+            if (this.p3xrValue.length < p3xr.settings.maxValueAsBuffer ) {
+                originalValue = angular.copy(this.p3xrValue) 
+                this.buffer = false
+            } else {
+                originalValue = angular.copy(this.p3xrValueBuffer)
+                this.buffer = true
+            }
             this.editable = true
         }
 
         this.cancelEdit = () => {
-            this.p3xrValue = originalValue
+            if (this.buffer === true) {
+                this.p3xrValueBuffer = originalValue
+            } else {
+                this.p3xrValue = originalValue
+            }
             this.editable = false
+            this.buffer = false
         }
 
 
@@ -108,7 +120,7 @@ p3xr.ng.component('p3xrMainKeyString', {
             try {
                 if (this.validateJson === true) {
                     try {
-                        JSON.parse(this.p3xrValue)
+                        JSON.parse(this.buffer ? this.p3xrValueBuffer : this.p3xrValue)
                     } catch (e) {
                         p3xrCommon.toast({
                             message: p3xr.strings.label.jsonViewNotParsable
@@ -121,7 +133,7 @@ p3xr.ng.component('p3xrMainKeyString', {
                     action: 'key-set',
                     payload: {
                         type: this.p3xrResponse.type,
-                        value: this.p3xrValue,
+                        value: this.buffer ? this.p3xrValueBuffer : this.p3xrValue,
                         key: this.p3xrKey,
                     }
                 })

diff --git a/src/angular/pages/main/key/p3xr-main-key-zset.html b/src/angular/pages/main/key/p3xr-main-key-zset.html
@@ -53,7 +53,7 @@
         </md-button>
 
         <md-button class="md-icon-button md-primary"
-                   ng-click="$ctrl.editValue({ score: value[0], member: value[1], $event: $event})">
+                   ng-click="$ctrl.editValue({ score: value[0], member: value[1], $event: $event,  $index: $index + (($ctrl.page -1) * $root.p3xr.settings.keyPageCount  )})">
             <md-tooltip>{{ $root.p3xr.strings.intention.edit }}</md-tooltip>
             <md-icon>edit</md-icon>
         </md-button>

diff --git a/src/angular/pages/main/key/p3xr-main-key-zset.js b/src/angular/pages/main/key/p3xr-main-key-zset.js
@@ -164,7 +164,7 @@ p3xr.ng.component('p3xrMainKeyZset', {
                     model: {
                         type: 'zset',
                         score: options.score,
-                        value: member,
+                        value: member.length < p3xr.settings.maxValueAsBuffer ?  member : this.p3xrValueBuffer[(options.$index * 2) ],
                         key: this.p3xrKey
                     }
                 })

diff --git a/src/core/settings.js b/src/core/settings.js
@@ -59,6 +59,7 @@ p3xr.settings = {
     },
     pageCount: 50,
     maxValueDisplay: 1024,
+    maxValueAsBuffer: 512 * 1024,
     maxValueDisplaySetting: {
       default: 1024,
       cookieName: 'p3xr-main-treecontrol-max-value-display'

diff --git a/src/strings/en/strings.js b/src/strings/en/strings.js
@@ -128,6 +128,7 @@ const strings = {
     quickConsole: "Quick Console",
   },
   label: {
+    isBuffer: "[object ArrayBuffer] means that the value is a binary buffer or the value is bigger than 0.5MB",
     streamValue: `Stream field and value is a oneliner. Eg.: field1 value1 "field 2" "value 2"`,
     streamTimestampId: `'*' means auto generated or the specification as <millisecondsTime>-<sequenceNumber>`,
     unableToLoadKey: ({ key }) => {

diff --git a/src/strings/ru/strings.js b/src/strings/ru/strings.js
@@ -131,6 +131,7 @@ const strings = {
     quickConsole: "Быстрый",
   },
   label: {
+    isBuffer: "[object ArrayBuffer] означает, что значение представляет собой двоичный буфер или значение превышает 0.5 МБ.",
     streamValue: `Поле и значение потока это однополосник. Например: поле1 значение1 "поле 2" "значение 2"`,
     streamTimestampId: `'*' означает автогенерацию или определяется как <millisecondsTime>-<sequenceNumber>`,
     unableToLoadKey: ({ key }) => {

diff --git a/src/strings/zn/strings.js b/src/strings/zn/strings.js
@@ -121,6 +121,7 @@ const strings = {
     quickConsole: "快的",
   },
   label: {
+    isBuffer: "[object ArrayBuffer] 表示該值是二進位緩衝區或該值大於 0.5MB",
     streamValue: `流字段和值是唯一的。 例如：field1 value1 "field 2" "value 2"`,
     streamTimestampId: `'*'表示自动生成或指定为<millisecondsTime>-<sequenceNumber>`,
     unableToLoadKey: ({ key }) => {