(1) Only show first line in a commit

(2) Correctly set update type in commits (3) Show completed times in UI
leinelissen · Nov 2, 2020 · 2e576d8 · 2e576d8
1 parent 8a131fd
commit 2e576d8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/app/screens/Requests/components/ProviderOverlay.tsx b/src/app/screens/Requests/components/ProviderOverlay.tsx
@@ -46,6 +46,17 @@ function ProviderOverlay({ selectedProvider, status }: Props): JSX.Element {
                                 fixedWidth
                             />
                             Last check: <i>{status?.lastCheck ? formatDistanceToNow(status.lastCheck) + ' ago' : 'never'}</i>
+                            {status?.completed && 
+                                <>
+                                    <br />
+                                    <FontAwesomeIcon
+                                        icon={faCheck}
+                                        style={{ marginRight: 8 }}
+                                        fixedWidth
+                                    />
+                                    Completed: <i>{formatDistanceToNow(status?.completed)} ago</i>
+                                </>
+                            }
                         </span>
                     </Section>
                     {status?.dispatched ? 

diff --git a/src/main/lib/repository/index.ts b/src/main/lib/repository/index.ts
@@ -258,7 +258,8 @@ class Repository extends EventEmitter {
 
                 return {
                     oid: commit.sha(),
-                    message: commit.message(),
+                    // Only show the first line of a commit
+                    message: commit.message().split('\n')[0],
                     author: {
                         email: author.email(),
                         name: author.name(),

diff --git a/src/main/providers/index.ts b/src/main/providers/index.ts
@@ -127,7 +127,7 @@ class ProviderManager extends EventEmitter {
         }
 
         // Alternatively, we save the files and attempt to commit
-        const changedFiles = await this.saveFilesAndCommit(files, key, `Auto-update ${new Date().toLocaleString()}`);
+        const changedFiles = await this.saveFilesAndCommit(files, key, `Auto-update ${new Date().toLocaleString()}`, ProviderUpdateType.UPDATE);
 
         // GUARD: Only log stuff if new data is found
         if (changedFiles) {
@@ -276,7 +276,7 @@ class ProviderManager extends EventEmitter {
                 // If it is complete now, we'll fetch the data and parse it
                 const dirPath = path.join(REPOSITORY_PATH, key);
                 const files = await instance.parseDataRequest(dirPath);
-                const changedFiles = await this.saveFilesAndCommit(files, key, `Data Request [${key}] ${new Date().toLocaleString()}`);
+                const changedFiles = await this.saveFilesAndCommit(files, key, `Data Request [${key}] ${new Date().toLocaleString()}`, ProviderUpdateType.DATA_REQUEST);
                 Notifications.success(`The data request for ${key} was successfully completed. ${changedFiles} files were changed.`);
 
                 // Set the flag for completion