r0b08x [chore] 2/28/2024, 10:50:44 AM

patrikx3 · Feb 28, 2024 · a04c87b · a04c87b
1 parent b960d7e
commit a04c87b
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 16 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.121
+# 💿 The p3x-redis-ui-material web interface that connects to the p3x-redis-ui-server via http and socket.io v2024.4.122
 
 
 
@@ -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.121
+[**P3X-REDIS-UI-MATERIAL**](https://corifeus.com/redis-ui-material) Build v2024.4.122
 
 [![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.121",
+    "version": "2024.4.122",
     "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/pages/main/key/p3xr-main-key-hash.html b/src/angular/pages/main/key/p3xr-main-key-hash.html
@@ -17,8 +17,10 @@
 <div layout-gt-xs="row" layout="column" layout-align-gt-sm="start start" layout-align="center center" ng-repeat="(key, value) in $ctrl.pageBasedList()"
      ng-class="{ 'p3xr-list-key-odd-item': $odd }" class="p3xr-list-key-item">
     <div flex="20" ng-click="$ctrl.editValue({ hashKey: key, value: value, $event: $event})"><span ng-if="!$root.$mdMedia('xs')">&nbsp;</span><span ng-if="$root.p3xr.settings.maxValueDisplay > 0 && key.length > $root.p3xr.settings.maxValueDisplay">{{ key.substring(0, $root.p3xr.settings.maxValueDisplay) }}...</span><span ng-if="$root.p3xr.settings.maxValueDisplay === 0 || key.length <= $root.p3xr.settings.maxValueDisplay || $root.p3xr.settings.maxValueDisplay === -1 ">{{ key }}</span></div>
-    <div flex="60" class="p3xr-pre" style="overflow: auto;align-items: flex-start; max-height: 200px;"
-    ng-click="$ctrl.editValue({ hashKey: key, value: value, $event: $event})"><span ng-if="$root.p3xr.settings.maxValueDisplay > 0 && value.length > $root.p3xr.settings.maxValueDisplay">{{ value.substring(0, $root.p3xr.settings.maxValueDisplay) }}...</span><span ng-if="$root.p3xr.settings.maxValueDisplay === 0 || value.length <= $root.p3xr.settings.maxValueDisplay || $root.p3xr.settings.maxValueDisplay === -1 ">{{ value }}</span></div>
+    <div flex="60" style="overflow: auto;align-items: flex-start; max-height: 200px;" ng-click="$ctrl.editValue({ hashKey: key, value: value, $event: $event})">
+        <span class="p3xr-pre" ng-if="$root.p3xr.settings.maxValueDisplay > 0 && value.length > $root.p3xr.settings.maxValueDisplay">{{ value.substring(0, $root.p3xr.settings.maxValueDisplay) }}...</span>
+        <span class="p3xr-pre" ng-if="$root.p3xr.settings.maxValueDisplay === 0 || value.length <= $root.p3xr.settings.maxValueDisplay || $root.p3xr.settings.maxValueDisplay === -1 ">{{ value }}</span>
+    </div>
     <div flex="20" style="text-align: right; ">
 
         <md-button class="md-icon-button md-warn" ng-click="$ctrl.deleteHashKey({ hashKey: key, $event: $event})" ng-if="$root.p3xr.state.connection.readonly !== true">

diff --git a/src/angular/pages/main/key/p3xr-main-key-list.html b/src/angular/pages/main/key/p3xr-main-key-list.html
@@ -22,8 +22,10 @@
         <span ng-if="!$root.$mdMedia('xs')">&nbsp;</span>
         {{ $index + ($ctrl.pages * ($ctrl.page -1) ) }}
     </div>
-    <div flex="60" class="p3xr-pre" style="overflow: auto;align-items: flex-start; max-height: 200px;"
-         ng-click="$ctrl.editValue({ index: $index, value: value, $event: $event})"><span ng-if="$root.p3xr.settings.maxValueDisplay > 0 && value.length > $root.p3xr.settings.maxValueDisplay">{{ value.substring(0, $root.p3xr.settings.maxValueDisplay) }}...</span><span ng-if="$root.p3xr.settings.maxValueDisplay === 0 || value.length <= $root.p3xr.settings.maxValueDisplay|| $root.p3xr.settings.maxValueDisplay === -1 ">{{ value }}</span></div>
+    <div flex="60" style="overflow: auto;align-items: flex-start; max-height: 200px;" ng-click="$ctrl.editValue({ index: $index, value: value, $event: $event})">
+        <span class="p3xr-pre" ng-if="$root.p3xr.settings.maxValueDisplay > 0 && value.length > $root.p3xr.settings.maxValueDisplay">{{ value.substring(0, $root.p3xr.settings.maxValueDisplay) }}...</span>
+        <span class="p3xr-pre" ng-if="$root.p3xr.settings.maxValueDisplay === 0 || value.length <= $root.p3xr.settings.maxValueDisplay|| $root.p3xr.settings.maxValueDisplay === -1 ">{{ value }}</span>
+    </div>
     <div flex="20" style="text-align: right; ">
 
         <md-button class="md-icon-button md-warn" ng-click="$ctrl.deleteListElement({ index: $index, $event: $event})" ng-if="$root.p3xr.state.connection.readonly !== true">

diff --git a/src/angular/pages/main/key/p3xr-main-key-set.html b/src/angular/pages/main/key/p3xr-main-key-set.html
@@ -14,8 +14,10 @@
 
 <div layout-gt-xs="row" layout="column" layout-align-gt-sm="start start" layout-align="center center" ng-repeat="value in $ctrl.pageBasedList()"
      ng-class="{ 'p3xr-list-key-odd-item': $odd }" class="p3xr-list-key-item">
-    <div flex="95" class="p3xr-pre" style="padding-left: 3px; align-items: flex-start; max-height: 200px;"
-         ng-click="$ctrl.editValue({ value: value, $event: $event})"><span ng-if="$root.p3xr.settings.maxValueDisplay > 0 && value.length > $root.p3xr.settings.maxValueDisplay">{{ value.substring(0, $root.p3xr.settings.maxValueDisplay) }}...</span><span ng-if="$root.p3xr.settings.maxValueDisplay === 0 || value.length <= $root.p3xr.settings.maxValueDisplay || $root.p3xr.settings.maxValueDisplay === -1 ">{{ value }}</span></div>
+    <div flex="95" style="padding-left: 3px; align-items: flex-start; max-height: 200px; overflow: auto !important; " ng-click="$ctrl.editValue({ value: value, $event: $event})">
+        <span class="p3xr-pre" ng-if="$root.p3xr.settings.maxValueDisplay > 0 && value.length > $root.p3xr.settings.maxValueDisplay">{{ value.substring(0, $root.p3xr.settings.maxValueDisplay) }}...</span>
+        <span class="p3xr-pre" ng-if="$root.p3xr.settings.maxValueDisplay === 0 || value.length <= $root.p3xr.settings.maxValueDisplay || $root.p3xr.settings.maxValueDisplay === -1 ">{{ value }}</span>
+    </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">

diff --git a/src/angular/pages/main/key/p3xr-main-key-stream.html b/src/angular/pages/main/key/p3xr-main-key-stream.html
@@ -22,7 +22,9 @@
             <md-tooltip md-direction="top">{{  $ctrl.showTimestamp({ timestamp: value[0]})}}</md-tooltip>
         </span>
     </div>
-    <div flex="60" class="p3xr-pre" style="overflow: auto;align-items: flex-start;"><span ng-repeat="dataArr in $ctrl.p3xrValueGenerated[key]">{{ dataArr[0]}} <i class="fas fa-chevron-right" style="transform: scale(0.75) !important;"></i> {{ dataArr[1]}}<span ng-if="!$last"><br/></span></span></div>
+    <div flex="60" style="overflow: auto;align-items: flex-start;">
+        <span ng-repeat="dataArr in $ctrl.p3xrValueGenerated[key]"  class="p3xr-pre">{{ dataArr[0]}} <i class="fas fa-chevron-right" style="transform: scale(0.75) !important;"></i> {{ dataArr[1]}}<span ng-if="!$last"><br/></span></span>
+    </div>
     <div flex="20" style="text-align: right; ">
 
         <md-button class="md-icon-button md-warn" ng-click="$ctrl.deleteStreamTimestamp({ streamTimestamp: value[0], $event: $event})" ng-if="$root.p3xr.state.connection.readonly !== true">

diff --git a/src/angular/pages/main/key/p3xr-main-key-string.html b/src/angular/pages/main/key/p3xr-main-key-string.html
@@ -74,7 +74,12 @@
 </div>
 
 <div layout-padding>
-    <div class="p3xr-pre" style="max-width: 100%; overflow: auto;" ng-click="$ctrl.edit()" ng-if="!$ctrl.editable"><span ng-if="$root.p3xr.settings.maxValueDisplay > -1"><span ng-if="$root.p3xr.settings.maxValueDisplay > 0 && $ctrl.p3xrValue.length > $root.p3xr.settings.maxValueDisplay">{{ $ctrl.p3xrValue.substring(0, $root.p3xr.settings.maxValueDisplay) }}...</span><span ng-if="$root.p3xr.settings.maxValueDisplay === 0 || $ctrl.p3xrValue.length <= $root.p3xr.settings.maxValueDisplay">{{ $ctrl.p3xrValue }}</span></span></div>
+    <div style="max-width: 100%; overflow: auto;" ng-click="$ctrl.edit()" ng-if="!$ctrl.editable">
+        <span ng-if="$root.p3xr.settings.maxValueDisplay > -1">
+            <span class="p3xr-pre" ng-if="$root.p3xr.settings.maxValueDisplay > 0 && $ctrl.p3xrValue.length > $root.p3xr.settings.maxValueDisplay">{{ $ctrl.p3xrValue.substring(0, $root.p3xr.settings.maxValueDisplay) }}...</span>
+            <span class="p3xr-pre" ng-if="$root.p3xr.settings.maxValueDisplay === 0 || $ctrl.p3xrValue.length <= $root.p3xr.settings.maxValueDisplay">{{ $ctrl.p3xrValue }}</span>
+        </span>
+    </div>
 
     <div ng-if="$ctrl.editable">
         <md-input-container class="md-block">

diff --git a/src/angular/pages/main/key/p3xr-main-key-zset.html b/src/angular/pages/main/key/p3xr-main-key-zset.html
@@ -24,8 +24,10 @@
         <span ng-if="!$root.$mdMedia('xs')">&nbsp;</span>
         {{ value[0] }}
     </div>
-    <div flex="60" class="p3xr-pre" style="overflow: auto;align-items: flex-start; max-height: 200px;"
-         ng-click="$ctrl.editValue({ score: value[0], member: value[1], $event: $event})"><span ng-if="$root.p3xr.settings.maxValueDisplay > 0 && value[1].length > $root.p3xr.settings.maxValueDisplay">{{ value[1].substring(0, $root.p3xr.settings.maxValueDisplay) }}...</span><span ng-if="$root.p3xr.settings.maxValueDisplay === 0 || value[1].length <= $root.p3xr.settings.maxValueDisplay|| $root.p3xr.settings.maxValueDisplay === -1 ">{{ value[1] }}</span></div>
+    <div flex="60" style="overflow: auto;align-items: flex-start; max-height: 200px;" ng-click="$ctrl.editValue({ score: value[0], member: value[1], $event: $event})">
+        <span class="p3xr-pre" ng-if="$root.p3xr.settings.maxValueDisplay > 0 && value[1].length > $root.p3xr.settings.maxValueDisplay">{{ value[1].substring(0, $root.p3xr.settings.maxValueDisplay) }}...</span>
+        <span class="p3xr-pre" ng-if="$root.p3xr.settings.maxValueDisplay === 0 || value[1].length <= $root.p3xr.settings.maxValueDisplay|| $root.p3xr.settings.maxValueDisplay === -1 ">{{ value[1] }}</span>
+    </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">

diff --git a/src/scss/index.scss b/src/scss/index.scss
@@ -389,11 +389,13 @@ body.p3xr-no-animation * {
     line-height: 18px;
     overflow: hidden !important;
     //white-space: pre;
-    // white-space: pre-wrap;
-    word-wrap: break-word;
-    overflow-wrap: break-word;
+    white-space: pre-wrap;
+    //word-wrap: break-word !important;
+    //overflow-wrap: break-word !important;
    // white-space: pre-wrap;
     word-spacing: 0px;
+    //white-space: text-wrap;
+
 }