From 9cb224f6db0c92b6690347b8b2634ac167df9405 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Thu, 10 Sep 2020 16:49:00 -0400
Subject: [PATCH 1/2] fix: Add type of 'tcp' to target resource

---
 addons/api/addon/generated/models/target.js                 | 4 ++--
 addons/api/tests/unit/serializers/target-test.js            | 5 +++--
 ui/core/app/components/form/target/index.hbs                | 6 ++++++
 .../app/routes/scopes/scope/projects/project/targets/new.js | 5 ++++-
 .../routes/scopes/scope/projects/project/targets/target.js  | 5 ++++-
 .../scopes/scope/projects/project/targets/index.hbs         | 6 +++---
 ui/core/mirage/generated/factories/target.js                | 2 +-
 ui/core/translations/en-us.yaml                             | 2 +-
 8 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/addons/api/addon/generated/models/target.js b/addons/api/addon/generated/models/target.js
index f80ea83cc..60a105b45 100644
--- a/addons/api/addon/generated/models/target.js
+++ b/addons/api/addon/generated/models/target.js
@@ -9,8 +9,8 @@ export default class GeneratedTargetModel extends BaseModel {
   // =attributes
 
   @attr('string', {
-    description: 'The protocol used in the target'
-  }) protocol;
+    description: 'The type of the resource, to help differentiate schemas'
+  }) type;
 
   @attr('string', {
     description: 'Optional name for identification purposes'
diff --git a/addons/api/tests/unit/serializers/target-test.js b/addons/api/tests/unit/serializers/target-test.js
index cc4413567..62af72737 100644
--- a/addons/api/tests/unit/serializers/target-test.js
+++ b/addons/api/tests/unit/serializers/target-test.js
@@ -19,7 +19,8 @@ module('Unit | Serializer | target', function(hooks) {
         scope_id: 'org_1',
         type: 'org'
       },
-      version: 1
+      version: 1,
+      type: 'tcp'
     });
     const snapshot = record._createSnapshot();
     snapshot.adapterOptions = {};
@@ -28,7 +29,7 @@ module('Unit | Serializer | target', function(hooks) {
       name: 'User',
       description: 'Description',
       version: 1,
-      protocol: null,
+      type: 'tcp',
       scope_id: 'org_1'
     });
 
diff --git a/ui/core/app/components/form/target/index.hbs b/ui/core/app/components/form/target/index.hbs
index 45adc26d0..a6e5a204e 100644
--- a/ui/core/app/components/form/target/index.hbs
+++ b/ui/core/app/components/form/target/index.hbs
@@ -6,6 +6,12 @@
   as |form|
 >
 
+  <form.input
+  @value={{t (concat 'target.types.' @model.type)}}
+  @label={{t "form.label.type"}}
+  readonly={{true}}
+  @disabled={{true}} />
+
   <form.input
     @name="name"
     @type="name"
diff --git a/ui/core/app/routes/scopes/scope/projects/project/targets/new.js b/ui/core/app/routes/scopes/scope/projects/project/targets/new.js
index 000752c13..ab5c04496 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/targets/new.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/targets/new.js
@@ -10,7 +10,10 @@ export default class ScopesScopeProjectsProjectTargetsNewRoute extends Route {
    */
   model() {
     const scopeModel = this.modelFor('scopes.scope.projects.project');
-    return this.store.createRecord('target', { scopeModel });
+    return this.store.createRecord('target', {
+      type: 'tcp',
+      scopeModel
+    });
   }
 
 }
diff --git a/ui/core/app/routes/scopes/scope/projects/project/targets/target.js b/ui/core/app/routes/scopes/scope/projects/project/targets/target.js
index c1d1093f8..abd458486 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/targets/target.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/targets/target.js
@@ -12,7 +12,10 @@ export default class ScopesScopeProjectsProjectTargetsTargetRoute extends Route
    */
   async model({ target_id }) {
     const { id: scopeID } = this.modelFor('scopes.scope.projects.project');
-    return this.store.findRecord('target', target_id, { adapterOptions: { scopeID } });
+    return this.store.findRecord('target', target_id, {
+      reload: true,
+      adapterOptions: { scopeID }
+    });
   }
 
   /**
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
index 0c05deabb..cb6254a49 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs
@@ -24,7 +24,7 @@
         <table.header as |header|>
           <header.row as |row|>
             <row.headerCell>{{t "form.label.name"}}</row.headerCell>
-            <row.headerCell>{{t "form.label.protocol"}}</row.headerCell>
+            <row.headerCell>{{t "form.label.type"}}</row.headerCell>
             <row.headerCell>{{t "form.label.id"}}</row.headerCell>
           </header.row>
         </table.header>
@@ -41,9 +41,9 @@
                 <p>{{target.description}}</p>
               </row.headerCell>
               <row.cell>
-                {{#if target.protocol}}
+                {{#if target.type}}
                   <Rose::Badge>
-                    {{t (concat "target.protocols." target.protocol)}}
+                    {{t (concat "target.types." target.type)}}
                   </Rose::Badge>
                 {{/if}}
               </row.cell>
diff --git a/ui/core/mirage/generated/factories/target.js b/ui/core/mirage/generated/factories/target.js
index 2fca0871d..24915d9da 100644
--- a/ui/core/mirage/generated/factories/target.js
+++ b/ui/core/mirage/generated/factories/target.js
@@ -6,7 +6,7 @@ import { random, date } from 'faker';
  */
 export default Factory.extend({
 
-  protocol: 'tcp',
+  type: 'tcp',
   name: () => random.words(),
   description: () => random.words(),
   created_time: () => date.recent(),
diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml
index 08e371e4b..394f1e6ec 100644
--- a/ui/core/translations/en-us.yaml
+++ b/ui/core/translations/en-us.yaml
@@ -42,7 +42,7 @@ host-set:
   types:
     static: Static
 target:
-  protocols:
+  types:
     tcp: TCP
 host:
   types:

From 30d6a8fbc0265603c00fa3ff476e90248644cada Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Fri, 11 Sep 2020 11:08:51 -0400
Subject: [PATCH 2/2] refactor: Remove adapterOptions for a target route

---
 .../routes/scopes/scope/projects/project/targets/target.js  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ui/core/app/routes/scopes/scope/projects/project/targets/target.js b/ui/core/app/routes/scopes/scope/projects/project/targets/target.js
index abd458486..c13eebac6 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/targets/target.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/targets/target.js
@@ -11,11 +11,7 @@ export default class ScopesScopeProjectsProjectTargetsTargetRoute extends Route
    * @return {TargetModel}
    */
   async model({ target_id }) {
-    const { id: scopeID } = this.modelFor('scopes.scope.projects.project');
-    return this.store.findRecord('target', target_id, {
-      reload: true,
-      adapterOptions: { scopeID }
-    });
+    return this.store.findRecord('target', target_id, { reload: true });
   }
 
   /**