resolve marge conflict

This commit is contained in:
hardiknai-techm
2021-05-04 08:13:34 +05:30
67 changed files with 6729 additions and 3360 deletions

View File

@@ -3,10 +3,9 @@ import React, { FunctionComponent, ReactNode } from "react";
import ErrorRedIcon from "../../../../images/error_red.svg";
import LoadingIndicatorIcon from "../../../../images/LoadingIndicator_3Squares.gif";
import { KeyCodes } from "../../../Common/Constants";
import Explorer from "../../Explorer";
export interface GenericRightPaneProps {
container: Explorer;
expandConsole: () => void;
formError: string;
formErrorDetail: string;
id: string;
@@ -20,7 +19,7 @@ export interface GenericRightPaneProps {
}
export const GenericRightPaneComponent: FunctionComponent<GenericRightPaneProps> = ({
container,
expandConsole,
formError,
formErrorDetail,
id,
@@ -68,7 +67,7 @@ export const GenericRightPaneComponent: FunctionComponent<GenericRightPaneProps>
<span className="formErrors" title={formError}>
{formError}
</span>
<a className="errorLink" role="link" hidden={!formErrorDetail} onClick={showErrorDetail}>
<a className="errorLink" role="link" hidden={!formErrorDetail} onClick={expandConsole}>
More details
</a>
</span>
@@ -110,10 +109,6 @@ export const GenericRightPaneComponent: FunctionComponent<GenericRightPaneProps>
}
};
const showErrorDetail = (): void => {
container.expandConsole();
};
return (
<div tabIndex={-1} onKeyDown={onKeyDown}>
<div className="contextual-pane-out" onClick={onClose}></div>