Add whether squash merge is invoked

JKRhb · Jun 8, 2021 · 9ada3db · 9ada3db
1 parent 7ccd6ac
commit 9ada3db
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/app/src/lib/stats/stats-database.ts b/app/src/lib/stats/stats-database.ts
@@ -445,6 +445,9 @@ export interface IDailyMeasures {
 
   /** The number of times a successful squash merge occurs */
   readonly squashMergeSuccessfulCount: number
+
+  /** The number of times a squash merge is initiated */
+  readonly squashMergeInvokedCount: number
 }
 
 export class StatsDatabase extends Dexie {

diff --git a/app/src/lib/stats/stats-store.ts b/app/src/lib/stats/stats-store.ts
@@ -172,6 +172,7 @@ const DefaultDailyMeasures: IDailyMeasures = {
   squashMergeIntoCurrentBranchMenuCount: 0,
   squashMergeSuccessfulWithConflictsCount: 0,
   squashMergeSuccessfulCount: 0,
+  squashMergeInvokedCount: 0,
 }
 
 interface IOnboardingStats {
@@ -1679,6 +1680,12 @@ export class StatsStore implements IStatsStore {
     }))
   }
 
+  public recordSquashMergeInvokedCount(): Promise<void> {
+    return this.updateDailyMeasures(m => ({
+      squashMergeInvokedCount: m.squashMergeInvokedCount + 1,
+    }))
+  }
+
   /** Post some data to our stats endpoint. */
   private post(body: object): Promise<Response> {
     const options: RequestInit = {

diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
@@ -4474,6 +4474,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
   ): Promise<void> {
     const gitStore = this.gitStoreCache.get(repository)
 
+    if (isSquash) {
+      this.statsStore.recordSquashMergeInvokedCount()
+    }
+
     if (mergeStatus !== null) {
       if (mergeStatus.kind === ComputedAction.Clean) {
         this.statsStore.recordMergeHintSuccessAndUserProceeded()