Project group name is now mandatory, Canceling when entering group na…

…me fixed // v1.5.1

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 All notable changes to the "dashboard" extension will be documented in this file. It follows the [Keep a Changelog](http://keepachangelog.com/) recommendations.
 
+## [1.5.1] 2019-10-24
+### Changed
+- Project group name is now mandatory, as the group name is always displayed. So enforcing a name makes sense.
+
+### Fixed
+- Escape/Unfocus on entering group name now cancels the add/edit action instead of having an unnamed group.
+
 ## [1.5] 2019-10-22
 ### Added
 - Support for [Remote Development Projects](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.vscode-remote-extensionpack).

package.json

@@ -2,7 +2,7 @@
     "name": "vscode-dashboard",
     "displayName": "Dashboard",
     "description": "Organize your workspaces in a speed-dial manner.",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "publisher": "kruemelkatze",
     "icon": "media/extension_icon.png",
     "engines": {

src/dashboard.ts

@@ -169,9 +169,15 @@ export function activate(context: vscode.ExtensionContext) {
             value: group.groupName || undefined,
             valueSelection: group.groupName ? [0, group.groupName.length] : undefined,
             placeHolder: 'Project Group Name',
-            ignoreFocusOut: true
+            ignoreFocusOut: true,
+            validateInput:  (val: string) => val ? '' : 'A Group Name must be provided.',
         });
 
+        if (groupName == null) {
+            //throw new Error(USER_CANCELED);
+            return
+        }
+
         group.groupName = groupName;
         await updateProjectGroup(context, projectGroupId, group);
 
@@ -372,14 +378,16 @@ export function activate(context: vscode.ExtensionContext) {
 
         projectGroupId = selectedProjectGroupPick.id;
         if (projectGroupId === 'Add') {
-            // If there is no default group, allow name to be empty
-            let validateInput = projectGroups.length === 0 ? undefined : (val: string) => val ? '' : 'A Group Name must be provided.';
             let newGroupName = await vscode.window.showInputBox({
                 placeHolder: 'New Project Group Name',
                 ignoreFocusOut: true,
-                validateInput,
+                validateInput:  (val: string) => val ? '' : 'A Group Name must be provided.',
             });
 
+            if (newGroupName == null) {
+                throw new Error(USER_CANCELED);
+            }
+
             projectGroupId = (await addProjectGroup(context, newGroupName)).id;
         }