From a52b806e5c01baac0536aeb7773d223135bb4672 Mon Sep 17 00:00:00 2001 From: Alexander Platov Date: Wed, 6 Sep 2023 09:48:52 +0300 Subject: [PATCH] UBERF-60: updated inline presenters. (#3663) Signed-off-by: Alexander Platov --- models/lead/src/index.ts | 1 - models/lead/src/plugin.ts | 1 - models/recruit/src/index.ts | 4 +- .../src/components/NavLink.svelte | 7 ++- packages/theme/styles/_layouts.scss | 6 +++ .../src/components/Message.svelte | 2 +- .../components/OrganizationPresenter.svelte | 23 ++++---- .../src/components/PersonContent.svelte | 53 ++++++++++--------- .../src/components/DocumentPresenter.svelte | 20 +++---- .../src/components/CategoryPresenter.svelte | 12 +++-- .../src/components/ProductPresenter.svelte | 14 ++--- .../src/components/LeadPresenter.svelte | 20 +++---- plugins/lead/src/index.ts | 1 + .../components/ApplicationPresenter.svelte | 21 +++++--- .../src/components/KanbanCard.svelte | 7 ++- .../src/components/VacancyPresenter.svelte | 14 +++-- .../components/ComponentPresenter.svelte | 22 ++++---- .../components/issues/IssuePresenter.svelte | 37 +++++-------- .../milestones/MilestonePresenter.svelte | 32 +++++++---- .../src/components/ObjectPresenter.svelte | 2 +- .../src/components/ParentsNavigator.svelte | 2 +- 21 files changed, 168 insertions(+), 133 deletions(-) diff --git a/models/lead/src/index.ts b/models/lead/src/index.ts index 2fd6a7dd7b..e7d2763578 100644 --- a/models/lead/src/index.ts +++ b/models/lead/src/index.ts @@ -324,7 +324,6 @@ export function createModel (builder: Builder): void { sortingKey: '$lookup.attachedTo.name', props: { _class: lead.mixin.Customer, - inline: true, maxWidth: '10rem' } }, diff --git a/models/lead/src/plugin.ts b/models/lead/src/plugin.ts index d3933d974d..7d95cb3b20 100644 --- a/models/lead/src/plugin.ts +++ b/models/lead/src/plugin.ts @@ -29,7 +29,6 @@ export default mergeIds(leadId, lead, { Funnel: '' as IntlString, Funnels: '' as IntlString, LeadApplication: '' as IntlString, - Lead: '' as IntlString, Title: '' as IntlString, ManageFunnelStatuses: '' as IntlString, GotoLeadApplication: '' as IntlString, diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts index 0e66e96b9b..9c9d4b37fe 100644 --- a/models/recruit/src/index.ts +++ b/models/recruit/src/index.ts @@ -695,8 +695,7 @@ export function createModel (builder: Builder): void { label: recruit.string.Talent, sortingKey: '$lookup.attachedTo.name', props: { - _class: recruit.mixin.Candidate, - inline: true + _class: recruit.mixin.Candidate } }, { key: 'attachments', displayProps: { key: 'attachments', suffix: true } }, @@ -712,7 +711,6 @@ export function createModel (builder: Builder): void { key: '$lookup.space.company', displayProps: { fixed: 'left', key: 'company' }, props: { - inline: true, maxWidth: '10rem' } }, diff --git a/packages/presentation/src/components/NavLink.svelte b/packages/presentation/src/components/NavLink.svelte index 0a917f4414..698ec93d29 100644 --- a/packages/presentation/src/components/NavLink.svelte +++ b/packages/presentation/src/components/NavLink.svelte @@ -91,21 +91,24 @@ &:not(.colorInherit) { color: var(--theme-content-color); } - &.colorInherit { + &.colorInherit, + &.inline { color: inherit; } &.inline { display: inline-flex; align-items: center; + text-decoration: none; } &.noUnderline { + text-decoration: none; &:not(.colorInherit) { color: var(--theme-caption-color); } } - &:not(.noUnderline) { + &:not(.noUnderline, .inline) { &:hover { text-decoration: underline; &:not(.colorInherit) { diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index b8754a518f..87bcea3305 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -278,6 +278,12 @@ input.search { .flex-gap-1-5 { gap: .375rem; } .flex-gap-1 { gap: .25rem; } +.flex-between-half-content > * { + flex-basis: 50%; + + &:last-child { justify-content: flex-end; } +} + .flex-break { flex-basis: 100%; height: 0; diff --git a/plugins/chunter-resources/src/components/Message.svelte b/plugins/chunter-resources/src/components/Message.svelte index 1d8328d4f5..e2e79aaee3 100644 --- a/plugins/chunter-resources/src/components/Message.svelte +++ b/plugins/chunter-resources/src/components/Message.svelte @@ -208,7 +208,7 @@
{#if employee} - + {/if} {getTime(message.createdOn ?? 0)} {#if message.editedOn} diff --git a/plugins/contact-resources/src/components/OrganizationPresenter.svelte b/plugins/contact-resources/src/components/OrganizationPresenter.svelte index 51e622ff72..3a37da406d 100644 --- a/plugins/contact-resources/src/components/OrganizationPresenter.svelte +++ b/plugins/contact-resources/src/components/OrganizationPresenter.svelte @@ -29,16 +29,17 @@ {#if value} -
- {#if !inline} -
- {/if} - {value.name} -
+ {#if inline} + + @{value.name} + + {:else} +
+ {#if !inline} +
+ {/if} + {value.name} +
+ {/if}
{/if} diff --git a/plugins/contact-resources/src/components/PersonContent.svelte b/plugins/contact-resources/src/components/PersonContent.svelte index fe2a8070fc..591940aa74 100644 --- a/plugins/contact-resources/src/components/PersonContent.svelte +++ b/plugins/contact-resources/src/components/PersonContent.svelte @@ -69,28 +69,33 @@ {#if value} - - {#if !inline && shouldShowAvatar} - - - - {/if} - {#if shouldShowName} - {getName(client.getHierarchy(), value)} - {/if} - + {#if inline} + + @{getName(client.getHierarchy(), value)} + + {:else} + + {#if shouldShowAvatar} + + + + {/if} + {#if shouldShowName} + {getName(client.getHierarchy(), value)} + {/if} + + {/if} {#if statusLabel} @@ -128,10 +133,6 @@ align-items: center; flex-wrap: nowrap; - &.inline-presenter { - display: inline-flex; - align-items: baseline; - } .eContentPresenterIcon { color: var(--theme-dark-color); } diff --git a/plugins/document-resources/src/components/DocumentPresenter.svelte b/plugins/document-resources/src/components/DocumentPresenter.svelte index 16376aa9f1..72e8ceb4cf 100644 --- a/plugins/document-resources/src/components/DocumentPresenter.svelte +++ b/plugins/document-resources/src/components/DocumentPresenter.svelte @@ -17,7 +17,8 @@ {#if value} - - {#if !inline} + + {#if inline} + + @{value.name}-{value.version} + + {:else}
+ {value.name}-{value.version} {/if} - {value.name}-{value.version} -
+ {/if} diff --git a/plugins/inventory-resources/src/components/CategoryPresenter.svelte b/plugins/inventory-resources/src/components/CategoryPresenter.svelte index 6d0bded53c..7f4db1ae4b 100644 --- a/plugins/inventory-resources/src/components/CategoryPresenter.svelte +++ b/plugins/inventory-resources/src/components/CategoryPresenter.svelte @@ -16,6 +16,8 @@ - - {#if !inline && shouldShowAvatar} -
- -
- {/if} - - {label} + {#if inline} + @{label} + {:else} + + {#if shouldShowAvatar} +
+ +
+ {/if} + + {label} +
-
+ {/if}
diff --git a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte index 728fd2f123..e61f812d68 100644 --- a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte +++ b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte @@ -58,17 +58,21 @@ component={tracker.component.EditIssue} shrink={0} > - - {#if !inline && shouldShowAvatar} -
- -
- {/if} - - {title} - + {#if inline} + @{title} + {:else} + + {#if shouldShowAvatar} +
+ +
+ {/if} + + {title} + +
-
+ {/if} {/if} @@ -92,18 +96,5 @@ margin-right: 0.5rem; color: var(--theme-dark-color); } - - &.inline { - display: inline-flex; - align-items: baseline; - - .icon { - transform: translateY(0.2rem); - } - .select-text { - font-weight: 500; - color: var(--theme-caption-color); - } - } } diff --git a/plugins/tracker-resources/src/components/milestones/MilestonePresenter.svelte b/plugins/tracker-resources/src/components/milestones/MilestonePresenter.svelte index 36b561cc6e..d216943858 100644 --- a/plugins/tracker-resources/src/components/milestones/MilestonePresenter.svelte +++ b/plugins/tracker-resources/src/components/milestones/MilestonePresenter.svelte @@ -15,7 +15,13 @@