From 5b70fd1afeeb975be189acd8ea3c9dbe3373e05d Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Mon, 31 Jul 2023 10:17:43 -0700 Subject: [PATCH] More layering movement (#24023) * finish layering * undo eslint changes * undo * restore -> backup * fix paths * Skip commandLine layers check * fix path * fix tsec path --- .eslintrc.json | 1 - build/lib/layersChecker.js | 12 ++- build/lib/layersChecker.ts | 11 ++- .../clipboardService.ts | 0 .../browser}/editableDropdown.component.ts | 0 .../test/common/testErrorMessageService.ts | 5 -- .../browser}/inputBox.component.ts | 0 .../sqlOAuthServiceImpl.ts | 0 .../browser}/selectBox.component.ts | 0 .../{ => workspace}/common/pathUtilities.ts | 0 .../common => common/backup}/constants.ts | 0 .../backup/browser/backup.component.ts | 2 +- .../contrib/charts/browser/actions.ts | 2 +- .../contrib/charts/browser/chartOptions.ts | 2 +- .../contrib/charts/browser/chartView.ts | 2 +- .../contrib/charts/browser/countInsight.ts | 2 +- .../contrib/charts/browser/graphInsight.ts | 2 +- .../contrib/charts/browser/imageInsight.ts | 2 +- .../contrib/charts/browser/insight.ts | 2 +- .../contrib/charts/browser/interfaces.ts | 72 ++++++++++++++++- .../contrib/charts/browser/tableInsight.ts | 2 +- .../contrib/charts/common/interfaces.ts | 76 ------------------ .../commandLine.contribution.ts | 2 +- .../commandLine.ts | 0 .../test/electron-browser/commandLine.test.ts | 2 +- .../dashboard/browser/dashboard.module.ts | 6 +- .../views/charts/chartInsight.component.ts | 2 +- .../insights/views/charts/interfaces.ts | 2 +- .../views/charts/types/barChart.component.ts | 2 +- .../charts/types/doughnutChart.component.ts | 2 +- .../types/horizontalBarChart.component.ts | 2 +- .../views/charts/types/lineChart.component.ts | 2 +- .../views/charts/types/pieChart.component.ts | 2 +- .../charts/types/scatterChart.component.ts | 2 +- .../charts/types/timeSeriesChart.component.ts | 2 +- .../notebook/browser/notebook.module.ts | 6 +- .../modelViewTab/queryModelViewTab.module.ts | 6 +- .../browser/telemetryOptOut.contribution.ts | 2 +- .../browser/telemetryOptOut.ts | 0 .../telemetryOptOut.contribution.ts | 2 +- .../electron-sandbox/telemetryOptOut.ts | 2 +- .../browser/abstractEnablePreviewFeatures.ts | 0 .../browser/az_data_welcome_page.ts | 4 +- .../browser/enablePreviewFeatures.ts | 2 +- .../browser/gettingStarted.contribution.ts | 2 +- .../{page => }/browser/gettingStartedTour.css | 0 .../{page => }/browser/gettingStartedTour.ts | 0 .../browser/welcomePage.contribution.ts | 2 +- .../{page => }/browser/welcomePage.css | 42 +++++----- .../welcome/{page => }/browser/welcomePage.ts | 20 ++--- .../workbench/contrib/welcome/constants.ts | 7 -- .../enablePreviewFeatures.ts | 2 +- .../gettingStarted.contribution.ts | 4 +- .../gettingStarted.ts | 0 .../gettingStarted/media/serverIcon.svg | 10 --- .../media/connections.png | Bin .../media/diamondIcon.svg | 0 .../{gettingStarted => }/media/extensions.png | Bin .../{gettingStarted => }/media/notebooks.png | Bin .../{gettingStarted => }/media/settings.png | Bin .../{gettingStarted => }/media/welcome.png | Bin .../page/browser/media/connections.png | Bin 30825 -> 0 bytes .../{ => common}/assessmentService.test.ts | 0 .../services/dialog/browser/dialog.module.ts | 6 +- .../services/query/common/resultSerializer.ts | 2 +- .../services/restore/browser/restoreDialog.ts | 2 +- .../restore/browser/restoreViewModel.ts | 2 +- .../restore/common/mssqlRestoreInfo.ts | 2 +- src/tsec.exemptions.json | 2 +- src/vs/workbench/workbench.common.main.ts | 2 +- src/vs/workbench/workbench.desktop.main.ts | 10 +-- src/vs/workbench/workbench.web.main.ts | 4 +- 72 files changed, 178 insertions(+), 190 deletions(-) rename src/sql/platform/clipboard/{electron-browser => electron-sandbox}/clipboardService.ts (100%) rename src/sql/platform/{browser/editableDropdown => editableDropdown/browser}/editableDropdown.component.ts (100%) rename src/sql/platform/{browser/inputbox => inputBox/browser}/inputBox.component.ts (100%) rename src/sql/platform/oAuth/{electron-browser => electron-sandbox}/sqlOAuthServiceImpl.ts (100%) rename src/sql/platform/{browser/selectBox => selectBox/browser}/selectBox.component.ts (100%) rename src/sql/platform/{ => workspace}/common/pathUtilities.ts (100%) rename src/sql/workbench/{contrib/backup/common => common/backup}/constants.ts (100%) delete mode 100644 src/sql/workbench/contrib/charts/common/interfaces.ts rename src/sql/workbench/contrib/commandLine/{electron-browser => electron-sandbox}/commandLine.contribution.ts (94%) rename src/sql/workbench/contrib/commandLine/{electron-browser => electron-sandbox}/commandLine.ts (100%) rename src/sql/workbench/contrib/{welcome/telemetryOptOut => telemetry}/browser/telemetryOptOut.contribution.ts (87%) rename src/sql/workbench/contrib/{welcome/telemetryOptOut => telemetry}/browser/telemetryOptOut.ts (100%) rename src/sql/workbench/contrib/{welcome/telemetryOptOut => telemetry}/electron-sandbox/telemetryOptOut.contribution.ts (86%) rename src/sql/workbench/contrib/{welcome/telemetryOptOut => telemetry}/electron-sandbox/telemetryOptOut.ts (94%) rename src/sql/workbench/contrib/welcome/{gettingStarted => }/browser/abstractEnablePreviewFeatures.ts (100%) rename src/sql/workbench/contrib/welcome/{page => }/browser/az_data_welcome_page.ts (97%) rename src/sql/workbench/contrib/welcome/{gettingStarted => }/browser/enablePreviewFeatures.ts (94%) rename src/sql/workbench/contrib/welcome/{gettingStarted => }/browser/gettingStarted.contribution.ts (93%) rename src/sql/workbench/contrib/welcome/{page => }/browser/gettingStartedTour.css (100%) rename src/sql/workbench/contrib/welcome/{page => }/browser/gettingStartedTour.ts (100%) rename src/sql/workbench/contrib/welcome/{page => }/browser/welcomePage.contribution.ts (98%) rename src/sql/workbench/contrib/welcome/{page => }/browser/welcomePage.css (95%) rename src/sql/workbench/contrib/welcome/{page => }/browser/welcomePage.ts (97%) delete mode 100644 src/sql/workbench/contrib/welcome/constants.ts rename src/sql/workbench/contrib/welcome/{gettingStarted/electron-browser => electron-sandbox}/enablePreviewFeatures.ts (95%) rename src/sql/workbench/contrib/welcome/{gettingStarted/electron-browser => electron-sandbox}/gettingStarted.contribution.ts (89%) rename src/sql/workbench/contrib/welcome/{gettingStarted/electron-browser => electron-sandbox}/gettingStarted.ts (100%) delete mode 100644 src/sql/workbench/contrib/welcome/gettingStarted/media/serverIcon.svg rename src/sql/workbench/contrib/welcome/{gettingStarted => }/media/connections.png (100%) rename src/sql/workbench/contrib/welcome/{gettingStarted => }/media/diamondIcon.svg (100%) rename src/sql/workbench/contrib/welcome/{gettingStarted => }/media/extensions.png (100%) rename src/sql/workbench/contrib/welcome/{gettingStarted => }/media/notebooks.png (100%) rename src/sql/workbench/contrib/welcome/{gettingStarted => }/media/settings.png (100%) rename src/sql/workbench/contrib/welcome/{gettingStarted => }/media/welcome.png (100%) delete mode 100644 src/sql/workbench/contrib/welcome/page/browser/media/connections.png rename src/sql/workbench/services/assessment/test/{ => common}/assessmentService.test.ts (100%) diff --git a/.eslintrc.json b/.eslintrc.json index 045929033b..faaf1a9262 100755 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1599,4 +1599,3 @@ } ] } - diff --git a/build/lib/layersChecker.js b/build/lib/layersChecker.js index 171f795334..91f71218dd 100644 --- a/build/lib/layersChecker.js +++ b/build/lib/layersChecker.js @@ -180,12 +180,20 @@ const RULES = [ }, // Electron (sandbox) { - target: '**/{vs,sql}/**/electron-sandbox/**', + target: '**/{vs,sql}/**/electron-sandbox/**/!(commandLine.ts)', allowedTypes: CORE_TYPES, disallowedDefinitions: [ '@types/node' // no node.js ] }, + // {{SQL CARBON TODO}} chgagnon investigate the use of querystring + { + target: '**/{vs,sql}/**/electron-sandbox/commandLine.ts', + allowedTypes: [ + ...CORE_TYPES, + '@types/node' + ] + }, // Electron (renderer): skip { target: '**/{vs,sql}/**/electron-browser/**', @@ -293,4 +301,4 @@ for (const sourceFile of program.getSourceFiles()) { if (hasErrors) { process.exit(1); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"layersChecker.js","sourceRoot":"","sources":["layersChecker.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;AAEhG,iCAAiC;AACjC,2BAA8C;AAC9C,+BAA8C;AAC9C,yCAAkC;AAElC,EAAE;AACF,gGAAgG;AAChG,EAAE;AACF,+FAA+F;AAC/F,mDAAmD;AACnD,4EAA4E;AAC5E,iEAAiE;AACjE,EAAE;AACF,gGAAgG;AAChG,EAAE;AACF,gGAAgG;AAChG,EAAE;AAEF,mFAAmF;AACnF,wFAAwF;AACxF,MAAM,UAAU,GAAG;IAClB,SAAS;IACT,YAAY;IACZ,cAAc;IACd,aAAa;IACb,eAAe;IACf,SAAS;IACT,SAAS;IACT,OAAO;IACP,kBAAkB;IAClB,QAAQ;IACR,aAAa;IACb,aAAa;IACb,MAAM;IACN,gBAAgB;IAChB,OAAO;IACP,YAAY;IACZ,aAAa;IACb,aAAa;IACb,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,cAAc;IACd,cAAc;IACd,mBAAmB;IACnB,gBAAgB;IAChB,eAAe;IACf,MAAM;IACN,MAAM;IACN,iBAAiB;IACjB,aAAa;IACb,gBAAgB;IAChB,aAAa;IACb,KAAK;IACL,iBAAiB;IACjB,eAAe;CACf,CAAC;AAEF,oEAAoE;AACpE,oEAAoE;AACpE,MAAM,YAAY,GAAG;IACpB,kBAAkB;IAClB,2BAA2B;IAC3B,kCAAkC;IAClC,4BAA4B;IAC5B,0BAA0B;IAC1B,oBAAoB;IACpB,qBAAqB;CACrB,CAAC;AAEF,MAAM,KAAK,GAAY;IAEtB,cAAc;IACd;QACC,MAAM,EAAE,wBAAwB;QAChC,IAAI,EAAE,IAAI,CAAC,yBAAyB;KACpC;IAED,kEAAkE;IAClE;QACC,MAAM,EAAE,yFAAyF;QACjG,IAAI,EAAE,IAAI;KACV;IAED,qCAAqC;IACrC;QACC,MAAM,EAAE,qCAAqC;QAC7C,YAAY,EAAE;YACb,GAAG,UAAU;YAEb,2CAA2C;YAC3C,cAAc;SACd;QACD,eAAe,EAAE,YAAY;QAC7B,qBAAqB,EAAE;YACtB,cAAc;YACd,aAAa,CAAC,aAAa;SAC3B;KACD;IAED,2CAA2C;IAC3C;QACC,MAAM,EAAE,8CAA8C;QACtD,YAAY,EAAE,UAAU;QACxB,eAAe,EAAE,EAAC,oDAAoD,CAAC;QACvE,qBAAqB,EAAE;YACtB,cAAc;YACd,aAAa,CAAC,aAAa;SAC3B;KACD;IAED,8CAA8C;IAC9C;QACC,MAAM,EAAE,8CAA8C;QACtD,YAAY,EAAE,UAAU;QACxB,eAAe,EAAE,EAAC,oDAAoD,CAAC;QACvE,qBAAqB,EAAE;YACtB,cAAc;YACd,aAAa,CAAC,aAAa;SAC3B;KACD;IAED,8CAA8C;IAC9C;QACC,MAAM,EAAE,8CAA8C;QACtD,YAAY,EAAE,UAAU;QACxB,eAAe,EAAE,EAAC,oDAAoD,CAAC;QACvE,qBAAqB,EAAE;YACtB,cAAc;YACd,aAAa,CAAC,aAAa;SAC3B;KACD;IAED,6DAA6D;IAC7D;QACC,MAAM,EAAE,6DAA6D;QACrE,YAAY,EAAE;YACb,GAAG,UAAU;YAEb,wBAAwB;YACxB,QAAQ;SACR;QACD,eAAe,EAAE,YAAY;QAC7B,qBAAqB,EAAE;YACtB,cAAc;YACd,aAAa,CAAC,aAAa;SAC3B;KACD;IAED,SAAS;IACT;QACC,MAAM,EAAE,0BAA0B;QAClC,YAAY,EAAE,UAAU;QACxB,eAAe,EAAE,YAAY;QAC7B,qBAAqB,EAAE;YACtB,cAAc;YACd,aAAa,CAAC,aAAa;SAC3B;KACD;IAED,UAAU;IACV;QACC,MAAM,EAAE,2BAA2B;QACnC,YAAY,EAAE,UAAU;QACxB,eAAe,EAAE,YAAY;QAC7B,kBAAkB,EAAE;YACnB,mCAAmC,CAAC,sFAAsF;SAC1H;QACD,qBAAqB,EAAE;YACtB,aAAa,CAAC,aAAa;SAC3B;KACD;IAED,2BAA2B;IAC3B;QACC,MAAM,EAAE,mCAAmC;QAC3C,YAAY,EAAE,UAAU;QACxB,eAAe,EAAE,YAAY;QAC7B,qBAAqB,EAAE;YACtB,aAAa,CAAC,aAAa;SAC3B;KACD;IAED,UAAU;IACV;QACC,MAAM,EAAE,wBAAwB;QAChC,YAAY,EAAE,UAAU;QACxB,qBAAqB,EAAE;YACtB,cAAc,CAAC,SAAS;SACxB;KACD;IAED,qBAAqB;IACrB;QACC,MAAM,EAAE,oCAAoC;QAC5C,YAAY,EAAE,UAAU;QACxB,qBAAqB,EAAE;YACtB,aAAa,CAAC,aAAa;SAC3B;KACD;IAED,4BAA4B;IAC5B;QACC,MAAM,EAAE,oCAAoC;QAC5C,IAAI,EAAE,IAAI,CAAC,wBAAwB;KACnC;IAED,kBAAkB;IAClB;QACC,MAAM,EAAE,iCAAiC;QACzC,YAAY,EAAE;YACb,GAAG,UAAU;YAEb,gEAAgE;YAChE,OAAO;YACP,SAAS;SACT;QACD,eAAe,EAAE;YAChB,SAAS,CAAC,4CAA4C;SACtD;QACD,qBAAqB,EAAE;YACtB,cAAc,CAAC,SAAS;SACxB;KACD;CACD,CAAC;AAEF,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;AAWzE,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB,SAAS,SAAS,CAAC,OAAmB,EAAE,UAAyB,EAAE,IAAW;IAC7E,SAAS,CAAC,UAAU,CAAC,CAAC;IAEtB,SAAS,SAAS,CAAC,IAAa;QAC/B,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE;YAC3C,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,eAAe;SACxD;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAEjD,IAAI,CAAC,MAAM,EAAE;YACZ,OAAO;SACP;QAED,IAAI,aAAa,GAAQ,MAAM,CAAC;QAEhC,OAAO,aAAa,CAAC,MAAM,EAAE;YAC5B,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC;SACrC;QAED,MAAM,YAAY,GAAG,aAA0B,CAAC;QAChD,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,EAAE;YACzD,OAAO,CAAC,WAAW;SACnB;QAED,IAAI,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,KAAK,IAAI,CAAC,EAAE;YAClE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC,6BAA6B,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtF,OAAO,CAAC,GAAG,CAAC,oDAAoD,IAAI,qBAAqB,IAAI,CAAC,MAAM,MAAM,UAAU,CAAC,QAAQ,KAAK,IAAI,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,wHAAwH,CAAC,CAAC;YAErR,SAAS,GAAG,IAAI,CAAC;YACjB,OAAO;SACP;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACzC,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAChC,eAAe,EAAE,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;gBACxD,IAAI,WAAW,EAAE;oBAChB,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;oBAClC,IAAI,MAAM,EAAE;wBACX,MAAM,gBAAgB,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;wBAChD,IAAI,gBAAgB,EAAE;4BACrB,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,QAAQ,CAAC;4BACrD,IAAI,IAAI,CAAC,kBAAkB,EAAE;gCAC5B,KAAK,MAAM,iBAAiB,IAAI,IAAI,CAAC,kBAAkB,EAAE;oCACxD,IAAI,kBAAkB,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;wCACvD,SAAS,eAAe,CAAC;qCACzB;iCACD;6BACD;4BACD,IAAI,IAAI,CAAC,qBAAqB,EAAE;gCAC/B,KAAK,MAAM,oBAAoB,IAAI,IAAI,CAAC,qBAAqB,EAAE;oCAC9D,IAAI,kBAAkB,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE;wCAC1D,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC,6BAA6B,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;wCAEtF,OAAO,CAAC,GAAG,CAAC,sDAAsD,IAAI,WAAW,oBAAoB,qBAAqB,IAAI,CAAC,MAAM,MAAM,UAAU,CAAC,QAAQ,KAAK,IAAI,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,uHAAuH,CAAC,CAAC;wCAErT,SAAS,GAAG,IAAI,CAAC;wCACjB,OAAO;qCACP;iCACD;6BACD;yBACD;qBACD;iBACD;aACD;SACD;IACF,CAAC;AACF,CAAC;AAED,SAAS,aAAa,CAAC,YAAoB;IAC1C,MAAM,QAAQ,GAAG,EAAE,CAAC,cAAc,CAAC,YAAY,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAElE,MAAM,gBAAgB,GAAuB,EAAE,UAAU,EAAE,eAAU,EAAE,aAAa,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,IAAA,iBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,EAAE,yBAAyB,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;IACpN,MAAM,cAAc,GAAG,EAAE,CAAC,0BAA0B,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAA,cAAO,EAAC,IAAA,cAAO,EAAC,YAAY,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1I,MAAM,YAAY,GAAG,EAAE,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAEzE,OAAO,EAAE,CAAC,aAAa,CAAC,cAAc,CAAC,SAAS,EAAE,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AACzF,CAAC;AAED,EAAE;AACF,oCAAoC;AACpC,EAAE;AACF,MAAM,OAAO,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC;AAE9C,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,cAAc,EAAE,EAAE;IAClD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACzB,IAAI,IAAA,iBAAK,EAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACzD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;gBACf,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;aACrC;YAED,MAAM;SACN;KACD;CACD;AAED,IAAI,SAAS,EAAE;IACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CAChB"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"layersChecker.js","sourceRoot":"","sources":["layersChecker.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/build/lib/layersChecker.ts b/build/lib/layersChecker.ts index c06b23e766..1d3df7fe16 100644 --- a/build/lib/layersChecker.ts +++ b/build/lib/layersChecker.ts @@ -197,13 +197,22 @@ const RULES: IRule[] = [ // Electron (sandbox) { - target: '**/{vs,sql}/**/electron-sandbox/**', + target: '**/{vs,sql}/**/electron-sandbox/**/!(commandLine.ts)', // {{SQL CARBON EDIT}} commandLine currently uses querystring, so skip that one for now allowedTypes: CORE_TYPES, disallowedDefinitions: [ '@types/node' // no node.js ] }, + // {{SQL CARBON TODO}} chgagnon investigate the use of querystring + { + target: '**/{vs,sql}/**/electron-sandbox/commandLine.ts', + allowedTypes: [ + ...CORE_TYPES, + '@types/node' + ] + }, + // Electron (renderer): skip { target: '**/{vs,sql}/**/electron-browser/**', diff --git a/src/sql/platform/clipboard/electron-browser/clipboardService.ts b/src/sql/platform/clipboard/electron-sandbox/clipboardService.ts similarity index 100% rename from src/sql/platform/clipboard/electron-browser/clipboardService.ts rename to src/sql/platform/clipboard/electron-sandbox/clipboardService.ts diff --git a/src/sql/platform/browser/editableDropdown/editableDropdown.component.ts b/src/sql/platform/editableDropdown/browser/editableDropdown.component.ts similarity index 100% rename from src/sql/platform/browser/editableDropdown/editableDropdown.component.ts rename to src/sql/platform/editableDropdown/browser/editableDropdown.component.ts diff --git a/src/sql/platform/errorMessage/test/common/testErrorMessageService.ts b/src/sql/platform/errorMessage/test/common/testErrorMessageService.ts index 4cd50fc8c6..03b22af96a 100644 --- a/src/sql/platform/errorMessage/test/common/testErrorMessageService.ts +++ b/src/sql/platform/errorMessage/test/common/testErrorMessageService.ts @@ -5,14 +5,9 @@ import Severity from 'vs/base/common/severity'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -import { IErrorDialogOptions } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { TelemetryView } from 'sql/platform/telemetry/common/telemetryKeys'; export class TestErrorMessageService implements IErrorMessageService { _serviceBrand: undefined; showDialog(severity: Severity, headerTitle: string, message: string): void { } - showDialogAsync(options: IErrorDialogOptions, telemetryView: TelemetryView): Promise { - return Promise.resolve(undefined); - } } diff --git a/src/sql/platform/browser/inputbox/inputBox.component.ts b/src/sql/platform/inputBox/browser/inputBox.component.ts similarity index 100% rename from src/sql/platform/browser/inputbox/inputBox.component.ts rename to src/sql/platform/inputBox/browser/inputBox.component.ts diff --git a/src/sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl.ts b/src/sql/platform/oAuth/electron-sandbox/sqlOAuthServiceImpl.ts similarity index 100% rename from src/sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl.ts rename to src/sql/platform/oAuth/electron-sandbox/sqlOAuthServiceImpl.ts diff --git a/src/sql/platform/browser/selectBox/selectBox.component.ts b/src/sql/platform/selectBox/browser/selectBox.component.ts similarity index 100% rename from src/sql/platform/browser/selectBox/selectBox.component.ts rename to src/sql/platform/selectBox/browser/selectBox.component.ts diff --git a/src/sql/platform/common/pathUtilities.ts b/src/sql/platform/workspace/common/pathUtilities.ts similarity index 100% rename from src/sql/platform/common/pathUtilities.ts rename to src/sql/platform/workspace/common/pathUtilities.ts diff --git a/src/sql/workbench/contrib/backup/common/constants.ts b/src/sql/workbench/common/backup/constants.ts similarity index 100% rename from src/sql/workbench/contrib/backup/common/constants.ts rename to src/sql/workbench/common/backup/constants.ts diff --git a/src/sql/workbench/contrib/backup/browser/backup.component.ts b/src/sql/workbench/contrib/backup/browser/backup.component.ts index c5e261bbf8..0c1d2cc45e 100644 --- a/src/sql/workbench/contrib/backup/browser/backup.component.ts +++ b/src/sql/workbench/contrib/backup/browser/backup.component.ts @@ -12,7 +12,7 @@ import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { ListBox } from 'sql/base/browser/ui/listBox/listBox'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import * as BackupConstants from 'sql/workbench/contrib/backup/common/constants'; +import * as BackupConstants from 'sql/workbench/common/backup/constants'; import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService'; import * as FileValidationConstants from 'sql/workbench/services/fileBrowser/common/fileValidationServiceConstants'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; diff --git a/src/sql/workbench/contrib/charts/browser/actions.ts b/src/sql/workbench/contrib/charts/browser/actions.ts index 1e32e819ca..cfd10e39b6 100644 --- a/src/sql/workbench/contrib/charts/browser/actions.ts +++ b/src/sql/workbench/contrib/charts/browser/actions.ts @@ -12,7 +12,7 @@ import { Action } from 'vs/base/common/actions'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { URI } from 'vs/base/common/uri'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IInsightOptions } from 'sql/workbench/contrib/charts/common/interfaces'; +import { IInsightOptions } from 'sql/workbench/contrib/charts/browser/interfaces'; import { QueryEditorInput } from 'sql/workbench/common/editor/query/queryEditorInput'; import { IFileService } from 'vs/platform/files/common/files'; import { IFileDialogService, FileFilter } from 'vs/platform/dialogs/common/dialogs'; diff --git a/src/sql/workbench/contrib/charts/browser/chartOptions.ts b/src/sql/workbench/contrib/charts/browser/chartOptions.ts index fc61564633..1abf1518a3 100644 --- a/src/sql/workbench/contrib/charts/browser/chartOptions.ts +++ b/src/sql/workbench/contrib/charts/browser/chartOptions.ts @@ -7,7 +7,7 @@ import { localize } from 'vs/nls'; import { Registry } from 'vs/platform/registry/common/platform'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry'; -import { IInsightOptions, DataDirection, DataType, LegendPosition, ChartType, InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { IInsightOptions, DataDirection, DataType, LegendPosition, ChartType, InsightType } from 'sql/workbench/contrib/charts/browser/interfaces'; import { values } from 'vs/base/common/collections'; const insightRegistry = Registry.as(Extensions.InsightContribution); diff --git a/src/sql/workbench/contrib/charts/browser/chartView.ts b/src/sql/workbench/contrib/charts/browser/chartView.ts index 85226c0c4c..eac71e9db3 100644 --- a/src/sql/workbench/contrib/charts/browser/chartView.ts +++ b/src/sql/workbench/contrib/charts/browser/chartView.ts @@ -11,7 +11,7 @@ import { Extensions, IInsightData, IInsightRegistry } from 'sql/platform/dashboa import { ChartState } from 'sql/workbench/common/editor/query/chartState'; import { ConfigureChartAction, CopyAction, CreateInsightAction, IChartActionContext, SaveImageAction } from 'sql/workbench/contrib/charts/browser/actions'; import { getChartMaxRowCount } from 'sql/workbench/contrib/charts/browser/utils'; -import { ChartType, IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { ChartType, IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/browser/interfaces'; import { ICellValue, VisualizationOptions } from 'sql/workbench/services/query/common/query'; import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import * as DOM from 'vs/base/browser/dom'; diff --git a/src/sql/workbench/contrib/charts/browser/countInsight.ts b/src/sql/workbench/contrib/charts/browser/countInsight.ts index 029d986a3f..b4143b6288 100644 --- a/src/sql/workbench/contrib/charts/browser/countInsight.ts +++ b/src/sql/workbench/contrib/charts/browser/countInsight.ts @@ -8,7 +8,7 @@ import 'vs/css!./media/countInsight'; import { IInsight } from './interfaces'; import { $, clearNode } from 'vs/base/browser/dom'; -import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/browser/interfaces'; import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; export class CountInsight implements IInsight { diff --git a/src/sql/workbench/contrib/charts/browser/graphInsight.ts b/src/sql/workbench/contrib/charts/browser/graphInsight.ts index 4d5e2b8845..509de5842d 100644 --- a/src/sql/workbench/contrib/charts/browser/graphInsight.ts +++ b/src/sql/workbench/contrib/charts/browser/graphInsight.ts @@ -13,7 +13,7 @@ import { editorLineNumbers } from 'vs/editor/common/core/editorColorRegistry'; import { IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService'; import { IInsight, customMixin } from './interfaces'; -import { IInsightOptions, DataDirection, ChartType, LegendPosition, DataType, ChartTypeToChartJsType, LegendPositionToChartJsPosition } from 'sql/workbench/contrib/charts/common/interfaces'; +import { IInsightOptions, DataDirection, ChartType, LegendPosition, DataType, ChartTypeToChartJsType, LegendPositionToChartJsPosition } from 'sql/workbench/contrib/charts/browser/interfaces'; import { values } from 'vs/base/common/collections'; import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; diff --git a/src/sql/workbench/contrib/charts/browser/imageInsight.ts b/src/sql/workbench/contrib/charts/browser/imageInsight.ts index 3beea751c3..eaffcaf68a 100644 --- a/src/sql/workbench/contrib/charts/browser/imageInsight.ts +++ b/src/sql/workbench/contrib/charts/browser/imageInsight.ts @@ -7,7 +7,7 @@ import { IInsight } from './interfaces'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { $ } from 'vs/base/browser/dom'; import { mixin } from 'vs/base/common/objects'; -import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/browser/interfaces'; import * as nls from 'vs/nls'; import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; diff --git a/src/sql/workbench/contrib/charts/browser/insight.ts b/src/sql/workbench/contrib/charts/browser/insight.ts index de9533ee78..d7ab510169 100644 --- a/src/sql/workbench/contrib/charts/browser/insight.ts +++ b/src/sql/workbench/contrib/charts/browser/insight.ts @@ -12,7 +12,7 @@ import { CountInsight } from './countInsight'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Dimension, clearNode } from 'vs/base/browser/dom'; import { deepClone } from 'vs/base/common/objects'; -import { IInsightOptions, ChartType, DataDirection, InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { IInsightOptions, ChartType, DataDirection, InsightType } from 'sql/workbench/contrib/charts/browser/interfaces'; import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; const defaultOptions: IInsightOptions = { diff --git a/src/sql/workbench/contrib/charts/browser/interfaces.ts b/src/sql/workbench/contrib/charts/browser/interfaces.ts index 9b1c5ebb23..31fb71e922 100644 --- a/src/sql/workbench/contrib/charts/browser/interfaces.ts +++ b/src/sql/workbench/contrib/charts/browser/interfaces.ts @@ -6,9 +6,9 @@ import { Dimension } from 'vs/base/browser/dom'; import { mixin } from 'sql/base/common/objects'; import * as types from 'vs/base/common/types'; -import { IInsightOptions, InsightType, ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; import { BrandedService } from 'vs/platform/instantiation/common/instantiation'; +import * as chartjs from 'chart.js'; export interface IPointDataSet { data: Array<{ x: number | string, y: number }>; @@ -50,3 +50,73 @@ export interface IInsightCtor { export interface IChartsConfiguration { readonly maxRowCount: number; } + +export interface IInsightOptions { + type: InsightType | ChartType; + dataDirection?: DataDirection; + dataType?: DataType; + labelFirstColumn?: boolean; + columnsAsLabels?: boolean; + legendPosition?: LegendPosition; + yAxisLabel?: string; + yAxisMin?: number; + yAxisMax?: number; + xAxisLabel?: string; + xAxisMin?: number; + xAxisMax?: number; + encoding?: string; + imageFormat?: string; + indexAxis?: string; +} + +export enum InsightType { + Image = 'image', + Table = 'table', + Count = 'count' +} + +export enum ChartType { + Bar = 'bar', + Doughnut = 'doughnut', + HorizontalBar = 'horizontalBar', + Line = 'line', + Pie = 'pie', + TimeSeries = 'timeSeries', + Scatter = 'scatter' +} + +export const ChartTypeToChartJsType: { [key in ChartType]: chartjs.ChartType } = { + 'bar': 'bar', + 'doughnut': 'doughnut', + 'horizontalBar': 'bar', + 'line': 'line', + 'pie': 'pie', + 'timeSeries': 'line', + 'scatter': 'scatter' +} + +export enum LegendPosition { + Top = 'top', + Bottom = 'bottom', + Left = 'left', + Right = 'right', + None = 'none' +} + +export const LegendPositionToChartJsPosition: { [key in LegendPosition]: chartjs.LayoutPosition } = { + 'top': 'top', + 'bottom': 'bottom', + 'left': 'left', + 'right': 'right', + 'none': 'left' // chart.js doesn't have a 'none' option, so we use 'left' and then hide the legend +} + +export enum DataType { + Number = 'number', + Point = 'point' +} + +export enum DataDirection { + Vertical = 'vertical', + Horizontal = 'horizontal' +} diff --git a/src/sql/workbench/contrib/charts/browser/tableInsight.ts b/src/sql/workbench/contrib/charts/browser/tableInsight.ts index 220588c812..b7dcead9a7 100644 --- a/src/sql/workbench/contrib/charts/browser/tableInsight.ts +++ b/src/sql/workbench/contrib/charts/browser/tableInsight.ts @@ -10,7 +10,7 @@ import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelect import { $, Dimension } from 'vs/base/browser/dom'; import { Disposable } from 'vs/base/common/lifecycle'; -import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/browser/interfaces'; import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility'; import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; diff --git a/src/sql/workbench/contrib/charts/common/interfaces.ts b/src/sql/workbench/contrib/charts/common/interfaces.ts deleted file mode 100644 index da4d4de1c7..0000000000 --- a/src/sql/workbench/contrib/charts/common/interfaces.ts +++ /dev/null @@ -1,76 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import * as chartjs from 'chart.js'; - -export interface IInsightOptions { - type: InsightType | ChartType; - dataDirection?: DataDirection; - dataType?: DataType; - labelFirstColumn?: boolean; - columnsAsLabels?: boolean; - legendPosition?: LegendPosition; - yAxisLabel?: string; - yAxisMin?: number; - yAxisMax?: number; - xAxisLabel?: string; - xAxisMin?: number; - xAxisMax?: number; - encoding?: string; - imageFormat?: string; - indexAxis?: string; -} - -export enum InsightType { - Image = 'image', - Table = 'table', - Count = 'count' -} - -export enum ChartType { - Bar = 'bar', - Doughnut = 'doughnut', - HorizontalBar = 'horizontalBar', - Line = 'line', - Pie = 'pie', - TimeSeries = 'timeSeries', - Scatter = 'scatter' -} - -export const ChartTypeToChartJsType: { [key in ChartType]: chartjs.ChartType } = { - 'bar': 'bar', - 'doughnut': 'doughnut', - 'horizontalBar': 'bar', - 'line': 'line', - 'pie': 'pie', - 'timeSeries': 'line', - 'scatter': 'scatter' -} - -export enum LegendPosition { - Top = 'top', - Bottom = 'bottom', - Left = 'left', - Right = 'right', - None = 'none' -} - -export const LegendPositionToChartJsPosition: { [key in LegendPosition]: chartjs.LayoutPosition } = { - 'top': 'top', - 'bottom': 'bottom', - 'left': 'left', - 'right': 'right', - 'none': 'left' // chart.js doesn't have a 'none' option, so we use 'left' and then hide the legend -} - -export enum DataType { - Number = 'number', - Point = 'point' -} - -export enum DataDirection { - Vertical = 'vertical', - Horizontal = 'horizontal' -} diff --git a/src/sql/workbench/contrib/commandLine/electron-browser/commandLine.contribution.ts b/src/sql/workbench/contrib/commandLine/electron-sandbox/commandLine.contribution.ts similarity index 94% rename from src/sql/workbench/contrib/commandLine/electron-browser/commandLine.contribution.ts rename to src/sql/workbench/contrib/commandLine/electron-sandbox/commandLine.contribution.ts index c0e68f0459..b79a528b1a 100644 --- a/src/sql/workbench/contrib/commandLine/electron-browser/commandLine.contribution.ts +++ b/src/sql/workbench/contrib/commandLine/electron-sandbox/commandLine.contribution.ts @@ -6,6 +6,6 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle'; -import { CommandLineWorkbenchContribution } from 'sql/workbench/contrib/commandLine/electron-browser/commandLine'; +import { CommandLineWorkbenchContribution } from 'sql/workbench/contrib/commandLine/electron-sandbox/commandLine'; Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(CommandLineWorkbenchContribution, LifecyclePhase.Restored); diff --git a/src/sql/workbench/contrib/commandLine/electron-browser/commandLine.ts b/src/sql/workbench/contrib/commandLine/electron-sandbox/commandLine.ts similarity index 100% rename from src/sql/workbench/contrib/commandLine/electron-browser/commandLine.ts rename to src/sql/workbench/contrib/commandLine/electron-sandbox/commandLine.ts diff --git a/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts b/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts index 413ba14c65..a07bd46bdd 100644 --- a/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts +++ b/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts @@ -8,7 +8,7 @@ import * as TypeMoq from 'typemoq'; import * as azdata from 'azdata'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; -import { CommandLineWorkbenchContribution } from 'sql/workbench/contrib/commandLine/electron-browser/commandLine'; +import { CommandLineWorkbenchContribution } from 'sql/workbench/contrib/commandLine/electron-sandbox/commandLine'; import * as Constants from 'sql/platform/connection/common/constants'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; diff --git a/src/sql/workbench/contrib/dashboard/browser/dashboard.module.ts b/src/sql/workbench/contrib/dashboard/browser/dashboard.module.ts index 79f1ca0bd1..b25d543470 100644 --- a/src/sql/workbench/contrib/dashboard/browser/dashboard.module.ts +++ b/src/sql/workbench/contrib/dashboard/browser/dashboard.module.ts @@ -56,9 +56,9 @@ import { ProxiesViewComponent } from 'sql/workbench/contrib/jobManagement/browse import { NotebooksViewComponent } from 'sql/workbench/contrib/jobManagement/browser/notebooksView.component'; import { NotebookHistoryComponent } from 'sql/workbench/contrib/jobManagement/browser/notebookHistory.component'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; -import { SelectBox } from 'sql/platform/browser/selectBox/selectBox.component'; -import { InputBox } from 'sql/platform/browser/inputbox/inputBox.component'; -import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component'; +import { SelectBox } from 'sql/platform/selectBox/browser/selectBox.component'; +import { InputBox } from 'sql/platform/inputBox/browser/inputBox.component'; +import { EditableDropDown } from 'sql/platform/editableDropdown/browser/editableDropdown.component'; import { AsmtViewComponent } from 'sql/workbench/contrib/assessment/browser/asmtView.component'; import { AsmtResultsViewComponent } from 'sql/workbench/contrib/assessment/browser/asmtResultsView.component'; diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts index 500f29e5ba..6ea5169f4f 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts @@ -17,7 +17,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import * as nls from 'vs/nls'; import { IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService'; import { IInsightsView, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; -import { ChartType, ChartTypeToChartJsType, LegendPosition } from 'sql/workbench/contrib/charts/common/interfaces'; +import { ChartType, ChartTypeToChartJsType, LegendPosition } from 'sql/workbench/contrib/charts/browser/interfaces'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; @Component({ diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces.ts index ae9f20bb51..898ac3e6ac 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { LegendPosition, DataDirection } from 'sql/workbench/contrib/charts/common/interfaces'; +import { LegendPosition, DataDirection } from 'sql/workbench/contrib/charts/browser/interfaces'; export interface IDataSet { data: Array; diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.component.ts index 573e6c2bbf..37988163b2 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.component.ts @@ -14,7 +14,7 @@ import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core'; import { IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { customMixin } from 'sql/workbench/contrib/charts/browser/interfaces'; -import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { ChartType } from 'sql/workbench/contrib/charts/browser/interfaces'; export interface IBarChartConfig extends IChartConfig { yAxisMin: number; diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.component.ts index 6bf0db7e2a..4451d72fe8 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.component.ts @@ -6,7 +6,7 @@ import PieChart from './pieChart.component'; import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { ChartType } from 'sql/workbench/contrib/charts/browser/interfaces'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; export default class DoughnutChart extends PieChart { diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.component.ts index 8f52a9abd8..ea42af9c79 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.component.ts @@ -7,7 +7,7 @@ import BarChart, { IBarChartConfig } from './barChart.component'; import { forwardRef, Inject, ChangeDetectorRef } from '@angular/core'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; -import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { ChartType } from 'sql/workbench/contrib/charts/browser/interfaces'; import * as chartjs from 'chart.js'; import { mixin } from 'sql/base/common/objects'; import { customMixin } from 'sql/workbench/contrib/charts/browser/interfaces'; diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/lineChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/lineChart.component.ts index f811e5dc57..fe6c1adf86 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/lineChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/lineChart.component.ts @@ -10,7 +10,7 @@ import BarChart, { IBarChartConfig } from './barChart.component'; import { defaultChartConfig } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces'; import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { DataType, ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { DataType, ChartType } from 'sql/workbench/contrib/charts/browser/interfaces'; import { values } from 'vs/base/common/collections'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/pieChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/pieChart.component.ts index 29b657b9ad..b1ee9d0f25 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/pieChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/pieChart.component.ts @@ -7,7 +7,7 @@ import { ChartInsight } from 'sql/workbench/contrib/dashboard/browser/widgets/in import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; -import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { ChartType } from 'sql/workbench/contrib/charts/browser/interfaces'; export default class PieChart extends ChartInsight { protected readonly chartType: ChartType = ChartType.Pie; diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/scatterChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/scatterChart.component.ts index 059b71851e..a194812f27 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/scatterChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/scatterChart.component.ts @@ -10,7 +10,7 @@ import { mixin, deepClone } from 'vs/base/common/objects'; import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; -import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { ChartType } from 'sql/workbench/contrib/charts/browser/interfaces'; const defaultScatterConfig = mixin(deepClone(defaultChartConfig), { dataType: 'point', dataDirection: 'horizontal' }) as ILineConfig; diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.component.ts index 535a7cce67..8e4fd77a94 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.component.ts @@ -11,7 +11,7 @@ import { mixin, deepClone } from 'vs/base/common/objects'; import { Color } from 'vs/base/common/color'; import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { ChartType } from 'sql/workbench/contrib/charts/browser/interfaces'; import { values } from 'vs/base/common/collections'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; diff --git a/src/sql/workbench/contrib/notebook/browser/notebook.module.ts b/src/sql/workbench/contrib/notebook/browser/notebook.module.ts index 03534ff13c..391a322052 100644 --- a/src/sql/workbench/contrib/notebook/browser/notebook.module.ts +++ b/src/sql/workbench/contrib/notebook/browser/notebook.module.ts @@ -11,7 +11,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { ComponentHostDirective } from 'sql/base/browser/componentHost.directive'; import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; -import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component'; +import { EditableDropDown } from 'sql/platform/editableDropdown/browser/editableDropdown.component'; import { NotebookComponent } from 'sql/workbench/contrib/notebook/browser/notebook.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { CodeComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/code.component'; @@ -22,8 +22,8 @@ import { StdInComponent } from 'sql/workbench/contrib/notebook/browser/cellViews import { PlaceholderCellComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/placeholderCell.component'; import LoadingSpinner from 'sql/base/browser/ui/loadingSpinner/loadingSpinner.component'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; -import { SelectBox } from 'sql/platform/browser/selectBox/selectBox.component'; -import { InputBox } from 'sql/platform/browser/inputbox/inputBox.component'; +import { SelectBox } from 'sql/platform/selectBox/browser/selectBox.component'; +import { InputBox } from 'sql/platform/inputBox/browser/inputBox.component'; import { IMimeComponentRegistry, Extensions } from 'sql/workbench/contrib/notebook/browser/outputs/mimeRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; import { LinkHandlerDirective } from 'sql/workbench/contrib/notebook/browser/cellViews/linkHandler.directive'; diff --git a/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab.module.ts b/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab.module.ts index c3c36a4384..6f7e1d6574 100644 --- a/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab.module.ts +++ b/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab.module.ts @@ -16,11 +16,11 @@ import { ModelComponentWrapper } from 'sql/workbench/browser/modelComponents/mod import { ComponentHostDirective } from 'sql/base/browser/componentHost.directive'; import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; -import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component'; +import { EditableDropDown } from 'sql/platform/editableDropdown/browser/editableDropdown.component'; import { QueryModelViewTabContainer } from 'sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTabContainer.component'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; -import { SelectBox } from 'sql/platform/browser/selectBox/selectBox.component'; -import { InputBox } from 'sql/platform/browser/inputbox/inputBox.component'; +import { SelectBox } from 'sql/platform/selectBox/browser/selectBox.component'; +import { InputBox } from 'sql/platform/inputBox/browser/inputBox.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/sql/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut.contribution.ts b/src/sql/workbench/contrib/telemetry/browser/telemetryOptOut.contribution.ts similarity index 87% rename from src/sql/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut.contribution.ts rename to src/sql/workbench/contrib/telemetry/browser/telemetryOptOut.contribution.ts index 25d7819ffc..411afddf17 100644 --- a/src/sql/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut.contribution.ts +++ b/src/sql/workbench/contrib/telemetry/browser/telemetryOptOut.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { Registry } from 'vs/platform/registry/common/platform'; -import { BrowserTelemetryOptOut } from 'sql/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut'; +import { BrowserTelemetryOptOut } from 'sql/workbench/contrib/telemetry/browser/telemetryOptOut'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle'; diff --git a/src/sql/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut.ts b/src/sql/workbench/contrib/telemetry/browser/telemetryOptOut.ts similarity index 100% rename from src/sql/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut.ts rename to src/sql/workbench/contrib/telemetry/browser/telemetryOptOut.ts diff --git a/src/sql/workbench/contrib/welcome/telemetryOptOut/electron-sandbox/telemetryOptOut.contribution.ts b/src/sql/workbench/contrib/telemetry/electron-sandbox/telemetryOptOut.contribution.ts similarity index 86% rename from src/sql/workbench/contrib/welcome/telemetryOptOut/electron-sandbox/telemetryOptOut.contribution.ts rename to src/sql/workbench/contrib/telemetry/electron-sandbox/telemetryOptOut.contribution.ts index 72f326365f..dd9d2a5878 100644 --- a/src/sql/workbench/contrib/welcome/telemetryOptOut/electron-sandbox/telemetryOptOut.contribution.ts +++ b/src/sql/workbench/contrib/telemetry/electron-sandbox/telemetryOptOut.contribution.ts @@ -6,6 +6,6 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle'; -import { NativeTelemetryOptOut } from 'sql/workbench/contrib/welcome/telemetryOptOut/electron-sandbox/telemetryOptOut'; +import { NativeTelemetryOptOut } from 'sql/workbench/contrib/telemetry/electron-sandbox/telemetryOptOut'; Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(NativeTelemetryOptOut, LifecyclePhase.Eventually); diff --git a/src/sql/workbench/contrib/welcome/telemetryOptOut/electron-sandbox/telemetryOptOut.ts b/src/sql/workbench/contrib/telemetry/electron-sandbox/telemetryOptOut.ts similarity index 94% rename from src/sql/workbench/contrib/welcome/telemetryOptOut/electron-sandbox/telemetryOptOut.ts rename to src/sql/workbench/contrib/telemetry/electron-sandbox/telemetryOptOut.ts index a7a9643f7a..e2eb1d459e 100644 --- a/src/sql/workbench/contrib/welcome/telemetryOptOut/electron-sandbox/telemetryOptOut.ts +++ b/src/sql/workbench/contrib/telemetry/electron-sandbox/telemetryOptOut.ts @@ -9,7 +9,7 @@ import { IOpenerService } from 'vs/platform/opener/common/opener'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IProductService } from 'vs/platform/product/common/productService'; import { IHostService } from 'vs/workbench/services/host/browser/host'; -import { AbstractTelemetryOptOut } from 'sql/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut'; +import { AbstractTelemetryOptOut } from 'sql/workbench/contrib/telemetry/browser/telemetryOptOut'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { INativeHostService } from 'vs/platform/native/common/native'; diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/browser/abstractEnablePreviewFeatures.ts b/src/sql/workbench/contrib/welcome/browser/abstractEnablePreviewFeatures.ts similarity index 100% rename from src/sql/workbench/contrib/welcome/gettingStarted/browser/abstractEnablePreviewFeatures.ts rename to src/sql/workbench/contrib/welcome/browser/abstractEnablePreviewFeatures.ts diff --git a/src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts b/src/sql/workbench/contrib/welcome/browser/az_data_welcome_page.ts similarity index 97% rename from src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts rename to src/sql/workbench/contrib/welcome/browser/az_data_welcome_page.ts index 989165d968..6a2f9589c8 100644 --- a/src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts +++ b/src/sql/workbench/contrib/welcome/browser/az_data_welcome_page.ts @@ -127,13 +127,13 @@ export default () => `
- +

${escape(localize('welcomePage.videoDescriptionOverview', "Overview of Azure Data Studio"))}
- +

${escape(localize('welcomePage.videoDescriptionIntroduction', "Introduction to Azure Data Studio Notebooks | Data Exposed"))}
diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/browser/enablePreviewFeatures.ts b/src/sql/workbench/contrib/welcome/browser/enablePreviewFeatures.ts similarity index 94% rename from src/sql/workbench/contrib/welcome/gettingStarted/browser/enablePreviewFeatures.ts rename to src/sql/workbench/contrib/welcome/browser/enablePreviewFeatures.ts index 2ce21fe847..6579f73a36 100644 --- a/src/sql/workbench/contrib/welcome/gettingStarted/browser/enablePreviewFeatures.ts +++ b/src/sql/workbench/contrib/welcome/browser/enablePreviewFeatures.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AbstractEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/browser/abstractEnablePreviewFeatures'; +import { AbstractEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/browser/abstractEnablePreviewFeatures'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IHostService } from 'vs/workbench/services/host/browser/host'; diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution.ts b/src/sql/workbench/contrib/welcome/browser/gettingStarted.contribution.ts similarity index 93% rename from src/sql/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution.ts rename to src/sql/workbench/contrib/welcome/browser/gettingStarted.contribution.ts index cde9e4d03d..a326260a5f 100644 --- a/src/sql/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution.ts +++ b/src/sql/workbench/contrib/welcome/browser/gettingStarted.contribution.ts @@ -6,7 +6,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle'; -import { BrowserEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/browser/enablePreviewFeatures'; +import { BrowserEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/browser/enablePreviewFeatures'; Registry .as(WorkbenchExtensions.Workbench) diff --git a/src/sql/workbench/contrib/welcome/page/browser/gettingStartedTour.css b/src/sql/workbench/contrib/welcome/browser/gettingStartedTour.css similarity index 100% rename from src/sql/workbench/contrib/welcome/page/browser/gettingStartedTour.css rename to src/sql/workbench/contrib/welcome/browser/gettingStartedTour.css diff --git a/src/sql/workbench/contrib/welcome/page/browser/gettingStartedTour.ts b/src/sql/workbench/contrib/welcome/browser/gettingStartedTour.ts similarity index 100% rename from src/sql/workbench/contrib/welcome/page/browser/gettingStartedTour.ts rename to src/sql/workbench/contrib/welcome/browser/gettingStartedTour.ts diff --git a/src/sql/workbench/contrib/welcome/page/browser/welcomePage.contribution.ts b/src/sql/workbench/contrib/welcome/browser/welcomePage.contribution.ts similarity index 98% rename from src/sql/workbench/contrib/welcome/page/browser/welcomePage.contribution.ts rename to src/sql/workbench/contrib/welcome/browser/welcomePage.contribution.ts index 8eaaad56dd..2135574e49 100644 --- a/src/sql/workbench/contrib/welcome/page/browser/welcomePage.contribution.ts +++ b/src/sql/workbench/contrib/welcome/browser/welcomePage.contribution.ts @@ -6,7 +6,7 @@ import { localize } from 'vs/nls'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { Registry } from 'vs/platform/registry/common/platform'; -import { WelcomePageContribution, WelcomePageAction, WelcomeInputSerializer } from 'sql/workbench/contrib/welcome/page/browser/welcomePage'; +import { WelcomePageContribution, WelcomePageAction, WelcomeInputSerializer } from 'sql/workbench/contrib/welcome/browser/welcomePage'; import { MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions'; import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry'; import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle'; diff --git a/src/sql/workbench/contrib/welcome/page/browser/welcomePage.css b/src/sql/workbench/contrib/welcome/browser/welcomePage.css similarity index 95% rename from src/sql/workbench/contrib/welcome/page/browser/welcomePage.css rename to src/sql/workbench/contrib/welcome/browser/welcomePage.css index 96d2c94e33..2d82e954f4 100644 --- a/src/sql/workbench/contrib/welcome/page/browser/welcomePage.css +++ b/src/sql/workbench/contrib/welcome/browser/welcomePage.css @@ -405,9 +405,9 @@ height: 12px; margin-left: 6px; margin-top: 3px; - -webkit-mask: url(../../media/info.svg) no-repeat; + -webkit-mask: url(../media/info.svg) no-repeat; -webkit-mask-size: 12px 12px; - mask: url(../../media/info.svg) no-repeat; + mask: url(../media/info.svg) no-repeat; mask-size: 12px 12px } @@ -455,9 +455,9 @@ display: inline-block; width: 11px; margin-left: 4px; - -webkit-mask: url(../../media/link_icon.svg) no-repeat; + -webkit-mask: url(../media/link_icon.svg) no-repeat; -webkit-mask-size: 11px 11px; - mask: url(../../media/link_icon.svg) no-repeat; + mask: url(../media/link_icon.svg) no-repeat; mask-size: 11px 11px; height: 11px; } @@ -610,7 +610,7 @@ .ads-homepage-section.hero { background-size: 1128px 467px; background-repeat: no-repeat; - background-image: url(../../media/homeBanner_icon.svg); + background-image: url(../media/homeBanner_icon.svg); padding: 0 16px 40px; } @@ -636,7 +636,7 @@ .hc-black .ads-homepage-section.hero, .vs-dark .ads-homepage-section.hero { background-size: 1128px 467px; - background-image: url(../../media/homeBanner_icon_dark.svg); + background-image: url(../media/homeBanner_icon_dark.svg); background-repeat: no-repeat } @@ -703,7 +703,7 @@ .ads-homepage .header-top-nav .icon { min-width: 92px; min-height: 92px; - background-image: url(../../media/dataStudioIcon.svg); + background-image: url(../media/dataStudioIcon.svg); background-size: contain; margin-right: 20px; background-repeat: no-repeat @@ -805,25 +805,25 @@ } .ads-homepage .header-bottom-nav-tile .icon.connection { - background-image: url(../../media/createConnectionIcon.svg); + background-image: url(../media/createConnectionIcon.svg); background-size: contain; background-repeat: no-repeat } .ads-homepage .header-bottom-nav-tile .icon.query { - background-image: url(../../media/databaseIcon.svg); + background-image: url(../media/databaseIcon.svg); background-size: contain; background-repeat: no-repeat } .ads-homepage .header-bottom-nav-tile .icon.notebook { - background-image: url(../../media/notebookIcon.svg); + background-image: url(../media/notebookIcon.svg); background-size: contain; background-repeat: no-repeat } .ads-homepage .header-bottom-nav-tile .icon.server { - background-image: url(../../media/serverIcon.svg); + background-image: url(../media/serverIcon.svg); background-size: contain; background-repeat: no-repeat } @@ -923,36 +923,36 @@ } .ads-homepage .ads-homepage-section .history .list li:not(.moreRecent) i, .ads-homepage .ads-homepage-section .pinned .list li i, .ads-homepage .icon-document { - -webkit-mask: url(../../media/icon_file_document.svg) no-repeat; + -webkit-mask: url(../media/icon_file_document.svg) no-repeat; -webkit-mask-size: 13px 16px; - mask: url(../../media/icon_file_document.svg) no-repeat; + mask: url(../media/icon_file_document.svg) no-repeat; mask-size: 13px 16px; height: 16px; width: 16px } .ads-homepage .ads-homepage-section .history .list li:not(.moreRecent) i[title$=".ipynb"], .ads-homepage .ads-homepage-section .pinned .list li:not(.moreRecent) i[title$=".ipynb"] { - -webkit-mask: url(../../media/icon_file_ipynb.svg) no-repeat; + -webkit-mask: url(../media/icon_file_ipynb.svg) no-repeat; -webkit-mask-size: 13px 16px; - mask: url(../../media/icon_file_ipynb.svg) no-repeat; + mask: url(../media/icon_file_ipynb.svg) no-repeat; mask-size: 13px 16px; height: 16px; width: 16px } .ads-homepage .ads-homepage-section .history .list li:not(.moreRecent) i[title$=".sql"], .ads-homepage .ads-homepage-section .pinned .list li:not(.moreRecent) i[title$=".sql"] { - -webkit-mask: url(../../media/icon_file_sql.svg) no-repeat; + -webkit-mask: url(../media/icon_file_sql.svg) no-repeat; -webkit-mask-size: 13px 16px; - mask: url(../../media/icon_file_sql.svg) no-repeat; + mask: url(../media/icon_file_sql.svg) no-repeat; mask-size: 13px 16px; height: 16px; width: 16px } .ads-homepage .ads-homepage-section .history .list li:not(.moreRecent) i[title$=".csv"], .ads-homepage .ads-homepage-section .pinned .list li:not(.moreRecent) a[title$=".csv"] { - -webkit-mask: url(../../media/icon_file_csv.svg) no-repeat; + -webkit-mask: url(../media/icon_file_csv.svg) no-repeat; -webkit-mask-size: 13px 16px; - mask: url(../../media/icon_file_csv.svg) no-repeat; + mask: url(../media/icon_file_csv.svg) no-repeat; mask-size: 13px 16px; height: 16px; width: 16px @@ -1060,7 +1060,7 @@ } .ads-homepage .extension-pack-description { - background: url(../../media/extension_pack_img.svg); + background: url(../media/extension_pack_img.svg); background-position: center; position: relative; background-size: cover; @@ -1257,7 +1257,7 @@ .file-icons-enabled .show-file-icons .az-data-welcome-page-name-file-icon.file-icon::before { content: " "; - background-image: url('../../../../../../vs/workbench/browser/media/code-icon.svg'); + background-image: url('../../../../../vs/workbench/browser/media/code-icon.svg'); } .monaco-workbench .part.editor>.content .welcomePage .linux-only, .monaco-workbench .part.editor>.content .welcomePage .mac-only, .monaco-workbench .part.editor>.content .welcomePage .windows-only { diff --git a/src/sql/workbench/contrib/welcome/page/browser/welcomePage.ts b/src/sql/workbench/contrib/welcome/browser/welcomePage.ts similarity index 97% rename from src/sql/workbench/contrib/welcome/page/browser/welcomePage.ts rename to src/sql/workbench/contrib/welcome/browser/welcomePage.ts index cfd642afc1..cc974ecaf5 100644 --- a/src/sql/workbench/contrib/welcome/page/browser/welcomePage.ts +++ b/src/sql/workbench/contrib/welcome/browser/welcomePage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./welcomePage'; -import 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page'; +import 'sql/workbench/contrib/welcome/browser/az_data_welcome_page'; import { URI } from 'vs/base/common/uri'; import { ICommandService } from 'vs/platform/commands/common/commands'; import * as arrays from 'vs/base/common/arrays'; @@ -41,7 +41,7 @@ import { IHostService } from 'vs/workbench/services/host/browser/host'; import { IProductService } from 'vs/platform/product/common/productService'; import { joinPath } from 'vs/base/common/resources'; import { clearNode } from 'vs/base/browser/dom'; -import { GuidedTour } from 'sql/workbench/contrib/welcome/page/browser/gettingStartedTour'; +import { GuidedTour } from 'sql/workbench/contrib/welcome/browser/gettingStartedTour'; import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService'; import { ILayoutService } from 'vs/platform/layout/browser/layoutService'; import { Button } from 'sql/base/browser/ui/button/button'; @@ -191,16 +191,16 @@ const extensionPacks: ExtensionSuggestion[] = [ ]; const extensionPackExtensions: ExtensionPackExtensions[] = [ - { name: localize('welcomePage.sqlServerAgent', "SQL Server Agent"), icon: require.toUrl('./../../media/agentExtensionIcon.png'), link: `command:azdata.extension.open?{"id":"microsoft.agent"}` }, - { name: localize('welcomePage.sqlServerProfiler', "SQL Server Profiler"), icon: require.toUrl('./../../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.profiler"}` }, - { name: localize('welcomePage.sqlServerImport', "SQL Server Import"), icon: require.toUrl('./../../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.import"}` }, - { name: localize('welcomePage.sqlServerDacpac', "SQL Server Dacpac"), icon: require.toUrl('./../../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.dacpac"}` } + { name: localize('welcomePage.sqlServerAgent', "SQL Server Agent"), icon: require.toUrl('./../media/agentExtensionIcon.png'), link: `command:azdata.extension.open?{"id":"microsoft.agent"}` }, + { name: localize('welcomePage.sqlServerProfiler', "SQL Server Profiler"), icon: require.toUrl('./../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.profiler"}` }, + { name: localize('welcomePage.sqlServerImport', "SQL Server Import"), icon: require.toUrl('./../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.import"}` }, + { name: localize('welcomePage.sqlServerDacpac', "SQL Server Dacpac"), icon: require.toUrl('./../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.dacpac"}` } ]; const extensions: ExtensionSuggestion[] = [ - { name: localize('welcomePage.powershell', "Powershell"), id: 'microsoft.powershell', description: localize('welcomePage.powershellDescription', "Write and execute PowerShell scripts using Azure Data Studio's rich query editor"), icon: require.toUrl('./../../media/icon_powershell.png'), link: `command:azdata.extension.open?{"id":"microsoft.powershell"}` }, - { name: localize('welcomePage.dataVirtualization', "Data Virtualization"), id: 'microsoft.datavirtualization', description: localize('welcomePage.dataVirtualizationDescription', "Virtualize data with SQL Server 2019 and create external tables using interactive wizards"), icon: require.toUrl('./../../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.datavirtualization"}` }, - { name: localize('welcomePage.PostgreSQL', "PostgreSQL"), id: 'microsoft.azuredatastudio-postgresql', description: localize('welcomePage.PostgreSQLDescription', "Connect, query, and manage Postgres databases with Azure Data Studio"), icon: require.toUrl('./../../media/icon_postgre_sql.png'), link: `command:azdata.extension.open?{"id":"microsoft.azuredatastudio-postgresql"}` }, + { name: localize('welcomePage.powershell', "Powershell"), id: 'microsoft.powershell', description: localize('welcomePage.powershellDescription', "Write and execute PowerShell scripts using Azure Data Studio's rich query editor"), icon: require.toUrl('./../media/icon_powershell.png'), link: `command:azdata.extension.open?{"id":"microsoft.powershell"}` }, + { name: localize('welcomePage.dataVirtualization', "Data Virtualization"), id: 'microsoft.datavirtualization', description: localize('welcomePage.dataVirtualizationDescription', "Virtualize data with SQL Server 2019 and create external tables using interactive wizards"), icon: require.toUrl('./../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.datavirtualization"}` }, + { name: localize('welcomePage.PostgreSQL', "PostgreSQL"), id: 'microsoft.azuredatastudio-postgresql', description: localize('welcomePage.PostgreSQLDescription', "Connect, query, and manage Postgres databases with Azure Data Studio"), icon: require.toUrl('./../media/icon_postgre_sql.png'), link: `command:azdata.extension.open?{"id":"microsoft.azuredatastudio-postgresql"}` }, ]; const extensionPackStrings = { @@ -262,7 +262,7 @@ class WelcomePage extends Disposable { const resource = URI.parse(require.toUrl('./az_data_welcome_page')) .with({ scheme: Schemas.walkThrough, - query: JSON.stringify({ moduleId: 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page' }) + query: JSON.stringify({ moduleId: 'sql/workbench/contrib/welcome/browser/az_data_welcome_page' }) }); this.editorInput = this.instantiationService.createInstance(WalkThroughInput, { typeId: welcomeInputTypeId, diff --git a/src/sql/workbench/contrib/welcome/constants.ts b/src/sql/workbench/contrib/welcome/constants.ts deleted file mode 100644 index 0f4c3c3d44..0000000000 --- a/src/sql/workbench/contrib/welcome/constants.ts +++ /dev/null @@ -1,7 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -// Link is regularly updated with new information from release. -export const NOTIFY_READMORE_LINK = 'https://aka.ms/azuredatastudio-connection'; diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/enablePreviewFeatures.ts b/src/sql/workbench/contrib/welcome/electron-sandbox/enablePreviewFeatures.ts similarity index 95% rename from src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/enablePreviewFeatures.ts rename to src/sql/workbench/contrib/welcome/electron-sandbox/enablePreviewFeatures.ts index 7f0c07232e..2afc0910e4 100644 --- a/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/enablePreviewFeatures.ts +++ b/src/sql/workbench/contrib/welcome/electron-sandbox/enablePreviewFeatures.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AbstractEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/browser/abstractEnablePreviewFeatures'; +import { AbstractEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/browser/abstractEnablePreviewFeatures'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IHostService } from 'vs/workbench/services/host/browser/host'; diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts b/src/sql/workbench/contrib/welcome/electron-sandbox/gettingStarted.contribution.ts similarity index 89% rename from src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts rename to src/sql/workbench/contrib/welcome/electron-sandbox/gettingStarted.contribution.ts index 0c0f1d32a4..510b84f78a 100644 --- a/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts +++ b/src/sql/workbench/contrib/welcome/electron-sandbox/gettingStarted.contribution.ts @@ -6,8 +6,8 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle'; -import { NativeEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/electron-browser/enablePreviewFeatures'; -import { ShowGettingStartedAction } from 'sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted'; +import { NativeEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/electron-sandbox/enablePreviewFeatures'; +import { ShowGettingStartedAction } from 'sql/workbench/contrib/welcome/electron-sandbox/gettingStarted'; import { registerAction2 } from 'vs/platform/actions/common/actions'; Registry diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.ts b/src/sql/workbench/contrib/welcome/electron-sandbox/gettingStarted.ts similarity index 100% rename from src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.ts rename to src/sql/workbench/contrib/welcome/electron-sandbox/gettingStarted.ts diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/media/serverIcon.svg b/src/sql/workbench/contrib/welcome/gettingStarted/media/serverIcon.svg deleted file mode 100644 index f1daee0e8c..0000000000 --- a/src/sql/workbench/contrib/welcome/gettingStarted/media/serverIcon.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/media/connections.png b/src/sql/workbench/contrib/welcome/media/connections.png similarity index 100% rename from src/sql/workbench/contrib/welcome/gettingStarted/media/connections.png rename to src/sql/workbench/contrib/welcome/media/connections.png diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/media/diamondIcon.svg b/src/sql/workbench/contrib/welcome/media/diamondIcon.svg similarity index 100% rename from src/sql/workbench/contrib/welcome/gettingStarted/media/diamondIcon.svg rename to src/sql/workbench/contrib/welcome/media/diamondIcon.svg diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/media/extensions.png b/src/sql/workbench/contrib/welcome/media/extensions.png similarity index 100% rename from src/sql/workbench/contrib/welcome/gettingStarted/media/extensions.png rename to src/sql/workbench/contrib/welcome/media/extensions.png diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/media/notebooks.png b/src/sql/workbench/contrib/welcome/media/notebooks.png similarity index 100% rename from src/sql/workbench/contrib/welcome/gettingStarted/media/notebooks.png rename to src/sql/workbench/contrib/welcome/media/notebooks.png diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/media/settings.png b/src/sql/workbench/contrib/welcome/media/settings.png similarity index 100% rename from src/sql/workbench/contrib/welcome/gettingStarted/media/settings.png rename to src/sql/workbench/contrib/welcome/media/settings.png diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/media/welcome.png b/src/sql/workbench/contrib/welcome/media/welcome.png similarity index 100% rename from src/sql/workbench/contrib/welcome/gettingStarted/media/welcome.png rename to src/sql/workbench/contrib/welcome/media/welcome.png diff --git a/src/sql/workbench/contrib/welcome/page/browser/media/connections.png b/src/sql/workbench/contrib/welcome/page/browser/media/connections.png deleted file mode 100644 index 35648c998661ac3f004bed0d81aca524702584cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30825 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

$eo)tZObwqM5glzTB48K)~qNyPf3ewdCY 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 z

YmccYs+{MElVp^@Vp*R9)z{*baWUz+T6c_7<5e0|E4LZ%9rlth|~ z1cfN6qKGkz)y-JWe4#g2n))SWY8xR`U2k`n%zh1vfZLlJmeKEH_tbVPGxWB1HMEW< zoRN;{Z?-cGsa)=_;6_17{vKSYn!6f_t8jYYh?YsNJc;0FBAjXr1HI69Sr?Z~K;#zS4YBvqoIZ){6yG zn||WoM*;S@h>|U6V0p}%>$oD~{g`1-aWGCuufm;`_SkI?`U@0I`Y7AgGLWptumjYh z-^qZ%uYG1n{z!W5@zjP>NhgbE(ojv$(f8-_$+fq4RVwJE>4Nr2eSpDI zjfy;9h56>>A@5??!QgkE`190tDlYeRf?YQ*KSivEbHS@Nd3z-6Zo$DyF2Ui^WiWa@ zrVo)WI_@T1&4x(MP*?J2AGF>M)=o^1pmy}4u@LgxL}Wo2&%jtWN68jD4%MLQ-Gej6;kmc06PlP( zGieUN-Y+R0^NZHZ_zWG?8NXk1l(bOO94bzwPb{ju9fcYWLNL+}&Aahs42)u)Z`~&t zWL@z5A-79E2T?IKa+-|7YAzX$#iQ4|_6=Q;7Arr)aTUx&QL-VA)hgA?S0RNK?8L~& z_7pv~yh`U+&l3<}8Ge%0ME0Qf)%UVY+|CuunlNuNAaVjkF#RUu`y_ne zGBjz#1P`%>*uZ}w_Gp*=h%$K5fBel?Atm+J|8a%cR@VPPX)rct2ecQ}g$$dCqnN0r zdyO(NXgmn}Z0OD^8+JM6;v?pK5%!}{^kU5;0s2?ow|(jaeya5@bDuw+kO&ufjxF0Y z`^B76gFF#CkFy{iNm5WS6=Q7yO{k`v9dxiuqdcxKHSzV1-yxBHWbb_G^)#e$jy>q5 zqr`My3Lf43jmJTy(a0z69%4{5qjjvPmlit@#pfx($&i!A{$y6Px()Kf;@i83V8BfR zUQ0MR@TShbW-7f~($FvGh zA91*478l&hGlSY}79x@w3>g@cnqm@ll9-T#Wf+4}pTyX!qwF1SQ9!o+L%;5>C4^_s zRd|?FPm84JO+n&h@PS6~7E@5rM2NyO&6Z-@+lNA9N&D`- z9l!+2x}z=OPgQbF0-!P<*+Dy840d2GKf+mKgn%oNfHhru00dE8q?kMs^TfYXV(tb^2fH3UlI60-XR7-ae zW!fH>qsE#!11gZsFJ z#AfY3w}-%G%!16h1kxIRoidYaTv#a^;X zGf<0E@K+}mTJIJeI*AfSS@l@Zz}V^gmQgl_vmUoLEBQ2z5?WBBB&Xe6&0EzhfA56~k1PqTiTKg|M)q$m2_k(%gM_D(@rTA(5Sq;n%V;J=>ov)WVNvVKCb0@2gB~TX6`QEFvxHmAt|pjz`gcTr zF}sbca`W&NiZafE!%nwzl5EVjtBTF?Vl%_@t$%he3}fYuAn{i?aIId3Rx_Qw=0DkC zw8`8V;qIx7jRO#z>c6)#cB}aB)a>5r*1&Xgw_QhjAZTUDPAZZ?ed5;R+si?JHZAlD z{GxZn%=g=8=nZpmG%7<6N-Z0&kzZaqzyD{JHzftoKVw{;d{XZtApqjWds+nI8>8=) z;qtt!pfTX@ENE6HuQnW*_}qO(9Q>m4-d-r#kry(JtKZd5b{V-=cHy|&wo9M9R7N}5 zdrE}LQC42V|FETOwe-QDhP%k>R{wYZ;0x4GDymjDD{3!ml!TP7*vXb(EC*v!w!Y?k z)8X^<*hML12j7{v!6D5>ViU#oGpvIm918Zm@loShFoTc)$qLMuDr~E)XAxyDj@xLH zlTJM=RyTn&3r@`gn`?-WB=*nu{SP-uPrn~egHi&??JE<+otWI3dnHJ!lTqPHI2*2W zbC}WTQ-)Q^V-jf^XWb}f_uZVl5aEwVQ(H$Z-~@5hye~F!H4sIdEOm|j+AV~q=apnt(K!T9-43?aH&_?=CmUvTk@Um+>xjP!JRv?>mn z+Z++mi#rWc#Ae;V>F*Ql1)R|B527!L1xiZ2*rO8Mtd}T2yVYpt5kqdx9PA99sKTBP z9A{b+^qbK_1cb8TE0ljjR|X7$g{>XDTNnX!u$)>_qp$(GI8$o#=Gw6USUrt}(w^8% z`*uV-AZjcFOTe&1HYOh(3<$r>HDpvw95w7AOFsiI$a zNRI=5zv)hGCK(Iq=1;RYJ@C6|+O0K6RJ$J2x*u&3a#*Vt0=m*Ff_R$JMk@Vs&AqYx zW?T@_&@_0O)AoYsCfl^LSK|D=KHA2&bfd=9Zgq>Nbq#c}f7`CH9#WWgv(|)Ic;k{x zNLbn~T*QLI0fm+Is;@#gx)H%aW@<~+^pyc!@6$O2F?@Wwov14t!9gz+*R;V>KEXtH z<5go=bQ1CIPetleUNRJQhu7hWAqkoP7dSV^$XF49@;GIQ5+3AkjcruRUl;kDoMqj| zTZFx@+u40FYmmEnjC^M7p+Mf(FtRNDde>OD(=)?MQYKQ#NA}4`RK|#E*T=0nv%6|g zQBnbCcQ;hY30GCy!!4j;lcu7m2!@lZctIT01t>{Lm$A9Q!N~&-Ue2(qDwTkD0jkTY z;TRMu`_-T{ITIA1PU4SqbgVtqmkIV+SyX!J;_w=@92CG@Al(={uI#6VZ}UI6uKN2g*XK@1v~{c z+oE7*E-aEomo8n)U(A`B% ze(2Dl>N5lPbOo8(xmk0A{akz!S{A$qn^HYfL&H|Ei3LIdNdZPbe^Uz>@y6$?u^@Rvt{=LucJJP; zNPx#u5Yy_R7G`Q=JdV}}trEr~C`3slv^-3=7_AqQ5M4|ZsucKj!ELlE*uLpvVw=?B zxt-Pk>w9nvjKy$&meQpwiNv;b>sHl1uL=F>d{Myj#WqO-6!s(>k_t(KZI}Xo)~s3T zn$`s^8G`$=02T?6V<54yZvN=a?BZ=Xsbh5Kam($%Zr3_#Ll1 ztsnj+X_Dmlo@1aZj{TBw*dDhtRXj<88Y{8{h23~dhv&*yAEh@x_< zGBUVbBzi^JW+H#~v8`Bg%z_6ejD?${c0X!d9<+EmcQYF=1wVxztpo~LE+V9$WR*V( z$GR>T3Q=TG7CHLJ&B88TO22ehD5;j%|(%HlO({l*awfN71L1P92@)QzHE6CKr~e32SIv%b-HE>F5bjmJFNc z!gBNrhD$-dT2G+~MB{QmPu&9XQB#qD%_|epJ=hN#8kY;Ypp=HjWrCf=_r`XK#ihXU zgFCS+AQBID(E)Ug%ZDo>ojYH37wyqc%o#wO8N|T44y0>noErgA-7qOSKu_V-xU6V# z0wHNIK6*u^Vp|? zxeB{EnMg@O%zn$1B1~p@E|4IZwuE`6G&GtEx?$&RKZKph>1sySqeFWlCcpSW-HSAirS3px%39=!|jsVf)7nefSb23GH|pxVd4)WB+8 z{XecpX=fiyYM@P)&z=9)^H{OJ6@EMYNwDP|^QPg$)tT`0aL44IJ%MgsnfT~~w~?6d zioo_m@bG<8;8zxpx8DC6`;At3>CrncNuD&D5D2XgS`tik&h#VAu|!UsIMJm2X>qW4 zll#d+158)W%)2BMrb=hNEVIxK_oJE5G4e&Lh54YE?2yNg963_ujAA^dW5 zcrOq<1bBTS&WT!gPdxJCG;~wtJO*Lfi=KGy!!3B>HxGlqT3TWp9D_Q*wKNM^RgSO} zBx2Q~EW3+XrI!&_3|4Ovm2zd=$jRqavyYM)rwD((cVD z@`=TOPA3)FiW6A5XcO|~ZRepkp+lexZhrCw*gv-zWPp=8^qsdFkXOvT=~Y;?Y^t4$_c*vx4f6BCUr zp>$demjg__{?=P>;ma?-RIV-t;z=qL{uKPoOiPmBe*8@0Fl&F%{l$ceOdv>7;A}7M z%i~FcjK46UAh(fhnA?g(qupd07Xw!(M~v>=8gH)Hiukk~^oR^bOQE((1fYWjgGV&{ zeSQxh@T6h?%bN{}Q5yK@WC`!M-N3{fELgCw@%EQ|Y+$S$^J}pd@+%tO&r1~UAt^w7 zA+S~m;P#Og%-Y|$V9OBUA3MQ<+IJ1)%ICCr;OA2eyz;4#(MTa6k-GUVV)=wwU=hoz zQqCbT)xhI-88}v_n(d|!t>-l91p~!s9+I}r!=bDylxC-3%g%#v_4Gz)pqF}uhX=yT zAs^o^U5<2%C;Tf8$?v`&6{$P$(Ld&kyD9?J`~HUwsbc*EhM*?p1orRGur_S(4uAPR zJlqHSmMp@Fb6h`nzet2-RU@~kT=xAKk3I5RY^wG_tH6enp;i>eW9G+;k(6(nn6k}+ z=y7rTF?Q??%B^%cz$A-z-+i|d?6h7e=$Y1>Zh{>KI*@>S2Xw`@#8mun@Hi&- zYLAvcjmVF}VnYD|Cl};wt`J85W0=%25L?@TdwywSGiXb!}+H0vJF}o6!atp&PHKbT7reA z=u$gZoP>dT#%`ugovH|j?KPBMUPI$zP$O|Sd$~7T`Fo>NXdp@}Tdr)dy||!4<%d##%7rZ3_;4VPJ3J*~jgeBijCb7DPu|(0RPLqSA3u$cPgX>SKZ1Ap>{zvbKA} zz0yzo+54u61r+^?1>K^7F5Q6KMCA=rU8EndA5<{$u_9BE+zn8%E{|wB} zFfg$@lfpx+bg>}BFiH{`6fUR#uh-@K`35S)0MC}7_boR_P&-<@0D%TdOT-EYvIgWm zM1KtNqETVs2igB)dBuxB7k4`x>dCYGod#xpVqjN+1h(%Jaws$qCQA8G5%TS2|LjC- zE%r)j*WO#+%VU=y)=AeXVu8rm+Dh!El)k3|1ONT6#A}2o9(r7^#X$o-#{#`O%0988 z9E#g&>AwxU_nCooA(7j~vhk90-?G@i2h#r!i3W!EZ#em6{O;xOX*UMJW>L_Z3KUk_ zp+lQ!wZFfgJ627fj-wHMF}70}!b1b#9UO_>Uwniw7wt!Di3j)dFTjV>Kf zH^W2htqOZDM2DDl(u=Wv#th8bxf}6^_aetN27@GyvEjY9Ft;QO_w|WFU@H%N`McM! z1DV*dejA)a+as_%0bhPS7kg4`@X#+GMVOlq{;D~cvrt_5Jx5|}-)Pty)-i8BbQGQ1 zbbyzOJ!;B}uw?c^_;t7rZ9^}<=1+^Kb2kM$EAr8TU_joi@JC_aSou{AjZ2M7mCoJP zFei(g%aYexpg5Dkqh4VpkSG|mm3Oi@GQDu;`Q4@#=+VPD($>?IE;3k;nmOT)&{ z1frpFmBYc=4dvB_THDbW+$5G^+v+148oC~chK7cQMl*56SRiIvcQfx51Lx*TL*rTi z)0cd-emB-0I*v#`FZ|z#-iYw^f-SIjF7V$sB_0wA-26CjqaX0+KLa@u7MXY-@bCn& zLbSg@!^XHG>VYu$w`tQRH6@ox75TY+`}S(lA7^9fTIm|s0y2wAP*Prrf8IVC`_rYB{(Jz9s|+npAk3)y<(FS! z@Ss7MI%O)HoSjioUXC3*cH*OtW?(?5DH;h3KWjb$%j=|R*G4( zW;Xa;L+vrJPSV)Ff4@pSLV?fN2~(j^$PXPlR3$?sVXRrR24lyLRjErxj~=aRdobQ| z2q^739+uN&I6$zUQrf;V( zr<;kOP^SycbQAF}-A3F_%OE2o1N-*vQ!b{4;ws#S?a^|fMMKaH#?Q>y%b8&$5~hw| z)?PDpL{wCivQX#}YYcQ{X=rF@TuZPCfl!bJ1o$i0QB$iC(h_LM8mQZLV;~7I26FiD zVU>uHWWlVt6!^3_SQv_x1-YH^3dSLZ3>ku*J9joXHJD_4CN3tgav@2GuP_YIIZGJXMjTQ;rTeLz* zEEf{cHeF$KgON;HwQ8kG;hHJpP0+%iyKCLLb&53TDl^l`bNnPF9kxzLY*Eg#v*ci3M7EAX zaZWBg0z*|>6~(zIF1Lr1k%#Q8Ofkh>;1$#c?hb{>NJ-)hV)#b%fRBe0G84C;q+E9K z2$5$x64m*M;wi{NtsD~=B}$%)1Bx>aASFz@WtAf+ zELailo;9B!J8(Egc50>eE=@ZIct?t&=ZNymeJD6mptieo?k8S|rs&$$C`*>OtCuI- zyf0+ZOeyl?O5oW!5cV|{$V)DOXLOLd##K3)C@FP;Ph|7tNAbFEuxo!T`u)5oE;LuO zrAp$wG6wI~*5CQ~j~lUH#xQzR&$I3!n-r9~7??tu@r6Ny24TdA5y}bc`vq z2_9efGv8C&H)lL?d)?Rw1-eNlrW>mMK6PDdCfS(p&DmK*{g{i{C)?+Kb;qG`b>U(Q zN*zqg#_VkeuxR%YjOpAORDou0-H*K~S?W7KcUJ^^+s3WAK8#}bKl%Lpwb^qCb(9ykB1w|i! zC+zxh4oZUiAj0!Z3TbfyF+uH}+C5_veCZrm8ZC{BB@lNPCq(&qV^>NBuJ0Hl)YJW4jbnF5@UvHG>r=iMw5QYuwj-&g3L}*k8$WL~7OTbG)fw3$>|%yLk5C*(a)~cG_2`c_A+AU$iNTnu6A%*A3N=T!A)(ww z;*;5E+oeAOyxfHRmcY_+Jo>b9SAx~fQjIElHA33K)5k?Df|+od_%^zY?}dbwpTetW zKg7NB8V=2zjrgy=gG;x;sLJ>Oo1T3Z@r%~T=l<|;D@W4G>Dc*)f8xX%Q4pr|K>pgz zs0a*$ed=oL*k^}`2sb2r`yRGF|0>ebT;Lp$i+z822^pK$BK^l7Q5rD}p#fhby>b}B zLJAPK@_R&%y9osg-^b<`|AylmJ>fMh2IX6Sz|Jqe!ok;HM{;E#0@`}x$lqSV-Z%e? zgrsr=_w0z=EuUk@YoDRqtp~!c3x!dUf$jf#4sp}|hty(6gm)JO;qA|GY}H?I=%c-` z3?2qQH&Lo<%8@1Cx9J)Kr5ZbWphFa}aA7vO^bCh%9i3jMSJTkAL~wO@mA^^YGWTsUX(};vd?do{CZO=+?@%DI%k`*iF`j*l91%Na*zd@v0b z=URAleGoogwb(CKPy64#4*!~T z>#gv!--i{`_aJE8KvX9$M$)b>XoW(QJN3rsxlbc?`*Bnk?4_ZxMUEiHT-@H zULMxi4hB3zx?{-1Zpb>Y1YfV+hK}RHR8p<$CyzY2Pp-T|(4kjH?47d!CABr;&*+KP z{?oC0b13{eKA?o7gL??Njk*t=!mRF^lzrmzX)^+$#yYXGB+k*r9j-wg(eb(|@b>bB ztD6J%ON^yeS8+Kdufd6eT6A-8!tnwoUlAdD{0M3S$H1`&i0CyLy+R$}=^re@DhVC| z!!T&_T`(Owj$Ywt*LDE*&zmc;f@+3t&VrL~cl3;S6LzuP;i4GB4lW`DtEw%iN2_PR zXZ#(AjT9?1g0X-?IQhiL%T31L8sU+}I5t<}v(EM~N?l=8+oQU;9CqcA!WLzyt|+kz z*DCRENBgmDRBd?& ze{mb`Is%WdP?79z2A9G_^#JT7Mm9iP zRx1xAV)33M=pGRaTVdII23CJB7RL-AF7y2RGk~7B?Q5)@`!2R@--(E@lOj27jcj{I zUf-ceZE%8Dt9}?csvWj2STBZ+Jz_fd!j7HZXculBe|1SZ_N;ghD;Ir%Ly1|+x^ngm zLc5{2!N}Z>+~NuedV9h*ARM0VZg4QH?K+A;?l@pLO84!8TiZzFZ2MgL{TG&OFF>Cz zkxI0?`-RJK!6%QApm6pYY>@G-T{RbZ)}#;c@av8K1KQw_#6ij%Ox!JjejyCIQ)|Cm z5!JyT`_>&rfAKYrEnkPS%CiSlRhW$9i#|c#p-gy$`k~sWLhgp|ad7$< z$lD;Ut|f8s=pKyHPyd5G)Bc2n?Nta4yYN||`TKrAMgLCluGe*o&%!cmfG`aSXG#%_ ze=zWD&WO_S5RI0=#m>TF`u5}51*#5+tCRSYgM3j`UWw$~Lio5jBii4`X0xyktrpoY ze;q|8v=w)ilXxxirRnHKVy`5SoU|h-l8;@&DcdI;quc5rXo z0UlyGlqDZQafOFiav`d(;v;fQW&w3CBng{&JrAKWC@O z;po!JHWL}HRb=dsM}asE+jR;$>$?^w5ay?fk3Wpz!-gxOpv6HV;aZEt!~`5XbP)I4 zbB|h=p`md(akUT#XD^;Bn}deNrGia@=v+)k7gTfdU@`4TeEcDF>D*bZ+UA-LzG#UY zPfAibsOql;;RC~T>Sme}rfj!mnh-PbA~W@JrF-w*y`iCTrGn1^vq79I?T?1WrGQNc zglR-JZrp@1V@5ZNM3`Qk`K4G;%E7^2xv&Zf@>RQLrro-rg>vG=36(m8mI~``Fo)H} z*4kh@W=eLF2m7Xrjs5AORvH=_mkNb>`Ec>|LGxD~wG3=RAapO$lKAn*A5}r7rY2M* zNC-^Zg4)ok9p zS+zy0gJi@s?dD2#rYK>(5VI{aV=r9?Buy5jVkTdb4Uai+;DB05&m@aHH`YvHI(Uv- z_ggoE5G*~O*Uo|ulE zu;FkDW^UP!@~Uc8g>dQKqu6vb1)Gnh;z~rtK?5^)8Q6Hp`Z;qqusiGY_s%{_=3~bm z;R}(UZX$V8QzsQM9wf=*7r6@B}(sR`GW`53={WG~O zyF^aYg3|nKMD!hv!JSSrZA}T%`Mtc@K4I@30H?I&SbOreN!_;snMNSIs*^B#{$iX+ zJC3b~4#3051M%OlMM7GEbyl3nv`ullQP|M@=2GCxKN)a{mg~^UO1_-FwEh$M?V_#M zoEL}hGv^y95`8Bm;LIj$Mj%Iy994q+aukyyDCqCJ^G-F@m+=>7^QEw6LPkyprWHU7 zg$Ws%k(cB~BH$S5nqmPg7LB6i(YJ43<+`F3!EC#S@7N7hQAN)0Spu?Bet{kFH@vci6);Vf-O;Ax$?eNwncUVhV-!1nSxsn z!a_azi$yRJXunCc{fc^h3n9hylzl{qwU@TKx937ku_lfJgYUIq;THzTOXZ?*rzeZ% z?`Rct_VW3lNb2k5*u0%WC?Yp2at%}!OB+3y_TJikiI5`82p!Kh&C$8vo5->;4sD@2q4u6XP_9Ox*&SD(T1TZEm}#KnWI z8rBqVPB~i&;&TQ6%xt<1!OYrA3xb5fTIUZv^bjUZnxwv?mBJVX1v!N`trH4*g5*IG zYA9|(lAy)FzBvVg&vYmAUQ*bglnlG_6hJfKKS*Fo2~Do_Ya z7xz=|jzGjb1IZV7n4?%7fnldD5IYe_vtBVU={5uHho5#&H3<36SG3&Xv^&JTJ~9eZo_G<{rag{mqX4@zs_^?izJ_Vf+=v~^4=B>}iM|d`PJ11H zdG-+mJBe~R?m;{;b;RjK^dduQl?9T9wX3!x^IWSP?Hv%3C)RDX1y1f>2n_avYjy$h z^GeS@U?GnQ&sxx4#M7@HHn29u{6el@^hpckJg`|kkmi+=p$FKzRID zUwx%WY}~kUD&C@F9~xIWlEfY4CvKmIA2U!U!Z}=A{(UdtI44nd`*e|bNNeloIMG&b zd&Ppmt_J?~6)>o`D1wdXh$SMll7#@;CZ65*U0u%Hw{RQqsgTT?hYaQGzf%Y!L;?&=CWtF*p7`vSt`tR3tc&g=E$9_1?yy)3ys`~!mo|E|lV`oHHGXq3D66hP zbybaM{i(<+^FOt{qSCtLz|PJdHPy9BiLETnLq&C!THod-ZYCOLPJRuqKRNv6Z&3Nj zzwlMB47~cz_H&M*ASD4wv3}_9?JBX4j_5z2FAgN9AhV(t9dUjHM*|b()j?t(e~_3{ z|6f?s{|^~%jWL}MEuIUD8vfX^W7Sky*6E;?K!Tw5&)~FKXQM7i1igCoI`x@BB;tk} zZaB4#RtMu44C>dl0Qi|N6C^Mb436_vzb%3!KtZEA!Xl7bAM(%gu3EeJBx*au0jCI^(A9ZE>Ywr^FscJ!-)uarIOu z7k+~&7EX~CeAQYB)51p(W{9U>M% z*ZTUU1l^y0$3SR=1<(J{f|PZ}S$$X6Baj_)3_Sa93vLukCq<6mBII*a0_ZPE3?(8I z`2Ab5{afI{H!Tcv;7sFAWV1jpm@&z^Q5)?^O$$ z2KKHP)3*=2TrSNzwrkb`(a^Y9TrCzzW_BK2-92D$*SL_dhfW2gVSDI$AQ~E1IUHO) zkzdAD291-1yHPFy+*)X8*b-L^ftWSO&7e8gXYj9He5avte(>2jR}944%?b886sTci zv^as73+i;M5L7>}PB{O002&c>=gjaNhCYCvtR1q+w$!SR$_Ja*p@xvw3tefM#E zId>akqXY2pU4!84Y@0_gbB}?!?*s8Zz{uNxaUFp#rU7yJz}?RQquW43!{%u59MD|l z{l*(_D*x@&DO2&tBah4Go*4#U(S- zesE1kpFVw6HeM%3Ckb47skIt+-*q>ZEnB8D;c8r!=+i42!v?gK*n`z~>UQGZ?d3M74ZBYfO#8$V`6#S)D`dw1p+z&1r^ZHusLjEKQp^6 z)3MX#WM;3uP|!W~)?05PA>kN0cIX5*cQ@3CmUiIa0jyfJQZ3-C53cO|=%bHRzjSd; zm@q-DM8DYe9)*R4YUT~&FW-IloyvX1)$o%iPqxWg61F#Y?p&2(g;R|C^y#A(Q8pJ$ z^!Uv;->7sjetv$cdLwg@aWy?%f=n@U>#et{Rr4BG2CC%Vp1*VtvT}+sX>51c0_DX_ z>0v=YTj0KNz>cHVd{jz1lz$v7))}1|8n%W_2!ts^D6|;6Xih#XV!?t1>Qx^N5ePv+ z$=p<2M8#~oTp50`mI|}#GPf2}qmY<>_q*Sz1&Ivg+k!yY_H)lYr?T}jpB8g*T`b0r zAFtYC>UyT5XPYF!pa1;lDlH6CvSakP!awRWQwlg;t)0ogo;Ct@J2cN0p*REZw z+8R1^s1nSySg83k{}t1zaDS#^VK!iX&+q7p+r4}Dsp4473~Yk6NSGF$V`N5P=Hgnh zVuiBGNCZp~&q)PLlR|5P@gRZ=H3`NxIHcwj)66}sk=Qsea=9hH_&eq&|@<2$&0}E z@+eNZ7YMXn!A=d0Q?MCQTm?@Y^9?cnL96#%pm^DR6BxA;mQDbB_VYWe+AXCsYJ220S zmfjtA+@UfFbNuExnjk^)c(%>!Lb4-CG0CHjBVB%U=@5pu|8naY+y3;M3AhyKd|M5A z+auJ69S>&3JCC5nt4;J5t{2i79!d-aG;w0 z%VTJna4Zz4d{KbX4Q0BbD9FuqCbSglx~M4dIi?XKMktHGv{=}_Ip3ay#W)7rrS(Dr zpupxfT42oB%kL=oH*DCTTw?XzU>qN>8TThS(c0ix_@3?Xds;K*EHrN8x$s;W2dWEN zI3!dO8uwuqVIEJnAg`?^kZT+Kjd`y$hN5aNB-D`*4co$I>D;M3Q&=_?blXtlr|_!} z3Tg(L8zUF9?ChE~Ym}d#L23rp`JNeYsi`kqxKIh(e*O9>(lFPX(A7lYO}CH<3Tj#% zO!LmR=tAN#6zUY(?8h8aT`>M)y1ppnNp7oGuU6NC)=NY26K>;q(^}#E z=gpg^tP;A+NRmupPpgQ+gRVQ02G5rgM z3yT(jDe&qpB%~{e!C?wn3c$K6()phIQRAo3r#p#4n=T#-Qd66!bwV(Fetgfi_?d)5ON1avkXZPgNe<>1_?hR!;5)%SObfs~5BAA( zw#RYp!GqkX!yle!O^&2XadpDI5)1@Y`i2MYVi~T z*9vGA>B@$e51K$UG|r7{Hb)4pj%$fL2u&Uu8X8v;9I9$;U!_Vz<63}2t)6_Kp>Zz! YKdYafHOAj*egFUf07*qoM6N<$g51wNH2?qr diff --git a/src/sql/workbench/services/assessment/test/assessmentService.test.ts b/src/sql/workbench/services/assessment/test/common/assessmentService.test.ts similarity index 100% rename from src/sql/workbench/services/assessment/test/assessmentService.test.ts rename to src/sql/workbench/services/assessment/test/common/assessmentService.test.ts diff --git a/src/sql/workbench/services/dialog/browser/dialog.module.ts b/src/sql/workbench/services/dialog/browser/dialog.module.ts index b374844dab..636a46f613 100644 --- a/src/sql/workbench/services/dialog/browser/dialog.module.ts +++ b/src/sql/workbench/services/dialog/browser/dialog.module.ts @@ -18,10 +18,10 @@ import { ModelComponentWrapper } from 'sql/workbench/browser/modelComponents/mod import { ComponentHostDirective } from 'sql/base/browser/componentHost.directive'; import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; -import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component'; +import { EditableDropDown } from 'sql/platform/editableDropdown/browser/editableDropdown.component'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; -import { SelectBox } from 'sql/platform/browser/selectBox/selectBox.component'; -import { InputBox } from 'sql/platform/browser/inputbox/inputBox.component'; +import { SelectBox } from 'sql/platform/selectBox/browser/selectBox.component'; +import { InputBox } from 'sql/platform/inputBox/browser/inputBox.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/sql/workbench/services/query/common/resultSerializer.ts b/src/sql/workbench/services/query/common/resultSerializer.ts index d61428c249..2a30b3adb1 100644 --- a/src/sql/workbench/services/query/common/resultSerializer.ts +++ b/src/sql/workbench/services/query/common/resultSerializer.ts @@ -14,7 +14,7 @@ import * as nls from 'vs/nls'; import Severity from 'vs/base/common/severity'; import { INotificationService, INotification } from 'vs/platform/notification/common/notification'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { getRootPath, resolveCurrentDirectory } from 'sql/platform/common/pathUtilities'; +import { getRootPath, resolveCurrentDirectory } from 'sql/platform/workspace/common/pathUtilities'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IFileDialogService, FileFilter } from 'vs/platform/dialogs/common/dialogs'; import { IOpenerService } from 'vs/platform/opener/common/opener'; diff --git a/src/sql/workbench/services/restore/browser/restoreDialog.ts b/src/sql/workbench/services/restore/browser/restoreDialog.ts index 64f6506229..caf2fc749f 100644 --- a/src/sql/workbench/services/restore/browser/restoreDialog.ts +++ b/src/sql/workbench/services/restore/browser/restoreDialog.ts @@ -43,7 +43,7 @@ import { fileFiltersSet } from 'sql/workbench/services/restore/common/constants' import { ILayoutService } from 'vs/platform/layout/browser/layoutService'; import { Dropdown } from 'sql/base/browser/ui/editableDropdown/browser/dropdown'; import { IBackupRestoreUrlBrowserDialogService } from 'sql/workbench/services/backupRestoreUrlBrowser/common/urlBrowserDialogService'; -import { MediaDeviceType } from 'sql/workbench/contrib/backup/common/constants'; +import { MediaDeviceType } from 'sql/workbench/common/backup/constants'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration'; import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility'; import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; diff --git a/src/sql/workbench/services/restore/browser/restoreViewModel.ts b/src/sql/workbench/services/restore/browser/restoreViewModel.ts index fac34a74a1..62a6c7dad2 100644 --- a/src/sql/workbench/services/restore/browser/restoreViewModel.ts +++ b/src/sql/workbench/services/restore/browser/restoreViewModel.ts @@ -10,7 +10,7 @@ import * as types from 'vs/base/common/types'; import { Event, Emitter } from 'vs/base/common/event'; import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { coalesce } from 'vs/base/common/arrays'; -import { MediaDeviceType } from 'sql/workbench/contrib/backup/common/constants'; +import { MediaDeviceType } from 'sql/workbench/common/backup/constants'; export interface RestoreOptionsElement { optionMetadata: azdata.ServiceOption; diff --git a/src/sql/workbench/services/restore/common/mssqlRestoreInfo.ts b/src/sql/workbench/services/restore/common/mssqlRestoreInfo.ts index dfb759f7fe..2f6360ac36 100644 --- a/src/sql/workbench/services/restore/common/mssqlRestoreInfo.ts +++ b/src/sql/workbench/services/restore/common/mssqlRestoreInfo.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as azdata from 'azdata'; -import { MediaDeviceType } from 'sql/workbench/contrib/backup/common/constants'; +import { MediaDeviceType } from 'sql/workbench/common/backup/constants'; export class MssqlRestoreInfo implements azdata.RestoreInfo { diff --git a/src/tsec.exemptions.json b/src/tsec.exemptions.json index 27a60bd213..c1dcd660a5 100644 --- a/src/tsec.exemptions.json +++ b/src/tsec.exemptions.json @@ -60,7 +60,7 @@ "sql/workbench/services/objectExplorer/browser/iconRenderer.ts", "sql/workbench/services/resourceProvider/browser/firewallRuleDialog.ts", "sql/workbench/services/notebook/browser/outputs/renderers.ts", - "sql/workbench/contrib/welcome/page/browser/welcomePage.ts", + "sql/workbench/contrib/welcome/browser/welcomePage.ts", "sql/workbench/contrib/editData/browser/editDataResultsEditor.ts", "sql/workbench/contrib/jobManagement/browser/jobHistoryTree.ts", "sql/workbench/contrib/notebook/browser/outputs/mimeRenderer.component.ts", diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts index 470667ee25..01d8c85d86 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts @@ -431,7 +431,7 @@ import 'vs/workbench/contrib/surveys/browser/ces.contribution'; import 'vs/workbench/contrib/surveys/browser/languageSurveys.contribution'; // Welcome -import 'sql/workbench/contrib/welcome/page/browser/welcomePage.contribution'; // {{SQL CARBON EDIT}} - add welcome page contribution +import 'sql/workbench/contrib/welcome/browser/welcomePage.contribution'; // {{SQL CARBON EDIT}} - add welcome page contribution // import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution'; // {{SQL CARBON EDIT}} - remove vscode getting started import 'vs/workbench/contrib/welcomeWalkthrough/browser/walkThrough.contribution'; import 'vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution'; diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts index fe5d14937d..71bdc92416 100644 --- a/src/vs/workbench/workbench.desktop.main.ts +++ b/src/vs/workbench/workbench.desktop.main.ts @@ -170,7 +170,7 @@ import 'vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribu // {{SQL CARBON EDIT}} - SQL added contributions // Telemetry Opt Out -import 'sql/workbench/contrib/welcome/telemetryOptOut/electron-sandbox/telemetryOptOut.contribution'; +import 'sql/workbench/contrib/telemetry/electron-sandbox/telemetryOptOut.contribution'; //#endregion @@ -178,9 +178,9 @@ export { main } from 'vs/workbench/electron-sandbox/desktop.main'; // {{SQL CARBON EDIT}} - SQL-specific services import { ISqlOAuthService } from 'sql/platform/oAuth/common/sqlOAuthService'; -import { SqlOAuthService } from 'sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl'; +import { SqlOAuthService } from 'sql/platform/oAuth/electron-sandbox/sqlOAuthServiceImpl'; import { IClipboardService as sqlIClipboardService } from 'sql/platform/clipboard/common/clipboardService'; -import { ClipboardService as sqlClipboardService } from 'sql/platform/clipboard/electron-browser/clipboardService'; +import { ClipboardService as sqlClipboardService } from 'sql/platform/clipboard/electron-sandbox/clipboardService'; import { IAzureBlobService } from 'sql/platform/azureBlob/common/azureBlobService'; import { AzureBlobService } from 'sql/workbench/services/azureBlob/browser/azureBlobService'; import { IAzureAccountService } from 'sql/platform/azureAccount/common/azureAccountService'; @@ -196,7 +196,7 @@ registerSingleton(IAzureAccountService, AzureAccountService, InstantiationType.D // getting started // CLI -import 'sql/workbench/contrib/commandLine/electron-browser/commandLine.contribution'; +import 'sql/workbench/contrib/commandLine/electron-sandbox/commandLine.contribution'; //getting started -import 'sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution'; +import 'sql/workbench/contrib/welcome/electron-sandbox/gettingStarted.contribution'; diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts index fb47dc258d..3544389a8c 100644 --- a/src/vs/workbench/workbench.web.main.ts +++ b/src/vs/workbench/workbench.web.main.ts @@ -216,9 +216,9 @@ export { //#region {{SQL CARBON EDIT}} - SQL added contributions // Getting Started -import 'sql/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution'; +import 'sql/workbench/contrib/welcome/browser/gettingStarted.contribution'; // Telemetry Opt Out -import 'sql/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut.contribution'; +import 'sql/workbench/contrib/telemetry/browser/telemetryOptOut.contribution'; //#endregion