From 5e83b815403f68464f5af0ad043614937867888b Mon Sep 17 00:00:00 2001
From: Tara Zou <tarazou@microsoft.com>
Date: Tue, 26 Mar 2024 10:38:59 -0400
Subject: [PATCH] get dedicated gateway value from API response

---
 src/SelfServe/SqlX/SqlX.rp.ts   | 12 ++++++++++--
 src/SelfServe/SqlX/SqlX.tsx     | 19 +++++++++----------
 src/SelfServe/SqlX/SqlxTypes.ts |  2 ++
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/SelfServe/SqlX/SqlX.rp.ts b/src/SelfServe/SqlX/SqlX.rp.ts
index 02bbdffdf..76d732b43 100644
--- a/src/SelfServe/SqlX/SqlX.rp.ts
+++ b/src/SelfServe/SqlX/SqlX.rp.ts
@@ -24,6 +24,7 @@ export enum ResourceStatus {
 
 export interface DedicatedGatewayResponse {
   sku: string;
+  dedicatedGatewayType: string;
   instances: number;
   status: string;
   endpoint: string;
@@ -42,7 +43,7 @@ export const updateDedicatedGatewayResource = async (
   const body: UpdateDedicatedGatewayRequestParameters = {
     properties: {
       instanceSize: sku,
-      // TODO: pass in DedicatedGatewayType into the properties on Update
+      dedicatedGatewayType: dedicatedGatewayType,
       instanceCount: instances,
       serviceType: "SqlDedicatedGateway",
     },
@@ -114,12 +115,19 @@ export const getCurrentProvisioningState = async (): Promise<DedicatedGatewayRes
     const response = await getDedicatedGatewayResource();
     return {
       sku: response.properties.instanceSize,
+      dedicatedGatewayType: response.properties.dedicatedGatewayType,
       instances: response.properties.instanceCount,
       status: response.properties.status,
       endpoint: response.properties.sqlxEndPoint,
     };
   } catch (e) {
-    return { sku: undefined, instances: undefined, status: undefined, endpoint: undefined };
+    return {
+      sku: undefined,
+      dedicatedGatewayType: undefined,
+      instances: undefined,
+      status: undefined,
+      endpoint: undefined,
+    };
   }
 };
 
diff --git a/src/SelfServe/SqlX/SqlX.tsx b/src/SelfServe/SqlX/SqlX.tsx
index 44265aa89..463116102 100644
--- a/src/SelfServe/SqlX/SqlX.tsx
+++ b/src/SelfServe/SqlX/SqlX.tsx
@@ -408,8 +408,7 @@ export default class SqlX extends SelfServeBaseClass {
     if (response.status && response.status !== "Deleting") {
       defaults.set("enableDedicatedGateway", { value: true });
       defaults.set("sku", { value: response.sku, disabled: true });
-      // TODO: Replace mocked value with real API response value later on initilization
-      defaults.set("dedicatedGatewayType", { value: IntegratedCache, disabled: true });
+      defaults.set("dedicatedGatewayType", { value: response.dedicatedGatewayType || IntegratedCache, disabled: true });
       defaults.set("instances", { value: response.instances, disabled: false });
       defaults.set("costPerHour", { value: calculateCost(response.sku, response.instances) });
       defaults.set("connectionString", {
@@ -451,14 +450,6 @@ export default class SqlX extends SelfServeBaseClass {
   })
   enableDedicatedGateway: boolean;
 
-  @OnChange(onSKUChange)
-  @Values({
-    labelTKey: "SKUs",
-    choices: getSkus,
-    placeholderTKey: "SKUsPlaceHolder",
-  })
-  sku: ChoiceItem;
-
   @OnChange(onDedicatedGatewayTypeChange)
   @Values({
     labelTKey: "Dedicated Gateway Type",
@@ -467,6 +458,14 @@ export default class SqlX extends SelfServeBaseClass {
   })
   dedicatedGatewayType: ChoiceItem;
 
+  @OnChange(onSKUChange)
+  @Values({
+    labelTKey: "SKUs",
+    choices: getSkus,
+    placeholderTKey: "SKUsPlaceHolder",
+  })
+  sku: ChoiceItem;
+
   @OnChange(onNumberOfInstancesChange)
   @PropertyInfo(NumberOfInstancesDropdownInfo)
   @Values({
diff --git a/src/SelfServe/SqlX/SqlxTypes.ts b/src/SelfServe/SqlX/SqlxTypes.ts
index 3360df734..f2149ae77 100644
--- a/src/SelfServe/SqlX/SqlxTypes.ts
+++ b/src/SelfServe/SqlX/SqlxTypes.ts
@@ -10,6 +10,7 @@ export type SqlxServiceProps = {
   creationTime: string;
   status: string;
   instanceSize: string;
+  dedicatedGatewayType: string;
   instanceCount: number;
   sqlxEndPoint: string;
 };
@@ -26,6 +27,7 @@ export type UpdateDedicatedGatewayRequestParameters = {
 
 export type UpdateDedicatedGatewayRequestProperties = {
   instanceSize: string;
+  dedicatedGatewayType: string;
   instanceCount: number;
   serviceType: string;
 };