rettriev and display last commi

Author: zenoxs

src/app/screens/application-list/ApplicationList.tsx

@@ -10,6 +10,8 @@ import {
   IColumn,
   IGroup,
   Image,
+  Persona,
+  PersonaSize,
   ProgressIndicator,
   SelectionMode,
   Stack,
@@ -68,15 +70,29 @@ export const ApplicationList = observer(() => {
         }
         return appName
       },
-      minWidth: 100,
+      minWidth: 150,
       maxWidth: 250
     },
     {
       key: 'branch',
       name: 'Branch',
       onRender: (item: Branch) => item.name,
       minWidth: 50,
-      maxWidth: 100
+      maxWidth: 80
+    },
+    {
+      key: 'commit',
+      name: 'Commit',
+      onRender: ({ lastCommit }: Branch) => (
+        <Persona
+          size={PersonaSize.size32}
+          showSecondaryText
+          imageUrl={lastCommit.author.avatar_url}
+          text={lastCommit.commit.message}
+          secondaryText={lastCommit.commit.author.name}
+        />
+      ),
+      minWidth: 150
     },
     {
       key: 'build',
@@ -88,7 +104,7 @@ export const ApplicationList = observer(() => {
           return <BuildStatusIndicator status={lastBuild.status} result={lastBuild.result} />
         }
       },
-      minWidth: 50
+      minWidth: 40
     },
     {
       key: 'actions',

src/models/application-store/application/application.ts

@@ -10,7 +10,7 @@ import {
   SnapshotOut,
   types
 } from 'mobx-state-tree'
-import { ApplicationDto, BranchDto } from '../../../services'
+import { ApplicationDto, BranchWithCommitDto } from '../../../services'
 import { Branch, BranchModel } from '../../branch-store'
 import { withEnvironment } from '../../extensions/with-environment'
 import { withRootStore } from '../../extensions/with-root-store'
@@ -77,18 +77,19 @@ export const ApplicationModel: ApplicationRunType = ApplicationModel$1.props({
   .actions((self) => ({
     fetchBranches: flow(function* () {
       self.isLoading = true
-      const [applicationDto, branchesDto]: [ApplicationDto, Array<BranchDto>] = yield Promise.all([
-        self.environment.appcenterApi.getApplication(
-          self.owner.displayName,
-          self.name,
-          self.token.token
-        ),
-        self.environment.appcenterApi.getBranches(
-          self.owner.displayName,
-          self.name,
-          self.token.token
-        )
-      ])
+      const [applicationDto, branchesDto]: [ApplicationDto, Array<BranchWithCommitDto>] =
+        yield Promise.all([
+          self.environment.appcenterApi.getApplication(
+            self.owner.displayName,
+            self.name,
+            self.token.token
+          ),
+          self.environment.appcenterApi.getBranches(
+            self.owner.displayName,
+            self.name,
+            self.token.token
+          )
+        ])
 
       // update self properties
       self.name = applicationDto.name

src/models/branch-store/branch-store.ts

@@ -1,5 +1,5 @@
 import { Instance, SnapshotOut, types } from 'mobx-state-tree'
-import { BranchDto } from '../../services'
+import { BranchWithCommitDto } from '../../services'
 import { Build } from '../build-store'
 import { withEnvironment, withRootStore } from '../extensions/extensions'
 import { BranchModel } from './branch'
@@ -21,7 +21,7 @@ export const BranchStoreModel = types
   .extend(withRootStore)
   .actions((self) => ({
     putBranchDdto: (
-      branchDto: BranchDto,
+      branchDto: BranchWithCommitDto,
       appId: string,
       applicationName: string,
       ownerName: string
@@ -35,7 +35,7 @@ export const BranchStoreModel = types
         id: `${ownerName}_${applicationName}_${branchDto.branch.name}`,
         name: branchDto.branch.name,
         configured: branchDto.configured,
-        lastCommit: branchDto.branch.commit.sha,
+        lastCommit: branchDto.commit,
         application: appId,
         lastBuild: lastBuild?.id
       })

src/models/branch-store/branch/branch.ts

@@ -1,6 +1,6 @@
 import { IObjectWithKey } from '@fluentui/react'
 import { flow, Instance, SnapshotOut, types } from 'mobx-state-tree'
-import { BuildDto } from '../../../services'
+import { BuildDto, CommitLiteDto } from '../../../services'
 import { ApplicationModel, ApplicationRunType } from '../../application-store'
 import { BuildModel } from '../../build-store'
 import { withEnvironment } from '../../extensions/with-environment'
@@ -15,7 +15,7 @@ export const BranchModel = types
     id: types.identifier,
     name: types.string,
     configured: types.boolean,
-    lastCommit: types.string,
+    lastCommit: types.frozen<CommitLiteDto>(),
     lastBuild: types.safeReference(BuildModel),
     application: types.reference(types.late((): ApplicationRunType => ApplicationModel))
   })
@@ -40,7 +40,7 @@ export const BranchModel = types
         ownerName: self.application.owner.displayName,
         applicationName: self.application.name,
         branchName: self.name,
-        commit: self.lastCommit,
+        commit: self.lastCommit.sha,
         token: self.application.token.token
       })
     }),

src/services/appcenter-api/appcenter-api.ts

@@ -1,6 +1,6 @@
 import { Body } from '@tauri-apps/api/http'
 import { HttpClient } from '../http-client/http-client'
-import { ApplicationDto, BranchDto } from './appcenter-api.type'
+import { ApplicationDto, BranchDto, BranchWithCommitDto, CommitLiteDto } from './appcenter-api.type'
 
 export class AppcenterApi {
   private readonly _http: HttpClient
@@ -45,19 +45,29 @@ export class AppcenterApi {
     ownerName: string,
     applicationName: string,
     token: string
-  ): Promise<Array<BranchDto>> {
+  ): Promise<Array<BranchWithCommitDto>> {
     return this._http
       .get<Array<BranchDto>>(`apps/${ownerName}/${applicationName}/branches`, {
         headers: {
           'Content-Type': 'application/json',
           'X-API-Token': token
         }
       })
-      .then((res) => {
+      .then(async (res) => {
         if (!res.ok) {
           return []
         }
-        return res.data
+        const commits = await this.getCommitsBatch(
+          ownerName,
+          applicationName,
+          res.data.map((b) => b.branch.commit.sha),
+          token
+        )
+
+        return res.data.map((b, index) => ({
+          ...b,
+          commit: commits[index]
+        }))
       })
   }
 
@@ -125,4 +135,30 @@ export class AppcenterApi {
     )
     console.log(res)
   }
+
+  async getCommitsBatch(
+    ownerName: string,
+    applicationName: string,
+    hashes: Array<string>,
+    token: string
+  ): Promise<Array<CommitLiteDto>> {
+    return this._http
+      .get<Array<CommitLiteDto>>(`apps/${ownerName}/${applicationName}/commits/batch`, {
+        headers: {
+          'Content-Type': 'application/json',
+          'X-API-Token': token
+        },
+        query: {
+          form: 'lite',
+          hashes: hashes.join(',')
+        }
+      })
+      .then((res) => {
+        if (!res.ok) {
+          return []
+        }
+
+        return res.data
+      })
+  }
 }

src/services/appcenter-api/appcenter-api.type.ts

@@ -41,6 +41,20 @@ export interface CommitDto {
   sha: string
 }
 
+export interface CommitLiteDto extends CommitDto {
+  author: {
+    avatar_url?: string
+  }
+  commit: {
+    message: string
+    author: {
+      name: string
+      email: string
+      date: string
+    }
+  }
+}
+
 export interface BuildDto {
   id: number
   buildNumber: string
@@ -68,3 +82,7 @@ export interface BranchDto {
   lastBuild?: BuildDto
   trigger?: string
 }
+
+export interface BranchWithCommitDto extends BranchDto {
+  commit: CommitLiteDto
+}