ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove data workspace * activationEvent (#22005)

Browse Source 
* remove data workspace * activationEvent

* fix tests
This commit is contained in:
Kim Santiago
2023-02-22 12:03:39 -08:00
committed by GitHub
parent 10c3199a23
commit 169138e24b
8 changed files with 33 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/data-workspace/package.json
View File

@@ -13,7 +13,9 @@
"azdata": ">=1.25.0" "azdata": ">=1.25.0"
}, },
"activationEvents": [ "activationEvents": [
"*" "onView:dataworkspace.views.main",
"onCommand:projects.openExisting",
"onCommand:projects.new"
], ],
"main": "./out/main", "main": "./out/main",
"repository": { "repository": {
@@ -158,8 +160,7 @@
"id": "dataworkspace.views.main", "id": "dataworkspace.views.main",
"name": "%main-view-name%", "name": "%main-view-name%",
"contextualTitle": "%data-workspace-view-container-name%", "contextualTitle": "%data-workspace-view-container-name%",
"icon": "images/data-workspace.svg", "icon": "images/data-workspace.svg"
"when": "isProjectProviderAvailable"
} }
] ]
}, },

2
extensions/data-workspace/src/common/interfaces.ts
View File

@@ -85,8 +85,6 @@ export interface IWorkspaceService {
*/ */
gitCloneProject(url: string, localClonePath: string): Promise<void>; gitCloneProject(url: string, localClonePath: string): Promise<void>;
readonly isProjectProviderAvailable: boolean;
/** /**
* Event fires when projects in workspace changes * Event fires when projects in workspace changes
*/ */

12
extensions/data-workspace/src/main.ts
View File

@@ -10,7 +10,6 @@ import { WorkspaceTreeItem, IExtension } from 'dataworkspace';
import { DataWorkspaceExtension } from './common/dataWorkspaceExtension'; import { DataWorkspaceExtension } from './common/dataWorkspaceExtension';
import { NewProjectDialog } from './dialogs/newProjectDialog'; import { NewProjectDialog } from './dialogs/newProjectDialog';
import { browseForProject, OpenExistingDialog } from './dialogs/openExistingDialog'; import { browseForProject, OpenExistingDialog } from './dialogs/openExistingDialog';
import { IWorkspaceService } from './common/interfaces';
import { IconPathHelper } from './common/iconHelper'; import { IconPathHelper } from './common/iconHelper';
import { ProjectDashboard } from './dialogs/projectDashboard'; import { ProjectDashboard } from './dialogs/projectDashboard';
import { getAzdataApi } from './common/utils'; import { getAzdataApi } from './common/utils';
@@ -42,13 +41,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<IExten
const dataWorkspaceExtension = new DataWorkspaceExtension(workspaceService); const dataWorkspaceExtension = new DataWorkspaceExtension(workspaceService);
Logger.log(`DataWorkspaceExtension constructor took ${new Date().getTime() - dataWorkspaceExtensionStartTime}ms`); Logger.log(`DataWorkspaceExtension constructor took ${new Date().getTime() - dataWorkspaceExtensionStartTime}ms`);
const settingProjectProviderContextStartTime = new Date().getTime();
context.subscriptions.push(vscode.extensions.onDidChange(() => {
setProjectProviderContextValue(workspaceService);
}));
setProjectProviderContextValue(workspaceService);
Logger.log(`setProjectProviderContextValue took ${new Date().getTime() - settingProjectProviderContextStartTime}ms`);
const registerCommandStartTime = new Date().getTime(); const registerCommandStartTime = new Date().getTime();
context.subscriptions.push(vscode.commands.registerCommand('projects.new', async () => { context.subscriptions.push(vscode.commands.registerCommand('projects.new', async () => {
// Make sure all project providing extensions are activated to be sure the project templates show up // Make sure all project providing extensions are activated to be sure the project templates show up
@@ -105,9 +97,5 @@ export async function activate(context: vscode.ExtensionContext): Promise<IExten
return Promise.resolve(dataWorkspaceExtension); return Promise.resolve(dataWorkspaceExtension);
} }
function setProjectProviderContextValue(workspaceService: IWorkspaceService): void {
void vscode.commands.executeCommand('setContext', 'isProjectProviderAvailable', workspaceService.isProjectProviderAvailable);
}
export function deactivate(): void { export function deactivate(): void {
} }

15
extensions/data-workspace/src/services/workspaceService.ts
View File

@@ -31,21 +31,6 @@ export class WorkspaceService implements IWorkspaceService {
this.getProjectsInWorkspace(undefined, true).catch(err => Logger.error(`Error initializing projects in workspace ${err}`)); this.getProjectsInWorkspace(undefined, true).catch(err => Logger.error(`Error initializing projects in workspace ${err}`));
} }
get isProjectProviderAvailable(): boolean {
Logger.log(`Checking ${vscode.extensions.all.length} extensions to see if there is a project provider is available`);
const startTime = new Date().getTime();
for (const extension of vscode.extensions.all) {
const projectTypes = extension.packageJSON.contributes && extension.packageJSON.contributes.projects as string[];
if (projectTypes && projectTypes.length > 0) {
Logger.log(`Project provider found. Total time = ${new Date().getTime() - startTime}ms`);
return true;
}
}
Logger.log(`No project providers found. Total time = ${new Date().getTime() - startTime}ms`);
return false;
}
/** /**
* Verify that a workspace is open or that if one isn't and we're running in ADS, it's ok to create a workspace and restart ADS * Verify that a workspace is open or that if one isn't and we're running in ADS, it's ok to create a workspace and restart ADS
*/ */

3
extensions/sql-database-projects/package.json
View File

@@ -26,7 +26,8 @@
}, },
"extensionDependencies": [ "extensionDependencies": [
"Microsoft.mssql", "Microsoft.mssql",
"Microsoft.schema-compare" "Microsoft.schema-compare",
"Microsoft.data-workspace"
], ],
"capabilities": { "capabilities": {
"virtualWorkspaces": false, "virtualWorkspaces": false,

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

@@ -7,6 +7,9 @@ import * as should from 'should';
import * as azdata from 'azdata'; import * as azdata from 'azdata';
import * as mssql from 'mssql'; import * as mssql from 'mssql';
import * as sinon from 'sinon'; import * as sinon from 'sinon';
import * as utils from '../../common/utils'
import * as newProjectTool from '../../tools/newProjectTool';
import { CreateProjectFromDatabaseDialog } from '../../dialogs/createProjectFromDatabaseDialog'; import { CreateProjectFromDatabaseDialog } from '../../dialogs/createProjectFromDatabaseDialog';
import { mockConnectionProfile } from '../testContext'; import { mockConnectionProfile } from '../testContext';
import { ImportDataModel } from '../../models/api/import'; import { ImportDataModel } from '../../models/api/import';
@@ -18,7 +21,7 @@ describe('Create Project From Database Dialog', () => {
it('Should open dialog successfully', async function (): Promise<void> { it('Should open dialog successfully', async function (): Promise<void> {
sinon.stub(azdata.connection, 'getConnections').resolves([]); sinon.stub(azdata.connection, 'getConnections').resolves([]);
sinon.stub(azdata.connection, 'connect').resolves({ connected: true, connectionId: '0', errorMessage: '', errorCode: 0}); sinon.stub(azdata.connection, 'connect').resolves({ connected: true, connectionId: '0', errorMessage: '', errorCode: 0 });
sinon.stub(azdata.connection, 'listDatabases').resolves([]); sinon.stub(azdata.connection, 'listDatabases').resolves([]);
const dialog = new CreateProjectFromDatabaseDialog(mockConnectionProfile); const dialog = new CreateProjectFromDatabaseDialog(mockConnectionProfile);
await dialog.openDialog(); await dialog.openDialog();
@@ -27,7 +30,7 @@ describe('Create Project From Database Dialog', () => {
it('Should enable ok button correctly with a connection profile', async function (): Promise<void> { it('Should enable ok button correctly with a connection profile', async function (): Promise<void> {
sinon.stub(azdata.connection, 'getConnections').resolves([]); sinon.stub(azdata.connection, 'getConnections').resolves([]);
sinon.stub(azdata.connection, 'connect').resolves({ connected: true, connectionId: '0', errorMessage: '', errorCode: 0}); sinon.stub(azdata.connection, 'connect').resolves({ connected: true, connectionId: '0', errorMessage: '', errorCode: 0 });
sinon.stub(azdata.connection, 'listDatabases').resolves([]); sinon.stub(azdata.connection, 'listDatabases').resolves([]);
const dialog = new CreateProjectFromDatabaseDialog(mockConnectionProfile); const dialog = new CreateProjectFromDatabaseDialog(mockConnectionProfile);
await dialog.openDialog(); // should set connection details await dialog.openDialog(); // should set connection details
@@ -79,8 +82,10 @@ describe('Create Project From Database Dialog', () => {
it('Should create default project name correctly when database information is populated', async function (): Promise<void> { it('Should create default project name correctly when database information is populated', async function (): Promise<void> {
sinon.stub(azdata.connection, 'getConnections').resolves([]); sinon.stub(azdata.connection, 'getConnections').resolves([]);
sinon.stub(azdata.connection, 'connect').resolves({ connected: true, connectionId: '0', errorMessage: '', errorCode: 0}); sinon.stub(azdata.connection, 'connect').resolves({ connected: true, connectionId: '0', errorMessage: '', errorCode: 0 });
sinon.stub(azdata.connection, 'listDatabases').resolves(['My Database']); sinon.stub(azdata.connection, 'listDatabases').resolves(['My Database']);
sinon.stub(utils, 'sanitizeStringForFilename').returns('My Database');
sinon.stub(newProjectTool, 'defaultProjectNameFromDb').returns('DatabaseProjectMy Database');
const dialog = new CreateProjectFromDatabaseDialog(mockConnectionProfile); const dialog = new CreateProjectFromDatabaseDialog(mockConnectionProfile);
await dialog.openDialog(); await dialog.openDialog();
dialog.setProjectName(); dialog.setProjectName();
@@ -92,7 +97,7 @@ describe('Create Project From Database Dialog', () => {
const stubUri = 'My URI'; const stubUri = 'My URI';
const dialog = new CreateProjectFromDatabaseDialog(mockConnectionProfile); const dialog = new CreateProjectFromDatabaseDialog(mockConnectionProfile);
sinon.stub(azdata.connection, 'getConnections').resolves([]); sinon.stub(azdata.connection, 'getConnections').resolves([]);
sinon.stub(azdata.connection, 'connect').resolves({ connected: true, connectionId: '0', errorMessage: '', errorCode: 0}); sinon.stub(azdata.connection, 'connect').resolves({ connected: true, connectionId: '0', errorMessage: '', errorCode: 0 });
sinon.stub(azdata.connection, 'listDatabases').resolves(['My Database']); sinon.stub(azdata.connection, 'listDatabases').resolves(['My Database']);
sinon.stub(azdata.connection, 'getUriForConnection').resolves(stubUri); sinon.stub(azdata.connection, 'getUriForConnection').resolves(stubUri);
await dialog.openDialog(); await dialog.openDialog();

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

@@ -12,6 +12,7 @@ import * as constants from '../../common/constants';
import * as utils from '../../common/utils' import * as utils from '../../common/utils'
import * as quickpickHelper from '../../dialogs/quickpickHelper' import * as quickpickHelper from '../../dialogs/quickpickHelper'
import * as createProjectFromDatabaseQuickpick from '../../dialogs/createProjectFromDatabaseQuickpick'; import * as createProjectFromDatabaseQuickpick from '../../dialogs/createProjectFromDatabaseQuickpick';
import * as newProjectTool from '../../tools/newProjectTool';
import { createTestUtils, mockConnectionInfo, TestUtils } from './testUtils'; import { createTestUtils, mockConnectionInfo, TestUtils } from './testUtils';
import { promises as fs } from 'fs'; import { promises as fs } from 'fs';
import { ImportDataModel } from '../../models/api/import'; import { ImportDataModel } from '../../models/api/import';
@@ -25,6 +26,9 @@ describe('Create Project From Database Quickpick', () => {
beforeEach(function (): void { beforeEach(function (): void {
testUtils = createTestUtils(); testUtils = createTestUtils();
sinon.stub(utils, 'getVscodeMssqlApi').resolves(testUtils.vscodeMssqlIExtension.object); //set vscode mssql extension api sinon.stub(utils, 'getVscodeMssqlApi').resolves(testUtils.vscodeMssqlIExtension.object); //set vscode mssql extension api
sinon.stub(newProjectTool, 'defaultProjectSaveLocation').returns(undefined);
sinon.stub(newProjectTool, 'defaultProjectNameFromDb').returns('DatabaseProjectTestProject');
sinon.stub(utils, 'sanitizeStringForFilename').returns('TestProject');
}); });
afterEach(async function (): Promise<void> { afterEach(async function (): Promise<void> {

21
extensions/sql-database-projects/src/test/projectController.test.ts
View File

@@ -91,7 +91,8 @@ describe('ProjectsController', function (): void {
it('Should return silently when no SQL object name provided in prompts', async function (): Promise<void> { it('Should return silently when no SQL object name provided in prompts', async function (): Promise<void> {
for (const name of ['', ' ', undefined]) { for (const name of ['', ' ', undefined]) {
const showInputBoxStub = sinon.stub(vscode.window, 'showInputBox').resolves(name); sinon.stub(vscode.window, 'showInputBox').resolves(name);
sinon.stub(utils, 'sanitizeStringForFilename').returns('');
const showErrorMessageSpy = sinon.spy(vscode.window, 'showErrorMessage'); const showErrorMessageSpy = sinon.spy(vscode.window, 'showErrorMessage');
const projController = new ProjectsController(testContext.outputChannel); const projController = new ProjectsController(testContext.outputChannel);
const project = new Project('FakePath'); const project = new Project('FakePath');
@@ -100,14 +101,14 @@ describe('ProjectsController', function (): void {
await projController.addItemPrompt(new Project('FakePath'), '', { itemType: ItemType.script }); await projController.addItemPrompt(new Project('FakePath'), '', { itemType: ItemType.script });
should(project.files.length).equal(0, 'Expected to return without throwing an exception or adding a file when an empty/undefined name is provided.'); should(project.files.length).equal(0, 'Expected to return without throwing an exception or adding a file when an empty/undefined name is provided.');
should(showErrorMessageSpy.notCalled).be.true('showErrorMessage should not have been called'); should(showErrorMessageSpy.notCalled).be.true('showErrorMessage should not have been called');
showInputBoxStub.restore(); sinon.restore();
showErrorMessageSpy.restore();
} }
}); });
it('Should show error if trying to add a file that already exists', async function (): Promise<void> { it('Should show error if trying to add a file that already exists', async function (): Promise<void> {
const tableName = 'table1'; const tableName = 'table1';
sinon.stub(vscode.window, 'showInputBox').resolves(tableName); sinon.stub(vscode.window, 'showInputBox').resolves(tableName);
sinon.stub(utils, 'sanitizeStringForFilename').returns(tableName);
const spy = sinon.spy(vscode.window, 'showErrorMessage'); const spy = sinon.spy(vscode.window, 'showErrorMessage');
const projController = new ProjectsController(testContext.outputChannel); const projController = new ProjectsController(testContext.outputChannel);
let project = await testUtils.createTestProject(baselines.newProjectFileBaseline); let project = await testUtils.createTestProject(baselines.newProjectFileBaseline);
@@ -137,6 +138,7 @@ describe('ProjectsController', function (): void {
it('Should add existing item', async function (): Promise<void> { it('Should add existing item', async function (): Promise<void> {
const tableName = 'table1'; const tableName = 'table1';
sinon.stub(vscode.window, 'showInputBox').resolves(tableName); sinon.stub(vscode.window, 'showInputBox').resolves(tableName);
sinon.stub(utils, 'sanitizeStringForFilename').returns(tableName);
const spy = sinon.spy(vscode.window, 'showErrorMessage'); const spy = sinon.spy(vscode.window, 'showErrorMessage');
const projController = new ProjectsController(testContext.outputChannel); const projController = new ProjectsController(testContext.outputChannel);
let project = await testUtils.createTestProject(baselines.newProjectFileBaseline); let project = await testUtils.createTestProject(baselines.newProjectFileBaseline);
@@ -166,6 +168,7 @@ describe('ProjectsController', function (): void {
it('Should show error if trying to add a folder that already exists', async function (): Promise<void> { it('Should show error if trying to add a folder that already exists', async function (): Promise<void> {
const folderName = 'folder1'; const folderName = 'folder1';
const stub = sinon.stub(vscode.window, 'showInputBox').resolves(folderName); const stub = sinon.stub(vscode.window, 'showInputBox').resolves(folderName);
sinon.stub(utils, 'sanitizeStringForFilename').returns(folderName);
const projController = new ProjectsController(testContext.outputChannel); const projController = new ProjectsController(testContext.outputChannel);
let project = await testUtils.createTestProject(baselines.newProjectFileBaseline); let project = await testUtils.createTestProject(baselines.newProjectFileBaseline);
@@ -189,7 +192,8 @@ describe('ProjectsController', function (): void {
it('Should be able to add folder with reserved name as long as not at project root', async function (): Promise<void> { it('Should be able to add folder with reserved name as long as not at project root', async function (): Promise<void> {
const folderName = 'folder1'; const folderName = 'folder1';
const stub = sinon.stub(vscode.window, 'showInputBox').resolves(folderName); sinon.stub(vscode.window, 'showInputBox').resolves(folderName);
sinon.stub(utils, 'sanitizeStringForFilename').returns(folderName);
const projController = new ProjectsController(testContext.outputChannel); const projController = new ProjectsController(testContext.outputChannel);
let project = await testUtils.createTestProject(baselines.openProjectFileBaseline); let project = await testUtils.createTestProject(baselines.openProjectFileBaseline);
@@ -197,7 +201,7 @@ describe('ProjectsController', function (): void {
// make sure it's ok to add these folders if they aren't where the reserved folders are at the root of the project // make sure it's ok to add these folders if they aren't where the reserved folders are at the root of the project
let node = projectRoot.children.find(c => c.friendlyName === 'Tables'); let node = projectRoot.children.find(c => c.friendlyName === 'Tables');
stub.restore(); sinon.restore();
for (let i in reservedProjectFolders) { for (let i in reservedProjectFolders) {
// reload project // reload project
project = await Project.openProject(project.projectFilePath); project = await Project.openProject(project.projectFilePath);
@@ -208,13 +212,14 @@ describe('ProjectsController', function (): void {
async function verifyFolderAdded(folderName: string, projController: ProjectsController, project: Project, node: BaseProjectTreeItem): Promise<void> { async function verifyFolderAdded(folderName: string, projController: ProjectsController, project: Project, node: BaseProjectTreeItem): Promise<void> {
const beforeFileCount = project.files.length; const beforeFileCount = project.files.length;
let beforeFiles = project.files.map(f => f.relativePath); let beforeFiles = project.files.map(f => f.relativePath);
const stub = sinon.stub(vscode.window, 'showInputBox').resolves(folderName); sinon.stub(vscode.window, 'showInputBox').resolves(folderName);
sinon.stub(utils, 'sanitizeStringForFilename').returns(folderName);
await projController.addFolderPrompt(createWorkspaceTreeItem(node)); await projController.addFolderPrompt(createWorkspaceTreeItem(node));
// reload project // reload project
project = await Project.openProject(project.projectFilePath); project = await Project.openProject(project.projectFilePath);
should(project.files.length).equal(beforeFileCount + 1, `File count should be increased by one after adding the folder ${folderName}. before files: ${JSON.stringify(beforeFiles)}/n after files: ${JSON.stringify(project.files.map(f => f.relativePath))}`); should(project.files.length).equal(beforeFileCount + 1, `File count should be increased by one after adding the folder ${folderName}. before files: ${JSON.stringify(beforeFiles)}/n after files: ${JSON.stringify(project.files.map(f => f.relativePath))}`);
stub.restore(); sinon.restore();
} }
async function verifyFolderNotAdded(folderName: string, projController: ProjectsController, project: Project, node: BaseProjectTreeItem): Promise<void> { async function verifyFolderNotAdded(folderName: string, projController: ProjectsController, project: Project, node: BaseProjectTreeItem): Promise<void> {
@@ -386,12 +391,14 @@ describe('ProjectsController', function (): void {
const project = await testUtils.createTestProject(baselines.newProjectFileBaseline); const project = await testUtils.createTestProject(baselines.newProjectFileBaseline);
sinon.stub(vscode.window, 'showInputBox').resolves(preDeployScriptName); sinon.stub(vscode.window, 'showInputBox').resolves(preDeployScriptName);
sinon.stub(utils, 'sanitizeStringForFilename').returns(preDeployScriptName);
should(project.preDeployScripts.length).equal(0, 'There should be no pre deploy scripts'); should(project.preDeployScripts.length).equal(0, 'There should be no pre deploy scripts');
await projController.addItemPrompt(project, '', { itemType: ItemType.preDeployScript }); await projController.addItemPrompt(project, '', { itemType: ItemType.preDeployScript });
should(project.preDeployScripts.length).equal(1, `Pre deploy script should be successfully added. ${project.preDeployScripts.length}, ${project.files.length}`); should(project.preDeployScripts.length).equal(1, `Pre deploy script should be successfully added. ${project.preDeployScripts.length}, ${project.files.length}`);
sinon.restore(); sinon.restore();
sinon.stub(vscode.window, 'showInputBox').resolves(postDeployScriptName); sinon.stub(vscode.window, 'showInputBox').resolves(postDeployScriptName);
sinon.stub(utils, 'sanitizeStringForFilename').returns(postDeployScriptName);
should(project.postDeployScripts.length).equal(0, 'There should be no post deploy scripts'); should(project.postDeployScripts.length).equal(0, 'There should be no post deploy scripts');
await projController.addItemPrompt(project, '', { itemType: ItemType.postDeployScript }); await projController.addItemPrompt(project, '', { itemType: ItemType.postDeployScript });
should(project.postDeployScripts.length).equal(1, 'Post deploy script should be successfully added'); should(project.postDeployScripts.length).equal(1, 'Post deploy script should be successfully added');