Fixed typescript issues for DatabaseAccountUtility and InMemoryContentProvider

This commit is contained in:
vaidankarswapnil 2021-08-20 15:35:08 +05:30
parent 8eeda41021
commit 55b117d83b
5 changed files with 30 additions and 17 deletions

View File

@ -5,11 +5,15 @@ function isVirtualNetworkFilterEnabled() {
}
function isIpRulesEnabled() {
return userContext.databaseAccount?.properties?.ipRules?.length > 0;
return userContext?.databaseAccount?.properties?.ipRules !== undefined
? userContext?.databaseAccount?.properties?.ipRules?.length > 0
: false;
}
function isPrivateEndpointConnectionsEnabled() {
return userContext.databaseAccount?.properties?.privateEndpointConnections?.length > 0;
return userContext.databaseAccount?.properties?.privateEndpointConnections !== undefined
? userContext.databaseAccount?.properties?.privateEndpointConnections?.length > 0
: false;
}
export function isPublicInternetAccessAllowed(): boolean {

View File

@ -28,10 +28,10 @@ export const getErrorMessage = (error: string | Error = ""): string => {
};
export const getErrorStack = (error: string | Error): string => {
return typeof error === "string" ? undefined : error.stack;
return typeof error === "string" ? "" : error.stack === undefined ? "" : error.stack;
};
const sendNotificationForError = (errorMessage: string, errorCode: number | string): void => {
const sendNotificationForError = (errorMessage: string, errorCode: number | string | undefined): void => {
if (errorCode === HttpStatusCodes.Forbidden) {
if (errorMessage?.toLowerCase().indexOf("sharedoffer is disabled for your account") > 0) {
return;

View File

@ -2,9 +2,9 @@ import * as React from "react";
import * as Constants from "../../../Common/Constants";
interface AccessibleElementProps extends React.HtmlHTMLAttributes<HTMLElement> {
as: string; // tag element name
onActivated: (event: React.SyntheticEvent<HTMLElement>) => void;
"aria-label": string;
as?: string; // tag element name
onActivated?: (event: React.SyntheticEvent<HTMLElement>) => void;
"aria-label"?: string;
tabIndex?: number;
}
@ -16,7 +16,9 @@ export class AccessibleElement extends React.Component<AccessibleElementProps> {
if (event.charCode === Constants.KeyCodes.Space || event.charCode === Constants.KeyCodes.Enter) {
event.stopPropagation();
event.preventDefault();
this.props.onActivated(event);
if (this.props.onActivated !== undefined) {
this.props.onActivated(event);
}
}
};
@ -27,11 +29,15 @@ export class AccessibleElement extends React.Component<AccessibleElementProps> {
const tabIndex = this.props.tabIndex === undefined ? 0 : this.props.tabIndex;
return React.createElement(this.props.as, {
...elementProps,
onKeyPress: this.onKeyPress,
onClick: this.props.onActivated,
tabIndex,
});
return this.props.as !== undefined ? (
React.createElement(this.props.as, {
...elementProps,
onKeyPress: this.onKeyPress,
onClick: this.props.onActivated,
tabIndex,
})
) : (
<></>
);
}
}

View File

@ -89,7 +89,7 @@ export class InMemoryContentProvider implements IContentProvider {
request: {},
status,
response: content ? content : undefined,
responseText: content ? JSON.stringify(content) : undefined,
responseText: content ? JSON.stringify(content) : "",
responseType: "json",
};
}

View File

@ -137,9 +137,12 @@
"./src/quickstart.ts",
"./src/setupTests.ts",
"./src/userContext.test.ts",
"src/Common/EntityValue.tsx",
"./src/Common/EntityValue.tsx",
"./src/Platform/Hosted/Components/SwitchAccount.tsx",
"./src/Platform/Hosted/Components/SwitchSubscription.tsx"
"./src/Platform/Hosted/Components/SwitchSubscription.tsx",
"./src/Common/DatabaseAccountUtility.ts",
"./src/Explorer/Controls/Tabs/TabComponent.tsx",
"./src/Explorer/Notebook/NotebookComponent/ContentProviders/InMemoryContentProvider.ts"
],
"include": [
"src/CellOutputViewer/transforms/**/*",