random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2025-12-27 21:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve master merge conflict

Browse Source
This commit is contained in:
hardiknai-techm
2021-05-06 18:59:00 +05:30
parent fc83484b6c
commit 88491ba6a9
5 changed files with 71 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Explorer/Panes/RightPaneForm/RightPaneForm.tsx
View File

@@ -1,4 +1,4 @@
import { IconButton } from "office-ui-fabric-react/lib/Button";
import { IconButton } from "@fluentui/react";
import React, { FunctionComponent, ReactNode } from "react";
import { KeyCodes } from "../../../Common/Constants";
import { PanelFooterComponent } from "../PanelFooterComponent";

77
src/Explorer/Panes/RightPaneForm/__snapshots__/RightPaneForm.test.tsx.snap
View File

@@ -513,7 +513,6 @@ exports[`Load Query Pane should render Default properly 1`] = `
"borderColor": "#f3f2f1",
"color": "#a19f9d",
"cursor": "default",
"pointerEvents": "none",
"selectors": Object {
":focus": Object {
"outline": 0,
@@ -776,6 +775,35 @@ exports[`Load Query Pane should render Default properly 1`] = `
},
},
},
"splitButtonMenuFocused": Object {
"outline": "transparent",
"position": "relative",
"selectors": Object {
".ms-Fabric--isFocusVisible &:focus:after": Object {
"border": "1px solid #ffffff",
"bottom": 3,
"content": "\\"\\"",
"left": 3,
"outline": "1px solid #605e5c",
"position": "absolute",
"right": 3,
"selectors": Object {
"@media screen and (-ms-high-contrast: active), (forced-colors: active)": Object {
"border": "none",
"bottom": -2,
"left": -2,
"right": -2,
"top": -2,
},
},
"top": 3,
"zIndex": 1,
},
"::-moz-focus-inner": Object {
"border": "0",
},
},
},
"textContainer": Object {
"display": "block",
"flexGrow": 1,
@@ -1061,7 +1089,7 @@ exports[`Load Query Pane should render Default properly 1`] = `
>
<button
aria-label="Close pane"
className="ms-Button ms-Button--icon closePaneBtn root-40"
className="ms-Button ms-Button--icon closePaneBtn root-53"
data-is-focusable={true}
data-testid="closePaneBtn"
onClick={[Function]}
@@ -1075,18 +1103,17 @@ exports[`Load Query Pane should render Default properly 1`] = `
type="button"
>
<span
className="ms-Button-flexContainer flexContainer-41"
className="ms-Button-flexContainer flexContainer-54"
data-automationid="splitbuttonprimary"
>
<Component
className="ms-Button-icon icon-43"
className="ms-Button-icon icon-56"
iconName="Cancel"
>
<i
aria-hidden={true}
className="ms-Icon root-37 css-48 ms-Button-icon icon-43"
className="ms-Icon root-37 css-61 ms-Button-icon icon-56"
data-icon-name="Cancel"
role="presentation"
style={
Object {
"fontFamily": "\\"FabricMDL2Icons\\"",
@@ -2158,7 +2185,6 @@ exports[`Load Query Pane should render Default properly 1`] = `
"borderColor": "#f3f2f1",
"color": "#a19f9d",
"cursor": "default",
"pointerEvents": "none",
"selectors": Object {
":focus": Object {
"outline": 0,
@@ -2505,6 +2531,35 @@ exports[`Load Query Pane should render Default properly 1`] = `
},
},
},
"splitButtonMenuFocused": Object {
"outline": "transparent",
"position": "relative",
"selectors": Object {
".ms-Fabric--isFocusVisible &:focus:after": Object {
"border": "1px solid #ffffff",
"bottom": 3,
"content": "\\"\\"",
"left": 3,
"outline": "1px solid #605e5c",
"position": "absolute",
"right": 3,
"selectors": Object {
"@media screen and (-ms-high-contrast: active), (forced-colors: active)": Object {
"border": "none",
"bottom": -2,
"left": -2,
"right": -2,
"top": -2,
},
},
"top": 3,
"zIndex": 1,
},
"::-moz-focus-inner": Object {
"border": "0",
},
},
},
"splitButtonMenuIcon": Object {
"color": "#ffffff",
},
@@ -2801,7 +2856,7 @@ exports[`Load Query Pane should render Default properly 1`] = `
>
<button
aria-label="Load"
className="ms-Button ms-Button--primary root-49"
className="ms-Button ms-Button--primary root-62"
data-is-focusable={true}
data-testid="submit"
id="sidePanelOkButton"
@@ -2814,14 +2869,14 @@ exports[`Load Query Pane should render Default properly 1`] = `
type="submit"
>
<span
className="ms-Button-flexContainer flexContainer-41"
className="ms-Button-flexContainer flexContainer-54"
data-automationid="splitbuttonprimary"
>
<span
className="ms-Button-textContainer textContainer-42"
className="ms-Button-textContainer textContainer-55"
>
<span
className="ms-Button-label label-50"
className="ms-Button-label label-63"
id="id__3"
key="id__3"
>

4
src/Explorer/Panes/UploadItemsPane/__snapshots__/UploadItemsPane.test.tsx.snap
View File

@@ -20,7 +20,9 @@ exports[`Upload Items Pane should render Default properly 1`] = `
multiple={true}
onUpload={[Function]}
tabIndex={0}
tooltip="Select one or more JSON files to upload. Each file can contain a single JSON document or an array of JSON documents. The combined size of all files in an individual upload operation must be less than 2 MB. You can perform multiple upload operations for larger data sets."
tooltip="Select one or more JSON files to upload. Each file can contain a single JSON document or an array of JSON
documents. The combined size of all files in an individual upload operation must be less than 2 MB. You
can perform multiple upload operations for larger data sets."
/>
</div>
</RightPaneForm>

10
src/Explorer/Panes/__snapshots__/DeleteDatabaseConfirmationPanel.test.tsx.snap
View File

@@ -1596,12 +1596,8 @@ exports[`Delete Database Confirmation Pane submit() Should call delete database
variant="small"
>
<span
<<<<<<< HEAD
className="panelWarningErrorMessage css-143"
data-testid="panelmessage"
=======
className="panelWarningErrorMessage css-205"
>>>>>>> 23223cfb231e7c65b01dd47faa51a1d84007352d
data-testid="panelmessage"
>
Warning! The action you are about to take cannot be undone. Continuing will permanently delete this resource and all of its children resources.
</span>
@@ -4011,12 +4007,8 @@ exports[`Delete Database Confirmation Pane submit() Should call delete database
variantClassName="ms-Button--primary"
>
<button
<<<<<<< HEAD
aria-label="OK"
className="ms-Button ms-Button--primary root-156"
=======
className="ms-Button ms-Button--primary root-218"
>>>>>>> 23223cfb231e7c65b01dd47faa51a1d84007352d
data-is-focusable={true}
data-testid="submit"
id="sidePanelOkButton"

8
src/Platform/Hosted/Authorization.ts
View File

@@ -17,17 +17,9 @@ export default class AuthHeadersUtil {
}
private static _generateResourceUrl(): string {
<<<<<<< HEAD
const databaseAccount = userContext.databaseAccount;
const subscriptionId: string = userContext.subscriptionId;
const resourceGroup = userContext.resourceGroup;
const apiKind: DataModels.ApiKind = DefaultExperienceUtility.getApiKindFromDefaultExperience(userContext.apiType);
const accountEndpoint = (databaseAccount && databaseAccount.properties.documentEndpoint) || "";
=======
const { databaseAccount, resourceGroup, subscriptionId } = userContext;
const apiKind: DataModels.ApiKind = DefaultExperienceUtility.getApiKindFromDefaultExperience(userContext.apiType);
const accountEndpoint = databaseAccount?.properties?.documentEndpoint || "";
>>>>>>> 23223cfb231e7c65b01dd47faa51a1d84007352d
const sid = subscriptionId || "";
const rg = resourceGroup || "";
const dba = databaseAccount?.name || "";