From 80679b4c2dd977ccace0e5f64ca5b9cffdb039b5 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Fri, 17 Jun 2016 12:30:29 +0200
Subject: [PATCH] extensions UI

---
 src/vs/base/common/paging.ts                  | 11 +++++
 .../electron-browser/extensionsViewlet.ts     | 41 ++++++++-----------
 .../media/extensionsViewlet.css               |  6 +--
 3 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/vs/base/common/paging.ts b/src/vs/base/common/paging.ts
index 5706b6c3c85..d0f923dc91b 100644
--- a/src/vs/base/common/paging.ts
+++ b/src/vs/base/common/paging.ts
@@ -105,6 +105,17 @@ export class PagedModel<T> implements IPagedModel<T> {
 	}
 }
 
+export class SinglePagePagedModel<T> extends PagedModel<T> {
+	constructor(elements: T[]) {
+		super({
+			firstPage: elements,
+			total: elements.length,
+			pageSize: elements.length,
+			getPage: null
+		});
+	}
+}
+
 /**
  * Similar to array.map, `mapPager` lets you map the elements of an
  * abstract paged collection to another type.
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
index 5fef91861eb..235f9f3a805 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
@@ -13,7 +13,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Builder, Dimension } from 'vs/base/browser/builder';
 import { Viewlet } from 'vs/workbench/browser/viewlet';
 import { append, emmet as $ } from 'vs/base/browser/dom';
-import { PagedModel } from 'vs/base/common/paging';
+import { PagedModel, SinglePagePagedModel } from 'vs/base/common/paging';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { PagedList } from 'vs/base/browser/ui/list/listPaging';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -23,15 +23,6 @@ import { ExtensionsInput } from '../common/extensionsInput';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 
-function singlePageModel<T>(firstPage: T[]) {
-	return new PagedModel({
-		firstPage,
-		total: firstPage.length,
-		pageSize: firstPage.length,
-		getPage: null
-	});
-}
-
 export class ExtensionsViewlet extends Viewlet {
 
 	static ID: string = 'workbench.viewlet.extensions';
@@ -61,9 +52,10 @@ export class ExtensionsViewlet extends Viewlet {
 		parent.addClass('extensions-viewlet');
 		this.root = parent.getHTMLElement();
 
-		const search = append(this.root, $('.search'));
-		this.searchBox = append(search, $<HTMLInputElement>('input.search-box'));
-		this.searchBox.placeholder = localize('searchExtensions', "Search Extensions");
+		const header = append(this.root, $('.header'));
+
+		this.searchBox = append(header, $<HTMLInputElement>('input.search-box'));
+		this.searchBox.placeholder = localize('searchExtensions', "Search Extensions in Marketplace");
 		this.extensionsBox = append(this.root, $('.extensions'));
 
 		const delegate = new Delegate();
@@ -103,19 +95,22 @@ export class ExtensionsViewlet extends Viewlet {
 	}
 
 	private triggerSearch(text: string = '', delay = 500): void {
-		this.list.model = singlePageModel([]);
-
-		const promise = this.searchDelayer.trigger(() => this.doSearch(text), delay);
-
-		const progressRunner = this.progressService.show(true);
-		always(promise, () => progressRunner.done());
+		this.searchDelayer.trigger(() => this.doSearch(text), text ? delay : 0);
 	}
 
 	private doSearch(text: string = ''): TPromise<any> {
-		return this.extensionService.getInstalled()
-			.then(result => singlePageModel(result))
-		// return this.galleryService.query({ text })
-		// 	.then(result => new PagedModel(result))
+		const progressRunner = this.progressService.show(true);
+		let promise: TPromise<PagedModel<IExtension | IGalleryExtension>>;
+
+		if (text) {
+			promise = this.galleryService.query({ text })
+				.then(result => new PagedModel(result));
+		} else {
+			promise = this.extensionService.getInstalled()
+				.then(result => new SinglePagePagedModel(result));
+		}
+
+		return always(promise, () => progressRunner.done())
 			.then(model => this.list.model = model);
 	}
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/extensionsViewlet.css b/src/vs/workbench/parts/extensions/electron-browser/media/extensionsViewlet.css
index f16e30a372d..9e118a0ebb9 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/media/extensionsViewlet.css
+++ b/src/vs/workbench/parts/extensions/electron-browser/media/extensionsViewlet.css
@@ -7,15 +7,15 @@
 	height: 100%;
 }
 
-.extensions-viewlet > .search {
+.extensions-viewlet > .header {
 	height: 38px;
 	box-sizing: border-box;
 	padding: 5px 9px 5px 16px;
 }
 
-.extensions-viewlet > .search > .search-box {
+.extensions-viewlet > .header > .search-box {
 	width: 100%;
-	height: 100%;
+	height: 26px;
 	box-sizing: border-box;
 	padding: 0 3px;
 }
-- 
GitLab