diff --git a/models/server-tracker/src/index.ts b/models/server-tracker/src/index.ts index f7cffca933..d2e1681e18 100644 --- a/models/server-tracker/src/index.ts +++ b/models/server-tracker/src/index.ts @@ -32,4 +32,8 @@ export function createModel (builder: Builder): void { builder.createDoc(serverCore.class.Trigger, core.space.Model, { trigger: serverTracker.trigger.OnIssueUpdate }) + + builder.createDoc(serverCore.class.Trigger, core.space.Model, { + trigger: serverTracker.trigger.OnProjectRemove + }) } diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts index cda282c58e..ac88e688f5 100644 --- a/models/tracker/src/index.ts +++ b/models/tracker/src/index.ts @@ -56,7 +56,6 @@ import setting from '@hcengineering/setting' import tags, { TagElement } from '@hcengineering/tags' import task from '@hcengineering/task' import { - Document, Issue, IssueChildInfo, IssueParentInfo, @@ -343,28 +342,6 @@ export class TTimeSpendReport extends TAttachedDoc implements TimeSpendReport { @Prop(TypeString(), tracker.string.TimeSpendReportDescription) description!: string } -/** - * @public - */ -@Model(tracker.class.Document, core.class.Doc, DOMAIN_TRACKER) -@UX(tracker.string.Document, tracker.icon.Document, tracker.string.Document) -export class TDocument extends TDoc implements Document { - @Prop(TypeString(), tracker.string.Title) - @Index(IndexKind.FullText) - title!: string - - @Prop(TypeString(), tracker.string.DocumentIcon) - icon!: string | null - - @Prop(TypeString(), tracker.string.DocumentColor) - color!: number - - @Prop(TypeMarkup(), tracker.string.Description) - @Index(IndexKind.FullText) - content!: Markup - - declare space: Ref -} /** * @public @@ -394,9 +371,6 @@ export class TProject extends TDoc implements Project { @Prop(Collection(chunter.class.Comment), chunter.string.Comments) comments!: number - @Prop(Collection(tracker.class.Document), tracker.string.Document) - documents!: number - @Prop(Collection(attachment.class.Attachment), attachment.string.Attachments, { shortLabel: attachment.string.Files }) attachments?: number diff --git a/plugins/tracker-assets/lang/en.json b/plugins/tracker-assets/lang/en.json index 8ab90f37c7..d1d81fafab 100644 --- a/plugins/tracker-assets/lang/en.json +++ b/plugins/tracker-assets/lang/en.json @@ -109,6 +109,8 @@ "AddIssueTooltip": "Add issue...", "NewIssueDialogClose": "Do you want to close this dialog?", "NewIssueDialogCloseNote": "All changes will be lost", + "RemoveProjectDialogClose": "Delete the project?", + "RemoveProjectDialogCloseNote": "Are you sure you want to delete this project? This operation cannot be undone", "DueDatePopupTitle": "Due on {value}", "DueDatePopupOverdueTitle": "Was due on {value}", "DueDatePopupDescription": "{value, plural, =0 {Today} =1 {Tomorrow} other {# days remaining}}", diff --git a/plugins/tracker-assets/lang/ru.json b/plugins/tracker-assets/lang/ru.json index 68ee8b192d..f7756baa9c 100644 --- a/plugins/tracker-assets/lang/ru.json +++ b/plugins/tracker-assets/lang/ru.json @@ -109,6 +109,8 @@ "AddIssueTooltip": "Добавить задачу\u2026", "NewIssueDialogClose": "Вы действительно хотите закрыть окно?", "NewIssueDialogCloseNote": "Все внесенные изменения будут потеряны", + "RemoveProjectDialogClose": "Удалить проект?", + "RemoveProjectDialogCloseNote": "Уверены, что хотите удалить этот проект? Эта операция не может быть отменена", "DueDatePopupTitle": "Срок {value}", "DueDatePopupOverdueTitle": "Должна была завершится {value}", "DueDatePopupDescription": "{value, plural, =0 {Сегодня} =1 {Завтра} other {# дней осталось}}", diff --git a/plugins/tracker-resources/src/components/projects/DeleteProjectPresenter.svelte b/plugins/tracker-resources/src/components/projects/DeleteProjectPresenter.svelte new file mode 100644 index 0000000000..55142a1ae0 --- /dev/null +++ b/plugins/tracker-resources/src/components/projects/DeleteProjectPresenter.svelte @@ -0,0 +1,57 @@ + + + +{#if value} +