Merge branch 'migrate_querytablestab__to_react' of https://github.com/Azure/cosmos-explorer into migrate_querytablestab__to_react

This commit is contained in:
sunilyadav840 2021-09-28 12:03:04 +05:30
commit cec6b27d2e
2 changed files with 13 additions and 14 deletions

View File

@ -489,12 +489,19 @@ input::-webkit-inner-spin-button {
display: inline; display: inline;
} }
.querybuilder-addpropertyImg, .querybuilder-addpropertyImg {
width: 18px;
height: 18px;
margin-left: 3px;
margin-bottom: 8px;
margin-top: 8px;
}
.querybuilder-cancelImg { .querybuilder-cancelImg {
width: 14px; width: 14px;
height: 14px; height: 14px;
margin-left: 3px; margin-left: 3px;
margin-bottom: 8px; margin-bottom: 8px;
margin-top: 8px;
} }
.addclauseProperty-Img { .addclauseProperty-Img {

View File

@ -11,8 +11,8 @@ import {
TooltipHost, TooltipHost,
} from "@fluentui/react"; } from "@fluentui/react";
import React, { FunctionComponent } from "react"; import React, { FunctionComponent } from "react";
// import AddIcon from "../../../../images/Add.svg"; import AddIcon from "../../../../images/Add-property.svg";
import CancelIcon from "../../../../images/cancel.svg"; import CancelIcon from "../../../../images/Entity_cancel.svg";
import { userContext } from "../../../UserContext"; import { userContext } from "../../../UserContext";
import { IOption } from "./QueryTableTabUtils"; import { IOption } from "./QueryTableTabUtils";
const dropdownStyles: Partial<IDropdownStyles> = { dropdown: { width: 100 } }; const dropdownStyles: Partial<IDropdownStyles> = { dropdown: { width: 100 } };
@ -67,13 +67,11 @@ export const QueryTableEntityClause: FunctionComponent<IQueryTableEntityClausePr
onDeleteCaluseKeyDown, onDeleteCaluseKeyDown,
}: IQueryTableEntityClauseProps): JSX.Element => { }: IQueryTableEntityClauseProps): JSX.Element => {
const cancelImageProps: IImageProps = { const cancelImageProps: IImageProps = {
width: 14, className: "querybuilder-cancelImg",
height: 25,
}; };
const addImageProps: IImageProps = { const addImageProps: IImageProps = {
width: 18, className: "querybuilder-addpropertyImg",
height: 25,
}; };
const sectionStackTokens: IStackTokens = { childrenGap: 12 }; const sectionStackTokens: IStackTokens = { childrenGap: 12 };
@ -93,7 +91,7 @@ export const QueryTableEntityClause: FunctionComponent<IQueryTableEntityClausePr
<TooltipHost content="Add new clause" id="addNewClause"> <TooltipHost content="Add new clause" id="addNewClause">
<Image <Image
{...addImageProps} {...addImageProps}
// src={AddIcon} src={AddIcon}
alt="Add new clause" alt="Add new clause"
id="addNewClause" id="addNewClause"
onClick={onAddNewClause} onClick={onAddNewClause}
@ -120,7 +118,6 @@ export const QueryTableEntityClause: FunctionComponent<IQueryTableEntityClausePr
onDropdownChange(selectedOption, "selectedOperation") onDropdownChange(selectedOption, "selectedOperation")
} }
options={operationOptions} options={operationOptions}
// id="operatorOptionId"
styles={dropdownStyles} styles={dropdownStyles}
/> />
<Dropdown <Dropdown
@ -129,7 +126,6 @@ export const QueryTableEntityClause: FunctionComponent<IQueryTableEntityClausePr
onDropdownChange(selectedOption, "selectedField") onDropdownChange(selectedOption, "selectedField")
} }
options={fieldOptions} options={fieldOptions}
// id="fieldOptionId"
styles={dropdownStyles} styles={dropdownStyles}
/> />
<Dropdown <Dropdown
@ -138,7 +134,6 @@ export const QueryTableEntityClause: FunctionComponent<IQueryTableEntityClausePr
onDropdownChange(selectedOption, "selectedEntityType") onDropdownChange(selectedOption, "selectedEntityType")
} }
options={entityTypeOptions} options={entityTypeOptions}
// id="entityOptionId"
disabled={validateEntityTypeOption()} disabled={validateEntityTypeOption()}
styles={dropdownStyles} styles={dropdownStyles}
/> />
@ -148,7 +143,6 @@ export const QueryTableEntityClause: FunctionComponent<IQueryTableEntityClausePr
onDropdownChange(selectedOption, "selectedOperator") onDropdownChange(selectedOption, "selectedOperator")
} }
options={operatorOptions} options={operatorOptions}
// id="operatorOptionId"
styles={dropdownStyles} styles={dropdownStyles}
/> />
{isTimeStampSelected ? ( {isTimeStampSelected ? (
@ -158,12 +152,10 @@ export const QueryTableEntityClause: FunctionComponent<IQueryTableEntityClausePr
onDropdownChange(selectedOption, "selectedTimestamp") onDropdownChange(selectedOption, "selectedTimestamp")
} }
options={timestampOptions} options={timestampOptions}
// id="operatorOptionId"
styles={dropdownStyles} styles={dropdownStyles}
/> />
) : ( ) : (
<TextField <TextField
// id="entityValueId"
autoFocus autoFocus
placeholder={entityValuePlaceHolder} placeholder={entityValuePlaceHolder}
value={entityValue} value={entityValue}