Merge branch 'develop' into feature/6401_uupload_all_oak_files

Author: KMakowsky

src/commands/SelectReport.ts

@@ -1,3 +1,5 @@
+import vscode from 'vscode'
+
 import BaseCommand from './BaseCommand'
 
 import { Container } from '../container'
@@ -10,7 +12,7 @@ export enum CommandIdentifiers {
 
 export default class SelectReport extends BaseCommand {
 	container: Container
-	
+
 	constructor(container: Container) {
 		super()
 		this.container = container
@@ -34,7 +36,12 @@ export default class SelectReport extends BaseCommand {
 				}
 			})
 		}
-		const quickPick = new QuickPick(quickPickOptions)
+		const placeholder = `Select Project Report (${quickPickOptions.size} Report${quickPickOptions.size > 1 ? 's' : ''} Available)`
+		const quickPick = new QuickPick(quickPickOptions, placeholder)
+		if (quickPickOptions.size === 0) {
+			vscode.window.showInformationMessage('Oaklean: No Project Reports Available')
+			return
+		}
 		quickPick.show()
 	}
 }

src/components/QuickPick.ts

@@ -8,7 +8,7 @@ export default class QuickPick {
 	vsCodeComponent: vscode.QuickPick<vscode.QuickPickItem>
 	optionsWithCallBacks: QuickPickOptions
 
-	constructor(options: QuickPickOptions) {
+	constructor(options: QuickPickOptions, placeholder?: string) {
 		this.optionsWithCallBacks = options
 
 		const quickPick = vscode.window.createQuickPick()
@@ -19,6 +19,7 @@ export default class QuickPick {
 			})
 		}
 		quickPick.items = labels
+		quickPick.placeholder = placeholder
 		quickPick.onDidChangeSelection(selection => {
 			if (selection[0] && this.optionsWithCallBacks.has(selection[0].label)) {
 				this.optionsWithCallBacks.get(selection[0].label)?.selectionCallback()