diff --git a/src/sql/platform/dashboard/browser/insightRegistry.ts b/src/sql/platform/dashboard/browser/insightRegistry.ts index fbd009217b..1183c90e4e 100644 --- a/src/sql/platform/dashboard/browser/insightRegistry.ts +++ b/src/sql/platform/dashboard/browser/insightRegistry.ts @@ -7,6 +7,7 @@ import * as platform from 'vs/platform/registry/common/platform'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; import { values } from 'vs/base/common/collections'; +import { IInsightsConfig } from 'sql/platform/extensions/common/extensions'; export type InsightIdentifier = string; @@ -14,52 +15,6 @@ export const Extensions = { InsightContribution: 'dashboard.contributions.insights' }; -export interface IInsightsConfig { - cacheId?: string; - type: any; - name?: string; - when?: string; - gridItemConfig?: ISize; - query?: string | Array; - queryFile?: string; - details?: IInsightsConfigDetails; - autoRefreshInterval?: number; - id?: string; -} - -export interface IInsightsLabel { - column: string; - icon?: string; - state?: Array; -} - -export interface IStateCondition { - condition: { - if: string, - equals?: string - }; - color?: string; - icon?: string; -} - -export interface IInsightsConfigDetails { - query?: string | Array; - queryFile?: string; - label?: string | IInsightsLabel; - value?: string; - actions?: { - types: Array; - database?: string; - server?: string; - user?: string; - }; -} - -export interface ISize { - x: number; - y: number; -} - export interface IInsightData { columns: Array; rows: Array>; diff --git a/src/sql/platform/dashboard/browser/widgetRegistry.ts b/src/sql/platform/dashboard/browser/widgetRegistry.ts index 1a99a8f5cc..765bfed8c4 100644 --- a/src/sql/platform/dashboard/browser/widgetRegistry.ts +++ b/src/sql/platform/dashboard/browser/widgetRegistry.ts @@ -6,7 +6,7 @@ import * as platform from 'vs/platform/registry/common/platform'; import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry'; +import { IInsightsConfig } from 'sql/platform/extensions/common/extensions'; export type WidgetIdentifier = string; diff --git a/src/sql/platform/extensions/common/extensions.ts b/src/sql/platform/extensions/common/extensions.ts new file mode 100644 index 0000000000..025f69c9d2 --- /dev/null +++ b/src/sql/platform/extensions/common/extensions.ts @@ -0,0 +1,83 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { IExtensionContributions as vsIExtensionContributions } from 'vs/platform/extensions/common/extensions'; + + +export interface ISize { + x: number; + y: number; +} + +export interface IInsightsConfigDetails { + query?: string | Array; + queryFile?: string; + label?: string | IInsightsLabel; + value?: string; + actions?: { + types: Array; + database?: string; + server?: string; + user?: string; + }; +} + +export interface IInsightsLabel { + column: string; + icon?: string; + state?: Array; +} + +export interface IStateCondition { + condition: { + if: string, + equals?: string + }; + color?: string; + icon?: string; +} + +export interface IInsightsConfig { + cacheId?: string; + type: any; + name?: string; + when?: string; + gridItemConfig?: ISize; + query?: string | Array; + queryFile?: string; + details?: IInsightsConfigDetails; + autoRefreshInterval?: number; + id?: string; +} + +export interface IInsightTypeContrib { + id: string; + contrib: IInsightsConfig; +} + +export type IUserFriendlyIcon = string | { light: string; dark: string; }; + +export interface IDashboardTabContrib { + id: string; + title: string; + container: { [key: string]: any }; + provider: string | string[]; + when?: string; + description?: string; + alwaysShow?: boolean; + isHomeTab?: boolean; + group?: string; + icon?: IUserFriendlyIcon; +} + +export interface IInsightTypeContrib { + id: string; + contrib: IInsightsConfig; +} + +export interface IExtensionContributions extends vsIExtensionContributions { + readonly 'dashboard.insights'?: IInsightTypeContrib | IInsightTypeContrib[]; + readonly 'dashboard.tabs'?: IDashboardTabContrib | IDashboardTabContrib[] +} diff --git a/src/sql/workbench/browser/actions.ts b/src/sql/workbench/browser/actions.ts index b58d5d5f1c..70876eecc4 100644 --- a/src/sql/workbench/browser/actions.ts +++ b/src/sql/workbench/browser/actions.ts @@ -14,11 +14,11 @@ import { ObjectMetadata } from 'azdata'; import { Action } from 'vs/base/common/actions'; import * as nls from 'vs/nls'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; -import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { URI } from 'vs/base/common/uri'; import { IAccountManagementService } from 'sql/platform/accounts/common/interfaces'; import { ILogService } from 'vs/platform/log/common/log'; +import { IInsightsConfig } from 'sql/platform/extensions/common/extensions'; export interface BaseActionContext { object?: ObjectMetadata; diff --git a/src/sql/workbench/contrib/charts/browser/actions.ts b/src/sql/workbench/contrib/charts/browser/actions.ts index 67a51d5a66..d4f1caf9e7 100644 --- a/src/sql/workbench/contrib/charts/browser/actions.ts +++ b/src/sql/workbench/contrib/charts/browser/actions.ts @@ -12,7 +12,6 @@ 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 { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry'; import { IInsightOptions } from 'sql/workbench/contrib/charts/common/interfaces'; import { QueryEditorInput } from 'sql/workbench/common/editor/query/queryEditorInput'; import { IFileService } from 'vs/platform/files/common/files'; @@ -25,6 +24,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput'; import { ChartView } from 'sql/workbench/contrib/charts/browser/chartView'; import { ConfigureChartDialog } from 'sql/workbench/contrib/charts/browser/configureChartDialog'; +import { IInsightsConfig } from 'sql/platform/extensions/common/extensions'; export interface IChartActionContext { options: IInsightOptions; diff --git a/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts index ce6efaf6b8..d9a4c306e1 100644 --- a/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts @@ -15,22 +15,9 @@ import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/ import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.contribution'; import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.contribution'; import { values } from 'vs/base/common/collections'; -import { IUserFriendlyIcon } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { isValidIcon, createCSSRuleForIcon } from 'sql/workbench/contrib/dashboard/browser/dashboardIconUtil'; import { IDashboardTabGroup, IDashboardTab } from 'sql/workbench/services/dashboard/browser/common/interfaces'; - -export interface IDashboardTabContrib { - id: string; - title: string; - container: { [key: string]: any }; - provider: string | string[]; - when?: string; - description?: string; - alwaysShow?: boolean; - isHomeTab?: boolean; - group?: string; - icon?: IUserFriendlyIcon; -} +import { IDashboardTabContrib } from 'sql/platform/extensions/common/extensions'; export interface IDashboardTabGroupContrib { id: string; diff --git a/src/sql/workbench/contrib/dashboard/browser/core/dashboardWidget.ts b/src/sql/workbench/contrib/dashboard/browser/core/dashboardWidget.ts index c3f9953ee5..2afd76bb5a 100644 --- a/src/sql/workbench/contrib/dashboard/browser/core/dashboardWidget.ts +++ b/src/sql/workbench/contrib/dashboard/browser/core/dashboardWidget.ts @@ -9,6 +9,7 @@ import { Action } from 'vs/base/common/actions'; import { Disposable } from 'vs/base/common/lifecycle'; import { TabType } from 'sql/base/browser/ui/panel/tab.component'; import { IDashboardTab } from 'sql/workbench/services/dashboard/browser/common/interfaces'; +import { IUserFriendlyIcon } from 'sql/platform/extensions/common/extensions'; export interface IDashboardWidget { actions: Array; @@ -47,7 +48,6 @@ export interface TabConfig extends IDashboardTab { } -export type IUserFriendlyIcon = string | { light: string; dark: string; }; export interface NavSectionConfig { id: string; diff --git a/src/sql/workbench/contrib/dashboard/browser/dashboardIconUtil.ts b/src/sql/workbench/contrib/dashboard/browser/dashboardIconUtil.ts index 813f1fd8b4..9b05fede90 100644 --- a/src/sql/workbench/contrib/dashboard/browser/dashboardIconUtil.ts +++ b/src/sql/workbench/contrib/dashboard/browser/dashboardIconUtil.ts @@ -3,12 +3,12 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IUserFriendlyIcon } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { asCSSUrl, createCSSRule } from 'vs/base/browser/dom'; import { IdGenerator } from 'vs/base/common/idGenerator'; import * as resources from 'vs/base/common/resources'; import * as nls from 'vs/nls'; import { IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry'; +import { IUserFriendlyIcon } from 'sql/platform/extensions/common/extensions'; const ids = new IdGenerator('contrib-dashboard-icon-'); export function createCSSRuleForIcon(icon: IUserFriendlyIcon, extension: IExtensionPointUser): string { diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component.ts index e3998dfd7f..c2980889c1 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component.ts @@ -15,7 +15,7 @@ import { DashboardWidget, IDashboardWidget, WIDGET_CONFIG, WidgetConfig } from ' import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { ComponentHostDirective } from 'sql/base/browser/componentHost.directive'; import { InsightAction, InsightActionContext } from 'sql/workbench/browser/actions'; -import { Extensions, IInsightRegistry, IInsightsConfig, IInsightsView, getWidgetAutoRefreshState } from 'sql/platform/dashboard/browser/insightRegistry'; +import { Extensions, IInsightRegistry, IInsightsView, getWidgetAutoRefreshState } from 'sql/platform/dashboard/browser/insightRegistry'; import { resolveQueryFilePath } from 'sql/workbench/services/insights/common/insightsUtils'; import { RunInsightQueryAction } from './actions'; @@ -35,6 +35,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { IFileService } from 'vs/platform/files/common/files'; import { URI } from 'vs/base/common/uri'; import { subscriptionToDisposable } from 'sql/base/browser/lifecycle'; +import { IInsightsConfig } from 'sql/platform/extensions/common/extensions'; const insightRegistry = Registry.as(Extensions.InsightContribution); diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.contribution.ts index 7aca59d43d..489d690697 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.contribution.ts @@ -7,13 +7,13 @@ import { join } from 'vs/base/common/path'; import { registerDashboardWidget, registerNonCustomDashboardWidget } from 'sql/platform/dashboard/browser/widgetRegistry'; import { Extensions as InsightExtensions, IInsightRegistry, setWidgetAutoRefreshState } from 'sql/platform/dashboard/browser/insightRegistry'; -import { IInsightTypeContrib } from './interfaces'; import { insightsContribution, insightsSchema } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidgetSchemas'; import { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { ServicesAccessor } from 'vs/editor/browser/editorExtensions'; +import { IInsightTypeContrib } from 'sql/platform/extensions/common/extensions'; const insightRegistry = Registry.as(InsightExtensions.InsightContribution); diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/interfaces.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/interfaces.ts deleted file mode 100644 index 2a03ce361e..0000000000 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/interfaces.ts +++ /dev/null @@ -1,11 +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 { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry'; - -export interface IInsightTypeContrib { - id: string; - contrib: IInsightsConfig; -} \ No newline at end of file diff --git a/src/sql/workbench/contrib/extensions/browser/contributionRenders.ts b/src/sql/workbench/contrib/extensions/browser/contributionRenders.ts index 5fe863ad9c..e4fa572ba7 100644 --- a/src/sql/workbench/contrib/extensions/browser/contributionRenders.ts +++ b/src/sql/workbench/contrib/extensions/browser/contributionRenders.ts @@ -4,10 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import { append, $ } from 'vs/base/browser/dom'; -import { IInsightTypeContrib } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/interfaces'; -import { IDashboardTabContrib } from 'sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution'; import { localize } from 'vs/nls'; import { IExtensionManifest } from 'vs/platform/extensions/common/extensions'; +import { IDashboardTabContrib, IExtensionContributions, IInsightTypeContrib } from 'sql/platform/extensions/common/extensions'; class ContributionReader { constructor(private manifest: IExtensionManifest) { } @@ -15,7 +14,7 @@ class ContributionReader { public dashboardInsights(): IInsightTypeContrib[] { let contributes = this.manifest.contributes; if (contributes) { - let insights: IInsightTypeContrib | IInsightTypeContrib[] = contributes['dashboard.insights']; + let insights = (contributes as IExtensionContributions)['dashboard.insights']; if (insights) { if (!Array.isArray(insights)) { return [insights]; @@ -23,13 +22,13 @@ class ContributionReader { return insights; } } - return undefined; + return []; } public dashboardTabs(): IDashboardTabContrib[] { let contributes = this.manifest.contributes; if (contributes) { - let tabs: IDashboardTabContrib | IDashboardTabContrib[] = contributes['dashboard.tabs']; + let tabs = (contributes as IExtensionContributions)['dashboard.tabs']; if (tabs) { if (!Array.isArray(tabs)) { return [tabs]; @@ -37,7 +36,7 @@ class ContributionReader { return tabs; } } - return undefined; + return []; } } @@ -56,17 +55,17 @@ function renderDashboardTabs(onDetailsToggle: Function, contributionReader: Cont } const details = $('details', { open: true, ontoggle: onDetailsToggle }, - $('summary', null, localize('tabs', "Dashboard Tabs ({0})", tabs.length)), - $('table', null, - $('tr', null, - $('th', null, localize('tabId', "Id")), - $('th', null, localize('tabTitle', "Title")), - $('th', null, localize('tabDescription', "Description")) + $('summary', undefined, localize('tabs', "Dashboard Tabs ({0})", tabs.length)), + $('table', undefined, + $('tr', undefined, + $('th', undefined, localize('tabId', "Id")), + $('th', undefined, localize('tabTitle', "Title")), + $('th', undefined, localize('tabDescription', "Description")) ), - ...tabs.map(tab => $('tr', null, - $('td', null, $('code', null, tab.id)), - $('td', null, tab.title ? tab.title : tab.id), - $('td', null, tab.description), + ...tabs.map(tab => $('tr', undefined, + $('td', undefined, $('code', undefined, tab.id)), + $('td', undefined, tab.title ? tab.title : tab.id), + $('td', undefined, tab.description ?? ''), )) ) ); @@ -83,17 +82,17 @@ function renderDashboardInsights(onDetailsToggle: Function, contributionReader: } const details = $('details', { open: true, ontoggle: onDetailsToggle }, - $('summary', null, localize('insights', "Dashboard Insights ({0})", insights.length)), - $('table', null, - $('tr', null, - $('th', null, localize('insightId', "Id")), - $('th', null, localize('name', "Name")), - $('th', null, localize('insight condition', "When")) + $('summary', undefined, localize('insights', "Dashboard Insights ({0})", insights.length)), + $('table', undefined, + $('tr', undefined, + $('th', undefined, localize('insightId', "Id")), + $('th', undefined, localize('name', "Name")), + $('th', undefined, localize('insight condition', "When")) ), - ...insights.map(insight => $('tr', null, - $('td', null, $('code', null, insight.id)), - $('td', null, insight.contrib.name ? insight.contrib.name : insight.id), - $('td', null, insight.contrib.when), + ...insights.map(insight => $('tr', undefined, + $('td', undefined, $('code', undefined, insight.id)), + $('td', undefined, insight.contrib.name ? insight.contrib.name : insight.id), + $('td', undefined, insight.contrib.when ?? ''), )) ) ); diff --git a/src/sql/workbench/services/insights/browser/insightsDialogController.ts b/src/sql/workbench/services/insights/browser/insightsDialogController.ts index a894519842..17085a590f 100644 --- a/src/sql/workbench/services/insights/browser/insightsDialogController.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogController.ts @@ -20,7 +20,7 @@ import { ILogService } from 'vs/platform/log/common/log'; import { IFileService } from 'vs/platform/files/common/files'; import { URI } from 'vs/base/common/uri'; import { IInsightsDialogModel } from 'sql/workbench/services/insights/browser/insightsDialogService'; -import { IInsightsConfigDetails } from 'sql/platform/dashboard/browser/insightRegistry'; +import { IInsightsConfigDetails } from 'sql/platform/extensions/common/extensions'; export class InsightsDialogController { private _queryRunner: QueryRunner; diff --git a/src/sql/workbench/services/insights/browser/insightsDialogModel.ts b/src/sql/workbench/services/insights/browser/insightsDialogModel.ts index 72ead55108..66fc77c6d4 100644 --- a/src/sql/workbench/services/insights/browser/insightsDialogModel.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogModel.ts @@ -6,7 +6,7 @@ import { IInsightsDialogModel, ListResource } from 'sql/workbench/services/insights/browser/insightsDialogService'; import { Event, Emitter } from 'vs/base/common/event'; -import { IInsightsConfigDetails, IInsightsLabel } from 'sql/platform/dashboard/browser/insightRegistry'; +import { IInsightsConfigDetails, IInsightsLabel } from 'sql/platform/extensions/common/extensions'; export enum Conditional { 'equals', diff --git a/src/sql/workbench/services/insights/browser/insightsDialogService.ts b/src/sql/workbench/services/insights/browser/insightsDialogService.ts index c71ca7c1b7..9b02bb527c 100644 --- a/src/sql/workbench/services/insights/browser/insightsDialogService.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogService.ts @@ -7,7 +7,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { BaseActionContext } from 'sql/workbench/browser/actions'; -import { IInsightsConfigDetails, IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry'; +import { IInsightsConfigDetails, IInsightsConfig } from 'sql/platform/extensions/common/extensions'; export interface IInsightsDialogModel { rows: string[][]; diff --git a/src/sql/workbench/services/insights/browser/insightsDialogServiceImpl.ts b/src/sql/workbench/services/insights/browser/insightsDialogServiceImpl.ts index 71ea835a91..3864207927 100644 --- a/src/sql/workbench/services/insights/browser/insightsDialogServiceImpl.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogServiceImpl.ts @@ -8,8 +8,8 @@ import { InsightsDialogView } from 'sql/workbench/services/insights/browser/insi import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IInsightsDialogModel, IInsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService'; import { InsightsDialogModel } from 'sql/workbench/services/insights/browser/insightsDialogModel'; -import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry'; import { InsightsDialogController } from 'sql/workbench/services/insights/browser/insightsDialogController'; +import { IInsightsConfig } from 'sql/platform/extensions/common/extensions'; export class InsightsDialogService implements IInsightsDialogService { _serviceBrand: undefined; diff --git a/src/sql/workbench/services/insights/browser/insightsDialogView.ts b/src/sql/workbench/services/insights/browser/insightsDialogView.ts index 8a6a787620..9ce96afd62 100644 --- a/src/sql/workbench/services/insights/browser/insightsDialogView.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogView.ts @@ -36,7 +36,6 @@ import { SplitView, Orientation, Sizing } from 'vs/base/browser/ui/splitview/spl import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ILogService } from 'vs/platform/log/common/log'; -import { IInsightsConfigDetails } from 'sql/platform/dashboard/browser/insightRegistry'; import { TaskRegistry } from 'sql/workbench/services/tasks/browser/tasksRegistry'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; @@ -49,6 +48,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { ILayoutService } from 'vs/platform/layout/browser/layoutService'; import { Registry } from 'vs/platform/registry/common/platform'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; +import { IInsightsConfigDetails } from 'sql/platform/extensions/common/extensions'; const labelDisplay = nls.localize("insights.item", "Item"); const valueDisplay = nls.localize("insights.value", "Value"); diff --git a/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts b/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts index 2d9741ed73..2ec3fb45f3 100644 --- a/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts +++ b/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts @@ -15,11 +15,11 @@ import { equal } from 'assert'; import { Mock, MockBehavior, It } from 'typemoq'; import { Emitter } from 'vs/base/common/event'; import { InsightsDialogModel } from 'sql/workbench/services/insights/browser/insightsDialogModel'; -import { IInsightsConfigDetails } from 'sql/platform/dashboard/browser/insightRegistry'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices'; +import { IInsightsConfigDetails } from 'sql/platform/extensions/common/extensions'; const testData: string[][] = [ ['1', '2', '3', '4'], diff --git a/src/sql/workbench/services/insights/test/browser/insightsDialogModel.test.ts b/src/sql/workbench/services/insights/test/browser/insightsDialogModel.test.ts index 5f06debf85..a550813f1d 100644 --- a/src/sql/workbench/services/insights/test/browser/insightsDialogModel.test.ts +++ b/src/sql/workbench/services/insights/test/browser/insightsDialogModel.test.ts @@ -7,7 +7,7 @@ import { InsightsDialogModel } from 'sql/workbench/services/insights/browser/ins import { isUndefinedOrNull } from 'vs/base/common/types'; import * as assert from 'assert'; -import { IInsightsLabel, IInsightsConfigDetails } from 'sql/platform/dashboard/browser/insightRegistry'; +import { IInsightsLabel, IInsightsConfigDetails } from 'sql/platform/extensions/common/extensions'; suite('Insights Dialog Model Tests', () => { test('does parse condition right', () => { diff --git a/src/tsconfig.vscode.json b/src/tsconfig.vscode.json index 91559be6d5..1d4f6da075 100644 --- a/src/tsconfig.vscode.json +++ b/src/tsconfig.vscode.json @@ -42,7 +42,6 @@ "./sql/workbench/contrib/dataExplorer/**/*.ts", // 3275 errors "./sql/workbench/contrib/editData/**/*.ts", // 579 errors "./sql/workbench/contrib/editorReplacement/**/*.ts", // 3315 errors - "./sql/workbench/contrib/extensions/**/*.ts", // 45 errors "./sql/workbench/contrib/jobManagement/**/*.ts", // 315 errors "./sql/workbench/contrib/modelView/**/*.ts", // 3253 errors "./sql/workbench/contrib/notebook/**/*.ts", // 3740 errors