Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UBER-1144: Fixed estimation time representation used when creating issue and issue template #4139

Merged
merged 2 commits into from
Dec 5, 2023
Merged

UBER-1144: Fixed estimation time representation used when creating issue and issue template #4139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca990b1
UBER-1144: Fixed estimation time representation used when creating is…
anotherpit Dec 5, 2023
fafe5d0
UBER-1144: Revert some tests to make CI happy
anotherpit Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion plugins/tracker-assets/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion plugins/tracker-assets/lang/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@
"TimeSpendReportValue": "Затраченные дни",
"TimeSpendReportValueTooltip": "Затраченное время в человеко днях",
"TimeSpendReportDescription": "Описание",
"TimeSpendValue": "{value}d",
"TimeSpendDays": "{value}d",
"TimeSpendHours": "{value}h",
"TimeSpendMinutes": "{value}m",
Expand Down
7 changes: 4 additions & 3 deletions plugins/tracker-resources/src/components/issues/timereport/EstimationEditor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -81,16 +82,16 @@
<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}
{size}
{kind}
disabled={!isEditable}
on:click={handleestimationEditorOpened}
/>
>
<TimePresenter slot="content" value={value.estimation} />
</Button>
{/if}
{/if}
2 changes: 1 addition & 1 deletion plugins/tracker-resources/src/components/issues/timereport/TimePresenter.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
use:tooltip={{
component: Label,
props: {
label: tracker.string.TimeSpendValue,
label: tracker.string.TimeSpendHours,
params: { value }
}
}}
Expand Down
7 changes: 4 additions & 3 deletions plugins/tracker-resources/src/components/templates/EstimationEditor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -72,5 +71,7 @@
{kind}
disabled={!isEditable}
on:click={handleestimationEditorOpened}
/>
>
<TimePresenter slot="content" value={value.estimation} />
</Button>
{/if}
1 change: 0 additions & 1 deletion plugins/tracker-resources/src/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/sanity/tests/tracker/tracker.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ test.describe('Tracker tests', () => {
status: 'Todo',
priority: 'Urgent',
assignee: 'Appleseed John',
estimation: '1d',
estimation: '1h',
dueDate: '24'
})
})
Expand Down