wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-06-06 07:46:32 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Activity: remove inline from presenters. DoneStatesPopup fix. (#3664)

Browse Source 
Signed-off-by: Alexander Platov <sas_lord@mail.ru>
This commit is contained in:
Alexander Platov 2023-09-06 14:41:51 +03:00 committed by GitHub
parent 7c2aa9f282
commit d7fa8c3800
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/activity-resources/src/components/TxView.svelte
View File

@ -247,7 +247,7 @@
{#if value.isObjectAdded} {#if value.isObjectAdded}
<ObjectPresenter value={cvalue} inline accent /> <ObjectPresenter value={cvalue} inline accent />
{:else} {:else}
<svelte:component this={m.presenter} value={cvalue} inline accent /> <svelte:component this={m.presenter} value={cvalue} accent />
{/if} {/if}
{/each} {/each}
{:else if value.removed.length} {:else if value.removed.length}
@ -256,9 +256,9 @@
<span class="lower"><Label label={m.label} /></span> <span class="lower"><Label label={m.label} /></span>
{#each value.removed as cvalue} {#each value.removed as cvalue}
{#if value.isObjectRemoved} {#if value.isObjectRemoved}
<ObjectPresenter value={cvalue} inline accent /> <ObjectPresenter value={cvalue} accent />
{:else} {:else}
<svelte:component this={m.presenter} value={cvalue} inline accent /> <svelte:component this={m.presenter} value={cvalue} accent />
{/if} {/if}
{/each} {/each}
{:else if value.set === null || value.set === undefined || value.set === ''} {:else if value.set === null || value.set === undefined || value.set === ''}
@ -272,9 +272,9 @@
<span class="lower"><Label label={activity.string.To} /></span> <span class="lower"><Label label={activity.string.To} /></span>
<span class="strong overflow-label"> <span class="strong overflow-label">
{#if value.isObjectSet} {#if value.isObjectSet}
<ObjectPresenter value={value.set} inline accent /> <ObjectPresenter value={value.set} accent />
{:else} {:else}
<svelte:component this={m.presenter} value={value.set} inline accent /> <svelte:component this={m.presenter} value={value.set} accent />
{/if} {/if}
</span> </span>
{:else} {:else}
@ -300,9 +300,9 @@
{#if !hasMessageType} {#if !hasMessageType}
<div class="strong overflow-label"> <div class="strong overflow-label">
{#if value.isObjectSet} {#if value.isObjectSet}
<ObjectPresenter value={value.set} inline accent /> <ObjectPresenter value={value.set} accent />
{:else} {:else}
<svelte:component this={m.presenter} value={value.set} inline accent /> <svelte:component this={m.presenter} value={value.set} accent />
{/if} {/if}
</div> </div>
{/if} {/if}
@ -313,9 +313,9 @@
{#if tx.collectionAttribute !== undefined && (tx.txDocIds?.size ?? 0) > 1} {#if tx.collectionAttribute !== undefined && (tx.txDocIds?.size ?? 0) > 1}
<TxViewTx {tx} {onCancelEdit} {edit} {viewlet} /> <TxViewTx {tx} {onCancelEdit} {edit} {viewlet} />
{:else if typeof viewlet.component === 'string'} {:else if typeof viewlet.component === 'string'}
<Component is={viewlet.component} {props} on:close={onCancelEdit} inline /> <Component is={viewlet.component} {props} on:close={onCancelEdit} />
{:else} {:else}
<svelte:component this={viewlet.component} {...props} on:close={onCancelEdit} inline /> <svelte:component this={viewlet.component} {...props} on:close={onCancelEdit} />
{/if} {/if}
{/if} {/if}
</div> </div>
@ -355,9 +355,9 @@
<div class="activity-content content" class:indent={isAttached} class:contentHidden> <div class="activity-content content" class:indent={isAttached} class:contentHidden>
<ShowMore ignore={edit || prevValue !== undefined}> <ShowMore ignore={edit || prevValue !== undefined}>
{#if value.isObjectSet} {#if value.isObjectSet}
<ObjectPresenter value={value.set} inline /> <ObjectPresenter value={value.set} />
{:else if showDiff} {:else if showDiff}
<svelte:component this={model[0].presenter} value={value.set} inline {prevValue} showOnlyDiff /> <svelte:component this={model[0].presenter} value={value.set} {prevValue} showOnlyDiff />
{/if} {/if}
</ShowMore> </ShowMore>
</div> </div>
@ -410,7 +410,7 @@
} }
.msgactivity-content__title { .msgactivity-content__title {
display: inline-flex; display: inline-flex;
align-items: baseline; align-items: center;
flex-grow: 1; flex-grow: 1;
min-width: 0; min-width: 0;
} }

8
plugins/activity-resources/src/components/TxViewTx.svelte
View File

@ -27,9 +27,9 @@
<IconAdd size={'x-small'} fill={'var(--theme-trans-color)'} /> <IconAdd size={'x-small'} fill={'var(--theme-trans-color)'} />
{/if} {/if}
{#if typeof viewlet?.component === 'string'} {#if typeof viewlet?.component === 'string'}
<Component is={viewlet?.component} props={getProps(ctx, edit)} disabled inline on:close={onCancelEdit} /> <Component is={viewlet?.component} props={getProps(ctx, edit)} disabled on:close={onCancelEdit} />
{:else} {:else}
<svelte:component this={viewlet?.component} {...getProps(ctx, edit)} disabled inline on:close={onCancelEdit} /> <svelte:component this={viewlet?.component} {...getProps(ctx, edit)} disabled on:close={onCancelEdit} />
{/if} {/if}
<div class="antiHSpacer" /> <div class="antiHSpacer" />
{/each} {/each}
@ -38,9 +38,9 @@
<IconDelete size={'x-small'} fill={'var(--theme-trans-color)'} /> <IconDelete size={'x-small'} fill={'var(--theme-trans-color)'} />
{/if} {/if}
{#if typeof viewlet?.component === 'string'} {#if typeof viewlet?.component === 'string'}
<Component is={viewlet?.component} props={getProps(ctx, edit)} disabled inline on:close={onCancelEdit} /> <Component is={viewlet?.component} props={getProps(ctx, edit)} disabled on:close={onCancelEdit} />
{:else} {:else}
<svelte:component this={viewlet?.component} {...getProps(ctx, edit)} disabled inline on:close={onCancelEdit} /> <svelte:component this={viewlet?.component} {...getProps(ctx, edit)} disabled on:close={onCancelEdit} />
{/if} {/if}
<div class="antiHSpacer" /> <div class="antiHSpacer" />
{/each} {/each}

2
plugins/chunter-resources/src/components/activity/TxBacklinkReference.svelte
View File

@ -47,6 +47,6 @@
{#if presenter} {#if presenter}
<span class="labels-row"> <span class="labels-row">
<svelte:component this={presenter.presenter} value={doc} inline disabled /> <svelte:component this={presenter.presenter} value={doc} disabled />
</span> </span>
{/if} {/if}

2
plugins/task-resources/src/components/state/DoneStatesPopup.svelte
View File

@ -54,6 +54,7 @@
</script> </script>
<div class="selectPopup" use:resizeObserver={() => dispatch('changeContent')}> <div class="selectPopup" use:resizeObserver={() => dispatch('changeContent')}>
<div class="menu-space" />
<div class="scroll"> <div class="scroll">
<div class="box"> <div class="box">
{#each states as state} {#each states as state}
@ -80,4 +81,5 @@
</button> </button>
</div> </div>
</div> </div>
<div class="menu-space" />
</div> </div>

2
plugins/tracker-resources/src/components/activity/TxIssueCreated.svelte
View File

@ -28,5 +28,5 @@
<Label label={isSub ? tracker.string.CreatedSubIssue : tracker.string.CreatedIssue} /> <Label label={isSub ? tracker.string.CreatedSubIssue : tracker.string.CreatedIssue} />
</div> </div>
{#if !isOwnTx} {#if !isOwnTx}
<IssuePresenter {value} inline /> <IssuePresenter {value} />
{/if} {/if}