Update glsp to v2.3.0-next.390

- Align ActionDispatcher API (GLSP-1416)
axonivy · Nov 29, 2024 · 8f88c39 · 8f88c39
1 parent 3b2f1be
commit 8f88c39
Show file tree

Hide file tree

Showing 24 changed files with 90 additions and 77 deletions.
diff --git a/integration/eclipse/package.json b/integration/eclipse/package.json
@@ -13,9 +13,9 @@
     "@axonivy/process-editor": "~12.0.1-next",
     "@axonivy/process-editor-inscription": "~12.0.1-next",
     "@axonivy/process-editor-inscription-view": "~12.0.1-next",
-    "@eclipse-glsp/client": "2.3.0-next.381",
+    "@eclipse-glsp/client": "2.3.0-next.390",
     "@eclipse-glsp/ide": "2.3.0-next.134",
-    "@eclipse-glsp/protocol": "2.3.0-next.381"
+    "@eclipse-glsp/protocol": "2.3.0-next.390"
   },
   "devDependencies": {
     "@vscode/codicons": "^0.0.25",

diff --git a/integration/eclipse/src/startup.ts b/integration/eclipse/src/startup.ts
@@ -2,17 +2,17 @@ import type { ToolBar } from '@axonivy/process-editor';
 import { IVY_TYPES } from '@axonivy/process-editor';
 import { EnableInscriptionAction } from '@axonivy/process-editor-inscription';
 import { EnableViewportAction, SwitchThemeAction, UpdatePaletteItems } from '@axonivy/process-editor-protocol';
-import type { IDiagramStartup} from '@eclipse-glsp/client';
-import { EnableToolPaletteAction, GLSPActionDispatcher, ShowGridAction, TYPES } from '@eclipse-glsp/client';
+import type { IActionDispatcher, IDiagramStartup } from '@eclipse-glsp/client';
+import { EnableToolPaletteAction, ShowGridAction, TYPES } from '@eclipse-glsp/client';
 import { ContainerModule, inject, injectable } from 'inversify';
 import type { IvyDiagramOptions } from './di.config';
 
 import './index.css';
 
 @injectable()
 export class EclipseDiagramStartup implements IDiagramStartup {
-  @inject(GLSPActionDispatcher)
-  protected actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher)
+  protected actionDispatcher: IActionDispatcher;
 
   @inject(IVY_TYPES.ToolBar)
   protected toolBar: ToolBar;

diff --git a/integration/standalone/package.json b/integration/standalone/package.json
@@ -14,7 +14,7 @@
     "@axonivy/process-editor-inscription": "~12.0.1-next",
     "@axonivy/process-editor-inscription-view": "~12.0.1-next",
     "@axonivy/ui-components": "~12.0.1-next.384",
-    "@eclipse-glsp/client": "2.3.0-next.381"
+    "@eclipse-glsp/client": "2.3.0-next.390"
   },
   "devDependencies": {
     "@vscode/codicons": "^0.0.25",

diff --git a/integration/standalone/src/app.ts b/integration/standalone/src/app.ts
@@ -1,7 +1,8 @@
 import { MonacoEditorUtil } from '@axonivy/process-editor-inscription-view';
 import { IvyBaseJsonrpcGLSPClient, SwitchThemeActionHandler } from '@axonivy/process-editor';
 import type { ThemeMode } from '@axonivy/process-editor-protocol';
-import { DiagramLoader, EditMode, GLSPActionDispatcher, GLSPWebSocketProvider, MessageAction, StatusAction } from '@eclipse-glsp/client';
+import type { IActionDispatcher } from '@eclipse-glsp/client';
+import { DiagramLoader, EditMode, GLSPWebSocketProvider, MessageAction, StatusAction, TYPES } from '@eclipse-glsp/client';
 import { ApplicationIdProvider, GLSPClient } from '@eclipse-glsp/protocol';
 import type { Container } from 'inversify';
 import type { MessageConnection } from 'vscode-jsonrpc';
@@ -63,7 +64,7 @@ async function initialize(connectionProvider: MessageConnection, isReconnecting
     }
   });
 
-  const actionDispatcher = container.get(GLSPActionDispatcher);
+  const actionDispatcher = container.get<IActionDispatcher>(TYPES.IActionDispatcher);
   if (isReconnecting) {
     const message = `Connection to the ${id} glsp server got closed. Connection was successfully re-established.`;
     const timeout = 5000;

diff --git a/integration/standalone/src/startup.ts b/integration/standalone/src/startup.ts
@@ -1,15 +1,15 @@
 import { EnableInscriptionAction } from '@axonivy/process-editor-inscription';
 import { EnableViewportAction, SwitchThemeAction, UpdatePaletteItems } from '@axonivy/process-editor-protocol';
-import type { IDiagramStartup } from '@eclipse-glsp/client';
-import { EnableToolPaletteAction, GLSPActionDispatcher, NavigationTarget, SelectAction, TYPES } from '@eclipse-glsp/client';
+import type { IActionDispatcher, IDiagramStartup } from '@eclipse-glsp/client';
+import { EnableToolPaletteAction, NavigationTarget, SelectAction, TYPES } from '@eclipse-glsp/client';
 import { ContainerModule, inject, injectable } from 'inversify';
 import type { IvyDiagramOptions } from './di.config';
 import './index.css';
 
 @injectable()
 export class StandaloneDiagramStartup implements IDiagramStartup {
-  @inject(GLSPActionDispatcher)
-  protected actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher)
+  protected actionDispatcher: IActionDispatcher;
 
   @inject(TYPES.IDiagramOptions)
   protected options: IvyDiagramOptions;

diff --git a/integration/viewer/package.json b/integration/viewer/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@axonivy/process-editor": "~12.0.1-next",
-    "@eclipse-glsp/client": "2.3.0-next.381"
+    "@eclipse-glsp/client": "2.3.0-next.390"
   },
   "devDependencies": {
     "@vscode/codicons": "^0.0.25",

diff --git a/integration/viewer/src/app.ts b/integration/viewer/src/app.ts
@@ -1,6 +1,7 @@
 import { IvyBaseJsonrpcGLSPClient, SwitchThemeActionHandler } from '@axonivy/process-editor';
 import type { ThemeMode } from '@axonivy/process-editor-protocol';
-import { DiagramLoader, EditMode, GLSPActionDispatcher, GLSPWebSocketProvider, MessageAction, StatusAction } from '@eclipse-glsp/client';
+import type { IActionDispatcher } from '@eclipse-glsp/client';
+import { DiagramLoader, EditMode, GLSPWebSocketProvider, MessageAction, StatusAction, TYPES } from '@eclipse-glsp/client';
 import { ApplicationIdProvider, GLSPClient } from '@eclipse-glsp/protocol';
 import type { Container } from 'inversify';
 import type { MessageConnection } from 'vscode-jsonrpc';
@@ -59,7 +60,7 @@ async function initialize(connectionProvider: MessageConnection, isReconnecting
     }
   });
 
-  const actionDispatcher = container.get(GLSPActionDispatcher);
+  const actionDispatcher = container.get<IActionDispatcher>(TYPES.IActionDispatcher);
   if (isReconnecting) {
     const message = `Connection to the ${id} glsp server got closed. Connection was successfully re-established.`;
     const timeout = 5000;

diff --git a/integration/viewer/src/startup.ts b/integration/viewer/src/startup.ts
@@ -1,6 +1,6 @@
 import { EnableViewportAction, MoveIntoViewportAction, SetViewportZoomAction, SwitchThemeAction } from '@axonivy/process-editor-protocol';
-import type { Action, IDiagramStartup } from '@eclipse-glsp/client';
-import { CenterAction, GLSPActionDispatcher, NavigationTarget, SelectAction, TYPES } from '@eclipse-glsp/client';
+import type { Action, IActionDispatcher, IDiagramStartup } from '@eclipse-glsp/client';
+import { CenterAction, NavigationTarget, SelectAction, TYPES } from '@eclipse-glsp/client';
 import type { interfaces } from 'inversify';
 import { ContainerModule, inject, injectable } from 'inversify';
 import type { IvyDiagramOptions } from './di.config';
@@ -10,8 +10,8 @@ const ContainerSymbol = Symbol('ContainerSymbol');
 
 @injectable()
 export class ViewerDiagramStartup implements IDiagramStartup {
-  @inject(GLSPActionDispatcher)
-  protected actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher)
+  protected actionDispatcher: IActionDispatcher;
 
   @inject(TYPES.IDiagramOptions)
   protected options: IvyDiagramOptions;

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "@axonivy/process-editor-protocol": "~12.0.1-next",
-    "@eclipse-glsp/client": "2.3.0-next.381",
+    "@eclipse-glsp/client": "2.3.0-next.390",
     "showdown": "^2.1.0",
     "toastify-js": "1.12.0"
   },

diff --git a/packages/editor/src/jump/action.ts b/packages/editor/src/jump/action.ts
@@ -6,8 +6,8 @@ import {
   isViewport,
   Viewport,
   TYPES,
-  GLSPActionDispatcher,
-  SetViewportAction
+  SetViewportAction,
+  type IActionDispatcher
 } from '@eclipse-glsp/client';
 import { SelectAllAction } from '@eclipse-glsp/protocol';
 import { injectable, inject } from 'inversify';
@@ -19,7 +19,7 @@ import { JumpAction } from '@axonivy/process-editor-protocol';
 
 @injectable()
 export class JumpActionHandler implements IActionHandler {
-  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: IActionDispatcher;
   @inject(EditorContextService) protected readonly editorContext: EditorContextService;
   private jumpStack: Map<string, Viewport> = new Map();
 

diff --git a/packages/editor/src/tools/di.config.ts b/packages/editor/src/tools/di.config.ts
@@ -30,10 +30,10 @@ export const ivyChangeBoundsToolModule = new FeatureModule(
     // GSLP defaults
     configureCommand(context, ShowChangeBoundsToolResizeFeedbackCommand);
     configureCommand(context, HideChangeBoundsToolResizeFeedbackCommand);
-    bindAsService(context, TYPES.IDefaultTool, IvyChangeBoundsTool);
 
     // GLSP replacements
     bindAsService(context, TYPES.IChangeBoundsManager, IvyChangeBoundsManager);
+    bindAsService(context, TYPES.IDefaultTool, IvyChangeBoundsTool);
     configureView(context, GResizeHandle.TYPE, IvyResizeHandleView);
   },
   { featureId: changeBoundsToolModule.featureId }

diff --git a/packages/editor/src/tools/ivy-change-bounds-tool.ts b/packages/editor/src/tools/ivy-change-bounds-tool.ts
@@ -1,7 +1,8 @@
 import type { TrackedResize } from '@eclipse-glsp/client';
 import { Bounds, ChangeBoundsListener, ChangeBoundsTool, ResizeHandleLocation, SetBoundsFeedbackAction } from '@eclipse-glsp/client';
 import { LaneNode } from '../diagram/model';
-
+import { injectable } from 'inversify';
+@injectable()
 export class IvyChangeBoundsTool extends ChangeBoundsTool {
   protected createChangeBoundsListener() {
     return new IvyChangeBoundsListener(this);

diff --git a/packages/editor/src/ui-tools/quick-action/color/action-handler.ts b/packages/editor/src/ui-tools/quick-action/color/action-handler.ts
@@ -1,20 +1,20 @@
 import {
   Action,
-  GLSPActionDispatcher,
   IActionHandler,
   ICommand,
   PaletteItem,
   RequestContextActions,
   SetContextActions,
-  TYPES
+  TYPES,
+  type IActionDispatcher
 } from '@eclipse-glsp/client';
 import { injectable, inject } from 'inversify';
 import { ShowQuickActionMenuAction } from '../quick-action-menu-ui';
 import { UpdateColorPaletteAction, UpdatePaletteItems } from '@axonivy/process-editor-protocol';
 
 @injectable()
 export class ColorPaletteHandler implements IActionHandler {
-  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: IActionDispatcher;
 
   protected paletteItems: PaletteItem[] = [];
 

diff --git a/packages/editor/src/ui-tools/quick-action/color/action.ts b/packages/editor/src/ui-tools/quick-action/color/action.ts
@@ -1,4 +1,4 @@
-import { Action, GLSPActionDispatcher, PaletteItem, GModelElement, TYPES } from '@eclipse-glsp/client';
+import { Action, PaletteItem, GModelElement, TYPES, type IActionDispatcher } from '@eclipse-glsp/client';
 import { QuickAction, QuickActionProvider } from '../quick-action';
 import { ShowQuickActionMenuAction } from '../quick-action-menu-ui';
 import { injectable, inject } from 'inversify';
@@ -11,7 +11,7 @@ import { LaneTypes } from '../../../diagram/view-types';
 @injectable()
 export class SelectColorQuickActionProvider implements QuickActionProvider {
   @inject(IVY_TYPES.ColorPalette) protected readonly colors: ColorPaletteHandler;
-  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: IActionDispatcher;
 
   singleQuickAction(element: GModelElement): QuickAction | undefined {
     if (element.type === LaneTypes.POOL) {