Display changed files.

Damnae · Apr 9, 2024 · e54becf · e54becf
1 parent df0b73f
commit e54becf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/common/datasource.ts b/src/common/datasource.ts
@@ -214,16 +214,18 @@ export interface DataSourceCompareFile
 
 export interface DataSourceCompare
 {
-    AddedFiles: DataSourceCompareFile[]
-    RemovedFiles: DataSourceCompareFile[]
+    Added: DataSourceCompareFile[]
+    Removed: DataSourceCompareFile[]
+    Changed: DataSourceCompareFile[]
 }
 
 export async function retrieveCompare(fromCommit:string, toCommit:string) : Promise<DataSourceCompare>
 {
     const compare:DataSourceCompare = 
     {
-        AddedFiles: [],
-        RemovedFiles: [],
+        Added: [],
+        Removed: [],
+        Changed:[],
     }
     await compareProcessTree(compare, fromCommit, toCommit, 'Config/ConfigAbility')
     await compareProcessTree(compare, fromCommit, toCommit, 'Config/ConfigGlobalModifier')
@@ -246,8 +248,9 @@ async function compareProcessTree(compare:DataSourceCompare, fromCommit:string,
     const filesTo = to.filter(fileFilter)
 
     const convert = (f:DataSourceTreeItem) => <DataSourceCompareFile>{ Path: `${path}/${f.path}` }
-    compare.AddedFiles = compare.AddedFiles.concat(filesTo.filter(f => !filesFrom.some(f2 => f.path == f2.path)).map(convert))
-    compare.RemovedFiles = compare.RemovedFiles.concat(filesFrom.filter(f => !filesTo.some(f2 => f.path == f2.path)).map(convert))
+    compare.Added = compare.Added.concat(filesTo.filter(f => !filesFrom.some(f2 => f.path == f2.path)).map(convert))
+    compare.Removed = compare.Removed.concat(filesFrom.filter(f => !filesTo.some(f2 => f.path == f2.path)).map(convert))
+    compare.Changed = compare.Changed.concat(filesFrom.filter(f => filesTo.some(f2 => f.path == f2.path && f.sha != f2.sha)).map(convert))
 }
 
 function getHeaders(accept?:string)

diff --git a/src/views/pages/changes/Files.vue b/src/views/pages/changes/Files.vue
@@ -25,15 +25,20 @@
   </h2>
 
   <LoadingArea :loading="loading">
-    <h3>{{ compare.AddedFiles.length }} Added</h3>
-    <template v-for="file in compare.AddedFiles">
+    <h3>{{ compare.Added.length }} Added</h3>
+    <template v-for="file in compare.Added">
       <FileItem :commitId="commitId" :file="file" />
     </template>
 
-    <h3>{{ compare.RemovedFiles.length }} Removed</h3>
-    <template v-for="file in compare.RemovedFiles">
+    <h3>{{ compare.Removed.length }} Removed</h3>
+    <template v-for="file in compare.Removed">
       <FileItem :commitId="fromCommitId" :file="file" />
     </template>
+
+    <h3>{{ compare.Changed.length }} Changed</h3>
+    <template v-for="file in compare.Changed">
+      <FileItem :commitId="commitId" :file="file" />
+    </template>
   </LoadingArea>
 
 </template>