@theia/timeline 1.53.0-next.55 → 1.53.0-next.64

package/src/browser/timeline-tree-widget.tsx

@@ -1,120 +1,120 @@
-// *****************************************************************************
-// Copyright (C) 2020 RedHat and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { CommandRegistry, MenuModelRegistry, MenuPath } from '@theia/core/lib/common';
-import { TreeWidget, TreeProps, NodeProps, TREE_NODE_SEGMENT_GROW_CLASS } from '@theia/core/lib/browser/tree';
-import { ContextMenuRenderer } from '@theia/core/lib/browser';
-import { TimelineNode, TimelineTreeModel } from './timeline-tree-model';
-import { TimelineService } from './timeline-service';
-import { TimelineContextKeyService } from './timeline-context-key-service';
-import * as React from '@theia/core/shared/react';
-import { TimelineItem } from '../common/timeline-model';
-
-export const TIMELINE_ITEM_CONTEXT_MENU: MenuPath = ['timeline-item-context-menu'];
-
-@injectable()
-export class TimelineTreeWidget extends TreeWidget {
-
-    static ID = 'timeline-tree-widget';
-    static PAGE_SIZE = 20;
-
-    @inject(MenuModelRegistry) protected readonly menus: MenuModelRegistry;
-    @inject(TimelineContextKeyService) protected readonly contextKeys: TimelineContextKeyService;
-    @inject(TimelineService) protected readonly timelineService: TimelineService;
-    @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry;
-
-    constructor(
-        @inject(TreeProps) props: TreeProps,
-        @inject(TimelineTreeModel) override readonly model: TimelineTreeModel,
-        @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer,
-    ) {
-        super(props, model, contextMenuRenderer);
-        this.id = TimelineTreeWidget.ID;
-        this.addClass('timeline-outer-container');
-    }
-
-    protected override renderNode(node: TimelineNode, props: NodeProps): React.ReactNode {
-        const attributes = this.createNodeAttributes(node, props);
-        const content = <TimelineItemNode
-            timelineItem={node.timelineItem}
-            commandRegistry={this.commandRegistry}
-            contextKeys={this.contextKeys}
-            contextMenuRenderer={this.contextMenuRenderer} />;
-        return React.createElement('div', attributes, content);
-    }
-
-    protected override handleEnter(event: KeyboardEvent): void {
-        const node = this.model.getFocusedNode() as TimelineNode;
-        const command = node?.timelineItem?.command;
-        if (command) {
-            this.commandRegistry.executeCommand(command.id, ...(command.arguments ? command.arguments : []));
-        }
-    }
-
-    protected override async handleLeft(event: KeyboardEvent): Promise<void> {
-        this.model.selectPrevNode();
-    }
-}
-
-export namespace TimelineItemNode {
-    export interface Props {
-        timelineItem: TimelineItem;
-        commandRegistry: CommandRegistry;
-        contextKeys: TimelineContextKeyService;
-        contextMenuRenderer: ContextMenuRenderer;
-    }
-}
-
-export class TimelineItemNode extends React.Component<TimelineItemNode.Props> {
-    override render(): JSX.Element | undefined {
-        const { label, description, detail } = this.props.timelineItem;
-        return <div className='timeline-item'
-            title={detail}
-            onContextMenu={this.renderContextMenu}
-            onClick={this.open}>
-            <div className={`noWrapInfo ${TREE_NODE_SEGMENT_GROW_CLASS}`} >
-                <span className='name'>{label}</span>
-                <span className='label'>{description}</span>
-            </div>
-        </div>;
-    }
-
-    protected open = () => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const command: any = this.props.timelineItem.command;
-        if (command) {
-            this.props.commandRegistry.executeCommand(command.id, ...command.arguments ? command.arguments : []);
-        }
-    };
-
-    protected renderContextMenu = (event: React.MouseEvent<HTMLElement>) => {
-        event.preventDefault();
-        event.stopPropagation();
-        const { timelineItem, contextKeys, contextMenuRenderer } = this.props;
-        const currentTimelineItem = contextKeys.timelineItem.get();
-        contextKeys.timelineItem.set(timelineItem.contextValue);
-        try {
-            contextMenuRenderer.render({
-                menuPath: TIMELINE_ITEM_CONTEXT_MENU,
-                anchor: event.nativeEvent,
-                args: [timelineItem]
-            });
-        } finally {
-            contextKeys.timelineItem.set(currentTimelineItem);
-        }
-    };
-}
+// *****************************************************************************
+// Copyright (C) 2020 RedHat and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { CommandRegistry, MenuModelRegistry, MenuPath } from '@theia/core/lib/common';
+import { TreeWidget, TreeProps, NodeProps, TREE_NODE_SEGMENT_GROW_CLASS } from '@theia/core/lib/browser/tree';
+import { ContextMenuRenderer } from '@theia/core/lib/browser';
+import { TimelineNode, TimelineTreeModel } from './timeline-tree-model';
+import { TimelineService } from './timeline-service';
+import { TimelineContextKeyService } from './timeline-context-key-service';
+import * as React from '@theia/core/shared/react';
+import { TimelineItem } from '../common/timeline-model';
+
+export const TIMELINE_ITEM_CONTEXT_MENU: MenuPath = ['timeline-item-context-menu'];
+
+@injectable()
+export class TimelineTreeWidget extends TreeWidget {
+
+    static ID = 'timeline-tree-widget';
+    static PAGE_SIZE = 20;
+
+    @inject(MenuModelRegistry) protected readonly menus: MenuModelRegistry;
+    @inject(TimelineContextKeyService) protected readonly contextKeys: TimelineContextKeyService;
+    @inject(TimelineService) protected readonly timelineService: TimelineService;
+    @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry;
+
+    constructor(
+        @inject(TreeProps) props: TreeProps,
+        @inject(TimelineTreeModel) override readonly model: TimelineTreeModel,
+        @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer,
+    ) {
+        super(props, model, contextMenuRenderer);
+        this.id = TimelineTreeWidget.ID;
+        this.addClass('timeline-outer-container');
+    }
+
+    protected override renderNode(node: TimelineNode, props: NodeProps): React.ReactNode {
+        const attributes = this.createNodeAttributes(node, props);
+        const content = <TimelineItemNode
+            timelineItem={node.timelineItem}
+            commandRegistry={this.commandRegistry}
+            contextKeys={this.contextKeys}
+            contextMenuRenderer={this.contextMenuRenderer} />;
+        return React.createElement('div', attributes, content);
+    }
+
+    protected override handleEnter(event: KeyboardEvent): void {
+        const node = this.model.getFocusedNode() as TimelineNode;
+        const command = node?.timelineItem?.command;
+        if (command) {
+            this.commandRegistry.executeCommand(command.id, ...(command.arguments ? command.arguments : []));
+        }
+    }
+
+    protected override async handleLeft(event: KeyboardEvent): Promise<void> {
+        this.model.selectPrevNode();
+    }
+}
+
+export namespace TimelineItemNode {
+    export interface Props {
+        timelineItem: TimelineItem;
+        commandRegistry: CommandRegistry;
+        contextKeys: TimelineContextKeyService;
+        contextMenuRenderer: ContextMenuRenderer;
+    }
+}
+
+export class TimelineItemNode extends React.Component<TimelineItemNode.Props> {
+    override render(): JSX.Element | undefined {
+        const { label, description, detail } = this.props.timelineItem;
+        return <div className='timeline-item'
+            title={detail}
+            onContextMenu={this.renderContextMenu}
+            onClick={this.open}>
+            <div className={`noWrapInfo ${TREE_NODE_SEGMENT_GROW_CLASS}`} >
+                <span className='name'>{label}</span>
+                <span className='label'>{description}</span>
+            </div>
+        </div>;
+    }
+
+    protected open = () => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const command: any = this.props.timelineItem.command;
+        if (command) {
+            this.props.commandRegistry.executeCommand(command.id, ...command.arguments ? command.arguments : []);
+        }
+    };
+
+    protected renderContextMenu = (event: React.MouseEvent<HTMLElement>) => {
+        event.preventDefault();
+        event.stopPropagation();
+        const { timelineItem, contextKeys, contextMenuRenderer } = this.props;
+        const currentTimelineItem = contextKeys.timelineItem.get();
+        contextKeys.timelineItem.set(timelineItem.contextValue);
+        try {
+            contextMenuRenderer.render({
+                menuPath: TIMELINE_ITEM_CONTEXT_MENU,
+                anchor: event.nativeEvent,
+                args: [timelineItem]
+            });
+        } finally {
+            contextKeys.timelineItem.set(currentTimelineItem);
+        }
+    };
+}

package/src/browser/timeline-widget.tsx

@@ -1,179 +1,179 @@
-// *****************************************************************************
-// Copyright (C) 2020 RedHat and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { Message } from '@theia/core/shared/@phosphor/messaging';
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import {
-    ApplicationShell,
-    BaseWidget,
-    MessageLoop, Navigatable,
-    NavigatableWidget,
-    Panel,
-    PanelLayout
-} from '@theia/core/lib/browser';
-import { TimelineTreeWidget } from './timeline-tree-widget';
-import { TimelineService, TimelineAggregate } from './timeline-service';
-import { CommandRegistry, SelectionService } from '@theia/core/lib/common';
-import { TimelineEmptyWidget } from './timeline-empty-widget';
-import { toArray } from '@theia/core/shared/@phosphor/algorithm';
-import URI from '@theia/core/lib/common/uri';
-import { URI as CodeURI } from '@theia/core/shared/vscode-uri';
-import { nls } from '@theia/core/lib/common/nls';
-
-@injectable()
-export class TimelineWidget extends BaseWidget {
-
-    protected panel: Panel;
-    static ID = 'timeline-view';
-
-    private readonly timelinesBySource = new Map<string, TimelineAggregate>();
-
-    @inject(TimelineTreeWidget) protected readonly resourceWidget: TimelineTreeWidget;
-    @inject(TimelineService) protected readonly timelineService: TimelineService;
-    @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry;
-    @inject(ApplicationShell) protected readonly applicationShell: ApplicationShell;
-    @inject(TimelineEmptyWidget) protected readonly timelineEmptyWidget: TimelineEmptyWidget;
-    @inject(SelectionService) protected readonly selectionService: SelectionService;
-
-    constructor() {
-        super();
-        this.id = TimelineWidget.ID;
-        this.title.label = nls.localizeByDefault('Timeline');
-        this.title.caption = this.title.label;
-        this.addClass('theia-timeline');
-    }
-
-    @postConstruct()
-    protected init(): void {
-        const layout = new PanelLayout();
-        this.layout = layout;
-        this.panel = new Panel({ layout: new PanelLayout({}) });
-        this.panel.node.tabIndex = -1;
-        layout.addWidget(this.panel);
-        this.containerLayout!.addWidget(this.resourceWidget);
-        this.containerLayout!.addWidget(this.timelineEmptyWidget);
-
-        this.refresh();
-        this.toDispose.push(this.timelineService.onDidChangeTimeline(event => {
-            const currentWidgetUri = this.getCurrentWidgetUri();
-            if (currentWidgetUri) {
-                this.loadTimeline(currentWidgetUri, event.reset);
-            }
-        })
-        );
-        this.toDispose.push(this.selectionService.onSelectionChanged(selection => {
-            if (Array.isArray(selection) && !!selection[0] && 'uri' in selection[0]) {
-                this.refresh(selection[0].uri);
-            }
-        }));
-        this.toDispose.push(this.applicationShell.onDidChangeCurrentWidget(async e => {
-            if ((e.newValue && Navigatable.is(e.newValue)) || !this.suitableWidgetsOpened()) {
-                this.refresh();
-            }
-        }));
-        this.toDispose.push(this.applicationShell.onDidRemoveWidget(widget => {
-            if (NavigatableWidget.is(widget)) {
-                this.refresh();
-            }
-        }));
-        this.toDispose.push(this.timelineService.onDidChangeProviders(() => this.refresh()));
-    }
-
-    protected async loadTimelineForSource(source: string, uri: CodeURI, reset: boolean): Promise<void> {
-        if (reset) {
-            this.timelinesBySource.delete(source);
-        }
-        let timeline = this.timelinesBySource.get(source);
-        const cursor = timeline?.cursor;
-        const options = { cursor: reset ? undefined : cursor, limit: TimelineTreeWidget.PAGE_SIZE };
-        const timelineResult = await this.timelineService.getTimeline(source, uri, options, { cacheResults: true, resetCache: reset });
-        if (timelineResult) {
-            const items = timelineResult.items;
-            if (items) {
-                if (timeline) {
-                    timeline.add(items);
-                    timeline.cursor = timelineResult.paging?.cursor;
-                } else {
-                    timeline = new TimelineAggregate(timelineResult);
-                }
-                this.timelinesBySource.set(source, timeline);
-                this.resourceWidget.model.updateTree(timeline.items, !!timeline.cursor);
-            }
-        }
-    }
-
-    async loadTimeline(uri: URI, reset: boolean): Promise<void> {
-        for (const source of this.timelineService.getSources().map(s => s.id)) {
-            this.loadTimelineForSource(source, CodeURI.parse(uri.toString()), reset);
-        }
-    }
-
-    refresh(uri?: URI): void {
-        if (!uri) {
-            uri = this.getCurrentWidgetUri();
-        }
-        if (uri) {
-            this.timelineEmptyWidget.hide();
-            this.resourceWidget.show();
-            this.loadTimeline(uri, true);
-        } else if (!this.suitableWidgetsOpened()) {
-            this.timelineEmptyWidget.show();
-            this.resourceWidget.hide();
-        }
-    }
-
-    private suitableWidgetsOpened(): boolean {
-        return !!toArray(this.applicationShell.mainPanel.widgets()).find(widget => {
-            if (NavigatableWidget.is(widget)) {
-                const uri = widget.getResourceUri();
-                if (uri?.scheme && this.timelineService.getSchemas().indexOf(uri?.scheme) > -1) {
-                    return true;
-                }
-            }
-        });
-    }
-
-    private getCurrentWidgetUri(): URI | undefined {
-        let current = this.applicationShell.currentWidget;
-        if (!NavigatableWidget.is(current)) {
-            current = toArray(this.applicationShell.mainPanel.widgets()).find(widget => {
-                if (widget.isVisible && !widget.isHidden) {
-                    return widget;
-                }
-            });
-        }
-        return NavigatableWidget.is(current) ? current.getResourceUri() : undefined;
-    }
-
-    protected get containerLayout(): PanelLayout | undefined {
-        return this.panel.layout as PanelLayout;
-    }
-
-    protected override onUpdateRequest(msg: Message): void {
-        MessageLoop.sendMessage(this.resourceWidget, msg);
-        MessageLoop.sendMessage(this.timelineEmptyWidget, msg);
-        this.refresh();
-        super.onUpdateRequest(msg);
-    }
-
-    protected override onAfterAttach(msg: Message): void {
-        this.node.appendChild(this.resourceWidget.node);
-        this.node.appendChild(this.timelineEmptyWidget.node);
-        super.onAfterAttach(msg);
-        this.update();
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2020 RedHat and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { Message } from '@theia/core/shared/@phosphor/messaging';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import {
+    ApplicationShell,
+    BaseWidget,
+    MessageLoop, Navigatable,
+    NavigatableWidget,
+    Panel,
+    PanelLayout
+} from '@theia/core/lib/browser';
+import { TimelineTreeWidget } from './timeline-tree-widget';
+import { TimelineService, TimelineAggregate } from './timeline-service';
+import { CommandRegistry, SelectionService } from '@theia/core/lib/common';
+import { TimelineEmptyWidget } from './timeline-empty-widget';
+import { toArray } from '@theia/core/shared/@phosphor/algorithm';
+import URI from '@theia/core/lib/common/uri';
+import { URI as CodeURI } from '@theia/core/shared/vscode-uri';
+import { nls } from '@theia/core/lib/common/nls';
+
+@injectable()
+export class TimelineWidget extends BaseWidget {
+
+    protected panel: Panel;
+    static ID = 'timeline-view';
+
+    private readonly timelinesBySource = new Map<string, TimelineAggregate>();
+
+    @inject(TimelineTreeWidget) protected readonly resourceWidget: TimelineTreeWidget;
+    @inject(TimelineService) protected readonly timelineService: TimelineService;
+    @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry;
+    @inject(ApplicationShell) protected readonly applicationShell: ApplicationShell;
+    @inject(TimelineEmptyWidget) protected readonly timelineEmptyWidget: TimelineEmptyWidget;
+    @inject(SelectionService) protected readonly selectionService: SelectionService;
+
+    constructor() {
+        super();
+        this.id = TimelineWidget.ID;
+        this.title.label = nls.localizeByDefault('Timeline');
+        this.title.caption = this.title.label;
+        this.addClass('theia-timeline');
+    }
+
+    @postConstruct()
+    protected init(): void {
+        const layout = new PanelLayout();
+        this.layout = layout;
+        this.panel = new Panel({ layout: new PanelLayout({}) });
+        this.panel.node.tabIndex = -1;
+        layout.addWidget(this.panel);
+        this.containerLayout!.addWidget(this.resourceWidget);
+        this.containerLayout!.addWidget(this.timelineEmptyWidget);
+
+        this.refresh();
+        this.toDispose.push(this.timelineService.onDidChangeTimeline(event => {
+            const currentWidgetUri = this.getCurrentWidgetUri();
+            if (currentWidgetUri) {
+                this.loadTimeline(currentWidgetUri, event.reset);
+            }
+        })
+        );
+        this.toDispose.push(this.selectionService.onSelectionChanged(selection => {
+            if (Array.isArray(selection) && !!selection[0] && 'uri' in selection[0]) {
+                this.refresh(selection[0].uri);
+            }
+        }));
+        this.toDispose.push(this.applicationShell.onDidChangeCurrentWidget(async e => {
+            if ((e.newValue && Navigatable.is(e.newValue)) || !this.suitableWidgetsOpened()) {
+                this.refresh();
+            }
+        }));
+        this.toDispose.push(this.applicationShell.onDidRemoveWidget(widget => {
+            if (NavigatableWidget.is(widget)) {
+                this.refresh();
+            }
+        }));
+        this.toDispose.push(this.timelineService.onDidChangeProviders(() => this.refresh()));
+    }
+
+    protected async loadTimelineForSource(source: string, uri: CodeURI, reset: boolean): Promise<void> {
+        if (reset) {
+            this.timelinesBySource.delete(source);
+        }
+        let timeline = this.timelinesBySource.get(source);
+        const cursor = timeline?.cursor;
+        const options = { cursor: reset ? undefined : cursor, limit: TimelineTreeWidget.PAGE_SIZE };
+        const timelineResult = await this.timelineService.getTimeline(source, uri, options, { cacheResults: true, resetCache: reset });
+        if (timelineResult) {
+            const items = timelineResult.items;
+            if (items) {
+                if (timeline) {
+                    timeline.add(items);
+                    timeline.cursor = timelineResult.paging?.cursor;
+                } else {
+                    timeline = new TimelineAggregate(timelineResult);
+                }
+                this.timelinesBySource.set(source, timeline);
+                this.resourceWidget.model.updateTree(timeline.items, !!timeline.cursor);
+            }
+        }
+    }
+
+    async loadTimeline(uri: URI, reset: boolean): Promise<void> {
+        for (const source of this.timelineService.getSources().map(s => s.id)) {
+            this.loadTimelineForSource(source, CodeURI.parse(uri.toString()), reset);
+        }
+    }
+
+    refresh(uri?: URI): void {
+        if (!uri) {
+            uri = this.getCurrentWidgetUri();
+        }
+        if (uri) {
+            this.timelineEmptyWidget.hide();
+            this.resourceWidget.show();
+            this.loadTimeline(uri, true);
+        } else if (!this.suitableWidgetsOpened()) {
+            this.timelineEmptyWidget.show();
+            this.resourceWidget.hide();
+        }
+    }
+
+    private suitableWidgetsOpened(): boolean {
+        return !!toArray(this.applicationShell.mainPanel.widgets()).find(widget => {
+            if (NavigatableWidget.is(widget)) {
+                const uri = widget.getResourceUri();
+                if (uri?.scheme && this.timelineService.getSchemas().indexOf(uri?.scheme) > -1) {
+                    return true;
+                }
+            }
+        });
+    }
+
+    private getCurrentWidgetUri(): URI | undefined {
+        let current = this.applicationShell.currentWidget;
+        if (!NavigatableWidget.is(current)) {
+            current = toArray(this.applicationShell.mainPanel.widgets()).find(widget => {
+                if (widget.isVisible && !widget.isHidden) {
+                    return widget;
+                }
+            });
+        }
+        return NavigatableWidget.is(current) ? current.getResourceUri() : undefined;
+    }
+
+    protected get containerLayout(): PanelLayout | undefined {
+        return this.panel.layout as PanelLayout;
+    }
+
+    protected override onUpdateRequest(msg: Message): void {
+        MessageLoop.sendMessage(this.resourceWidget, msg);
+        MessageLoop.sendMessage(this.timelineEmptyWidget, msg);
+        this.refresh();
+        super.onUpdateRequest(msg);
+    }
+
+    protected override onAfterAttach(msg: Message): void {
+        this.node.appendChild(this.resourceWidget.node);
+        this.node.appendChild(this.timelineEmptyWidget.node);
+        super.onAfterAttach(msg);
+        this.update();
+    }
+
+}