ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-16 09:35:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Data workspace projects changes (#13466)

Browse Source 
* Fix project context menu actions (#12541)

* delete works again

* make fewer changes

* update all sql db project commands

* cleanup

* Remove old projects view (#12563)

* remove old projects view from file explorer view

* fix tests failing

* remove projects in open folder opening up in old view

* Update db reference dialog to show projects in the workspace (#12580)

* update database reference dialog to show projects in the workspace in the project dropdown

* remove workspace stuff from sql projects extension

* undo change

* add class that implements IExtension

* undo a change

* update DataWorkspaceExtension to take workspaceService as a parameter

* add type

* Update sql database project commands (#12595)

* remove sql proj's open and create new project from comman palette

* hook up create project from database to data workspace

* rename the remaining import databases to create project from database

* remove open, new, and close commands

* expose addProjectsToWorkspace() in IExtension instead of calling command

* Addressing comments

* fix failing sql project tests (#12651)

* update SSDT projects opened in projects viewlet (#12669)

* fix action not refreshing the tree issue (#12692)

* fix adding project references in new projects viewlet (#12688)

* Remove old projects tree provider (#12702)

* Remove old projects tree provider and fix tests

* formatting

* update refreshProjectsTree() to accept workspaceTreeItem()

* Cleanup ProjectsController (#12718)

* remove openProject from ProjectController and some cleanup

* rename

* add project and open project dialogs (#12729)

* empty dialogs

* wip

* new project dialog implementation

* revert gitattributes

* open project dialog

* implement add project

* remove icon helper

* refactor

* revert script change

* adjust views

* more updates

* make data-workspace a builtin extension

* show the view only when project provider is detected (#12819)

* only show the view when proj provider is available

* update

* fix sql project tests after merge (#12793)

* Update dialogs to be closer to mockups (#12879)

* small UI changes to dialogs

* center radio card group text

* Create workspace if needed when opening/new project (#12930)

* empty dialogs

* wip

* new project dialog implementation

* revert gitattributes

* open project dialog

* implement add project

* remove icon helper

* refactor

* revert script change

* create workspace

* initial changes

* create new workspace working

* fix tests

* cleanup

* remove showWorkspaceRequiredNotification()

* Add test for no workspace open

* update blue buttons

* move loading temp project to activate() instead of workspaceService constructor

* move workspace creation warning message to before project is created

* pass uri to createWorkspace

* add tests

Co-authored-by: Alan Ren <alanren@microsoft.com>

* Additional create workspace changes (#13004)

* Dialogs workspace updates (#13010)

* adding workspace text boxes

* match new project dialog to mockups

* Add validation error message for workspace file

* add enterWorkspace api

* add warning message for opening workspace

* cleanup

* update commands to remove project so they're more generic

* remove 'empty' from string

* Move default project location setting to data workspace extension (#13022)

* remove project location setting and notification from sql database projects extension

* add default project location setting to data workspace extension

* fix typo

* Add back project name incrementing

* other merge fixes

* fix strings from other PR

* default to last opened directory instead of home directory if no specified default location

* A few small updates (#13092)

* fix build error

* update title for inputboxes

* add missing file

* Add tests for data workspace dialogs (#13324)

* add tests for dialogs

* create helper functions

* New project dialog workspace inputbox fixes (#13407)

* workspace inputbox fixes

* fix folder icons

* Update package.jsons and readme (#13451)

* update package.jsons

* update readme

* add workspace information to open existing dialog (#13455)

Co-authored-by: Alan Ren <alanren@microsoft.com>
This commit is contained in:
Kim Santiago
2020-11-18 16:13:43 -08:00
committed by GitHub
parent 34170e7741
commit ddc8c00090
63 changed files with 1835 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
extensions/sql-database-projects/src/tools/newProjectTool.ts
View File

@@ -5,24 +5,17 @@
import * as vscode from 'vscode';
import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import * as os from 'os';
import * as constants from '../common/constants';
/**
* Sets workspace setting on the default save location to the user's home directory
*/
export async function initializeSaveLocationSetting() {
if (!projectSaveLocationSettingExists()) {
await config().update(constants.projectSaveLocationKey, os.homedir(), true);
}
}
import * as utils from '../common/utils';
/**
* Returns the default location to save a new database project
*/
export function defaultProjectSaveLocation(): vscode.Uri {
return projectSaveLocationSettingIsValid() ? vscode.Uri.file(projectSaveLocationSetting()) : vscode.Uri.file(os.homedir());
export function defaultProjectSaveLocation(): vscode.Uri | undefined {
const workspaceApi = utils.getDataWorkspaceExtensionApi();
return workspaceApi.defaultProjectSaveLocation;
}
/**
@@ -41,7 +34,8 @@ export function defaultProjectNameNewProj(): string {
*/
export function defaultProjectNameFromDb(dbName: string): string {
const projectNameStarter = constants.defaultProjectNameStarter + dbName;
const projectPath: string = path.join(defaultProjectSaveLocation().fsPath, projectNameStarter);
const defaultLocation = defaultProjectSaveLocation() ?? vscode.Uri.file(os.homedir());
const projectPath: string = path.join(defaultLocation.fsPath, projectNameStarter);
if (!fs.existsSync(projectPath)) {
return projectNameStarter;
}
@@ -49,58 +43,6 @@ export function defaultProjectNameFromDb(dbName: string): string {
return defaultProjectName(projectNameStarter, 2);
}
/**
* Prompts user to update workspace settings
*/
export async function updateSaveLocationSetting(): Promise<void> {
const showPrompt: boolean = config()[constants.showUpdatePromptKey];
if (showPrompt) {
const openSettingsMessage = projectSaveLocationSettingIsValid() ?
constants.newDefaultProjectSaveLocation : constants.invalidDefaultProjectSaveLocation;
const result = await vscode.window.showInformationMessage(openSettingsMessage, constants.openWorkspaceSettings,
constants.doNotPromptAgain);
if (result === constants.openWorkspaceSettings || result === constants.doNotPromptAgain) {
// if user either opens settings or clicks "don't ask again", do not prompt for save location again
await config().update(constants.showUpdatePromptKey, false, true);
if (result === constants.openWorkspaceSettings) {
await vscode.commands.executeCommand('workbench.action.openGlobalSettings'); //open settings
}
}
}
}
/**
* Get workspace configurations for this extension
*/
function config(): vscode.WorkspaceConfiguration {
return vscode.workspace.getConfiguration(constants.dbProjectConfigurationKey);
}
/**
* Returns the workspace setting on the default location to save new database projects
*/
function projectSaveLocationSetting(): string {
return config()[constants.projectSaveLocationKey];
}
/**
* Returns if the default save location for new database projects workspace setting exists and is
* a valid path
*/
function projectSaveLocationSettingIsValid(): boolean {
return projectSaveLocationSettingExists() && fs.existsSync(projectSaveLocationSetting());
}
/**
* Returns if a value for the default save location for new database projects exists
*/
function projectSaveLocationSettingExists(): boolean {
return projectSaveLocationSetting() !== undefined && projectSaveLocationSetting() !== null
&& projectSaveLocationSetting().trim() !== '';
}
/**
* Returns a project name that begins with the given nameStarter, and ends in a number, such as
* 'DatabaseProject1'. Number begins at the given counter, but auto-increments if a project of
@@ -112,7 +54,8 @@ function projectSaveLocationSettingExists(): boolean {
function defaultProjectName(nameStarter: string, counter: number): string {
while (counter < Number.MAX_SAFE_INTEGER) {
const name: string = nameStarter + counter;
const projectPath: string = path.join(defaultProjectSaveLocation().fsPath, name);
const defaultLocation = defaultProjectSaveLocation() ?? vscode.Uri.file(os.homedir());
const projectPath: string = path.join(defaultLocation.fsPath, name);
if (!fs.existsSync(projectPath)) {
return name;
}