[TSK-1338] Update issue filters order (#3141)

Signed-off-by: Sergei Ogorelkov <sergei.ogorelkov@icloud.com>
2025-04-27 10:49:44 +00:00 · 2023-05-05 15:12:15 +04:00 · 2023-05-05 15:12:15 +04:00 · 1362b556d9
commit 1362b556d9
parent 2444992f19
19 changed files with 46 additions and 17 deletions
--- a/models/contact/src/index.ts
+++ b/models/contact/src/index.ts
@ -104,7 +104,7 @@ export class TContact extends TDoc implements Contact {
  @Index(IndexKind.FullText)
    city!: string

-  @Prop(TypeTimestamp(), contact.string.CreatedOn)
+  @Prop(TypeTimestamp(), contact.string.CreatedDate)
  @ReadOnly()
    createOn!: Timestamp
 }
--- a/models/contact/src/plugin.ts
+++ b/models/contact/src/plugin.ts
@ -77,7 +77,7 @@ export default mergeIds(contactId, contact, {
    TypeLabel: '' as IntlString,
    Homepage: '' as IntlString,
    Birthday: '' as IntlString,
-    CreatedOn: '' as IntlString,
+    CreatedDate: '' as IntlString,
    Whatsapp: '' as IntlString,
    WhatsappPlaceholder: '' as IntlString,
    Skype: '' as IntlString,
--- a/models/core/src/core.ts
+++ b/models/core/src/core.ts
@ -90,7 +90,7 @@ export class TDoc extends TObj implements Doc {
  @Hidden()
    space!: Ref<Space>

-  @Prop(TypeTimestamp(), core.string.Modified)
+  @Prop(TypeTimestamp(), core.string.ModifiedDate)
  @Index(IndexKind.Indexed)
    modifiedOn!: Timestamp

--- a/models/recruit/src/index.ts
+++ b/models/recruit/src/index.ts
@ -168,7 +168,7 @@ export class TApplicant extends TTask implements Applicant {
  @Prop(TypeRef(contact.class.Employee), recruit.string.AssignedRecruiter)
  declare assignee: Ref<Employee> | null

-  @Prop(TypeTimestamp(), contact.string.CreatedOn)
+  @Prop(TypeTimestamp(), contact.string.CreatedDate)
  @ReadOnly()
    createOn!: Timestamp
 }
@ -454,7 +454,7 @@ export function createModel (builder: Builder): void {
        'description',
        {
          key: '@applications.modifiedOn',
-          label: core.string.Modified
+          label: core.string.ModifiedDate
        }
      ],
      hiddenKeys: ['name', 'space', 'modifiedOn']
@ -484,7 +484,7 @@ export function createModel (builder: Builder): void {
        '$lookup.channels',
        {
          key: '@applications.modifiedOn',
-          label: core.string.Modified
+          label: core.string.ModifiedDate
        }
      ],
      hiddenKeys: ['name', 'space', 'modifiedOn']
--- a/models/tracker/src/index.ts
+++ b/models/tracker/src/index.ts
@ -256,7 +256,7 @@ export class TIssue extends TAttachedDoc implements Issue {
  @Prop(Collection(tracker.class.TimeSpendReport), tracker.string.TimeSpendReports)
    reports!: number

-  @Prop(TypeTimestamp(), tracker.string.CreatedOn)
+  @Prop(TypeTimestamp(), tracker.string.CreatedDate)
  @ReadOnly()
    createOn!: Timestamp

@ -1352,7 +1352,22 @@ export function createModel (builder: Builder): void {
  })

  builder.mixin(tracker.class.Issue, core.class.Class, view.mixin.ClassFilters, {
-    filters: ['space']
+    filters: [
+      'status',
+      'assignee',
+      'createdBy',
+      'priority',
+      'labels',
+      'title',
+      'sprint',
+      'component',
+      'dueDate',
+      'createOn',
+      'modifiedOn',
+      'modifiedBy',
+      'space'
+    ],
+    ignoreKeys: ['number', 'estimation', 'attachedTo']
  })

  builder.mixin(tracker.class.IssueTemplate, core.class.Class, view.mixin.ClassFilters, {
--- a/models/tracker/src/plugin.ts
+++ b/models/tracker/src/plugin.ts
@ -38,7 +38,7 @@ export default mergeIds(trackerId, tracker, {
    GotoMyIssues: '' as IntlString,
    SearchIssue: '' as IntlString,
    Parent: '' as IntlString,
-    CreatedOn: '' as IntlString,
+    CreatedDate: '' as IntlString,
    ChangeStatus: '' as IntlString,
    ConfigLabel: '' as IntlString,
    ConfigDescription: '' as IntlString
--- a/models/view/src/index.ts
+++ b/models/view/src/index.ts
@ -127,6 +127,8 @@ export class TFilterMode extends TDoc implements FilterMode {
@Mixin(view.mixin.ClassFilters, core.class.Class)
 export class TClassFilters extends TClass implements ClassFilters {
  filters!: (string | KeyFilter)[]
+  ignoreKeys?: string[] | undefined
+  strict?: boolean | undefined
 }

@Mixin(view.mixin.AttributeFilter, core.class.Class)
--- a/packages/core/src/component.ts
+++ b/packages/core/src/component.ts
@ -148,6 +148,7 @@ export default plugin(coreId, {
    Id: '' as IntlString,
    Space: '' as IntlString,
    Modified: '' as IntlString,
+    ModifiedDate: '' as IntlString,
    ModifiedBy: '' as IntlString,
    Class: '' as IntlString,
    AttachedTo: '' as IntlString,
--- a/packages/core/src/lang/en.json
+++ b/packages/core/src/lang/en.json
@ -3,6 +3,7 @@
    "Id": "Id",
    "Space": "Space",
    "Modified": "Modified",
+    "ModifiedDate": "Modified date",
    "ModifiedBy": "Modified by",
    "Class": "Class",
    "AttachedTo": "Attached to",
--- a/packages/core/src/lang/ru.json
+++ b/packages/core/src/lang/ru.json
@ -3,6 +3,7 @@
    "Id": "Id",
    "Space": "Пространство",
    "Modified": "Изменено",
+    "ModifiedDate": "Дата изменения",
    "ModifiedBy": "Изменен",
    "Class": "Класс",
    "AttachedTo": "Прикреплен к",
--- a/plugins/contact-assets/lang/en.json
+++ b/plugins/contact-assets/lang/en.json
@ -71,7 +71,7 @@
    "UseGravatar": "Gravatar",
    "UseColor": "Color",
    "NotSpecified": "Not specified",
-    "CreatedOn": "Created",
+    "CreatedDate": "Created date",
    "Whatsapp": "Whatsapp",
    "WhatsappPlaceholder": "Whatsapp",
    "Skype": "Skype",
--- a/plugins/contact-assets/lang/ru.json
+++ b/plugins/contact-assets/lang/ru.json
@ -72,7 +72,7 @@
    "UseColor": "Цвет",
    "AvatarProvider": "Тип аватара",
    "NotSpecified": "Не указан",
-    "CreatedOn": "Создан",
+    "CreatedDate": "Дата создания",
    "Whatsapp": "Whatsapp",
    "WhatsappPlaceholder": "Whatsapp",
    "Skype": "Skype",
--- a/plugins/recruit-resources/src/components/Organizations.svelte
+++ b/plugins/recruit-resources/src/components/Organizations.svelte
@ -169,7 +169,7 @@
      {
        key: '',
        presenter: recruit.component.VacancyModifiedPresenter,
-        label: core.string.Modified,
+        label: core.string.ModifiedDate,
        props: { applications },
        sortingKey: 'modifiedOn',
        sortingFunction: modifiedSorting
--- a/plugins/recruit-resources/src/components/Vacancies.svelte
+++ b/plugins/recruit-resources/src/components/Vacancies.svelte
@ -91,7 +91,7 @@
      {
        key: '',
        presenter: recruit.component.VacancyModifiedPresenter,
-        label: core.string.Modified,
+        label: core.string.ModifiedDate,
        props: { applications },
        sortingKey: 'modifiedOn',
        sortingFunction: modifiedSorting
--- a/plugins/tracker-assets/lang/en.json
+++ b/plugins/tracker-assets/lang/en.json
@ -284,7 +284,7 @@

    "SevenHoursLength": "Seven Hours",
    "EightHoursLength": "Eight Hours",
-    "CreatedOn": "Created on",
+    "CreatedDate": "Created date",
    "HourLabel": "h",
    "Saved": "Saved...",
    "CreatedIssue": "Created issue",
--- a/plugins/tracker-assets/lang/ru.json
+++ b/plugins/tracker-assets/lang/ru.json
@ -284,7 +284,7 @@

    "SevenHoursLength": "Семь Часов",
    "EightHoursLength": "Восемь Часов",
-    "CreatedOn": "Создана",
+    "CreatedDate": "Дата создания",
    "HourLabel": "ч",
    "Saved": "Сохранено...",
    "CreatedIssue": "Создал(а) задачу",
--- a/plugins/view-resources/src/components/filter/FilterTypePopup.svelte
+++ b/plugins/view-resources/src/components/filter/FilterTypePopup.svelte
@ -69,7 +69,7 @@
      return
    }
    const value = getValue(attribute.name, attribute.type)
-    if (result.findIndex((p) => p.key === value) !== -1) {
+    if (result.findIndex((p) => p.attribute.name === value) !== -1) {
      return
    }
    const filter = buildFilterKey(hierarchy, _class, value, attribute)
@ -97,6 +97,12 @@
    const clazz = hierarchy.getClass(_class)
    const mixin = hierarchy.as(clazz, view.mixin.ClassFilters)
    const result = getFilters(_class, mixin)
+
+    if (mixin.strict) {
+      // Attributes not specified in "mixing.filters" are ignored
+      return result
+    }
+
    const allAttributes = hierarchy.getAllAttributes(_class)
    buildFilterFor(_class, allAttributes, result, mixin)

--- a/plugins/view/src/index.ts
+++ b/plugins/view/src/index.ts
@ -104,6 +104,9 @@ export interface FilteredView extends Preference {
 export interface ClassFilters extends Class<Doc> {
  filters: (KeyFilter | string)[]
  ignoreKeys?: string[]
+
+  // Ignore attributes not specified in the "filters" array
+  strict?: boolean
 }

 /**
--- a/tests/sanity/tests/tracker.spec.ts
+++ b/tests/sanity/tests/tracker.spec.ts
@ -154,7 +154,7 @@ test('report-time-from-main-view', async ({ page }) => {
  await page.click('text="Issues"')
  await page.click('button:has-text("View")')
  await page.click('.ordering >> nth=0')
-  await page.click('text="Modified"')
+  await page.click('text="Modified date"')
  await page.keyboard.press('Escape')

  const values = [0.25, 0.5, 0.75, 1]