From a42a765b83a2ec7a7aa17e11c0a40a55aaa91bf4 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Fri, 16 Feb 2024 10:11:17 +0100
Subject: [PATCH] Fix inline editor.

---
 .../IdentityServer/Controllers/Setup/SetupController.cs   | 2 +-
 .../features/apps/pages/onboarding-dialog.component.html  | 2 +-
 .../components/contents/content-list-field.component.ts   | 2 +-
 frontend/src/app/shared/state/schemas.state.ts            | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/Squidex/Areas/IdentityServer/Controllers/Setup/SetupController.cs b/backend/src/Squidex/Areas/IdentityServer/Controllers/Setup/SetupController.cs
index 3e9219b91..b035dbe17 100644
--- a/backend/src/Squidex/Areas/IdentityServer/Controllers/Setup/SetupController.cs
+++ b/backend/src/Squidex/Areas/IdentityServer/Controllers/Setup/SetupController.cs
@@ -67,7 +67,7 @@ public class SetupController : IdentityServerController
 
         if (!ModelState.IsValid)
         {
-            return View(nameof(Profile), await GetVM(model));
+            return View(nameof(Setup), await GetVM(model));
         }
 
         string errorMessage;
diff --git a/frontend/src/app/features/apps/pages/onboarding-dialog.component.html b/frontend/src/app/features/apps/pages/onboarding-dialog.component.html
index ebbf45d76..1c42c3441 100644
--- a/frontend/src/app/features/apps/pages/onboarding-dialog.component.html
+++ b/frontend/src/app/features/apps/pages/onboarding-dialog.component.html
@@ -6,7 +6,7 @@
     </ng-container>
 
     <ng-container content>
-        <a class="header-right modal-close force" (click)="dialogClose.emit()">{{ 'tour.skip' | sqxTranslate }}</a>
+        <a class="header-right modal-close force" (click)="cancel()">{{ 'tour.skip' | sqxTranslate }}</a>
 
         <div class="onboarding-step " *ngIf="step === 0">
             <img @fade class="header-left" src="./images/logo-white-small.png">
diff --git a/frontend/src/app/shared/components/contents/content-list-field.component.ts b/frontend/src/app/shared/components/contents/content-list-field.component.ts
index 09ee24141..1bcd7a1b3 100644
--- a/frontend/src/app/shared/components/contents/content-list-field.component.ts
+++ b/frontend/src/app/shared/components/contents/content-list-field.component.ts
@@ -88,7 +88,7 @@ export class ContentListFieldComponent extends StatefulComponent<State> {
             const { value, formatted } = getContentValue(this.content, this.language, this.field.rootField);
 
             if (this.patchForm) {
-                const formControl = this.patchForm.controls[this.field.name];
+                const formControl = this.patchForm.controls[this.field.rootField.name];
 
                 if (formControl) {
                     formControl.setValue(value);
diff --git a/frontend/src/app/shared/state/schemas.state.ts b/frontend/src/app/shared/state/schemas.state.ts
index ac83fb5a5..a5f6f9ff6 100644
--- a/frontend/src/app/shared/state/schemas.state.ts
+++ b/frontend/src/app/shared/state/schemas.state.ts
@@ -274,7 +274,7 @@ export class SchemasState extends State<Snapshot> {
     public update(schema: SchemaDto, request: UpdateSchemaDto): Observable<SchemaDto> {
         return this.schemasService.putSchema(this.appName, schema, request, schema.version).pipe(
             tap(updated => {
-                this.replaceSchema(updated, schema.version, 'i18n:schemas.saved');
+                this.replaceSchema(updated, schema.version);
             }),
             shareSubscribed(this.dialogs));
     }
@@ -290,7 +290,7 @@ export class SchemasState extends State<Snapshot> {
     public configureUIFields(schema: SchemaDto, request: UpdateUIFields): Observable<SchemaDto> {
         return this.schemasService.putUIFields(this.appName, schema, request, schema.version).pipe(
             tap(updated => {
-                this.replaceSchema(updated, schema.version, 'i18n:schemas.saved');
+                this.replaceSchema(updated, schema.version);
             }),
             shareSubscribed(this.dialogs));
     }
@@ -298,7 +298,7 @@ export class SchemasState extends State<Snapshot> {
     public orderFields(schema: SchemaDto, fields: ReadonlyArray<FieldDto>, parent?: RootFieldDto): Observable<SchemaDto> {
         return this.schemasService.putFieldOrdering(this.appName, parent || schema, fields.map(t => t.fieldId), schema.version).pipe(
             tap(updated => {
-                this.replaceSchema(updated, schema.version, 'i18n:schemas.saved');
+                this.replaceSchema(updated, schema.version);
             }),
             shareSubscribed(this.dialogs));
     }
@@ -346,7 +346,7 @@ export class SchemasState extends State<Snapshot> {
     public updateField<T extends FieldDto>(schema: SchemaDto, field: T, request: UpdateFieldDto): Observable<SchemaDto> {
         return this.schemasService.putField(this.appName, field, request, schema.version).pipe(
             tap(updated => {
-                this.replaceSchema(updated, schema.version, 'i18n:schemas.saved');
+                this.replaceSchema(updated, schema.version);
             }),
             shareSubscribed(this.dialogs));
     }