diff --git a/plugins/tracker-resources/src/components/issues/CategoryPresenter.svelte b/plugins/tracker-resources/src/components/issues/CategoryPresenter.svelte index 3e190d57d2..8ae0ef7156 100644 --- a/plugins/tracker-resources/src/components/issues/CategoryPresenter.svelte +++ b/plugins/tracker-resources/src/components/issues/CategoryPresenter.svelte @@ -61,13 +61,11 @@ { showPanel(tracker.component.EditIssue, value._id, value._class, 'content') } {#if value && shortLabel} -
+
- {currentTeam.identifier}-{value.number} + {issueName}
{/if} + + diff --git a/plugins/tracker-resources/src/components/issues/IssuesList.svelte b/plugins/tracker-resources/src/components/issues/IssuesList.svelte index 7279d88ce9..d1250ca598 100644 --- a/plugins/tracker-resources/src/components/issues/IssuesList.svelte +++ b/plugins/tracker-resources/src/components/issues/IssuesList.svelte @@ -23,8 +23,7 @@ export let _class: Ref> export let baseMenuClass: Ref> | undefined = undefined - export let leftItemsConfig: (BuildModelKey | string)[] - export let rightItemsConfig: (BuildModelKey | string)[] | undefined = undefined + export let itemsConfig: (BuildModelKey | string)[] export let options: FindOptions | undefined = undefined export let query: DocumentQuery @@ -92,16 +91,9 @@ return props.length } - - const buildItemModels = async () => { - const leftModels = await buildModel({ client, _class, keys: leftItemsConfig, options }) - const rightModels = rightItemsConfig && (await buildModel({ client, _class, keys: rightItemsConfig, options })) - - return { leftModels, rightModels } - } -{#await buildItemModels()} +{#await buildModel({ client, _class, keys: itemsConfig, options })} {#if !isLoading} {/if} @@ -114,78 +106,68 @@ class:mListGridChecked={selectedIssueIds.has(docObject._id)} class:mListGridFixed={rowIndex === selectedRowIndex} > -
- {#each itemModels.leftModels as attributeModel, attributeModelIndex} - {#if attributeModelIndex === 0} -
- -
- { - handleIssueSelected(docObject._id, event) - }} - /> -
-
-
- + +
+ { + handleIssueSelected(docObject._id, event) + }} />
-
- {:else if attributeModelIndex === 1} -
- -
showMenu(event, docObject, rowIndex)} - > - -
-
- {:else} -
+ +
- {/if} - {/each} -
- {#if itemModels.rightModels} -
- {#each itemModels.rightModels as attributeModel} -
- +
+ {:else if attributeModelIndex === 1} +
+ +
showMenu(event, docObject, rowIndex)} + > +
- {/each} -
- {/if} +
+ {:else if attributeModelIndex === 3} + +
+ {:else} +
+ +
+ {/if} + {/each}
{/each} {:else if loadingProps !== undefined} {#each Array(getLoadingElementsLength(loadingProps, options)) as _, rowIndex}
-
-
- -
- -
+
+ +
+
@@ -206,7 +188,6 @@ .listGrid { display: flex; align-items: center; - justify-content: space-between; height: 3.25rem; color: var(--theme-caption-color); border-bottom: 1px solid var(--theme-button-border-hovered); @@ -245,9 +226,9 @@ } } - .modelsContainer { + .filler { display: flex; - align-items: center; + flex-grow: 1; } .gridElement { @@ -268,6 +249,8 @@ .issuePresenter { display: flex; align-items: center; + flex-shrink: 0; + width: 5.5rem; margin-left: 0.5rem; .eIssuePresenterContextMenu { diff --git a/plugins/tracker-resources/src/components/issues/ModificationDatePresenter.svelte b/plugins/tracker-resources/src/components/issues/ModificationDatePresenter.svelte index 9b66d90c7b..1c71da13b0 100644 --- a/plugins/tracker-resources/src/components/issues/ModificationDatePresenter.svelte +++ b/plugins/tracker-resources/src/components/issues/ModificationDatePresenter.svelte @@ -29,5 +29,13 @@ - {shortModificationDate} + {shortModificationDate} + + diff --git a/plugins/tracker-resources/src/components/issues/TitlePresenter.svelte b/plugins/tracker-resources/src/components/issues/TitlePresenter.svelte index 8b5a917882..7e2f3afd25 100644 --- a/plugins/tracker-resources/src/components/issues/TitlePresenter.svelte +++ b/plugins/tracker-resources/src/components/issues/TitlePresenter.svelte @@ -16,8 +16,22 @@ import type { Issue } from '@anticrm/tracker' export let value: Issue + export let shouldUseMargin: boolean = false {#if value} - {value.title} + {value.title} {/if} + +