From ad26ebcfc26d8d8a4ee020821a954750dd8bc675 Mon Sep 17 00:00:00 2001
From: Asier Isayas <aisayas@microsoft.com>
Date: Mon, 21 Sep 2026 06:27:30 -0700
Subject: [PATCH] Remove throughput bucketing feature registration check

Derive throughput bucket availability in container settings from the supported AAD ARM path, and remove obsolete global and URL feature state.
---
 .../Settings/SettingsComponent.test.tsx       |  1 -
 .../Controls/Settings/SettingsComponent.tsx   |  8 +++++--
 src/Explorer/Explorer.tsx                     | 22 ++-----------------
 src/Platform/Hosted/extractFeatures.ts        |  2 --
 src/UserContext.ts                            |  1 -
 src/Utils/AuthorizationUtils.test.ts          |  1 -
 6 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/Explorer/Controls/Settings/SettingsComponent.test.tsx b/src/Explorer/Controls/Settings/SettingsComponent.test.tsx
index ff7485b5e..0cf4fecd1 100644
--- a/src/Explorer/Controls/Settings/SettingsComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.test.tsx
@@ -258,7 +258,6 @@ describe("SettingsComponent", () => {
   it("should save throughput bucket changes when Save button is clicked", async () => {
     updateUserContext({
       apiType: "SQL",
-      throughputBucketsEnabled: true,
       authType: AuthType.AAD,
     });
 
diff --git a/src/Explorer/Controls/Settings/SettingsComponent.tsx b/src/Explorer/Controls/Settings/SettingsComponent.tsx
index 558beceec..67c8c969d 100644
--- a/src/Explorer/Controls/Settings/SettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx
@@ -16,7 +16,7 @@ import {
 import { useIndexingPolicyStore } from "Explorer/Tabs/QueryTab/ResultsView";
 import { useDatabases } from "Explorer/useDatabases";
 import { Keys, t } from "Localization";
-import { isFabricNative } from "Platform/Fabric/FabricUtil";
+import { isFabric, isFabricNative } from "Platform/Fabric/FabricUtil";
 import { isVectorSearchEnabled } from "Utils/CapabilityUtils";
 import { isRunningOnPublicCloud } from "Utils/CloudUtils";
 import * as React from "react";
@@ -204,7 +204,11 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       this.isFullTextSearchEnabled = userContext.apiType === "SQL";
 
       this.changeFeedPolicyVisible = userContext.features.enableChangeFeedPolicy;
-      this.throughputBucketsEnabled = userContext.throughputBucketsEnabled;
+      this.throughputBucketsEnabled =
+        userContext.authType === AuthType.AAD &&
+        userContext.apiType === "SQL" &&
+        !userContext.features.enableSDKoperations &&
+        !isFabric();
 
       // Mongo container with system partition key still treat as "Fixed"
       this.isFixedContainer =
diff --git a/src/Explorer/Explorer.tsx b/src/Explorer/Explorer.tsx
index bc7df461d..1858def0c 100644
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -3,14 +3,8 @@ import { sendMessage } from "Common/MessageHandler";
 import { stringifyError } from "Common/stringifyError";
 import { MessageTypes } from "Contracts/ExplorerContracts";
 import { useDataPlaneRbac } from "Explorer/Panes/SettingsPane/SettingsPane";
-import {
-  isFabricMirrored,
-  isFabricMirroredKey,
-  isFabricNative,
-  scheduleRefreshFabricToken,
-} from "Platform/Fabric/FabricUtil";
+import { isFabricMirrored, isFabricMirroredKey, scheduleRefreshFabricToken } from "Platform/Fabric/FabricUtil";
 import { acquireMsalTokenForAccount } from "Utils/AuthorizationUtils";
-import { featureRegistered } from "Utils/FeatureRegistrationUtils";
 import { update } from "Utils/arm/generatedClients/cosmos/databaseAccounts";
 import * as ko from "knockout";
 import React from "react";
@@ -577,9 +571,6 @@ export default class Explorer {
       scenarioMonitor.start(MetricScenario.DatabaseLoad);
     }
 
-    // Run independent initialization tasks in parallel:
-    // - Database loading (ARM/SDK calls for databases + collections)
-    // - Feature registration check (ARM call — no dependency on databases)
     const databasesTask =
       userContext.apiType !== "Postgres" && userContext.apiType !== "VCoreMongo"
         ? (async () => {
@@ -596,15 +587,6 @@ export default class Explorer {
           })()
         : Promise.resolve();
 
-    const featureRegistrationTask =
-      userContext.authType === AuthType.AAD && userContext.apiType === "SQL" && !isFabricNative()
-        ? featureRegistered(userContext.subscriptionId, "ThroughputBucketing")
-        : Promise.resolve(false);
-
-    const [, throughputBucketsEnabled] = await Promise.all([databasesTask, featureRegistrationTask]);
-
-    if (throughputBucketsEnabled) {
-      updateUserContext({ throughputBucketsEnabled });
-    }
+    await databasesTask;
   }
 }
diff --git a/src/Platform/Hosted/extractFeatures.ts b/src/Platform/Hosted/extractFeatures.ts
index d8ccecae0..1a4e549fc 100644
--- a/src/Platform/Hosted/extractFeatures.ts
+++ b/src/Platform/Hosted/extractFeatures.ts
@@ -16,7 +16,6 @@ export type Features = {
   readonly enableAadDataPlane: boolean;
   readonly enableResourceGraph: boolean;
   readonly enableKoResourceTree: boolean;
-  readonly enableThroughputBuckets: boolean;
   readonly hostedDataExplorer: boolean;
   readonly junoEndpoint?: string;
   readonly phoenixEndpoint?: string;
@@ -80,7 +79,6 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     enableSpark: "true" === get("enablespark"),
     enableTtl: "true" === get("enablettl"),
     enableKoResourceTree: "true" === get("enablekoresourcetree"),
-    enableThroughputBuckets: "true" === get("enablethroughputbuckets"),
     executeSproc: "true" === get("dataexplorerexecutesproc"),
     hostedDataExplorer: "true" === get("hosteddataexplorerenabled"),
     mongoProxyEndpoint: get("mongoproxyendpoint"),
diff --git a/src/UserContext.ts b/src/UserContext.ts
index 036ed322e..8f268157e 100644
--- a/src/UserContext.ts
+++ b/src/UserContext.ts
@@ -144,7 +144,6 @@ export interface UserContext {
   readonly feedbackPolicies?: AdminFeedbackPolicySettings;
   readonly dataPlaneRbacEnabled?: boolean;
   readonly refreshCosmosClient?: boolean;
-  throughputBucketsEnabled?: boolean;
   readonly sessionId: string;
 }
 
diff --git a/src/Utils/AuthorizationUtils.test.ts b/src/Utils/AuthorizationUtils.test.ts
index fd361ac22..2df20d6a0 100644
--- a/src/Utils/AuthorizationUtils.test.ts
+++ b/src/Utils/AuthorizationUtils.test.ts
@@ -34,7 +34,6 @@ describe("AuthorizationUtils", () => {
         executeSproc: false,
         enableResourceGraph: false,
         enableKoResourceTree: false,
-        enableThroughputBuckets: false,
         hostedDataExplorer: false,
         sandboxNotebookOutputs: true,
         showMinRUSurvey: false,