r0b08x [chore] 3/24/2024, 7:05:06 AM

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

Hide file tree

Showing 11 changed files with 48 additions and 8 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.150
+# 💿 The p3x-redis-ui-material web interface that connects to the p3x-redis-ui-server via http and socket.io v2024.4.153
 
 
 
@@ -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.150
+[**P3X-REDIS-UI-MATERIAL**](https://corifeus.com/redis-ui-material) Build v2024.4.153
 
 [![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.150",
+    "version": "2024.4.153",
     "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
@@ -82,6 +82,16 @@ <h2 flex md-truncate>
                         </span>
                     </span>
 
+
+                    <input type="file" id="p3xr-main-key-new-upload-buffer" style="display: none" onchange="angular.element(this).scope().readFileAsBuffer(event)"/>
+                    <md-button class="md-button md-raised md-primary" ng-click="setBufferUpload({ $event: $event})" ng-if="model.type !== 'stream'">
+                        <md-icon>upload</md-icon>
+                        <span hide-sm hide-xs>{{ $root.p3xr.strings.intention.setBuffer }}</span>
+                        <md-tooltip ng-if="$root.$mdMedia('sm') || $root.$mdMedia('xs')" md-direction="bottom">{{
+                            $root.p3xr.strings.intention.setBuffer }}
+                        </md-tooltip>
+                    </md-button>
+
                     <md-button class="md-button md-raised md-primary" ng-if="$root.p3xr.state.donated" ng-click="jsonEditor({ $event: $event, value: model.value})">
                         <i class="fas fa-file-alt"></i>
                         <span hide-sm hide-xs>{{ $root.p3xr.strings.intention.jsonViewEditor }}</span>

diff --git a/src/angular/dialog/p3xr-dialog-key-new-or-set.js b/src/angular/dialog/p3xr-dialog-key-new-or-set.js
@@ -11,6 +11,32 @@ p3xr.ng.factory('p3xrDialogKeyNewOrSet', function (p3xrCommon, $mdDialog, p3xrSo
                     const result = await $mdDialog.show({
                         controller: function ($scope, $mdDialog) {
 
+
+                            $scope.setBufferUpload = () => {
+                                const input = document.getElementById('p3xr-main-key-new-upload-buffer');
+                                input.value = ''; // Clear the input value
+                                input.click();
+                            }
+
+                            $scope.readFileAsBuffer = async (event) => {
+                                const file = event.target.files[0];
+                                if (!file) {
+                                    return;
+                                }
+                                const reader = new FileReader();
+                                reader.onload = async (loadEvent) => {
+
+                                    const arrayBuffer = loadEvent.target.result;                                
+                                    $scope.model.value = arrayBuffer            
+                                    console.log('buffer', $scope.model.value)            
+
+                                };
+                                reader.onerror = (error) => {
+                                    p3xrCommon.generalHandleError(error)
+                                } 
+                                reader.readAsArrayBuffer(file);
+                            }
+
                             $scope.jsonViewer = (options) => {
                                 p3xrDialogJsonView.show({
                                     event: options.$event,

diff --git a/src/angular/pages/main/key/p3xr-main-key-hash.html b/src/angular/pages/main/key/p3xr-main-key-hash.html
@@ -38,6 +38,8 @@
             <md-icon>content_copy</md-icon>
         </md-button>
 
+
+
         <md-button class="md-icon-button md-accent" ng-click="$ctrl.downloadBuffer({ key: key, $event: $event})">
             <md-icon>download</md-icon>
             <md-tooltip>{{ $root.p3xr.strings.intention.downloadBuffer }}

diff --git a/src/angular/pages/main/key/p3xr-main-key-set.html b/src/angular/pages/main/key/p3xr-main-key-set.html
@@ -20,7 +20,7 @@
     </div>
     <div flex="5" style="text-align: right; ">
 
-        <md-button class="md-icon-button md-warn" ng-click="$ctrl.deleteSetMember({ value: value, $event: $event})"  ng-if="$root.p3xr.state.connection.readonly !== true">
+        <md-button class="md-icon-button md-warn" ng-click="$ctrl.deleteSetMember({ $index: $index + (($ctrl.page -1) * $root.p3xr.settings.keyPageCount ), $event: $event})"  ng-if="$root.p3xr.state.connection.readonly !== true">
             <md-tooltip>{{ $root.p3xr.strings.intention.delete }}</md-tooltip>
             <md-icon>delete</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
@@ -103,7 +103,7 @@ p3xr.ng.component('p3xrMainKeySet', {
                     action: 'key-set-delete-member',
                     payload: {
                         key: this.p3xrKey,
-                        value: options.value,
+                        value: this.p3xrValueBuffer[options.$index],
                     }
                 })
                 $rootScope.$broadcast('p3xr-refresh-key');

diff --git a/src/angular/pages/main/key/p3xr-main-key-string.html b/src/angular/pages/main/key/p3xr-main-key-string.html
@@ -3,7 +3,7 @@
 
 
         <input type="file" id="p3xr-main-key-string-upload-buffer" style="display: none" onchange="angular.element(this).scope().readFileAsBuffer(event)"/>
-        <md-button class="md-button md-raised md-primary" ng-click="$ctrl.setBufferUpload({ $event: $event})">
+        <md-button class="md-button md-raised md-primary" ng-click="$ctrl.setBufferUpload({ $event: $event})"  ng-if="$root.p3xr.state.connection.readonly !== true">
             <md-icon>upload</md-icon>
             <span hide-sm hide-xs>{{ $root.p3xr.strings.intention.setBuffer }}</span>
             <md-tooltip ng-if="$root.$mdMedia('sm') || $root.$mdMedia('xs')" md-direction="bottom">{{

diff --git a/src/angular/pages/main/key/p3xr-main-key-zset.html b/src/angular/pages/main/key/p3xr-main-key-zset.html
@@ -30,7 +30,7 @@
     </div>
     <div flex="20" style="text-align: right; ">
 
-        <md-button class="md-icon-button md-warn" ng-click="$ctrl.deleteZSet({ member: value[1], $event: $event})" ng-if="$root.p3xr.state.connection.readonly !== true">
+        <md-button class="md-icon-button md-warn" ng-click="$ctrl.deleteZSet({ $index: $index + (($ctrl.page -1) * $root.p3xr.settings.keyPageCount), $event: $event})" ng-if="$root.p3xr.state.connection.readonly !== true">
             <md-tooltip>{{ $root.p3xr.strings.intention.delete }}</md-tooltip>
             <md-icon>delete</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
@@ -146,7 +146,7 @@ p3xr.ng.component('p3xrMainKeyZset', {
                     action: 'key-zset-delete-member',
                     payload: {
                         key: this.p3xrKey,
-                        value: options.member,
+                        value: this.p3xrValueBuffer[options.$index * 2 ],
                     }
                 })
                 $rootScope.$broadcast('p3xr-refresh-key');

diff --git a/src/angular/pages/p3xr-main.scss b/src/angular/pages/p3xr-main.scss
@@ -31,6 +31,8 @@ p3xr-main {
     }
 
     .p3xr-main-db-select {
+        position: relative;
+        top: -2px;
         .md-select-value {
             border-bottom: none !important;
         }