Merge branch 'development'

Author: alexjpwalker

VERSION

@@ -1 +1 @@
-3.5.7
+3.5.6

package.json

@@ -1,6 +1,6 @@
 {
   "name": "typedb-studio",
-  "version": "3.5.7",
+  "version": "3.5.6",
   "scripts": {
     "ng": "ng",
     "generate-grammar": "lezer-generator --typeScript src/framework/codemirror-lang-typeql/typeql.grammar -o src/framework/codemirror-lang-typeql/generated/typeql.grammar.generated",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "typedb-studio"
-version = "3.5.7"
+version = "3.5.6"
 description = "A Tauri App"
 authors = ["you"]
 edition = "2021"

src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "typedb-studio",
-  "version": "3.5.7",
+  "version": "3.5.6",
   "identifier": "com.typedb.studio",
   "build": {
     "beforeDevCommand": "pnpm start",
@@ -31,7 +31,7 @@
     ],
     "windows": {
       "wix": {
-        "version": "3.5.7"
+        "version": "3.5.6"
       }
     },
     "macOS": {

src-tauri/tauri.conf.json

@@ -78,27 +78,27 @@ export class ConnectionCreatorComponent {
         private router: Router, route: ActivatedRoute,
     ) {
         (window as any).connectionCreator = this;
+
+        this.updateAdvancedConfigOnUrlChanges();
+        this.updateUrlOnAdvancedConfigChanges();
+
         route.queryParamMap.pipe(first()).subscribe((params) => {
             if (params.get(NAME)) this.form.patchValue({ name: params.get(NAME) ?? `` });
 
             this.advancedForm.patchValue({
                 address: params.get(ADDRESS) ?? ``,
                 username: params.get(USERNAME) ?? ``,
             });
-
-            this.updateNameAndAdvancedConfigOnUrlChanges();
-            this.updateNameAndUrlOnAdvancedConfigChanges();
         });
     }
 
-    private updateNameAndAdvancedConfigOnUrlChanges() {
+    private updateAdvancedConfigOnUrlChanges() {
         combineLatest([this.form.controls.url.valueChanges]).pipe(
             filter(([url]) => !this.form.controls.name.dirty && !!url),
             map(([url]) => parseConnectionUrlOrNull(url!)),
             filter(params => !!params),
             map(params => params!)
         ).subscribe((params) => {
-            if (!this.form.controls.name.dirty) this.form.patchValue({ name: ConnectionConfig.autoName(params) });
             this.advancedForm.patchValue({
                 address: isBasicParams(params) ? params.addresses[0] : params.translatedAddresses[0].external,
                 username: params.username,
@@ -107,7 +107,7 @@ export class ConnectionCreatorComponent {
         });
     }
 
-    private updateNameAndUrlOnAdvancedConfigChanges() {
+    private updateUrlOnAdvancedConfigChanges() {
         this.advancedForm.valueChanges.pipe(
             map((value) => {
                 const params: DriverParams = {
@@ -119,7 +119,6 @@ export class ConnectionCreatorComponent {
             }),
             tap((params) => {
                 if (!params.addresses[0]?.length || !params.username) return;
-                if (!this.form.controls.name.dirty) this.form.patchValue({ name: ConnectionConfig.autoName(params) });
             }),
             map((params) => connectionUrl(params)),
         ).subscribe(url => {