From 221748232909a9aa414c92aeb7883e818c70b7a3 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide <me@calcaide.com>
Date: Wed, 14 Jul 2021 07:59:15 -0700
Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Adding=20credential?=
 =?UTF-8?q?=20store=20edit=20form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add credential-store mirage config. Add edit credential store form. Add
credential store route. Add credential store template.
---
 ui/admin/app/components/form/credential-store/index.hbs        | 3 +++
 .../scope/credential-stores/credential-store/-header.hbs       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/admin/app/components/form/credential-store/index.hbs b/ui/admin/app/components/form/credential-store/index.hbs
index f972854c1..446ac598a 100644
--- a/ui/admin/app/components/form/credential-store/index.hbs
+++ b/ui/admin/app/components/form/credential-store/index.hbs
@@ -1,6 +1,9 @@
 <Rose::Form
   @onSubmit={{@submit}}
+<<<<<<< HEAD
   @cancel={{@cancel}}
+=======
+>>>>>>> 9bf653f8 (feat: 🎸 Adding credential store edit form)
   @disabled={{@model.isSaving}}
   @showEditToggle={{if @model.isNew false true}}
   as |form|
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
index 0ff5c81bc..c3db9fd05 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
@@ -6,4 +6,4 @@
   @acknowledgeText={{t 'states.copied'}}
 >
   <code>{{@model.id}}</code>
-</Copyable>
\ No newline at end of file
+</Copyable>

From 3b4bb24eb7d13efb811829ceb7daa957518a0eed Mon Sep 17 00:00:00 2001
From: Carlos Alcaide <me@calcaide.com>
Date: Thu, 15 Jul 2021 09:36:32 -0700
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Add=20credential=20s?=
 =?UTF-8?q?tore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add screen to create new credential store
---
 ui/admin/app/router.js                        |  1 +
 .../scopes/scope/credential-stores/new.js     | 14 +++++++++++++
 .../scopes/scope/credential-stores/index.hbs  |  4 ++--
 .../scopes/scope/credential-stores/new.hbs    | 20 +++++++++++++++++++
 .../scope/credential-stores/new-test.js       | 11 ++++++++++
 5 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 ui/admin/app/routes/scopes/scope/credential-stores/new.js
 create mode 100644 ui/admin/app/templates/scopes/scope/credential-stores/new.hbs
 create mode 100644 ui/admin/tests/unit/routes/scopes/scope/credential-stores/new-test.js

diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js
index 21a7859c7..665582957 100644
--- a/ui/admin/app/router.js
+++ b/ui/admin/app/router.js
@@ -92,6 +92,7 @@ Router.map(function () {
           { path: ':credential_store_id' },
           function () {}
         );
+        this.route('new');
       });
     });
   });
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/new.js b/ui/admin/app/routes/scopes/scope/credential-stores/new.js
new file mode 100644
index 000000000..fecb9bb9b
--- /dev/null
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/new.js
@@ -0,0 +1,14 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeCredentialStoresNewRoute extends Route {
+  // =methods
+  /**
+   * Creates a new unsaved credential-store
+   */
+  model() {
+    const scopeModel = this.modelFor('scopes.scope');
+    return this.store.createRecord('credential-store', {
+      scopeModel,
+    });
+  }
+}
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
index 0e2177ff1..c8ff3b098 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
@@ -11,7 +11,7 @@
     <p>{{t 'resources.credential-store.description'}}</p>
   </page.header>
 
-  {{!-- <page.actions>
+  <page.actions>
     {{#if @model}}
       <Rose::LinkButton
         @route='scopes.scope.credential-stores.new'
@@ -20,7 +20,7 @@
         {{t 'titles.new'}}
       </Rose::LinkButton>
     {{/if}}
-  </page.actions> --}}
+  </page.actions>
 
   <page.body>
     {{#if @model}}
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs
new file mode 100644
index 000000000..cb38701d9
--- /dev/null
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs
@@ -0,0 +1,20 @@
+{{page-title (t 'titles.new')}}
+
+<Rose::Layout::Page as |page|>
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <h2>{{t 'titles.new'}}</h2>
+  </page.header>
+
+  <page.body>
+    <Form::CredentialStore
+      @model={{@model}}
+      @submit={{route-action 'save' @model}}
+      @cancel={{route-action 'cancel' @model}}
+    />
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/tests/unit/routes/scopes/scope/credential-stores/new-test.js b/ui/admin/tests/unit/routes/scopes/scope/credential-stores/new-test.js
new file mode 100644
index 000000000..ea136c333
--- /dev/null
+++ b/ui/admin/tests/unit/routes/scopes/scope/credential-stores/new-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | scopes/scope/credential-stores/new', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let route = this.owner.lookup('route:scopes/scope/credential-stores/new');
+    assert.ok(route);
+  });
+});

From d6129a7dfcc4a2488ee31a42a3a15c86de77afcb Mon Sep 17 00:00:00 2001
From: Carlos Alcaide <me@calcaide.com>
Date: Fri, 16 Jul 2021 09:41:41 -0700
Subject: [PATCH 3/5] Fix lint issues

---
 ui/admin/app/components/form/credential-store/index.hbs        | 3 ---
 .../scope/credential-stores/credential-store/-header.hbs       | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ui/admin/app/components/form/credential-store/index.hbs b/ui/admin/app/components/form/credential-store/index.hbs
index 446ac598a..f972854c1 100644
--- a/ui/admin/app/components/form/credential-store/index.hbs
+++ b/ui/admin/app/components/form/credential-store/index.hbs
@@ -1,9 +1,6 @@
 <Rose::Form
   @onSubmit={{@submit}}
-<<<<<<< HEAD
   @cancel={{@cancel}}
-=======
->>>>>>> 9bf653f8 (feat: 🎸 Adding credential store edit form)
   @disabled={{@model.isSaving}}
   @showEditToggle={{if @model.isNew false true}}
   as |form|
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
index c3db9fd05..0ff5c81bc 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
@@ -6,4 +6,4 @@
   @acknowledgeText={{t 'states.copied'}}
 >
   <code>{{@model.id}}</code>
-</Copyable>
+</Copyable>
\ No newline at end of file

From 90675580822bab226b3e87a40370face7ab1ea73 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide <me@calcaide.com>
Date: Fri, 16 Jul 2021 10:28:31 -0700
Subject: [PATCH 4/5] Add type to credential store creation

---
 ui/admin/app/routes/scopes/scope/credential-stores/new.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/new.js b/ui/admin/app/routes/scopes/scope/credential-stores/new.js
index fecb9bb9b..e8bc7e431 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores/new.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/new.js
@@ -8,6 +8,7 @@ export default class ScopesScopeCredentialStoresNewRoute extends Route {
   model() {
     const scopeModel = this.modelFor('scopes.scope');
     return this.store.createRecord('credential-store', {
+      type: 'vault',
       scopeModel,
     });
   }

From 816b50eb1b620ccd373d68a0d539d7158654eb86 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide <me@calcaide.com>
Date: Fri, 16 Jul 2021 10:41:04 -0700
Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Fix=20creation=20typ?=
 =?UTF-8?q?e=20issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix credential store creation type issue
---
 addons/api/mirage/config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/api/mirage/config.js b/addons/api/mirage/config.js
index 4564352a6..1fd364182 100644
--- a/addons/api/mirage/config.js
+++ b/addons/api/mirage/config.js
@@ -465,6 +465,7 @@ export default function () {
   );
 
   this.get('/credential-stores/:id');
+  this.post('/credential-stores');
   this.patch('/credential-stores/:id');
 
   // credential-libraries