development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-04 02:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #74266

Browse source
This commit is contained in:
Sandeep Somavarapu 2019-06-03 19:47:43 +02:00
parent 7ee7705cc8
commit a03caec78b
4 changed files with 59 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/vs/workbench/contrib/extensions/electron-browser/extensionsViews.ts
View file

@ -7,7 +7,7 @@ import { localize } from 'vs/nls';
import { dispose, Disposable } from 'vs/base/common/lifecycle';
import { assign } from 'vs/base/common/objects';
import { Event, Emitter } from 'vs/base/common/event';
import { isPromiseCanceledError } from 'vs/base/common/errors';
import { isPromiseCanceledError, getErrorMessage } from 'vs/base/common/errors';
import { PagedModel, IPagedModel, IPager, DelayedPagedModel } from 'vs/base/common/paging';
import { SortBy, SortOrder, IQueryOptions, IExtensionTipsService, IExtensionRecommendation, IExtensionManagementServer, IExtensionManagementServerService } from 'vs/platform/extensionManagement/common/extensionManagement';
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
@ -69,9 +69,13 @@ export interface ExtensionsListViewOptions extends IViewletViewOptions {
server?: IExtensionManagementServer;
}
class ExtensionListViewWarning extends Error { }
export class ExtensionsListView extends ViewletPanel {
private readonly server: IExtensionManagementServer | undefined;
private messageContainer: HTMLElement;
private messageStatus: HTMLElement;
private messageBox: HTMLElement;
private extensionsList: HTMLElement;
private badge: CountBadge;
@ -117,7 +121,9 @@ export class ExtensionsListView extends ViewletPanel {
renderBody(container: HTMLElement): void {
this.extensionsList = append(container, $('.extensions-list'));
this.messageBox = append(container, $('.message'));
this.messageContainer = append(container, $('.message-container'));
this.messageStatus = append(this.messageContainer, $(''));
this.messageBox = append(this.messageContainer, $('.message'));
const delegate = new Delegate();
const extensionsViewState = new ExtensionsViewState();
const renderer = this.instantiationService.createInstance(Renderer, extensionsViewState);
@ -178,12 +184,11 @@ export class ExtensionsListView extends ViewletPanel {
};
const errorCallback = (e: Error) => {
const errorCallback = (e: any) => {
const model = new PagedModel([]);
if (!isPromiseCanceledError(e)) {
this.queryRequest = null;
console.warn('Error querying extensions gallery', e);
this.setModel(model, true);
this.setModel(model, e);
}
return this.list ? this.list.model : model;
};
@ -238,7 +243,11 @@ export class ExtensionsListView extends ViewletPanel {
if (ExtensionsListView.isLocalExtensionsQuery(query.value) || /@builtin/.test(query.value)) {
return this.queryLocal(query, options);
}
return this.queryGallery(query, options, token);
return this.queryGallery(query, options, token)
.then(null, e => {
console.warn('Error querying extensions gallery', getErrorMessage(e));
return Promise.reject(new ExtensionListViewWarning(localize('galleryError', "We cannot connect to the Extensions Marketplace at this time, please try again later.")));
});
}
private async queryByIds(ids: string[], options: IQueryOptions, token: CancellationToken): Promise<IPagedModel<IExtension>> {
@ -696,23 +705,30 @@ export class ExtensionsListView extends ViewletPanel {
});
}
private setModel(model: IPagedModel<IExtension>, isGalleryError?: boolean) {
private setModel(model: IPagedModel<IExtension>, error?: any) {
if (this.list) {
this.list.model = new DelayedPagedModel(model);
this.list.scrollTop = 0;
const count = this.count();
toggleClass(this.extensionsList, 'hidden', count === 0);
toggleClass(this.messageBox, 'hidden', count > 0);
toggleClass(this.messageContainer, 'hidden', count > 0);
this.badge.setCount(count);
if (count === 0 && this.isBodyVisible()) {
this.messageBox.textContent = isGalleryError ? localize('galleryError', "We cannot connect to the Extensions Marketplace at this time, please try again later.") : localize('no extensions found', "No extensions found.");
if (isGalleryError) {
alert(this.messageBox.textContent);
if (error) {
if (error instanceof ExtensionListViewWarning) {
this.messageStatus.className = 'message-status warning';
this.messageBox.textContent = getErrorMessage(error);
} else {
this.messageStatus.className = 'message-status error';
this.messageBox.textContent = localize('error', "Error while loading extensions. {0}", getErrorMessage(error));
}
} else {
this.messageStatus.className = '';
this.messageBox.textContent = localize('no extensions found', "No extensions found.");
}
} else {
this.messageBox.textContent = '';
alert(this.messageBox.textContent);
}
}
}

30
src/vs/workbench/contrib/extensions/electron-browser/media/extensionsViewlet.css
View file

@ -38,7 +38,7 @@
}
.extensions-viewlet > .extensions .extensions-list.hidden,
.extensions-viewlet > .extensions .message.hidden {
.extensions-viewlet > .extensions .message-container.hidden {
display: none;
visibility: hidden;
}
@ -51,9 +51,35 @@
flex: 1;
}
.extensions-viewlet > .extensions .message {
.extensions-viewlet > .extensions .message-container {
padding: 5px 9px 5px 16px;
cursor: default;
display: flex;
}
.extensions-viewlet > .extensions .message-container .message-status {
height: 16px;
width: 16px;
}
.extensions-viewlet > .extensions .message-container .message-status.warning {
background: url('status-warning.svg') center center no-repeat;
}
.extensions-viewlet > .extensions .message-container .message-status.error {
background: url('status-error.svg') center center no-repeat;
}
.vs-dark .extensions-viewlet > .extensions .message-container .message-status.warning {
background: url('status-warning-inverse.svg') center center no-repeat;
}
.vs-dark .extensions-viewlet > .extensions .message-container .message-status.error {
background: url('status-error-inverse.svg') center center no-repeat;
}
.extensions-viewlet > .extensions .message-container .message {
padding-left: 5px;
}
.extensions-viewlet > .extensions .monaco-list-row > .bookmark {

1
src/vs/workbench/contrib/extensions/electron-browser/media/status-error-inverse.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16"><circle cx="8" cy="8" r="6" fill="#1E1E1E"/><path d="M8 3C5.238 3 3 5.238 3 8s2.238 5 5 5 5-2.238 5-5-2.238-5-5-5zm3 7l-1 1-2-2-2 2-1-1 2-2.027L5 6l1-1 2 2 2-2 1 1-2 1.973L11 10z" fill="#F48771"/><path fill="#252526" d="M11 6l-1-1-2 2-2-2-1 1 2 1.973L5 10l1 1 2-2 2 2 1-1-2-2.027z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 372 B

1
src/vs/workbench/contrib/extensions/electron-browser/media/status-error.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><circle cx="8" cy="8" r="6" fill="#F6F6F6"/><path d="M8 3C5.238 3 3 5.238 3 8s2.238 5 5 5 5-2.238 5-5-2.238-5-5-5zm3 7l-1 1-2-2-2 2-1-1 2-2.027L5 6l1-1 2 2 2-2 1 1-2 1.973L11 10z" fill="#E51400"/><path fill="#fff" d="M11 6l-1-1-2 2-2-2-1 1 2 1.973L5 10l1 1 2-2 2 2 1-1-2-2.027z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 403 B