diff --git a/models/activity/src/index.ts b/models/activity/src/index.ts index eb1a6ce644..037ef4bc7b 100644 --- a/models/activity/src/index.ts +++ b/models/activity/src/index.ts @@ -38,7 +38,7 @@ export class TTxViewlet extends TDoc implements TxViewlet { hideOnRemove!: boolean } -@Model(activity.class.ActivityFilter, core.class.Class, DOMAIN_MODEL) +@Model(activity.class.ActivityFilter, core.class.Doc, DOMAIN_MODEL) export class TActivityFilter extends TDoc implements ActivityFilter { label!: IntlString filter!: Resource<(tx: DisplayTx, _class?: Ref) => boolean> diff --git a/models/all/src/index.ts b/models/all/src/index.ts index 1429e5157d..b8f84a2da8 100644 --- a/models/all/src/index.ts +++ b/models/all/src/index.ts @@ -98,7 +98,7 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ label: contact.string.ConfigLabel, description: contact.string.ConfigDescription, enabled: true, - configurable: false, + beta: false, icon: contact.icon.ContactApplication, classFilter: [workbench.class.Application] } @@ -110,7 +110,7 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ label: chunter.string.ConfigLabel, description: chunter.string.ConfigDescription, enabled: false, - configurable: false, + beta: true, icon: chunter.icon.Chunter, classFilter: [workbench.class.Application] } @@ -123,9 +123,9 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ label: recruit.string.ConfigLabel, description: recruit.string.ConfigDescription, enabled: true, + beta: false, icon: recruit.icon.RecruitApplication, - classFilter: [workbench.class.Application, view.class.Action], - configurable: true + classFilter: [workbench.class.Application, view.class.Action] } ], [settingModel, settingId], @@ -136,13 +136,13 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ label: telegram.string.ConfigLabel, description: telegram.string.ConfigDescription, enabled: true, + beta: false, classFilter: [ workbench.class.Application, view.class.Action, contact.class.ChannelProvider, setting.class.IntegrationType - ], - configurable: true + ] } ], [ @@ -151,9 +151,9 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ { label: lead.string.ConfigLabel, description: lead.string.ConfigDescription, - enabled: true, - icon: lead.icon.LeadApplication, - configurable: false + enabled: false, + beta: true, + icon: lead.icon.LeadApplication } ], [ @@ -163,13 +163,13 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ label: gmail.string.ConfigLabel, description: gmail.string.ConfigDescription, enabled: true, + beta: false, classFilter: [ workbench.class.Application, view.class.Action, contact.class.ChannelProvider, setting.class.IntegrationType - ], - configurable: true + ] } ], [ @@ -178,10 +178,10 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ { label: inventory.string.ConfigLabel, description: inventory.string.ConfigDescription, - enabled: true, + enabled: false, + beta: true, icon: inventory.icon.InventoryApplication, - classFilter: [workbench.class.Application, view.class.Action], - configurable: false + classFilter: [workbench.class.Application, view.class.Action] } ], [presentationModel, presentationId], @@ -195,10 +195,10 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ { label: hr.string.ConfigLabel, description: hr.string.ConfigDescription, - enabled: true, + enabled: false, + beta: true, icon: hr.icon.Structure, - classFilter: [workbench.class.Application, view.class.Action], - configurable: true + classFilter: [workbench.class.Application, view.class.Action] } ], [ @@ -207,9 +207,9 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ { label: document.string.ConfigLabel, description: document.string.ConfigDescription, - enabled: true, - icon: document.icon.DocumentApplication, - configurable: false + enabled: false, + beta: true, + icon: document.icon.DocumentApplication } ], [ @@ -219,9 +219,9 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ label: tracker.string.ConfigLabel, description: tracker.string.ConfigDescription, enabled: true, + beta: false, icon: tracker.icon.TrackerApplication, - classFilter: [workbench.class.Application, view.class.Action], - configurable: true + classFilter: [workbench.class.Application, view.class.Action] } ], [ @@ -230,10 +230,10 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ { label: board.string.ConfigLabel, description: board.string.ConfigDescription, - enabled: true, + enabled: false, + beta: true, icon: board.icon.Board, - classFilter: [workbench.class.Application, view.class.Action], - configurable: false + classFilter: [workbench.class.Application, view.class.Action] } ], [ @@ -242,10 +242,10 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ { label: calendar.string.ConfigLabel, description: calendar.string.ConfigDescription, - enabled: true, + enabled: false, + beta: true, icon: calendar.icon.Calendar, - classFilter: [workbench.class.Application], - configurable: false + classFilter: [workbench.class.Application] } ], [ @@ -255,8 +255,8 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ label: bitrix.string.ConfigLabel, description: bitrix.string.ConfigDescription, enabled: false, - icon: bitrix.icon.Bitrix, - configurable: false + beta: true, + icon: bitrix.icon.Bitrix } ], [ @@ -266,7 +266,7 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ // label: request.string.ConfigLabel, // description: request.string.ConfigDescription, enabled: false, - configurable: false, + beta: true, classFilter: [workbench.class.Application, view.class.Action] } ], @@ -311,7 +311,7 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ enabled: config?.label === undefined || ((config?.enabled ?? true) && (enabled.includes(id) || enabled.includes('*')) && !disabled.includes(id)), - configurable: config?.configurable ?? false + beta: config?.beta ?? false }, ('plugin-configuration-' + id) as Ref ) diff --git a/models/core/src/core.ts b/models/core/src/core.ts index 58be744dc5..b8ddcd5f65 100644 --- a/models/core/src/core.ts +++ b/models/core/src/core.ts @@ -242,7 +242,7 @@ export class TPluginConfiguration extends TDoc implements PluginConfiguration { label!: IntlString enabled!: boolean - configurable!: boolean + beta!: boolean } @Model(core.class.BlobData, core.class.Doc, DOMAIN_BLOB) diff --git a/packages/core/src/__tests__/client.test.ts b/packages/core/src/__tests__/client.test.ts index cd830ec661..4137b21234 100644 --- a/packages/core/src/__tests__/client.test.ts +++ b/packages/core/src/__tests__/client.test.ts @@ -121,7 +121,7 @@ describe('client', () => { const pluginData1: Data = { pluginId: 'testPlugin1' as Plugin, transactions: [], - configurable: true, + beta: true, enabled: true } const txCreateDoc1 = txFactory.createTxCreateDoc(core.class.PluginConfiguration, core.space.Model, pluginData1) @@ -138,7 +138,7 @@ describe('client', () => { const pluginData2 = { pluginId: 'testPlugin2' as Plugin, transactions: [], - configurable: true, + beta: true, enabled: true } const txCreateDoc2 = txFactory.createTxCreateDoc(core.class.PluginConfiguration, core.space.Model, pluginData2) @@ -156,7 +156,7 @@ describe('client', () => { const pluginData3 = { pluginId: 'testPlugin3' as Plugin, transactions: [txCreateDoc1._id], - configurable: true, + beta: true, enabled: true } const txUpdateDoc = txFactory.createTxUpdateDoc( diff --git a/packages/core/src/classes.ts b/packages/core/src/classes.ts index 2611ee3ac9..fe24f4dec0 100644 --- a/packages/core/src/classes.ts +++ b/packages/core/src/classes.ts @@ -180,8 +180,8 @@ export interface PluginConfiguration extends Doc { description?: IntlString enabled: boolean - // If specified, will allow user to enable/disable item. - configurable: boolean + // If specified, will show beta/testing label in UI. + beta: boolean // If defined, will only remove classes in list. classFilter?: Ref>[] diff --git a/plugins/setting-assets/lang/en.json b/plugins/setting-assets/lang/en.json index 2f27b1eb67..38765024b0 100644 --- a/plugins/setting-assets/lang/en.json +++ b/plugins/setting-assets/lang/en.json @@ -79,6 +79,7 @@ "ConfigurationEnabled": "Enabled", "ConfigurationDisabled": "Disabled", "ConfigDisable": "Disable", - "ConfigEnable": "Enable" + "ConfigEnable": "Enable", + "ConfigBeta": "Beta version" } } \ No newline at end of file diff --git a/plugins/setting-assets/lang/ru.json b/plugins/setting-assets/lang/ru.json index 8b9a6ff943..817d86368d 100644 --- a/plugins/setting-assets/lang/ru.json +++ b/plugins/setting-assets/lang/ru.json @@ -80,6 +80,7 @@ "ConfigurationEnabled": "Включено", "ConfigurationDisabled": "Выключено", "ConfigDisable": "Выключить", - "ConfigEnable": "Включить" + "ConfigEnable": "Включить", + "ConfigBeta": "Ознакомительная версия" } } \ No newline at end of file diff --git a/plugins/setting-resources/src/components/Configure.svelte b/plugins/setting-resources/src/components/Configure.svelte index f52da84981..d01e34742a 100644 --- a/plugins/setting-resources/src/components/Configure.svelte +++ b/plugins/setting-resources/src/components/Configure.svelte @@ -50,7 +50,10 @@