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

Resource viewer cleanup (#13168)

Browse Source 
* Resource viewer cleanup

* uneeded

* Only show in insiders
This commit is contained in:
Charles Gagnon
2020-10-30 16:48:50 -07:00
committed by GitHub
parent c6f72e6504
commit d7767c7d91
9 changed files with 37 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/sql/workbench/contrib/resourceViewer/browser/resourceViewer.contribution.ts
View File

@@ -12,9 +12,17 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
import { isString } from 'vs/base/common/types';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
import { ResourceViewResourcesExtensionHandler } from 'sql/workbench/contrib/resourceViewer/common/resourceViewerViewExtensionPoint';
import { ResourceViewerView } from 'sql/workbench/contrib/resourceViewer/browser/resourceViewerView';
import { ResourceViewerViewlet } from 'sql/workbench/contrib/resourceViewer/browser/resourceViewerViewlet';
import { RESOURCE_VIEWER_VIEW_CONTAINER_ID, RESOURCE_VIEWER_VIEW_ID } from 'sql/workbench/contrib/resourceViewer/common/resourceViewer';
import { Codicon } from 'vs/base/common/codicons';
import { localize } from 'vs/nls';
import { Extensions as ViewContainerExtensions, IViewsRegistry, IViewContainersRegistry, ViewContainerLocation } from 'vs/workbench/common/views';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IProductService } from 'vs/platform/product/common/productService';
CommandsRegistry.registerCommand({
id: 'resourceViewer.openResourceViewer',
@@ -41,39 +49,28 @@ Registry.as<IEditorRegistry>(EditorExtensions.Editors)
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(ResourceViewResourcesExtensionHandler, LifecyclePhase.Ready);
// TODO: chgagnon disabling until the resource viewer is feature complete
// class ResourceViewerContributor implements IWorkbenchContribution {
// constructor(
// @IExtensionService private readonly extensionService: IExtensionService
// ) {
// this.checkForArc();
// }
class ResourceViewerContributor implements IWorkbenchContribution {
constructor(
@IConfigurationService readonly configurationService: IConfigurationService,
@IProductService readonly productService: IProductService
) {
if (productService.quality !== 'stable' && productService.quality !== 'saw' && configurationService.getValue('workbench.enablePreviewFeatures')) {
registerResourceViewerContainer();
}
}
}
// private async checkForArc(): Promise<void> {
// if (await this.extensionService.getExtension('Microsoft.arc')) {
// registerResourceViewerContainer();
// } else {
// const disposable = this.extensionService.onDidChangeExtensions(async () => {
// if (await this.extensionService.getExtension('Microsoft.arc')) {
// registerResourceViewerContainer();
// disposable.dispose();
// }
// });
// }
// }
// }
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(ResourceViewerContributor, LifecyclePhase.Ready);
// Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(ResourceViewerContributor, LifecyclePhase.Ready);
function registerResourceViewerContainer() {
const viewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({
id: RESOURCE_VIEWER_VIEW_CONTAINER_ID,
name: localize('resourceViewer', "Resource Viewer"),
ctorDescriptor: new SyncDescriptor(ResourceViewerViewlet),
icon: Codicon.database.classNames,
alwaysUseContainerInfo: true
}, ViewContainerLocation.Sidebar);
// function registerResourceViewerContainer() {
// const viewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
// id: RESOURCE_VIEWER_VIEW_CONTAINER_ID,
// name: localize('resourceViewer', "Resource Viewer"),
// ctorDescriptor: new SyncDescriptor(ResourceViewerViewlet),
// icon: Codicon.database.classNames,
// alwaysUseContainerInfo: true
// }, ViewContainerLocation.Sidebar);
// const viewsRegistry = Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry);
// viewsRegistry.registerViews([{ id: RESOURCE_VIEWER_VIEW_ID, name: localize('resourceViewer', "Resource Viewer"), containerIcon: Codicon.database.classNames, ctorDescriptor: new SyncDescriptor(ResourceViewerView), canToggleVisibility: false, canMoveView: false }], viewContainer);
// }
const viewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);
viewsRegistry.registerViews([{ id: RESOURCE_VIEWER_VIEW_ID, name: localize('resourceViewer', "Resource Viewer"), containerIcon: Codicon.database.classNames, ctorDescriptor: new SyncDescriptor(ResourceViewerView), canToggleVisibility: false, canMoveView: false }], viewContainer);
}

13
src/sql/workbench/contrib/resourceViewer/browser/resourceViewerActions.ts
View File

@@ -7,19 +7,6 @@ import { Action } from 'vs/base/common/actions';
import * as nls from 'vs/nls';
import { ResourceViewerInput } from 'sql/workbench/browser/editor/resourceViewer/resourceViewerInput';
export class ResourceViewerEditColumns extends Action {
public static readonly ID = 'resourceViewer.editColumns';
public static readonly LABEL = nls.localize('resourceViewer.editColumns', "Edit Columns");
constructor() {
super(ResourceViewerEditColumns.ID, ResourceViewerEditColumns.LABEL, 'codicon edit');
}
public async run(input: ResourceViewerInput): Promise<void> {
}
}
export class ResourceViewerRefresh extends Action {
public static readonly ID = 'resourceViewer.refresh';
public static readonly LABEL = nls.localize('resourceViewer.refresh', "Refresh");

4
src/sql/workbench/contrib/resourceViewer/browser/resourceViewerEditor.ts
View File

@@ -17,7 +17,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { ResourceViewerInput } from 'sql/workbench/browser/editor/resourceViewer/resourceViewerInput';
import { ResourceViewerTable } from 'sql/workbench/contrib/resourceViewer/browser/resourceViewerTable';
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
import { ResourceViewerEditColumns, ResourceViewerRefresh } from 'sql/workbench/contrib/resourceViewer/browser/resourceViewerActions';
import { ResourceViewerRefresh } from 'sql/workbench/contrib/resourceViewer/browser/resourceViewerActions';
import { IAction } from 'vs/base/common/actions';
import { fillInActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
@@ -67,10 +67,8 @@ export class ResourceViewerEditor extends EditorPane {
header.className = 'resource-viewer-header';
this._actionBar = this._register(new Taskbar(header));
const editColumnsAction = this._register(this._instantiationService.createInstance(ResourceViewerEditColumns));
const refreshAction = this._register(this._instantiationService.createInstance(ResourceViewerRefresh));
this._actionBar.setContent([
{ action: editColumnsAction },
{ action: refreshAction }
]);
return header;

2
src/sql/workbench/contrib/resourceViewer/browser/resourceViewerView.ts
View File

@@ -136,7 +136,7 @@ class TreeModel {
private readonly registry = Registry.as<ResourceViewerResourcesRegistry>(Extensions.ResourceViewerExtension);
getChildren(): ResourceType[] {
return this.registry.allResources.slice();
return this.registry.allResources.filter(resource => resource.id === 'azure-resources');
}
}

1
src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts
View File

@@ -65,7 +65,6 @@ export interface NotebookConfig {
remoteBookDownloadTimeout: number;
showAllKernels: boolean;
showCellStatusBar: boolean;
showNotebookConvertActions: boolean;
sqlStopOnError: boolean;
trustedBooks: Array<string>;
useExistingPython: boolean;