From 830cecd7d03ecd49550adb76a578a7ad4005ffe5 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sat, 23 Feb 2019 00:51:45 +0800
Subject: Add icon and redesign card in todo page.

---
 .../src/app/todo-list-page/todo-list.service.ts    | 23 +++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'Timeline/ClientApp/src/app/todo-list-page/todo-list.service.ts')

diff --git a/Timeline/ClientApp/src/app/todo-list-page/todo-list.service.ts b/Timeline/ClientApp/src/app/todo-list-page/todo-list.service.ts
index ed28bc59..17ded67b 100644
--- a/Timeline/ClientApp/src/app/todo-list-page/todo-list.service.ts
+++ b/Timeline/ClientApp/src/app/todo-list-page/todo-list.service.ts
@@ -24,12 +24,18 @@ export interface WorkItemResult {
   fields: { [name: string]: any };
 }
 
+export interface WorkItemTypeResult {
+  icon: {
+    url: string
+  };
+}
 
 export interface WorkItem {
   id: number;
   title: string;
   closed: boolean;
   detailUrl: string;
+  iconUrl: string;
 }
 
 @Injectable({
@@ -39,6 +45,7 @@ export class TodoListService {
 
   public static titleFieldName = 'System.Title';
   public static stateFieldName = 'System.State';
+  public static typeFieldName = 'System.WorkItemType';
 
   constructor(private client: HttpClient) { }
 
@@ -46,6 +53,14 @@ export class TodoListService {
     return this.client.get<AzureDevOpsAccessInfo>('/api/TodoPage/AzureDevOpsAccessInfo');
   }
 
+  private getItemIconUrl(baseUrl: string, headers: HttpHeaders, type: string): Observable<string> {
+    return this.client.get<WorkItemTypeResult>(`${baseUrl}_apis/wit/workitemtypes/${encodeURIComponent(type)}?api-version=5.0`, {
+      headers: headers
+    }).pipe(
+      map(result => result.icon.url)
+    );
+  }
+
   getWorkItemList(): Observable<WorkItem[]> {
     return this.getAzureDevOpsAccessInfo().pipe(
       switchMap(
@@ -61,12 +76,14 @@ export class TodoListService {
             }, { headers: headers }).pipe(
               switchMap(result => result.workItems),
               concatMap(result => this.client.get<WorkItemResult>(result.url, { headers: headers })),
-              map(result => <WorkItem>{
+              concatMap(result => this.getItemIconUrl(baseUrl, headers, result.fields[TodoListService.typeFieldName]).pipe(
+                map(iconResult => <WorkItem>{
                 id: result.id,
                 title: <string>result.fields[TodoListService.titleFieldName],
                 closed: ((<string>result.fields[TodoListService.stateFieldName]).toLowerCase() === 'closed'),
-                detailUrl: `${baseUrl}_workitems/edit/${result.id}/`
-              }),
+                detailUrl: `${baseUrl}_workitems/edit/${result.id}/`,
+                iconUrl: iconResult
+              }))),
               toArray()
             );
         }
-- 
cgit v1.2.3