From 3aecf83b27af2e042a3c3f1b490cdfa8fe9b03e5 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Sun, 17 Dec 2017 17:02:44 +0100
Subject: [PATCH] UI fixed

---
 .../pages/languages/languages-page.component.ts      |  2 +-
 .../settings/pages/patterns/pattern.component.html   |  2 +-
 .../settings/pages/patterns/pattern.component.ts     |  4 ++++
 .../shared/services/app-languages.service.spec.ts    |  2 +-
 .../app/shared/services/app-languages.service.ts     |  2 +-
 .../app/shared/services/app-patterns.service.ts      | 12 +++++++-----
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts
index cb23a9962..fdb0081c4 100644
--- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts
@@ -82,7 +82,7 @@ export class LanguagesPageComponent implements OnInit {
     }
 
     public updateLanguage(language: AppLanguageDto) {
-        this.appLanguagesService.updateLanguage(this.ctx.appName, language.iso2Code, language, this.appLanguages.version)
+        this.appLanguagesService.putLanguage(this.ctx.appName, language.iso2Code, language, this.appLanguages.version)
             .subscribe(dto => {
                 this.updateLanguages(this.appLanguages.updateLanguage(language, dto.version));
             }, error => {
diff --git a/src/Squidex/app/features/settings/pages/patterns/pattern.component.html b/src/Squidex/app/features/settings/pages/patterns/pattern.component.html
index 51913da2b..7c8a7729e 100644
--- a/src/Squidex/app/features/settings/pages/patterns/pattern.component.html
+++ b/src/Squidex/app/features/settings/pages/patterns/pattern.component.html
@@ -20,7 +20,7 @@
         </div>
 
         <div class="col col-auto pl-2 col-options" *ngIf="pattern">
-            <button type="submit" class="btn btn-primary" [class.disabled]="!editForm.touched">
+            <button type="submit" class="btn btn-primary" [class.disabled]="!editForm.dirty">
                 <i class="icon-checkmark"></i>
             </button>
 
diff --git a/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts b/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts
index 41d612573..28bf0ca55 100644
--- a/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts
+++ b/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts
@@ -89,6 +89,10 @@ export class PatternComponent implements OnInit {
                 this.editForm.controls['message'].value);
 
             this.updating.emit(requestDto);
+
+            if (!this.pattern) {
+                this.cancel();
+            }
         }
     }
 }
diff --git a/src/Squidex/app/shared/services/app-languages.service.spec.ts b/src/Squidex/app/shared/services/app-languages.service.spec.ts
index b9f8b1c03..8f80c4732 100644
--- a/src/Squidex/app/shared/services/app-languages.service.spec.ts
+++ b/src/Squidex/app/shared/services/app-languages.service.spec.ts
@@ -172,7 +172,7 @@ describe('AppLanguagesService', () => {
 
         const dto = new UpdateAppLanguageDto(true, true, []);
 
-        appLanguagesService.updateLanguage('my-app', 'de', dto, version).subscribe();
+        appLanguagesService.putLanguage('my-app', 'de', dto, version).subscribe();
 
         const req = httpMock.expectOne('http://service/p/api/apps/my-app/languages/de');
 
diff --git a/src/Squidex/app/shared/services/app-languages.service.ts b/src/Squidex/app/shared/services/app-languages.service.ts
index 78f6bc6e9..92d3d95d2 100644
--- a/src/Squidex/app/shared/services/app-languages.service.ts
+++ b/src/Squidex/app/shared/services/app-languages.service.ts
@@ -141,7 +141,7 @@ export class AppLanguagesService {
                 .pretifyError('Failed to add language. Please reload.');
     }
 
-    public updateLanguage(appName: string, languageCode: string, dto: UpdateAppLanguageDto, version: Version): Observable<Versioned<any>> {
+    public putLanguage(appName: string, languageCode: string, dto: UpdateAppLanguageDto, version: Version): Observable<Versioned<any>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/languages/${languageCode}`);
 
         return HTTP.putVersioned(this.http, url, dto, version)
diff --git a/src/Squidex/app/shared/services/app-patterns.service.ts b/src/Squidex/app/shared/services/app-patterns.service.ts
index 657d158bc..4cf5288c3 100644
--- a/src/Squidex/app/shared/services/app-patterns.service.ts
+++ b/src/Squidex/app/shared/services/app-patterns.service.ts
@@ -96,26 +96,28 @@ export class AppPatternsService {
             .pretifyError('Failed to add pattern. Please reload.');
     }
 
-    public postPattern(appName: string, pattern: UpdatePatternDto, version: Version): Observable<Versioned<AppPatternDto>> {
+    public postPattern(appName: string, dto: UpdatePatternDto, version: Version): Observable<Versioned<AppPatternDto>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns`);
 
-        return HTTP.postVersioned<any>(this.http, url, pattern, version)
+        return HTTP.postVersioned<any>(this.http, url, dto, version)
             .map(response => {
                 const body = response.payload.body;
 
-                return new AppPatternDto(
+                const pattern = new AppPatternDto(
                     body.patternId,
                     body.name,
                     body.pattern,
                     body.message);
+
+                return new Versioned(response.version, pattern);
             })
             .pretifyError('Failed to add pattern. Please reload.');
     }
 
-    public putPattern(appName: string, id: string, pattern: UpdatePatternDto, version: Version): Observable<Versioned<any>> {
+    public putPattern(appName: string, id: string, dto: UpdatePatternDto, version: Version): Observable<Versioned<any>> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns/${id}`);
 
-        return HTTP.putVersioned(this.http, url, pattern, version)
+        return HTTP.putVersioned(this.http, url, dto, version)
             .pretifyError('Failed to update pattern. Please reload.');
     }