mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 18:46:40 -05:00
Layering of everything else but query (#5085)
* layer profiler and edit data * relayering everything but query * fix css import * readd qp * fix script src * fix hygiene
This commit is contained in:
@@ -3,7 +3,8 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data: vscode-remote:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https: vscode-remote:;">
|
||||
<!-- {{SQL CARBON EDIT}} @anthonydresser add 'unsafe-eval' under script src; since its required by angular -->
|
||||
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data: vscode-remote:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https: vscode-remote:;">
|
||||
</head>
|
||||
<body class="vs-dark" aria-label="">
|
||||
</body>
|
||||
|
||||
@@ -33,7 +33,7 @@ import { Parts, IWorkbenchLayoutService } from 'vs/workbench/services/layout/bro
|
||||
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
|
||||
|
||||
// {{SQL CARBON EDIT}}
|
||||
import { convertEditorInput } from 'sql/parts/common/customInputConverter';
|
||||
import { convertEditorInput } from 'sql/workbench/common/customInputConverter';
|
||||
|
||||
|
||||
interface IEditorPartUIState {
|
||||
|
||||
@@ -16,7 +16,7 @@ import { coalesce } from 'vs/base/common/arrays';
|
||||
// {{SQL CARBON EDIT}}
|
||||
import { QueryInput } from 'sql/parts/query/common/queryInput';
|
||||
import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
|
||||
import * as CustomInputConverter from 'sql/parts/common/customInputConverter';
|
||||
import * as CustomInputConverter from 'sql/workbench/common/customInputConverter';
|
||||
import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput';
|
||||
|
||||
const EditorOpenPositioning = {
|
||||
|
||||
@@ -30,7 +30,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
|
||||
import { withNullAsUndefined, withUndefinedAsNull } from 'vs/base/common/types';
|
||||
|
||||
//{{SQL CARBON EDIT}}
|
||||
import { convertEditorInput, getFileMode } from 'sql/parts/common/customInputConverter';
|
||||
import { convertEditorInput, getFileMode } from 'sql/workbench/common/customInputConverter';
|
||||
//{{SQL CARBON EDIT}} - End
|
||||
|
||||
type ICachedEditorInput = ResourceEditorInput | IFileEditorInput | DataUriEditorInput;
|
||||
|
||||
@@ -453,8 +453,8 @@ import 'sql/workbench/api/node/sqlExtHost.contribution';
|
||||
import 'sql/workbench/parts/connection/browser/connection.contribution';
|
||||
import 'sql/parts/query/common/query.contribution';
|
||||
import 'sql/parts/query/editor/resultsGridContribution';
|
||||
import 'sql/parts/profiler/contrib/profiler.contribution';
|
||||
import 'sql/parts/profiler/contrib/profilerActions.contribution';
|
||||
import 'sql/workbench/parts/profiler/browser/profiler.contribution';
|
||||
import 'sql/workbench/parts/profiler/browser/profilerActions.contribution';
|
||||
import 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution';
|
||||
import 'sql/platform/accounts/browser/accountManagement.contribution';
|
||||
|
||||
@@ -479,9 +479,9 @@ import 'sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.contribution';
|
||||
import 'sql/workbench/parts/dashboard/widgets/webview/webviewWidget.contribution';
|
||||
import 'sql/workbench/parts/dashboard/dashboardConfig.contribution';
|
||||
/* Model-based Views */
|
||||
import 'sql/parts/modelComponents/components.contribution';
|
||||
import 'sql/workbench/electron-browser/modelComponents/components.contribution';
|
||||
/* View Model Editor */
|
||||
import 'sql/parts/modelComponents/modelEditor/modelViewEditor.contribution';
|
||||
import 'sql/workbench/electron-browser/modelComponents/modelViewEditor.contribution';
|
||||
/* Notebook Editor */
|
||||
import 'sql/workbench/parts/notebook/notebook.contribution';
|
||||
/* Containers */
|
||||
|
||||
Reference in New Issue
Block a user