Fix lable calculation on chart (close #1963)

application/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chipmunk",
-  "version": "3.10.2",
+  "version": "3.10.3",
   "description": "Logs analyzer tool",
   "author": "Dmitry Astafyev",
   "scripts": {

application/client/src/app/ui/views/toolbar/chart/cursor.ts

@@ -128,11 +128,10 @@ export class Cursor {
     public rowsRangeByX(x: number): IRange {
         const frame = this.to - this.from;
         const rate = this.width / frame;
+        const from = Math.floor(x / rate) + this.from;
         if (rate < 1) {
-            const from = Math.floor(x / rate) + this.from;
             return { from, to: from + Math.floor(frame / this.width) };
         } else {
-            const from = Math.floor(x / rate);
             return { from, to: from };
         }
     }

application/client/src/app/ui/views/toolbar/chart/cursor/styles.less

@@ -60,6 +60,7 @@
                 padding: 2px 4px;
                 border-radius: 2px;
                 top: 0;
+                z-index: 10;
             }
             &::before{
                 position: absolute;

application/client/src/app/ui/views/toolbar/chart/output/template.html

@@ -1,6 +1,11 @@
 <canvas #canvas [attr.width]="rect.width" [attr.height]="rect.height"></canvas>
 <span class="pointer" *ngIf="x !== undefined" [ngStyle]="{'left': x}">
-    <span class="label range" *ngIf="range !== undefined">{{range.from}} - {{range.to}}</span>
+    <span class="label range" *ngIf="((range !== undefined) && (range.from !== range.to))"
+        >{{range.from}} - {{range.to}}</span
+    >
+    <span class="label range" *ngIf="((range !== undefined) && (range.from === range.to))"
+        >{{range.from}}</span
+    >
     <span class="label" [ngStyle]="{'background': label.color}" *ngFor="let label of labels">
         <span class="wrapped" *ngIf="!label.candle">
             <span class="row">{{label.position}}:</span>
@@ -13,4 +18,4 @@
         </span>
     </span>
     <span class="label more" *ngIf="cutted !== 0">and more {{cutted}}</span>
-</span>
+</span>

application/holder/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chipmunk",
-    "version": "3.10.2",
+    "version": "3.10.3",
     "chipmunk": {
         "versions": {}
     },

changelog.md

@@ -1,3 +1,8 @@
+# 3.10.3 (10.11.2023)
+
+## Fixes
+- Fix labels on chart
+
 # 3.10.2 (30.10.2023)
 
 ## Fixes