From 98e14a642fe13c7e514d49b2d8b810f144da8b19 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Mon, 19 Jul 2021 12:05:40 -0400
Subject: [PATCH] fix: Treat credential library attributes as an object

---
 addons/api/mirage/config.js                   |  1 +
 .../form/credential-library/index.hbs         |  8 ++---
 .../form/credential-library/index.js          |  4 +--
 .../credential-libraries/index.hbs            |  6 ++++
 .../form/credential-library/index-test.js     | 29 -------------------
 5 files changed, 13 insertions(+), 35 deletions(-)
 delete mode 100644 ui/admin/tests/integration/components/form/credential-library/index-test.js

diff --git a/addons/api/mirage/config.js b/addons/api/mirage/config.js
index a45cd1bab..5d9ddaf8e 100644
--- a/addons/api/mirage/config.js
+++ b/addons/api/mirage/config.js
@@ -484,6 +484,7 @@ export default function () {
       const attrs = this.normalizedRequestAttrs();
       const credentialStore = credentialStores.find(attrs.credentialStoreId);
       attrs.scopeId = credentialStore.scope.id;
+      console.log(attrs);
       return credentialLibraries.create(attrs);
     }
   );
diff --git a/ui/admin/app/components/form/credential-library/index.hbs b/ui/admin/app/components/form/credential-library/index.hbs
index f5bd6c4eb..35aa5c339 100644
--- a/ui/admin/app/components/form/credential-library/index.hbs
+++ b/ui/admin/app/components/form/credential-library/index.hbs
@@ -47,7 +47,7 @@
   <form.input
     @name='vault_path'
     @type='text'
-    @value={{@model.attributes_path}}
+    @value={{@model.attributes.path}}
     @label={{t 'form.vault_path.label'}}
     @error={{@model.errors.name}}
     @helperText={{t 'form.vault_path.help'}}
@@ -65,8 +65,8 @@
 
   <form.radioGroup
     @name='http_method'
-    @selectedValue={{@model.attributes_http_method}}
-    @changed={{fn (mut @model.attributes_http_method)}}
+    @selectedValue={{@model.attributes.http_method}}
+    @changed={{fn (mut @model.attributes.http_method)}}
     as |radioGroup|
   >
     {{#each this.httpMethods as |httpMethod|}}
@@ -78,7 +78,7 @@
     <form.textarea
       @name='http_request_body'
       @type='text'
-      @value={{@model.attributes_http_request_body}}
+      @value={{@model.attributes.http_request_body}}
       @label={{t 'form.http_request_body.label'}}
       @error={{@model.errors.description}}
       @helperText={{t 'form.http_request_body.help'}}
diff --git a/ui/admin/app/components/form/credential-library/index.js b/ui/admin/app/components/form/credential-library/index.js
index 69427c13b..ae59983db 100644
--- a/ui/admin/app/components/form/credential-library/index.js
+++ b/ui/admin/app/components/form/credential-library/index.js
@@ -13,8 +13,8 @@ export default class FormCredentialLibraryIndexComponent extends Component {
    * Only allow HTTP request body field if http_method is set to POST.
    * @type {boolean}
    */
-  @computed('args.model.attributes_http_method')
+  @computed('args.model.attributes.http_method')
   get isHttpRequestBodyAllowed() {
-    return this.args.model.attributes_http_method?.match(/post/i);
+    return this.args.model.attributes.http_method?.match(/post/i);
   }
 }
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs
index 403a2175a..2164989cc 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs
@@ -38,6 +38,12 @@
       <message.description>
         {{t 'resources.credential-library.messages.none.description'}}
       </message.description>
+      <message.link
+        @route='scopes.scope.credential-stores.credential-store.credential-libraries.new'
+      >
+        <Rose::Icon @name='plus-circle-outline' />
+        {{t 'titles.new'}}
+      </message.link>
     </Rose::Message>
   </Rose::Layout::Centered>
 
diff --git a/ui/admin/tests/integration/components/form/credential-library/index-test.js b/ui/admin/tests/integration/components/form/credential-library/index-test.js
deleted file mode 100644
index e0d24a8c2..000000000
--- a/ui/admin/tests/integration/components/form/credential-library/index-test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module(
-  'Integration | Component | form/credential-library/index',
-  function (hooks) {
-    setupRenderingTest(hooks);
-
-    test('it renders', async function (assert) {
-      // Set any properties with this.set('myProperty', 'value');
-      // Handle any actions with this.set('myAction', function(val) { ... });
-
-      await render(hbs`<Form::CredentialLibrary::Index />`);
-
-      assert.equal(this.element.textContent.trim(), '');
-
-      // Template block usage:
-      await render(hbs`
-      <Form::CredentialLibrary::Index>
-        template block text
-      </Form::CredentialLibrary::Index>
-    `);
-
-      assert.equal(this.element.textContent.trim(), 'template block text');
-    });
-  }
-);