From e50bdd461bd751ffc089dfbe7f220be742e84982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pete=20An=C3=B8ther?= <develop.pit@gmail.com>
Date: Mon, 4 Dec 2023 23:08:12 -0300
Subject: [PATCH] UBER-1144: Fixed estimation time representation used when
 creating issue and issue template (#4139)

---
 plugins/tracker-assets/lang/en.json                        | 1 -
 plugins/tracker-assets/lang/ru.json                        | 1 -
 .../components/issues/timereport/EstimationEditor.svelte   | 7 ++++---
 .../src/components/issues/timereport/TimePresenter.svelte  | 2 +-
 .../src/components/templates/EstimationEditor.svelte       | 7 ++++---
 plugins/tracker-resources/src/plugin.ts                    | 1 -
 tests/sanity/tests/tracker/tracker.spec.ts                 | 2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/plugins/tracker-assets/lang/en.json b/plugins/tracker-assets/lang/en.json
index 10639ae4d2..98b1d51a05 100644
--- a/plugins/tracker-assets/lang/en.json
+++ b/plugins/tracker-assets/lang/en.json
@@ -236,7 +236,6 @@
     "TimeSpendReportValue": "Spent time",
     "TimeSpendReportValueTooltip": "Spent time in hours",
     "TimeSpendReportDescription": "Description",
-    "TimeSpendValue": "{value}d",
     "TimeSpendDays": "{value}d",
     "TimeSpendHours": "{value}h",
     "TimeSpendMinutes": "{value}m",
diff --git a/plugins/tracker-assets/lang/ru.json b/plugins/tracker-assets/lang/ru.json
index 8714959fed..51ae37a851 100644
--- a/plugins/tracker-assets/lang/ru.json
+++ b/plugins/tracker-assets/lang/ru.json
@@ -236,7 +236,6 @@
     "TimeSpendReportValue": "Затраченные дни",
     "TimeSpendReportValueTooltip": "Затраченное время в человеко днях",
     "TimeSpendReportDescription": "Описание",
-    "TimeSpendValue": "{value}d",
     "TimeSpendDays": "{value}d",
     "TimeSpendHours": "{value}h",
     "TimeSpendMinutes": "{value}m",
diff --git a/plugins/tracker-resources/src/components/issues/timereport/EstimationEditor.svelte b/plugins/tracker-resources/src/components/issues/timereport/EstimationEditor.svelte
index 8035d2892f..ebaa13d3a9 100644
--- a/plugins/tracker-resources/src/components/issues/timereport/EstimationEditor.svelte
+++ b/plugins/tracker-resources/src/components/issues/timereport/EstimationEditor.svelte
@@ -23,6 +23,7 @@
   import tracker from '../../../plugin'
   import EstimationPopup from './EstimationPopup.svelte'
   import EstimationStatsPresenter from './EstimationStatsPresenter.svelte'
+  import TimePresenter from './TimePresenter.svelte'
 
   export let value: Issue | AttachedData<Issue> | IssueDraft
   export let isEditable: boolean = true
@@ -81,9 +82,7 @@
     <Button
       {focusIndex}
       showTooltip={isEditable ? { label: tracker.string.Estimation } : undefined}
-      label={tracker.string.TimeSpendValue}
       notSelected={value.estimation === 0}
-      labelParams={{ value: value.estimation }}
       icon={tracker.icon.DueDate}
       {justify}
       {width}
@@ -91,6 +90,8 @@
       {kind}
       disabled={!isEditable}
       on:click={handleestimationEditorOpened}
-    />
+    >
+      <TimePresenter slot="content" value={value.estimation} />
+    </Button>
   {/if}
 {/if}
diff --git a/plugins/tracker-resources/src/components/issues/timereport/TimePresenter.svelte b/plugins/tracker-resources/src/components/issues/timereport/TimePresenter.svelte
index bc80718ec4..0c41190a26 100644
--- a/plugins/tracker-resources/src/components/issues/timereport/TimePresenter.svelte
+++ b/plugins/tracker-resources/src/components/issues/timereport/TimePresenter.svelte
@@ -64,7 +64,7 @@
   use:tooltip={{
     component: Label,
     props: {
-      label: tracker.string.TimeSpendValue,
+      label: tracker.string.TimeSpendHours,
       params: { value }
     }
   }}
diff --git a/plugins/tracker-resources/src/components/templates/EstimationEditor.svelte b/plugins/tracker-resources/src/components/templates/EstimationEditor.svelte
index 24758bde0b..04e64ad682 100644
--- a/plugins/tracker-resources/src/components/templates/EstimationEditor.svelte
+++ b/plugins/tracker-resources/src/components/templates/EstimationEditor.svelte
@@ -20,6 +20,7 @@
   import { EditBoxPopup } from '@hcengineering/view-resources'
   import { createEventDispatcher } from 'svelte'
   import tracker from '../../plugin'
+  import TimePresenter from '../issues/timereport/TimePresenter.svelte'
 
   export let value: IssueTemplateChild | IssueTemplate | Data<IssueTemplate> | IssueDraft
   export let isEditable: boolean = true
@@ -62,8 +63,6 @@
 {#if value}
   <Button
     showTooltip={isEditable ? { label: tracker.string.Estimation } : undefined}
-    label={tracker.string.TimeSpendValue}
-    labelParams={{ value: value.estimation }}
     icon={tracker.icon.Estimation}
     notSelected={value.estimation === 0}
     {justify}
@@ -72,5 +71,7 @@
     {kind}
     disabled={!isEditable}
     on:click={handleestimationEditorOpened}
-  />
+  >
+    <TimePresenter slot="content" value={value.estimation} />
+  </Button>
 {/if}
diff --git a/plugins/tracker-resources/src/plugin.ts b/plugins/tracker-resources/src/plugin.ts
index 6dfe6e4580..9ca2b32e5a 100644
--- a/plugins/tracker-resources/src/plugin.ts
+++ b/plugins/tracker-resources/src/plugin.ts
@@ -268,7 +268,6 @@ export default mergeIds(trackerId, tracker, {
     TimeSpendReportDate: '' as IntlString,
     TimeSpendReportValue: '' as IntlString,
     TimeSpendReportDescription: '' as IntlString,
-    TimeSpendValue: '' as IntlString,
     TimeSpendDays: '' as IntlString,
     TimeSpendHours: '' as IntlString,
     TimeSpendMinutes: '' as IntlString,
diff --git a/tests/sanity/tests/tracker/tracker.spec.ts b/tests/sanity/tests/tracker/tracker.spec.ts
index cccb9e0139..93031d6cb4 100644
--- a/tests/sanity/tests/tracker/tracker.spec.ts
+++ b/tests/sanity/tests/tracker/tracker.spec.ts
@@ -306,7 +306,7 @@ test.describe('Tracker tests', () => {
       status: 'Todo',
       priority: 'Urgent',
       assignee: 'Appleseed John',
-      estimation: '1d',
+      estimation: '1h',
       dueDate: '24'
     })
   })