Skip to content

Commit 32c4eaa

Browse files
committed
Don't auto generate connection name until form is submitting
1 parent 0046417 commit 32c4eaa

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/module/connection/create/connection-creator.component.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,27 +78,27 @@ export class ConnectionCreatorComponent {
7878
private router: Router, route: ActivatedRoute,
7979
) {
8080
(window as any).connectionCreator = this;
81+
82+
this.updateAdvancedConfigOnUrlChanges();
83+
this.updateUrlOnAdvancedConfigChanges();
84+
8185
route.queryParamMap.pipe(first()).subscribe((params) => {
8286
if (params.get(NAME)) this.form.patchValue({ name: params.get(NAME) ?? `` });
8387

8488
this.advancedForm.patchValue({
8589
address: params.get(ADDRESS) ?? ``,
8690
username: params.get(USERNAME) ?? ``,
8791
});
88-
89-
this.updateNameAndAdvancedConfigOnUrlChanges();
90-
this.updateNameAndUrlOnAdvancedConfigChanges();
9192
});
9293
}
9394

94-
private updateNameAndAdvancedConfigOnUrlChanges() {
95+
private updateAdvancedConfigOnUrlChanges() {
9596
combineLatest([this.form.controls.url.valueChanges]).pipe(
9697
filter(([url]) => !this.form.controls.name.dirty && !!url),
9798
map(([url]) => parseConnectionUrlOrNull(url!)),
9899
filter(params => !!params),
99100
map(params => params!)
100101
).subscribe((params) => {
101-
if (!this.form.controls.name.dirty) this.form.patchValue({ name: ConnectionConfig.autoName(params) });
102102
this.advancedForm.patchValue({
103103
address: isBasicParams(params) ? params.addresses[0] : params.translatedAddresses[0].external,
104104
username: params.username,
@@ -107,7 +107,7 @@ export class ConnectionCreatorComponent {
107107
});
108108
}
109109

110-
private updateNameAndUrlOnAdvancedConfigChanges() {
110+
private updateUrlOnAdvancedConfigChanges() {
111111
this.advancedForm.valueChanges.pipe(
112112
map((value) => {
113113
const params: DriverParams = {
@@ -119,7 +119,6 @@ export class ConnectionCreatorComponent {
119119
}),
120120
tap((params) => {
121121
if (!params.addresses[0]?.length || !params.username) return;
122-
if (!this.form.controls.name.dirty) this.form.patchValue({ name: ConnectionConfig.autoName(params) });
123122
}),
124123
map((params) => connectionUrl(params)),
125124
).subscribe(url => {

0 commit comments

Comments
 (0)