@theia/timeline 1.34.3 → 1.34.4

package/src/browser/timeline-service.ts

@@ -1,124 +1,124 @@
-// *****************************************************************************
-// 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable } from '@theia/core/shared/inversify';
-import { Disposable, Emitter, Event } from '@theia/core/lib/common';
-import { URI } from '@theia/core/shared/vscode-uri';
-import {
-    InternalTimelineOptions,
-    Timeline,
-    TimelineChangeEvent, TimelineItem, TimelineOptions,
-    TimelineProvider,
-    TimelineProvidersChangeEvent,
-    TimelineSource
-} from '../common/timeline-model';
-
-@injectable()
-export class TimelineService {
-    private readonly providers = new Map<string, TimelineProvider>();
-
-    private readonly onDidChangeProvidersEmitter = new Emitter<TimelineProvidersChangeEvent>();
-    readonly onDidChangeProviders: Event<TimelineProvidersChangeEvent> = this.onDidChangeProvidersEmitter.event;
-
-    private readonly onDidChangeTimelineEmitter = new Emitter<TimelineChangeEvent>();
-    readonly onDidChangeTimeline: Event<TimelineChangeEvent> = this.onDidChangeTimelineEmitter.event;
-
-    registerTimelineProvider(provider: TimelineProvider): Disposable {
-        const id = provider.id;
-
-        this.providers.set(id, provider);
-        if (provider.onDidChange) {
-            provider.onDidChange(e => this.onDidChangeTimelineEmitter.fire(e));
-        }
-        this.onDidChangeProvidersEmitter.fire({ added: [id] });
-
-        return Disposable.create(() => this.unregisterTimelineProvider(id));
-    }
-
-    unregisterTimelineProvider(id: string): void {
-        const provider = this.providers.get(id);
-        if (provider) {
-            provider.dispose();
-            this.providers.delete(id);
-            this.onDidChangeProvidersEmitter.fire({ removed: [id] });
-        }
-    }
-
-    getSources(): TimelineSource[] {
-        return [...this.providers.values()].map(p => ({ id: p.id, label: p.label }));
-    }
-
-    getSchemas(): string[] {
-        const result: string[] = [];
-        Array.from(this.providers.values()).forEach(provider => {
-            const scheme = provider.scheme;
-            if (typeof scheme === 'string') {
-                result.push(scheme);
-            } else {
-                scheme.forEach(s => result.push(s));
-            }
-        });
-        return result;
-    }
-
-    getTimeline(id: string, uri: URI, options: TimelineOptions, internalOptions?: InternalTimelineOptions): Promise<Timeline | undefined> {
-        const provider = this.providers.get(id);
-        if (!provider) {
-            return Promise.resolve(undefined);
-        }
-
-        if (typeof provider.scheme === 'string') {
-            if (provider.scheme !== '*' && provider.scheme !== uri.scheme) {
-                return Promise.resolve(undefined);
-            }
-        }
-
-        return provider.provideTimeline(uri, options, internalOptions)
-            .then(result => {
-                if (!result) {
-                    return undefined;
-                }
-                result.items = result.items.map(item => ({ ...item, source: provider.id }));
-                return result;
-            });
-    }
-}
-
-export class TimelineAggregate {
-    readonly items: TimelineItem[];
-    readonly source: string;
-    readonly uri: string;
-
-    private _cursor?: string;
-    get cursor(): string | undefined {
-        return this._cursor;
-    }
-
-    set cursor(cursor: string | undefined) {
-        this._cursor = cursor;
-    }
-
-    constructor(timeline: Timeline) {
-        this.source = timeline.source;
-        this.items = timeline.items;
-        this._cursor = timeline.paging?.cursor;
-    }
-
-    add(items: TimelineItem[]): void {
-        this.items.push(...items);
-        this.items.sort((a, b) => b.timestamp - a.timestamp);
-    }
-}
+// *****************************************************************************
+// 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+import { Disposable, Emitter, Event } from '@theia/core/lib/common';
+import { URI } from '@theia/core/shared/vscode-uri';
+import {
+    InternalTimelineOptions,
+    Timeline,
+    TimelineChangeEvent, TimelineItem, TimelineOptions,
+    TimelineProvider,
+    TimelineProvidersChangeEvent,
+    TimelineSource
+} from '../common/timeline-model';
+
+@injectable()
+export class TimelineService {
+    private readonly providers = new Map<string, TimelineProvider>();
+
+    private readonly onDidChangeProvidersEmitter = new Emitter<TimelineProvidersChangeEvent>();
+    readonly onDidChangeProviders: Event<TimelineProvidersChangeEvent> = this.onDidChangeProvidersEmitter.event;
+
+    private readonly onDidChangeTimelineEmitter = new Emitter<TimelineChangeEvent>();
+    readonly onDidChangeTimeline: Event<TimelineChangeEvent> = this.onDidChangeTimelineEmitter.event;
+
+    registerTimelineProvider(provider: TimelineProvider): Disposable {
+        const id = provider.id;
+
+        this.providers.set(id, provider);
+        if (provider.onDidChange) {
+            provider.onDidChange(e => this.onDidChangeTimelineEmitter.fire(e));
+        }
+        this.onDidChangeProvidersEmitter.fire({ added: [id] });
+
+        return Disposable.create(() => this.unregisterTimelineProvider(id));
+    }
+
+    unregisterTimelineProvider(id: string): void {
+        const provider = this.providers.get(id);
+        if (provider) {
+            provider.dispose();
+            this.providers.delete(id);
+            this.onDidChangeProvidersEmitter.fire({ removed: [id] });
+        }
+    }
+
+    getSources(): TimelineSource[] {
+        return [...this.providers.values()].map(p => ({ id: p.id, label: p.label }));
+    }
+
+    getSchemas(): string[] {
+        const result: string[] = [];
+        Array.from(this.providers.values()).forEach(provider => {
+            const scheme = provider.scheme;
+            if (typeof scheme === 'string') {
+                result.push(scheme);
+            } else {
+                scheme.forEach(s => result.push(s));
+            }
+        });
+        return result;
+    }
+
+    getTimeline(id: string, uri: URI, options: TimelineOptions, internalOptions?: InternalTimelineOptions): Promise<Timeline | undefined> {
+        const provider = this.providers.get(id);
+        if (!provider) {
+            return Promise.resolve(undefined);
+        }
+
+        if (typeof provider.scheme === 'string') {
+            if (provider.scheme !== '*' && provider.scheme !== uri.scheme) {
+                return Promise.resolve(undefined);
+            }
+        }
+
+        return provider.provideTimeline(uri, options, internalOptions)
+            .then(result => {
+                if (!result) {
+                    return undefined;
+                }
+                result.items = result.items.map(item => ({ ...item, source: provider.id }));
+                return result;
+            });
+    }
+}
+
+export class TimelineAggregate {
+    readonly items: TimelineItem[];
+    readonly source: string;
+    readonly uri: string;
+
+    private _cursor?: string;
+    get cursor(): string | undefined {
+        return this._cursor;
+    }
+
+    set cursor(cursor: string | undefined) {
+        this._cursor = cursor;
+    }
+
+    constructor(timeline: Timeline) {
+        this.source = timeline.source;
+        this.items = timeline.items;
+        this._cursor = timeline.paging?.cursor;
+    }
+
+    add(items: TimelineItem[]): void {
+        this.items.push(...items);
+        this.items.sort((a, b) => b.timestamp - a.timestamp);
+    }
+}

package/src/browser/timeline-tree-model.ts

@@ -1,72 +1,72 @@
-// *****************************************************************************
-// 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable } from '@theia/core/shared/inversify';
-import {
-    CompositeTreeNode,
-    SelectableTreeNode,
-    TreeModelImpl,
-} from '@theia/core/lib/browser/tree';
-import { TimelineItem } from '../common/timeline-model';
-import { Command } from '@theia/core';
-
-export const LOAD_MORE_COMMAND: Command = {
-    id: 'timeline-load-more'
-};
-
-export interface TimelineNode extends SelectableTreeNode {
-    timelineItem: TimelineItem;
-}
-
-@injectable()
-export class TimelineTreeModel extends TreeModelImpl {
-
-    updateTree(items: TimelineItem[], hasMoreItems: boolean): void {
-        const root = {
-            id: 'timeline-tree-root',
-            parent: undefined,
-            visible: false,
-            children: []
-        } as CompositeTreeNode;
-        const children = items.map(item =>
-        ({
-            timelineItem: item,
-            id: item.id ? item.id : item.timestamp.toString(),
-            parent: root,
-            detail: item.detail,
-            selected: false,
-            visible: true
-        } as TimelineNode)
-        );
-        let loadMore;
-        if (hasMoreItems) {
-            const loadMoreNode: TimelineItem = { label: 'Load-more', timestamp: 0, handle: '', uri: '', source: '' };
-            loadMoreNode.command = LOAD_MORE_COMMAND;
-            loadMore = {
-                timelineItem: loadMoreNode,
-                id: 'load-more',
-                parent: root,
-                selected: true
-            } as TimelineNode;
-            children.push(loadMore);
-        }
-        root.children = children;
-        this.root = root;
-        if (loadMore) {
-            this.selectionService.addSelection(loadMore);
-        }
-    }
-}
+// *****************************************************************************
+// 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+import {
+    CompositeTreeNode,
+    SelectableTreeNode,
+    TreeModelImpl,
+} from '@theia/core/lib/browser/tree';
+import { TimelineItem } from '../common/timeline-model';
+import { Command } from '@theia/core';
+
+export const LOAD_MORE_COMMAND: Command = {
+    id: 'timeline-load-more'
+};
+
+export interface TimelineNode extends SelectableTreeNode {
+    timelineItem: TimelineItem;
+}
+
+@injectable()
+export class TimelineTreeModel extends TreeModelImpl {
+
+    updateTree(items: TimelineItem[], hasMoreItems: boolean): void {
+        const root = {
+            id: 'timeline-tree-root',
+            parent: undefined,
+            visible: false,
+            children: []
+        } as CompositeTreeNode;
+        const children = items.map(item =>
+        ({
+            timelineItem: item,
+            id: item.id ? item.id : item.timestamp.toString(),
+            parent: root,
+            detail: item.detail,
+            selected: false,
+            visible: true
+        } as TimelineNode)
+        );
+        let loadMore;
+        if (hasMoreItems) {
+            const loadMoreNode: TimelineItem = { label: 'Load-more', timestamp: 0, handle: '', uri: '', source: '' };
+            loadMoreNode.command = LOAD_MORE_COMMAND;
+            loadMore = {
+                timelineItem: loadMoreNode,
+                id: 'load-more',
+                parent: root,
+                selected: true
+            } as TimelineNode;
+            children.push(loadMore);
+        }
+        root.children = children;
+        this.root = root;
+        if (loadMore) {
+            this.selectionService.addSelection(loadMore);
+        }
+    }
+}

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 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 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);
+        }
+    };
+}