From ad4a16ca82192e03af76387fc0ac5120dfdefb2d Mon Sep 17 00:00:00 2001
From: Candice Ye <candiceye@berkeley.edu>
Date: Mon, 8 Aug 2022 13:20:05 -0700
Subject: [PATCH] Config profile is now Kubernetes configuration template in
 Arc DC Create Wizard (#20261)

* Re-enabled config for direct mode

* Changed name and placement

* Shortened description

* Remove pg and sql as categories for DC

Co-authored-by: Candice Ye <canye@microsoft.com>
---
 extensions/arc/package.json     | 41 +++++++++++++++------------------
 extensions/arc/package.nls.json |  5 ++--
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/extensions/arc/package.json b/extensions/arc/package.json
index b6d6be6875..54d33c8db2 100644
--- a/extensions/arc/package.json
+++ b/extensions/arc/package.json
@@ -143,9 +143,7 @@
         "platforms": "*",
         "icon": "./images/data_controller.svg",
         "tags": [
-          "Hybrid",
-          "SQL Server",
-          "PostgreSQL"
+          "Hybrid"
         ],
         "providers": [
           {
@@ -201,26 +199,6 @@
                             "target": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CONNECTIVITY_MODE",
                             "value": "indirect"
                           }
-                        },
-                        {
-                          "type": "options",
-                          "label": "%arc.data.controller.cluster.config.profile%",
-                          "required": true,
-                          "variableName": "AZDATA_NB_VAR_ARC_PROFILE",
-                          "editable": false,
-                          "options": {
-                            "source": {
-                              "providerId": "azcli.arc.controller.config.profiles",
-                              "loadingText": "%arc.data.controller.cluster.config.profile.loading%",
-                              "loadingCompletedText": "%arc.data.controller.cluster.config.profile.loadingcompleted%"
-                            },
-                            "defaultValue": "azure-arc-aks-default-storage",
-                            "optionsType": "dropdown"
-                          },
-                          "enabled": {
-                            "target": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CONNECTIVITY_MODE",
-                            "value": "indirect"
-                          }
                         }
                       ]
                     }
@@ -298,6 +276,23 @@
                           "required": true,
                           "variableName": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_NAME"
                         },
+                        {
+                          "type": "options",
+                          "label": "%arc.data.controller.cluster.config.profile%",
+                          "description": "%arc.data.controller.cluster.config.profile.description%",
+                          "required": true,
+                          "variableName": "AZDATA_NB_VAR_ARC_PROFILE",
+                          "editable": false,
+                          "options": {
+                            "source": {
+                              "providerId": "azcli.arc.controller.config.profiles",
+                              "loadingText": "%arc.data.controller.cluster.config.profile.loading%",
+                              "loadingCompletedText": "%arc.data.controller.cluster.config.profile.loadingcompleted%"
+                            },
+                            "defaultValue": "azure-arc-aks-default-storage",
+                            "optionsType": "dropdown"
+                          }
+                        },
                         {
                           "label": "%arc.storage-class.dc.label%",
                           "description": "%arc.sql.storage-class.dc.description%",
diff --git a/extensions/arc/package.nls.json b/extensions/arc/package.nls.json
index 5b3b38fbbb..bdad2bd172 100644
--- a/extensions/arc/package.nls.json
+++ b/extensions/arc/package.nls.json
@@ -20,7 +20,8 @@
 	"arc.data.controller.select.cluster.title": "Select from existing Kubernetes clusters",
 	"arc.data.controller.kube.cluster.context": "Cluster context",
 	"arc.data.controller.cluster.config.profile.title": "Choose the config profile",
-	"arc.data.controller.cluster.config.profile": "Config profile",
+	"arc.data.controller.cluster.config.profile": "Kubernetes configuration template",
+	"arc.data.controller.cluster.config.profile.description": "Choose the Kubernetes configuration template that matches with your Kubernetes distribution. This template provides defaults for storage class, service type, etc.",
 	"arc.data.controller.cluster.config.profile.loading": "Loading config profiles",
 	"arc.data.controller.cluster.config.profile.loadingcompleted": "Loading config profiles complete",
 	"arc.data.controller.create.azureconfig.title": "Azure Configuration",
@@ -28,7 +29,7 @@
 	"arc.data.controller.project.details.title": "Azure details",
 	"arc.data.controller.project.details.description": "Select the subscription to manage deployed resources and costs. Use resource groups like folders to organize and manage all your resources.",
 	"arc.data.controller.details.title": "Data controller details",
-	"arc.data.controller.details.description": "For indirect mode, provide a namespace, name and storage class for your Azure Arc data controller. This name will be used to identify your Arc instance for remote management and monitoring. For direct mode you do not need to provide a namespace, but please provide the custom location name.",
+	"arc.data.controller.details.description": "For indirect mode, namespace, name and storage class are required. This name will be used to identify your Arc instance for remote management and monitoring. For direct mode, custom location name is required.",
 	"arc.data.controller.indirect.display.name": "Indirect",
 	"arc.data.controller.direct.display.name": "Direct",
 	"arc.data.controller.connectivity.mode": "Connectivity mode",