FSM simplification & state editor

common/changes/@anticrm/chunter-impl/fsm-simplification_2021-11-16-06-59.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@anticrm/chunter-impl",
+      "comment": "Move intl msg to ui",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@anticrm/chunter-impl"
+}

common/changes/@anticrm/chunter/fsm-simplification_2021-11-16-06-59.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@anticrm/chunter",
+      "comment": "Move intl msg to ui",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@anticrm/chunter"
+}

common/changes/@anticrm/fsm-impl/fsm-simplification_2021-11-16-06-59.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@anticrm/fsm-impl",
+      "comment": "Update FSM",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@anticrm/fsm-impl"
+}

common/changes/@anticrm/fsm/fsm-simplification_2021-11-16-06-59.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@anticrm/fsm",
+      "comment": "Update FSM",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@anticrm/fsm"
+}

common/changes/@anticrm/model-fsm/fsm-simplification_2021-11-16-06-59.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@anticrm/model-fsm",
+      "comment": "Update FSM",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@anticrm/model-fsm"
+}

common/changes/@anticrm/model-recruiting/fsm-simplification_2021-11-16-06-59.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@anticrm/model-recruiting",
+      "comment": "Get rid of FSM templates",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@anticrm/model-recruiting"
+}

common/changes/@anticrm/recruiting-assets/fsm-simplification_2021-11-16-06-59.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@anticrm/recruiting-assets",
+      "comment": "Add FSM state editor",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@anticrm/recruiting-assets"
+}

common/changes/@anticrm/recruiting-impl/fsm-simplification_2021-11-16-06-59.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@anticrm/recruiting-impl",
+      "comment": "Add FSM state editor",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@anticrm/recruiting-impl"
+}

common/changes/@anticrm/recruiting/fsm-simplification_2021-11-16-06-59.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@anticrm/recruiting",
+      "comment": "Add FSM state editor",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@anticrm/recruiting"
+}

common/changes/@anticrm/theme/fsm-simplification_2021-11-16-06-59.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@anticrm/theme",
+      "comment": "Update default colors",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@anticrm/theme"
+}

common/changes/@anticrm/ui-assets/fsm-simplification_2021-11-16-06-59.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@anticrm/ui-assets",
+      "comment": "Add intl mesg",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@anticrm/ui-assets"
+}

common/changes/@anticrm/ui/fsm-simplification_2021-11-16-06-59.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@anticrm/ui",
+      "comment": "Enrich Dropdown",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@anticrm/ui"
+}

models/dev/src/demoRecruiting.ts

@@ -55,7 +55,6 @@ export async function demoRecruiting (builder: DemoBuilder, candidateCount = 20)
       private: false,
       location: faker.address.cityName(),
       dueDate: faker.date.soon().getTime(),
-      fsm: recruiting.fsm.DefaultVacancy,
       company: faker.company.companyName()
     },
     demoIds.vacancy.DemoVacany,
@@ -139,7 +138,7 @@ export async function demoRecruiting (builder: DemoBuilder, candidateCount = 20)
           comments: [],
           attachments: [],
           candidate: getFullRef(candidateId, recruiting.class.Candidate),
-          fsm: demoIds.vacancy.DemoVacany,
+          fsm: recruiting.fsm.DefaultVacancy,
           state: faker.random.arrayElement(states) as Ref<State>,
           item: candidateId,
           clazz: recruiting.class.Candidate,

models/fsm/src/index.ts

@@ -13,21 +13,19 @@
 // limitations under the License.
 //
 
-import { LexoRank } from 'lexorank'
-import { DOMAIN_MODEL } from '@anticrm/core'
 import type { Class, Doc, Domain, Ref } from '@anticrm/core'
-import type { FSM, FSMItem, State, Transition, WithFSM } from '@anticrm/fsm'
+import type { FSM, FSMItem, State, Transition } from '@anticrm/fsm'
 import fsmPlugin from '@anticrm/fsm'
 import { Builder, Model } from '@anticrm/model'
-import core, { TDoc, TSpace } from '@anticrm/model-core'
+import core, { TDoc } from '@anticrm/model-core'
 import type { Action } from '@anticrm/action-plugin'
 
 const DOMAIN_FSM = 'fsm' as Domain
 
 /**
  * @public
  */
-@Model(fsmPlugin.class.FSM, core.class.Doc, DOMAIN_MODEL)
+@Model(fsmPlugin.class.FSM, core.class.Doc, DOMAIN_FSM)
 export class TFSM extends TDoc implements FSM {
   name!: string
   clazz!: Ref<Class<Doc>>
@@ -39,7 +37,7 @@ export class TFSM extends TDoc implements FSM {
  */
 @Model(fsmPlugin.class.FSMItem, core.class.Doc, DOMAIN_FSM)
 export class TFSMItem extends TDoc implements FSMItem {
-  fsm!: Ref<WithFSM>
+  fsm!: Ref<FSM>
   state!: Ref<State>
   item!: Ref<Doc>
   clazz!: Ref<Class<Doc>>
@@ -49,7 +47,7 @@ export class TFSMItem extends TDoc implements FSMItem {
 /**
  * @public
  */
-@Model(fsmPlugin.class.State, core.class.Doc, DOMAIN_MODEL)
+@Model(fsmPlugin.class.State, core.class.Doc, DOMAIN_FSM)
 export class TState extends TDoc implements State {
   name!: string
   color!: string
@@ -62,155 +60,16 @@ export class TState extends TDoc implements State {
 /**
  * @public
  */
-@Model(fsmPlugin.class.Transition, core.class.Doc, DOMAIN_MODEL)
+@Model(fsmPlugin.class.Transition, core.class.Doc, DOMAIN_FSM)
 export class TTransition extends TDoc implements Transition {
   from!: Ref<State>
   to!: Ref<State>
   fsm!: Ref<FSM>
 }
 
-/**
- * @public
- */
-@Model(fsmPlugin.class.WithFSM, core.class.Space)
-export class TWithFSM extends TSpace implements WithFSM {
-  fsm!: Ref<FSM>
-}
-
 /**
  * @public
  */
 export function createModel (builder: Builder): void {
-  builder.createModel(TFSM, TState, TTransition, TFSMItem, TWithFSM)
-}
-
-/**
- * @public
- */
-export type PureState = Omit<State, keyof Doc | 'fsm' | 'color' | 'rank'> & {
-  color?: string
-}
-
-/**
- * @public
- */
-export class FSMBuilder {
-  private readonly states = new Map<string, PureState>()
-  private readonly transitions: Array<[string, string]> = []
-  private readonly ids = new Set<Ref<Doc>>()
-
-  constructor (readonly name: string, readonly clazz: Ref<Class<Doc>>, readonly fsmId: Ref<FSM>) {}
-
-  private getState (a: PureState): PureState | undefined {
-    if (!this.states.has(a.name)) {
-      this.states.set(a.name, a)
-    }
-
-    return this.states.get(a.name)
-  }
-
-  private _transition (a: PureState, b: PureState): FSMBuilder {
-    const existingA = this.getState(a)
-    const existingB = this.getState(b)
-
-    if (existingA == null || existingB == null) {
-      return this
-    }
-
-    this.transitions.push([existingA.name, existingB.name])
-
-    return this
-  }
-
-  transition (a: PureState, b: PureState | PureState[]): FSMBuilder {
-    ;(Array.isArray(b) ? b : [b]).forEach((x) => this._transition(a, x))
-
-    return this
-  }
-
-  private readonly genColor = (function * defaultColors () {
-    while (true) {
-      yield * [
-        'var(--primary-color-pink)',
-        'var(--primary-color-purple-01)',
-        'var(--primary-color-orange-01)',
-        'var(--primary-color-skyblue)',
-        'var(--primary-color-purple-02)',
-        'var(--primary-color-orange-02)',
-        'var(--primary-color-purple-03)'
-      ]
-    }
-  })()
-
-  makeId<T extends Doc>(key: string, name: string): Ref<T> {
-    const id = (this.fsmId + `-${key}-` + name.toLowerCase()) as Ref<T>
-    if (this.ids.has(id)) {
-      throw new Error(`Non uniq ID for FSM detected:${id}, ${Array.from(this.ids.keys()).toString()}`)
-    }
-    this.ids.add(id)
-    return id
-  }
-
-  build (S: Builder): Ref<FSM> {
-    const stateIDs: Map<string, Ref<State>> = new Map(
-      [...this.states.keys()].map((x) => [x, this.makeId('st', x)] as [string, Ref<State>])
-    )
-    S.createDoc(
-      fsmPlugin.class.FSM,
-      {
-        name: this.name,
-        clazz: this.clazz,
-        isTemplate: true
-      },
-      this.fsmId
-    )
-
-    let rank = LexoRank.middle()
-    this.states.forEach((state, key) => {
-      const color = state.color ?? this.genColor.next().value
-      S.createDoc(
-        fsmPlugin.class.State,
-        {
-          ...state,
-          color,
-          fsm: this.fsmId,
-          rank: rank.toString()
-        },
-        stateIDs.get(key) ?? ('' as Ref<State>)
-      )
-      rank = rank.between(LexoRank.max())
-    })
-
-    const transitions: Array<Ref<Transition>> = []
-
-    this.transitions.forEach(([fromName, toName]) => {
-      const from = stateIDs.get(fromName)
-      const to = stateIDs.get(toName)
-
-      if (from == null || to == null) {
-        return
-      }
-
-      const tID: Ref<Transition> = this.makeId('tr', fromName + '-' + toName)
-      S.createDoc(
-        fsmPlugin.class.Transition,
-        {
-          from,
-          to,
-          fsm: this.fsmId
-        },
-        tID
-      )
-
-      transitions.push(tID)
-    })
-
-    return this.fsmId
-  }
+  builder.createModel(TFSM, TState, TTransition, TFSMItem)
 }
-
-/**
- * @public
- */
-export const templateFSM = (name: string, clazz: Ref<Class<Doc>>, fsmId: Ref<FSM>): FSMBuilder =>
-  new FSMBuilder(name, clazz, fsmId)