From d555409ca117ffc6953e710aab365e001690eb13 Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Tue, 11 Jan 2022 16:05:53 +0700 Subject: [PATCH] Unify contacts (#778) Signed-off-by: Andrey Sobolev --- models/contact/src/index.ts | 49 ++---- models/contact/src/plugin.ts | 4 +- models/recruit/src/index.ts | 8 +- models/recruit/src/plugin.ts | 4 +- models/view/src/index.ts | 9 +- packages/core/src/hierarchy.ts | 11 +- packages/ui/src/components/Menu.svelte | 15 +- plugins/contact-assets/lang/en.json | 3 +- plugins/contact-resources/package.json | 3 +- .../src/components/Contacts.svelte | 122 +++++++++++++++ .../src/components/CreateContact.svelte | 32 ++++ .../src/components/CreateOrganization.svelte | 11 +- .../src/components/CreatePerson.svelte | 11 +- .../src/components/EditContact.svelte | 21 +-- .../src/components/EditPerson.svelte | 14 +- .../src/components/RolePresenter.svelte | 72 +++++++++ .../src/components/icons/Edit.svelte | 24 +++ plugins/contact-resources/src/index.ts | 6 +- plugins/contact-resources/src/plugin.ts | 3 +- plugins/contact-resources/src/utils.ts | 10 ++ plugins/contact/src/index.ts | 19 ++- .../src/components/ModelView.svelte | 2 + .../src/components/CreateCandidate.svelte | 17 +- .../src/components/EditCandidate.svelte | 148 ------------------ .../src/components/KanbanCard.svelte | 6 +- plugins/recruit-resources/src/index.ts | 30 ++-- .../view-resources/src/components/Menu.svelte | 16 +- plugins/view/src/index.ts | 13 +- .../src/components/Workbench.svelte | 135 +++++++++------- plugins/workbench/src/index.ts | 3 + 30 files changed, 466 insertions(+), 355 deletions(-) create mode 100644 plugins/contact-resources/src/components/Contacts.svelte create mode 100644 plugins/contact-resources/src/components/CreateContact.svelte create mode 100644 plugins/contact-resources/src/components/RolePresenter.svelte create mode 100644 plugins/contact-resources/src/components/icons/Edit.svelte create mode 100644 plugins/contact-resources/src/utils.ts delete mode 100644 plugins/recruit-resources/src/components/EditCandidate.svelte diff --git a/models/contact/src/index.ts b/models/contact/src/index.ts index b634787e3d..a641ec9f7e 100644 --- a/models/contact/src/index.ts +++ b/models/contact/src/index.ts @@ -71,13 +71,14 @@ export class TContact extends TDoc implements Contact { @Prop(Collection(chunter.class.Comment), 'Comments' as IntlString) comments?: number + + @Prop(TypeString(), 'Location' as IntlString) + city!: string } @Model(contact.class.Person, contact.class.Contact) @UX('Person' as IntlString, contact.icon.Person, undefined, 'name') export class TPerson extends TContact implements Person { - @Prop(TypeString(), 'City' as IntlString) - city!: string } @Model(contact.class.Organization, contact.class.Contact) @@ -85,6 +86,7 @@ export class TPerson extends TContact implements Person { export class TOrganization extends TContact implements Organization {} @Model(contact.class.Employee, contact.class.Person) +@UX('Employee' as IntlString, contact.icon.Person) export class TEmployee extends TPerson implements Employee {} @Model(contact.class.EmployeeAccount, core.class.Account) @@ -114,44 +116,23 @@ export function createModel (builder: Builder): void { TEmployeeAccount ) - builder.mixin(contact.class.Persons, core.class.Class, workbench.mixin.SpaceView, { - view: { - class: contact.class.Person, - createItemDialog: contact.component.CreatePerson - } + builder.mixin(contact.class.Person, core.class.Class, view.mixin.ObjectFactory, { + component: contact.component.CreatePerson }) - builder.mixin(contact.class.Organizations, core.class.Class, workbench.mixin.SpaceView, { - view: { - class: contact.class.Organization, - createItemDialog: contact.component.CreateOrganization - } + builder.mixin(contact.class.Organization, core.class.Class, view.mixin.ObjectFactory, { + component: contact.component.CreateOrganization }) builder.createDoc(workbench.class.Application, core.space.Model, { label: contact.string.Contacts, icon: contact.icon.Person, hidden: false, - navigatorModel: { - spaces: [ - { - label: contact.string.Persons, - spaceClass: contact.class.Persons, - addSpaceLabel: contact.string.CreatePersons, - createComponent: contact.component.CreatePersons - }, - { - label: contact.string.Organizations, - spaceClass: contact.class.Organizations, - addSpaceLabel: contact.string.CreateOrganizations, - createComponent: contact.component.CreateOrganizations - } - ] - } + component: contact.component.Contacts }, contact.app.Contacts) builder.createDoc(view.class.Viewlet, core.space.Model, { - attachTo: contact.class.Person, + attachTo: contact.class.Contact, descriptor: view.viewlet.Table, open: contact.component.EditContact, // eslint-disable-next-line @typescript-eslint/consistent-type-assertions @@ -161,19 +142,11 @@ export function createModel (builder: Builder): void { 'city', { presenter: attachment.component.AttachmentsPresenter, label: 'Files', sortingKey: 'attachments' }, 'modifiedOn', + { presenter: contact.component.RolePresenter, label: 'Role' }, 'channels' ] }) - builder.createDoc(view.class.Viewlet, core.space.Model, { - attachTo: contact.class.Organization, - descriptor: view.viewlet.Table, - open: contact.component.EditContact, - // eslint-disable-next-line @typescript-eslint/consistent-type-assertions - options: {}, - config: ['', { presenter: attachment.component.AttachmentsPresenter, label: 'Files', sortingKey: 'attachments' }, 'modifiedOn', 'channels'] - }) - builder.mixin(contact.class.Person, core.class.Class, view.mixin.ObjectEditor, { editor: contact.component.EditPerson }) diff --git a/models/contact/src/plugin.ts b/models/contact/src/plugin.ts index 79d4b94202..0ef9bf59e2 100644 --- a/models/contact/src/plugin.ts +++ b/models/contact/src/plugin.ts @@ -36,7 +36,9 @@ export const ids = mergeIds(contactId, contact, { CreateOrganization: '' as AnyComponent, CreatePersons: '' as AnyComponent, CreateOrganizations: '' as AnyComponent, - OrganizationPresenter: '' as AnyComponent + OrganizationPresenter: '' as AnyComponent, + Contacts: '' as AnyComponent, + RolePresenter: '' as AnyComponent }, string: { Organizations: '' as IntlString, diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts index 3c3e588672..97a00c68ee 100644 --- a/models/recruit/src/index.ts +++ b/models/recruit/src/index.ts @@ -100,6 +100,10 @@ export function createModel (builder: Builder): void { editor: recruit.component.Applications }) + builder.mixin(recruit.mixin.Candidate, core.class.Mixin, view.mixin.ObjectFactory, { + component: recruit.component.CreateCandidate + }) + builder.createDoc( workbench.class.Application, core.space.Model, @@ -235,10 +239,6 @@ export function createModel (builder: Builder): void { card: recruit.component.KanbanCard }) - builder.mixin(recruit.mixin.Candidate, core.class.Class, view.mixin.ObjectEditor, { - editor: recruit.component.EditCandidate - }) - builder.mixin(recruit.class.Applicant, core.class.Class, view.mixin.ObjectEditor, { editor: recruit.component.EditApplication }) diff --git a/models/recruit/src/plugin.ts b/models/recruit/src/plugin.ts index e526f61cb9..f8e771857c 100644 --- a/models/recruit/src/plugin.ts +++ b/models/recruit/src/plugin.ts @@ -44,7 +44,6 @@ export default mergeIds(recruitId, recruit, { component: { CreateVacancy: '' as AnyComponent, CreateApplication: '' as AnyComponent, - EditCandidate: '' as AnyComponent, KanbanCard: '' as AnyComponent, ApplicationPresenter: '' as AnyComponent, ApplicationsPresenter: '' as AnyComponent, @@ -52,7 +51,8 @@ export default mergeIds(recruitId, recruit, { EditApplication: '' as AnyComponent, TemplatesIcon: '' as AnyComponent, Applications: '' as AnyComponent, - Candidates: '' as AnyComponent + Candidates: '' as AnyComponent, + CreateCandidate: '' as AnyComponent }, template: { DefaultVacancy: '' as Ref diff --git a/models/view/src/index.ts b/models/view/src/index.ts index c68d9338d5..f694d5f941 100644 --- a/models/view/src/index.ts +++ b/models/view/src/index.ts @@ -19,7 +19,7 @@ import { Builder, Mixin, Model } from '@anticrm/model' import core, { TClass, TDoc } from '@anticrm/model-core' import type { Asset, IntlString, Resource, Status } from '@anticrm/platform' import type { AnyComponent } from '@anticrm/ui' -import type { Action, ActionTarget, AttributeEditor, AttributePresenter, ObjectEditor, ObjectValidator, Viewlet, ViewletDescriptor } from '@anticrm/view' +import type { Action, ActionTarget, AttributeEditor, AttributePresenter, ObjectEditor, ObjectFactory, ObjectValidator, Viewlet, ViewletDescriptor } from '@anticrm/view' import view from './plugin' @Mixin(view.mixin.AttributeEditor, core.class.Class) @@ -42,6 +42,11 @@ export class TObjectValidator extends TClass implements ObjectValidator { validator!: Resource<((doc: T, client: Client) => Promise>)> } +@Mixin(view.mixin.ObjectFactory, core.class.Class) +export class TObjectFactory extends TClass implements ObjectFactory { + component!: AnyComponent +} + @Model(view.class.ViewletDescriptor, core.class.Doc, DOMAIN_MODEL) export class TViewletDescriptor extends TDoc implements ViewletDescriptor { component!: AnyComponent @@ -70,7 +75,7 @@ export class TActionTarget extends TDoc implements ActionTarget { } export function createModel (builder: Builder): void { - builder.createModel(TAttributeEditor, TAttributePresenter, TObjectEditor, TViewletDescriptor, TViewlet, TAction, TActionTarget, TObjectValidator) + builder.createModel(TAttributeEditor, TAttributePresenter, TObjectEditor, TViewletDescriptor, TViewlet, TAction, TActionTarget, TObjectValidator, TObjectFactory) builder.mixin(core.class.TypeString, core.class.Class, view.mixin.AttributeEditor, { editor: view.component.StringEditor diff --git a/packages/core/src/hierarchy.ts b/packages/core/src/hierarchy.ts index 2e4b7990aa..2dd2e6f416 100644 --- a/packages/core/src/hierarchy.ts +++ b/packages/core/src/hierarchy.ts @@ -157,7 +157,7 @@ export class Hierarchy { } private txMixin (tx: TxMixin): void { - if (tx.objectClass === core.class.Class) { + if (this.isDerived(tx.objectClass, core.class.Class)) { const obj = this.getClass(tx.objectId as Ref>) as any TxProcessor.updateMixin4Doc(obj, tx.mixin, tx.attributes) } @@ -304,7 +304,14 @@ export class Hierarchy { const result = new Map() let ancestors = this.getAncestors(clazz) if (to !== undefined) { - ancestors = ancestors.filter(c => this.isDerived(c, to) && c !== to) + const toAncestors = this.getAncestors(to) + for (const uto of toAncestors) { + if (ancestors.includes(uto)) { + to = uto + break + } + } + ancestors = ancestors.filter(c => this.isDerived(c, to as Ref>) && c !== to) } for (const cls of ancestors) { diff --git a/packages/ui/src/components/Menu.svelte b/packages/ui/src/components/Menu.svelte index b81d9bbd5f..8c678755b0 100644 --- a/packages/ui/src/components/Menu.svelte +++ b/packages/ui/src/components/Menu.svelte @@ -14,27 +14,22 @@ -->
{#each actions as action} -
{ +
{ dispatch('close') - action.action(ctx) + action.action(ctx) }}> {#if action.icon} diff --git a/plugins/contact-assets/lang/en.json b/plugins/contact-assets/lang/en.json index ece561a169..7a99ce3e3d 100644 --- a/plugins/contact-assets/lang/en.json +++ b/plugins/contact-assets/lang/en.json @@ -13,6 +13,7 @@ "PersonsFolder": "Persons folder", "AddSocialLinks": "Add social links", "MakePrivate": "Make private", - "MakePrivateDescription": "Only members can see it" + "MakePrivateDescription": "Only members can see it", + "Create": "Contact" } } \ No newline at end of file diff --git a/plugins/contact-resources/package.json b/plugins/contact-resources/package.json index f3d8c1ddf5..280fc072cb 100644 --- a/plugins/contact-resources/package.json +++ b/plugins/contact-resources/package.json @@ -39,6 +39,7 @@ "@anticrm/core": "~0.6.11", "@anticrm/view": "~0.6.0", "@anticrm/attachment-resources": "~0.6.0", - "@anticrm/panel": "~0.6.0" + "@anticrm/panel": "~0.6.0", + "@anticrm/view-resources": "~0.6.0" } } diff --git a/plugins/contact-resources/src/components/Contacts.svelte b/plugins/contact-resources/src/components/Contacts.svelte new file mode 100644 index 0000000000..10a2101a92 --- /dev/null +++ b/plugins/contact-resources/src/components/Contacts.svelte @@ -0,0 +1,122 @@ + + + + +
+
+
+ + +
+
+ + { resultQuery = {} } } /> +
+ +
+
+ + {#await tableDescriptor then descr} + {#if descr} + + {/if} + {/await} + + + + diff --git a/plugins/contact-resources/src/components/CreateContact.svelte b/plugins/contact-resources/src/components/CreateContact.svelte new file mode 100644 index 0000000000..992de7c6a7 --- /dev/null +++ b/plugins/contact-resources/src/components/CreateContact.svelte @@ -0,0 +1,32 @@ + + + \ No newline at end of file diff --git a/plugins/contact-resources/src/components/CreateOrganization.svelte b/plugins/contact-resources/src/components/CreateOrganization.svelte index f64d357104..efc681505d 100644 --- a/plugins/contact-resources/src/components/CreateOrganization.svelte +++ b/plugins/contact-resources/src/components/CreateOrganization.svelte @@ -26,10 +26,6 @@ import contact from '../plugin' import Company from './icons/Company.svelte' - export let space: Ref - - let _space = space - export function canClose (): boolean { return object.name === '' } @@ -42,7 +38,7 @@ const client = getClient() async function createOrganization () { - await client.createDoc(contact.class.Organization, _space, object) + await client.createDoc(contact.class.Organization, contact.space.Contacts, object) dispatch('close') } @@ -52,10 +48,7 @@ label={'Create organization'} okAction={createOrganization} canSave={object.name.length > 0} - spaceClass={contact.class.Organizations} - spaceLabel={contact.string.OrganizationsFolder} - spacePlaceholder={contact.string.SelectFolder} - bind:space={_space} + space={contact.space.Contacts} on:close={() => { dispatch('close') }} diff --git a/plugins/contact-resources/src/components/CreatePerson.svelte b/plugins/contact-resources/src/components/CreatePerson.svelte index 53a1846653..a1886214ca 100644 --- a/plugins/contact-resources/src/components/CreatePerson.svelte +++ b/plugins/contact-resources/src/components/CreatePerson.svelte @@ -25,10 +25,6 @@ import { combineName, Person } from '@anticrm/contact' import contact from '../plugin' - export let space: Ref - - let _space = space - let firstName = '' let lastName = '' @@ -48,7 +44,7 @@ channels: object.channels } - await client.createDoc(contact.class.Person, _space, person) + await client.createDoc(contact.class.Person, contact.space.Contacts, person) dispatch('close') } @@ -58,10 +54,7 @@ label={contact.string.CreatePerson} okAction={createPerson} canSave={firstName.length > 0 && lastName.length > 0} - spaceClass={contact.class.Persons} - spaceLabel={contact.string.PersonsFolder} - spacePlaceholder={contact.string.SelectFolder} - bind:space={_space} + bind:space={contact.space.Contacts} on:close={() => { dispatch('close') }} diff --git a/plugins/contact-resources/src/components/EditContact.svelte b/plugins/contact-resources/src/components/EditContact.svelte index 1cba555416..dd67931dd0 100644 --- a/plugins/contact-resources/src/components/EditContact.svelte +++ b/plugins/contact-resources/src/components/EditContact.svelte @@ -25,10 +25,11 @@ getClient, KeyedAttribute } from '@anticrm/presentation' - import { AnyComponent, Component, getPlatformColorForText, Label } from '@anticrm/ui' + import { AnyComponent, Component, Label } from '@anticrm/ui' import view from '@anticrm/view' import { createEventDispatcher, onDestroy } from 'svelte' import contact from '../plugin' + import { getMixinStyle } from '../utils' export let _id: Ref let object: Contact @@ -77,8 +78,8 @@ return keys } - function getFiltredKeys (objectClass: Ref>, ignoreKeys: string[]): KeyedAttribute[] { - const keys = [...hierarchy.getAllAttributes(objectClass).entries()] + function getFiltredKeys (objectClass: Ref>, ignoreKeys: string[], to?: Ref>): KeyedAttribute[] { + const keys = [...hierarchy.getAllAttributes(objectClass, to).entries()] .filter(([, value]) => value.hidden !== true) .map(([key, attr]) => ({ key, attr })) @@ -86,7 +87,7 @@ } function updateKeys (ignoreKeys: string[]): void { - const filtredKeys = getFiltredKeys(selectedClass ?? object._class, ignoreKeys) + const filtredKeys = getFiltredKeys(selectedClass ?? object._class, ignoreKeys, selectedClass !== objectClass._id ? objectClass._id : undefined) keys = collectionsFilter(filtredKeys, false) collectionKeys = collectionsFilter(filtredKeys, true) } @@ -130,14 +131,6 @@ $: icon = (objectClass?.icon ?? contact.class.Person) as Asset - function getStyle (id: Ref>, selected: boolean): string { - const color = getPlatformColorForText(id as string) - return ` - background: ${color + (selected ? 'ff' : '33')}; - border: 1px solid ${color + (selected ? '0f' : '66')}; - ` - } - let mainEditor: HTMLElement let prevEditor: HTMLElement let maxHeight = 0 @@ -193,13 +186,13 @@ {#if mixins.length > 0}
{ selectedClass = objectClass._id; selectedMixin = undefined }}>
{#each mixins as mixin}
{ selectedClass = mixin._id; selectedMixin = mixin }}>
diff --git a/plugins/contact-resources/src/components/EditPerson.svelte b/plugins/contact-resources/src/components/EditPerson.svelte index 6c31a0bbde..4207a1c5fc 100644 --- a/plugins/contact-resources/src/components/EditPerson.svelte +++ b/plugins/contact-resources/src/components/EditPerson.svelte @@ -17,11 +17,12 @@ import { createEventDispatcher, onMount, afterUpdate } from 'svelte' import { getCurrentAccount, Ref, Space } from '@anticrm/core' import { CircleButton, EditBox, showPopup, IconEdit, IconAdd, Label, IconActivity } from '@anticrm/ui' - import { getClient, createQuery, Channels, Avatar } from '@anticrm/presentation' + import { getClient, createQuery, Channels, Avatar, AttributeEditor } from '@anticrm/presentation' import setting from '@anticrm/setting' import { IntegrationType } from '@anticrm/setting' import contact from '../plugin' import { combineName, getFirstName, getLastName, Person } from '@anticrm/contact' + import Edit from './icons/Edit.svelte' export let object: Person @@ -58,7 +59,7 @@ integrations = new Set(res.map((p) => p.type)) }) - const sendOpen = () => dispatch('open', { ignoreKeys: ['comments', 'name', 'channels'] }) + const sendOpen = () => dispatch('open', { ignoreKeys: ['comments', 'name', 'channels', 'city'] }) onMount(sendOpen) afterUpdate(sendOpen) @@ -76,6 +77,9 @@
+
+ +
@@ -97,7 +101,7 @@
@@ -132,6 +136,10 @@ margin-left: 0.5rem; } } + .location { + margin-top: 0.25rem; + font-size: 0.75rem; + } .separator { margin: 1rem 0; diff --git a/plugins/contact-resources/src/components/RolePresenter.svelte b/plugins/contact-resources/src/components/RolePresenter.svelte new file mode 100644 index 0000000000..0e8219169a --- /dev/null +++ b/plugins/contact-resources/src/components/RolePresenter.svelte @@ -0,0 +1,72 @@ + + +{#if mixins.length > 0} +
+ {#each mixins as mixin} +
+
+ {/each} +
+{/if} + diff --git a/plugins/contact-resources/src/components/icons/Edit.svelte b/plugins/contact-resources/src/components/icons/Edit.svelte new file mode 100644 index 0000000000..1c4e3e0837 --- /dev/null +++ b/plugins/contact-resources/src/components/icons/Edit.svelte @@ -0,0 +1,24 @@ + + + + + + + diff --git a/plugins/contact-resources/src/index.ts b/plugins/contact-resources/src/index.ts index 76d0cc746f..79ade36792 100644 --- a/plugins/contact-resources/src/index.ts +++ b/plugins/contact-resources/src/index.ts @@ -26,7 +26,9 @@ import EditOrganization from './components/EditOrganization.svelte' import CreatePersons from './components/CreatePersons.svelte' import CreateOrganizations from './components/CreateOrganizations.svelte' import SocialEditor from './components/SocialEditor.svelte' +import Contacts from './components/Contacts.svelte' import { Resources } from '@anticrm/platform' +import RolePresenter from './components/RolePresenter.svelte' export { ContactPresenter, EditContact } @@ -42,6 +44,8 @@ export default async (): Promise => ({ EditOrganization, CreatePersons, CreateOrganizations, - SocialEditor + SocialEditor, + Contacts, + RolePresenter } }) diff --git a/plugins/contact-resources/src/plugin.ts b/plugins/contact-resources/src/plugin.ts index 5c0fbe2287..972787a882 100644 --- a/plugins/contact-resources/src/plugin.ts +++ b/plugins/contact-resources/src/plugin.ts @@ -32,6 +32,7 @@ export default mergeIds(contactId, contact, { AddSocialLinks: '' as IntlString, Name: '' as IntlString, MakePrivate: '' as IntlString, - MakePrivateDescription: '' as IntlString + MakePrivateDescription: '' as IntlString, + Create: '' as IntlString } }) diff --git a/plugins/contact-resources/src/utils.ts b/plugins/contact-resources/src/utils.ts new file mode 100644 index 0000000000..64dcc728b4 --- /dev/null +++ b/plugins/contact-resources/src/utils.ts @@ -0,0 +1,10 @@ +import { Class, Doc, Ref } from '@anticrm/core' +import { getPlatformColorForText } from '@anticrm/ui' + +export function getMixinStyle (id: Ref>, selected: boolean): string { + const color = getPlatformColorForText(id as string) + return ` + background: ${color + (selected ? 'ff' : '33')}; + border: 1px solid ${color + (selected ? '0f' : '66')}; + ` +} diff --git a/plugins/contact/src/index.ts b/plugins/contact/src/index.ts index 60de37f459..14d2416604 100644 --- a/plugins/contact/src/index.ts +++ b/plugins/contact/src/index.ts @@ -54,19 +54,21 @@ export interface Contact extends Doc { attachments?: number comments?: number channels: Channel[] -} - -/** - * @public - */ -export interface Person extends Contact { city: string } /** * @public */ -export interface Organization extends Contact {} +export interface Person extends Contact { +} + +/** + * @public + */ +export interface Organization extends Contact { + +} /** * @public @@ -155,6 +157,7 @@ export default plugin(contactId, { Company: '' as Asset }, space: { - Employee: '' as Ref + Employee: '' as Ref, + Contacts: '' as Ref } }) diff --git a/plugins/devmodel-resources/src/components/ModelView.svelte b/plugins/devmodel-resources/src/components/ModelView.svelte index df4507dfc1..002394d4ec 100644 --- a/plugins/devmodel-resources/src/components/ModelView.svelte +++ b/plugins/devmodel-resources/src/components/ModelView.svelte @@ -37,6 +37,7 @@ import { toIntl } from '..'
+ @@ -44,6 +45,7 @@ import { toIntl } from '..' {#each txes as tx} +
ID ClassObjectID Body
{tx.index}{tx._class} {tx.objectId} {tx.objectClass} diff --git a/plugins/recruit-resources/src/components/CreateCandidate.svelte b/plugins/recruit-resources/src/components/CreateCandidate.svelte index 87fd30c87b..fb90792959 100644 --- a/plugins/recruit-resources/src/components/CreateCandidate.svelte +++ b/plugins/recruit-resources/src/components/CreateCandidate.svelte @@ -16,7 +16,7 @@ - -{#if object !== undefined} -
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
- -
-
- {#if !object.channels || object.channels.length === 0} - - showPopup(contact.component.SocialEditor, { values: object.channels ?? [] }, ev.target, (result) => { - saveChannels(result) - })} - /> - - {:else} - -
- - showPopup(contact.component.SocialEditor, { values: object.channels ?? [] }, ev.target, (result) => { - saveChannels(result) - })} - /> -
- {/if} -
- -
- - - View activity - -
-
-
-
-{/if} - - diff --git a/plugins/recruit-resources/src/components/KanbanCard.svelte b/plugins/recruit-resources/src/components/KanbanCard.svelte index a447fb8759..b0bc24c54e 100644 --- a/plugins/recruit-resources/src/components/KanbanCard.svelte +++ b/plugins/recruit-resources/src/components/KanbanCard.svelte @@ -15,12 +15,10 @@ diff --git a/plugins/recruit-resources/src/index.ts b/plugins/recruit-resources/src/index.ts index b6cf687124..87f5ea9f81 100644 --- a/plugins/recruit-resources/src/index.ts +++ b/plugins/recruit-resources/src/index.ts @@ -14,22 +14,20 @@ // import type { Client, Doc } from '@anticrm/core' - -import CreateVacancy from './components/CreateVacancy.svelte' -import CreateApplication from './components/CreateApplication.svelte' -import EditCandidate from './components/EditCandidate.svelte' -import KanbanCard from './components/KanbanCard.svelte' -import EditVacancy from './components/EditVacancy.svelte' -import ApplicationPresenter from './components/ApplicationPresenter.svelte' -import ApplicationsPresenter from './components/ApplicationsPresenter.svelte' -import TemplatesIcon from './components/TemplatesIcon.svelte' -import Applications from './components/Applications.svelte' -import EditApplication from './components/EditApplication.svelte' -import Candidates from './components/Candidates.svelte' - -import { showPopup } from '@anticrm/ui' import { OK, Resources, Severity, Status } from '@anticrm/platform' import { Applicant } from '@anticrm/recruit' +import { showPopup } from '@anticrm/ui' +import ApplicationPresenter from './components/ApplicationPresenter.svelte' +import Applications from './components/Applications.svelte' +import ApplicationsPresenter from './components/ApplicationsPresenter.svelte' +import Candidates from './components/Candidates.svelte' +import CreateApplication from './components/CreateApplication.svelte' +import CreateCandidate from './components/CreateCandidate.svelte' +import CreateVacancy from './components/CreateVacancy.svelte' +import EditApplication from './components/EditApplication.svelte' +import EditVacancy from './components/EditVacancy.svelte' +import KanbanCard from './components/KanbanCard.svelte' +import TemplatesIcon from './components/TemplatesIcon.svelte' import recruit from './plugin' async function createApplication (object: Doc): Promise { @@ -63,7 +61,6 @@ export default async (): Promise => ({ component: { CreateVacancy, CreateApplication, - EditCandidate, EditApplication, KanbanCard, ApplicationPresenter, @@ -71,6 +68,7 @@ export default async (): Promise => ({ EditVacancy, TemplatesIcon, Applications, - Candidates + Candidates, + CreateCandidate } }) diff --git a/plugins/view-resources/src/components/Menu.svelte b/plugins/view-resources/src/components/Menu.svelte index 46133b99df..096e4198a2 100644 --- a/plugins/view-resources/src/components/Menu.svelte +++ b/plugins/view-resources/src/components/Menu.svelte @@ -14,20 +14,16 @@ -->