From f5bd3edc480d267f469fd82edf98b6d0a5868af3 Mon Sep 17 00:00:00 2001 From: Denis Bykhov Date: Thu, 4 May 2023 19:20:49 +0600 Subject: [PATCH] TSK-1372 Improve account filter (#3139) Signed-off-by: Denis Bykhov --- models/contact/src/index.ts | 1 - models/core/src/index.ts | 1 + models/core/src/security.ts | 2 ++ packages/core/src/__tests__/memdb.test.ts | 6 +++++- packages/core/src/classes.ts | 1 + packages/core/src/component.ts | 1 + packages/core/src/lang/en.json | 3 ++- packages/core/src/lang/ru.json | 3 ++- packages/presentation/src/components/NavLink.svelte | 11 +++++------ packages/query/src/__tests__/minmodel.ts | 4 ++-- packages/query/src/__tests__/query.test.ts | 1 + .../src/components/CommentPresenter.svelte | 4 ++-- .../src/components/ContactList.svelte | 2 +- .../src/components/ContactPresenter.svelte | 6 +++--- .../src/components/ContactRefPresenter.svelte | 4 ++-- .../src/components/EmployeeAccountPresenter.svelte | 2 +- .../src/components/EmployeeAttributePresenter.svelte | 3 +-- .../src/components/EmployeePresenter.svelte | 5 ++--- .../src/components/MemberPresenter.svelte | 2 +- .../src/components/OrganizationCard.svelte | 2 +- .../src/components/PersonCard.svelte | 2 +- .../src/components/PersonContent.svelte | 7 +++---- .../src/components/PersonPresenter.svelte | 4 ++-- .../src/components/PersonRefPresenter.svelte | 4 ++-- plugins/contact/src/index.ts | 1 - .../src/components/schedule/ReportsPopup.svelte | 2 +- .../src/components/ApplicationPresenter.svelte | 4 ++-- .../src/components/CandidateCard.svelte | 2 +- .../src/components/VacancyPresenter.svelte | 4 ++-- .../setting-resources/src/components/Owners.svelte | 2 +- .../src/components/AssigneePresenter.svelte | 2 +- .../src/components/CreateIssue.svelte | 2 +- .../components/components/ComponentPresenter.svelte | 4 ++-- .../src/components/components/LeadPresenter.svelte | 4 ++-- .../src/components/issues/AssigneePresenter.svelte | 2 +- .../src/components/issues/IssuePresenter.svelte | 4 ++-- .../src/components/issues/edit/ControlPanel.svelte | 2 +- .../issues/timereport/EstimationPopup.svelte | 2 +- .../components/issues/timereport/ReportsPopup.svelte | 2 +- .../src/components/sprints/SprintLeadPresenter.svelte | 4 ++-- .../src/components/sprints/SprintPresenter.svelte | 4 ++-- .../templates/IssueTemplatePresenter.svelte | 6 +++--- .../view-resources/src/components/DocNavLink.svelte | 6 +++--- .../view-resources/src/components/ObjectBox.svelte | 2 +- .../src/components/ObjectBoxPopup.svelte | 2 +- .../src/components/ObjectSearchBox.svelte | 2 +- .../src/components/ValueSelector.svelte | 2 +- .../src/components/filter/ObjectFilter.svelte | 2 +- server/middleware/src/utils.ts | 1 + server/mongo/src/__tests__/minmodel.ts | 4 ++-- server/ws/src/__tests__/minmodel.ts | 4 ++-- 51 files changed, 83 insertions(+), 76 deletions(-) diff --git a/models/contact/src/index.ts b/models/contact/src/index.ts index fd172571be..b1be3cd44c 100644 --- a/models/contact/src/index.ts +++ b/models/contact/src/index.ts @@ -176,7 +176,6 @@ export class TEmployee extends TPerson implements Employee { @Model(contact.class.EmployeeAccount, core.class.Account) export class TEmployeeAccount extends TAccount implements EmployeeAccount { employee!: Ref - name!: string mergedTo!: Ref } diff --git a/models/core/src/index.ts b/models/core/src/index.ts index 2a4addee59..dc4570a7d9 100644 --- a/models/core/src/index.ts +++ b/models/core/src/index.ts @@ -128,6 +128,7 @@ export function createModel (builder: Builder): void { core.space.Model, { email: systemAccountEmail, + name: systemAccountEmail, role: AccountRole.Owner }, core.account.System diff --git a/models/core/src/security.ts b/models/core/src/security.ts index d6d9e3ffcb..6d18fde85b 100644 --- a/models/core/src/security.ts +++ b/models/core/src/security.ts @@ -45,7 +45,9 @@ export class TSpace extends TDoc implements Space { } @Model(core.class.Account, core.class.Doc, DOMAIN_MODEL) +@UX(core.string.Account, undefined, undefined, 'name') export class TAccount extends TDoc implements Account { email!: string + name!: string role!: AccountRole } diff --git a/packages/core/src/__tests__/memdb.test.ts b/packages/core/src/__tests__/memdb.test.ts index 063498c6d3..dd0bfcea28 100644 --- a/packages/core/src/__tests__/memdb.test.ts +++ b/packages/core/src/__tests__/memdb.test.ts @@ -236,7 +236,11 @@ describe('memdb', () => { members: [], archived: false }) - const account = await model.createDoc(core.class.Account, core.space.Model, { email: 'email', role: 0 }) + const account = await model.createDoc(core.class.Account, core.space.Model, { + email: 'email', + name: 'test', + role: 0 + }) await model.updateDoc(core.class.Space, core.space.Model, space, { $push: { members: account } }) const txSpace = await model.findAll(core.class.Space, { _id: space }) expect(txSpace[0].members).toEqual(expect.arrayContaining([account])) diff --git a/packages/core/src/classes.ts b/packages/core/src/classes.ts index fe24f4dec0..b9379dec2b 100644 --- a/packages/core/src/classes.ts +++ b/packages/core/src/classes.ts @@ -319,6 +319,7 @@ export interface Space extends Doc { * @public */ export interface Account extends Doc { + name: string email: string role: AccountRole } diff --git a/packages/core/src/component.ts b/packages/core/src/component.ts index f26a16b2fa..9f70fc5474 100644 --- a/packages/core/src/component.ts +++ b/packages/core/src/component.ts @@ -172,6 +172,7 @@ export default plugin(coreId, { System: '' as IntlString, CreatedBy: '' as IntlString, Status: '' as IntlString, + Account: '' as IntlString, StatusCategory: '' as IntlString } }) diff --git a/packages/core/src/lang/en.json b/packages/core/src/lang/en.json index e7038ee5ba..411fed29cb 100644 --- a/packages/core/src/lang/en.json +++ b/packages/core/src/lang/en.json @@ -30,6 +30,7 @@ "System": "System", "CreatedBy": "Created by", "Status": "Status", - "StatusCategory": "Status category" + "StatusCategory": "Status category", + "Account": "Account" } } diff --git a/packages/core/src/lang/ru.json b/packages/core/src/lang/ru.json index 4b563e7662..a38035b565 100644 --- a/packages/core/src/lang/ru.json +++ b/packages/core/src/lang/ru.json @@ -30,6 +30,7 @@ "System": "Система", "CreatedBy": "Создан", "Status": "Статус", - "StatusCategory": "Категория статуса" + "StatusCategory": "Категория статуса", + "Account": "Аккаунт" } } diff --git a/packages/presentation/src/components/NavLink.svelte b/packages/presentation/src/components/NavLink.svelte index 11f5d09ff5..a71dde2bca 100644 --- a/packages/presentation/src/components/NavLink.svelte +++ b/packages/presentation/src/components/NavLink.svelte @@ -16,15 +16,15 @@ import { closePopup, closeTooltip, navigate, parseLocation } from '@hcengineering/ui' export let href: string | undefined - export let disableClick = false + export let disabled = false export let onClick: ((event: MouseEvent) => void) | undefined = undefined - export let noUnderline = false + export let noUnderline = disabled export let inline = false export let colorInherit: boolean = false export let shrink: number = 0 function clickHandler (e: MouseEvent) { - if (disableClick) return + if (disabled) return if (onClick) { e.preventDefault() @@ -48,10 +48,10 @@ } -{#if disableClick || href === undefined} +{#if disabled || href === undefined} [] { const u1 = 'User1' as Ref const u2 = 'User2' as Ref txes.push( - createDoc(core.class.Account, { email: 'user1@site.com', role: 0 }, u1), - createDoc(core.class.Account, { email: 'user2@site.com', role: 0 }, u2), + createDoc(core.class.Account, { email: 'user1@site.com', name: 'user1', role: 0 }, u1), + createDoc(core.class.Account, { email: 'user2@site.com', name: 'user2', role: 0 }, u2), createDoc(core.class.Space, { name: 'Sp1', description: '', diff --git a/packages/query/src/__tests__/query.test.ts b/packages/query/src/__tests__/query.test.ts index d0d4d7c66c..cc5d108609 100644 --- a/packages/query/src/__tests__/query.test.ts +++ b/packages/query/src/__tests__/query.test.ts @@ -101,6 +101,7 @@ describe('query', () => { await factory.createDoc(core.class.Account, core.space.Model, { email: 'user1@site.com', + name: 'user1', role: 0 }) await factory.createDoc(core.class.Space, core.space.Model, { diff --git a/plugins/chunter-resources/src/components/CommentPresenter.svelte b/plugins/chunter-resources/src/components/CommentPresenter.svelte index a150908427..339fbb9a3b 100644 --- a/plugins/chunter-resources/src/components/CommentPresenter.svelte +++ b/plugins/chunter-resources/src/components/CommentPresenter.svelte @@ -25,7 +25,7 @@ export let value: Comment export let inline: boolean = false - export let disableClick = false + export let disabled = false const cutId = (str: string): string => { return str.slice(0, 4) + '...' + str.slice(-4) @@ -45,7 +45,7 @@ {#if inline} - +
diff --git a/plugins/contact-resources/src/components/ContactList.svelte b/plugins/contact-resources/src/components/ContactList.svelte index c3f22d4e21..e21164cd8d 100644 --- a/plugins/contact-resources/src/components/ContactList.svelte +++ b/plugins/contact-resources/src/components/ContactList.svelte @@ -89,7 +89,7 @@ {#if contacts.length > 0}
{#if contacts.length === 1} - + {:else} diff --git a/plugins/contact-resources/src/components/ContactPresenter.svelte b/plugins/contact-resources/src/components/ContactPresenter.svelte index 1911ab4f37..5e741041e8 100644 --- a/plugins/contact-resources/src/components/ContactPresenter.svelte +++ b/plugins/contact-resources/src/components/ContactPresenter.svelte @@ -24,7 +24,7 @@ export let value: Contact export let inline: boolean = false - export let isInteractive = true + export let disabled = false function isPerson (value: Contact): boolean { const client = getClient() @@ -41,9 +41,9 @@ {#if isEmployee(value)} - + {:else if isPerson(value)} - + {:else} {/if} diff --git a/plugins/contact-resources/src/components/ContactRefPresenter.svelte b/plugins/contact-resources/src/components/ContactRefPresenter.svelte index 6d2469a9e1..c21e9dc7e1 100644 --- a/plugins/contact-resources/src/components/ContactRefPresenter.svelte +++ b/plugins/contact-resources/src/components/ContactRefPresenter.svelte @@ -21,7 +21,7 @@ import ContactPresenter from './ContactPresenter.svelte' export let value: Ref - export let isInteractive = true + export let disabled = false let doc: Contact | undefined const query = createQuery() @@ -29,5 +29,5 @@ {#if doc} - + {/if} diff --git a/plugins/contact-resources/src/components/EmployeeAccountPresenter.svelte b/plugins/contact-resources/src/components/EmployeeAccountPresenter.svelte index 62fbab09a0..ec4c2ebd4e 100644 --- a/plugins/contact-resources/src/components/EmployeeAccountPresenter.svelte +++ b/plugins/contact-resources/src/components/EmployeeAccountPresenter.svelte @@ -34,7 +34,7 @@ {#if value} {#if employee} - + {:else}
diff --git a/plugins/contact-resources/src/components/EmployeeAttributePresenter.svelte b/plugins/contact-resources/src/components/EmployeeAttributePresenter.svelte index 73fae8b73c..a8f445090c 100644 --- a/plugins/contact-resources/src/components/EmployeeAttributePresenter.svelte +++ b/plugins/contact-resources/src/components/EmployeeAttributePresenter.svelte @@ -45,13 +45,12 @@ value={getValue(employee, value)} {inline} {tooltipLabels} - isInteractive={false} + disabled shouldShowAvatar shouldShowPlaceholder defaultName={contact.string.NotSpecified} shouldShowName={kind !== 'list'} avatarSize={kind === 'list-header' ? 'smaller' : 'x-small'} - disableClick {colorInherit} {accent} on:accent-color diff --git a/plugins/contact-resources/src/components/EmployeePresenter.svelte b/plugins/contact-resources/src/components/EmployeePresenter.svelte index 104f8e2ce2..e940b0e39e 100644 --- a/plugins/contact-resources/src/components/EmployeePresenter.svelte +++ b/plugins/contact-resources/src/components/EmployeePresenter.svelte @@ -14,9 +14,8 @@ export let shouldShowPlaceholder = false export let onEmployeeEdit: ((event: MouseEvent) => void) | undefined = undefined export let avatarSize: IconSize = 'x-small' - export let isInteractive = true + export let disabled = false export let inline = false - export let disableClick = false export let colorInherit: boolean = false export let accent: boolean = false export let defaultName: IntlString | undefined = undefined @@ -34,7 +33,7 @@ {shouldShowName} {avatarSize} {shouldShowPlaceholder} - isInteractive={isInteractive && !disableClick} + {disabled} {inline} {colorInherit} {accent} diff --git a/plugins/contact-resources/src/components/MemberPresenter.svelte b/plugins/contact-resources/src/components/MemberPresenter.svelte index 74118fc378..775d7450c3 100644 --- a/plugins/contact-resources/src/components/MemberPresenter.svelte +++ b/plugins/contact-resources/src/components/MemberPresenter.svelte @@ -28,7 +28,7 @@ {#await contactRef then ct} {#if ct} - + {/if} {/await} diff --git a/plugins/contact-resources/src/components/OrganizationCard.svelte b/plugins/contact-resources/src/components/OrganizationCard.svelte index 1a028ed8c8..c23f96dbd8 100644 --- a/plugins/contact-resources/src/components/OrganizationCard.svelte +++ b/plugins/contact-resources/src/components/OrganizationCard.svelte @@ -45,7 +45,7 @@
{#if organization} - +
{organization.name}
diff --git a/plugins/contact-resources/src/components/PersonCard.svelte b/plugins/contact-resources/src/components/PersonCard.svelte index a2c56d4edc..effb0e1ee0 100644 --- a/plugins/contact-resources/src/components/PersonCard.svelte +++ b/plugins/contact-resources/src/components/PersonCard.svelte @@ -44,7 +44,7 @@
{#if object} - +
{getName(object)}
diff --git a/plugins/contact-resources/src/components/PersonContent.svelte b/plugins/contact-resources/src/components/PersonContent.svelte index c60cfa82b5..21b3bb9320 100644 --- a/plugins/contact-resources/src/components/PersonContent.svelte +++ b/plugins/contact-resources/src/components/PersonContent.svelte @@ -22,7 +22,7 @@ export let value: Person | Employee | undefined | null export let inline: boolean = false - export let isInteractive = true + export let disabled = false export let shouldShowAvatar: boolean = true export let shouldShowName = true export let shouldShowPlaceholder = false @@ -37,14 +37,14 @@ export let accent: boolean = false const onEditClick = (evt: MouseEvent) => { - if (isInteractive) { + if (!disabled) { onEdit?.(evt) } } {#if value} - + > = contact.class.Person export let inline = false export let enlargedText = false - export let isInteractive = true + export let disabled = false export let shouldShowAvatar = true export let shouldShowName = true export let shouldShowPlaceholder = false @@ -55,6 +55,6 @@ {shouldShowName} {shouldShowPlaceholder} {enlargedText} - {isInteractive} + {disabled} {inline} /> diff --git a/plugins/contact/src/index.ts b/plugins/contact/src/index.ts index 3b86debb8b..9c58906436 100644 --- a/plugins/contact/src/index.ts +++ b/plugins/contact/src/index.ts @@ -150,7 +150,6 @@ export interface Employee extends Person { */ export interface EmployeeAccount extends Account { employee: Ref - name: string mergedTo?: Ref } diff --git a/plugins/hr-resources/src/components/schedule/ReportsPopup.svelte b/plugins/hr-resources/src/components/schedule/ReportsPopup.svelte index e0e31992d4..e528f1f920 100644 --- a/plugins/hr-resources/src/components/schedule/ReportsPopup.svelte +++ b/plugins/hr-resources/src/components/schedule/ReportsPopup.svelte @@ -48,7 +48,7 @@ on:changeContent > - + {#if value && shortLabel} - +
{#if !inline}
diff --git a/plugins/recruit-resources/src/components/CandidateCard.svelte b/plugins/recruit-resources/src/components/CandidateCard.svelte index e3fc6dff7e..495cf0388f 100644 --- a/plugins/recruit-resources/src/components/CandidateCard.svelte +++ b/plugins/recruit-resources/src/components/CandidateCard.svelte @@ -48,7 +48,7 @@
{#if candidate} - +
{getName(candidate)}
diff --git a/plugins/recruit-resources/src/components/VacancyPresenter.svelte b/plugins/recruit-resources/src/components/VacancyPresenter.svelte index e98795a60d..a867ec3e1d 100644 --- a/plugins/recruit-resources/src/components/VacancyPresenter.svelte +++ b/plugins/recruit-resources/src/components/VacancyPresenter.svelte @@ -23,11 +23,11 @@ export let value: Vacancy export let inline: boolean = false - export let disableClick = false + export let disabled = false {#if value} - +
{#if !inline}
diff --git a/plugins/setting-resources/src/components/Owners.svelte b/plugins/setting-resources/src/components/Owners.svelte index ccc25e520c..3ce08a64fc 100644 --- a/plugins/setting-resources/src/components/Owners.svelte +++ b/plugins/setting-resources/src/components/Owners.svelte @@ -68,7 +68,7 @@
{#if employee} - + {:else} {formatName(account.name)} {/if} diff --git a/plugins/task-resources/src/components/AssigneePresenter.svelte b/plugins/task-resources/src/components/AssigneePresenter.svelte index ea7f9a18bb..f1387fc24b 100644 --- a/plugins/task-resources/src/components/AssigneePresenter.svelte +++ b/plugins/task-resources/src/components/AssigneePresenter.svelte @@ -105,7 +105,7 @@ {value} {defaultName} avatarSize={'x-small'} - isInteractive={true} + disabled={false} shouldShowPlaceholder={true} shouldShowName={shouldShowLabel} onEmployeeEdit={handleAssigneeEditorOpened} diff --git a/plugins/tracker-resources/src/components/CreateIssue.svelte b/plugins/tracker-resources/src/components/CreateIssue.svelte index 751441e26a..d4cc5d44e8 100644 --- a/plugins/tracker-resources/src/components/CreateIssue.svelte +++ b/plugins/tracker-resources/src/components/CreateIssue.svelte @@ -567,7 +567,7 @@ searchField={'title'} allowDeselect={true} showNavigate={false} - docProps={{ disableClick: true }} + docProps={{ disabled: true }} focusIndex={20000} /> diff --git a/plugins/tracker-resources/src/components/components/ComponentPresenter.svelte b/plugins/tracker-resources/src/components/components/ComponentPresenter.svelte index cad67a26a1..907cfe032d 100644 --- a/plugins/tracker-resources/src/components/components/ComponentPresenter.svelte +++ b/plugins/tracker-resources/src/components/components/ComponentPresenter.svelte @@ -21,11 +21,11 @@ export let value: WithLookup export let shouldShowAvatar = true export let onClick: () => void | undefined - export let isInteractive = true + export let disabled = false export let inline: boolean = false function navigateToComponent () { - if (!isInteractive) { + if (disabled) { return } if (onClick) { diff --git a/plugins/tracker-resources/src/components/components/LeadPresenter.svelte b/plugins/tracker-resources/src/components/components/LeadPresenter.svelte index a9421cfebf..30385d32fc 100644 --- a/plugins/tracker-resources/src/components/components/LeadPresenter.svelte +++ b/plugins/tracker-resources/src/components/components/LeadPresenter.svelte @@ -85,7 +85,7 @@ {value} {defaultName} avatarSize={size} - isInteractive={true} + disabled={false} shouldShowPlaceholder={true} shouldShowName={shouldShowLabel} onEmployeeEdit={handleLeadEditorOpened} @@ -97,7 +97,7 @@ {value} {defaultName} avatarSize={size} - isInteractive={true} + disabled={false} shouldShowPlaceholder={true} shouldShowName={shouldShowLabel} onEmployeeEdit={handleLeadEditorOpened} diff --git a/plugins/tracker-resources/src/components/issues/AssigneePresenter.svelte b/plugins/tracker-resources/src/components/issues/AssigneePresenter.svelte index a422158dd3..46c3a987e7 100644 --- a/plugins/tracker-resources/src/components/issues/AssigneePresenter.svelte +++ b/plugins/tracker-resources/src/components/issues/AssigneePresenter.svelte @@ -90,7 +90,7 @@ {value} {defaultName} {avatarSize} - isInteractive={true} + disabled={false} shouldShowPlaceholder={true} shouldShowName={shouldShowLabel} onEmployeeEdit={handleAssigneeEditorOpened} diff --git a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte index 34d63afd69..514b830e60 100644 --- a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte +++ b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte @@ -21,7 +21,7 @@ import tracker from '../../plugin' export let value: WithLookup - export let disableClick = false + export let disabled = false export let onClick: (() => void) | undefined = undefined export let shouldShowAvatar: boolean = false export let noUnderline = false @@ -48,7 +48,7 @@ {#if value} - + {#if !inline && shouldShowAvatar}
diff --git a/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte b/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte index cea7d2f769..ee888b8338 100644 --- a/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte +++ b/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte @@ -110,7 +110,7 @@ allowDeselect={true} showNavigate={false} readonly - docProps={{ disableClick: true }} + docProps={{ disabled: true }} /> {/if} diff --git a/plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte b/plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte index e4e1e156e2..00646c8fb4 100644 --- a/plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte +++ b/plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte @@ -107,7 +107,7 @@ - + {#if currentProject} diff --git a/plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte b/plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte index 6f1c6fe322..240d62c7d3 100644 --- a/plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte +++ b/plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte @@ -62,7 +62,7 @@ on:changeContent > - +
diff --git a/plugins/tracker-resources/src/components/sprints/SprintLeadPresenter.svelte b/plugins/tracker-resources/src/components/sprints/SprintLeadPresenter.svelte index 3f2937419b..b7498836c0 100644 --- a/plugins/tracker-resources/src/components/sprints/SprintLeadPresenter.svelte +++ b/plugins/tracker-resources/src/components/sprints/SprintLeadPresenter.svelte @@ -85,7 +85,7 @@ {value} {defaultName} avatarSize={size} - isInteractive={true} + disabled={false} shouldShowPlaceholder={true} shouldShowName={shouldShowLabel} onEmployeeEdit={handleLeadEditorOpened} @@ -97,7 +97,7 @@ {value} {defaultName} avatarSize={size} - isInteractive={true} + disabled={false} shouldShowPlaceholder={true} shouldShowName={shouldShowLabel} onEmployeeEdit={handleLeadEditorOpened} diff --git a/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte b/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte index 0734ee54bf..0de237bd96 100644 --- a/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte +++ b/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte @@ -21,11 +21,11 @@ export let value: WithLookup export let shouldShowAvatar: boolean = true export let onClick: () => void | undefined - export let isInteractive = true + export let disabled = false export let inline: boolean = false function navigateToSprint () { - if (!isInteractive) { + if (disabled) { return } if (onClick) { diff --git a/plugins/tracker-resources/src/components/templates/IssueTemplatePresenter.svelte b/plugins/tracker-resources/src/components/templates/IssueTemplatePresenter.svelte index c3a7a540c1..4bda414361 100644 --- a/plugins/tracker-resources/src/components/templates/IssueTemplatePresenter.svelte +++ b/plugins/tracker-resources/src/components/templates/IssueTemplatePresenter.svelte @@ -19,13 +19,13 @@ import tracker from '../../plugin' export let value: WithLookup - export let disableClick = false + export let disabled = false export let noUnderline = false export let shouldShowAvatar: boolean = true export let inline: boolean = false function handleIssueEditorOpened () { - if (disableClick) { + if (disabled) { return } showPanel(tracker.component.EditIssueTemplate, value._id, value._class, 'content') @@ -36,7 +36,7 @@ {#if value} - + {#if !inline && shouldShowAvatar}
diff --git a/plugins/view-resources/src/components/DocNavLink.svelte b/plugins/view-resources/src/components/DocNavLink.svelte index 9e35e4f46b..74b12af30b 100644 --- a/plugins/view-resources/src/components/DocNavLink.svelte +++ b/plugins/view-resources/src/components/DocNavLink.svelte @@ -20,7 +20,7 @@ import { getObjectLinkFragment } from '../utils' export let object: Doc - export let disableClick = false + export let disabled = false export let onClick: ((event: MouseEvent) => void) | undefined = undefined export let noUnderline = false export let inline = false @@ -38,7 +38,7 @@ : undefined async function getHref (object: Doc): Promise { - if (disableClick) { + if (disabled) { href = undefined return } @@ -49,4 +49,4 @@ $: if (object !== undefined) getHref(object) - + diff --git a/plugins/view-resources/src/components/ObjectBox.svelte b/plugins/view-resources/src/components/ObjectBox.svelte index 3549529632..f8c199e7ae 100644 --- a/plugins/view-resources/src/components/ObjectBox.svelte +++ b/plugins/view-resources/src/components/ObjectBox.svelte @@ -132,7 +132,7 @@ objectId={selected._id} _class={selected._class} value={selected} - props={{ ...docProps, isInteractive: false, inline: true, size: 'x-small' }} + props={{ ...docProps, disabled: true, inline: true, size: 'x-small' }} /> {:else}
diff --git a/plugins/view-resources/src/components/ObjectBoxPopup.svelte b/plugins/view-resources/src/components/ObjectBoxPopup.svelte index 4239cf4daa..bdadcd5d55 100644 --- a/plugins/view-resources/src/components/ObjectBoxPopup.svelte +++ b/plugins/view-resources/src/components/ObjectBoxPopup.svelte @@ -61,7 +61,7 @@ objectId={doc._id} _class={doc._class} value={doc} - props={{ ...docProps, isInteractive: false, inline: true, size: 'x-small' }} + props={{ ...docProps, disabled: true, inline: true, size: 'x-small' }} />
diff --git a/plugins/view-resources/src/components/ObjectSearchBox.svelte b/plugins/view-resources/src/components/ObjectSearchBox.svelte index 4fc9a8542b..066fb8363e 100644 --- a/plugins/view-resources/src/components/ObjectSearchBox.svelte +++ b/plugins/view-resources/src/components/ObjectSearchBox.svelte @@ -139,7 +139,7 @@ objectId={selected._id} _class={selected._class} value={selected} - props={{ ...docProps, isInteractive: false, inline: true, size: 'x-small' }} + props={{ ...docProps, disabled: true, inline: true, size: 'x-small' }} /> {:else}
diff --git a/plugins/view-resources/src/components/ValueSelector.svelte b/plugins/view-resources/src/components/ValueSelector.svelte index d0ba046ab8..578f4d41a4 100644 --- a/plugins/view-resources/src/components/ValueSelector.svelte +++ b/plugins/view-resources/src/components/ValueSelector.svelte @@ -158,7 +158,7 @@ _class={item._class} value={item} inline={false} - props={{ isInteractive: false, inline: false, size }} + props={{ disabled: true, inline: false, size }} />
diff --git a/plugins/view-resources/src/components/filter/ObjectFilter.svelte b/plugins/view-resources/src/components/filter/ObjectFilter.svelte index ddd5526933..f847b2200d 100644 --- a/plugins/view-resources/src/components/filter/ObjectFilter.svelte +++ b/plugins/view-resources/src/components/filter/ObjectFilter.svelte @@ -194,7 +194,7 @@
{#if value} - + {:else}