diff --git a/plugins/tracker-assets/lang/en.json b/plugins/tracker-assets/lang/en.json
index d2ab5cd5ab..06c8d10eb4 100644
--- a/plugins/tracker-assets/lang/en.json
+++ b/plugins/tracker-assets/lang/en.json
@@ -22,7 +22,7 @@
"InProgress": "In Progress",
"Done": "Done",
"Canceled": "Canceled",
- "SetStatus": "Set status...",
+ "SetStatus": "Set status\u2026",
"Priority": "Priority",
"NoPriority": "No priority",
"Urgent": "Urgent",
@@ -35,14 +35,15 @@
"Status": "",
"Number": "Number",
"Assignee": "Assignee",
- "Parent": "",
+ "Parent": "Set parent issue\u2026",
"BlockedBy": "",
"RelatedTo": "",
"Comments": "",
"Attachments": "",
- "Labels": "",
+ "Labels": "Labels",
+ "Project": "Project",
"Space": "",
- "DueDate": "",
+ "DueDate": "Set due date\u2026",
"Team": "",
"Issue": "",
"Document": "",
@@ -53,7 +54,5 @@
"IssueDescriptionPlaceholder": "Add description",
"AddIssueTooltip": "Add issue..."
},
- "status": {
-
- }
-}
\ No newline at end of file
+ "status": {}
+}
diff --git a/plugins/tracker-assets/lang/ru.json b/plugins/tracker-assets/lang/ru.json
index 649767dc7e..b5fd71aab4 100644
--- a/plugins/tracker-assets/lang/ru.json
+++ b/plugins/tracker-assets/lang/ru.json
@@ -15,22 +15,44 @@
"Board": "Board",
"Projects": "Projects",
"CreateTeam": "Create team",
- "SaveIssue": "Save issue",
- "CreateMore": "Create more",
+ "NewIssue": "Новая задача",
+ "SaveIssue": "Сохранить задачу",
+ "CreateMore": "Создать еще",
"Todo": "Todo",
- "InProgress": "In Progress",
- "Done": "Done",
- "Canceled": "Canceled",
- "SetStatus": "Set status...",
- "Priority": "Priority",
- "NoPriority": "No priority",
- "Urgent": "Urgent",
- "High": "High",
- "Medium": "Medium",
- "Low": "Low",
- "AddIssueTooltip": "Добавить задачу..."
+ "InProgress": "В работе",
+ "Done": "Выполнено",
+ "Canceled": "Отменено",
+ "SetStatus": "Установить статус\u2026",
+ "Priority": "Установить приоритет",
+ "NoPriority": "Нет приоритета",
+ "Urgent": "Наивысший",
+ "High": "Высокий",
+ "Medium": "Средний",
+ "Low": "Низкий",
+ "AddIssueTooltip": "Добавить задачу\u2026",
+
+ "Title": "Заголовок",
+ "Description": "",
+ "Status": "",
+ "Number": "Number",
+ "Assignee": "Исполнитель",
+ "Parent": "Указать родительскую задачу\u2026",
+ "BlockedBy": "",
+ "RelatedTo": "",
+ "Comments": "",
+ "Attachments": "",
+ "Labels": "Метки",
+ "Project": "Проект",
+ "Space": "",
+ "DueDate": "Указать срок выполнения\u2026",
+ "Team": "",
+ "Issue": "",
+ "Document": "",
+ "DocumentIcon": "",
+ "DocumentColor": "",
+ "Rank": "",
+ "IssueTitlePlaceholder": "Имя задачи",
+ "IssueDescriptionPlaceholder": "Описание задачи"
},
- "status": {
-
- }
-}
\ No newline at end of file
+ "status": {}
+}
diff --git a/plugins/tracker-assets/src/index.ts b/plugins/tracker-assets/src/index.ts
index 32506ca5ee..0b75594561 100644
--- a/plugins/tracker-assets/src/index.ts
+++ b/plugins/tracker-assets/src/index.ts
@@ -31,6 +31,11 @@ loadMetadata(tracker.icon, {
NewIssue: `${icons}#newissue`,
Magnifier: `${icons}#magnifier`,
Home: `${icons}#home`,
+ Labels: `${icons}#priority-nopriority`, // TODO: add icon
+ MoreActions: `${icons}#priority-nopriority`, // TODO: add icon
+ DueDate: `${icons}#inbox`, // TODO: add icon
+ Parent: `${icons}#myissues`, // TODO: add icon
+
StatusBacklog: `${icons}#status-backlog`,
StatusTodo: `${icons}#status-todo`,
StatusInProgress: `${icons}#status-inprogress`,
diff --git a/plugins/tracker-resources/src/components/CreateIssue.svelte b/plugins/tracker-resources/src/components/CreateIssue.svelte
index 9f8f2705c9..51eb833f9f 100644
--- a/plugins/tracker-resources/src/components/CreateIssue.svelte
+++ b/plugins/tracker-resources/src/components/CreateIssue.svelte
@@ -13,26 +13,28 @@
// limitations under the License.
-->
@@ -132,42 +117,49 @@
kind={'large-style'}
focus
/>
-
-
-
+
+
+
-
diff --git a/plugins/tracker-resources/src/components/PrioritySelector.svelte b/plugins/tracker-resources/src/components/PrioritySelector.svelte
new file mode 100644
index 0000000000..1b5750a794
--- /dev/null
+++ b/plugins/tracker-resources/src/components/PrioritySelector.svelte
@@ -0,0 +1,53 @@
+
+
+
+ {
+ showPopup(
+ SelectPopup,
+ { value: prioritiesInfo, placeholder: tracker.string.SetStatus },
+ ev.currentTarget,
+ handlePriorityChange
+ )
+ }}
+/>
diff --git a/plugins/tracker-resources/src/components/SelectPopup.svelte b/plugins/tracker-resources/src/components/SelectPopup.svelte
index c5eadd681a..762c46a58e 100644
--- a/plugins/tracker-resources/src/components/SelectPopup.svelte
+++ b/plugins/tracker-resources/src/components/SelectPopup.svelte
@@ -15,26 +15,17 @@
+
+ {
+ showPopup(
+ SelectPopup,
+ { value: statusesInfo, placeholder: tracker.string.SetStatus, searchable: true },
+ ev.currentTarget,
+ handleStatusChange
+ )
+ }}
+/>
diff --git a/plugins/tracker-resources/src/plugin.ts b/plugins/tracker-resources/src/plugin.ts
index 6096978582..ca5b6f961c 100644
--- a/plugins/tracker-resources/src/plugin.ts
+++ b/plugins/tracker-resources/src/plugin.ts
@@ -31,6 +31,7 @@ export default mergeIds(trackerId, tracker, {
Active: '' as IntlString,
Backlog: '' as IntlString,
Board: '' as IntlString,
+ Project: '' as IntlString,
Projects: '' as IntlString,
CreateTeam: '' as IntlString,
NewIssue: '' as IntlString,
diff --git a/plugins/tracker-resources/src/utils.ts b/plugins/tracker-resources/src/utils.ts
index 7a8fe31cf4..a3de29dd64 100644
--- a/plugins/tracker-resources/src/utils.ts
+++ b/plugins/tracker-resources/src/utils.ts
@@ -16,10 +16,11 @@
import { Ref } from '@anticrm/core'
import type { Asset, IntlString } from '@anticrm/platform'
-import { Team } from '@anticrm/tracker'
+import { IssuePriority, IssueStatus, Team } from '@anticrm/tracker'
import { AnyComponent } from '@anticrm/ui'
import { LexoDecimal, LexoNumeralSystem36, LexoRank } from 'lexorank'
import LexoRankBucket from 'lexorank/lib/lexoRank/lexoRankBucket'
+import tracker from './plugin'
export interface NavigationItem {
id: string
@@ -61,3 +62,19 @@ export const calcRank = (prev?: { rank: string }, next?: { rank: string }): stri
return a.between(b).toString()
}
+
+export const issueStatuses: Record = {
+ [IssueStatus.Backlog]: { icon: tracker.icon.StatusBacklog, label: tracker.string.Backlog },
+ [IssueStatus.Todo]: { icon: tracker.icon.StatusTodo, label: tracker.string.Todo },
+ [IssueStatus.InProgress]: { icon: tracker.icon.StatusInProgress, label: tracker.string.InProgress },
+ [IssueStatus.Done]: { icon: tracker.icon.StatusDone, label: tracker.string.Done },
+ [IssueStatus.Canceled]: { icon: tracker.icon.StatusCanceled, label: tracker.string.Canceled }
+}
+
+export const issuePriorities: Record = {
+ [IssuePriority.NoPriority]: { icon: tracker.icon.PriorityNoPriority, label: tracker.string.NoPriority },
+ [IssuePriority.Urgent]: { icon: tracker.icon.PriorityUrgent, label: tracker.string.Urgent },
+ [IssuePriority.High]: { icon: tracker.icon.PriorityHigh, label: tracker.string.High },
+ [IssuePriority.Medium]: { icon: tracker.icon.PriorityMedium, label: tracker.string.Medium },
+ [IssuePriority.Low]: { icon: tracker.icon.PriorityLow, label: tracker.string.Low }
+}
diff --git a/plugins/tracker/src/index.ts b/plugins/tracker/src/index.ts
index 81d448335e..2aaced7d82 100644
--- a/plugins/tracker/src/index.ts
+++ b/plugins/tracker/src/index.ts
@@ -149,6 +149,10 @@ export default plugin(trackerId, {
NewIssue: '' as Asset,
Magnifier: '' as Asset,
Home: '' as Asset,
+ Labels: '' as Asset,
+ MoreActions: '' as Asset,
+ DueDate: '' as Asset,
+ Parent: '' as Asset,
StatusBacklog: '' as Asset,
StatusTodo: '' as Asset,