diff --git a/plugins/card-resources/src/index.ts b/plugins/card-resources/src/index.ts
index ced311f583..c527522011 100644
--- a/plugins/card-resources/src/index.ts
+++ b/plugins/card-resources/src/index.ts
@@ -57,6 +57,7 @@ import CardEditor from './components/CardEditor.svelte'
import CardRefPresenter from './components/CardRefPresenter.svelte'
import ChangeType from './components/ChangeType.svelte'
import CreateCardButton from './components/CreateCardButton.svelte'
+import CreateCardPopup from './components/CreateCardPopup.svelte'
import CardArrayEditor from './components/CardArrayEditor.svelte'
import SpacePresenter from './components/navigator/SpacePresenter.svelte'
import TypesNavigator from './components/navigator/TypesNavigator.svelte'
@@ -124,6 +125,7 @@ export default async (): Promise
=> ({
CardsPresenter,
ChangeType,
CreateCardButton,
+ CreateCard: CreateCardPopup,
CardArrayEditor,
SpacePresenter,
TypesNavigator,
diff --git a/plugins/card-resources/src/plugin.ts b/plugins/card-resources/src/plugin.ts
index f758b0426f..e0b057e5bd 100644
--- a/plugins/card-resources/src/plugin.ts
+++ b/plugins/card-resources/src/plugin.ts
@@ -174,6 +174,8 @@ export default mergeIds(cardId, card, {
MyCards: '' as IntlString,
GotoMyCards: '' as IntlString,
SingleColumn: '' as IntlString,
+ BaseType: '' as IntlString,
+ BaseTypeDescription: '' as IntlString,
TwoColumns: '' as IntlString,
LayoutAuto: '' as IntlString
}
diff --git a/plugins/card-resources/src/utils.ts b/plugins/card-resources/src/utils.ts
index 4c153a35a4..67867efc0e 100644
--- a/plugins/card-resources/src/utils.ts
+++ b/plugins/card-resources/src/utils.ts
@@ -530,6 +530,10 @@ export async function cardFactory (props: Record = {}): Promise[> {
const client = getClient()
const hierarchy = client.getHierarchy()
+
+ if (isBaseTypeWithSubtypes(hierarchy, type)) {
+ throw new Error(`Cannot create card with base type ${type}`)
+ }
+
const title = data.title ?? (await translate(card.string.Card, {}))
const _id = id ?? generateId()
@@ -581,6 +590,29 @@ export async function createCard (
return _id
}
+export function isBaseTypeWithSubtypes (hierarchy: Hierarchy, type: Ref): boolean {
+ const clazz = hierarchy.getClass(type) as MasterTag | undefined
+ if (clazz?.baseType !== true) return false
+
+ return hierarchy.getDescendants(type).some((descendant) => {
+ if (descendant === type || hierarchy.isMixin(descendant)) return false
+ const descendantClass = hierarchy.getClass(descendant) as MasterTag | undefined
+ return descendantClass?._class === card.class.MasterTag && descendantClass.removed !== true
+ })
+}
+
+export function getFirstCreatableSubtype (hierarchy: Hierarchy, type: Ref): Ref | undefined {
+ return hierarchy.getDescendants(type).find((descendant) => {
+ if (descendant === type || hierarchy.isMixin(descendant)) return false
+ const descendantClass = hierarchy.getClass(descendant) as MasterTag | undefined
+ return (
+ descendantClass?._class === card.class.MasterTag &&
+ descendantClass.removed !== true &&
+ !isBaseTypeWithSubtypes(hierarchy, descendant as Ref)
+ )
+ }) as Ref | undefined
+}
+
export async function createChildCard (object: Card): Promise {
const client = getClient()
const hierarchy = client.getHierarchy()
diff --git a/plugins/card/src/index.ts b/plugins/card/src/index.ts
index d3c8054c60..136dbc1643 100644
--- a/plugins/card/src/index.ts
+++ b/plugins/card/src/index.ts
@@ -40,6 +40,7 @@ export interface MasterTag extends Class {
removed?: boolean
roles?: CollectionSize
singleColumn?: boolean
+ baseType?: boolean
}
export interface Tag extends MasterTag, Mixin {}
diff --git a/plugins/process-resources/src/components/contextEditors/ClassUserInput.svelte b/plugins/process-resources/src/components/contextEditors/ClassUserInput.svelte
index 56b005ab8b..32670ad6c8 100644
--- a/plugins/process-resources/src/components/contextEditors/ClassUserInput.svelte
+++ b/plugins/process-resources/src/components/contextEditors/ClassUserInput.svelte
@@ -44,6 +44,7 @@
parent={_class}
kind={'ghost'}
width={'100%'}
+ excludeBaseTypes
on:change={(e) => {
if (e.detail !== undefined) {
onChange(e.detail)
diff --git a/plugins/process-resources/src/components/settings/CreateCardEditor.svelte b/plugins/process-resources/src/components/settings/CreateCardEditor.svelte
index 0a48ccfc08..c60d9bd886 100644
--- a/plugins/process-resources/src/components/settings/CreateCardEditor.svelte
+++ b/plugins/process-resources/src/components/settings/CreateCardEditor.svelte
@@ -152,23 +152,50 @@
$: typeChange(targetClass)
$: subclasses = h.getDescendants(targetClass).filter((c) => !h.isMixin(c) && c !== targetClass)
+ $: baseTargetType = isBaseTypeWithSubtypes(targetClass)
let askSubclass = params._class !== params.targetClass
$: askSubclass = params._class !== params.targetClass
+ $: if (baseTargetType && !askSubclass) {
+ setAskSubclass()
+ }
- function changeAskSubclass (e: CustomEvent): void {
+ function setAskSubclass (): void {
const context = createContext({
type: 'userRequest',
id: generateContextId(),
_class: targetClass,
key: '_class'
})
+ params._class = context
+ step.params = params
+ dispatch('change', step)
+ }
+
+ function changeAskSubclass (e: CustomEvent): void {
if (e.detail !== undefined) {
- step.params._class = e.detail ? context : targetClass
+ if (!e.detail && baseTargetType) return
+ if (e.detail) {
+ setAskSubclass()
+ return
+ }
+ params._class = targetClass
+ step.params = params
dispatch('change', step)
}
}
+ function isBaseTypeWithSubtypes (_class: Ref>): boolean {
+ const clazz = h.getClass(_class) as MasterTag | undefined
+ if (clazz?.baseType !== true) return false
+
+ return h.getDescendants(_class).some((descendant) => {
+ if (descendant === _class || h.isMixin(descendant)) return false
+ const descendantClass = h.getClass(descendant) as MasterTag | undefined
+ return descendantClass?._class === cardPlugin.class.MasterTag && descendantClass.removed !== true
+ })
+ }
+
let askRequired = params.askRequired ?? false
$: askRequired = params.askRequired ?? false
@@ -219,7 +246,7 @@
]
-
+
{/if}
+ import card, { type MasterTag } from '@hcengineering/card'
import core, { Association, Doc, WithLookup } from '@hcengineering/core'
import { IntlString } from '@hcengineering/platform'
import { getClient, ObjectCreate } from '@hcengineering/presentation'
@@ -25,15 +26,30 @@
function getCreate (): ObjectCreate | undefined {
const factory = client.getHierarchy().classHierarchyMixin(_class, view.mixin.ObjectFactory)
if (factory) {
+ const usePopup = isBaseCardTypeWithSubtypes()
return {
- component: factory.component,
+ component: usePopup ? factory.component : undefined,
func: factory.create,
label,
- props: { _class, space: object.space }
+ props: { _class, type: _class, space: object.space, changeType: usePopup }
}
}
}
+ function isBaseCardTypeWithSubtypes (): boolean {
+ const hierarchy = client.getHierarchy()
+ if (!hierarchy.isDerived(_class, card.class.Card)) return false
+
+ const clazz = hierarchy.getClass(_class) as MasterTag | undefined
+ if (clazz?.baseType !== true) return false
+
+ return hierarchy.getDescendants(_class).some((descendant) => {
+ if (descendant === _class || hierarchy.isMixin(descendant)) return false
+ const descendantClass = hierarchy.getClass(descendant) as MasterTag | undefined
+ return descendantClass?._class === card.class.MasterTag && descendantClass.removed !== true
+ })
+ }
+
function add (): void {
const create = getCreate()
const isVersionable = client.getHierarchy().classHierarchyMixin(_class, core.mixin.VersionableClass) !== undefined