Align ActionDispatcher API (GLSP-1416)

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;

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;

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;

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;

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;

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();
 

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[] = [];
 

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) {

packages/editor/src/ui-tools/quick-action/info/action.ts

@@ -1,14 +1,14 @@
 import {
   GArgument,
   GIssueMarker,
-  GLSPActionDispatcher,
   isWithEditableLabel,
   JsonAny,
   GChildElement,
   GEdge,
   GModelElement,
   TYPES,
-  hasArgs
+  hasArgs,
+  type IActionDispatcher
 } from '@eclipse-glsp/client';
 import { QuickAction, SingleQuickActionProvider } from '../quick-action';
 import { ShowInfoQuickActionMenuAction } from '../quick-action-menu-ui';
@@ -20,7 +20,7 @@ import { IvyIcons } from '@axonivy/ui-icons';
 
 @injectable()
 export class InfoQuickActionProvider extends SingleQuickActionProvider {
-  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: IActionDispatcher;
   @inject(IVY_TYPES.IvyViewerOptions) protected readonly options: IvyViewerOptions;
 
   singleQuickAction(element: GModelElement): QuickAction | undefined {

packages/editor/src/ui-tools/quick-action/types/action-handler.ts

@@ -1,19 +1,19 @@
 import { UpdatePaletteItems } from '@axonivy/process-editor-protocol';
 import {
   Action,
-  GLSPActionDispatcher,
   IActionHandler,
   ICommand,
   PaletteItem,
   RequestContextActions,
   SetContextActions,
-  TYPES
+  TYPES,
+  type IActionDispatcher
 } from '@eclipse-glsp/client';
 import { injectable, inject } from 'inversify';
 
 @injectable()
 export class TypesPaletteHandler implements IActionHandler {
-  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: IActionDispatcher;
 
   protected paletteItems: PaletteItem[] = [];
 

packages/editor/src/ui-tools/quick-action/types/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, SingleQuickActionProvider } from '../quick-action';
 import { ShowQuickActionMenuAction } from '../quick-action-menu-ui';
 import { injectable, inject } from 'inversify';
@@ -11,7 +11,7 @@ import { ChangeActivityTypeOperation } from '@axonivy/process-editor-protocol';
 @injectable()
 export class SelectActivityTypeQuickActionProvider extends SingleQuickActionProvider {
   @inject(IVY_TYPES.ActivityTypesPalette) protected readonly types: TypesPaletteHandler;
-  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: IActionDispatcher;
 
   singleQuickAction(element: GModelElement): QuickAction | undefined {
     if (isUnwrapable(element)) {

packages/editor/src/ui-tools/tool-bar/node/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 { ToolBar } from '../tool-bar';
 import { UpdatePaletteItems } from '@axonivy/process-editor-protocol';
 
 @injectable()
 export class ElementsPaletteHandler implements IActionHandler {
-  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: IActionDispatcher;
 
   protected paletteItems: Array<PaletteItem> = [];
   protected extensionItems: Promise<Array<PaletteItem>>;

packages/editor/src/ui-tools/tool-bar/tool-bar.ts

@@ -5,7 +5,6 @@ import {
   EditorContextService,
   EnableDefaultToolsAction,
   EnableToolPaletteAction,
-  GLSPActionDispatcher,
   IActionHandler,
   ICommand,
   IEditModeListener,
@@ -15,7 +14,8 @@ import {
   SelectionService,
   SetUIExtensionVisibilityAction,
   TYPES,
-  isNotUndefined
+  isNotUndefined,
+  type IActionDispatcher
 } from '@eclipse-glsp/client';
 import { inject, injectable, multiInject, postConstruct } from 'inversify';
 
@@ -44,7 +44,7 @@ const CLICKED_CSS_CLASS = 'clicked';
 export class ToolBar extends GLSPAbstractUIExtension implements IActionHandler, IEditModeListener, ISelectionListener {
   static readonly ID = 'ivy-tool-bar';
 
-  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: IActionDispatcher;
   @inject(SelectionService) protected readonly selectionService: SelectionService;
   @inject(EditorContextService) protected readonly editorContext: EditorContextService;
   @multiInject(IVY_TYPES.ToolBarButtonProvider) protected toolBarButtonProvider: ToolBarButtonProvider[];

packages/editor/src/ui-tools/viewport/viewport-bar.ts

@@ -1,7 +1,6 @@
 import {
   Action,
   EditorContextService,
-  GLSPActionDispatcher,
   IActionHandler,
   ICommand,
   isViewport,
@@ -10,7 +9,8 @@ import {
   SetViewportAction,
   TYPES,
   SelectionService,
-  GLSPAbstractUIExtension
+  GLSPAbstractUIExtension,
+  type IActionDispatcher
 } from '@eclipse-glsp/client';
 import { inject, injectable } from 'inversify';
 import { CenterButton, FitToScreenButton, OriginScreenButton, ViewportBarButton } from './button';
@@ -23,7 +23,7 @@ import { EnableViewportAction, SetViewportZoomAction } from '@axonivy/process-ed
 export class ViewportBar extends GLSPAbstractUIExtension implements IActionHandler {
   static readonly ID = 'ivy-viewport-bar';
 
-  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: IActionDispatcher;
   @inject(TYPES.IToolManager) protected readonly toolManager: IToolManager;
   @inject(EditorContextService) protected readonly editorContext: EditorContextService;
   @inject(SelectionService) protected selectionService: SelectionService;

packages/inscription/src/inscription/inscription-ui.tsx

@@ -6,15 +6,16 @@ import {
   Action,
   GArgument,
   GLSPAbstractUIExtension,
-  GLSPActionDispatcher,
   GModelRoot,
   IActionHandler,
   ISelectionListener,
   SelectAction,
   SelectAllAction,
   SelectionService,
+  TYPES,
   isNotUndefined,
-  isOpenable
+  isOpenable,
+  type IActionDispatcher
 } from '@eclipse-glsp/client';
 import { webSocketConnection, type Connection } from '@axonivy/jsonrpc';
 import type { MonacoLanguageClient } from 'monaco-languageclient';
@@ -32,7 +33,7 @@ export class InscriptionUi extends GLSPAbstractUIExtension implements IActionHan
   static readonly ID = 'inscription-ui';
 
   @inject(SelectionService) protected readonly selectionService: SelectionService;
-  @inject(GLSPActionDispatcher) protected readonly actionDispatcher: GLSPActionDispatcher;
+  @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: IActionDispatcher;
 
   private inscriptionElement?: string;
   private action?: EnableInscriptionAction;