random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2025-12-28 21:32:05 +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

5
src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx
View File

@@ -3,12 +3,13 @@
* If the component signals a change through the callback passed in the properties, it must render the React component when appropriate
* and update any knockout observables passed from the parent.
*/
import { CommandBar, ICommandBarItemProps } from "@fluentui/react";
import * as ko from "knockout";
import { CommandBar, ICommandBarItemProps } from "office-ui-fabric-react/lib/CommandBar";
import * as React from "react";
import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
import { StyleConstants } from "../../../Common/Constants";
import * as ViewModels from "../../../Contracts/ViewModels";
import { userContext } from "../../../UserContext";
import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
import Explorer from "../../Explorer";
import * as CommandBarComponentButtonFactory from "./CommandBarComponentButtonFactory";
@@ -39,7 +40,7 @@ export class CommandBarComponentAdapter implements ReactAdapter {
container.isResourceTokenCollectionNodeSelected,
container.isHostedDataExplorerEnabled,
container.isSynapseLinkUpdating,
container.databaseAccount,
userContext?.databaseAccount,
this.isNotebookTabActive,
container.isServerlessEnabled,
];

14
src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
View File

@@ -239,21 +239,11 @@ function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonCo
return undefined;
}
if (
container.databaseAccount &&
container.databaseAccount() &&
container.databaseAccount().properties &&
container.databaseAccount().properties.enableAnalyticalStorage
) {
if (userContext?.databaseAccount?.properties?.enableAnalyticalStorage) {
return undefined;
}
const capabilities =
(container.databaseAccount &&
container.databaseAccount() &&
container.databaseAccount().properties &&
container.databaseAccount().properties.capabilities) ||
[];
const capabilities = userContext?.databaseAccount?.properties?.capabilities || [];
if (capabilities.some((capability) => capability.name === Constants.CapabilityNames.EnableStorageAnalytics)) {
return undefined;
}

4
src/Explorer/Menus/CommandBar/CommandBarUtil.test.tsx
View File

@@ -1,6 +1,6 @@
import * as CommandBarUtil from "./CommandBarUtil";
import { ICommandBarItemProps } from "office-ui-fabric-react/lib/CommandBar";
import { ICommandBarItemProps } from "@fluentui/react";
import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
import * as CommandBarUtil from "./CommandBarUtil";
describe("CommandBarUtil tests", () => {
const createButton = (): CommandButtonComponentProps => {

12
src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
View File

@@ -1,9 +1,13 @@
import {
Dropdown,
ICommandBarItemProps,
IComponentAsProps,
IconType,
IDropdownOption,
IDropdownStyles,
} from "@fluentui/react";
import ChevronDownIcon from "images/Chevron_down.svg";
import { Observable } from "knockout";
import { ICommandBarItemProps } from "office-ui-fabric-react/lib/CommandBar";
import { Dropdown, IDropdownOption, IDropdownStyles } from "office-ui-fabric-react/lib/Dropdown";
import { IconType } from "office-ui-fabric-react/lib/Icon";
import { IComponentAsProps } from "office-ui-fabric-react/lib/Utilities";
import * as React from "react";
import _ from "underscore";
import { StyleConstants } from "../../../Common/Constants";

6
src/Explorer/Menus/CommandBar/MemoryTrackerComponent.tsx
View File

@@ -1,9 +1,7 @@
import * as React from "react";
import { ProgressIndicator, Spinner, SpinnerSize, Stack } from "@fluentui/react";
import { Observable, Subscription } from "knockout";
import * as React from "react";
import { MemoryUsageInfo } from "../../../Contracts/DataModels";
import { ProgressIndicator } from "office-ui-fabric-react/lib/ProgressIndicator";
import { Spinner, SpinnerSize } from "office-ui-fabric-react/lib/Spinner";
import { Stack } from "office-ui-fabric-react/lib/Stack";
interface MemoryTrackerProps {
memoryUsageInfo: Observable<MemoryUsageInfo>;

2
src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.tsx
View File

@@ -2,6 +2,7 @@
* React component for control bar
*/
import { Dropdown, IDropdownOption } from "@fluentui/react";
import LoaderIcon from "images/circular_loader_black_16x16.gif";
import { ReactComponent as ClearIcon } from "images/Clear1.svg";
import ErrorBlackIcon from "images/error_black.svg";
@@ -11,7 +12,6 @@ import InfoIcon from "images/info_color.svg";
import LoadingIcon from "images/loading.svg";
import ChevronDownIcon from "images/QueryBuilder/CollapseChevronDown_16x.png";
import ChevronUpIcon from "images/QueryBuilder/CollapseChevronUp_16x.png";
import { Dropdown, IDropdownOption } from "office-ui-fabric-react";
import * as React from "react";
import AnimateHeight from "react-animate-height";
import { ClientDefaults, KeyCodes } from "../../../Common/Constants";

4
src/Explorer/Menus/NotificationConsole/__snapshots__/NotificationConsoleComponent.test.tsx.snap
View File

@@ -111,7 +111,7 @@ exports[`NotificationConsoleComponent renders the console 1`] = `
<div
className="notificationConsoleControls"
>
<StyledWithResponsiveMode
<Dropdown
aria-label="All"
aria-labelledby="consoleFilterLabel"
label="Filter:"
@@ -274,7 +274,7 @@ exports[`NotificationConsoleComponent renders the console 2`] = `
<div
className="notificationConsoleControls"
>
<StyledWithResponsiveMode
<Dropdown
aria-label="All"
aria-labelledby="consoleFilterLabel"
label="Filter:"