Fixed typescript strict issue of ResourceTokenUtils, CostEnstimatedText Draggable files

This commit is contained in:
sunilyadav840
2021-05-17 16:09:40 +05:30
parent a52a156005
commit 18bb22eab8
6 changed files with 24 additions and 13 deletions

View File

@@ -28,8 +28,9 @@ export const CostEstimateText: FunctionComponent<CostEstimateTextProps> = ({
} }
const serverId: string = userContext.portalEnv; const serverId: string = userContext.portalEnv;
const { enableMultipleWriteLocations } = databaseAccount.properties;
const numberOfRegions: number = databaseAccount.properties.readLocations?.length || 1; const numberOfRegions: number = databaseAccount.properties.readLocations?.length || 1;
const multimasterEnabled: boolean = databaseAccount.properties.enableMultipleWriteLocations; const multimasterEnabled: boolean = enableMultipleWriteLocations ? enableMultipleWriteLocations : false;
const hourlyPrice: number = computeRUUsagePriceHourly({ const hourlyPrice: number = computeRUUsagePriceHourly({
serverId, serverId,
requestUnits, requestUnits,

View File

@@ -11,7 +11,6 @@ import {
DropTargetConnector, DropTargetConnector,
DropTargetMonitor, DropTargetMonitor,
} from "react-dnd"; } from "react-dnd";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { Dispatch } from "redux"; import { Dispatch } from "redux";
import styled, { StyledComponent } from "styled-components"; import styled, { StyledComponent } from "styled-components";
@@ -109,7 +108,7 @@ const DragHandleAnchor = styled.div`
position: relative; position: relative;
`; `;
export function isDragUpper(props: Props, monitor: DropTargetMonitor, el: HTMLElement): boolean { export function isDragUpper(_props: Props, monitor: DropTargetMonitor, el: HTMLElement): boolean {
const hoverBoundingRect = el.getBoundingClientRect(); const hoverBoundingRect = el.getBoundingClientRect();
const hoverMiddleY = (hoverBoundingRect.bottom - hoverBoundingRect.top) / 2; const hoverMiddleY = (hoverBoundingRect.bottom - hoverBoundingRect.top) / 2;
@@ -223,7 +222,7 @@ export class DraggableCellView extends React.Component<Props & DnDSourceProps &
const source = DragSource<Props, DnDSourceProps>("CELL", cellSource, collectSource); const source = DragSource<Props, DnDSourceProps>("CELL", cellSource, collectSource);
const target = DropTarget<Props, DnDTargetProps>("CELL", cellTarget, collectTarget); const target = DropTarget<Props, DnDTargetProps>("CELL", cellTarget, collectTarget);
export const makeMapDispatchToProps = (initialDispatch: Dispatch) => { export const makeMapDispatchToProps = (_initialDispatch: Dispatch) => {
const mapDispatchToProps = (dispatch: Dispatch) => ({ const mapDispatchToProps = (dispatch: Dispatch) => ({
moveCell: (payload: actions.MoveCell["payload"]) => dispatch(actions.moveCell(payload)), moveCell: (payload: actions.MoveCell["payload"]) => dispatch(actions.moveCell(payload)),
focusCell: (payload: actions.FocusCell["payload"]) => dispatch(actions.focusCell(payload)), focusCell: (payload: actions.FocusCell["payload"]) => dispatch(actions.focusCell(payload)),

View File

@@ -10,7 +10,7 @@ describe("parseResourceTokenConnectionString", () => {
accountEndpoint: "fakeEndpoint", accountEndpoint: "fakeEndpoint",
collectionId: "fakeCollectionId", collectionId: "fakeCollectionId",
databaseId: "fakeDatabaseId", databaseId: "fakeDatabaseId",
partitionKey: undefined, partitionKey: "",
resourceToken: "type=resource&ver=1&sig=2dIP+CdIfT1ScwHWdv5GGw==;fakeToken;", resourceToken: "type=resource&ver=1&sig=2dIP+CdIfT1ScwHWdv5GGw==;fakeToken;",
}); });
}); });

View File

@@ -7,11 +7,11 @@ export interface ParsedResourceTokenConnectionString {
} }
export function parseResourceTokenConnectionString(connectionString: string): ParsedResourceTokenConnectionString { export function parseResourceTokenConnectionString(connectionString: string): ParsedResourceTokenConnectionString {
let accountEndpoint: string; let accountEndpoint = "";
let collectionId: string; let collectionId = "";
let databaseId: string; let databaseId = "";
let partitionKey: string; let partitionKey = "";
let resourceToken: string; let resourceToken = "";
const connectionStringParts = connectionString.split(";"); const connectionStringParts = connectionString.split(";");
connectionStringParts.forEach((part: string) => { connectionStringParts.forEach((part: string) => {
if (part.startsWith("type=resource")) { if (part.startsWith("type=resource")) {
@@ -39,5 +39,5 @@ export function parseResourceTokenConnectionString(connectionString: string): Pa
} }
export function isResourceTokenConnectionString(connectionString: string): boolean { export function isResourceTokenConnectionString(connectionString: string): boolean {
return connectionString && connectionString.includes("type=resource"); return connectionString.includes("type=resource");
} }

View File

@@ -21,7 +21,7 @@ interface UserContext {
// This is coming in a future Cosmos ARM API version as a prperty on databaseAccount // This is coming in a future Cosmos ARM API version as a prperty on databaseAccount
apiType: ApiType; apiType: ApiType;
readonly isTryCosmosDBSubscription?: boolean; readonly isTryCosmosDBSubscription?: boolean;
readonly portalEnv?: PortalEnv; readonly portalEnv: PortalEnv;
readonly features: Features; readonly features: Features;
readonly addCollectionFlight: string; readonly addCollectionFlight: string;
readonly hasWriteAccess: boolean; readonly hasWriteAccess: boolean;

View File

@@ -8,9 +8,11 @@
"noUnusedParameters": true "noUnusedParameters": true
}, },
"files": [ "files": [
"./src/Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText.tsx",
"./src/AuthType.ts", "./src/AuthType.ts",
"./src/Bindings/ReactBindingHandler.ts", "./src/Bindings/ReactBindingHandler.ts",
"./src/Common/ArrayHashMap.ts", "./src/Common/ArrayHashMap.ts",
"./src/Common/CollapsedResourceTree.tsx",
"./src/Common/Constants.ts", "./src/Common/Constants.ts",
"./src/Common/DeleteFeedback.ts", "./src/Common/DeleteFeedback.ts",
"./src/Common/DocumentUtility.ts", "./src/Common/DocumentUtility.ts",
@@ -25,6 +27,7 @@
"./src/Common/ObjectCache.ts", "./src/Common/ObjectCache.ts",
"./src/Common/OfferUtility.test.ts", "./src/Common/OfferUtility.test.ts",
"./src/Common/OfferUtility.ts", "./src/Common/OfferUtility.ts",
"./src/Common/ResourceTree.tsx",
"./src/Common/Splitter.ts", "./src/Common/Splitter.ts",
"./src/Common/ThemeUtility.ts", "./src/Common/ThemeUtility.ts",
"./src/Common/UrlUtility.ts", "./src/Common/UrlUtility.ts",
@@ -46,6 +49,7 @@
"./src/Explorer/LazyMonaco.ts", "./src/Explorer/LazyMonaco.ts",
"./src/Explorer/Notebook/FileSystemUtil.ts", "./src/Explorer/Notebook/FileSystemUtil.ts",
"./src/Explorer/Notebook/NTeractUtil.ts", "./src/Explorer/Notebook/NTeractUtil.ts",
"./src/Explorer/Notebook/NotebookComponent/ContentProviders/InMemoryContentProviderUtils.ts",
"./src/Explorer/Notebook/NotebookComponent/actions.ts", "./src/Explorer/Notebook/NotebookComponent/actions.ts",
"./src/Explorer/Notebook/NotebookComponent/loadTransform.ts", "./src/Explorer/Notebook/NotebookComponent/loadTransform.ts",
"./src/Explorer/Notebook/NotebookComponent/reducers.ts", "./src/Explorer/Notebook/NotebookComponent/reducers.ts",
@@ -57,7 +61,10 @@
"./src/Explorer/Notebook/NotebookRenderer/PromptContent.tsx", "./src/Explorer/Notebook/NotebookRenderer/PromptContent.tsx",
"./src/Explorer/Notebook/NotebookRenderer/decorators/CellCreator.tsx", "./src/Explorer/Notebook/NotebookRenderer/decorators/CellCreator.tsx",
"./src/Explorer/Notebook/NotebookRenderer/decorators/CellLabeler.tsx", "./src/Explorer/Notebook/NotebookRenderer/decorators/CellLabeler.tsx",
"./src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx",
"./src/Explorer/Notebook/NotebookUtil.ts", "./src/Explorer/Notebook/NotebookUtil.ts",
"./src/Explorer/Notebook/SchemaAnalyzer/SchemaAnalyzerSplashScreen.tsx",
"./src/Explorer/Notebook/SchemaAnalyzer/SchemaAnalyzerUtils.ts",
"./src/Explorer/OpenFullScreen.test.tsx", "./src/Explorer/OpenFullScreen.test.tsx",
"./src/Explorer/OpenFullScreen.tsx", "./src/Explorer/OpenFullScreen.tsx",
"./src/Explorer/Panes/PaneComponents.ts", "./src/Explorer/Panes/PaneComponents.ts",
@@ -78,9 +85,13 @@
"./src/Index.ts", "./src/Index.ts",
"./src/NotebookWorkspaceManager/NotebookWorkspaceResourceProviderMockClients.ts", "./src/NotebookWorkspaceManager/NotebookWorkspaceResourceProviderMockClients.ts",
"./src/Platform/Hosted/Authorization.ts", "./src/Platform/Hosted/Authorization.ts",
"./src/Platform/Hosted/Components/ConnectExplorer.test.tsx",
"./src/Platform/Hosted/Components/ConnectExplorer.tsx",
"./src/Platform/Hosted/Components/MeControl.test.tsx", "./src/Platform/Hosted/Components/MeControl.test.tsx",
"./src/Platform/Hosted/Components/MeControl.tsx", "./src/Platform/Hosted/Components/MeControl.tsx",
"./src/Platform/Hosted/Components/SignInButton.tsx", "./src/Platform/Hosted/Components/SignInButton.tsx",
"./src/Platform/Hosted/Helpers/ResourceTokenUtils.test.ts",
"./src/Platform/Hosted/Helpers/ResourceTokenUtils.ts",
"./src/Platform/Hosted/extractFeatures.test.ts", "./src/Platform/Hosted/extractFeatures.test.ts",
"./src/Platform/Hosted/extractFeatures.ts", "./src/Platform/Hosted/extractFeatures.ts",
"./src/ReactDevTools.ts", "./src/ReactDevTools.ts",
@@ -139,4 +150,4 @@
"src/Terminal/**/*", "src/Terminal/**/*",
"src/Utils/arm/**/*" "src/Utils/arm/**/*"
] ]
} }