refactor: tree.

Author: cangzhang

package.json

@@ -13,7 +13,7 @@
   "activationEvents": [
     "onCommand:codingPlugin.show",
     "onCommand:codingPlugin.login",
-    "onView:treeViewSample"
+    "onView:mrTreeView"
   ],
   "repository": {
     "type": "git",
@@ -56,19 +56,19 @@
       "view/title": [
         {
           "command": "codingPlugin.refresh",
-          "when": "view == treeViewSample",
+          "when": "view == mrTreeView",
           "group": "navigation"
         }
       ]
     },
     "viewsWelcome": [
       {
-        "view": "treeViewSample",
+        "view": "mrTreeView",
         "contents": "Please login first.\n[Login](command:codingPlugin.login)",
         "when": "!loggedIn"
       },
       {
-        "view": "treeViewSample",
+        "view": "mrTreeView",
         "contents": "No merge request for now.\n[Create Merge Request](command:codingPlugin.createMr)",
         "when": "noMRResult && loggedIn"
       }
@@ -85,8 +85,14 @@
     "views": {
       "treeview-sample": [
         {
-          "id": "treeViewSample",
-          "name": "CODING Merge Requests",
+          "id": "mrTreeView",
+          "name": "Merge Requests",
+          "icon": "src/assets/coding.svg",
+          "contextualTitle": "List"
+        },
+        {
+          "id": "releaseTreeView",
+          "name": "Releases",
           "icon": "src/assets/coding.svg",
           "contextualTitle": "List"
         }

src/extension.ts

@@ -3,7 +3,8 @@ import * as vscode from 'vscode';
 // import Logger from './common/logger';
 import { uriHandler, CodingServer } from './codingServer';
 import { Panel } from './panel';
-import { ListItem, ListProvider } from './tree';
+import { ListItem, MRTreeDataProvider } from './tree/mr-tree';
+import { ReleaseTreeDataProvider } from './tree/release-tree';
 
 export async function activate(context: vscode.ExtensionContext) {
   const repoInfo = await CodingServer.getRepoParams();
@@ -23,8 +24,9 @@ export async function activate(context: vscode.ExtensionContext) {
     context.workspaceState.update(`session`, codingSrv.session);
   }
 
-  const treeDataProvider = new ListProvider(context, codingSrv);
-  const tree = vscode.window.createTreeView(`treeViewSample`, { treeDataProvider });
+  const treeDataProvider = new MRTreeDataProvider(context, codingSrv);
+  const tree = vscode.window.createTreeView(`mrTreeView`, { treeDataProvider });
+  vscode.window.registerTreeDataProvider(`releaseTreeView`, new ReleaseTreeDataProvider(context));
 
   context.subscriptions.push(vscode.window.registerUriHandler(uriHandler));
   context.subscriptions.push(

src/tree.ts renamed to src/tree/mr-tree.ts

@@ -1,28 +1,22 @@
 import * as vscode from 'vscode';
 import * as path from 'path';
 
-import { CodingServer } from './codingServer';
-import { RepoInfo } from './typings/commonTypes';
-import { MRData } from './typings/respResult';
+import { CodingServer } from '../codingServer';
+import { RepoInfo } from '../typings/commonTypes';
+import { MRData } from '../typings/respResult';
 
 enum MRType {
   Open = `open`,
   Closed = `close`,
   All = `all`,
 }
 
-enum FolderType {
-  MR = `mr`,
-  Release = `release`,
-}
-
 enum ItemType {
   ListItem = `listItem`,
-  FolderITem = `folderItem`,
   CategoryItem = `categoryItem`,
 }
 
-export class ListProvider implements vscode.TreeDataProvider<ListItem> {
+export class MRTreeDataProvider implements vscode.TreeDataProvider<ListItem> {
   private _onDidChangeTreeData: vscode.EventEmitter<ListItem | undefined | void> = new vscode.EventEmitter<ListItem | undefined | void>();
   readonly onDidChangeTreeData: vscode.Event<ListItem | undefined | void> = this._onDidChangeTreeData.event;
 
@@ -54,18 +48,6 @@ export class ListProvider implements vscode.TreeDataProvider<ListItem> {
     }
 
     if (element) {
-      if (element.contextValue === ItemType.FolderITem) {
-        if (element.value === FolderType.Release) {
-          return Promise.resolve([]);
-        }
-
-        return Promise.resolve([
-          new CategoryItem(MRType.Open.toUpperCase(), MRType.Open, vscode.TreeItemCollapsibleState.Collapsed),
-          new CategoryItem(MRType.Closed.toUpperCase(), MRType.Closed, vscode.TreeItemCollapsibleState.Collapsed),
-          new CategoryItem(MRType.All.toUpperCase(), MRType.All, vscode.TreeItemCollapsibleState.Collapsed),
-        ]);
-      }
-
       if (element.contextValue === ItemType.CategoryItem) {
         return this._service.getMRList(``, element.value as MRType)
           .then(resp => {
@@ -108,9 +90,10 @@ export class ListProvider implements vscode.TreeDataProvider<ListItem> {
       return Promise.resolve([]);
     }
 
-    return Promise.all([
-      new FolderItem(FolderType.MR.toUpperCase(), FolderType.MR, vscode.TreeItemCollapsibleState.Collapsed),
-      new FolderItem(FolderType.Release.toUpperCase(), FolderType.Release, vscode.TreeItemCollapsibleState.Collapsed),
+    return Promise.resolve([
+      new CategoryItem(MRType.Open.toUpperCase(), MRType.Open, vscode.TreeItemCollapsibleState.Collapsed),
+      new CategoryItem(MRType.Closed.toUpperCase(), MRType.Closed, vscode.TreeItemCollapsibleState.Collapsed),
+      new CategoryItem(MRType.All.toUpperCase(), MRType.All, vscode.TreeItemCollapsibleState.Collapsed),
     ]);
   }
 }
@@ -135,17 +118,13 @@ export class ListItem extends vscode.TreeItem {
   }
 }
 
-export class FolderItem extends ListItem {
-  contextValue = ItemType.FolderITem;
-}
-
 export class CategoryItem extends ListItem {
   contextValue = ItemType.CategoryItem;
 }
 
 export class MRItem extends ListItem {
   iconPath = {
-    light: path.join(__filename, '../../src/assets/star.light.svg'),
-    dark: path.join(__filename, '../../src/assets/star.dark.svg'),
+    light: path.join(__filename, '../../../src/assets/star.light.svg'),
+    dark: path.join(__filename, '../../../src/assets/star.dark.svg'),
   };
 }

src/tree/release-tree.ts

@@ -0,0 +1,57 @@
+import * as vscode from 'vscode';
+import * as path from 'path';
+
+enum ItemType {
+  ListItem = `listItem`,
+  FolderITem = `folderItem`,
+  CategoryItem = `categoryItem`,
+}
+
+export class ReleaseTreeDataProvider implements vscode.TreeDataProvider<ListItem> {
+  private _onDidChangeTreeData: vscode.EventEmitter<ListItem | undefined | void> = new vscode.EventEmitter<ListItem | undefined | void>();
+  readonly onDidChangeTreeData: vscode.Event<ListItem | undefined | void> = this._onDidChangeTreeData.event;
+
+  private _context: vscode.ExtensionContext;
+
+  constructor(context: vscode.ExtensionContext) {
+    this._context = context;
+  }
+
+  public refresh(): any {
+    this._onDidChangeTreeData.fire();
+  }
+
+  getTreeItem(element: ListItem): vscode.TreeItem {
+    return element;
+  }
+
+  getChildren(element?: ListItem): Thenable<ListItem[]> {
+    if (element) {
+      return Promise.resolve([]);
+    }
+
+    return Promise.resolve([
+      new ListItem(`//TODO`, `noData`, vscode.TreeItemCollapsibleState.None),
+    ]);
+  }
+}
+
+export class ListItem extends vscode.TreeItem {
+  contextValue = ItemType.ListItem;
+  private readonly _value: string | number;
+
+  constructor(
+    public readonly label: string,
+    public readonly val: number | string,
+    public readonly collapsibleState: vscode.TreeItemCollapsibleState,
+    public readonly command?: vscode.Command,
+  ) {
+    super(label, collapsibleState);
+
+    this._value = val;
+  }
+
+  get value() {
+    return this._value;
+  }
+}