ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-21 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix project name validation (#22547)

Browse Source 
* Fix project name validation

* Add/update tests

* Address comments

* Fix error
This commit is contained in:
Sakshi Sharma
2023-03-31 08:46:58 -07:00
committed by GitHub
parent 6cc5e9a70d
commit 9d8006562d
11 changed files with 124 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/sql-database-projects/src/common/utils.ts
View File

@@ -785,7 +785,7 @@ export function isValidBasename(name?: string): boolean {
* Returns specific error message if file name is invalid
* @param name filename to check
*/
export function isValidBasenameErrorMessage(name?: string): string {
export function isValidBasenameErrorMessage(name?: string): string | undefined {
return getDataWorkspaceExtensionApi().isValidBasenameErrorMessage(name);
}

4
extensions/sql-database-projects/src/controllers/projectController.ts
View File

@@ -677,7 +677,7 @@ export class ProjectsController {
prompt: constants.newObjectNamePrompt(itemType.friendlyName),
value: `${suggestedName}${counter}`,
validateInput: (value) => {
return utils.isValidBasename(value) ? undefined : utils.isValidBasenameErrorMessage(value);
return utils.isValidBasenameErrorMessage(value);
},
ignoreFocusOut: true,
});
@@ -1339,7 +1339,7 @@ export class ProjectsController {
prompt: constants.autorestProjectName,
value: defaultName,
validateInput: (value) => {
return utils.isValidBasename(value.trim()) ? undefined : utils.isValidBasenameErrorMessage(value.trim());
return utils.isValidBasenameErrorMessage(value);
}
});

2
extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseDialog.ts
View File

@@ -303,7 +303,7 @@ export class CreateProjectFromDatabaseDialog {
this.projectNameTextBox.onTextChanged(text => {
const errorMessage = isValidBasenameErrorMessage(text);
if (errorMessage) {
if (errorMessage !== undefined) {
// Set validation error message if project name is invalid
void this.projectNameTextBox!.updateProperty('validationErrorMessage', errorMessage);
} else {

4
extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseQuickpick.ts
View File

@@ -6,7 +6,7 @@
import * as vscode from 'vscode';
import * as path from 'path';
import * as constants from '../common/constants';
import { exists, getVscodeMssqlApi, isValidBasename, isValidBasenameErrorMessage, sanitizeStringForFilename } from '../common/utils';
import { exists, getVscodeMssqlApi, isValidBasenameErrorMessage, sanitizeStringForFilename } from '../common/utils';
import { IConnectionInfo } from 'vscode-mssql';
import { defaultProjectNameFromDb, defaultProjectSaveLocation } from '../tools/newProjectTool';
import { ImportDataModel } from '../models/api/import';
@@ -72,7 +72,7 @@ export async function createNewProjectFromDatabaseWithQuickpick(connectionInfo?:
title: constants.projectNamePlaceholderText,
value: defaultProjectNameFromDb(sanitizeStringForFilename(selectedDatabase)),
validateInput: (value) => {
return isValidBasename(value) ? undefined : isValidBasenameErrorMessage(value);
return isValidBasenameErrorMessage(value);
},
ignoreFocusOut: true
});