From a5b4bcc24bebbd3d72dc80e8f861807eb61836ad Mon Sep 17 00:00:00 2001
From: Greg Hoin <ghoin@hashicorp.com>
Date: Wed, 8 Sep 2021 14:35:24 +0200
Subject: [PATCH 1/3] Fix overwriting default project model

---
 ui/app/components/app-form/project-repository-settings.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/app/components/app-form/project-repository-settings.ts b/ui/app/components/app-form/project-repository-settings.ts
index 1166b879d7d..f2827800502 100644
--- a/ui/app/components/app-form/project-repository-settings.ts
+++ b/ui/app/components/app-form/project-repository-settings.ts
@@ -56,10 +56,12 @@ export default class AppFormProjectRepositorySettings extends Component<ProjectS
   @tracked project: Project.AsObject;
   @tracked authCase: number;
   @tracked serverHcl: boolean;
+  defaultProject: Project.AsObject;
 
   constructor(owner: unknown, args: ProjectSettingsArgs) {
     super(owner, args);
-    this.project = JSON.parse(JSON.stringify(DEFAULT_PROJECT_MODEL)) as Project.AsObject; // to ensure we're doing a deep copy
+    this.defaultProject = JSON.parse(JSON.stringify(DEFAULT_PROJECT_MODEL)) as Project.AsObject; // to ensure we're doing a deep copy
+    this.project = this.defaultProject;
     let { project } = this.args;
     this.populateExistingFields(project, this.project);
     this.authCase = 4;
@@ -128,7 +130,7 @@ export default class AppFormProjectRepositorySettings extends Component<ProjectS
   populateExistingFields(projectFromArgs: Project.AsObject, currentModel: Project.AsObject): void {
     for (let [key, value] of Object.entries(projectFromArgs)) {
       if (isEmpty(value)) {
-        currentModel[key] = DEFAULT_PROJECT_MODEL[key];
+        currentModel[key] = this.defaultProject[key];
         continue;
       }
 

From cc0704a1d3dd5325bf8749962411439ff1ea63e5 Mon Sep 17 00:00:00 2001
From: Greg Hoin <ghoin@hashicorp.com>
Date: Wed, 8 Sep 2021 14:41:30 +0200
Subject: [PATCH 2/3] Changelog

---
 .changelog/2250.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .changelog/2250.txt

diff --git a/.changelog/2250.txt b/.changelog/2250.txt
new file mode 100644
index 00000000000..80b406aaaf0
--- /dev/null
+++ b/.changelog/2250.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: fix leaky project repository settings being reused when creating a new project
+```

From 1380b02418b6a959e08797c06eedc0b69a7acd7f Mon Sep 17 00:00:00 2001
From: Greg Hoin <ghoin@hashicorp.com>
Date: Wed, 8 Sep 2021 17:19:11 +0200
Subject: [PATCH 3/3] update test data

---
 .../components/app-form/project-repository-settings-test.ts  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/tests/integration/components/app-form/project-repository-settings-test.ts b/ui/tests/integration/components/app-form/project-repository-settings-test.ts
index 52c915e2419..ee3cfe312f7 100644
--- a/ui/tests/integration/components/app-form/project-repository-settings-test.ts
+++ b/ui/tests/integration/components/app-form/project-repository-settings-test.ts
@@ -2,8 +2,9 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, clearRender, fillIn } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
+import { Project } from 'waypoint-pb';
 
-module('Integration | Component | app-form/project-settings', function (hooks) {
+module('Integration | Component | app-form/project-repository-settings', function (hooks) {
   setupRenderingTest(hooks);
 
   test('second new project does not have previous input', async function (assert) {
@@ -14,7 +15,7 @@ module('Integration | Component | app-form/project-settings', function (hooks) {
     await fillIn('#git-source-password', 'password');
     await clearRender();
 
-    this.set('project2', {});
+    this.set('project2', new Project().toObject());
     await render(hbs`<AppForm::ProjectRepositorySettings @project={{this.project2}} />`);
 
     assert.dom('#git-source-url').hasValue('');