Merge pull request #30 from rgeorgiev583/implement-selection-of-a-single-branch-or-author

hansu · web-flow · commit 40d1877be7cd · 2025-04-24T17:46:59.000+02:00
Implement selection of a single branch or author
diff --git a/package.json b/package.json
@@ -1090,6 +1090,16 @@
 					"default": false,
 					"markdownDescription": "Only follow the first parent of commits when discovering the commits to load in the Git Graph View. See [--first-parent](https://git-scm.com/docs/git-log#Documentation/git-log.txt---first-parent) to find out more about this setting. This can be overridden per repository in the Git Graph View's Repository Settings Widget."
 				},
+				"git-graph.repository.selectMultipleAuthors": {
+					"type": "boolean",
+					"default": true,
+					"description": "Enables the selection of multiple authors from the Authors dropdown."
+				},
+				"git-graph.repository.selectMultipleBranches": {
+					"type": "boolean",
+					"default": true,
+					"description": "Enables the selection of multiple branches from the Branches dropdown."
+				},
 				"git-graph.repository.showCommitsOnlyReferencedByTags": {
 					"type": "boolean",
 					"default": true,
diff --git a/src/config.ts b/src/config.ts
@@ -464,6 +464,20 @@ class Config {
 		return !!this.getRenamedExtensionSetting('repository.onlyFollowFirstParent', 'onlyFollowFirstParent', false);
 	}
 
+	/**
+	 * Get the value of the `git-graph.repository.selectMultipleAuthors` Extension Setting.
+	 */
+	get selectMultipleAuthors() {
+		return !!this.config.get('repository.selectMultipleAuthors', true);
+	}
+
+	/**
+	 * Get the value of the `git-graph.repository.selectMultipleBranches` Extension Setting.
+	 */
+	get selectMultipleBranches() {
+		return !!this.config.get('repository.selectMultipleBranches', true);
+	}
+
 	/**
 	 * Get the value of the `git-graph.repository.showCommitsOnlyReferencedByTags` Extension Setting.
 	 */
diff --git a/src/gitGraphView.ts b/src/gitGraphView.ts
@@ -691,6 +691,8 @@ export class GitGraphView extends Disposable {
 				onRepoLoad: config.onRepoLoad,
 				referenceLabels: config.referenceLabels,
 				repoDropdownOrder: config.repoDropdownOrder,
+				selectMultipleAuthors: config.selectMultipleAuthors,
+				selectMultipleBranches: config.selectMultipleBranches,
 				showRemoteBranches: config.showRemoteBranches,
 				simplifyByDecoration: config.simplifyByDecoration,
 				showStashes: config.showStashes,
@@ -719,15 +721,17 @@ export class GitGraphView extends Disposable {
 			</body>`;
 		} else if (numRepos > 0) {
 			const stickyClassAttr = initialState.config.stickyHeader ? ' class="sticky"' : '';
+			const branchDropdownLabel = initialState.config.selectMultipleBranches ? 'Branches' : 'Branch';
+			const authorDropdownLabel = initialState.config.selectMultipleAuthors ? 'Authors' : 'Author';
 			let hideRemotes = '', hideSimplify = '';
 			if (!config.toolbarButtonVisibility.remotes) { hideRemotes = 'style="display: none"'; }
 			if (!config.toolbarButtonVisibility.simplify) { hideSimplify = 'style="display: none"'; }
 			body = `<body>
 			<div id="view" tabindex="-1">
 				<div id="controls"${stickyClassAttr}>
 					<span id="repoControl"><span class="unselectable">Repo: </span><div id="repoDropdown" class="dropdown"></div></span>
-					<span id="branchControl"><span class="unselectable">Branches: </span><div id="branchDropdown" class="dropdown"></div></span>
-					<span id="authorControl"><span class="unselectable">Authors: </span><div id="authorDropdown" class="dropdown"></div></span>
+					<span id="branchControl"><span class="unselectable">${branchDropdownLabel}: </span><div id="branchDropdown" class="dropdown"></div></span>
+					<span id="authorControl"><span class="unselectable">${authorDropdownLabel}: </span><div id="authorDropdown" class="dropdown"></div></span>
 					<label ${hideRemotes} id="showRemoteBranchesControl" title="Show Remote Branches"><input type="checkbox" id="showRemoteBranchesCheckbox" tabindex="-1"><span class="customCheckbox"></span>Remotes</label>
 					<label ${hideSimplify} id="simplifyByDecorationControl" title="Simplify By Decoration"><input type="checkbox" id="simplifyByDecorationCheckbox" tabindex="-1"><span class="customCheckbox"></span>Simplify</label>
 					<div id="currentBtn" title="Current"></div>
diff --git a/src/types.ts b/src/types.ts
@@ -263,6 +263,8 @@ export interface GitGraphViewConfig {
 	readonly onRepoLoad: OnRepoLoadConfig;
 	readonly referenceLabels: ReferenceLabelsConfig;
 	readonly repoDropdownOrder: RepoDropdownOrder;
+	readonly selectMultipleAuthors: boolean;
+	readonly selectMultipleBranches: boolean;
 	readonly showRemoteBranches: boolean;
 	readonly simplifyByDecoration: boolean;
 	readonly showStashes: boolean;
diff --git a/web/main.ts b/web/main.ts
@@ -86,14 +86,14 @@ class GitGraphView {
 			this.loadRepo(values[0]);
 		});
 
-		this.branchDropdown = new Dropdown('branchDropdown', false, true, 'Branches', (values) => {
+		this.branchDropdown = new Dropdown('branchDropdown', false, this.config.selectMultipleBranches, 'Branches', (values) => {
 			this.currentBranches = values;
 			this.maxCommits = this.config.initialLoadCommits;
 			this.saveState();
 			this.clearCommits();
 			this.requestLoadRepoInfoAndCommits(true, true);
 		});
-		this.authorDropdown = new Dropdown('authorDropdown', false, true, 'Authors', (values) => {
+		this.authorDropdown = new Dropdown('authorDropdown', false, this.config.selectMultipleAuthors, 'Authors', (values) => {
 			this.currentAuthors = values;
 			this.maxCommits = this.config.initialLoadCommits;
 			this.saveState();
