diff --git a/src/Common/dataAccess/getCollectionDataUsageSize.ts b/src/Common/dataAccess/getCollectionDataUsageSize.ts index bb53bc6ac..7f8e009c2 100644 --- a/src/Common/dataAccess/getCollectionDataUsageSize.ts +++ b/src/Common/dataAccess/getCollectionDataUsageSize.ts @@ -1,3 +1,4 @@ +import { isFabricNative } from "Platform/Fabric/FabricUtil"; import { AuthType } from "../../AuthType"; import { configContext } from "../../ConfigContext"; import { userContext } from "../../UserContext"; @@ -41,7 +42,7 @@ interface MetricsResponse { } export const getCollectionUsageSizeInKB = async (databaseName: string, containerName: string): Promise => { - if (userContext.authType !== AuthType.AAD) { + if (userContext.authType !== AuthType.AAD || isFabricNative()) { return undefined; } diff --git a/src/Explorer/Explorer.tsx b/src/Explorer/Explorer.tsx index a3685dae9..b4b5e0c54 100644 --- a/src/Explorer/Explorer.tsx +++ b/src/Explorer/Explorer.tsx @@ -8,7 +8,12 @@ import { MessageTypes } from "Contracts/ExplorerContracts"; import { useDataPlaneRbac } from "Explorer/Panes/SettingsPane/SettingsPane"; import { getCopilotEnabled, isCopilotFeatureRegistered } from "Explorer/QueryCopilot/Shared/QueryCopilotClient"; import { IGalleryItem } from "Juno/JunoClient"; -import { isFabricMirrored, isFabricMirroredKey, scheduleRefreshFabricToken } from "Platform/Fabric/FabricUtil"; +import { + isFabricMirrored, + isFabricMirroredKey, + isFabricNative, + scheduleRefreshFabricToken, +} from "Platform/Fabric/FabricUtil"; import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility"; import { acquireMsalTokenForAccount } from "Utils/AuthorizationUtils"; import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointUtils"; @@ -1149,7 +1154,10 @@ export default class Explorer { ? this.refreshDatabaseForResourceToken() : await this.refreshAllDatabases(); // await: we rely on the databases to be loaded before restoring the tabs further in the flow } - await useNotebook.getState().refreshNotebooksEnabledStateForAccount(); + + if (!isFabricNative()) { + await useNotebook.getState().refreshNotebooksEnabledStateForAccount(); + } // TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount const isNotebookEnabled = @@ -1171,7 +1179,7 @@ export default class Explorer { await this.initNotebooks(userContext.databaseAccount); } - if (userContext.authType === AuthType.AAD && userContext.apiType === "SQL") { + if (userContext.authType === AuthType.AAD && userContext.apiType === "SQL" && !isFabricNative()) { const throughputBucketsEnabled = await featureRegistered(userContext.subscriptionId, "ThroughputBucketing"); updateUserContext({ throughputBucketsEnabled }); } diff --git a/src/Phoenix/PhoenixClient.ts b/src/Phoenix/PhoenixClient.ts index 662433de1..c4f3fa38b 100644 --- a/src/Phoenix/PhoenixClient.ts +++ b/src/Phoenix/PhoenixClient.ts @@ -252,7 +252,7 @@ export class PhoenixClient { private getPhoenixControlPlanePathPrefix(): string { if (!this.armResourceId) { - throw new Error("The Phoenix client was not initialized properly: missing ARM resourcce id"); + throw new Error("The Phoenix client was not initialized properly: missing ARM resource id"); } const toolsEndpoint =