Remove Unused Splitter (#874)
This commit is contained in:
parent
2c296ede35
commit
8f6cac3d35
|
@ -158,16 +158,6 @@ export class DocumentsGridMetrics {
|
||||||
public static DocumentEditorMaxWidthRatio: number = 0.4;
|
public static DocumentEditorMaxWidthRatio: number = 0.4;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ExplorerMetrics {
|
|
||||||
public static SplitterMinWidth: number = 240;
|
|
||||||
public static SplitterMaxWidth: number = 400;
|
|
||||||
public static CollapsedResourceTreeWidth: number = 36;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class SplitterMetrics {
|
|
||||||
public static CollapsedPositionLeft: number = ExplorerMetrics.CollapsedResourceTreeWidth;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class Areas {
|
export class Areas {
|
||||||
public static ResourceTree: string = "Resource Tree";
|
public static ResourceTree: string = "Resource Tree";
|
||||||
public static ContextualPane: string = "Contextual Pane";
|
public static ContextualPane: string = "Contextual Pane";
|
||||||
|
|
|
@ -1,7 +1,3 @@
|
||||||
import * as ko from "knockout";
|
|
||||||
|
|
||||||
import { SplitterMetrics } from "./Constants";
|
|
||||||
|
|
||||||
export enum SplitterDirection {
|
export enum SplitterDirection {
|
||||||
Horizontal = "horizontal",
|
Horizontal = "horizontal",
|
||||||
Vertical = "vertical",
|
Vertical = "vertical",
|
||||||
|
@ -28,14 +24,12 @@ export class Splitter {
|
||||||
public lastX!: number;
|
public lastX!: number;
|
||||||
public lastWidth!: number;
|
public lastWidth!: number;
|
||||||
|
|
||||||
private isCollapsed: ko.Observable<boolean>;
|
|
||||||
private bounds: SplitterBounds;
|
private bounds: SplitterBounds;
|
||||||
private direction: SplitterDirection;
|
private direction: SplitterDirection;
|
||||||
|
|
||||||
constructor(options: SplitterOptions) {
|
constructor(options: SplitterOptions) {
|
||||||
this.splitterId = options.splitterId;
|
this.splitterId = options.splitterId;
|
||||||
this.leftSideId = options.leftId;
|
this.leftSideId = options.leftId;
|
||||||
this.isCollapsed = ko.observable<boolean>(false);
|
|
||||||
this.bounds = options.bounds;
|
this.bounds = options.bounds;
|
||||||
this.direction = options.direction;
|
this.direction = options.direction;
|
||||||
this.initialize();
|
this.initialize();
|
||||||
|
@ -83,23 +77,4 @@ export class Splitter {
|
||||||
};
|
};
|
||||||
|
|
||||||
private onResizeStop: JQueryUI.ResizableEvent = () => $("iframe").css("pointer-events", "auto");
|
private onResizeStop: JQueryUI.ResizableEvent = () => $("iframe").css("pointer-events", "auto");
|
||||||
|
|
||||||
public collapseLeft() {
|
|
||||||
this.lastX = $(this.splitter).position().left;
|
|
||||||
this.lastWidth = $(this.leftSide).width();
|
|
||||||
$(this.splitter).css("left", SplitterMetrics.CollapsedPositionLeft);
|
|
||||||
$(this.leftSide).css("width", "");
|
|
||||||
$(this.leftSide).resizable("option", "disabled", true).removeClass("ui-resizable-disabled"); // remove class so splitter is visible
|
|
||||||
$(this.splitter).removeClass("ui-resizable-e");
|
|
||||||
this.isCollapsed(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public expandLeft() {
|
|
||||||
$(this.splitter).addClass("ui-resizable-e");
|
|
||||||
$(this.leftSide).css("width", this.lastWidth);
|
|
||||||
$(this.splitter).css("left", this.lastX);
|
|
||||||
$(this.splitter).css("left", ""); // this ensures the splitter's position is not fixed and enables movement during resizing
|
|
||||||
$(this.leftSide).resizable("enable");
|
|
||||||
this.isCollapsed(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,7 +31,6 @@ exports[`SettingsComponent renders 1`] = `
|
||||||
"_isInitializingNotebooks": false,
|
"_isInitializingNotebooks": false,
|
||||||
"_resetNotebookWorkspace": [Function],
|
"_resetNotebookWorkspace": [Function],
|
||||||
"canSaveQueries": [Function],
|
"canSaveQueries": [Function],
|
||||||
"collapsedResourceTreeWidth": 36,
|
|
||||||
"databases": [Function],
|
"databases": [Function],
|
||||||
"isAccountReady": [Function],
|
"isAccountReady": [Function],
|
||||||
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
||||||
|
@ -75,18 +74,6 @@ exports[`SettingsComponent renders 1`] = `
|
||||||
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
||||||
"setNotificationConsoleData": undefined,
|
"setNotificationConsoleData": undefined,
|
||||||
"sparkClusterConnectionInfo": [Function],
|
"sparkClusterConnectionInfo": [Function],
|
||||||
"splitter": Splitter {
|
|
||||||
"bounds": Object {
|
|
||||||
"max": 400,
|
|
||||||
"min": 240,
|
|
||||||
},
|
|
||||||
"direction": "vertical",
|
|
||||||
"isCollapsed": [Function],
|
|
||||||
"leftSideId": "resourcetree",
|
|
||||||
"onResizeStart": [Function],
|
|
||||||
"onResizeStop": [Function],
|
|
||||||
"splitterId": "h_splitter1",
|
|
||||||
},
|
|
||||||
"tabsManager": TabsManager {
|
"tabsManager": TabsManager {
|
||||||
"activeTab": [Function],
|
"activeTab": [Function],
|
||||||
"openedTabs": [Function],
|
"openedTabs": [Function],
|
||||||
|
@ -115,7 +102,6 @@ exports[`SettingsComponent renders 1`] = `
|
||||||
"_isInitializingNotebooks": false,
|
"_isInitializingNotebooks": false,
|
||||||
"_resetNotebookWorkspace": [Function],
|
"_resetNotebookWorkspace": [Function],
|
||||||
"canSaveQueries": [Function],
|
"canSaveQueries": [Function],
|
||||||
"collapsedResourceTreeWidth": 36,
|
|
||||||
"databases": [Function],
|
"databases": [Function],
|
||||||
"isAccountReady": [Function],
|
"isAccountReady": [Function],
|
||||||
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
||||||
|
@ -159,18 +145,6 @@ exports[`SettingsComponent renders 1`] = `
|
||||||
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
||||||
"setNotificationConsoleData": undefined,
|
"setNotificationConsoleData": undefined,
|
||||||
"sparkClusterConnectionInfo": [Function],
|
"sparkClusterConnectionInfo": [Function],
|
||||||
"splitter": Splitter {
|
|
||||||
"bounds": Object {
|
|
||||||
"max": 400,
|
|
||||||
"min": 240,
|
|
||||||
},
|
|
||||||
"direction": "vertical",
|
|
||||||
"isCollapsed": [Function],
|
|
||||||
"leftSideId": "resourcetree",
|
|
||||||
"onResizeStart": [Function],
|
|
||||||
"onResizeStop": [Function],
|
|
||||||
"splitterId": "h_splitter1",
|
|
||||||
},
|
|
||||||
"tabsManager": TabsManager {
|
"tabsManager": TabsManager {
|
||||||
"activeTab": [Function],
|
"activeTab": [Function],
|
||||||
"openedTabs": [Function],
|
"openedTabs": [Function],
|
||||||
|
@ -212,7 +186,6 @@ exports[`SettingsComponent renders 1`] = `
|
||||||
"_isInitializingNotebooks": false,
|
"_isInitializingNotebooks": false,
|
||||||
"_resetNotebookWorkspace": [Function],
|
"_resetNotebookWorkspace": [Function],
|
||||||
"canSaveQueries": [Function],
|
"canSaveQueries": [Function],
|
||||||
"collapsedResourceTreeWidth": 36,
|
|
||||||
"databases": [Function],
|
"databases": [Function],
|
||||||
"isAccountReady": [Function],
|
"isAccountReady": [Function],
|
||||||
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
||||||
|
@ -256,18 +229,6 @@ exports[`SettingsComponent renders 1`] = `
|
||||||
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
||||||
"setNotificationConsoleData": undefined,
|
"setNotificationConsoleData": undefined,
|
||||||
"sparkClusterConnectionInfo": [Function],
|
"sparkClusterConnectionInfo": [Function],
|
||||||
"splitter": Splitter {
|
|
||||||
"bounds": Object {
|
|
||||||
"max": 400,
|
|
||||||
"min": 240,
|
|
||||||
},
|
|
||||||
"direction": "vertical",
|
|
||||||
"isCollapsed": [Function],
|
|
||||||
"leftSideId": "resourcetree",
|
|
||||||
"onResizeStart": [Function],
|
|
||||||
"onResizeStop": [Function],
|
|
||||||
"splitterId": "h_splitter1",
|
|
||||||
},
|
|
||||||
"tabsManager": TabsManager {
|
"tabsManager": TabsManager {
|
||||||
"activeTab": [Function],
|
"activeTab": [Function],
|
||||||
"openedTabs": [Function],
|
"openedTabs": [Function],
|
||||||
|
@ -296,7 +257,6 @@ exports[`SettingsComponent renders 1`] = `
|
||||||
"_isInitializingNotebooks": false,
|
"_isInitializingNotebooks": false,
|
||||||
"_resetNotebookWorkspace": [Function],
|
"_resetNotebookWorkspace": [Function],
|
||||||
"canSaveQueries": [Function],
|
"canSaveQueries": [Function],
|
||||||
"collapsedResourceTreeWidth": 36,
|
|
||||||
"databases": [Function],
|
"databases": [Function],
|
||||||
"isAccountReady": [Function],
|
"isAccountReady": [Function],
|
||||||
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
||||||
|
@ -340,18 +300,6 @@ exports[`SettingsComponent renders 1`] = `
|
||||||
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
||||||
"setNotificationConsoleData": undefined,
|
"setNotificationConsoleData": undefined,
|
||||||
"sparkClusterConnectionInfo": [Function],
|
"sparkClusterConnectionInfo": [Function],
|
||||||
"splitter": Splitter {
|
|
||||||
"bounds": Object {
|
|
||||||
"max": 400,
|
|
||||||
"min": 240,
|
|
||||||
},
|
|
||||||
"direction": "vertical",
|
|
||||||
"isCollapsed": [Function],
|
|
||||||
"leftSideId": "resourcetree",
|
|
||||||
"onResizeStart": [Function],
|
|
||||||
"onResizeStop": [Function],
|
|
||||||
"splitterId": "h_splitter1",
|
|
||||||
},
|
|
||||||
"tabsManager": TabsManager {
|
"tabsManager": TabsManager {
|
||||||
"activeTab": [Function],
|
"activeTab": [Function],
|
||||||
"openedTabs": [Function],
|
"openedTabs": [Function],
|
||||||
|
|
|
@ -6,14 +6,12 @@ import _ from "underscore";
|
||||||
import { AuthType } from "../AuthType";
|
import { AuthType } from "../AuthType";
|
||||||
import { BindingHandlersRegisterer } from "../Bindings/BindingHandlersRegisterer";
|
import { BindingHandlersRegisterer } from "../Bindings/BindingHandlersRegisterer";
|
||||||
import * as Constants from "../Common/Constants";
|
import * as Constants from "../Common/Constants";
|
||||||
import { ExplorerMetrics } from "../Common/Constants";
|
|
||||||
import { readCollection } from "../Common/dataAccess/readCollection";
|
import { readCollection } from "../Common/dataAccess/readCollection";
|
||||||
import { readDatabases } from "../Common/dataAccess/readDatabases";
|
import { readDatabases } from "../Common/dataAccess/readDatabases";
|
||||||
import { isPublicInternetAccessAllowed } from "../Common/DatabaseAccountUtility";
|
import { isPublicInternetAccessAllowed } from "../Common/DatabaseAccountUtility";
|
||||||
import { getErrorMessage, getErrorStack, handleError } from "../Common/ErrorHandlingUtils";
|
import { getErrorMessage, getErrorStack, handleError } from "../Common/ErrorHandlingUtils";
|
||||||
import * as Logger from "../Common/Logger";
|
import * as Logger from "../Common/Logger";
|
||||||
import { QueriesClient } from "../Common/QueriesClient";
|
import { QueriesClient } from "../Common/QueriesClient";
|
||||||
import { Splitter, SplitterBounds, SplitterDirection } from "../Common/Splitter";
|
|
||||||
import { configContext, Platform } from "../ConfigContext";
|
import { configContext, Platform } from "../ConfigContext";
|
||||||
import * as DataModels from "../Contracts/DataModels";
|
import * as DataModels from "../Contracts/DataModels";
|
||||||
import * as ViewModels from "../Contracts/ViewModels";
|
import * as ViewModels from "../Contracts/ViewModels";
|
||||||
|
@ -86,15 +84,12 @@ export interface ExplorerParams {
|
||||||
}
|
}
|
||||||
|
|
||||||
export default class Explorer {
|
export default class Explorer {
|
||||||
public collapsedResourceTreeWidth: number = ExplorerMetrics.CollapsedResourceTreeWidth;
|
|
||||||
|
|
||||||
public isFixedCollectionWithSharedThroughputSupported: ko.Computed<boolean>;
|
public isFixedCollectionWithSharedThroughputSupported: ko.Computed<boolean>;
|
||||||
public isServerlessEnabled: ko.Computed<boolean>;
|
public isServerlessEnabled: ko.Computed<boolean>;
|
||||||
public isAccountReady: ko.Observable<boolean>;
|
public isAccountReady: ko.Observable<boolean>;
|
||||||
public canSaveQueries: ko.Computed<boolean>;
|
public canSaveQueries: ko.Computed<boolean>;
|
||||||
public queriesClient: QueriesClient;
|
public queriesClient: QueriesClient;
|
||||||
public tableDataClient: TableDataClient;
|
public tableDataClient: TableDataClient;
|
||||||
public splitter: Splitter;
|
|
||||||
|
|
||||||
private setNotificationConsoleData: (consoleData: ConsoleData) => void;
|
private setNotificationConsoleData: (consoleData: ConsoleData) => void;
|
||||||
private setInProgressConsoleDataIdToBeDeleted: (id: string) => void;
|
private setInProgressConsoleDataIdToBeDeleted: (id: string) => void;
|
||||||
|
@ -230,17 +225,6 @@ export default class Explorer {
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
const splitterBounds: SplitterBounds = {
|
|
||||||
min: ExplorerMetrics.SplitterMinWidth,
|
|
||||||
max: ExplorerMetrics.SplitterMaxWidth,
|
|
||||||
};
|
|
||||||
this.splitter = new Splitter({
|
|
||||||
splitterId: "h_splitter1",
|
|
||||||
leftId: "resourcetree",
|
|
||||||
bounds: splitterBounds,
|
|
||||||
direction: SplitterDirection.Vertical,
|
|
||||||
});
|
|
||||||
|
|
||||||
this.isFixedCollectionWithSharedThroughputSupported = ko.computed(() => {
|
this.isFixedCollectionWithSharedThroughputSupported = ko.computed(() => {
|
||||||
if (userContext.features.enableFixedCollectionWithSharedThroughput) {
|
if (userContext.features.enableFixedCollectionWithSharedThroughput) {
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -20,7 +20,6 @@ exports[`GitHub Repos Panel should render Default properly 1`] = `
|
||||||
"_isInitializingNotebooks": false,
|
"_isInitializingNotebooks": false,
|
||||||
"_resetNotebookWorkspace": [Function],
|
"_resetNotebookWorkspace": [Function],
|
||||||
"canSaveQueries": [Function],
|
"canSaveQueries": [Function],
|
||||||
"collapsedResourceTreeWidth": 36,
|
|
||||||
"databases": [Function],
|
"databases": [Function],
|
||||||
"isAccountReady": [Function],
|
"isAccountReady": [Function],
|
||||||
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
||||||
|
@ -64,18 +63,6 @@ exports[`GitHub Repos Panel should render Default properly 1`] = `
|
||||||
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
||||||
"setNotificationConsoleData": undefined,
|
"setNotificationConsoleData": undefined,
|
||||||
"sparkClusterConnectionInfo": [Function],
|
"sparkClusterConnectionInfo": [Function],
|
||||||
"splitter": Splitter {
|
|
||||||
"bounds": Object {
|
|
||||||
"max": 400,
|
|
||||||
"min": 240,
|
|
||||||
},
|
|
||||||
"direction": "vertical",
|
|
||||||
"isCollapsed": [Function],
|
|
||||||
"leftSideId": "resourcetree",
|
|
||||||
"onResizeStart": [Function],
|
|
||||||
"onResizeStop": [Function],
|
|
||||||
"splitterId": "h_splitter1",
|
|
||||||
},
|
|
||||||
"tabsManager": TabsManager {
|
"tabsManager": TabsManager {
|
||||||
"activeTab": [Function],
|
"activeTab": [Function],
|
||||||
"openedTabs": [Function],
|
"openedTabs": [Function],
|
||||||
|
|
|
@ -10,7 +10,6 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
|
||||||
"_isInitializingNotebooks": false,
|
"_isInitializingNotebooks": false,
|
||||||
"_resetNotebookWorkspace": [Function],
|
"_resetNotebookWorkspace": [Function],
|
||||||
"canSaveQueries": [Function],
|
"canSaveQueries": [Function],
|
||||||
"collapsedResourceTreeWidth": 36,
|
|
||||||
"databases": [Function],
|
"databases": [Function],
|
||||||
"isAccountReady": [Function],
|
"isAccountReady": [Function],
|
||||||
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
||||||
|
@ -54,18 +53,6 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
|
||||||
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
||||||
"setNotificationConsoleData": undefined,
|
"setNotificationConsoleData": undefined,
|
||||||
"sparkClusterConnectionInfo": [Function],
|
"sparkClusterConnectionInfo": [Function],
|
||||||
"splitter": Splitter {
|
|
||||||
"bounds": Object {
|
|
||||||
"max": 400,
|
|
||||||
"min": 240,
|
|
||||||
},
|
|
||||||
"direction": "vertical",
|
|
||||||
"isCollapsed": [Function],
|
|
||||||
"leftSideId": "resourcetree",
|
|
||||||
"onResizeStart": [Function],
|
|
||||||
"onResizeStop": [Function],
|
|
||||||
"splitterId": "h_splitter1",
|
|
||||||
},
|
|
||||||
"tabsManager": TabsManager {
|
"tabsManager": TabsManager {
|
||||||
"activeTab": [Function],
|
"activeTab": [Function],
|
||||||
"openedTabs": [Function],
|
"openedTabs": [Function],
|
||||||
|
|
|
@ -8,7 +8,6 @@ exports[`Delete Database Confirmation Pane submit() Should call delete database
|
||||||
"_isInitializingNotebooks": false,
|
"_isInitializingNotebooks": false,
|
||||||
"_resetNotebookWorkspace": [Function],
|
"_resetNotebookWorkspace": [Function],
|
||||||
"canSaveQueries": [Function],
|
"canSaveQueries": [Function],
|
||||||
"collapsedResourceTreeWidth": 36,
|
|
||||||
"databases": [Function],
|
"databases": [Function],
|
||||||
"isAccountReady": [Function],
|
"isAccountReady": [Function],
|
||||||
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
"isFixedCollectionWithSharedThroughputSupported": [Function],
|
||||||
|
@ -56,18 +55,6 @@ exports[`Delete Database Confirmation Pane submit() Should call delete database
|
||||||
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
"setInProgressConsoleDataIdToBeDeleted": undefined,
|
||||||
"setNotificationConsoleData": undefined,
|
"setNotificationConsoleData": undefined,
|
||||||
"sparkClusterConnectionInfo": [Function],
|
"sparkClusterConnectionInfo": [Function],
|
||||||
"splitter": Splitter {
|
|
||||||
"bounds": Object {
|
|
||||||
"max": 400,
|
|
||||||
"min": 240,
|
|
||||||
},
|
|
||||||
"direction": "vertical",
|
|
||||||
"isCollapsed": [Function],
|
|
||||||
"leftSideId": "resourcetree",
|
|
||||||
"onResizeStart": [Function],
|
|
||||||
"onResizeStop": [Function],
|
|
||||||
"splitterId": "h_splitter1",
|
|
||||||
},
|
|
||||||
"tabsManager": TabsManager {
|
"tabsManager": TabsManager {
|
||||||
"activeTab": [Function],
|
"activeTab": [Function],
|
||||||
"openedTabs": [Function],
|
"openedTabs": [Function],
|
||||||
|
|
|
@ -105,9 +105,6 @@ const App: React.FunctionComponent = () => {
|
||||||
/>
|
/>
|
||||||
{/* Collections Tree Collapsed - End */}
|
{/* Collections Tree Collapsed - End */}
|
||||||
</div>
|
</div>
|
||||||
{/* Splitter - Start */}
|
|
||||||
<div className="splitter ui-resizable-handle ui-resizable-e" id="h_splitter1" />
|
|
||||||
{/* Splitter - End */}
|
|
||||||
</div>
|
</div>
|
||||||
{/* Collections Tree - End */}
|
{/* Collections Tree - End */}
|
||||||
{tabs.length === 0 && <SplashScreen explorer={explorer} />}
|
{tabs.length === 0 && <SplashScreen explorer={explorer} />}
|
||||||
|
|
Loading…
Reference in New Issue