Rename CommitGraphViewMode -> CommitHistoryViewMode, change default to "List"

Author: pol-rivero

app/src/lib/stores/commit-graph-state.ts

@@ -8,25 +8,31 @@ const commitGraph_CollapsedBranchGroupsKeyPrefix =
   'commitGraph-collapsed-branch-groups'
 const commitGraph_ViewModeKey = 'commitGraph-view-mode'
 const commitGraph_DefaultCollapsedBranchGroups = ['origin', 'upstream', 'tags']
-const commitGraph_DefaultViewMode: CommitGraphViewModePreference = 'tree'
+
+export enum CommitHistoryViewMode {
+  List = 'list',
+  Graph = 'graph',
+}
+
+const DEFAULT_COMMIT_GRAPH_VIEW_MODE = CommitHistoryViewMode.List
 
 export const commitGraph_DefaultBranchListWidth = 180
 export const commitGraph_BranchListWidthConfigKey =
   'commitGraph-branch-list-width'
 
-export type CommitGraphViewModePreference = 'list' | 'tree'
-
-export function commitGraph_getStoredViewMode(): CommitGraphViewModePreference {
+export function commitGraph_getStoredViewMode(): CommitHistoryViewMode {
   const value = localStorage.getItem(commitGraph_ViewModeKey)
-
-  return value === 'list' || value === 'tree'
-    ? value
-    : commitGraph_DefaultViewMode
+  switch (value) {
+    case CommitHistoryViewMode.List:
+      return CommitHistoryViewMode.List
+    case CommitHistoryViewMode.Graph:
+      return CommitHistoryViewMode.Graph
+    default:
+      return DEFAULT_COMMIT_GRAPH_VIEW_MODE
+  }
 }
 
-export function commitGraph_setStoredViewMode(
-  viewMode: CommitGraphViewModePreference
-) {
+export function commitGraph_setStoredViewMode(viewMode: CommitHistoryViewMode) {
   localStorage.setItem(commitGraph_ViewModeKey, viewMode)
 }
 

app/src/ui/history/commit-graph-sidebar.tsx

@@ -5,6 +5,7 @@ import { ICompareState, IConstrainedValue } from '../../lib/app-state'
 import {
   commitGraph_getStoredViewMode,
   commitGraph_setStoredViewMode,
+  CommitHistoryViewMode,
 } from '../../lib/stores/commit-graph-state'
 import { Repository } from '../../models/repository'
 import { Branch, BranchType } from '../../models/branch'
@@ -37,17 +38,6 @@ import {
 } from './commit-graph-model'
 import { CommitGraphCommitListItem } from './commit-graph-commit-list-item'
 
-enum CommitGraphViewMode {
-  List = 'list',
-  Tree = 'tree',
-}
-
-function commitGraph_getInitialViewMode() {
-  return commitGraph_getStoredViewMode() === 'list'
-    ? CommitGraphViewMode.List
-    : CommitGraphViewMode.Tree
-}
-
 type CommitGraphBranchGroup =
   | 'local'
   | 'origin'
@@ -90,7 +80,7 @@ interface ICommitGraphSidebarProps {
 interface ICommitGraphSidebarState {
   readonly keyboardReorderData?: KeyboardInsertionData
   readonly isSearching: boolean
-  readonly commitGraphViewMode: CommitGraphViewMode
+  readonly commitGraphViewMode: CommitHistoryViewMode
   readonly commitGraphSelectedBranchRef: string | null
 }
 
@@ -527,7 +517,7 @@ export class CommitGraphSidebar extends React.Component<
 
     this.state = {
       isSearching: false,
-      commitGraphViewMode: commitGraph_getInitialViewMode(),
+      commitGraphViewMode: commitGraph_getStoredViewMode(),
       commitGraphSelectedBranchRef: null,
     }
   }
@@ -568,7 +558,7 @@ export class CommitGraphSidebar extends React.Component<
           {this.commitGraph_renderViewModeSwitch()}
         </div>
 
-        {this.state.commitGraphViewMode === CommitGraphViewMode.Tree
+        {this.state.commitGraphViewMode === CommitHistoryViewMode.Graph
           ? this.commitGraph_renderView()
           : this.renderCommitList(false)}
       </div>
@@ -582,10 +572,10 @@ export class CommitGraphSidebar extends React.Component<
           size="small"
           className={classNames('button-group-item', {
             selected:
-              this.state.commitGraphViewMode === CommitGraphViewMode.List,
+              this.state.commitGraphViewMode === CommitHistoryViewMode.List,
           })}
           ariaPressed={
-            this.state.commitGraphViewMode === CommitGraphViewMode.List
+            this.state.commitGraphViewMode === CommitHistoryViewMode.List
           }
           ariaLabel="List view"
           tooltip="List view"
@@ -597,10 +587,10 @@ export class CommitGraphSidebar extends React.Component<
           size="small"
           className={classNames('button-group-item', {
             selected:
-              this.state.commitGraphViewMode === CommitGraphViewMode.Tree,
+              this.state.commitGraphViewMode === CommitHistoryViewMode.Graph,
           })}
           ariaPressed={
-            this.state.commitGraphViewMode === CommitGraphViewMode.Tree
+            this.state.commitGraphViewMode === CommitHistoryViewMode.Graph
           }
           ariaLabel="Graph view"
           tooltip="Graph view"
@@ -1166,24 +1156,24 @@ export class CommitGraphSidebar extends React.Component<
   }
 
   private commitGraph_onListModeClicked = () => {
-    commitGraph_setStoredViewMode('list')
-    this.setState({ commitGraphViewMode: CommitGraphViewMode.List })
+    commitGraph_setStoredViewMode(CommitHistoryViewMode.List)
+    this.setState({ commitGraphViewMode: CommitHistoryViewMode.List })
     void this.props.dispatcher.setCommitSearchQuery(
       this.props.repository,
       this.props.compareState.commitSearchQuery
     )
   }
 
   private commitGraph_onTreeModeClicked = () => {
-    commitGraph_setStoredViewMode('tree')
-    this.setState({ commitGraphViewMode: CommitGraphViewMode.Tree }, () =>
+    commitGraph_setStoredViewMode(CommitHistoryViewMode.Graph)
+    this.setState({ commitGraphViewMode: CommitHistoryViewMode.Graph }, () =>
       this.commitGraph_ensureLoaded()
     )
   }
 
   private commitGraph_ensureLoaded() {
     if (
-      this.state.commitGraphViewMode !== CommitGraphViewMode.Tree ||
+      this.state.commitGraphViewMode !== CommitHistoryViewMode.Graph ||
       this.commitGraph_getHiddenBranchRefs() === null
     ) {
       return
@@ -1278,7 +1268,7 @@ export class CommitGraphSidebar extends React.Component<
 
   private onScroll = (start: number, end: number) => {
     const commitGraphIsTreeMode =
-      this.state.commitGraphViewMode === CommitGraphViewMode.Tree
+      this.state.commitGraphViewMode === CommitHistoryViewMode.Graph
     const commits = commitGraphIsTreeMode
       ? this.commitGraph_getFilteredCommitSHAs()
       : this.props.compareState.filteredHistoryCommitSHAs
@@ -1324,7 +1314,7 @@ export class CommitGraphSidebar extends React.Component<
   }
 
   private onCommitSearchQueryChanged = async (text: string) => {
-    if (this.state.commitGraphViewMode === CommitGraphViewMode.Tree) {
+    if (this.state.commitGraphViewMode === CommitHistoryViewMode.Graph) {
       this.props.dispatcher.updateCompareForm(this.props.repository, {
         commitSearchQuery: text,
       })