From 7a6168d9e6f985193e7b1e675cb45a096d3dfdfa Mon Sep 17 00:00:00 2001
From: Candice Ye <candiceye@berkeley.edu>
Date: Mon, 8 Aug 2022 18:24:09 -0700
Subject: [PATCH] Fixes to SQL MIAA Compute + Storage page (#20272)

* Max for syncsecondary. Fix syncsecondary update.

* Update the value not the placeholder for SQL MIAA

* Disable save toolbar icon after save/update complete

Co-authored-by: Candice Ye <canye@microsoft.com>
---
 .../miaa/miaaComputeAndStoragePage.ts         | 26 +++++++++++--------
 extensions/azcli/src/az.ts                    |  1 +
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/extensions/arc/src/ui/dashboards/miaa/miaaComputeAndStoragePage.ts b/extensions/arc/src/ui/dashboards/miaa/miaaComputeAndStoragePage.ts
index a91efef695..bbb7a6753d 100644
--- a/extensions/arc/src/ui/dashboards/miaa/miaaComputeAndStoragePage.ts
+++ b/extensions/arc/src/ui/dashboards/miaa/miaaComputeAndStoragePage.ts
@@ -262,6 +262,7 @@ export class MiaaComputeAndStoragePage extends DashboardPage {
 		this.syncSecondaryToCommitBox = this.modelView.modelBuilder.inputBox().withProps({
 			readOnly: false,
 			min: -1,
+			max: 2,
 			inputType: 'number',
 			placeHolder: loc.loading,
 			ariaLabel: loc.syncSecondaryToCommit
@@ -323,7 +324,7 @@ export class MiaaComputeAndStoragePage extends DashboardPage {
 	}
 
 	private handleOnTextChanged(component: azdata.InputBoxComponent): boolean {
-		if ((!component.value)) {
+		if ((!component.placeHolder)) {
 			// if there is no text found in the inputbox component return false
 			return false;
 		} else if ((!component.valid)) {
@@ -349,8 +350,9 @@ export class MiaaComputeAndStoragePage extends DashboardPage {
 			currentCPUSize = '';
 		}
 
-		this.coresRequestBox!.placeHolder = currentCPUSize;
-		this.coresRequestBox!.value = '';
+		this.coresRequestBox!.value = currentCPUSize;
+		this.coresRequestBox!.placeHolder = '';
+
 		this.saveArgs.coresRequest = undefined;
 
 		currentCPUSize = this._miaaModel.config?.spec?.scheduling?.default?.resources?.limits?.cpu;
@@ -359,8 +361,9 @@ export class MiaaComputeAndStoragePage extends DashboardPage {
 			currentCPUSize = '';
 		}
 
-		this.coresLimitBox!.placeHolder = currentCPUSize;
-		this.coresLimitBox!.value = '';
+		this.coresLimitBox!.value = currentCPUSize;
+		this.coresLimitBox!.placeHolder = '';
+
 		this.saveArgs.coresLimit = undefined;
 	}
 
@@ -374,8 +377,8 @@ export class MiaaComputeAndStoragePage extends DashboardPage {
 			currentMemSizeConversion = convertToGibibyteString(currentMemorySize);
 		}
 
-		this.memoryRequestBox!.placeHolder = currentMemSizeConversion!;
-		this.memoryRequestBox!.value = '';
+		this.memoryRequestBox!.value = currentMemSizeConversion!;
+		this.memoryRequestBox!.placeHolder = '';
 
 		this.saveArgs.memoryRequest = undefined;
 
@@ -387,8 +390,9 @@ export class MiaaComputeAndStoragePage extends DashboardPage {
 			currentMemSizeConversion = convertToGibibyteString(currentMemorySize);
 		}
 
-		this.memoryLimitBox!.placeHolder = currentMemSizeConversion!;
-		this.memoryLimitBox!.value = '';
+		this.memoryLimitBox!.value = currentMemSizeConversion!;
+		this.memoryLimitBox!.placeHolder = '';
+
 
 		this.saveArgs.memoryLimit = undefined;
 	}
@@ -396,8 +400,8 @@ export class MiaaComputeAndStoragePage extends DashboardPage {
 	private editSyncSecondaryToCommit(): void {
 		let currentSyncSecondaryToCommit = this._miaaModel.config?.spec?.syncSecondaryToCommit;
 
-		this.syncSecondaryToCommitBox!.placeHolder = currentSyncSecondaryToCommit!;
-		this.syncSecondaryToCommitBox!.value = '';
+		this.syncSecondaryToCommitBox!.value = currentSyncSecondaryToCommit!;
+		this.syncSecondaryToCommitBox!.placeHolder = '';
 
 		this.saveArgs.syncSecondaryToCommit = undefined;
 	}
diff --git a/extensions/azcli/src/az.ts b/extensions/azcli/src/az.ts
index 2a3b35c664..649e3a310c 100644
--- a/extensions/azcli/src/az.ts
+++ b/extensions/azcli/src/az.ts
@@ -265,6 +265,7 @@ export class AzTool implements azExt.IAzApi {
 				if (args.memoryRequest) { argsArray.push('--memory-request', args.memoryRequest); }
 				if (args.noWait) { argsArray.push('--no-wait'); }
 				if (args.retentionDays) { argsArray.push('--retention-days', args.retentionDays); }
+				if (args.syncSecondaryToCommit) { argsArray.push('--sync-secondary-to-commit', args.syncSecondaryToCommit); }
 				if (resourceGroup) { argsArray.push('--resource-group', resourceGroup); }
 				if (namespace) { argsArray.push('--k8s-namespace', namespace); }
 				if (usek8s) { argsArray.push('--use-k8s'); }