Skip to content

Add gather status bar and update survey link #13225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
David Kutugata (DavidKutu) merged 11 commits into from
Aug 5, 2020
Merged

Add gather status bar and update survey link #13225

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
890b7e6
add status bar
DavidKutu Jul 29, 2020
369fdea
Merge branch 'master' into david/gatherStatusBar
DavidKutu Jul 31, 2020
25ae4e3
add localization
DavidKutu Jul 31, 2020
6c5acf1
Added news file
DavidKutu Jul 31, 2020
bbc682c
add a 2 second timeout
DavidKutu Jul 31, 2020
03821b0
updated the gather survey link
DavidKutu Jul 31, 2020
4a88ac3
Change the gather icon while gathering
DavidKutu Aug 5, 2020
debd937
moved the gathering redux function to
DavidKutu Aug 5, 2020
e53bb62
move css to common.css
DavidKutu Aug 5, 2020
d648240
removed the status bar message
DavidKutu Aug 5, 2020
6e81619
changed noop import
DavidKutu Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
add status bar
  • Loading branch information
@DavidKutu
DavidKutu committed Jul 29, 2020
commit 890b7e6372b0b7379f90844c938853f568b96ecc
41 changes: 27 additions & 14 deletions src/client/datascience/gather/gatherListener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { inject, injectable } from 'inversify';
import { IDisposable } from 'monaco-editor';
import * as uuid from 'uuid/v4';
import { Event, EventEmitter, Position, Uri, ViewColumn } from 'vscode';
import { Event, EventEmitter, Position, StatusBarItem, Uri, ViewColumn } from 'vscode';
import { createMarkdownCell } from '../../../datascience-ui/common/cellFactory';
import { IApplicationShell, IDocumentManager } from '../../common/application/types';
import { PYTHON_LANGUAGE } from '../../common/constants';
import { traceError } from '../../common/logger';

import { IConfigurationService, Resource } from '../../common/types';
import * as localize from '../../common/utils/localize';
import { noop } from '../../common/utils/misc';
// import { noop } from '../../common/utils/misc';
import { StopWatch } from '../../common/utils/stopWatch';
import { sendTelemetryEvent } from '../../telemetry';
import { generateCellsFromString } from '../cellFactory';
Expand Down Expand Up @@ -45,6 +45,7 @@ export class GatherListener implements IInteractiveWindowListener {
private gatherTimer: StopWatch | undefined;
private linesSubmitted: number = 0;
private cellsSubmitted: number = 0;
private statusBar: StatusBarItem;

constructor(
@inject(IApplicationShell) private applicationShell: IApplicationShell,
Expand All @@ -54,10 +55,14 @@ export class GatherListener implements IInteractiveWindowListener {
@inject(IConfigurationService) private configService: IConfigurationService,
@inject(IDocumentManager) private documentManager: IDocumentManager,
@inject(IDataScienceFileSystem) private fs: IDataScienceFileSystem
) {}
) {
this.statusBar = this.applicationShell.createStatusBarItem();
this.statusBar.text = '$(sync~spin) Gathering Code';
}

public dispose() {
noop();
// noop();
this.statusBar.dispose();
}

// tslint:disable-next-line: no-any
Expand All @@ -73,10 +78,12 @@ export class GatherListener implements IInteractiveWindowListener {
break;

case InteractiveWindowMessages.GatherCode:
this.statusBar.show();
this.handleMessage(message, payload, this.doGather);
break;

case InteractiveWindowMessages.GatherCodeToScript:
this.statusBar.show();
this.handleMessage(message, payload, this.doGatherToScript);
break;

Expand Down Expand Up @@ -141,18 +148,24 @@ export class GatherListener implements IInteractiveWindowListener {
}
}

private doGather(payload: ICell): void {
this.gatherCodeInternal(payload).catch((err) => {
traceError(`Gather to Notebook error: ${err}`);
this.applicationShell.showErrorMessage(err);
});
private doGather(payload: ICell): Promise<void> {
return this.gatherCodeInternal(payload)
.catch((err) => {
traceError(`Gather to Notebook error: ${err}`);
this.applicationShell.showErrorMessage(err);
})
.finally(() => {
this.statusBar.hide();
});
}

private doGatherToScript(payload: ICell): void {
this.gatherCodeInternal(payload, true).catch((err) => {
traceError(`Gather to Script error: ${err}`);
this.applicationShell.showErrorMessage(err);
});
private doGatherToScript(payload: ICell): Promise<void> {
return this.gatherCodeInternal(payload, true)
.catch((err) => {
traceError(`Gather to Script error: ${err}`);
this.applicationShell.showErrorMessage(err);
})
.finally(() => this.statusBar.hide());
}

private gatherCodeInternal = async (cell: ICell, toScript: boolean = false) => {
Expand Down