@eclipse-glsp-examples/workflow-server 0.9.0-next.5ce3b9a.1 → 0.9.0-next.82d6d28.20

package/src/provider/workflow-context-menu-item-provider.ts

@@ -13,26 +13,39 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Args, ContextMenuItemProvider, CreateNodeOperation, GModelState, MenuItem, Point } from '@eclipse-glsp/server-node';
+import { Args, ContextMenuItemProvider, CreateNodeOperation, MenuItem, ModelState, Point } from '@eclipse-glsp/server-node';
 import { inject, injectable } from 'inversify';
 import { GridSnapper } from '../handler/grid-snapper';
 import { ModelTypes } from '../util/model-types';
 
 @injectable()
 export class WorkflowContextMenuItemProvider extends ContextMenuItemProvider {
-    @inject(GModelState)
-    protected modelState: GModelState;
+    @inject(ModelState)
+    protected modelState: ModelState;
 
     getItems(selectedElementIds: string[], position: Point, args?: Args): MenuItem[] {
-        if (this.modelState.isReadonly) {
+        if (this.modelState.isReadonly || selectedElementIds.length !== 0) {
             return [];
         }
         const snappedPosition = GridSnapper.snap(position);
-        const newAutTask = new MenuItem('newAutoTask', 'Automated Task', [
-            new CreateNodeOperation(ModelTypes.AUTOMATED_TASK, snappedPosition)
-        ]);
-        const newManTask = new MenuItem('newManualTask', 'Manual Task', [new CreateNodeOperation(ModelTypes.MANUAL_TASK, snappedPosition)]);
-        const newChildMenu = new MenuItem('new', 'New', undefined, [newAutTask, newManTask], 'add', '0_new');
+        const newAutTask: MenuItem = {
+            id: 'newAutoTask',
+            label: 'Automated Task',
+            actions: [CreateNodeOperation.create(ModelTypes.AUTOMATED_TASK, { location: snappedPosition })]
+        };
+        const newManTask: MenuItem = {
+            id: 'newManualTask',
+            label: 'Manual Task',
+            actions: [CreateNodeOperation.create(ModelTypes.MANUAL_TASK, { location: snappedPosition })]
+        };
+        const newChildMenu: MenuItem = {
+            id: 'new',
+            label: 'New',
+            actions: [],
+            children: [newAutTask, newManTask],
+            icon: 'add',
+            group: '0_new'
+        };
         return [newChildMenu];
     }
 }

package/src/workflow-diagram-module.ts

@@ -14,26 +14,23 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import {
-    ClassMultiBinding,
     CommandPaletteActionProvider,
     ContextMenuItemProvider,
-    DefaultToolPaletteItemProvider,
     DiagramConfiguration,
     GLSPServer,
     GModelDiagramModule,
-    GModelIndex,
     InstanceMultiBinding,
-    JsonRpcGLSPServer,
     LabelEditValidator,
     ModelValidator,
+    MultiBinding,
+    NavigationTargetProvider,
+    NavigationTargetResolver,
     OperationHandlerConstructor,
     PopupModelFactory,
-    ServerModule,
-    ToolPaletteItemProvider
+    ServerModule
 } from '@eclipse-glsp/server-node';
-import { NavigationTargetProvider } from '@eclipse-glsp/server-node/lib/features/navigation/navigation-target-provider';
-import { NavigationTargetResolver } from '@eclipse-glsp/server-node/lib/features/navigation/navigation-target-resolver';
-import { injectable, interfaces } from 'inversify';
+import { BindingTarget } from '@eclipse-glsp/server-node/lib/di/binding-target';
+import { injectable } from 'inversify';
 import { CreateAutomatedTaskHandler } from './handler/create-automated-task-handler';
 import { CreateCategoryHandler } from './handler/create-category-handler';
 import { CreateDecisionNodeHandler } from './handler/create-decision-node-handler';
@@ -53,16 +50,12 @@ import { WorkflowCommandPaletteActionProvider } from './provider/workflow-comman
 import { WorkflowContextMenuItemProvider } from './provider/workflow-context-menu-item-provider';
 import { WorkflowDiagramConfiguration } from './workflow-diagram-configuration';
 import { WorkflowGLSPServer } from './workflow-glsp-server';
-import { WorkflowModelIndex } from './workflow-model-index';
 import { WorkflowPopupFactory } from './workflow-popup-factory';
 
 @injectable()
 export class WorkflowServerModule extends ServerModule {
-    configure(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void {
-        super.configure(bind, unbind, isBound, rebind);
-        bind(WorkflowGLSPServer).toSelf().inSingletonScope();
-        rebind(GLSPServer).toService(WorkflowGLSPServer);
-        rebind(JsonRpcGLSPServer).toService(WorkflowGLSPServer);
+    protected override bindGLSPServer(): BindingTarget<GLSPServer> {
+        return WorkflowGLSPServer;
     }
 }
 
@@ -72,20 +65,7 @@ export class WorkflowDiagramModule extends GModelDiagramModule {
         return 'workflow-diagram';
     }
 
-    protected configure(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void {
-        super.configure(bind, unbind, isBound, rebind);
-        bind(DiagramConfiguration).to(WorkflowDiagramConfiguration).inSingletonScope();
-        bind(NavigationTargetResolver).to(WorkflowNavigationTargetResolver).inSingletonScope();
-        bind(ContextMenuItemProvider).to(WorkflowContextMenuItemProvider).inSingletonScope();
-        bind(CommandPaletteActionProvider).to(WorkflowCommandPaletteActionProvider).inSingletonScope();
-        bind(LabelEditValidator).to(WorkflowLabelEditValidator).inSingletonScope();
-        bind(PopupModelFactory).to(WorkflowPopupFactory).inSingletonScope();
-        bind(ModelValidator).to(WorkflowModelValidator).inSingletonScope();
-        bind(ToolPaletteItemProvider).to(DefaultToolPaletteItemProvider).inSingletonScope();
-        rebind(GModelIndex).to(WorkflowModelIndex).inSingletonScope();
-    }
-
-    protected configureOperationHandlers(binding: InstanceMultiBinding<OperationHandlerConstructor>): void {
+    protected override configureOperationHandlers(binding: InstanceMultiBinding<OperationHandlerConstructor>): void {
         super.configureOperationHandlers(binding);
         binding.add(CreateAutomatedTaskHandler);
         binding.add(CreateManualTaskHandler);
@@ -98,7 +78,35 @@ export class WorkflowDiagramModule extends GModelDiagramModule {
         binding.add(CreateCategoryHandler);
     }
 
-    protected configureNavigationTargetProviders(binding: ClassMultiBinding<NavigationTargetProvider>): void {
+    protected bindDiagramConfiguration(): BindingTarget<DiagramConfiguration> {
+        return WorkflowDiagramConfiguration;
+    }
+
+    protected override bindNavigationTargetResolver(): BindingTarget<NavigationTargetResolver> | undefined {
+        return WorkflowNavigationTargetResolver;
+    }
+
+    protected override bindContextMenuItemProvider(): BindingTarget<ContextMenuItemProvider> | undefined {
+        return WorkflowContextMenuItemProvider;
+    }
+
+    protected override bindCommandPaletteActionProvider(): BindingTarget<CommandPaletteActionProvider> | undefined {
+        return WorkflowCommandPaletteActionProvider;
+    }
+
+    protected override bindLabelEditValidator(): BindingTarget<LabelEditValidator> | undefined {
+        return WorkflowLabelEditValidator;
+    }
+
+    protected override bindPopupModelFactory(): BindingTarget<PopupModelFactory> | undefined {
+        return WorkflowPopupFactory;
+    }
+
+    protected override bindModelValidator(): BindingTarget<ModelValidator> | undefined {
+        return WorkflowModelValidator;
+    }
+
+    protected override configureNavigationTargetProviders(binding: MultiBinding<NavigationTargetProvider>): void {
         super.configureNavigationTargetProviders(binding);
         binding.add(NextNodeNavigationTargetProvider);
         binding.add(PreviousNodeNavigationTargetProvider);

package/src/workflow-glsp-server.ts

@@ -22,9 +22,9 @@ export class WorkflowGLSPServer extends DefaultGLSPServer {
     TIMESTAMP_KEY = 'timestamp';
 
     @inject(Logger)
-    protected logger: Logger;
+    protected override logger: Logger;
 
-    protected handleInitializeArgs(result: InitializeResult, args: Args | undefined): MaybePromise<InitializeResult> {
+    protected override handleInitializeArgs(result: InitializeResult, args: Args | undefined): MaybePromise<InitializeResult> {
         if (!args) {
             return result;
         }

package/lib/workflow-model-index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"workflow-model-index.d.ts","sourceRoot":"","sources":["../src/workflow-model-index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAI/D,qBACa,kBAAmB,SAAQ,WAAW;IAC/C,WAAW,IAAI,KAAK,EAAE;CASzB"}

package/lib/workflow-model-index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"workflow-model-index.js","sourceRoot":"","sources":["../src/workflow-model-index.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,2DAA+D;AAC/D,yCAAuC;AACvC,oDAAgD;AAGhD,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,yBAAW;IAC/C,WAAW;QACP,MAAM,KAAK,GAAY,KAAK,CAAC,WAAW,EAAE,CAAC;QAC3C,IAAI,CAAC,WAAW,CAAC,wBAAU,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC1D,IAAI,QAAQ,YAAY,mBAAK,EAAE;gBAC3B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACxB;QACL,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAVY,kBAAkB;IAD9B,sBAAU,EAAE;GACA,kBAAkB,CAU9B;AAVY,gDAAkB"}