hcengineering/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2024-11-22 03:14:40 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

TSK-769: Fix channel editor (#2704)

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2023-03-02 16:28:54 +07:00 committed by GitHub
parent bd6ef3aa57
commit 7b14204aab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
models/contact/src/index.ts
View File

@ -400,12 +400,22 @@ export function createModel (builder: Builder): void {
{
label: contact.string.Whatsapp,
icon: contact.icon.Whatsapp,
placeholder: contact.string.WhatsappPlaceholder,
action: contact.actionImpl.OpenChannel
placeholder: contact.string.WhatsappPlaceholder
},
contact.channelProvider.Whatsapp
)
builder.createDoc(
contact.class.ChannelProvider,
core.space.Model,
{
label: contact.string.Profile,
icon: contact.icon.Profile,
placeholder: contact.string.ProfilePlaceholder
},
contact.channelProvider.Profile
)
builder.createDoc(
contact.class.AvatarProvider,
core.space.Model,

2
models/contact/src/plugin.ts
View File

@ -75,6 +75,8 @@ export default mergeIds(contactId, contact, {
CreatedOn: '' as IntlString,
Whatsapp: '' as IntlString,
WhatsappPlaceholder: '' as IntlString,
Profile: '' as IntlString,
ProfilePlaceholder: '' as IntlString,
CurrentEmployee: '' as IntlString
},
completion: {

2
models/gmail/src/index.ts
View File

@ -177,7 +177,7 @@ export function createModel (builder: Builder): void {
_objects: 'value'
}
},
label: gmail.string.WrtieEmail,
label: gmail.string.WriteEmail,
icon: contact.icon.Email,
keyBinding: [],
input: 'any',

5
plugins/contact-assets/assets/icons.svg
View File

@ -65,5 +65,8 @@
<symbol id="homepage" viewBox="0 0 24 24">
<path d="M12,1.2C6.1,1.2,1.2,6.1,1.2,12S6.1,22.8,12,22.8S22.8,17.9,22.8,12S17.9,1.2,12,1.2z M20.8,14.3 c-1.2,0.4-2.5,0.7-3.8,0.9c0.2-2.1,0.2-4.3,0-6.5c1.3,0.2,2.5,0.5,3.8,0.9c0.1,0,0.1,0,0.2,0c0.2,0.7,0.3,1.5,0.3,2.3 c0,0.8-0.1,1.5-0.3,2.3C20.9,14.3,20.8,14.3,20.8,14.3z M3,14.3c-0.2-0.7-0.3-1.5-0.3-2.3c0-0.8,0.1-1.5,0.3-2.3c0.1,0,0.1,0,0.2,0 C4.5,9.3,5.7,9,7,8.8c-0.2,2.1-0.2,4.3,0,6.5c-1.3-0.2-2.5-0.5-3.8-0.9C3.2,14.3,3.1,14.3,3,14.3z M8.5,8.5c2.3-0.3,4.6-0.3,6.9,0 c0.3,2.3,0.3,4.6,0,6.9c-2.3,0.3-4.6,0.3-6.9,0C8.3,13.2,8.3,10.8,8.5,8.5z M20.3,8c-1.2-0.3-2.3-0.6-3.5-0.8 C16.6,6,16.3,4.8,16,3.7C17.9,4.6,19.4,6.1,20.3,8z M14.3,3c0,0.1,0,0.1,0,0.2C14.7,4.5,15,5.7,15.2,7c-2.1-0.2-4.3-0.2-6.5,0 C9,5.7,9.3,4.5,9.7,3.2c0-0.1,0-0.1,0-0.2c0.7-0.2,1.5-0.3,2.3-0.3C12.8,2.8,13.5,2.9,14.3,3z M7.9,3.7C7.9,3.7,7.9,3.7,7.9,3.7 C7.6,4.9,7.4,6,7.2,7.2C6,7.4,4.8,7.7,3.7,8C4.5,6.2,6,4.7,7.9,3.7z M3.7,16.1C3.7,16.1,3.7,16.1,3.7,16.1c1.2,0.2,2.3,0.5,3.5,0.7 C7.4,18,7.6,19.1,8,20.2c0,0-0.1,0-0.1,0C6.1,19.4,4.6,17.9,3.7,16.1z M9.7,21c0-0.1,0-0.1,0-0.2C9.3,19.5,9,18.3,8.8,17 c1.1,0.1,2.2,0.2,3.2,0.2c1.1,0,2.2-0.1,3.2-0.2c-0.2,1.3-0.5,2.5-0.9,3.8c0,0.1,0,0.1,0,0.2c-0.7,0.2-1.5,0.3-2.3,0.3 C11.2,21.2,10.5,21.1,9.7,21z M16,20.3c0.3-1.2,0.6-2.4,0.8-3.6c1.2-0.2,2.3-0.4,3.5-0.8c0,0,0,0.1,0,0.1C19.4,18,17.8,19.5,16,20.3 z"/>
</symbol>
<symbol id='profile' viewBox="0 0 24 24">
<path d="M11.9,13.5c0,0,0.1,0,0.2,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c2.2-0.1,3.9-1.8,3.9-4c0-2.2-1.8-4-4-4c-2.2,0-4,1.8-4,4 C8,11.7,9.7,13.5,11.9,13.5z M12,7c1.4,0,2.5,1.1,2.5,2.5c0,1.4-1.1,2.5-2.4,2.5c-0.1,0-0.2,0-0.3,0c-1.3-0.1-2.4-1.2-2.4-2.5 C9.5,8.1,10.6,7,12,7z" />
<path d="M22.8,12c0-5.9-4.8-10.8-10.8-10.8S1.2,6.1,1.2,12c0,3.1,1.3,5.9,3.5,7.9c0,0,0,0,0,0C4.8,20,4.9,20,5,20.1 c0.1,0.1,0.3,0.2,0.4,0.3c0.1,0.1,0.3,0.2,0.4,0.3C5.9,20.8,6,20.9,6.2,21c0.2,0.1,0.3,0.2,0.5,0.3c0.1,0.1,0.3,0.2,0.4,0.2 c0.2,0.1,0.3,0.2,0.5,0.2C7.7,21.8,7.8,21.9,8,22c0.2,0.1,0.4,0.1,0.5,0.2c0.1,0,0.3,0.1,0.4,0.1c0.2,0.1,0.4,0.1,0.6,0.1 c0.1,0,0.3,0.1,0.4,0.1c0.2,0,0.4,0.1,0.6,0.1c0.1,0,0.3,0,0.4,0.1c0.3,0,0.7,0.1,1,0.1c0.4,0,0.7,0,1-0.1c0.1,0,0.3,0,0.4-0.1 c0.2,0,0.4-0.1,0.6-0.1c0.1,0,0.3-0.1,0.4-0.1c0.2,0,0.4-0.1,0.6-0.1c0.1,0,0.3-0.1,0.4-0.1c0.2-0.1,0.4-0.1,0.5-0.2 c0.1-0.1,0.3-0.1,0.4-0.2c0.2-0.1,0.3-0.2,0.5-0.2c0.1-0.1,0.3-0.1,0.4-0.2c0.2-0.1,0.3-0.2,0.5-0.3c0.1-0.1,0.3-0.2,0.4-0.3 c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.1-0.1,0.2-0.2c0,0,0,0,0,0C21.4,17.9,22.8,15.1,22.8,12z M2.8,12 c0-5.1,4.1-9.2,9.2-9.2s9.2,4.1,9.2,9.2c0,2.3-0.8,4.3-2.2,6c-0.4-0.7-0.9-1.3-1.7-1.8c-3-2-7.8-2-10.8,0c-0.7,0.5-1.3,1.1-1.7,1.8 C3.6,16.3,2.8,14.3,2.8,12z M17.9,19.1c-0.1,0.1-0.2,0.1-0.3,0.2c-0.1,0.1-0.3,0.2-0.4,0.3c-0.1,0.1-0.2,0.1-0.3,0.2 c-0.1,0.1-0.3,0.2-0.4,0.3c-0.1,0.1-0.2,0.1-0.3,0.2c-0.2,0.1-0.3,0.2-0.5,0.2c-0.1,0-0.2,0.1-0.3,0.1c-0.2,0.1-0.3,0.1-0.5,0.2 c-0.1,0-0.2,0.1-0.4,0.1c-0.2,0-0.3,0.1-0.5,0.1c-0.1,0-0.2,0.1-0.4,0.1c-0.2,0-0.4,0.1-0.6,0.1c-0.1,0-0.2,0-0.3,0 c-0.3,0-0.6,0-0.9,0c-0.3,0-0.6,0-0.9,0c-0.1,0-0.2,0-0.3,0c-0.2,0-0.4,0-0.6-0.1c-0.1,0-0.2-0.1-0.4-0.1c-0.2,0-0.3-0.1-0.5-0.1 c-0.1,0-0.2-0.1-0.4-0.1c-0.2-0.1-0.3-0.1-0.5-0.2c-0.1,0-0.2-0.1-0.3-0.1c-0.2-0.1-0.3-0.1-0.5-0.2c-0.1-0.1-0.2-0.1-0.3-0.2 c-0.2-0.1-0.3-0.2-0.4-0.3c-0.1-0.1-0.2-0.1-0.3-0.2c-0.1-0.1-0.3-0.2-0.4-0.3c-0.1-0.1-0.2-0.1-0.3-0.2c0,0,0,0,0,0 c0.2-0.6,0.7-1.2,1.4-1.7c2.5-1.6,6.6-1.6,9.1,0C17.3,17.9,17.7,18.5,17.9,19.1C17.9,19.1,17.9,19.1,17.9,19.1z" />
</symbol>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 14 KiB

2
plugins/contact-assets/lang/en.json
View File

@ -73,6 +73,8 @@
"CreatedOn": "Created",
"Whatsapp": "Whatsapp",
"WhatsappPlaceholder": "Whatsapp",
"Profile": "Profile",
"ProfilePlaceholder": "Profile...",
"CurrentEmployee": "Current employee"
}
}

2
plugins/contact-assets/lang/ru.json
View File

@ -73,6 +73,8 @@
"CreatedOn": "Создан",
"Whatsapp": "Whatsapp",
"WhatsappPlaceholder": "Whatsapp",
"Profile": "Профиль",
"ProfilePlaceholder": "Профиль...",
"CurrentEmployee": "Текущий сотрудник"
}
}

3
plugins/contact-assets/src/index.ts
View File

@ -36,6 +36,7 @@ loadMetadata(contact.icon, {
Company: `${icons}#company`,
SocialEdit: `${icons}#social-edit`,
Homepage: `${icons}#homepage`,
Whatsapp: `${icons}#whatsapp`
Whatsapp: `${icons}#whatsapp`,
Profile: `${icons}#profile`
})
addStringsLoader(contactId, async (lang: string) => await import(`../lang/${lang}.json`))

1
plugins/contact-resources/src/components/ChannelsDropdown.svelte
View File

@ -168,6 +168,7 @@
}
const saveItems = (): void => {
value = filterUndefined(displayItems)
dispatch('change', value)
updateMenu(displayItems)
}

2
plugins/contact-resources/src/components/ChannelsEditor.svelte
View File

@ -18,7 +18,7 @@
import { createQuery, getClient } from '@hcengineering/presentation'
import { ButtonKind, ButtonSize, closeTooltip } from '@hcengineering/ui'
import { ChannelProvider, Channel } from '@hcengineering/contact'
import { Channel, ChannelProvider } from '@hcengineering/contact'
import { showPopup } from '@hcengineering/ui'
import contact from '../plugin'
import ChannelsDropdown from './ChannelsDropdown.svelte'

6
plugins/contact/src/index.ts
View File

@ -232,7 +232,8 @@ const contactPlugin = plugin(contactId, {
GitHub: '' as Ref<ChannelProvider>,
Facebook: '' as Ref<ChannelProvider>,
Homepage: '' as Ref<ChannelProvider>,
Whatsapp: '' as Ref<ChannelProvider>
Whatsapp: '' as Ref<ChannelProvider>,
Profile: '' as Ref<ChannelProvider>
},
avatarProvider: {
Color: '' as Ref<AvatarProvider>,
@ -263,7 +264,8 @@ const contactPlugin = plugin(contactId, {
Company: '' as Asset,
SocialEdit: '' as Asset,
Homepage: '' as Asset,
Whatsapp: '' as Asset
Whatsapp: '' as Asset,
Profile: '' as Asset
},
space: {
Employee: '' as Ref<Space>,

2
plugins/gmail-assets/lang/en.json
View File

@ -30,7 +30,7 @@
"Email": "Email",
"Status": "Status",
"EmailPlaceholder": "john.appleseed@apple.com",
"WrtieEmail": "Wrtie Email",
"WriteEmail": "Write Email",
"Shared": "Shared",
"AvailableTo": "Available to"
}

2
plugins/gmail-assets/lang/ru.json
View File

@ -30,7 +30,7 @@
"Email": "Email",
"Status": "Статус",
"EmailPlaceholder": "john.appleseed@apple.com",
"WrtieEmail": "Написать Email",
"WriteEmail": "Написать Email",
"Shared": "Публичный",
"AvailableTo": "Доступен для"
}

2
plugins/gmail-resources/src/plugin.ts
View File

@ -39,7 +39,7 @@ export default mergeIds(gmailId, gmail, {
Cancel: '' as IntlString,
SubjectPlaceholder: '' as IntlString,
CopyPlaceholder: '' as IntlString,
WrtieEmail: '' as IntlString,
WriteEmail: '' as IntlString,
Shared: '' as IntlString,
AvailableTo: '' as IntlString
}