From 410b0a27b09fbae893dc82fabe22dfdc7bae97ed Mon Sep 17 00:00:00 2001 From: Alexander Platov Date: Mon, 12 Aug 2024 08:23:14 +0700 Subject: [PATCH 1/2] Added Settings UI tests, UI fix Signed-off-by: Alexander Platov --- .../presentation/src/components/Card.svelte | 2 + packages/theme/styles/dialogs.scss | 4 + .../ui/src/components/DropdownLabels.svelte | 2 + .../src/components/ClassAttributes.svelte | 1 + .../spaceTypes/CreateSpaceType.svelte | 1 + .../SpaceTypeGeneralSectionEditor.svelte | 2 +- .../editor/SpaceTypeRolesSectionEditor.svelte | 1 + ...ProjectTypeCollectionsSectionEditor.svelte | 2 +- .../ProjectTypeTasksTypeSectionEditor.svelte | 1 + .../taskTypes/TaskKindSelector.svelte | 7 +- .../taskTypes/TaskTypeEditor.svelte | 1 + .../src/components/CreateIssue.svelte | 14 +- .../src/components/ColorsPopup.svelte | 2 + tests/sanity/tests/contacts.spec.ts | 1 + .../tests/model/contacts/contract-page.ts | 5 + tests/sanity/tests/model/settings-page.ts | 131 ++++++++++++++++++ .../sanity/tests/model/tracker/issues-page.ts | 4 +- .../tests/model/tracker/templates-page.ts | 20 ++- tests/sanity/tests/model/types.ts | 18 +++ tests/sanity/tests/settings.spec.ts | 44 +++++- tests/sanity/tests/tracker/tracker.utils.ts | 9 +- 21 files changed, 256 insertions(+), 16 deletions(-) create mode 100644 tests/sanity/tests/model/settings-page.ts diff --git a/packages/presentation/src/components/Card.svelte b/packages/presentation/src/components/Card.svelte index 6bba7cb7265..bdeab3d2bbf 100644 --- a/packages/presentation/src/components/Card.svelte +++ b/packages/presentation/src/components/Card.svelte @@ -41,6 +41,7 @@ export let numberOfBlocks: number = 0 export let thinHeader: boolean = false export let accentHeader: boolean = false + export let headerNoPadding: boolean = false export let hideSubheader: boolean = false export let hideContent: boolean = false export let hideAttachments: boolean = false @@ -108,6 +109,7 @@ class="antiCard-header" class:withSub={$$slots.subheader && !hideSubheader} class:thinHeader + class:noPadding={headerNoPadding} class:border-bottom-popup-divider={headerDivide} >
diff --git a/packages/theme/styles/dialogs.scss b/packages/theme/styles/dialogs.scss index e94e82b2b16..5867c2727f1 100644 --- a/packages/theme/styles/dialogs.scss +++ b/packages/theme/styles/dialogs.scss @@ -44,6 +44,10 @@ &.withSub.thinHeader { padding: 1rem 1.5rem 0; } &.thinHeader:not(.withSub) { padding: 1rem 1.5rem; } &:not(.withSub, .thinHeader) { padding: 1.5rem; } + &.noPadding { + padding: 0 1.5rem; + min-height: 4.75rem; + } &__title-wrap { display: flex; diff --git a/packages/ui/src/components/DropdownLabels.svelte b/packages/ui/src/components/DropdownLabels.svelte index dc35099bc35..2f58b2d8cd0 100644 --- a/packages/ui/src/components/DropdownLabels.svelte +++ b/packages/ui/src/components/DropdownLabels.svelte @@ -33,6 +33,7 @@ export let allowDeselect: boolean = false export let showDropdownIcon: boolean = false + export let dataId: string | undefined = undefined export let kind: ButtonKind = 'no-border' export let size: ButtonSize = 'small' export let justify: 'left' | 'center' = 'center' @@ -68,6 +69,7 @@ {justify} {disabled} pressed={opened} + {dataId} showTooltip={{ label, direction: labelDirection }} on:click={() => { if (!opened) { diff --git a/plugins/setting-resources/src/components/ClassAttributes.svelte b/plugins/setting-resources/src/components/ClassAttributes.svelte index 2f2d14a85f1..39b62951a4c 100644 --- a/plugins/setting-resources/src/components/ClassAttributes.svelte +++ b/plugins/setting-resources/src/components/ClassAttributes.svelte @@ -157,6 +157,7 @@ kind={'primary'} icon={IconAdd} size={'small'} + dataId={'btnAdd'} {disabled} on:click={(ev) => { createAttribute(ev) diff --git a/plugins/setting-resources/src/components/spaceTypes/CreateSpaceType.svelte b/plugins/setting-resources/src/components/spaceTypes/CreateSpaceType.svelte index 12fbdb3969d..14be159fcba 100644 --- a/plugins/setting-resources/src/components/spaceTypes/CreateSpaceType.svelte +++ b/plugins/setting-resources/src/components/spaceTypes/CreateSpaceType.svelte @@ -109,6 +109,7 @@ searchField="name" showNavigate={false} focusIndex={20000} + id={'selectSpaceType'} />
diff --git a/plugins/setting-resources/src/components/spaceTypes/editor/SpaceTypeGeneralSectionEditor.svelte b/plugins/setting-resources/src/components/spaceTypes/editor/SpaceTypeGeneralSectionEditor.svelte index 8f59da973e0..35a9a507825 100644 --- a/plugins/setting-resources/src/components/spaceTypes/editor/SpaceTypeGeneralSectionEditor.svelte +++ b/plugins/setting-resources/src/components/spaceTypes/editor/SpaceTypeGeneralSectionEditor.svelte @@ -85,7 +85,7 @@
- + { $settingsStore = { id: 'createRole', component: CreateRole, props: { type, descriptor } } diff --git a/plugins/task-resources/src/components/projectTypes/ProjectTypeCollectionsSectionEditor.svelte b/plugins/task-resources/src/components/projectTypes/ProjectTypeCollectionsSectionEditor.svelte index f3710663d80..c2c63f5e13c 100644 --- a/plugins/task-resources/src/components/projectTypes/ProjectTypeCollectionsSectionEditor.svelte +++ b/plugins/task-resources/src/components/projectTypes/ProjectTypeCollectionsSectionEditor.svelte @@ -26,6 +26,6 @@
- {}} /> + {}} />
{/if} diff --git a/plugins/task-resources/src/components/projectTypes/ProjectTypeTasksTypeSectionEditor.svelte b/plugins/task-resources/src/components/projectTypes/ProjectTypeTasksTypeSectionEditor.svelte index 468c01eeca6..013aa1de7c0 100644 --- a/plugins/task-resources/src/components/projectTypes/ProjectTypeTasksTypeSectionEditor.svelte +++ b/plugins/task-resources/src/components/projectTypes/ProjectTypeTasksTypeSectionEditor.svelte @@ -63,6 +63,7 @@ kind="primary" icon={IconAdd} size="small" + dataId={'btnAdd'} {disabled} on:click={(ev) => { if (disabled) { diff --git a/plugins/task-resources/src/components/taskTypes/TaskKindSelector.svelte b/plugins/task-resources/src/components/taskTypes/TaskKindSelector.svelte index 2d1e60f3472..c37fa941068 100644 --- a/plugins/task-resources/src/components/taskTypes/TaskKindSelector.svelte +++ b/plugins/task-resources/src/components/taskTypes/TaskKindSelector.svelte @@ -2,7 +2,7 @@ import { Class, Doc, Ref, toIdMap } from '@hcengineering/core' import { getClient } from '@hcengineering/presentation' import task, { ProjectType, TaskType } from '@hcengineering/task' - import { ButtonKind, DropdownLabels } from '@hcengineering/ui' + import { ButtonKind, ButtonSize, DropdownLabels } from '@hcengineering/ui' import { createEventDispatcher, onDestroy } from 'svelte' import { selectedTaskTypeStore, taskTypeStore } from '../..' @@ -11,7 +11,9 @@ export let focusIndex: number = -1 export let baseClass: Ref> | undefined = undefined export let kind: ButtonKind = 'regular' + export let size: ButtonSize = 'medium' export let allTypes = false + const client = getClient() $: taskTypeDescriptors = toIdMap(client.getModel().findAllSync(task.class.TaskTypeDescriptor, {})) @@ -48,8 +50,9 @@ diff --git a/plugins/tracker-resources/src/components/CreateIssue.svelte b/plugins/tracker-resources/src/components/CreateIssue.svelte index df400714996..8e95353b38d 100644 --- a/plugins/tracker-resources/src/components/CreateIssue.svelte +++ b/plugins/tracker-resources/src/components/CreateIssue.svelte @@ -741,6 +741,7 @@ onCancel={showConfirmationDialog} hideAttachments={attachments.size === 0} hideSubheader={parentIssue == null} + headerNoPadding noFade={true} on:changeContent > @@ -778,11 +779,16 @@ -
-
+
+
- + + {#if relatedTo}