mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-13 03:28:33 -05:00
[Port] [SQL Migration] Bug fixes for new feature SKU Recommendation in migration extension (#18449)
* Bump follow-redirects in /extensions/resource-deployment (#18349) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * LEGO: check in for main to temporary branch. (#18347) Co-authored-by: Alex Ma <alma1@microsoft.com> * [Loc] update to sql.xlf and sql-migration (#18352) * Bump follow-redirects in /extensions/github-authentication (#18348) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump follow-redirects from 1.14.7 to 1.14.8 in /extensions/azurecore (#18350) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ajv from 6.12.0 to 6.12.6 in /extensions/mssql (#18316) Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.12.0 to 6.12.6. - [Release notes](https://github.com/ajv-validator/ajv/releases) - [Commits](https://github.com/ajv-validator/ajv/compare/v6.12.0...v6.12.6) --- updated-dependencies: - dependency-name: ajv dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Database Projects - Add existing file (#18066) * Add existing file to sqlproj * Address PR comments * Fix failing test * Add convertSlashesForSqlProj to test failure * Using proper zoom icon (#18338) * Bump ansi_up (#18190) * Fixing graph editing (#18361) * Update to langpacks and xlfs for February Release, (#18354) * Update to langpacks and xlfs * fixed id for git * Added small fix for locFunc (#18364) * Small update to the changelog (#18369) * [Loc] small update to sql-database-projects xlf (#18396) * azdataGraph version bump to 0.0.15 (#18388) * azdataGraph version bump to 0.0.15 * Updates azdataGraph version in remote package.json * Updates azdataGraph version in remote web package.json * Adding tooltips and fixing spacing (#18400) * avoid auto language detection for sql editor (#18402) * avoid auto lang detection for sql editor * update comment * fix SDK style projects not being able to find system dacpacs (#18218) * fix SDK style projects not being able to find system dacpacs * fix tests * LEGO: check in for main to temporary branch. (#18417) * LEGO: check in for main to temporary branch. (#18419) * Bump url-parse (#18422) * make sure the content is not undefined (#18406) * [SKU Recommendation] Adding telemetry for errors happening during data collection/ get recommendation and telemetry (#18345) * Adding telemetry for errors happening during data collection/ telemetry for sku recommendation * log and error happended during get sku recommendation * Resolving comments from PR https://github.com/microsoft/azuredatastudio/pull/18252. 1) Adding click and close events to dispoable collection to avoid leaks. 2) Adding readable constant for number representing minutes. * Changes - 1) updating migration workflow strings, 2) adding more onclick events to disposable collection. * Remove PaaS, IaaS terms from string * Changes - 1) Renamed 'Saved assessment result' to 'saved session'. 2) Removed Title from 'saved session' page. 3) Added stop data collection on migration start. * Fixing context menu strings (#18404) * Fixing context menu strings * Fixing string * Adding zoom button (#18407) * Adding zoom button * Fixing string * Fixing the height of the query plan (#18409) * Fixing the height of the query plan * Fixing layout issues * Fix on click edit mode states (#18321) * fix click code cell * modified editmode when updating active cell * Updating readme with new gif that includes SKU Recommendation (#18432) * Fix contributed icons for ModelView trees not showing (#18430) * Fix contributed icons for ModelView trees not showing * Use asCssUrl * Fixed color contrast for error message in connect a dc window. (#18411) * Fixed color contrast for error message in connect a dc window. * Remove color check for error message * Remove more unneeded checks Co-authored-by: Charles Gagnon <chgagnon@microsoft.com> * fix holding down key scrolling issue (#18322) * Stop propagation + debounce scroll Co-authored-by: chgagnon <chgagnon@microsoft.com> * LEGO: check in for main to temporary branch. (#18443) * Adds Operational Cost to Query Plan Vertex Labels. (#18435) * Adds operational cost to graph node labels. * Code clean up. Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: csigs <csigs@users.noreply.github.com> Co-authored-by: Alex Ma <alma1@microsoft.com> Co-authored-by: Z Chen <13544267+zijchen@users.noreply.github.com> Co-authored-by: Aasim Khan <aasimkhan30@gmail.com> Co-authored-by: Charles Gagnon <chgagnon@microsoft.com> Co-authored-by: Lewis Sanchez <87730006+lewis-sanchez@users.noreply.github.com> Co-authored-by: Alan Ren <alanren@microsoft.com> Co-authored-by: Kim Santiago <31145923+kisantia@users.noreply.github.com> Co-authored-by: Barbara Valdez <34872381+barbaravaldez@users.noreply.github.com> Co-authored-by: Candice Ye <candiceye@berkeley.edu>
This commit is contained in:
@@ -19,8 +19,8 @@ export function WIZARD_TITLE(instanceName: string): string {
|
||||
|
||||
// Resume Migration Dialog
|
||||
export const RESUME_TITLE = localize('sql.migration.resume.title', "Run migration workflow again");
|
||||
export const START_MIGRATION = localize('sql.migration.resume.start', "Start with migration assessment again (recommended)");
|
||||
export const CONTINUE_MIGRATION = localize('sql.migration.resume.continue', "Continue last migration attempt...");
|
||||
export const START_MIGRATION = localize('sql.migration.resume.start', "Start a new session");
|
||||
export const CONTINUE_MIGRATION = localize('sql.migration.resume.continue', "Resume previously saved session");
|
||||
|
||||
// Databases for assessment
|
||||
export const DATABASE_FOR_ASSESSMENT_PAGE_TITLE = localize('sql.migration.database.assessment.title', "Databases for assessment");
|
||||
@@ -63,13 +63,13 @@ export const REFRESH_ASSESSMENT_BUTTON_LABEL = localize('sql.migration.refresh.a
|
||||
export const SKU_RECOMMENDATION_CHOOSE_A_TARGET = localize('sql.migration.wizard.sku.choose_a_target', "Choose your Azure SQL target");
|
||||
|
||||
|
||||
export const SKU_RECOMMENDATION_MI_CARD_TEXT = localize('sql.migration.sku.mi.card.title', "Azure SQL Managed Instance (PaaS)");
|
||||
export const SKU_RECOMMENDATION_DB_CARD_TEXT = localize('sql.migration.sku.db.card.title', "Azure SQL Database (PaaS)");
|
||||
export const SKU_RECOMMENDATION_VM_CARD_TEXT = localize('sql.migration.sku.vm.card.title', "SQL Server on Azure Virtual Machine (IaaS)");
|
||||
export const SKU_RECOMMENDATION_MI_CARD_TEXT = localize('sql.migration.sku.mi.card.title', "Azure SQL Managed Instance");
|
||||
export const SKU_RECOMMENDATION_DB_CARD_TEXT = localize('sql.migration.sku.db.card.title', "Azure SQL Database");
|
||||
export const SKU_RECOMMENDATION_VM_CARD_TEXT = localize('sql.migration.sku.vm.card.title', "SQL Server on Azure Virtual Machine");
|
||||
export const SELECT_AZURE_MI = localize('sql.migration.select.azure.mi', "Select your target Azure subscription and your target Azure SQL Managed Instance.");
|
||||
export const SELECT_AZURE_VM = localize('sql.migration.select.azure.vm', "Select your target Azure Subscription and your target SQL Server on Azure Virtual Machine for your target.");
|
||||
export const SKU_RECOMMENDATION_VIEW_ASSESSMENT_MI = localize('sql.migration.sku.recommendation.view.assessment.mi', "To migrate to Azure SQL Managed Instance (PaaS), view assessment results and select one or more databases.");
|
||||
export const SKU_RECOMMENDATION_VIEW_ASSESSMENT_VM = localize('sql.migration.sku.recommendation.view.assessment.vm', "To migrate to SQL Server on Azure Virtual Machine (IaaS), view assessment results and select one or more databases.");
|
||||
export const SKU_RECOMMENDATION_VIEW_ASSESSMENT_MI = localize('sql.migration.sku.recommendation.view.assessment.mi', "To migrate to Azure SQL Managed Instance, view assessment results and select one or more databases.");
|
||||
export const SKU_RECOMMENDATION_VIEW_ASSESSMENT_VM = localize('sql.migration.sku.recommendation.view.assessment.vm', "To migrate to SQL Server on Azure Virtual Machine, view assessment results and select one or more databases.");
|
||||
export const VIEW_SELECT_BUTTON_LABEL = localize('sql.migration.view.select.button.label', "View/Select");
|
||||
export function TOTAL_DATABASES_SELECTED(selectedDbCount: number, totalDbCount: number): string {
|
||||
return localize('total.databases.selected', "{0} of {1} databases selected", selectedDbCount, totalDbCount);
|
||||
@@ -232,6 +232,9 @@ export const EMPTY_TIME = localize('sql.migration.sku.recommendations.empty.time
|
||||
export function LAST_REFRESHED_TIME(d: string = EMPTY_TIME): string {
|
||||
return localize('sql.migration.sku.recommendations.lastRefreshed', "Last refreshed: {0}", d);
|
||||
}
|
||||
export function TIME_IN_MINUTES(val: number): number {
|
||||
return val * 60000;
|
||||
}
|
||||
|
||||
// Azure SQL Target
|
||||
export const AZURE_SQL_TARGET_PAGE_TITLE = localize('sql.migration.wizard.target.title', "Azure SQL target");
|
||||
@@ -721,7 +724,7 @@ export const REFRESH_BUTTON_LABEL = localize('sql.migration.status.refresh.label
|
||||
// Saved Assessment Dialog
|
||||
export const NEXT_LABEL = localize('sql.migration.saved.assessment.next', "Next");
|
||||
export const CANCEL_LABEL = localize('sql.migration.saved.assessment.cancel', "Cancel");
|
||||
export const SAVED_ASSESSMENT_RESULT = localize('sql.migration.saved.assessment.result', "Saved assessment result");
|
||||
export const SAVED_ASSESSMENT_RESULT = localize('sql.migration.saved.assessment.result', "Saved session");
|
||||
|
||||
// Retry Migration
|
||||
export const MIGRATION_CANNOT_RETRY = localize('sql.migration.cannot.retry', 'Migration cannot be retried.');
|
||||
|
||||
Reference in New Issue
Block a user