mirror of
https://github.com/Azure/cosmos-explorer.git
synced 2025-12-28 13:21:42 +00:00
Compare commits
3 Commits
eslint/fix
...
resolve_es
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0897c75114 | ||
|
|
b9e06858c5 | ||
|
|
043541b0dc |
@@ -2,8 +2,6 @@
|
|||||||
src/**/__mocks__/**/*
|
src/**/__mocks__/**/*
|
||||||
dist/
|
dist/
|
||||||
Contracts/
|
Contracts/
|
||||||
src/Api/Apis.ts
|
|
||||||
src/AuthType.ts
|
|
||||||
src/Bindings/BindingHandlersRegisterer.ts
|
src/Bindings/BindingHandlersRegisterer.ts
|
||||||
src/Bindings/ReactBindingHandler.ts
|
src/Bindings/ReactBindingHandler.ts
|
||||||
src/Common/Constants.ts
|
src/Common/Constants.ts
|
||||||
@@ -37,7 +35,6 @@ src/Definitions/svg.d.ts
|
|||||||
src/Explorer/ComponentRegisterer.test.ts
|
src/Explorer/ComponentRegisterer.test.ts
|
||||||
src/Explorer/ComponentRegisterer.ts
|
src/Explorer/ComponentRegisterer.ts
|
||||||
src/Explorer/Controls/DiffEditor/DiffEditorComponent.ts
|
src/Explorer/Controls/DiffEditor/DiffEditorComponent.ts
|
||||||
|
|
||||||
src/Explorer/Controls/Editor/EditorComponent.ts
|
src/Explorer/Controls/Editor/EditorComponent.ts
|
||||||
src/Explorer/Controls/JsonEditor/JsonEditorComponent.ts
|
src/Explorer/Controls/JsonEditor/JsonEditorComponent.ts
|
||||||
src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
|
src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
|
||||||
@@ -87,6 +84,7 @@ src/Explorer/Tables/QueryBuilder/CustomTimestampHelper.ts
|
|||||||
src/Explorer/Tables/TableDataClient.ts
|
src/Explorer/Tables/TableDataClient.ts
|
||||||
src/Explorer/Tables/TableEntityProcessor.ts
|
src/Explorer/Tables/TableEntityProcessor.ts
|
||||||
src/Explorer/Tables/Utilities.ts
|
src/Explorer/Tables/Utilities.ts
|
||||||
|
src/Explorer/Tabs/ConflictsTab.ts
|
||||||
src/Explorer/Tabs/DatabaseSettingsTab.ts
|
src/Explorer/Tabs/DatabaseSettingsTab.ts
|
||||||
src/Explorer/Tabs/DocumentsTab.test.ts
|
src/Explorer/Tabs/DocumentsTab.test.ts
|
||||||
src/Explorer/Tabs/DocumentsTab.ts
|
src/Explorer/Tabs/DocumentsTab.ts
|
||||||
@@ -115,12 +113,8 @@ src/ReactDevTools.ts
|
|||||||
src/Shared/Constants.ts
|
src/Shared/Constants.ts
|
||||||
src/Shared/DefaultExperienceUtility.test.ts
|
src/Shared/DefaultExperienceUtility.test.ts
|
||||||
src/Shared/DefaultExperienceUtility.ts
|
src/Shared/DefaultExperienceUtility.ts
|
||||||
src/Shared/appInsights.ts
|
|
||||||
src/SparkClusterManager/ArcadiaResourceManager.ts
|
|
||||||
src/SparkClusterManager/SparkClusterManager.ts
|
|
||||||
src/Terminal/JupyterLabAppFactory.ts
|
src/Terminal/JupyterLabAppFactory.ts
|
||||||
src/Terminal/NotebookAppContracts.d.ts
|
src/Terminal/NotebookAppContracts.d.ts
|
||||||
src/applyExplorerBindings.ts
|
|
||||||
src/global.d.ts
|
src/global.d.ts
|
||||||
src/setupTests.ts
|
src/setupTests.ts
|
||||||
src/Explorer/Controls/InputTypeahead/InputTypeaheadComponent.tsx
|
src/Explorer/Controls/InputTypeahead/InputTypeaheadComponent.tsx
|
||||||
@@ -130,8 +124,6 @@ src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
|
|||||||
src/Explorer/Controls/TreeComponent/TreeComponent.tsx
|
src/Explorer/Controls/TreeComponent/TreeComponent.tsx
|
||||||
src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx
|
src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx
|
||||||
src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx
|
src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx
|
||||||
src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.test.tsx
|
|
||||||
src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.tsx
|
|
||||||
src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
|
src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
|
||||||
src/Explorer/Notebook/NotebookComponent/NotebookComponentAdapter.tsx
|
src/Explorer/Notebook/NotebookComponent/NotebookComponentAdapter.tsx
|
||||||
src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx
|
src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx
|
||||||
@@ -140,7 +132,6 @@ src/Explorer/Notebook/NotebookRenderer/NotebookRenderer.tsx
|
|||||||
src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx
|
src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx
|
||||||
src/Explorer/Notebook/NotebookRenderer/decorators/hijack-scroll/index.tsx
|
src/Explorer/Notebook/NotebookRenderer/decorators/hijack-scroll/index.tsx
|
||||||
src/Explorer/Notebook/NotebookRenderer/decorators/kbd-shortcuts/index.tsx
|
src/Explorer/Notebook/NotebookRenderer/decorators/kbd-shortcuts/index.tsx
|
||||||
src/Explorer/Notebook/temp/inputs/connected-editors/codemirror.tsx
|
|
||||||
src/Explorer/Tree/ResourceTreeAdapter.tsx
|
src/Explorer/Tree/ResourceTreeAdapter.tsx
|
||||||
__mocks__/monaco-editor.ts
|
__mocks__/monaco-editor.ts
|
||||||
src/Explorer/Tree/ResourceTree.tsx
|
src/Explorer/Tree/ResourceTree.tsx
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
/**
|
/**
|
||||||
* Data Explorer version {major.minor.patch}
|
* Data Explorer version {major.minor.patch}
|
||||||
*/
|
*/
|
||||||
export const DataExplorer: string = "1.0.1";
|
export const DataExplorer = "1.0.1";
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import React from "react";
|
|
||||||
import { shallow } from "enzyme";
|
import { shallow } from "enzyme";
|
||||||
|
import React from "react";
|
||||||
import { GraphHighlightedNodeData } from "./GraphExplorer";
|
import { GraphHighlightedNodeData } from "./GraphExplorer";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
ReadOnlyNodePropertiesComponent,
|
ReadOnlyNodePropertiesComponent,
|
||||||
ReadOnlyNodePropertiesComponentProps,
|
ReadOnlyNodePropertiesComponentProps,
|
||||||
@@ -44,7 +43,7 @@ describe("<ReadOnlyNodePropertiesComponent />", () => {
|
|||||||
const mockNode2 = {
|
const mockNode2 = {
|
||||||
...mockNode,
|
...mockNode,
|
||||||
properties: {
|
properties: {
|
||||||
key3: ["abcd", 1234, true, false, undefined, null],
|
key3: ["abcd", 1234, true, false, undefined],
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
const props: ReadOnlyNodePropertiesComponentProps = { node: mockNode2 };
|
const props: ReadOnlyNodePropertiesComponentProps = { node: mockNode2 };
|
||||||
|
|||||||
@@ -60,9 +60,7 @@ export class ReadOnlyNodePropertiesComponent extends React.Component<ReadOnlyNod
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static singlePropertyValueToString(value: ViewModels.GremlinPropertyValueType): string {
|
public static singlePropertyValueToString(value: ViewModels.GremlinPropertyValueType): string {
|
||||||
if (value === null) {
|
if (typeof value === "undefined") {
|
||||||
return "null";
|
|
||||||
} else if (typeof value === "undefined") {
|
|
||||||
return "undefined";
|
return "undefined";
|
||||||
} else {
|
} else {
|
||||||
return value.toString();
|
return value.toString();
|
||||||
@@ -71,11 +69,8 @@ export class ReadOnlyNodePropertiesComponent extends React.Component<ReadOnlyNod
|
|||||||
|
|
||||||
public static renderSinglePropertyValue(value: ViewModels.GremlinPropertyValueType): JSX.Element {
|
public static renderSinglePropertyValue(value: ViewModels.GremlinPropertyValueType): JSX.Element {
|
||||||
let singlePropValue = value;
|
let singlePropValue = value;
|
||||||
let className = "propertyValue";
|
const className = "propertyValue";
|
||||||
if (singlePropValue === null) {
|
if (typeof singlePropValue === "undefined") {
|
||||||
singlePropValue = "null";
|
|
||||||
className += " isNull";
|
|
||||||
} else if (typeof singlePropValue === "undefined") {
|
|
||||||
singlePropValue = "undefined";
|
singlePropValue = "undefined";
|
||||||
} else {
|
} else {
|
||||||
singlePropValue = value.toString();
|
singlePropValue = value.toString();
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ exports[`<ReadOnlyNodePropertiesComponent /> renders properties (with multiple v
|
|||||||
</td>
|
</td>
|
||||||
<td
|
<td
|
||||||
className="valueCol"
|
className="valueCol"
|
||||||
title="abcd, 1234, true, false, undefined, null"
|
title="abcd, 1234, true, false, undefined"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className="propertyValue"
|
className="propertyValue"
|
||||||
@@ -155,12 +155,6 @@ exports[`<ReadOnlyNodePropertiesComponent /> renders properties (with multiple v
|
|||||||
>
|
>
|
||||||
undefined
|
undefined
|
||||||
</div>
|
</div>
|
||||||
<div
|
|
||||||
className="propertyValue isNull"
|
|
||||||
key="null"
|
|
||||||
>
|
|
||||||
null
|
|
||||||
</div>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -307,11 +307,18 @@ function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonCo
|
|||||||
|
|
||||||
function createNewDatabase(container: Explorer): CommandButtonComponentProps {
|
function createNewDatabase(container: Explorer): CommandButtonComponentProps {
|
||||||
const label = "New " + getDatabaseName();
|
const label = "New " + getDatabaseName();
|
||||||
|
const newDatabaseButton = document.activeElement as HTMLElement;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
iconSrc: AddDatabaseIcon,
|
iconSrc: AddDatabaseIcon,
|
||||||
iconAlt: label,
|
iconAlt: label,
|
||||||
onCommandClick: () =>
|
onCommandClick: () =>
|
||||||
useSidePanel.getState().openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={container} />),
|
useSidePanel
|
||||||
|
.getState()
|
||||||
|
.openSidePanel(
|
||||||
|
"New " + getDatabaseName(),
|
||||||
|
<AddDatabasePanel explorer={container} buttonElement={newDatabaseButton} />
|
||||||
|
),
|
||||||
commandButtonLabel: label,
|
commandButtonLabel: label,
|
||||||
ariaLabel: label,
|
ariaLabel: label,
|
||||||
hasPopup: true,
|
hasPopup: true,
|
||||||
|
|||||||
@@ -23,10 +23,12 @@ import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneFor
|
|||||||
|
|
||||||
export interface AddDatabasePaneProps {
|
export interface AddDatabasePaneProps {
|
||||||
explorer: Explorer;
|
explorer: Explorer;
|
||||||
|
buttonElement?: HTMLElement;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
|
export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
|
||||||
explorer: container,
|
explorer: container,
|
||||||
|
buttonElement,
|
||||||
}: AddDatabasePaneProps) => {
|
}: AddDatabasePaneProps) => {
|
||||||
const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
|
const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
|
||||||
let throughput: number;
|
let throughput: number;
|
||||||
@@ -77,6 +79,7 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
|
|||||||
dataExplorerArea: Constants.Areas.ContextualPane,
|
dataExplorerArea: Constants.Areas.ContextualPane,
|
||||||
};
|
};
|
||||||
TelemetryProcessor.trace(Action.CreateDatabase, ActionModifiers.Open, addDatabasePaneOpenMessage);
|
TelemetryProcessor.trace(Action.CreateDatabase, ActionModifiers.Open, addDatabasePaneOpenMessage);
|
||||||
|
buttonElement.focus();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const onSubmit = () => {
|
const onSubmit = () => {
|
||||||
|
|||||||
@@ -307,16 +307,23 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
|
|||||||
iconSrc: AddDatabaseIcon,
|
iconSrc: AddDatabaseIcon,
|
||||||
title: "New " + getDatabaseName(),
|
title: "New " + getDatabaseName(),
|
||||||
description: undefined,
|
description: undefined,
|
||||||
onClick: () =>
|
onClick: () => this.openAddDatabasePanel(),
|
||||||
useSidePanel
|
|
||||||
.getState()
|
|
||||||
.openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={this.container} />),
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private openAddDatabasePanel() {
|
||||||
|
const newDatabaseButton = document.activeElement as HTMLElement;
|
||||||
|
useSidePanel
|
||||||
|
.getState()
|
||||||
|
.openSidePanel(
|
||||||
|
"New " + getDatabaseName(),
|
||||||
|
<AddDatabasePanel explorer={this.container} buttonElement={newDatabaseButton} />
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
private decorateOpenCollectionActivity({ databaseId, collectionId }: MostRecentActivity.OpenCollectionItem) {
|
private decorateOpenCollectionActivity({ databaseId, collectionId }: MostRecentActivity.OpenCollectionItem) {
|
||||||
return {
|
return {
|
||||||
iconSrc: NotebookIcon,
|
iconSrc: NotebookIcon,
|
||||||
|
|||||||
@@ -202,21 +202,14 @@ export class CassandraAPIDataClient extends TableDataClient {
|
|||||||
|
|
||||||
let updateQuery = `UPDATE ${collection.databaseId}.${collection.id()}`;
|
let updateQuery = `UPDATE ${collection.databaseId}.${collection.id()}`;
|
||||||
let isPropertyUpdated = false;
|
let isPropertyUpdated = false;
|
||||||
let isFirstPropertyToUpdate = true;
|
|
||||||
for (let property in newEntity) {
|
for (let property in newEntity) {
|
||||||
if (
|
if (
|
||||||
!originalDocument[property] ||
|
!originalDocument[property] ||
|
||||||
newEntity[property]._.toString() !== originalDocument[property]._.toString()
|
newEntity[property]._.toString() !== originalDocument[property]._.toString()
|
||||||
) {
|
) {
|
||||||
let propertyQuerySegment = this.isStringType(newEntity[property].$)
|
updateQuery += this.isStringType(newEntity[property].$)
|
||||||
? `${property} = '${newEntity[property]._}',`
|
? ` SET ${property} = '${newEntity[property]._}',`
|
||||||
: `${property} = ${newEntity[property]._},`;
|
: ` SET ${property} = ${newEntity[property]._},`;
|
||||||
// Only add the "SET" keyword once
|
|
||||||
if (isFirstPropertyToUpdate) {
|
|
||||||
propertyQuerySegment = " SET " + propertyQuerySegment;
|
|
||||||
isFirstPropertyToUpdate = false;
|
|
||||||
}
|
|
||||||
updateQuery += propertyQuerySegment;
|
|
||||||
isPropertyUpdated = true;
|
isPropertyUpdated = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
||||||
/* eslint-disable @typescript-eslint/switch-exhaustiveness-check */
|
|
||||||
import { ConflictDefinition, FeedOptions, QueryIterator, Resource } from "@azure/cosmos";
|
import { ConflictDefinition, FeedOptions, QueryIterator, Resource } from "@azure/cosmos";
|
||||||
import * as ko from "knockout";
|
import * as ko from "knockout";
|
||||||
import Q from "q";
|
import Q from "q";
|
||||||
@@ -71,13 +69,13 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
ViewModels.DocumentExplorerState.noDocumentSelected
|
ViewModels.DocumentExplorerState.noDocumentSelected
|
||||||
);
|
);
|
||||||
this.selectedConflictId = ko.observable<ConflictId>();
|
this.selectedConflictId = ko.observable<ConflictId>();
|
||||||
this.selectedConflictContent = editable.observable<string>("");
|
this.selectedConflictContent = editable.observable<any>("");
|
||||||
this.selectedConflictCurrent = editable.observable<string>("");
|
this.selectedConflictCurrent = editable.observable<any>("");
|
||||||
this.partitionKey = options.partitionKey || (this.collection && this.collection.partitionKey);
|
this.partitionKey = options.partitionKey || (this.collection && this.collection.partitionKey);
|
||||||
this.conflictIds = options.conflictIds;
|
this.conflictIds = options.conflictIds;
|
||||||
this.partitionKeyPropertyHeader =
|
this.partitionKeyPropertyHeader =
|
||||||
(this.collection && this.collection.partitionKeyPropertyHeader) || this._getPartitionKeyPropertyHeader();
|
(this.collection && this.collection.partitionKeyPropertyHeader) || this._getPartitionKeyPropertyHeader();
|
||||||
this.partitionKeyProperty = this.partitionKeyPropertyHeader
|
this.partitionKeyProperty = !!this.partitionKeyPropertyHeader
|
||||||
? this.partitionKeyPropertyHeader.replace(/[/]+/g, ".").substr(1).replace(/[']+/g, "")
|
? this.partitionKeyPropertyHeader.replace(/[/]+/g, ".").substr(1).replace(/[']+/g, "")
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
@@ -189,7 +187,7 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
this.buildCommandBarOptions();
|
this.buildCommandBarOptions();
|
||||||
this.shouldShowDiffEditor = ko.pureComputed<boolean>(() => {
|
this.shouldShowDiffEditor = ko.pureComputed<boolean>(() => {
|
||||||
const documentHasContent: boolean =
|
const documentHasContent: boolean =
|
||||||
this.selectedConflictContent() !== null && this.selectedConflictContent().length > 0;
|
this.selectedConflictContent() != null && this.selectedConflictContent().length > 0;
|
||||||
const operationIsReplace: boolean = this.conflictOperation() === Constants.ConflictOperationType.Replace;
|
const operationIsReplace: boolean = this.conflictOperation() === Constants.ConflictOperationType.Replace;
|
||||||
const isLoadingData: boolean = this.loadingConflictData();
|
const isLoadingData: boolean = this.loadingConflictData();
|
||||||
return documentHasContent && operationIsReplace && !isLoadingData;
|
return documentHasContent && operationIsReplace && !isLoadingData;
|
||||||
@@ -197,7 +195,7 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
|
|
||||||
this.shouldShowEditor = ko.pureComputed<boolean>(() => {
|
this.shouldShowEditor = ko.pureComputed<boolean>(() => {
|
||||||
const documentHasContent: boolean =
|
const documentHasContent: boolean =
|
||||||
this.selectedConflictContent() !== null && this.selectedConflictContent().length > 0;
|
this.selectedConflictContent() != null && this.selectedConflictContent().length > 0;
|
||||||
const operationIsInsert: boolean = this.conflictOperation() === Constants.ConflictOperationType.Create;
|
const operationIsInsert: boolean = this.conflictOperation() === Constants.ConflictOperationType.Create;
|
||||||
const operationIsDelete: boolean = this.conflictOperation() === Constants.ConflictOperationType.Delete;
|
const operationIsDelete: boolean = this.conflictOperation() === Constants.ConflictOperationType.Delete;
|
||||||
const isLoadingData: boolean = this.loadingConflictData();
|
const isLoadingData: boolean = this.loadingConflictData();
|
||||||
@@ -244,7 +242,7 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
|
|
||||||
public onConflictIdClick(): Q.Promise<unknown> {
|
public onConflictIdClick(clickedDocumentId: ConflictId): Q.Promise<any> {
|
||||||
if (this.editorState() !== ViewModels.DocumentExplorerState.noDocumentSelected) {
|
if (this.editorState() !== ViewModels.DocumentExplorerState.noDocumentSelected) {
|
||||||
return Q();
|
return Q();
|
||||||
}
|
}
|
||||||
@@ -407,19 +405,19 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
public onDiscardClick = (): Q.Promise<unknown> => {
|
public onDiscardClick = (): Q.Promise<any> => {
|
||||||
this.selectedConflictContent(this.selectedConflictContent.getEditableOriginalValue());
|
this.selectedConflictContent(this.selectedConflictContent.getEditableOriginalValue());
|
||||||
this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
|
this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
|
||||||
|
|
||||||
return Q();
|
return Q();
|
||||||
};
|
};
|
||||||
|
|
||||||
public onValidDocumentEdit(): Q.Promise<unknown> {
|
public onValidDocumentEdit(): Q.Promise<any> {
|
||||||
this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid);
|
this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid);
|
||||||
return Q();
|
return Q();
|
||||||
}
|
}
|
||||||
|
|
||||||
public onInvalidDocumentEdit(): Q.Promise<unknown> {
|
public onInvalidDocumentEdit(): Q.Promise<any> {
|
||||||
if (
|
if (
|
||||||
this.editorState() === ViewModels.DocumentExplorerState.exisitingDocumentNoEdits ||
|
this.editorState() === ViewModels.DocumentExplorerState.exisitingDocumentNoEdits ||
|
||||||
this.editorState() === ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid
|
this.editorState() === ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid
|
||||||
@@ -444,7 +442,7 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
this._documentsIterator = await this.createIterator();
|
this._documentsIterator = await this.createIterator();
|
||||||
await this.loadNextPage();
|
await this.loadNextPage();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (this.onLoadStartKey !== null && this.onLoadStartKey !== undefined) {
|
if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
|
||||||
TelemetryProcessor.traceFailure(
|
TelemetryProcessor.traceFailure(
|
||||||
Action.Tab,
|
Action.Tab,
|
||||||
{
|
{
|
||||||
@@ -473,7 +471,7 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
return queryConflicts(this.collection.databaseId, this.collection.id(), query, options as FeedOptions);
|
return queryConflicts(this.collection.databaseId, this.collection.id(), query, options as FeedOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
public loadNextPage(): Q.Promise<unknown> {
|
public loadNextPage(): Q.Promise<any> {
|
||||||
this.isExecuting(true);
|
this.isExecuting(true);
|
||||||
this.isExecutionError(false);
|
this.isExecutionError(false);
|
||||||
return this._loadNextPageInternal()
|
return this._loadNextPageInternal()
|
||||||
@@ -493,7 +491,7 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
|
|
||||||
const merged = currentConflicts.concat(nextConflictIds);
|
const merged = currentConflicts.concat(nextConflictIds);
|
||||||
this.conflictIds(merged);
|
this.conflictIds(merged);
|
||||||
if (this.onLoadStartKey !== null && this.onLoadStartKey !== undefined) {
|
if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
|
||||||
TelemetryProcessor.traceSuccess(
|
TelemetryProcessor.traceSuccess(
|
||||||
Action.Tab,
|
Action.Tab,
|
||||||
{
|
{
|
||||||
@@ -510,7 +508,7 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
},
|
},
|
||||||
(error) => {
|
(error) => {
|
||||||
this.isExecutionError(true);
|
this.isExecutionError(true);
|
||||||
if (this.onLoadStartKey !== null && this.onLoadStartKey !== undefined) {
|
if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
|
||||||
TelemetryProcessor.traceFailure(
|
TelemetryProcessor.traceFailure(
|
||||||
Action.Tab,
|
Action.Tab,
|
||||||
{
|
{
|
||||||
@@ -543,18 +541,18 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
return Q(this._documentsIterator.fetchNext().then((response) => response.resources));
|
return Q(this._documentsIterator.fetchNext().then((response) => response.resources));
|
||||||
}
|
}
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
protected _onEditorContentChange(newContent: string) {
|
||||||
protected _onEditorContentChange(_newContent: string) {
|
|
||||||
try {
|
try {
|
||||||
|
const parsed: any = JSON.parse(newContent);
|
||||||
this.onValidDocumentEdit();
|
this.onValidDocumentEdit();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.onInvalidDocumentEdit();
|
this.onInvalidDocumentEdit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public initDocumentEditorForCreate(documentId: ConflictId, documentToInsert: any): Q.Promise<unknown> {
|
public initDocumentEditorForCreate(documentId: ConflictId, documentToInsert: any): Q.Promise<any> {
|
||||||
if (documentId) {
|
if (documentId) {
|
||||||
const parsedConflictContent: any = JSON.parse(documentToInsert);
|
let parsedConflictContent: any = JSON.parse(documentToInsert);
|
||||||
const renderedConflictContent: string = this.renderObjectForEditor(parsedConflictContent, null, 4);
|
const renderedConflictContent: string = this.renderObjectForEditor(parsedConflictContent, null, 4);
|
||||||
this.selectedConflictContent.setBaseline(renderedConflictContent);
|
this.selectedConflictContent.setBaseline(renderedConflictContent);
|
||||||
this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
|
this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
|
||||||
@@ -567,7 +565,7 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
documentId: ConflictId,
|
documentId: ConflictId,
|
||||||
conflictContent: any,
|
conflictContent: any,
|
||||||
currentContent: any
|
currentContent: any
|
||||||
): Q.Promise<unknown> {
|
): Q.Promise<any> {
|
||||||
if (documentId) {
|
if (documentId) {
|
||||||
currentContent = ConflictsTab.removeSystemProperties(currentContent);
|
currentContent = ConflictsTab.removeSystemProperties(currentContent);
|
||||||
const renderedCurrentContent: string = this.renderObjectForEditor(currentContent, null, 4);
|
const renderedCurrentContent: string = this.renderObjectForEditor(currentContent, null, 4);
|
||||||
@@ -584,7 +582,7 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
return Q();
|
return Q();
|
||||||
}
|
}
|
||||||
|
|
||||||
public initDocumentEditorForDelete(documentId: ConflictId, documentToDelete: any): Q.Promise<unknown> {
|
public initDocumentEditorForDelete(documentId: ConflictId, documentToDelete: any): Q.Promise<any> {
|
||||||
if (documentId) {
|
if (documentId) {
|
||||||
let parsedDocumentToDelete: any = JSON.parse(documentToDelete);
|
let parsedDocumentToDelete: any = JSON.parse(documentToDelete);
|
||||||
parsedDocumentToDelete = ConflictsTab.removeSystemProperties(parsedDocumentToDelete);
|
parsedDocumentToDelete = ConflictsTab.removeSystemProperties(parsedDocumentToDelete);
|
||||||
@@ -596,8 +594,7 @@ export default class ConflictsTab extends TabsBase {
|
|||||||
return Q();
|
return Q();
|
||||||
}
|
}
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
public initDocumentEditorForNoOp(documentId: ConflictId): Q.Promise<any> {
|
||||||
public initDocumentEditorForNoOp(_documentId: ConflictId): Q.Promise<unknown> {
|
|
||||||
this.selectedConflictContent(null);
|
this.selectedConflictContent(null);
|
||||||
this.selectedConflictCurrent(null);
|
this.selectedConflictCurrent(null);
|
||||||
this.editorState(ViewModels.DocumentExplorerState.noDocumentSelected);
|
this.editorState(ViewModels.DocumentExplorerState.noDocumentSelected);
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { BindingHandlersRegisterer } from "./Bindings/BindingHandlersRegisterer"
|
|||||||
import Explorer from "./Explorer/Explorer";
|
import Explorer from "./Explorer/Explorer";
|
||||||
|
|
||||||
export const applyExplorerBindings = (explorer: Explorer) => {
|
export const applyExplorerBindings = (explorer: Explorer) => {
|
||||||
if (!!explorer) {
|
if (explorer) {
|
||||||
window.dataExplorer = explorer;
|
window.dataExplorer = explorer;
|
||||||
BindingHandlersRegisterer.registerBindingHandlers();
|
BindingHandlersRegisterer.registerBindingHandlers();
|
||||||
ko.applyBindings(explorer);
|
ko.applyBindings(explorer);
|
||||||
|
|||||||
Reference in New Issue
Block a user