diff --git a/models/board/src/index.ts b/models/board/src/index.ts index f55e2a54e9..64cf6c320f 100644 --- a/models/board/src/index.ts +++ b/models/board/src/index.ts @@ -286,7 +286,7 @@ export function createModel (builder: Builder): void { value: 'object' }, label: board.string.Labels, - icon: board.icon.Card, + icon: tags.icon.Tags, input: 'any', inline: true, category: board.category.Card, diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts index 86a96a039e..a9d3b3c60a 100644 --- a/models/recruit/src/index.ts +++ b/models/recruit/src/index.ts @@ -95,7 +95,7 @@ export class TCandidate extends TPerson implements Candidate { @Index(IndexKind.FullText) source?: string - @Prop(Collection(tags.class.TagReference, recruit.string.SkillLabel), recruit.string.SkillsLabel) + @Prop(Collection(tags.class.TagReference, recruit.string.SkillLabel), recruit.string.SkillsLabel, recruit.icon.Skills) skills?: number @Prop(Collection(recruit.class.Review, recruit.string.Review), recruit.string.Reviews) @@ -215,7 +215,7 @@ export function createModel (builder: Builder): void { { id: skillsId, component: recruit.component.SkillsView, - icon: tags.icon.Tags, + icon: recruit.icon.Skills, label: recruit.string.SkillsLabel, createItemLabel: recruit.string.SkillCreateLabel, position: 'bottom' @@ -275,7 +275,8 @@ export function createModel (builder: Builder): void { sortingKey: 'skills', props: { _class: recruit.mixin.Candidate, - key: 'skills' + key: 'skills', + icon: recruit.icon.Skills } }, 'modifiedOn', diff --git a/models/recruit/src/migration.ts b/models/recruit/src/migration.ts index 031b705d37..876ba9101e 100644 --- a/models/recruit/src/migration.ts +++ b/models/recruit/src/migration.ts @@ -49,7 +49,7 @@ async function createDefaults (tx: TxOperations): Promise { tags.class.TagCategory, tags.space.Tags, { - icon: tags.icon.Tags, + icon: recruit.icon.Skills, label: 'Other', targetClass: recruit.mixin.Candidate, tags: [], @@ -64,7 +64,7 @@ async function createDefaults (tx: TxOperations): Promise { tags.class.TagCategory, tags.space.Tags, { - icon: tags.icon.Tags, + icon: recruit.icon.Skills, label: c.label, targetClass: recruit.mixin.Candidate, tags: c.skills, diff --git a/plugins/board-resources/src/components/TableView.svelte b/plugins/board-resources/src/components/TableView.svelte index 85c51b71a7..fc4963ee34 100644 --- a/plugins/board-resources/src/components/TableView.svelte +++ b/plugins/board-resources/src/components/TableView.svelte @@ -26,13 +26,17 @@ '$lookup.state', { key: '', - presenter: tags.component.TagsAttributeEditor, - props: { isEditable: false }, - label: board.string.Labels + presenter: tags.component.TagsPresenter, + label: board.string.Labels, + sortingKey: 'labels', + props: { + _class: board.class.Card, + key: 'labels' + } }, 'startDate', 'dueDate', - { key: 'members', presenter: board.component.UserBoxList, label: board.string.Members, sortingKey: '' }, + { key: 'members', presenter: board.component.UserBoxList, label: board.string.Members, sortingKey: 'members' }, 'modifiedOn' ]} {options} diff --git a/plugins/recruit-assets/assets/icons.svg b/plugins/recruit-assets/assets/icons.svg index 43eaf04099..f0a0aa5127 100644 --- a/plugins/recruit-assets/assets/icons.svg +++ b/plugins/recruit-assets/assets/icons.svg @@ -32,4 +32,7 @@ + + + diff --git a/plugins/recruit-assets/src/index.ts b/plugins/recruit-assets/src/index.ts index 404ddd3c9e..b72427d4a3 100644 --- a/plugins/recruit-assets/src/index.ts +++ b/plugins/recruit-assets/src/index.ts @@ -26,7 +26,8 @@ loadMetadata(recruit.icon, { Application: `${icons}#application`, Review: `${icons}#application`, Opinion: `${icons}#application`, - CreateCandidate: `${icons}#new-candidate` + CreateCandidate: `${icons}#new-candidate`, + Skills: `${icons}#skills` }) addStringsLoader(recruitId, async (lang: string) => await import(`../lang/${lang}.json`)) diff --git a/plugins/recruit-resources/src/components/SkillsView.svelte b/plugins/recruit-resources/src/components/SkillsView.svelte index d15cc124b6..7b83e820e3 100644 --- a/plugins/recruit-resources/src/components/SkillsView.svelte +++ b/plugins/recruit-resources/src/components/SkillsView.svelte @@ -17,6 +17,7 @@ props={{ targetClass: recruit.mixin.Candidate, title: recruit.string.SkillsLabel, + icon: recruit.icon.Skills, item: recruit.string.SkillLabel, key: 'skills', сreateItemLabel: recruit.string.SkillCreateLabel, diff --git a/plugins/recruit/src/index.ts b/plugins/recruit/src/index.ts index ae43634fdd..78d86ac226 100644 --- a/plugins/recruit/src/index.ts +++ b/plugins/recruit/src/index.ts @@ -119,7 +119,8 @@ const recruit = plugin(recruitId, { Application: '' as Asset, Review: '' as Asset, Opinion: '' as Asset, - CreateCandidate: '' as Asset + CreateCandidate: '' as Asset, + Skills: '' as Asset }, space: { VacancyTemplates: '' as Ref, diff --git a/plugins/tags-assets/assets/icons.svg b/plugins/tags-assets/assets/icons.svg index d17e16b800..c00325b710 100644 --- a/plugins/tags-assets/assets/icons.svg +++ b/plugins/tags-assets/assets/icons.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/plugins/tags-resources/src/components/TagElementCountPresenter.svelte b/plugins/tags-resources/src/components/TagElementCountPresenter.svelte index cdefd29b7d..5b7765c0b8 100644 --- a/plugins/tags-resources/src/components/TagElementCountPresenter.svelte +++ b/plugins/tags-resources/src/components/TagElementCountPresenter.svelte @@ -14,18 +14,20 @@ --> {#if (tagElements?.get(value._id)?.count ?? 0) > 0}
onTag?.(value)}> - +  {tagElements?.get(value._id)?.count ?? 0}
{/if} diff --git a/plugins/tags-resources/src/components/TagsAttributeEditor.svelte b/plugins/tags-resources/src/components/TagsAttributeEditor.svelte index 7b84049857..0ad01da736 100644 --- a/plugins/tags-resources/src/components/TagsAttributeEditor.svelte +++ b/plugins/tags-resources/src/components/TagsAttributeEditor.svelte @@ -28,9 +28,11 @@ {#each items as value} {/each} - + {#if isEditable} + + {/if} {:else if isEditable}