From 9077a747d6ab54b42696e3fd54ba8ce9b7717a31 Mon Sep 17 00:00:00 2001
From: Priya Patel <priya.patel@hashicorp.com>
Date: Thu, 21 Aug 2025 15:00:25 -0500
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20change=20default=20t?=
 =?UTF-8?q?arget=20type=20to=20tcp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/routes/scopes/scope/targets/new.js    | 19 ++-----------------
 .../tests/acceptance/targets/create-test.js   | 12 ++++++------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/ui/admin/app/routes/scopes/scope/targets/new.js b/ui/admin/app/routes/scopes/scope/targets/new.js
index db40306fe..4cce18216 100644
--- a/ui/admin/app/routes/scopes/scope/targets/new.js
+++ b/ui/admin/app/routes/scopes/scope/targets/new.js
@@ -5,11 +5,7 @@
 
 import Route from '@ember/routing/route';
 import { service } from '@ember/service';
-import {
-  TYPE_TARGET_TCP,
-  TYPE_TARGET_SSH,
-  TYPE_TARGET_RDP,
-} from 'api/models/target';
+import { TYPE_TARGET_TCP } from 'api/models/target';
 
 export default class ScopesScopeTargetsNewRoute extends Route {
   // =services
@@ -47,21 +43,10 @@ export default class ScopesScopeTargetsNewRoute extends Route {
    * @return {TargetModel}
    */
 
-  model({ type }) {
+  model({ type = TYPE_TARGET_TCP }) {
     let name, description;
     const scopeModel = this.modelFor('scopes.scope');
 
-    // default type is RDP if the feature is enabled, or is SSH if feature enabled otherwise TCP
-    if (!type) {
-      if (this.features.isEnabled('rdp-target')) {
-        type = TYPE_TARGET_RDP;
-      } else if (this.features.isEnabled('ssh-target')) {
-        type = TYPE_TARGET_SSH;
-      } else {
-        type = TYPE_TARGET_TCP;
-      }
-    }
-
     if (this.currentModel?.isNew) {
       ({ name, description } = this.currentModel);
       this.currentModel.rollbackAttributes();
diff --git a/ui/admin/tests/acceptance/targets/create-test.js b/ui/admin/tests/acceptance/targets/create-test.js
index 0ba0667ea..29a1fbf8e 100644
--- a/ui/admin/tests/acceptance/targets/create-test.js
+++ b/ui/admin/tests/acceptance/targets/create-test.js
@@ -91,7 +91,7 @@ module('Acceptance | targets | create', function (hooks) {
     await authenticateSession({});
   });
 
-  test('defaults to type `ssh` when no query param provided', async function (assert) {
+  test('defaults to type `tcp` when no query param provided', async function (assert) {
     setRunOptions({
       rules: {
         'color-contrast': {
@@ -100,13 +100,12 @@ module('Acceptance | targets | create', function (hooks) {
         },
       },
     });
-
     featuresService.enable('ssh-target');
     await visit(urls.targets);
 
     await click(commonSelectors.HREF(urls.newTarget));
 
-    assert.dom(selectors.FIELD_TYPE_CHECKED).hasValue(TYPE_TARGET_SSH);
+    assert.dom(selectors.FIELD_TYPE_CHECKED).hasValue(TYPE_TARGET_TCP);
   });
 
   test('can create a type `ssh` target', async function (assert) {
@@ -181,6 +180,7 @@ module('Acceptance | targets | create', function (hooks) {
     await visit(urls.targets);
 
     await click(commonSelectors.HREF(urls.newTarget));
+    await click(selectors.FIELD_TYPE_VALUE('ssh'));
 
     assert.dom(selectors.FIELD_DEFAULT_PORT_LABEL).includesText('Optional');
   });
@@ -199,7 +199,6 @@ module('Acceptance | targets | create', function (hooks) {
     await visit(urls.targets);
 
     await click(commonSelectors.HREF(urls.newTarget));
-    await click(selectors.FIELD_TYPE_VALUE('tcp'));
 
     assert.dom(selectors.FIELD_DEFAULT_PORT_LABEL).includesText('Required');
   });
@@ -516,13 +515,13 @@ module('Acceptance | targets | create', function (hooks) {
     assert.strictEqual(currentURL(), urls.targets);
   });
 
-  test('defaults to type `rdp` when no query param provided and rdp feature is enabled', async function (assert) {
+  test('defaults to type `tcp` when no query param provided and rdp feature is enabled', async function (assert) {
     featuresService.enable('rdp-target');
     await visit(urls.targets);
 
     await click(commonSelectors.HREF(urls.newTarget));
 
-    assert.dom(selectors.FIELD_TYPE_CHECKED).hasValue(TYPE_TARGET_RDP);
+    assert.dom(selectors.FIELD_TYPE_CHECKED).hasValue(TYPE_TARGET_TCP);
   });
 
   test('cannot navigate to new RDP targets route when rdp feature is disabled', async function (assert) {
@@ -545,6 +544,7 @@ module('Acceptance | targets | create', function (hooks) {
     await visit(urls.targets);
 
     await click(commonSelectors.HREF(urls.newTarget));
+    await click(selectors.FIELD_TYPE_VALUE('rdp'));
 
     assert.dom(selectors.FIELD_DEFAULT_PORT_LABEL).includesText('Optional');
   });