diff --git a/src/Explorer/Menus/CommandBar/MemoryTrackerComponent.tsx b/src/Explorer/Menus/CommandBar/MemoryTrackerComponent.tsx index 29687e5c7..af977f11a 100644 --- a/src/Explorer/Menus/CommandBar/MemoryTrackerComponent.tsx +++ b/src/Explorer/Menus/CommandBar/MemoryTrackerComponent.tsx @@ -3,8 +3,8 @@ import useSWR from "swr"; import { ProgressIndicator } from "office-ui-fabric-react/lib/ProgressIndicator"; import { Spinner, SpinnerSize } from "office-ui-fabric-react/lib/Spinner"; import { Stack } from "office-ui-fabric-react/lib/Stack"; -import { listConnectionInfo } from "../../../Utils/arm/generatedClients/2020-04-01-notebooks/notebookWorkspaces"; -import { NotebookWorkspaceConnectionInfoResult } from "../../../Utils/arm/generatedClients/2020-04-01-notebooks/types"; +import { listConnectionInfo } from "../../../Utils/arm/generatedClients/2020-04-01-notebook/notebookWorkspaces"; +import { NotebookWorkspaceConnectionInfoResult } from "../../../Utils/arm/generatedClients/2020-04-01-notebook/types"; import { userContext } from "../../../UserContext"; export interface MemoryUsageInfo { @@ -33,7 +33,7 @@ const fetchMemoryInfo = async (_key: unknown, connectionInfo: NotebookWorkspaceC }; export const MemoryTrackerComponent: FunctionComponent = () => { - const { data: connectionInfo } = useSWR( + const { data: connectionInfo } = useSWR( [ "notebooksConnectionInfo", userContext.subscriptionId, @@ -44,7 +44,7 @@ export const MemoryTrackerComponent: FunctionComponent = () => { (_key, subscriptionId, resourceGroup, accountName, workspace) => listConnectionInfo(subscriptionId, resourceGroup, accountName, workspace) ); - const { data } = useSWR(connectionInfo ? ["memoryUsage", connectionInfo] : null, fetchMemoryInfo, { + const { data } = useSWR(connectionInfo ? ["memoryUsage", connectionInfo] : null, fetchMemoryInfo, { refreshInterval: 2000 }); diff --git a/src/Utils/arm/generatedClients/2020-04-01-notebooks/notebookWorkspaces.ts b/src/Utils/arm/generatedClients/2020-04-01-notebook/notebookWorkspaces.ts similarity index 92% rename from src/Utils/arm/generatedClients/2020-04-01-notebooks/notebookWorkspaces.ts rename to src/Utils/arm/generatedClients/2020-04-01-notebook/notebookWorkspaces.ts index 1ebf617e4..4792015c0 100644 --- a/src/Utils/arm/generatedClients/2020-04-01-notebooks/notebookWorkspaces.ts +++ b/src/Utils/arm/generatedClients/2020-04-01-notebook/notebookWorkspaces.ts @@ -14,7 +14,7 @@ export async function listByDatabaseAccount( subscriptionId: string, resourceGroupName: string, accountName: string -): Promise { +): Promise { const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces`; return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "GET", apiVersion }); } @@ -25,7 +25,7 @@ export async function get( resourceGroupName: string, accountName: string, notebookWorkspaceName: string -): Promise { +): Promise { const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}`; return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "GET", apiVersion }); } @@ -37,7 +37,7 @@ export async function createOrUpdate( accountName: string, notebookWorkspaceName: string, body: Types.NotebookWorkspaceCreateUpdateParameters -): Promise { +): Promise { const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}`; return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "PUT", apiVersion, body }); } @@ -48,7 +48,7 @@ export async function destroy( resourceGroupName: string, accountName: string, notebookWorkspaceName: string -): Promise { +): Promise { const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}`; return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "DELETE", apiVersion }); } @@ -59,7 +59,7 @@ export async function listConnectionInfo( resourceGroupName: string, accountName: string, notebookWorkspaceName: string -): Promise { +): Promise { const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}/listConnectionInfo`; return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "POST", apiVersion }); } @@ -70,7 +70,7 @@ export async function regenerateAuthToken( resourceGroupName: string, accountName: string, notebookWorkspaceName: string -): Promise { +): Promise { const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}/regenerateAuthToken`; return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "POST", apiVersion }); } @@ -81,7 +81,7 @@ export async function start( resourceGroupName: string, accountName: string, notebookWorkspaceName: string -): Promise { +): Promise { const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/notebookWorkspaces/${notebookWorkspaceName}/start`; return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "POST", apiVersion }); } diff --git a/src/Utils/arm/generatedClients/2020-04-01-notebooks/types.ts b/src/Utils/arm/generatedClients/2020-04-01-notebook/types.ts similarity index 100% rename from src/Utils/arm/generatedClients/2020-04-01-notebooks/types.ts rename to src/Utils/arm/generatedClients/2020-04-01-notebook/types.ts diff --git a/tsconfig.strict.json b/tsconfig.strict.json index da8886945..2292c1209 100644 --- a/tsconfig.strict.json +++ b/tsconfig.strict.json @@ -68,7 +68,7 @@ "./src/Utils/MessageValidation.ts", "./src/Utils/OfferUtils.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/setupTests.ts", "./src/workers/upload/definitions.ts" diff --git a/utils/armClientGenerator/generator.ts b/utils/armClientGenerator/generator.ts index fdbc46005..301558b5d 100644 --- a/utils/armClientGenerator/generator.ts +++ b/utils/armClientGenerator/generator.ts @@ -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. */ -const rpname = "cosmos-db"; // Can also use "notebooks" +const rpname = "notebook"; // Can also use "notebooks" // Array of strings to use for eventual output const outputTypes: string[] = [""]; @@ -79,12 +79,16 @@ function responseType(operation: Operation, namespace: string) { if (operation.responses) { return Object.keys(operation.responses) .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) { return "void"; } 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(" | "); } return "unknown";