random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2026-01-30 15:14:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix strict mode

Browse Source
This commit is contained in:
Steve Faulkner
2020-09-10 18:39:52 -05:00
parent d494278488
commit 23599741d7
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Explorer/Menus/CommandBar/MemoryTrackerComponent.tsx
View File

@@ -3,8 +3,8 @@ import useSWR from "swr";
import { ProgressIndicator } from "office-ui-fabric-react/lib/ProgressIndicator"; import { ProgressIndicator } from "office-ui-fabric-react/lib/ProgressIndicator";
import { Spinner, SpinnerSize } from "office-ui-fabric-react/lib/Spinner"; import { Spinner, SpinnerSize } from "office-ui-fabric-react/lib/Spinner";
import { Stack } from "office-ui-fabric-react/lib/Stack"; import { Stack } from "office-ui-fabric-react/lib/Stack";
import { listConnectionInfo } from "../../../Utils/arm/generatedClients/2020-04-01-notebooks/notebookWorkspaces"; import { listConnectionInfo } from "../../../Utils/arm/generatedClients/2020-04-01-notebook/notebookWorkspaces";
import { NotebookWorkspaceConnectionInfoResult } from "../../../Utils/arm/generatedClients/2020-04-01-notebooks/types"; import { NotebookWorkspaceConnectionInfoResult } from "../../../Utils/arm/generatedClients/2020-04-01-notebook/types";
import { userContext } from "../../../UserContext"; import { userContext } from "../../../UserContext";
export interface MemoryUsageInfo { export interface MemoryUsageInfo {
@@ -33,7 +33,7 @@ const fetchMemoryInfo = async (_key: unknown, connectionInfo: NotebookWorkspaceC
}; };
export const MemoryTrackerComponent: FunctionComponent = () => { export const MemoryTrackerComponent: FunctionComponent = () => {
const { data: connectionInfo } = useSWR<NotebookWorkspaceConnectionInfoResult>( const { data: connectionInfo } = useSWR(
[ [
"notebooksConnectionInfo", "notebooksConnectionInfo",
userContext.subscriptionId, userContext.subscriptionId,
@@ -44,7 +44,7 @@ export const MemoryTrackerComponent: FunctionComponent = () => {
(_key, subscriptionId, resourceGroup, accountName, workspace) => (_key, subscriptionId, resourceGroup, accountName, workspace) =>
listConnectionInfo(subscriptionId, resourceGroup, accountName, workspace) listConnectionInfo(subscriptionId, resourceGroup, accountName, workspace)
); );
const { data } = useSWR<any>(connectionInfo ? ["memoryUsage", connectionInfo] : null, fetchMemoryInfo, { const { data } = useSWR(connectionInfo ? ["memoryUsage", connectionInfo] : null, fetchMemoryInfo, {
refreshInterval: 2000 refreshInterval: 2000
}); });

14
src/Utils/arm/generatedClients/2020-04-01-notebooks/notebookWorkspaces.ts → src/Utils/arm/generatedClients/2020-04-01-notebook/notebookWorkspaces.ts
View File

@@ -14,7 +14,7 @@ export async function listByDatabaseAccount(
subscriptionId: string, subscriptionId: string,
resourceGroupName: string, resourceGroupName: string,
accountName: string accountName: string
): Promise<Types.NotebookWorkspaceListResult | unknown> { ): Promise<Types.NotebookWorkspaceListResult> {
const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces`; const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces`;
return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "GET", apiVersion }); return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "GET", apiVersion });
} }
@@ -25,7 +25,7 @@ export async function get(
resourceGroupName: string, resourceGroupName: string,
accountName: string, accountName: string,
notebookWorkspaceName: string notebookWorkspaceName: string
): Promise<Types.NotebookWorkspace | unknown> { ): Promise<Types.NotebookWorkspace> {
const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}`; const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}`;
return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "GET", apiVersion }); return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "GET", apiVersion });
} }
@@ -37,7 +37,7 @@ export async function createOrUpdate(
accountName: string, accountName: string,
notebookWorkspaceName: string, notebookWorkspaceName: string,
body: Types.NotebookWorkspaceCreateUpdateParameters body: Types.NotebookWorkspaceCreateUpdateParameters
): Promise<Types.NotebookWorkspace | unknown> { ): Promise<Types.NotebookWorkspace> {
const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}`; const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}`;
return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "PUT", apiVersion, body }); return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "PUT", apiVersion, body });
} }
@@ -48,7 +48,7 @@ export async function destroy(
resourceGroupName: string, resourceGroupName: string,
accountName: string, accountName: string,
notebookWorkspaceName: string notebookWorkspaceName: string
): Promise<void | unknown> { ): Promise<void> {
const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}`; const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}`;
return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "DELETE", apiVersion }); return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "DELETE", apiVersion });
} }
@@ -59,7 +59,7 @@ export async function listConnectionInfo(
resourceGroupName: string, resourceGroupName: string,
accountName: string, accountName: string,
notebookWorkspaceName: string notebookWorkspaceName: string
): Promise<Types.NotebookWorkspaceConnectionInfoResult | unknown> { ): Promise<Types.NotebookWorkspaceConnectionInfoResult> {
const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}/listConnectionInfo`; const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}/listConnectionInfo`;
return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "POST", apiVersion }); return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "POST", apiVersion });
} }
@@ -70,7 +70,7 @@ export async function regenerateAuthToken(
resourceGroupName: string, resourceGroupName: string,
accountName: string, accountName: string,
notebookWorkspaceName: string notebookWorkspaceName: string
): Promise<void | unknown> { ): Promise<void> {
const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}/regenerateAuthToken`; const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}/regenerateAuthToken`;
return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "POST", apiVersion }); return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "POST", apiVersion });
} }
@@ -81,7 +81,7 @@ export async function start(
resourceGroupName: string, resourceGroupName: string,
accountName: string, accountName: string,
notebookWorkspaceName: string notebookWorkspaceName: string
): Promise<void | unknown> { ): Promise<void> {
const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}/start`; const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}/start`;
return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "POST", apiVersion }); return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "POST", apiVersion });
} }

0
src/Utils/arm/generatedClients/2020-04-01-notebooks/types.ts → src/Utils/arm/generatedClients/2020-04-01-notebook/types.ts
View File

2
tsconfig.strict.json
View File

@@ -68,7 +68,7 @@
"./src/Utils/MessageValidation.ts", "./src/Utils/MessageValidation.ts",
"./src/Utils/OfferUtils.ts", "./src/Utils/OfferUtils.ts",
"./src/Utils/StringUtils.ts", "./src/Utils/StringUtils.ts",
"./src/Utils/arm/generatedClients/2020-04-01/types.ts", "./src/Utils/arm/generatedClients/2020-04-01-cosmos-db/types.ts",
"./src/quickstart.ts", "./src/quickstart.ts",
"./src/setupTests.ts", "./src/setupTests.ts",
"./src/workers/upload/definitions.ts" "./src/workers/upload/definitions.ts"

8
utils/armClientGenerator/generator.ts
View File

@@ -14,7 +14,7 @@ But it does work well enough to generate a fully typed tree-shakeable client for
Results of this file should be checked into the repo. Results of this file should be checked into the repo.
*/ */
const rpname = "cosmos-db"; // Can also use "notebooks" const rpname = "notebook"; // Can also use "notebooks"
// Array of strings to use for eventual output // Array of strings to use for eventual output
const outputTypes: string[] = [""]; const outputTypes: string[] = [""];
@@ -79,12 +79,16 @@ function responseType(operation: Operation, namespace: string) {
if (operation.responses) { if (operation.responses) {
return Object.keys(operation.responses) return Object.keys(operation.responses)
.map((responseCode: string) => { .map((responseCode: string) => {
// "default" always seems to be an ErrorResponse which we do not want to include in the possible return type
if (responseCode === "default") {
return undefined;
}
if (!operation.responses[responseCode].schema) { if (!operation.responses[responseCode].schema) {
return "void"; return "void";
} }
return refToType(operation.responses[responseCode].schema.$ref, namespace); return refToType(operation.responses[responseCode].schema.$ref, namespace);
}) })
.filter((value, index, array) => array.indexOf(value) === index) .filter((value, index, array) => value && array.indexOf(value) === index) // Ensure all values are truthy and unique
.join(" | "); .join(" | ");
} }
return "unknown"; return "unknown";