random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2025-12-28 05:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge master and resolve code conflict

Browse Source
This commit is contained in:
hardiknai-techm
2021-05-06 16:12:30 +05:30
parent cc4f20e482 23223cfb23
commit 2c58cd7be1
193 changed files with 6769 additions and 7218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Explorer/Graph/GraphExplorerComponent/LeftPaneComponent.tsx
View File

@@ -1,5 +1,5 @@
import { FocusZone } from "@fluentui/react";
import * as React from "react";
import { FocusZone } from "office-ui-fabric-react/lib/FocusZone";
import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
export interface CaptionId {

2
src/Explorer/Graph/NewVertexComponent/NewVertexComponent.tsx
View File

@@ -1,6 +1,6 @@
import { Dropdown, IDropdownOption, Stack, TextField } from "@fluentui/react";
import AddIcon from "images/Add-property.svg";
import DeleteIcon from "images/delete.svg";
import { Dropdown, IDropdownOption, Stack, TextField } from "office-ui-fabric-react";
import React, { FunctionComponent, useRef, useState } from "react";
import { NormalizedEventKey } from "../../../Common/Constants";
import { GremlinPropertyValueType, InputPropertyValueTypeString, NewVertexData } from "../../../Contracts/ViewModels";