From e5f95a0addc5175986e25861067612a033eef07f Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 26 Sep 2018 18:14:55 +0200 Subject: [PATCH 01/40] Started with list view. --- .../assets/pages/assets-page.component.html | 12 +- .../assets/pages/assets-page.component.ts | 11 + .../shared/assets-editor.component.html | 4 +- .../shared/components/asset.component.html | 185 ++++--- .../shared/components/asset.component.scss | 132 ++++- .../app/shared/components/asset.component.ts | 9 +- .../components/assets-list.component.html | 53 +- .../components/assets-list.component.ts | 5 +- .../components/assets-selector.component.html | 11 + .../components/assets-selector.component.ts | 15 +- .../components/schema-category.component.html | 2 +- src/Squidex/app/theme/_forms.scss | 64 +-- .../app/theme/icomoon/demo-files/demo.css | 8 +- src/Squidex/app/theme/icomoon/demo.html | 510 ++++++------------ .../app/theme/icomoon/fonts/icomoon.eot | Bin 24920 -> 25328 bytes .../app/theme/icomoon/fonts/icomoon.svg | 4 +- .../app/theme/icomoon/fonts/icomoon.ttf | Bin 24756 -> 25164 bytes .../app/theme/icomoon/fonts/icomoon.woff | Bin 24832 -> 25240 bytes src/Squidex/app/theme/icomoon/selection.json | 306 ++++++----- src/Squidex/app/theme/icomoon/style.css | 66 +-- 20 files changed, 737 insertions(+), 660 deletions(-) diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.html b/src/Squidex/app/features/assets/pages/assets-page.component.html index 594f6220c..402bcdbad 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.html +++ b/src/Squidex/app/features/assets/pages/assets-page.component.html @@ -34,11 +34,21 @@ +
+
+ + +
+
- + diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.ts b/src/Squidex/app/features/assets/pages/assets-page.component.ts index 2e5ead4b5..9eb1241e4 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.ts +++ b/src/Squidex/app/features/assets/pages/assets-page.component.ts @@ -14,6 +14,7 @@ import { onErrorResumeNext } from 'rxjs/operators'; import { AppsState, AssetsState, + LocalStoreService, Queries, UIState } from '@app/shared'; @@ -28,11 +29,15 @@ export class AssetsPageComponent implements OnInit { public queries = new Queries(this.uiState, 'assets'); + public isListView: boolean; + constructor( public readonly appsState: AppsState, public readonly assetsState: AssetsState, + private readonly localStore: LocalStoreService, private readonly uiState: UIState ) { + this.isListView = this.localStore.get('assetView') === 'List'; } public ngOnInit() { @@ -70,5 +75,11 @@ export class AssetsPageComponent implements OnInit { public isSelectedQuery(query: string) { return query === this.assetsState.snapshot.assetsQuery || (!query && !this.assetsState.assetsQuery); } + + public changeView(isListView: boolean) { + this.localStore.set('assetView', isListView ? 'List' : 'Grid'); + + this.isListView = isListView; + } } diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.html b/src/Squidex/app/features/content/shared/assets-editor.component.html index 8e8499fbd..115d7fceb 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.html +++ b/src/Squidex/app/features/content/shared/assets-editor.component.html @@ -4,11 +4,13 @@ Drop files here to add them. - diff --git a/src/Squidex/app/shared/components/asset.component.html b/src/Squidex/app/shared/components/asset.component.html index 294c7c14b..e8eebb1c2 100644 --- a/src/Squidex/app/shared/components/asset.component.html +++ b/src/Squidex/app/shared/components/asset.component.html @@ -1,84 +1,147 @@ -
-
-
- - {{asset.fileType}} - - -
- -
-
- -
- -
-
- -
- - - - - - - - - - -
- - + +
+
+
+ {{asset.fileType}} + +
+ +
+
+ +
-
-
- {{asset.lastModifiedBy | sqxUserNameRef}} +
+
+ +
+ + + + + + + + + +
-
- {{asset.lastModified | sqxFromNow}} + + + {{asset.fileType}} + + +
+
+ {{asset.lastModifiedBy | sqxUserNameRef}} +
+
+ {{asset.lastModified | sqxFromNow}} +
-
-
- +
+ +
+ +
+
+ + Drop to update +
- -
-
- - Drop to update +
+ +
+
+ {{asset.fileName}} +
+
+
+ + + +
+
+
+
+ + +
+
+ {{asset.pixelWidth}}x{{asset.pixelHeight}}px, {{asset.fileSize | sqxFileSize}} +
+
-
- -
-
+ + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
{{asset.fileName}}
- +
-
- - -
-
+
{{asset.pixelWidth}}x{{asset.pixelHeight}}px, {{asset.fileSize | sqxFileSize}}
- +
+ +
+
+ + + +
+
+ + +
+
+ +
+
+
+
+
+ +
+
+ + Drop to update +
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/Squidex/app/shared/components/asset.component.scss b/src/Squidex/app/shared/components/asset.component.scss index 7e1a3462b..e23ed859b 100644 --- a/src/Squidex/app/shared/components/asset.component.scss +++ b/src/Squidex/app/shared/components/asset.component.scss @@ -1,6 +1,8 @@ @import '_vars'; @import '_mixins'; +$list-height: 2.375rem; + @mixin overlay-container { position: relative; padding: 0; @@ -51,6 +53,10 @@ padding-right: 8px; } +:host(.isListView) { + padding: 0; +} + :host /deep/ { .form-control { &.disabled, @@ -83,20 +89,6 @@ min-height: $asset-footer; max-height: auto; } - - &.drag { - .drop-overlay { - @include opacity(1); - } - - .file-type { - @include opacity(0); - } - } - - &.selectable { - cursor: pointer; - } } .upload-progress { @@ -138,6 +130,11 @@ height: $asset-image; } + &-image-small, + &-icon-small { + height: 2.375rem; + } + &-name { line-height: 2rem; } @@ -201,6 +198,113 @@ .editable { height: 2rem; + border-top: none; + border-bottom: 1px solid transparent; +} + +.table-items-row { + & { + position: relative; + padding-left: $list-height + 2rem; + height: $list-height + 2rem; + } + + .image { + @include absolute(0, auto, auto, 4px); + height: $list-height + 2rem; + padding: 1rem; + border: 0; + background: $color-border; + width: $list-height + 2rem; + } + + .left-border { + & { + @include absolute(0, auto, auto, 0); + height: $list-height + 2rem; + border: 0; + background: $color-border; + width: 4px; + } + + &.selected { + background: $color-theme-blue; + } + } + + .icon { + max-width: 100%; + } + + .col { + & { + height: $list-height; + } + + &-user { + padding-top: .2rem; + } + + &-actions { + text-align: right; + line-height: $list-height; + } + + &-name, + &-info { + @include truncate; + padding-right: 1rem; + padding-left: 1rem; + line-height: $list-height; + } + + &-actions, + &-user { + max-width: 3rem; + min-width: 3rem; + } + + &-info { + color: $color-text-decent; + font-size: .9rem; + max-width: 12rem; + min-width: 12rem; + } + } + + .drop-overlay-text { + top: 1.4rem; + } +} + +.drag { + .drop-overlay { + @include opacity(1); + } + + .file-type { + @include opacity(0); + } +} + +.progress { + &-background { + background: $color-border; + margin: (($list-height - .25rem) / 2) 0; + } + + &-bar { + background: $color-theme-blue; + } + + &-background, + &-bar { + height: .25rem; + } +} + +.selectable { + cursor: pointer; } .tags { diff --git a/src/Squidex/app/shared/components/asset.component.ts b/src/Squidex/app/shared/components/asset.component.ts index 58bb509aa..3de754ff8 100644 --- a/src/Squidex/app/shared/components/asset.component.ts +++ b/src/Squidex/app/shared/components/asset.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, HostBinding, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { FormBuilder, FormControl } from '@angular/forms'; import { Subscription } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; @@ -20,10 +20,10 @@ import { fadeAnimation, RenameAssetDto, RenameAssetForm, + TagAssetDto, Types, Versioned } from '@app/shared/internal'; -import { TagAssetDto } from '@appshared/services/assets.service'; @Component({ selector: 'sqx-asset', @@ -54,6 +54,9 @@ export class AssetComponent implements OnDestroy, OnInit { @Input() public isSelectable = false; + @Input() @HostBinding('class.isListView') + public isListView = false; + @Input() public allTags: string[]; @@ -75,9 +78,9 @@ export class AssetComponent implements OnDestroy, OnInit { @Output() public failed = new EventEmitter(); - public renaming = false; public isTagging = false; + public renaming = false; public renameForm = new RenameAssetForm(this.formBuilder); public tagInput = new FormControl(); diff --git a/src/Squidex/app/shared/components/assets-list.component.html b/src/Squidex/app/shared/components/assets-list.component.html index 7b504e6ff..247fb6aae 100644 --- a/src/Squidex/app/shared/components/assets-list.component.html +++ b/src/Squidex/app/shared/components/assets-list.component.html @@ -15,22 +15,47 @@
- - - - - + + + + + + + + + +
+ + + + + + + +
+
\ No newline at end of file diff --git a/src/Squidex/app/shared/components/assets-list.component.ts b/src/Squidex/app/shared/components/assets-list.component.ts index d8fce26de..75d5601b3 100644 --- a/src/Squidex/app/shared/components/assets-list.component.ts +++ b/src/Squidex/app/shared/components/assets-list.component.ts @@ -28,7 +28,10 @@ export class AssetsListComponent { public state: AssetsState; @Input() - public isDisabled: false; + public isDisabled = false; + + @Input() + public isListView = false; @Input() public selectedIds: object; diff --git a/src/Squidex/app/shared/components/assets-selector.component.html b/src/Squidex/app/shared/components/assets-selector.component.html index 7ed1893c3..8959285df 100644 --- a/src/Squidex/app/shared/components/assets-selector.component.html +++ b/src/Squidex/app/shared/components/assets-selector.component.html @@ -29,11 +29,22 @@
+
+
+ + +
+
diff --git a/src/Squidex/app/shared/components/assets-selector.component.ts b/src/Squidex/app/shared/components/assets-selector.component.ts index 4380f6358..457929c2d 100644 --- a/src/Squidex/app/shared/components/assets-selector.component.ts +++ b/src/Squidex/app/shared/components/assets-selector.component.ts @@ -13,7 +13,8 @@ import { onErrorResumeNext } from 'rxjs/operators'; import { AssetDto, AssetsDialogState, - fadeAnimation + fadeAnimation, + LocalStoreService } from '@app/shared/internal'; @Component({ @@ -28,12 +29,16 @@ export class AssetsSelectorComponent implements OnInit { public selectedAssets: { [id: string]: AssetDto } = {}; public selectionCount = 0; + public isListView = false; + @Output() public selected = new EventEmitter(); constructor( - public readonly state: AssetsDialogState + public readonly state: AssetsDialogState, + private readonly localStore: LocalStoreService ) { + this.isListView = this.localStore.get('assetView') === 'List'; } public ngOnInit() { @@ -69,5 +74,11 @@ export class AssetsSelectorComponent implements OnInit { this.selectionCount = Object.keys(this.selectedAssets).length; } + + public changeView(isListView: boolean) { + this.localStore.set('assetView', isListView ? 'List' : 'Grid'); + + this.isListView = isListView; + } } diff --git a/src/Squidex/app/shared/components/schema-category.component.html b/src/Squidex/app/shared/components/schema-category.component.html index 19faa1ec9..f582ed000 100644 --- a/src/Squidex/app/shared/components/schema-category.component.html +++ b/src/Squidex/app/shared/components/schema-category.component.html @@ -10,7 +10,7 @@ - +
diff --git a/src/Squidex/app/theme/_forms.scss b/src/Squidex/app/theme/_forms.scss index b875570b4..2c2e9e6e7 100644 --- a/src/Squidex/app/theme/_forms.scss +++ b/src/Squidex/app/theme/_forms.scss @@ -179,39 +179,41 @@ } } -.form-underlined { - & { - @include border-radius(0); - padding-left: 0; - padding-right: 0; - border-color: transparent; - border-bottom: 1px solid $color-input-border; - } - - &:focus, - &.focus { - @include box-shadow-none; - background: transparent; - border-color: transparent; - border-bottom-color: $color-theme-blue; - outline: none; - } +input { + &.form-underlined { + & { + @include border-radius(0); + padding-left: 0; + padding-right: 0; + border-color: transparent; + border-bottom: 1px solid $color-input-border; + } - &.ng-invalid { - &.ng-dirty { - & { - @include box-shadow-none; - background: transparent; - border-color: transparent; - border-bottom-color: $color-theme-error; - outline: none; - } + &:focus, + &.focus { + @include box-shadow-none; + background: transparent; + border-color: transparent; + border-bottom-color: $color-theme-blue; + outline: none; + } - &:hover, - &:focus { - @include box-shadow-none; - border-color: transparent; - border-bottom-color: $color-theme-error-dark; + &.ng-invalid { + &.ng-dirty { + & { + @include box-shadow-none; + background: transparent; + border-color: transparent; + border-bottom-color: $color-theme-error; + outline: none; + } + + &:hover, + &:focus { + @include box-shadow-none; + border-color: transparent; + border-bottom-color: $color-theme-error-dark; + } } } } diff --git a/src/Squidex/app/theme/icomoon/demo-files/demo.css b/src/Squidex/app/theme/icomoon/demo-files/demo.css index 7876bec84..98e3bf639 100644 --- a/src/Squidex/app/theme/icomoon/demo-files/demo.css +++ b/src/Squidex/app/theme/icomoon/demo-files/demo.css @@ -147,7 +147,7 @@ p { font-size: 16px; } .fs1 { - font-size: 32px; + font-size: 20px; } .fs2 { font-size: 32px; @@ -156,12 +156,12 @@ p { font-size: 32px; } .fs4 { - font-size: 24px; + font-size: 32px; } .fs5 { - font-size: 28px; + font-size: 24px; } .fs6 { - font-size: 20px; + font-size: 28px; } diff --git a/src/Squidex/app/theme/icomoon/demo.html b/src/Squidex/app/theme/icomoon/demo.html index 17d4d4676..f6c2a3ed7 100644 --- a/src/Squidex/app/theme/icomoon/demo.html +++ b/src/Squidex/app/theme/icomoon/demo.html @@ -9,11 +9,62 @@
-

Font Name: icomoon (Glyphs: 95)

+

Font Name: icomoon (Glyphs: 97)

-

Grid Size: 32

+

Grid Size: 20

+
+
+ + + + icon-grid1 +
+
+ + +
+
+ liga: + +
+
+
+
+ + + + icon-list +
+
+ + +
+
+ liga: + +
+
+
+ + + + icon-info +
+
+ + +
+
+ liga: + +
+
+
+
+

Grid Size: 32

+
@@ -29,7 +80,7 @@
-
+
@@ -45,7 +96,7 @@
-
+
@@ -61,7 +112,7 @@
-
+
@@ -80,7 +131,7 @@

Grid Size: Unknown

-
+
@@ -96,7 +147,7 @@
-
+
@@ -112,7 +163,7 @@
-
+
@@ -128,7 +179,7 @@
-
+
@@ -144,7 +195,7 @@
-
+
@@ -160,7 +211,7 @@
-
+
@@ -176,7 +227,7 @@
-
+
@@ -192,7 +243,7 @@
-
+
@@ -208,7 +259,7 @@
-
+
@@ -224,7 +275,7 @@
-
+
@@ -240,7 +291,7 @@
-
+
@@ -256,7 +307,7 @@
-
+
@@ -272,7 +323,7 @@
-
+
@@ -288,7 +339,7 @@
-
+
@@ -304,7 +355,7 @@
-
+
@@ -320,7 +371,7 @@
-
+
@@ -336,7 +387,7 @@
-
+
@@ -352,7 +403,7 @@
-
+
@@ -368,7 +419,7 @@
-
+
@@ -384,7 +435,7 @@
-
+
@@ -400,7 +451,7 @@
-
+
@@ -416,7 +467,7 @@
-
+
@@ -432,7 +483,7 @@
-
+
@@ -448,7 +499,7 @@
-
+
@@ -464,7 +515,7 @@
-
+
@@ -480,7 +531,7 @@
-
+
@@ -496,7 +547,7 @@
-
+
@@ -512,7 +563,7 @@
-
+
@@ -528,7 +579,7 @@
-
+
@@ -544,7 +595,7 @@
-
+
@@ -560,7 +611,7 @@
-
+
@@ -576,7 +627,7 @@
-
+
@@ -592,7 +643,7 @@
-
+
@@ -608,7 +659,7 @@
-
+
@@ -624,7 +675,7 @@
-
+
-
+
@@ -656,7 +707,7 @@
-
+
@@ -672,7 +723,7 @@
-
+
@@ -688,7 +739,7 @@
-
+
@@ -704,7 +755,7 @@
-
+
@@ -720,7 +771,7 @@
-
+
@@ -736,7 +787,7 @@
-
+
@@ -752,7 +803,7 @@
-
+
@@ -768,7 +819,7 @@
-
+
@@ -784,7 +835,7 @@
-
+
@@ -800,7 +851,7 @@
-
+
@@ -816,7 +867,7 @@
-
+
@@ -832,7 +883,7 @@
-
+
@@ -848,7 +899,7 @@
-
+
@@ -864,7 +915,7 @@
-
+
@@ -880,7 +931,7 @@
-
+
@@ -896,7 +947,7 @@
-
+
@@ -915,7 +966,7 @@

Grid Size: 16

-
+
@@ -931,7 +982,7 @@
-
+
@@ -947,7 +998,7 @@
-
+
@@ -963,7 +1014,7 @@
-
+
@@ -979,7 +1030,7 @@
-
+
-
+
@@ -1011,7 +1062,7 @@
-
+
@@ -1027,7 +1078,7 @@
-
+
@@ -1043,7 +1094,7 @@
-
+
@@ -1059,7 +1110,7 @@
-
+
@@ -1075,7 +1126,7 @@
-
+
@@ -1091,7 +1142,7 @@
-
+
@@ -1107,7 +1158,7 @@
-
+
@@ -1123,7 +1174,7 @@
-
+
@@ -1139,7 +1190,7 @@
-
+
@@ -1155,7 +1206,7 @@
-
+
@@ -1171,7 +1222,7 @@
-
+
@@ -1187,7 +1238,7 @@
-
+
@@ -1206,7 +1257,7 @@

Grid Size: 24

-
+
@@ -1222,7 +1273,7 @@
-
+
@@ -1238,7 +1289,7 @@
-
+
@@ -1254,7 +1305,7 @@
-
+
@@ -1270,234 +1321,10 @@
-
-
- - - - icon-orleans -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-document-lock -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-document-unpublish -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-angle-down -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-angle-left -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-angle-right -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-angle-up -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-api -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-assets -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-bug -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-caret-down -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-caret-left -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-caret-right -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-caret-up -
-
- - -
-
- liga: - -
-

Grid Size: 14

-
+
@@ -1513,7 +1340,7 @@
-
+
@@ -1529,7 +1356,7 @@
-
+
@@ -1545,7 +1372,7 @@
-
+
@@ -1561,7 +1388,7 @@
-
+
@@ -1577,7 +1404,7 @@
-
+
@@ -1593,7 +1420,7 @@
-
+
@@ -1609,7 +1436,7 @@
-
+
@@ -1625,7 +1452,7 @@
-
+
@@ -1641,7 +1468,7 @@
-
+
@@ -1657,7 +1484,7 @@
-
+
@@ -1673,7 +1500,7 @@
-
+
@@ -1689,7 +1516,7 @@
-
+
@@ -1705,7 +1532,7 @@
-
+
@@ -1721,7 +1548,7 @@
-
+
@@ -1737,7 +1564,7 @@
-
+
@@ -1753,7 +1580,7 @@
-
+
@@ -1769,7 +1596,7 @@
-
+
@@ -1785,7 +1612,7 @@
-
+
@@ -1801,7 +1628,7 @@
-
+
@@ -1817,7 +1644,7 @@
-
+
@@ -1833,7 +1660,7 @@
-
+
@@ -1849,7 +1676,7 @@
-
+
@@ -1865,7 +1692,7 @@
-
+
@@ -1881,12 +1708,12 @@
-
+
- + - icon-list + icon-list1
@@ -1897,7 +1724,7 @@
-
+
@@ -1913,7 +1740,7 @@
-
+
@@ -1930,25 +1757,6 @@
-
-

Grid Size: 20

-
-
- - - - icon-info -
-
- - -
-
- liga: - -
-
-
diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot index b195bfb60674b73cffbc6e37dffe9004b149f33c..b7df7a30283335d11c1a666673b22f8fc2e85bf8 100644 GIT binary patch delta 849 zcmah{O=uHA6#iy6jc$sh+U&Mqjr|F2{u-;TQLrK?3TmKKdPr-NxJi=+X>70oBMP}x z4}#DV5A6yCrQSpjx%8kQf}q6~1);qth+c9Fie9X{zKJ%8B6^s4-_Lt9^B%MQl$D+_ zb14c0qO)edX*jX!%-@OFW`|5}^J2EbZ~XU5g3G{pwuGZeRuPh3uX z)W152&jF)7$+$XZgYgy!JtyCvBta7D5;&RDSdSQGw44zLKiX$}|Gd?t#nnY!;Vc2?`>R5iS&{#MwYy@&P@^Uti29B*o=8o=m3is`a`GLc8%LLYb8Gu ze&_G})V0v1JAKY+7hDUjSMGNAT~Dhg;JNR0c#nE7b~ksw@io)u0^%$Pg`W(e{Ami2 Gd+Y~A^1x64 delta 379 zcmexxl<~$PMz)AV28JyO6WPpI9=nRXnCMVmzlVW=0fZBha}x`0vCgz*U|^I1@>|jq ziwl6X0Fb``NOPp;RHg+k|CI#fuV7$^nv#*4m?Hc;f}MdO#s(;FmH`ytWMWML@=Jhx zm5khyihNIzLLh$zP)|=zesZFhQ~V(YhBy_V{E6JeiUNizJ;o@Yz#E`|LSABS>P#=r z-wX`#JU|U?1^LA#49q|ohJ+~~c?M?Ylao^ztA#UwJTaidm>Jj@7#S2^`o0XD{Eksv z(f?)e%cz&9K5%_F`Ty_#{|t=(AB(eyGmA5cGm1?U2Ow z`rI-vL|h-o^V@u7;AR2Y#Blvw=V2H9Xm10UgG`ki1zh@em^bxqE9h diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg index 533ca5aae..a4c3cddb1 100644 --- a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg +++ b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg @@ -85,9 +85,11 @@ + + @@ -101,5 +103,5 @@ - + \ No newline at end of file diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf index c2460360e885f8eaf448a8ad011111c12c9ce88d..9a148796a6cb2d87fc2ab562b112efe2cc1546a9 100644 GIT binary patch delta 827 zcmdmTknzkB#(D-u1_lOhh6V;^1_S?KeItG$-n~GPJwTk0oSRtiA#r^d0|TQBkYAFX zSX=<41%UhsK$;^xr!wuyzi%o){tO0&7=w(|#1s*R|92S}Vow0&%`$)joJ_1~3=DBV zE`v%&Zb?PCr|1nJAEakWPJXguVue=k9|nf_9Y6(VauX{G7-|@!fOfY4`3iZ7xv4X~ zIDZ5AOMn{M3i69ffDQ$MBpr}E12glfi3h6rBY+$spu3nEn1KFKnC!J|6_3$ab~d@0+IZ)fvOlMFH8{LypZvaPdyvMEQVRkX+T4H8KfDs7%Ujv z7(#${DJrpviijC28kw1zs0pL+7$JhnP(gNOuu^MAuu^6`Jf?^Lu8VSViZW`7a&ZOy zD*&?VMHwdmsejR6N)#+6x+DgqDn^WxQw$4>i9t?OR1Spy!&!{8U}A6vLK2|?6mqN# z4F5l~FfborkY_Mq*u2^=i>aQ4;Vdu^jDdl`4;0mBum=VJ&>ymlB4QwK*)p1_DWdTS z%FmhwawLdg41_cPwZfT5qB_h#kH971tbeoQ#AbpFnJFfRU~Lu&G~kxeIF}X~&u{aU zftv;7DTeD8W7omx$q6y$jH#Pv#CS6b&H_mz;j@$9#NIPg`=mZk{hx-OMvEqc<~+>{ tT1r}rv=y{{wAbjU=s4*V=}PEc(USmYja0@61~HJy3{2oe!ymtt5dfO3u?heH delta 387 zcmX?egmKG3#(D-u1_lOhh6V;^1_S?KeItG$-aSAO5Kc(WO)R*@I@6Ycfl&s?Z%I!q zE&$R3K>h+C&5@o{nHISGR}zrFf`K7wN=9m8itz6Ub_RwR8=$;d22g;Li8TetF9GsZ zGIC2Q@;yZgf&3XjJv}-3$&QI$PVt8r7~)ib3QpuERunK)F-8ITZ-9J-yu{qpnO>Z~ z85rVufEwBg@{3D=4h4dQDIj?UX6BO<4^-=B06AhncQG@t0sW)!()VTH%ZQh8FHe2o z`f&39-~azXT7cpVFa2KzPflPI;S*;PXB3+z5Y9gnsEKj1VUqafiHv`IHrM)BFl}BK zq|Yt$Ld5lPJipCX25uIx?(63|4}%yWdh(lCbH?P&DskS7oD3jo5T4u+e@{bQO}$Nh sn}(6b1x+T+5X~!EL0WZM_q4;bOSG5hcvJTE8!3$08kKW&;S4c diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.woff b/src/Squidex/app/theme/icomoon/fonts/icomoon.woff index 5decab2c6a14ce829781fc9ffeaf6b7752bf323f..136754e89b190ca3f24dc5ffa223fd30c9564d09 100644 GIT binary patch delta 865 zcmZoT#5m(9qe!{Gn;Qco0}v$5VBiMRJ`+W>>-Q$-CKfO-FlGRSNUxP~z*FEKY2 zDE0xUu?>W0dU5_P$S(#uHVJ4bR2?&r#mszaG7n?5a|Dnr#2~=H%)kWnvBJxUmvJvo zec<|V^8ere|ABHqJuewvMj?qY{(mgaBF-!}Lm-lWHc%hq=39*XzV&PjvlwPErvc68 zWsqjjVz6LvV+a8{K~afKR7A{J(a6lyL`@il#|RNrh6=JPgOyq{f|WAk;W0h@cU_c| zQ50W4u{S_I2NVmW=TxQv#lA2wL`?zVz~#S^GEx&$7#LzYfNIP@Son7Ydj?PtD0TqI zR{>#8Cf1aU+>#2Q*b|`s9uUs=6e-NfPX?; Date: Wed, 26 Sep 2018 18:29:47 +0200 Subject: [PATCH 02/40] Small improvement. --- .../assets/pages/assets-page.component.html | 2 +- .../shared/assets-editor.component.html | 58 ++++++++++++++----- .../shared/assets-editor.component.scss | 14 ++++- .../content/shared/assets-editor.component.ts | 12 +++- .../components/assets-selector.component.html | 2 +- 5 files changed, 69 insertions(+), 19 deletions(-) diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.html b/src/Squidex/app/features/assets/pages/assets-page.component.html index 402bcdbad..920d9baef 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.html +++ b/src/Squidex/app/features/assets/pages/assets-page.component.html @@ -35,7 +35,7 @@
-
+
diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.html b/src/Squidex/app/features/content/shared/assets-editor.component.html index 115d7fceb..1a24aa4ed 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.html +++ b/src/Squidex/app/features/content/shared/assets-editor.component.html @@ -1,18 +1,50 @@
-
-
- Drop files here to add them. +
+
+
+
+ Drop files or click here to add assets. +
+
+
+
+ + +
+
- - - - - +
+ +
+ + + + + + + + +
+
+ + + + +
+
+
diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.scss b/src/Squidex/app/features/content/shared/assets-editor.component.scss index 30c6f3189..be74dae8c 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.scss +++ b/src/Squidex/app/features/content/shared/assets-editor.component.scss @@ -18,15 +18,23 @@ } } +.header { + margin-bottom: .5rem; +} + +.list { + margin-left: 8px; + margin-right: 8px; +} + .drop-area { & { @include transition(border-color .4s ease); @include border-radius; @include flex-box; + @include truncate; border: 2px dashed $color-border; - height: $asset-height; - width: $asset-width; - margin-left: 8px; + height: 2.5rem; font-size: 1.2rem; font-weight: normal; text-align: center; diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.ts b/src/Squidex/app/features/content/shared/assets-editor.component.ts index cb022c704..4665593f4 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.ts +++ b/src/Squidex/app/features/content/shared/assets-editor.component.ts @@ -16,6 +16,7 @@ import { AssetsService, DialogModel, ImmutableArray, + LocalStoreService, Types } from '@app/shared'; @@ -40,12 +41,15 @@ export class AssetsEditorComponent implements ControlValueAccessor { public newAssets = ImmutableArray.empty(); public oldAssets = ImmutableArray.empty(); + public isListView = false; public isDisabled = false; constructor( private readonly appsState: AppsState, - private readonly assetsService: AssetsService + private readonly assetsService: AssetsService, + private readonly localStore: LocalStoreService ) { + this.isListView = this.localStore.get('assetView') === 'List'; } public writeValue(obj: any) { @@ -128,4 +132,10 @@ export class AssetsEditorComponent implements ControlValueAccessor { this.callTouched(); this.callChange(ids); } + + public changeView(isListView: boolean) { + this.localStore.set('assetView', isListView ? 'List' : 'Grid'); + + this.isListView = isListView; + } } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/assets-selector.component.html b/src/Squidex/app/shared/components/assets-selector.component.html index 8959285df..7b6ca4234 100644 --- a/src/Squidex/app/shared/components/assets-selector.component.html +++ b/src/Squidex/app/shared/components/assets-selector.component.html @@ -30,7 +30,7 @@
-
+
From a3ff5fa1808442f1359a28eca3b18911ed5bd54e Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 26 Sep 2018 18:56:10 +0200 Subject: [PATCH 03/40] List view finalized. --- .../shared/assets-editor.component.html | 36 ++++-------- .../shared/assets-editor.component.scss | 7 +++ .../shared/components/asset.component.html | 2 +- .../components/assets-list.component.html | 57 ++++++------------- .../components/assets-list.component.scss | 7 +++ 5 files changed, 42 insertions(+), 67 deletions(-) diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.html b/src/Squidex/app/features/content/shared/assets-editor.component.html index 1a24aa4ed..b931da3c0 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.html +++ b/src/Squidex/app/features/content/shared/assets-editor.component.html @@ -19,32 +19,16 @@
-
- - - - - - - - -
-
- - - - -
-
- +
+ + + +
diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.scss b/src/Squidex/app/features/content/shared/assets-editor.component.scss index be74dae8c..5f32e9ff6 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.scss +++ b/src/Squidex/app/features/content/shared/assets-editor.component.scss @@ -27,6 +27,13 @@ margin-right: 8px; } +.unrow { + display: block; + padding-left: 8px; + padding-right: 8px; + margin: 0; +} + .drop-area { & { @include transition(border-color .4s ease); diff --git a/src/Squidex/app/shared/components/asset.component.html b/src/Squidex/app/shared/components/asset.component.html index e8eebb1c2..8153de9db 100644 --- a/src/Squidex/app/shared/components/asset.component.html +++ b/src/Squidex/app/shared/components/asset.component.html @@ -122,7 +122,7 @@
-
+
diff --git a/src/Squidex/app/shared/components/assets-list.component.html b/src/Squidex/app/shared/components/assets-list.component.html index 247fb6aae..2cddf2d30 100644 --- a/src/Squidex/app/shared/components/assets-list.component.html +++ b/src/Squidex/app/shared/components/assets-list.component.html @@ -14,48 +14,25 @@
Drop file on existing item to replace the asset with a newer version.
-
- - +
+ + + + + - - - - - - - -
- - - - - - - -
-
\ No newline at end of file diff --git a/src/Squidex/app/shared/components/assets-list.component.scss b/src/Squidex/app/shared/components/assets-list.component.scss index 5c9a8cbca..7acbb132d 100644 --- a/src/Squidex/app/shared/components/assets-list.component.scss +++ b/src/Squidex/app/shared/components/assets-list.component.scss @@ -1,6 +1,13 @@ @import '_vars'; @import '_mixins'; +.unrow { + display: block; + padding-left: 8px; + padding-right: 8px; + margin: 0; +} + .file-drop { & { @include transition(border-color .4s ease); From bcc81aaefac681e295493e9bf20180c53f1fa78e Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 26 Sep 2018 20:13:47 +0200 Subject: [PATCH 04/40] Sorting for assets. --- .../shared/assets-editor.component.html | 35 +++++++++++++------ .../shared/assets-editor.component.scss | 9 ++--- .../content/shared/assets-editor.component.ts | 8 +++++ .../shared/references-editor.component.html | 8 ++--- 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.html b/src/Squidex/app/features/content/shared/assets-editor.component.html index b931da3c0..0e2ce62ca 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.html +++ b/src/Squidex/app/features/content/shared/assets-editor.component.html @@ -19,16 +19,31 @@
-
- - - - +
+ +
+ + + + +
+ + + + + + +
+
+ + +
+
+
diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.scss b/src/Squidex/app/features/content/shared/assets-editor.component.scss index 5f32e9ff6..8ee466d94 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.scss +++ b/src/Squidex/app/features/content/shared/assets-editor.component.scss @@ -18,15 +18,16 @@ } } -.header { - margin-bottom: .5rem; -} - .list { margin-left: 8px; margin-right: 8px; } +.body { + margin-bottom: -.25rem; + margin-top: 1rem; +} + .unrow { display: block; padding-left: 8px; diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.ts b/src/Squidex/app/features/content/shared/assets-editor.component.ts index 4665593f4..bcfeaa2e7 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.ts +++ b/src/Squidex/app/features/content/shared/assets-editor.component.ts @@ -133,6 +133,14 @@ export class AssetsEditorComponent implements ControlValueAccessor { this.callChange(ids); } + public sort(assets: AssetDto[]) { + if (assets) { + this.oldAssets = ImmutableArray.of(assets); + + this.updateValue(); + } + } + public changeView(isListView: boolean) { this.localStore.set('assetView', isListView ? 'List' : 'Grid'); diff --git a/src/Squidex/app/features/content/shared/references-editor.component.html b/src/Squidex/app/features/content/shared/references-editor.component.html index cefec023c..7fbb63a25 100644 --- a/src/Squidex/app/features/content/shared/references-editor.component.html +++ b/src/Squidex/app/features/content/shared/references-editor.component.html @@ -2,7 +2,7 @@
- Click here to link a content. + Click here to link content items.
@@ -12,10 +12,10 @@ + (deleting)="remove(content)"> From 96fc5f906df950d091bdae61bcff54fcb3013af4 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Thu, 27 Sep 2018 09:31:29 +0200 Subject: [PATCH 05/40] Style improvements. --- .../shared/assets-editor.component.html | 20 ++++--- .../shared/assets-editor.component.scss | 6 +- .../shared/components/asset.component.html | 26 ++++---- .../shared/components/asset.component.scss | 60 ++++++++----------- 4 files changed, 53 insertions(+), 59 deletions(-) diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.html b/src/Squidex/app/features/content/shared/assets-editor.component.html index 0e2ce62ca..e12d1061e 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.html +++ b/src/Squidex/app/features/content/shared/assets-editor.component.html @@ -32,15 +32,17 @@ - - - -
-
- - +
+ + + +
+
+ + +
diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.scss b/src/Squidex/app/features/content/shared/assets-editor.component.scss index 8ee466d94..4f208dcc6 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.scss +++ b/src/Squidex/app/features/content/shared/assets-editor.component.scss @@ -18,6 +18,10 @@ } } +.list-view { + margin-bottom: 1rem; +} + .list { margin-left: 8px; margin-right: 8px; @@ -47,8 +51,8 @@ font-weight: normal; text-align: center; padding: 0 2rem; - cursor: pointer; color: darken($color-border, 30%); + cursor: pointer; } &:hover { diff --git a/src/Squidex/app/shared/components/asset.component.html b/src/Squidex/app/shared/components/asset.component.html index 8153de9db..9eeb0acd0 100644 --- a/src/Squidex/app/shared/components/asset.component.html +++ b/src/Squidex/app/shared/components/asset.component.html @@ -48,10 +48,9 @@
-
+
- - Drop to update +
Drop to update
@@ -89,13 +88,11 @@
-
-
- -
-
- -
+
+ +
+
+
@@ -117,12 +114,12 @@
-
+
-
+
@@ -138,10 +135,9 @@
-
+
- - Drop to update +
Drop to update
\ No newline at end of file diff --git a/src/Squidex/app/shared/components/asset.component.scss b/src/Squidex/app/shared/components/asset.component.scss index e23ed859b..27f07083a 100644 --- a/src/Squidex/app/shared/components/asset.component.scss +++ b/src/Squidex/app/shared/components/asset.component.scss @@ -14,6 +14,7 @@ $list-height: 2.375rem; @include transition(opacity .4s ease); @include absolute(0, 0, 0, 0); @include opacity(0); + @include flex-box; color: $color-dark-foreground; } @@ -33,20 +34,6 @@ $list-height: 2.375rem; color: $color-dark-foreground; } -.drop-overlay { - & { - @include overlay; - pointer-events: none; - } - - &-text { - @include absolute(40%, 0, 0, 0); - text-align: center; - font-size: 1.25rem; - font-weight: lighter; - } -} - :host { padding-bottom: 1rem; padding-left: 8px; @@ -125,16 +112,10 @@ $list-height: 2.375rem; @include truncate; } - &-image, - &-icon { + &-image { height: $asset-image; } - &-image-small, - &-icon-small { - height: 2.375rem; - } - &-name { line-height: 2rem; } @@ -150,6 +131,7 @@ $list-height: 2.375rem; &-icon { line-height: $asset-image; background: $color-border; + height: $asset-image; border: 0; text-align: center; } @@ -198,7 +180,7 @@ $list-height: 2.375rem; .editable { height: 2rem; - border-top: none; + border-top: 0; border-bottom: 1px solid transparent; } @@ -209,15 +191,6 @@ $list-height: 2.375rem; height: $list-height + 2rem; } - .image { - @include absolute(0, auto, auto, 4px); - height: $list-height + 2rem; - padding: 1rem; - border: 0; - background: $color-border; - width: $list-height + 2rem; - } - .left-border { & { @include absolute(0, auto, auto, 0); @@ -232,6 +205,17 @@ $list-height: 2.375rem; } } + .image { + @include absolute(0, auto, 0, 4px); + border: 0; + background: $color-border; + width: $list-height + 2rem; + } + + .image-padded { + padding: 1rem; + } + .icon { max-width: 100%; } @@ -246,7 +230,6 @@ $list-height: 2.375rem; } &-actions { - text-align: right; line-height: $list-height; } @@ -271,9 +254,18 @@ $list-height: 2.375rem; min-width: 12rem; } } +} - .drop-overlay-text { - top: 1.4rem; +.drop-overlay { + & { + @include overlay; + pointer-events: none; + } + + &-text { + position: absolute; + font-size: 1.25rem; + font-weight: lighter; } } From d8b915e9470ddd1ef70273c9b64b1850d741e452 Mon Sep 17 00:00:00 2001 From: dsbegnoche Date: Thu, 27 Sep 2018 17:30:50 -0500 Subject: [PATCH 06/40] No error message for Schedule Error When saving invalid schedule, error is returned from API, but not displayed. Simple way to recreate is schedule item and enter invalid year (I.E. 0000). I think this may be proper fix, other solution is to remove the catcherror and extra pipe. --- src/Squidex/app/shared/state/contents.state.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Squidex/app/shared/state/contents.state.ts b/src/Squidex/app/shared/state/contents.state.ts index 98d4fdaf2..f220670bd 100644 --- a/src/Squidex/app/shared/state/contents.state.ts +++ b/src/Squidex/app/shared/state/contents.state.ts @@ -12,6 +12,7 @@ import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/oper import { DateTime, DialogService, + ErrorDto, ImmutableArray, notify, Pager, @@ -152,7 +153,7 @@ export abstract class ContentsStateBase extends State { this.contentsService.changeContentStatus(this.appName, this.schemaName, c.id, action, dueTime, c.version).pipe( catchError(error => of(error))))).pipe( tap(results => { - const error = results.find(x => !!x.error); + const error = results.find(x => x instanceof ErrorDto); if (error) { this.dialogs.notifyError(error); @@ -169,7 +170,7 @@ export abstract class ContentsStateBase extends State { this.contentsService.deleteContent(this.appName, this.schemaName, c.id, c.version).pipe( catchError(error => of(error))))).pipe( tap(results => { - const error = results.find(x => !!x.error); + const error = results.find(x => x instanceof ErrorDto); if (error) { this.dialogs.notifyError(error); @@ -389,4 +390,4 @@ const discardChanges = (content: ContentDto, user: string, version: Version, now lastModified: now || DateTime.now(), lastModifiedBy: user, version - }); \ No newline at end of file + }); From 3c32bdc855ba93a9b372fdf2beca350b51fefb29 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 1 Oct 2018 15:34:09 +0200 Subject: [PATCH 07/40] Logging improved. --- src/Squidex.Infrastructure/Log/FileChannel.cs | 22 ++++++++++----- .../Log/Internal/FileLogProcessor.cs | 27 +++++++++++++++---- src/Squidex/Config/Domain/LoggingServices.cs | 3 +-- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/src/Squidex.Infrastructure/Log/FileChannel.cs b/src/Squidex.Infrastructure/Log/FileChannel.cs index 51ec006ab..c5d8d37f1 100644 --- a/src/Squidex.Infrastructure/Log/FileChannel.cs +++ b/src/Squidex.Infrastructure/Log/FileChannel.cs @@ -9,9 +9,11 @@ using Squidex.Infrastructure.Log.Internal; namespace Squidex.Infrastructure.Log { - public sealed class FileChannel : DisposableObjectBase, ILogChannel, IInitializable + public sealed class FileChannel : DisposableObjectBase, ILogChannel { private readonly FileLogProcessor processor; + private readonly object lockObject = new object(); + private bool isInitialized; public FileChannel(string path) { @@ -30,12 +32,20 @@ namespace Squidex.Infrastructure.Log public void Log(SemanticLogLevel logLevel, string message) { - processor.EnqueueMessage(new LogMessageEntry { Message = message }); - } + if (!isInitialized) + { + lock (lockObject) + { + if (!isInitialized) + { + processor.Initialize(); - public void Initialize() - { - processor.Connect(); + isInitialized = true; + } + } + } + + processor.EnqueueMessage(new LogMessageEntry { Message = message }); } } } diff --git a/src/Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs b/src/Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs index fa60d61f8..42495544d 100644 --- a/src/Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs +++ b/src/Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs @@ -20,6 +20,7 @@ namespace Squidex.Infrastructure.Log.Internal private readonly BlockingCollection messageQueue = new BlockingCollection(MaxQueuedMessages); private readonly Task outputTask; private readonly string path; + private StreamWriter writer; public FileLogProcessor(string path) { @@ -45,16 +46,33 @@ namespace Squidex.Infrastructure.Log.Internal throw; } } + finally + { + writer.Dispose(); + } } } - public void Connect() + public void Initialize() { var fileInfo = new FileInfo(path); + try + { + if (!fileInfo.Directory.Exists) + { + fileInfo.Directory.Create(); + } - if (!fileInfo.Directory.Exists) + var fs = new FileStream(fileInfo.FullName, FileMode.Append, FileAccess.Write, FileShare.ReadWrite); + + writer = new StreamWriter(fs, Encoding.UTF8); + writer.AutoFlush = true; + + writer.WriteLine($"--- Started Logging {DateTime.UtcNow} ---", 1); + } + catch (Exception ex) { - throw new ConfigurationException($"Log directory '{fileInfo.Directory.FullName}' does not exist."); + throw new ConfigurationException($"Log directory '{fileInfo.Directory.FullName}' does not exist or cannot be created.", ex); } } @@ -71,8 +89,7 @@ namespace Squidex.Infrastructure.Log.Internal { try { - File.AppendAllText(path, entry.Message + Environment.NewLine, Encoding.UTF8); - + writer.WriteLine(entry.Message); break; } catch (Exception ex) diff --git a/src/Squidex/Config/Domain/LoggingServices.cs b/src/Squidex/Config/Domain/LoggingServices.cs index 486c29dff..3c82a100b 100644 --- a/src/Squidex/Config/Domain/LoggingServices.cs +++ b/src/Squidex/Config/Domain/LoggingServices.cs @@ -38,8 +38,7 @@ namespace Squidex.Config.Domain if (!string.IsNullOrWhiteSpace(loggingFile)) { services.AddSingletonAs(file ?? (file = new FileChannel(loggingFile))) - .As() - .As(); + .As(); } var useColors = config.GetValue("logging:colors"); From 1f18af567ea3e0dca967b23c457e5503859cba6e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 2 Oct 2018 10:20:30 +0200 Subject: [PATCH 08/40] Robots txt. --- src/Squidex/wwwroot/robots.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 src/Squidex/wwwroot/robots.txt diff --git a/src/Squidex/wwwroot/robots.txt b/src/Squidex/wwwroot/robots.txt new file mode 100644 index 000000000..f870a67b1 --- /dev/null +++ b/src/Squidex/wwwroot/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / \ No newline at end of file From 006768b21c24be4d4796a910831b72e8ff86d0c2 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 2 Oct 2018 12:32:43 +0200 Subject: [PATCH 09/40] Cancellable startup. --- .../Assets/MongoAssetRepository.cs | 6 ++- .../Assets/MongoAssetStatsRepository.cs | 13 +++-- .../Contents/MongoContentCollection.cs | 5 +- .../Contents/MongoContentDraftCollection.cs | 36 +++++++------- .../MongoContentPublishedCollection.cs | 21 ++++----- .../Contents/MongoContentRepository.cs | 6 +-- .../History/MongoHistoryEventRepository.cs | 25 +++++----- .../Rules/MongoRuleEventRepository.cs | 15 +++--- .../MongoPersistedGrantStore.cs | 14 +++--- .../MongoRoleStore.cs | 4 +- .../MongoUserStore.cs | 18 +++---- .../Assets/AzureBlobAssetStore.cs | 6 +-- .../EventSourcing/GetEventStore.cs | 8 ++-- .../EventSourcing/ProjectionClient.cs | 3 +- .../Assets/GoogleCloudAssetStore.cs | 6 +-- .../Assets/MongoGridFsAssetStore.cs | 4 +- .../EventSourcing/MongoEventStore.cs | 14 +++--- .../EventSourcing/MongoEventStore_Reader.cs | 2 +- .../MongoDb/MongoRepositoryBase.cs | 26 ++++------ .../UsageTracking/MongoUsageStore.cs | 5 +- .../CQRS/Events/RabbitMqEventConsumer.cs | 5 +- .../RedisPubSub.cs | 7 ++- .../Assets/FolderAssetStore.cs | 14 +++--- src/Squidex.Infrastructure/IInitializable.cs | 5 +- src/Squidex.Infrastructure/IRunnable.cs | 14 ------ .../Orleans/InitializerStartup.cs | 34 ++++++++++++++ src/Squidex/Config/Domain/SystemExtensions.cs | 47 +++++++++++++------ src/Squidex/Config/Orleans/OrleansServices.cs | 6 +-- src/Squidex/Config/Orleans/SiloWrapper.cs | 24 ++++------ src/Squidex/WebStartup.cs | 6 +-- .../Assets/AssetStoreTests.cs | 2 +- .../Assets/FolderAssetStoreTests.cs | 2 +- 32 files changed, 228 insertions(+), 175 deletions(-) delete mode 100644 src/Squidex.Infrastructure/IRunnable.cs create mode 100644 src/Squidex.Infrastructure/Orleans/InitializerStartup.cs diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs index 6c42283c8..ed6e85b39 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; using Squidex.Domain.Apps.Entities.Assets; @@ -32,7 +33,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets return "States_Assets"; } - protected override Task SetupCollectionAsync(IMongoCollection collection) + protected override Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) { return collection.Indexes.CreateOneAsync( new CreateIndexModel( @@ -41,7 +42,8 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets .Ascending(x => x.IsDeleted) .Ascending(x => x.FileName) .Ascending(x => x.Tags) - .Descending(x => x.LastModified))); + .Descending(x => x.LastModified)), + cancellationToken: ct); } public async Task> QueryAsync(Guid appId, Query query) diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetStatsRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetStatsRepository.cs index dd53f4313..a78ad5987 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetStatsRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetStatsRepository.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; using Squidex.Domain.Apps.Entities.Assets; @@ -30,12 +31,14 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets return "Projections_AssetStats"; } - protected override async Task SetupCollectionAsync(IMongoCollection collection) + protected override Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) { - await collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.AssetId).Ascending(x => x.Date))); - await collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.AssetId).Descending(x => x.Date))); + return collection.Indexes.CreateManyAsync( + new[] + { + new CreateIndexModel(Index.Ascending(x => x.AssetId).Ascending(x => x.Date)), + new CreateIndexModel(Index.Ascending(x => x.AssetId).Descending(x => x.Date)) + }, ct); } public async Task> QueryAsync(Guid appId, DateTime fromDate, DateTime toDate) diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs index f9a7b2d25..c9eec5756 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; using Squidex.Domain.Apps.Core.Contents; @@ -31,10 +32,10 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents this.collectionName = collectionName; } - protected override async Task SetupCollectionAsync(IMongoCollection collection) + protected override async Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) { await collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.ReferencedIds))); + new CreateIndexModel(Index.Ascending(x => x.ReferencedIds)), cancellationToken: ct); } protected override string CollectionName() diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs index 15cdb7f32..6ad2c7651 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; using NodaTime; @@ -29,24 +30,25 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { } - protected override async Task SetupCollectionAsync(IMongoCollection collection) + protected override async Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) { - await collection.Indexes.CreateOneAsync( - new CreateIndexModel( - Index - .Ascending(x => x.IndexedSchemaId) - .Ascending(x => x.Id) - .Ascending(x => x.IsDeleted))); - - await collection.Indexes.CreateOneAsync( - new CreateIndexModel( - Index - .Text(x => x.DataText) - .Ascending(x => x.IndexedSchemaId) - .Ascending(x => x.IsDeleted) - .Ascending(x => x.Status))); - - await base.SetupCollectionAsync(collection); + await collection.Indexes.CreateManyAsync( + new[] + { + new CreateIndexModel( + Index + .Ascending(x => x.IndexedSchemaId) + .Ascending(x => x.Id) + .Ascending(x => x.IsDeleted)), + new CreateIndexModel( + Index + .Text(x => x.DataText) + .Ascending(x => x.IndexedSchemaId) + .Ascending(x => x.IsDeleted) + .Ascending(x => x.Status)), + }, ct); + + await base.SetupCollectionAsync(collection, ct); } public async Task> QueryNotFoundAsync(Guid appId, Guid schemaId, IList ids) diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs index ec1d2da7c..8f2c424e9 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs @@ -6,6 +6,7 @@ // ========================================================================== using System; +using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; using Squidex.Domain.Apps.Entities.Apps; @@ -22,18 +23,16 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { } - protected override async Task SetupCollectionAsync(IMongoCollection collection) + protected override async Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) { - await collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Text(x => x.DataText).Ascending(x => x.IndexedSchemaId))); - - await collection.Indexes.CreateOneAsync( - new CreateIndexModel( - Index - .Ascending(x => x.IndexedSchemaId) - .Ascending(x => x.Id))); - - await base.SetupCollectionAsync(collection); + await collection.Indexes.CreateManyAsync( + new[] + { + new CreateIndexModel(Index.Text(x => x.DataText).Ascending(x => x.IndexedSchemaId)), + new CreateIndexModel(Index.Ascending(x => x.IndexedSchemaId).Ascending(x => x.Id)) + }, ct); + + await base.SetupCollectionAsync(collection, ct); } public async Task FindContentAsync(IAppEntity app, ISchemaEntity schema, Guid id) diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs index 796026d71..71c81e3aa 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; +using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; using NodaTime; @@ -40,10 +41,9 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents this.database = database; } - public void Initialize() + public Task InitializeAsync(CancellationToken ct = default(CancellationToken)) { - contentsDraft.Initialize(); - contentsPublished.Initialize(); + return Task.WhenAll(contentsDraft.InitializeAsync(ct), contentsPublished.InitializeAsync(ct)); } public async Task> QueryAsync(IAppEntity app, ISchemaEntity schema, Status[] status, Query query) diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs index fb40a3062..95e9c6e74 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; using Squidex.Domain.Apps.Entities.History; @@ -52,18 +53,20 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.History return "Projections_History"; } - protected override async Task SetupCollectionAsync(IMongoCollection collection) + protected override Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) { - await collection.Indexes.CreateOneAsync( - new CreateIndexModel( - Index - .Ascending(x => x.AppId) - .Ascending(x => x.Channel) - .Descending(x => x.Created) - .Descending(x => x.Version))); - - await collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.Created), new CreateIndexOptions { ExpireAfter = TimeSpan.FromDays(365) })); + return collection.Indexes.CreateManyAsync( + new[] + { + new CreateIndexModel( + Index + .Ascending(x => x.AppId) + .Ascending(x => x.Channel) + .Descending(x => x.Created) + .Descending(x => x.Version)), + new CreateIndexModel(Index.Ascending(x => x.Created), + new CreateIndexOptions { ExpireAfter = TimeSpan.FromDays(365) }) + }, ct); } public async Task> QueryByChannelAsync(Guid appId, string channelPrefix, int count) diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs index b775e9aba..352dfc479 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs @@ -32,14 +32,15 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Rules return "RuleEvents"; } - protected override async Task SetupCollectionAsync(IMongoCollection collection) + protected override async Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) { - await collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.NextAttempt))); - await collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.AppId).Descending(x => x.Created))); - await collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.Expires), new CreateIndexOptions { ExpireAfter = TimeSpan.Zero })); + await collection.Indexes.CreateManyAsync( + new[] + { + new CreateIndexModel(Index.Ascending(x => x.NextAttempt)), + new CreateIndexModel(Index.Ascending(x => x.AppId).Descending(x => x.Created)), + new CreateIndexModel(Index.Ascending(x => x.Expires), new CreateIndexOptions { ExpireAfter = TimeSpan.Zero }) + }, ct); } public Task QueryPendingAsync(Instant now, Func callback, CancellationToken ct = default(CancellationToken)) diff --git a/src/Squidex.Domain.Users.MongoDb/Infrastructure/MongoPersistedGrantStore.cs b/src/Squidex.Domain.Users.MongoDb/Infrastructure/MongoPersistedGrantStore.cs index 0f839a848..abf05e1ac 100644 --- a/src/Squidex.Domain.Users.MongoDb/Infrastructure/MongoPersistedGrantStore.cs +++ b/src/Squidex.Domain.Users.MongoDb/Infrastructure/MongoPersistedGrantStore.cs @@ -6,6 +6,7 @@ // ========================================================================== using System.Collections.Generic; +using System.Threading; using System.Threading.Tasks; using IdentityServer4.Models; using IdentityServer4.Stores; @@ -36,13 +37,14 @@ namespace Squidex.Domain.Users.MongoDb.Infrastructure return "Identity_PersistedGrants"; } - protected override Task SetupCollectionAsync(IMongoCollection collection) + protected override Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) { - return Task.WhenAll( - collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.ClientId))), - collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.SubjectId)))); + return collection.Indexes.CreateManyAsync( + new[] + { + new CreateIndexModel(Index.Ascending(x => x.ClientId)), + new CreateIndexModel(Index.Ascending(x => x.SubjectId)) + }, ct); } public Task StoreAsync(PersistedGrant grant) diff --git a/src/Squidex.Domain.Users.MongoDb/MongoRoleStore.cs b/src/Squidex.Domain.Users.MongoDb/MongoRoleStore.cs index 745414c35..8043b89e2 100644 --- a/src/Squidex.Domain.Users.MongoDb/MongoRoleStore.cs +++ b/src/Squidex.Domain.Users.MongoDb/MongoRoleStore.cs @@ -26,10 +26,10 @@ namespace Squidex.Domain.Users.MongoDb return "Identity_Roles"; } - protected override Task SetupCollectionAsync(IMongoCollection collection) + protected override Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) { return collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.NormalizedName), new CreateIndexOptions { Unique = true })); + new CreateIndexModel(Index.Ascending(x => x.NormalizedName), new CreateIndexOptions { Unique = true }), cancellationToken: ct); } protected override MongoCollectionSettings CollectionSettings() diff --git a/src/Squidex.Domain.Users.MongoDb/MongoUserStore.cs b/src/Squidex.Domain.Users.MongoDb/MongoUserStore.cs index 686acd84d..ec3cbde8d 100644 --- a/src/Squidex.Domain.Users.MongoDb/MongoUserStore.cs +++ b/src/Squidex.Domain.Users.MongoDb/MongoUserStore.cs @@ -46,15 +46,15 @@ namespace Squidex.Domain.Users.MongoDb return "Identity_Users"; } - protected override Task SetupCollectionAsync(IMongoCollection collection) - { - return Task.WhenAll( - collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending("Logins.LoginProvider").Ascending("Logins.ProviderKey"))), - collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.NormalizedUserName), new CreateIndexOptions { Unique = true })), - collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.NormalizedEmail), new CreateIndexOptions { Unique = true }))); + protected override Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) + { + return collection.Indexes.CreateManyAsync( + new[] + { + new CreateIndexModel(Index.Ascending("Logins.LoginProvider").Ascending("Logins.ProviderKey")), + new CreateIndexModel(Index.Ascending(x => x.NormalizedUserName), new CreateIndexOptions { Unique = true }), + new CreateIndexModel(Index.Ascending(x => x.NormalizedEmail), new CreateIndexOptions { Unique = true }) + }, ct); } protected override MongoCollectionSettings CollectionSettings() diff --git a/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs b/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs index 4239d2c4b..969f00ef3 100644 --- a/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs +++ b/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs @@ -29,7 +29,7 @@ namespace Squidex.Infrastructure.Assets this.containerName = containerName; } - public void Initialize() + public async Task InitializeAsync(CancellationToken ct = default(CancellationToken)) { try { @@ -38,7 +38,7 @@ namespace Squidex.Infrastructure.Assets var blobClient = storageAccount.CreateCloudBlobClient(); var blobReference = blobClient.GetContainerReference(containerName); - blobReference.CreateIfNotExistsAsync().Wait(); + await blobReference.CreateIfNotExistsAsync(); blobContainer = blobReference; } @@ -130,7 +130,7 @@ namespace Squidex.Infrastructure.Assets return blob.DeleteIfExistsAsync(); } - private async Task UploadCoreAsync(string blobName, Stream stream, CancellationToken ct) + private async Task UploadCoreAsync(string blobName, Stream stream, CancellationToken ct = default(CancellationToken)) { try { diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs index d948039e2..9ea5bc45c 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs @@ -34,18 +34,18 @@ namespace Squidex.Infrastructure.EventSourcing projectionClient = new ProjectionClient(connection, prefix, projectionHost); } - public void Initialize() + public async Task InitializeAsync(CancellationToken ct = default(CancellationToken)) { try { - connection.ConnectAsync().Wait(); + await connection.ConnectAsync(); } catch (Exception ex) { throw new ConfigurationException("Cannot connect to event store.", ex); } - projectionClient.ConnectAsync().Wait(); + await projectionClient.ConnectAsync(); } public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null) @@ -82,7 +82,7 @@ namespace Squidex.Infrastructure.EventSourcing } } - private async Task QueryAsync(Func callback, string streamName, long sliceStart, CancellationToken ct) + private async Task QueryAsync(Func callback, string streamName, long sliceStart, CancellationToken ct = default(CancellationToken)) { StreamEventsSlice currentSlice; do diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionClient.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionClient.cs index 6c4ef3f75..cb6051f52 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionClient.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionClient.cs @@ -10,6 +10,7 @@ using System.Collections.Concurrent; using System.Linq; using System.Net; using System.Net.Sockets; +using System.Threading; using System.Threading.Tasks; using EventStore.ClientAPI; using EventStore.ClientAPI.Exceptions; @@ -103,7 +104,7 @@ namespace Squidex.Infrastructure.EventSourcing } } - public async Task ConnectAsync() + public async Task ConnectAsync(CancellationToken ct = default(CancellationToken)) { var addressParts = projectionHost.Split(':'); diff --git a/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs b/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs index 9a8a31e7c..3ef01b8d2 100644 --- a/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs +++ b/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs @@ -30,13 +30,13 @@ namespace Squidex.Infrastructure.Assets this.bucketName = bucketName; } - public void Initialize() + public async Task InitializeAsync(CancellationToken ct = default(CancellationToken)) { try { storageClient = StorageClient.Create(); - storageClient.GetBucket(bucketName); + await storageClient.GetBucketAsync(bucketName, cancellationToken: ct); } catch (Exception ex) { @@ -103,7 +103,7 @@ namespace Squidex.Infrastructure.Assets return DeleteCoreAsync(fileName); } - private async Task UploadCoreAsync(string objectName, Stream stream, CancellationToken ct) + private async Task UploadCoreAsync(string objectName, Stream stream, CancellationToken ct = default(CancellationToken)) { try { diff --git a/src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs b/src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs index 15dc5619b..7f4ac0fd5 100644 --- a/src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs @@ -27,11 +27,11 @@ namespace Squidex.Infrastructure.Assets this.bucket = bucket; } - public void Initialize() + public async Task InitializeAsync(CancellationToken ct = default(CancellationToken)) { try { - bucket.Database.ListCollections(); + await bucket.Database.ListCollectionsAsync(cancellationToken: ct); } catch (MongoException ex) { diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs index 9438d62d6..be564d763 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs @@ -5,6 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System.Threading; using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; @@ -43,13 +44,14 @@ namespace Squidex.Infrastructure.EventSourcing return new MongoCollectionSettings { ReadPreference = ReadPreference.Primary, WriteConcern = WriteConcern.WMajority }; } - protected override Task SetupCollectionAsync(IMongoCollection collection) + protected override Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) { - return Task.WhenAll( - collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.Timestamp).Ascending(x => x.EventStream))), - collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.EventStream).Descending(x => x.EventStreamOffset), new CreateIndexOptions { Unique = true }))); + return collection.Indexes.CreateManyAsync( + new[] + { + new CreateIndexModel(Index.Ascending(x => x.Timestamp).Ascending(x => x.EventStream)), + new CreateIndexModel(Index.Ascending(x => x.EventStream).Descending(x => x.EventStreamOffset), new CreateIndexOptions { Unique = true }) + }, ct); } } } \ No newline at end of file diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs index a9e31eb43..d11bc804a 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs @@ -91,7 +91,7 @@ namespace Squidex.Infrastructure.EventSourcing return QueryAsync(callback, lastPosition, filter, ct); } - private async Task QueryAsync(Func callback, StreamPosition lastPosition, FilterDefinition filter, CancellationToken ct) + private async Task QueryAsync(Func callback, StreamPosition lastPosition, FilterDefinition filter, CancellationToken ct = default(CancellationToken)) { using (Profiler.TraceMethod()) { diff --git a/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs index d8c35ef2d..0a11b956e 100644 --- a/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs +++ b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs @@ -7,6 +7,7 @@ using System; using System.Globalization; +using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; using Squidex.Infrastructure.Tasks; @@ -67,21 +68,12 @@ namespace Squidex.Infrastructure.MongoDb private Lazy> CreateCollection() { return new Lazy>(() => - { - return Task.Run(async () => - { - var databaseCollection = mongoDatabase.GetCollection( - CollectionName(), - CollectionSettings() ?? new MongoCollectionSettings()); - - await SetupCollectionAsync(databaseCollection).ConfigureAwait(false); - - return databaseCollection; - }).Result; - }); + mongoDatabase.GetCollection( + CollectionName(), + CollectionSettings() ?? new MongoCollectionSettings())); } - protected virtual Task SetupCollectionAsync(IMongoCollection collection) + protected virtual Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) { return TaskHelper.Done; } @@ -93,7 +85,7 @@ namespace Squidex.Infrastructure.MongoDb await SetupCollectionAsync(Collection); } - public async Task DropCollectionIfExistsAsync() + public async Task DropCollectionIfExistsAsync(CancellationToken ct = default(CancellationToken)) { try { @@ -101,6 +93,8 @@ namespace Squidex.Infrastructure.MongoDb mongoCollection = CreateCollection(); + await SetupCollectionAsync(Collection, ct); + return true; } catch @@ -109,11 +103,11 @@ namespace Squidex.Infrastructure.MongoDb } } - public void Initialize() + public async Task InitializeAsync(CancellationToken ct = default(CancellationToken)) { try { - Database.ListCollections(); + await SetupCollectionAsync(Collection, ct); } catch (Exception ex) { diff --git a/src/Squidex.Infrastructure.MongoDb/UsageTracking/MongoUsageStore.cs b/src/Squidex.Infrastructure.MongoDb/UsageTracking/MongoUsageStore.cs index dc77f5677..63d6d32bc 100644 --- a/src/Squidex.Infrastructure.MongoDb/UsageTracking/MongoUsageStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/UsageTracking/MongoUsageStore.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; using Squidex.Infrastructure.MongoDb; @@ -26,10 +27,10 @@ namespace Squidex.Infrastructure.UsageTracking return "Usages"; } - protected override Task SetupCollectionAsync(IMongoCollection collection) + protected override Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default(CancellationToken)) { return collection.Indexes.CreateOneAsync( - new CreateIndexModel(Index.Ascending(x => x.Key).Ascending(x => x.Category).Ascending(x => x.Date))); + new CreateIndexModel(Index.Ascending(x => x.Key).Ascending(x => x.Category).Ascending(x => x.Date)), cancellationToken: ct); } public Task TrackUsagesAsync(DateTime date, string key, string category, double count, double elapsedMs) diff --git a/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs b/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs index 979a66208..238698bda 100644 --- a/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs +++ b/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs @@ -7,6 +7,7 @@ using System; using System.Text; +using System.Threading; using System.Threading.Tasks; using Newtonsoft.Json; using RabbitMQ.Client; @@ -61,7 +62,7 @@ namespace Squidex.Infrastructure.CQRS.Events } } - public void Initialize() + public Task InitializeAsync(CancellationToken ct = default(CancellationToken)) { try { @@ -71,6 +72,8 @@ namespace Squidex.Infrastructure.CQRS.Events { throw new ConfigurationException($"RabbitMq event bus failed to connect to {connectionFactory.Endpoint}"); } + + return TaskHelper.Done; } catch (Exception e) { diff --git a/src/Squidex.Infrastructure.Redis/RedisPubSub.cs b/src/Squidex.Infrastructure.Redis/RedisPubSub.cs index ce14d18fb..ce5e9f1f0 100644 --- a/src/Squidex.Infrastructure.Redis/RedisPubSub.cs +++ b/src/Squidex.Infrastructure.Redis/RedisPubSub.cs @@ -7,7 +7,10 @@ using System; using System.Collections.Concurrent; +using System.Threading; +using System.Threading.Tasks; using Squidex.Infrastructure.Log; +using Squidex.Infrastructure.Tasks; using StackExchange.Redis; namespace Squidex.Infrastructure @@ -30,11 +33,13 @@ namespace Squidex.Infrastructure redisSubscriber = new Lazy(() => redis.Value.GetSubscriber()); } - public void Initialize() + public Task InitializeAsync(CancellationToken ct = default(CancellationToken)) { try { redisClient.Value.GetStatus(); + + return TaskHelper.Done; } catch (Exception ex) { diff --git a/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs b/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs index e86c5dd84..435e41433 100644 --- a/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs +++ b/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs @@ -5,6 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; using System.IO; using System.Linq; using System.Threading; @@ -30,7 +31,7 @@ namespace Squidex.Infrastructure.Assets directory = new DirectoryInfo(path); } - public void Initialize() + public Task InitializeAsync(CancellationToken ct = default(CancellationToken)) { try { @@ -42,13 +43,12 @@ namespace Squidex.Infrastructure.Assets log.LogInformation(w => w .WriteProperty("action", "FolderAssetStoreConfigured") .WriteProperty("path", directory.FullName)); + + return TaskHelper.Done; } - catch + catch (Exception ex) { - if (!directory.Exists) - { - throw new ConfigurationException($"Cannot access directory {directory.FullName}"); - } + throw new ConfigurationException($"Cannot access directory {directory.FullName}", ex); } } @@ -125,7 +125,7 @@ namespace Squidex.Infrastructure.Assets return TaskHelper.Done; } - private static async Task UploadCoreAsync(FileInfo file, Stream stream, CancellationToken ct) + private static async Task UploadCoreAsync(FileInfo file, Stream stream, CancellationToken ct = default(CancellationToken)) { try { diff --git a/src/Squidex.Infrastructure/IInitializable.cs b/src/Squidex.Infrastructure/IInitializable.cs index 85011ae58..21f2afc8e 100644 --- a/src/Squidex.Infrastructure/IInitializable.cs +++ b/src/Squidex.Infrastructure/IInitializable.cs @@ -5,10 +5,13 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System.Threading; +using System.Threading.Tasks; + namespace Squidex.Infrastructure { public interface IInitializable { - void Initialize(); + Task InitializeAsync(CancellationToken ct = default(CancellationToken)); } } diff --git a/src/Squidex.Infrastructure/IRunnable.cs b/src/Squidex.Infrastructure/IRunnable.cs deleted file mode 100644 index 790fa1c59..000000000 --- a/src/Squidex.Infrastructure/IRunnable.cs +++ /dev/null @@ -1,14 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschränkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -namespace Squidex.Infrastructure -{ - public interface IRunnable - { - void Run(); - } -} diff --git a/src/Squidex.Infrastructure/Orleans/InitializerStartup.cs b/src/Squidex.Infrastructure/Orleans/InitializerStartup.cs new file mode 100644 index 000000000..f5e834aa7 --- /dev/null +++ b/src/Squidex.Infrastructure/Orleans/InitializerStartup.cs @@ -0,0 +1,34 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using Orleans.Runtime; + +namespace Squidex.Infrastructure.Orleans +{ + public sealed class InitializerStartup : IStartupTask + { + private readonly IEnumerable initializables; + + public InitializerStartup(IEnumerable initializables) + { + Guard.NotNull(initializables, nameof(initializables)); + + this.initializables = initializables; + } + + public async Task Execute(CancellationToken cancellationToken) + { + foreach (var initializable in initializables) + { + await initializable.InitializeAsync(cancellationToken); + } + } + } +} diff --git a/src/Squidex/Config/Domain/SystemExtensions.cs b/src/Squidex/Config/Domain/SystemExtensions.cs index 29e985d3e..5432416cd 100644 --- a/src/Squidex/Config/Domain/SystemExtensions.cs +++ b/src/Squidex/Config/Domain/SystemExtensions.cs @@ -5,9 +5,10 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Collections.Generic; -using Microsoft.Extensions.DependencyInjection; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; using Squidex.Infrastructure; using Squidex.Infrastructure.Migrations; @@ -15,31 +16,47 @@ namespace Squidex.Config.Domain { public static class SystemExtensions { - public static void RunInitialization(this IServiceProvider services) + public sealed class InitializeHostedService : IHostedService { - var systems = services.GetRequiredService>(); + private readonly IEnumerable targets; - foreach (var system in systems) + public InitializeHostedService(IEnumerable targets) { - system.Initialize(); + this.targets = targets; } - } - public static void RunRunnables(this IServiceProvider services) - { - var systems = services.GetRequiredService>(); + public async Task StartAsync(CancellationToken cancellationToken) + { + foreach (var target in targets) + { + await target.InitializeAsync(cancellationToken); + } + } - foreach (var system in systems) + public Task StopAsync(CancellationToken cancellationToken) { - system.Run(); + return Task.CompletedTask; } } - public static void RunMigrate(this IServiceProvider services) + public sealed class MigratorHostedService : IHostedService { - var migrator = services.GetRequiredService(); + private readonly Migrator migrator; + + public MigratorHostedService(Migrator migrator) + { + this.migrator = migrator; + } + + public Task StartAsync(CancellationToken cancellationToken) + { + return migrator.MigrateAsync(); + } - migrator.MigrateAsync().Wait(); + public Task StopAsync(CancellationToken cancellationToken) + { + return Task.CompletedTask; + } } } } diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs index a75936ad8..cb32bced3 100644 --- a/src/Squidex/Config/Orleans/OrleansServices.cs +++ b/src/Squidex/Config/Orleans/OrleansServices.cs @@ -6,8 +6,8 @@ // ========================================================================== using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Orleans; -using Squidex.Infrastructure; namespace Squidex.Config.Orleans { @@ -16,7 +16,7 @@ namespace Squidex.Config.Orleans public static void AddOrleansSilo(this IServiceCollection services) { services.AddSingletonAs() - .As() + .As() .AsSelf(); services.AddServicesForSelfHostedDashboard(null, options => @@ -24,7 +24,7 @@ namespace Squidex.Config.Orleans options.HideTrace = true; }); - services.AddSingletonAs(c => c.GetRequiredService().Client) + services.AddSingletonAs(c => c.GetRequiredService()) .As(); services.AddSingletonAs(c => c.GetRequiredService().Client) diff --git a/src/Squidex/Config/Orleans/SiloWrapper.cs b/src/Squidex/Config/Orleans/SiloWrapper.cs index 62139bb06..0cb7951a5 100644 --- a/src/Squidex/Config/Orleans/SiloWrapper.cs +++ b/src/Squidex/Config/Orleans/SiloWrapper.cs @@ -7,9 +7,11 @@ using System; using System.Net; +using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Orleans; using Orleans.Configuration; @@ -26,7 +28,7 @@ using Squidex.Infrastructure.Tasks; namespace Squidex.Config.Orleans { - public sealed class SiloWrapper : DisposableObjectBase, IInitializable, IDisposable + public sealed class SiloWrapper : IHostedService { private readonly Lazy silo; private readonly ISemanticLog log; @@ -61,15 +63,10 @@ namespace Squidex.Config.Orleans .UseDashboard(options => options.HostSelf = false) .EnableDirectClient() .AddIncomingGrainCallFilter() + .AddStartupTask() .AddStartupTask>() .AddStartupTask>() .AddStartupTask>() - .AddStartupTask((services, ct) => - { - services.RunInitialization(); - - return TaskHelper.Done; - }) .Configure(options => { options.Configure(); @@ -145,12 +142,12 @@ namespace Squidex.Config.Orleans }); } - public void Initialize() + public async Task StartAsync(CancellationToken cancellationToken) { var watch = ValueStopwatch.StartNew(); try { - silo.Value.StartAsync().Wait(); + await silo.Value.StartAsync(cancellationToken); } finally { @@ -162,14 +159,11 @@ namespace Squidex.Config.Orleans } } - protected override void DisposeObject(bool disposing) + public async Task StopAsync(CancellationToken cancellationToken) { - if (disposing) + if (!silo.IsValueCreated) { - if (silo.IsValueCreated) - { - Task.Run(() => silo.Value.StopAsync()).Wait(); - } + await silo.Value.StopAsync(cancellationToken); } } } diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index 815d183fd..119a69928 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -32,14 +32,14 @@ namespace Squidex { services.AddOrleansSilo(); services.AddAppServices(configuration); + + services.AddHostedService(); + services.AddHostedService(); } public void Configure(IApplicationBuilder app) { app.ApplicationServices.LogConfiguration(); - app.ApplicationServices.RunInitialization(); - app.ApplicationServices.RunMigrate(); - app.ApplicationServices.RunRunnables(); app.UseMyLocalCache(); app.UseMyCors(); diff --git a/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs index 4d9f8927b..409ce87d1 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs @@ -23,7 +23,7 @@ namespace Squidex.Infrastructure.Assets { sut = new Lazy(CreateStore); - ((IInitializable)Sut).Initialize(); + ((IInitializable)Sut).InitializeAsync().Wait(); } protected T Sut diff --git a/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreTests.cs index a1d221382..5af8355d8 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreTests.cs @@ -33,7 +33,7 @@ namespace Squidex.Infrastructure.Assets [Fact] public void Should_throw_when_creating_directory_failed() { - Assert.Throws(() => new FolderAssetStore(CreateInvalidPath(), A.Dummy()).Initialize()); + Assert.Throws(() => new FolderAssetStore(CreateInvalidPath(), A.Dummy()).InitializeAsync().Wait()); } [Fact] From f6bb68525e18afecf5cfc863f3defad0273bbfc2 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 2 Oct 2018 13:02:17 +0200 Subject: [PATCH 10/40] Added variants. --- src/Squidex.Infrastructure/Language.cs | 6 +- src/Squidex.Infrastructure/Languages.cs | 321 ++++++++++++++++++++++++ tools/GenerateLanguages/Program.cs | 89 +++++-- 3 files changed, 392 insertions(+), 24 deletions(-) diff --git a/src/Squidex.Infrastructure/Language.cs b/src/Squidex.Infrastructure/Language.cs index 5534be463..e18268e7b 100644 --- a/src/Squidex.Infrastructure/Language.cs +++ b/src/Squidex.Infrastructure/Language.cs @@ -20,11 +20,7 @@ namespace Squidex.Infrastructure private static Language AddLanguage(string iso2Code, string englishName) { - var language = new Language(iso2Code, englishName); - - AllLanguagesField[iso2Code] = language; - - return language; + return AllLanguagesField.GetOrAdd(iso2Code, code => new Language(code, englishName)); } public static Language GetLanguage(string iso2Code) diff --git a/src/Squidex.Infrastructure/Languages.cs b/src/Squidex.Infrastructure/Languages.cs index f788c86e2..403b79996 100644 --- a/src/Squidex.Infrastructure/Languages.cs +++ b/src/Squidex.Infrastructure/Languages.cs @@ -1,4 +1,5 @@ // ========================================================================== +// Languages.cs // Squidex Headless CMS // ========================================================================== // Copyright (c) Squidex UG (haftungsbeschränkt) @@ -190,5 +191,325 @@ namespace Squidex.Infrastructure public static readonly Language ZA = AddLanguage("za", "Zhuang"); public static readonly Language ZH = AddLanguage("zh", "Chinese"); public static readonly Language ZU = AddLanguage("zu", "Zulu"); + + public static readonly Language AfarDjibouti = AddLanguage("aa-DJ", "Afar (Djibouti)"); + public static readonly Language AfarEritrea = AddLanguage("aa-ER", "Afar (Eritrea)"); + public static readonly Language AfarEthiopia = AddLanguage("aa-ET", "Afar (Ethiopia)"); + public static readonly Language AfrikaansNamibia = AddLanguage("af-NA", "Afrikaans (Namibia)"); + public static readonly Language AfrikaansSouthAfrica = AddLanguage("af-ZA", "Afrikaans (South Africa)"); + public static readonly Language ArabicUnitedArabEmirates = AddLanguage("ar-AE", "Arabic (United Arab Emirates)"); + public static readonly Language ArabicBahrain = AddLanguage("ar-BH", "Arabic (Bahrain)"); + public static readonly Language ArabicDjibouti = AddLanguage("ar-DJ", "Arabic (Djibouti)"); + public static readonly Language ArabicAlgeria = AddLanguage("ar-DZ", "Arabic (Algeria)"); + public static readonly Language ArabicEgypt = AddLanguage("ar-EG", "Arabic (Egypt)"); + public static readonly Language ArabicEritrea = AddLanguage("ar-ER", "Arabic (Eritrea)"); + public static readonly Language ArabicIsrael = AddLanguage("ar-IL", "Arabic (Israel)"); + public static readonly Language ArabicIraq = AddLanguage("ar-IQ", "Arabic (Iraq)"); + public static readonly Language ArabicJordan = AddLanguage("ar-JO", "Arabic (Jordan)"); + public static readonly Language ArabicComoros = AddLanguage("ar-KM", "Arabic (Comoros)"); + public static readonly Language ArabicKuwait = AddLanguage("ar-KW", "Arabic (Kuwait)"); + public static readonly Language ArabicLebanon = AddLanguage("ar-LB", "Arabic (Lebanon)"); + public static readonly Language ArabicLibya = AddLanguage("ar-LY", "Arabic (Libya)"); + public static readonly Language ArabicMorocco = AddLanguage("ar-MA", "Arabic (Morocco)"); + public static readonly Language ArabicMauritania = AddLanguage("ar-MR", "Arabic (Mauritania)"); + public static readonly Language ArabicOman = AddLanguage("ar-OM", "Arabic (Oman)"); + public static readonly Language ArabicPalestinianAuthority = AddLanguage("ar-PS", "Arabic (Palestinian Authority)"); + public static readonly Language ArabicQatar = AddLanguage("ar-QA", "Arabic (Qatar)"); + public static readonly Language ArabicSaudiArabia = AddLanguage("ar-SA", "Arabic (Saudi Arabia)"); + public static readonly Language ArabicSudan = AddLanguage("ar-SD", "Arabic (Sudan)"); + public static readonly Language ArabicSomalia = AddLanguage("ar-SO", "Arabic (Somalia)"); + public static readonly Language ArabicSouthSudan = AddLanguage("ar-SS", "Arabic (South Sudan)"); + public static readonly Language ArabicSyria = AddLanguage("ar-SY", "Arabic (Syria)"); + public static readonly Language ArabicChad = AddLanguage("ar-TD", "Arabic (Chad)"); + public static readonly Language ArabicTunisia = AddLanguage("ar-TN", "Arabic (Tunisia)"); + public static readonly Language ArabicYemen = AddLanguage("ar-YE", "Arabic (Yemen)"); + public static readonly Language BanglaBangladesh = AddLanguage("bn-BD", "Bangla (Bangladesh)"); + public static readonly Language BanglaIndia = AddLanguage("bn-IN", "Bangla (India)"); + public static readonly Language TibetanChina = AddLanguage("bo-CN", "Tibetan (China)"); + public static readonly Language TibetanIndia = AddLanguage("bo-IN", "Tibetan (India)"); + public static readonly Language CatalanAndorra = AddLanguage("ca-AD", "Catalan (Andorra)"); + public static readonly Language CatalanCatalan = AddLanguage("ca-ES", "Catalan (Catalan)"); + public static readonly Language CatalanFrance = AddLanguage("ca-FR", "Catalan (France)"); + public static readonly Language CatalanItaly = AddLanguage("ca-IT", "Catalan (Italy)"); + public static readonly Language DanishDenmark = AddLanguage("da-DK", "Danish (Denmark)"); + public static readonly Language DanishGreenland = AddLanguage("da-GL", "Danish (Greenland)"); + public static readonly Language GermanAustria = AddLanguage("de-AT", "German (Austria)"); + public static readonly Language GermanBelgium = AddLanguage("de-BE", "German (Belgium)"); + public static readonly Language GermanSwitzerland = AddLanguage("de-CH", "German (Switzerland)"); + public static readonly Language GermanGermany = AddLanguage("de-DE", "German (Germany)"); + public static readonly Language GermanItaly = AddLanguage("de-IT", "German (Italy)"); + public static readonly Language GermanLiechtenstein = AddLanguage("de-LI", "German (Liechtenstein)"); + public static readonly Language GermanLuxembourg = AddLanguage("de-LU", "German (Luxembourg)"); + public static readonly Language EweGhana = AddLanguage("ee-GH", "Ewe (Ghana)"); + public static readonly Language EweTogo = AddLanguage("ee-TG", "Ewe (Togo)"); + public static readonly Language GreekCyprus = AddLanguage("el-CY", "Greek (Cyprus)"); + public static readonly Language GreekGreece = AddLanguage("el-GR", "Greek (Greece)"); + public static readonly Language EnglishAntiguaandBarbuda = AddLanguage("en-AG", "English (Antigua and Barbuda)"); + public static readonly Language EnglishAnguilla = AddLanguage("en-AI", "English (Anguilla)"); + public static readonly Language EnglishAmericanSamoa = AddLanguage("en-AS", "English (American Samoa)"); + public static readonly Language EnglishAustria = AddLanguage("en-AT", "English (Austria)"); + public static readonly Language EnglishAustralia = AddLanguage("en-AU", "English (Australia)"); + public static readonly Language EnglishBarbados = AddLanguage("en-BB", "English (Barbados)"); + public static readonly Language EnglishBelgium = AddLanguage("en-BE", "English (Belgium)"); + public static readonly Language EnglishBurundi = AddLanguage("en-BI", "English (Burundi)"); + public static readonly Language EnglishBermuda = AddLanguage("en-BM", "English (Bermuda)"); + public static readonly Language EnglishBahamas = AddLanguage("en-BS", "English (Bahamas)"); + public static readonly Language EnglishBotswana = AddLanguage("en-BW", "English (Botswana)"); + public static readonly Language EnglishBelize = AddLanguage("en-BZ", "English (Belize)"); + public static readonly Language EnglishCanada = AddLanguage("en-CA", "English (Canada)"); + public static readonly Language EnglishCocosKeelingIslands = AddLanguage("en-CC", "English (Cocos (Keeling) Islands)"); + public static readonly Language EnglishSwitzerland = AddLanguage("en-CH", "English (Switzerland)"); + public static readonly Language EnglishCookIslands = AddLanguage("en-CK", "English (Cook Islands)"); + public static readonly Language EnglishCameroon = AddLanguage("en-CM", "English (Cameroon)"); + public static readonly Language EnglishChristmasIsland = AddLanguage("en-CX", "English (Christmas Island)"); + public static readonly Language EnglishCyprus = AddLanguage("en-CY", "English (Cyprus)"); + public static readonly Language EnglishGermany = AddLanguage("en-DE", "English (Germany)"); + public static readonly Language EnglishDenmark = AddLanguage("en-DK", "English (Denmark)"); + public static readonly Language EnglishDominica = AddLanguage("en-DM", "English (Dominica)"); + public static readonly Language EnglishEritrea = AddLanguage("en-ER", "English (Eritrea)"); + public static readonly Language EnglishFinland = AddLanguage("en-FI", "English (Finland)"); + public static readonly Language EnglishFiji = AddLanguage("en-FJ", "English (Fiji)"); + public static readonly Language EnglishFalklandIslands = AddLanguage("en-FK", "English (Falkland Islands)"); + public static readonly Language EnglishMicronesia = AddLanguage("en-FM", "English (Micronesia)"); + public static readonly Language EnglishUnitedKingdom = AddLanguage("en-GB", "English (United Kingdom)"); + public static readonly Language EnglishGrenada = AddLanguage("en-GD", "English (Grenada)"); + public static readonly Language EnglishGuernsey = AddLanguage("en-GG", "English (Guernsey)"); + public static readonly Language EnglishGhana = AddLanguage("en-GH", "English (Ghana)"); + public static readonly Language EnglishGibraltar = AddLanguage("en-GI", "English (Gibraltar)"); + public static readonly Language EnglishGambia = AddLanguage("en-GM", "English (Gambia)"); + public static readonly Language EnglishGuam = AddLanguage("en-GU", "English (Guam)"); + public static readonly Language EnglishGuyana = AddLanguage("en-GY", "English (Guyana)"); + public static readonly Language EnglishHongKongSAR = AddLanguage("en-HK", "English (Hong Kong SAR)"); + public static readonly Language EnglishIndonesia = AddLanguage("en-ID", "English (Indonesia)"); + public static readonly Language EnglishIreland = AddLanguage("en-IE", "English (Ireland)"); + public static readonly Language EnglishIsrael = AddLanguage("en-IL", "English (Israel)"); + public static readonly Language EnglishIsleofMan = AddLanguage("en-IM", "English (Isle of Man)"); + public static readonly Language EnglishIndia = AddLanguage("en-IN", "English (India)"); + public static readonly Language EnglishBritishIndianOceanTerritory = AddLanguage("en-IO", "English (British Indian Ocean Territory)"); + public static readonly Language EnglishJersey = AddLanguage("en-JE", "English (Jersey)"); + public static readonly Language EnglishJamaica = AddLanguage("en-JM", "English (Jamaica)"); + public static readonly Language EnglishKenya = AddLanguage("en-KE", "English (Kenya)"); + public static readonly Language EnglishKiribati = AddLanguage("en-KI", "English (Kiribati)"); + public static readonly Language EnglishSaintKittsandNevis = AddLanguage("en-KN", "English (Saint Kitts and Nevis)"); + public static readonly Language EnglishCaymanIslands = AddLanguage("en-KY", "English (Cayman Islands)"); + public static readonly Language EnglishSaintLucia = AddLanguage("en-LC", "English (Saint Lucia)"); + public static readonly Language EnglishLiberia = AddLanguage("en-LR", "English (Liberia)"); + public static readonly Language EnglishLesotho = AddLanguage("en-LS", "English (Lesotho)"); + public static readonly Language EnglishMadagascar = AddLanguage("en-MG", "English (Madagascar)"); + public static readonly Language EnglishMarshallIslands = AddLanguage("en-MH", "English (Marshall Islands)"); + public static readonly Language EnglishMacaoSAR = AddLanguage("en-MO", "English (Macao SAR)"); + public static readonly Language EnglishNorthernMarianaIslands = AddLanguage("en-MP", "English (Northern Mariana Islands)"); + public static readonly Language EnglishMontserrat = AddLanguage("en-MS", "English (Montserrat)"); + public static readonly Language EnglishMalta = AddLanguage("en-MT", "English (Malta)"); + public static readonly Language EnglishMauritius = AddLanguage("en-MU", "English (Mauritius)"); + public static readonly Language EnglishMalawi = AddLanguage("en-MW", "English (Malawi)"); + public static readonly Language EnglishMalaysia = AddLanguage("en-MY", "English (Malaysia)"); + public static readonly Language EnglishNamibia = AddLanguage("en-NA", "English (Namibia)"); + public static readonly Language EnglishNorfolkIsland = AddLanguage("en-NF", "English (Norfolk Island)"); + public static readonly Language EnglishNigeria = AddLanguage("en-NG", "English (Nigeria)"); + public static readonly Language EnglishNetherlands = AddLanguage("en-NL", "English (Netherlands)"); + public static readonly Language EnglishNauru = AddLanguage("en-NR", "English (Nauru)"); + public static readonly Language EnglishNiue = AddLanguage("en-NU", "English (Niue)"); + public static readonly Language EnglishNewZealand = AddLanguage("en-NZ", "English (New Zealand)"); + public static readonly Language EnglishPapuaNewGuinea = AddLanguage("en-PG", "English (Papua New Guinea)"); + public static readonly Language EnglishPhilippines = AddLanguage("en-PH", "English (Philippines)"); + public static readonly Language EnglishPakistan = AddLanguage("en-PK", "English (Pakistan)"); + public static readonly Language EnglishPitcairnIslands = AddLanguage("en-PN", "English (Pitcairn Islands)"); + public static readonly Language EnglishPuertoRico = AddLanguage("en-PR", "English (Puerto Rico)"); + public static readonly Language EnglishPalau = AddLanguage("en-PW", "English (Palau)"); + public static readonly Language EnglishRwanda = AddLanguage("en-RW", "English (Rwanda)"); + public static readonly Language EnglishSolomonIslands = AddLanguage("en-SB", "English (Solomon Islands)"); + public static readonly Language EnglishSeychelles = AddLanguage("en-SC", "English (Seychelles)"); + public static readonly Language EnglishSudan = AddLanguage("en-SD", "English (Sudan)"); + public static readonly Language EnglishSweden = AddLanguage("en-SE", "English (Sweden)"); + public static readonly Language EnglishSingapore = AddLanguage("en-SG", "English (Singapore)"); + public static readonly Language EnglishStHelenaAscensionTristandaCunha = AddLanguage("en-SH", "English (St Helena, Ascension, Tristan da Cunha)"); + public static readonly Language EnglishSlovenia = AddLanguage("en-SI", "English (Slovenia)"); + public static readonly Language EnglishSierraLeone = AddLanguage("en-SL", "English (Sierra Leone)"); + public static readonly Language EnglishSouthSudan = AddLanguage("en-SS", "English (South Sudan)"); + public static readonly Language EnglishSintMaarten = AddLanguage("en-SX", "English (Sint Maarten)"); + public static readonly Language EnglishSwaziland = AddLanguage("en-SZ", "English (Swaziland)"); + public static readonly Language EnglishTurksandCaicosIslands = AddLanguage("en-TC", "English (Turks and Caicos Islands)"); + public static readonly Language EnglishTokelau = AddLanguage("en-TK", "English (Tokelau)"); + public static readonly Language EnglishTonga = AddLanguage("en-TO", "English (Tonga)"); + public static readonly Language EnglishTrinidadandTobago = AddLanguage("en-TT", "English (Trinidad and Tobago)"); + public static readonly Language EnglishTuvalu = AddLanguage("en-TV", "English (Tuvalu)"); + public static readonly Language EnglishTanzania = AddLanguage("en-TZ", "English (Tanzania)"); + public static readonly Language EnglishUganda = AddLanguage("en-UG", "English (Uganda)"); + public static readonly Language EnglishUSOutlyingIslands = AddLanguage("en-UM", "English (U.S. Outlying Islands)"); + public static readonly Language EnglishUnitedStates = AddLanguage("en-US", "English (United States)"); + public static readonly Language EnglishSaintVincentandtheGrenadines = AddLanguage("en-VC", "English (Saint Vincent and the Grenadines)"); + public static readonly Language EnglishBritishVirginIslands = AddLanguage("en-VG", "English (British Virgin Islands)"); + public static readonly Language EnglishUSVirginIslands = AddLanguage("en-VI", "English (U.S. Virgin Islands)"); + public static readonly Language EnglishVanuatu = AddLanguage("en-VU", "English (Vanuatu)"); + public static readonly Language EnglishSamoa = AddLanguage("en-WS", "English (Samoa)"); + public static readonly Language EnglishSouthAfrica = AddLanguage("en-ZA", "English (South Africa)"); + public static readonly Language EnglishZambia = AddLanguage("en-ZM", "English (Zambia)"); + public static readonly Language EnglishZimbabwe = AddLanguage("en-ZW", "English (Zimbabwe)"); + public static readonly Language SpanishArgentina = AddLanguage("es-AR", "Spanish (Argentina)"); + public static readonly Language SpanishBolivia = AddLanguage("es-BO", "Spanish (Bolivia)"); + public static readonly Language SpanishBrazil = AddLanguage("es-BR", "Spanish (Brazil)"); + public static readonly Language SpanishBelize = AddLanguage("es-BZ", "Spanish (Belize)"); + public static readonly Language SpanishChile = AddLanguage("es-CL", "Spanish (Chile)"); + public static readonly Language SpanishColombia = AddLanguage("es-CO", "Spanish (Colombia)"); + public static readonly Language SpanishCostaRica = AddLanguage("es-CR", "Spanish (Costa Rica)"); + public static readonly Language SpanishCuba = AddLanguage("es-CU", "Spanish (Cuba)"); + public static readonly Language SpanishDominicanRepublic = AddLanguage("es-DO", "Spanish (Dominican Republic)"); + public static readonly Language SpanishEcuador = AddLanguage("es-EC", "Spanish (Ecuador)"); + public static readonly Language SpanishSpainInternationalSort = AddLanguage("es-ES", "Spanish (Spain, International Sort)"); + public static readonly Language SpanishEquatorialGuinea = AddLanguage("es-GQ", "Spanish (Equatorial Guinea)"); + public static readonly Language SpanishGuatemala = AddLanguage("es-GT", "Spanish (Guatemala)"); + public static readonly Language SpanishHonduras = AddLanguage("es-HN", "Spanish (Honduras)"); + public static readonly Language SpanishMexico = AddLanguage("es-MX", "Spanish (Mexico)"); + public static readonly Language SpanishNicaragua = AddLanguage("es-NI", "Spanish (Nicaragua)"); + public static readonly Language SpanishPanama = AddLanguage("es-PA", "Spanish (Panama)"); + public static readonly Language SpanishPeru = AddLanguage("es-PE", "Spanish (Peru)"); + public static readonly Language SpanishPhilippines = AddLanguage("es-PH", "Spanish (Philippines)"); + public static readonly Language SpanishPuertoRico = AddLanguage("es-PR", "Spanish (Puerto Rico)"); + public static readonly Language SpanishParaguay = AddLanguage("es-PY", "Spanish (Paraguay)"); + public static readonly Language SpanishElSalvador = AddLanguage("es-SV", "Spanish (El Salvador)"); + public static readonly Language SpanishUnitedStates = AddLanguage("es-US", "Spanish (United States)"); + public static readonly Language SpanishUruguay = AddLanguage("es-UY", "Spanish (Uruguay)"); + public static readonly Language SpanishVenezuela = AddLanguage("es-VE", "Spanish (Venezuela)"); + public static readonly Language FulahCameroon = AddLanguage("ff-CM", "Fulah (Cameroon)"); + public static readonly Language FulahGuinea = AddLanguage("ff-GN", "Fulah (Guinea)"); + public static readonly Language FulahMauritania = AddLanguage("ff-MR", "Fulah (Mauritania)"); + public static readonly Language FulahNigeria = AddLanguage("ff-NG", "Fulah (Nigeria)"); + public static readonly Language FaroeseDenmark = AddLanguage("fo-DK", "Faroese (Denmark)"); + public static readonly Language FaroeseFaroeIslands = AddLanguage("fo-FO", "Faroese (Faroe Islands)"); + public static readonly Language FrenchBelgium = AddLanguage("fr-BE", "French (Belgium)"); + public static readonly Language FrenchBurkinaFaso = AddLanguage("fr-BF", "French (Burkina Faso)"); + public static readonly Language FrenchBurundi = AddLanguage("fr-BI", "French (Burundi)"); + public static readonly Language FrenchBenin = AddLanguage("fr-BJ", "French (Benin)"); + public static readonly Language FrenchSaintBarthélemy = AddLanguage("fr-BL", "French (Saint Barthélemy)"); + public static readonly Language FrenchCanada = AddLanguage("fr-CA", "French (Canada)"); + public static readonly Language FrenchCongoDRC = AddLanguage("fr-CD", "French Congo (DRC)"); + public static readonly Language FrenchCentralAfricanRepublic = AddLanguage("fr-CF", "French (Central African Republic)"); + public static readonly Language FrenchCongo = AddLanguage("fr-CG", "French (Congo)"); + public static readonly Language FrenchSwitzerland = AddLanguage("fr-CH", "French (Switzerland)"); + public static readonly Language FrenchCôtedIvoire = AddLanguage("fr-CI", "French (Côte d’Ivoire)"); + public static readonly Language FrenchCameroon = AddLanguage("fr-CM", "French (Cameroon)"); + public static readonly Language FrenchDjibouti = AddLanguage("fr-DJ", "French (Djibouti)"); + public static readonly Language FrenchAlgeria = AddLanguage("fr-DZ", "French (Algeria)"); + public static readonly Language FrenchFrance = AddLanguage("fr-FR", "French (France)"); + public static readonly Language FrenchGabon = AddLanguage("fr-GA", "French (Gabon)"); + public static readonly Language FrenchFrenchGuiana = AddLanguage("fr-GF", "French (French Guiana)"); + public static readonly Language FrenchGuinea = AddLanguage("fr-GN", "French (Guinea)"); + public static readonly Language FrenchGuadeloupe = AddLanguage("fr-GP", "French (Guadeloupe)"); + public static readonly Language FrenchEquatorialGuinea = AddLanguage("fr-GQ", "French (Equatorial Guinea)"); + public static readonly Language FrenchHaiti = AddLanguage("fr-HT", "French (Haiti)"); + public static readonly Language FrenchComoros = AddLanguage("fr-KM", "French (Comoros)"); + public static readonly Language FrenchLuxembourg = AddLanguage("fr-LU", "French (Luxembourg)"); + public static readonly Language FrenchMorocco = AddLanguage("fr-MA", "French (Morocco)"); + public static readonly Language FrenchMonaco = AddLanguage("fr-MC", "French (Monaco)"); + public static readonly Language FrenchSaintMartin = AddLanguage("fr-MF", "French (Saint Martin)"); + public static readonly Language FrenchMadagascar = AddLanguage("fr-MG", "French (Madagascar)"); + public static readonly Language FrenchMali = AddLanguage("fr-ML", "French (Mali)"); + public static readonly Language FrenchMartinique = AddLanguage("fr-MQ", "French (Martinique)"); + public static readonly Language FrenchMauritania = AddLanguage("fr-MR", "French (Mauritania)"); + public static readonly Language FrenchMauritius = AddLanguage("fr-MU", "French (Mauritius)"); + public static readonly Language FrenchNewCaledonia = AddLanguage("fr-NC", "French (New Caledonia)"); + public static readonly Language FrenchNiger = AddLanguage("fr-NE", "French (Niger)"); + public static readonly Language FrenchFrenchPolynesia = AddLanguage("fr-PF", "French (French Polynesia)"); + public static readonly Language FrenchSaintPierreandMiquelon = AddLanguage("fr-PM", "French (Saint Pierre and Miquelon)"); + public static readonly Language FrenchRéunion = AddLanguage("fr-RE", "French (Réunion)"); + public static readonly Language FrenchRwanda = AddLanguage("fr-RW", "French (Rwanda)"); + public static readonly Language FrenchSeychelles = AddLanguage("fr-SC", "French (Seychelles)"); + public static readonly Language FrenchSenegal = AddLanguage("fr-SN", "French (Senegal)"); + public static readonly Language FrenchSyria = AddLanguage("fr-SY", "French (Syria)"); + public static readonly Language FrenchChad = AddLanguage("fr-TD", "French (Chad)"); + public static readonly Language FrenchTogo = AddLanguage("fr-TG", "French (Togo)"); + public static readonly Language FrenchTunisia = AddLanguage("fr-TN", "French (Tunisia)"); + public static readonly Language FrenchVanuatu = AddLanguage("fr-VU", "French (Vanuatu)"); + public static readonly Language FrenchWallisandFutuna = AddLanguage("fr-WF", "French (Wallis and Futuna)"); + public static readonly Language FrenchMayotte = AddLanguage("fr-YT", "French (Mayotte)"); + public static readonly Language CroatianBosniaandHerzegovina = AddLanguage("hr-BA", "Croatian (Bosnia and Herzegovina)"); + public static readonly Language CroatianCroatia = AddLanguage("hr-HR", "Croatian (Croatia)"); + public static readonly Language ItalianSwitzerland = AddLanguage("it-CH", "Italian (Switzerland)"); + public static readonly Language ItalianItaly = AddLanguage("it-IT", "Italian (Italy)"); + public static readonly Language ItalianSanMarino = AddLanguage("it-SM", "Italian (San Marino)"); + public static readonly Language ItalianVaticanCity = AddLanguage("it-VA", "Italian (Vatican City)"); + public static readonly Language KoreanNorthKorea = AddLanguage("ko-KP", "Korean (North Korea)"); + public static readonly Language KoreanKorea = AddLanguage("ko-KR", "Korean (Korea)"); + public static readonly Language LingalaAngola = AddLanguage("ln-AO", "Lingala (Angola)"); + public static readonly Language LingalaCongoDRC = AddLanguage("ln-CD", "Lingala (Congo DRC)"); + public static readonly Language LingalaCentralAfricanRepublic = AddLanguage("ln-CF", "Lingala (Central African Republic)"); + public static readonly Language LingalaCongo = AddLanguage("ln-CG", "Lingala (Congo)"); + public static readonly Language MalayBrunei = AddLanguage("ms-BN", "Malay (Brunei)"); + public static readonly Language MalayMalaysia = AddLanguage("ms-MY", "Malay (Malaysia)"); + public static readonly Language MalaySingapore = AddLanguage("ms-SG", "Malay (Singapore)"); + public static readonly Language NorwegianBokmålNorway = AddLanguage("nb-NO", "Norwegian Bokmål (Norway)"); + public static readonly Language NorwegianBokmålSvalbardandJanMayen = AddLanguage("nb-SJ", "Norwegian Bokmål (Svalbard and Jan Mayen)"); + public static readonly Language NepaliIndia = AddLanguage("ne-IN", "Nepali (India)"); + public static readonly Language NepaliNepal = AddLanguage("ne-NP", "Nepali (Nepal)"); + public static readonly Language DutchAruba = AddLanguage("nl-AW", "Dutch (Aruba)"); + public static readonly Language DutchBelgium = AddLanguage("nl-BE", "Dutch (Belgium)"); + public static readonly Language DutchBonaireSintEustatiusandSaba = AddLanguage("nl-BQ", "Dutch (Bonaire, Sint Eustatius and Saba)"); + public static readonly Language DutchCuraçao = AddLanguage("nl-CW", "Dutch (Curaçao)"); + public static readonly Language DutchNetherlands = AddLanguage("nl-NL", "Dutch (Netherlands)"); + public static readonly Language DutchSuriname = AddLanguage("nl-SR", "Dutch (Suriname)"); + public static readonly Language DutchSintMaarten = AddLanguage("nl-SX", "Dutch (Sint Maarten)"); + public static readonly Language OromoEthiopia = AddLanguage("om-ET", "Oromo (Ethiopia)"); + public static readonly Language OromoKenya = AddLanguage("om-KE", "Oromo (Kenya)"); + public static readonly Language PortugueseAngola = AddLanguage("pt-AO", "Portuguese (Angola)"); + public static readonly Language PortugueseBrazil = AddLanguage("pt-BR", "Portuguese (Brazil)"); + public static readonly Language PortugueseSwitzerland = AddLanguage("pt-CH", "Portuguese (Switzerland)"); + public static readonly Language PortugueseCaboVerde = AddLanguage("pt-CV", "Portuguese (Cabo Verde)"); + public static readonly Language PortugueseEquatorialGuinea = AddLanguage("pt-GQ", "Portuguese (Equatorial Guinea)"); + public static readonly Language PortugueseGuineaBissau = AddLanguage("pt-GW", "Portuguese (Guinea-Bissau)"); + public static readonly Language PortugueseLuxembourg = AddLanguage("pt-LU", "Portuguese (Luxembourg)"); + public static readonly Language PortugueseMacaoSAR = AddLanguage("pt-MO", "Portuguese (Macao SAR)"); + public static readonly Language PortugueseMozambique = AddLanguage("pt-MZ", "Portuguese (Mozambique)"); + public static readonly Language PortuguesePortugal = AddLanguage("pt-PT", "Portuguese (Portugal)"); + public static readonly Language PortugueseSãoToméandPríncipe = AddLanguage("pt-ST", "Portuguese (São Tomé and Príncipe)"); + public static readonly Language PortugueseTimorLeste = AddLanguage("pt-TL", "Portuguese (Timor-Leste)"); + public static readonly Language RomanianMoldova = AddLanguage("ro-MD", "Romanian (Moldova)"); + public static readonly Language RomanianRomania = AddLanguage("ro-RO", "Romanian (Romania)"); + public static readonly Language RussianBelarus = AddLanguage("ru-BY", "Russian (Belarus)"); + public static readonly Language RussianKyrgyzstan = AddLanguage("ru-KG", "Russian (Kyrgyzstan)"); + public static readonly Language RussianKazakhstan = AddLanguage("ru-KZ", "Russian (Kazakhstan)"); + public static readonly Language RussianMoldova = AddLanguage("ru-MD", "Russian (Moldova)"); + public static readonly Language RussianRussia = AddLanguage("ru-RU", "Russian (Russia)"); + public static readonly Language RussianUkraine = AddLanguage("ru-UA", "Russian (Ukraine)"); + public static readonly Language SamiNorthernFinland = AddLanguage("se-FI", "Sami, Northern (Finland)"); + public static readonly Language SamiNorthernNorway = AddLanguage("se-NO", "Sami, Northern (Norway)"); + public static readonly Language SamiNorthernSweden = AddLanguage("se-SE", "Sami, Northern (Sweden)"); + public static readonly Language SomaliDjibouti = AddLanguage("so-DJ", "Somali (Djibouti)"); + public static readonly Language SomaliEthiopia = AddLanguage("so-ET", "Somali (Ethiopia)"); + public static readonly Language SomaliKenya = AddLanguage("so-KE", "Somali (Kenya)"); + public static readonly Language SomaliSomalia = AddLanguage("so-SO", "Somali (Somalia)"); + public static readonly Language AlbanianAlbania = AddLanguage("sq-AL", "Albanian (Albania)"); + public static readonly Language AlbanianMacedoniaFYRO = AddLanguage("sq-MK", "Albanian (Macedonia, FYRO)"); + public static readonly Language AlbanianKosovo = AddLanguage("sq-XK", "Albanian (Kosovo)"); + public static readonly Language siSwatiSwaziland = AddLanguage("ss-SZ", "siSwati (Swaziland)"); + public static readonly Language siSwatiSouthAfrica = AddLanguage("ss-ZA", "siSwati (South Africa)"); + public static readonly Language SesothoLesotho = AddLanguage("st-LS", "Sesotho (Lesotho)"); + public static readonly Language SesothoSouthAfrica = AddLanguage("st-ZA", "Sesotho (South Africa)"); + public static readonly Language SwedishÅlandIslands = AddLanguage("sv-AX", "Swedish (Åland Islands)"); + public static readonly Language SwedishFinland = AddLanguage("sv-FI", "Swedish (Finland)"); + public static readonly Language SwedishSweden = AddLanguage("sv-SE", "Swedish (Sweden)"); + public static readonly Language KiswahiliCongoDRC = AddLanguage("sw-CD", "Kiswahili (Congo DRC)"); + public static readonly Language KiswahiliKenya = AddLanguage("sw-KE", "Kiswahili (Kenya)"); + public static readonly Language KiswahiliTanzania = AddLanguage("sw-TZ", "Kiswahili (Tanzania)"); + public static readonly Language KiswahiliUganda = AddLanguage("sw-UG", "Kiswahili (Uganda)"); + public static readonly Language TamilIndia = AddLanguage("ta-IN", "Tamil (India)"); + public static readonly Language TamilSriLanka = AddLanguage("ta-LK", "Tamil (Sri Lanka)"); + public static readonly Language TamilMalaysia = AddLanguage("ta-MY", "Tamil (Malaysia)"); + public static readonly Language TamilSingapore = AddLanguage("ta-SG", "Tamil (Singapore)"); + public static readonly Language TigrinyaEritrea = AddLanguage("ti-ER", "Tigrinya (Eritrea)"); + public static readonly Language TigrinyaEthiopia = AddLanguage("ti-ET", "Tigrinya (Ethiopia)"); + public static readonly Language SetswanaBotswana = AddLanguage("tn-BW", "Setswana (Botswana)"); + public static readonly Language SetswanaSouthAfrica = AddLanguage("tn-ZA", "Setswana (South Africa)"); + public static readonly Language TurkishCyprus = AddLanguage("tr-CY", "Turkish (Cyprus)"); + public static readonly Language TurkishTurkey = AddLanguage("tr-TR", "Turkish (Turkey)"); + public static readonly Language UrduIndia = AddLanguage("ur-IN", "Urdu (India)"); + public static readonly Language UrduPakistan = AddLanguage("ur-PK", "Urdu (Pakistan)"); + public static readonly Language YorubaBenin = AddLanguage("yo-BJ", "Yoruba (Benin)"); + public static readonly Language YorubaNigeria = AddLanguage("yo-NG", "Yoruba (Nigeria)"); + public static readonly Language ChineseSimplifiedChina = AddLanguage("zh-CN", "Chinese (Simplified, China)"); + public static readonly Language ChineseTraditionalHongKongSAR = AddLanguage("zh-HK", "Chinese (Traditional, Hong Kong SAR)"); + public static readonly Language ChineseTraditionalMacaoSAR = AddLanguage("zh-MO", "Chinese (Traditional, Macao SAR)"); + public static readonly Language ChineseSimplifiedSingapore = AddLanguage("zh-SG", "Chinese (Simplified, Singapore)"); + public static readonly Language ChineseTraditionalTaiwan = AddLanguage("zh-TW", "Chinese (Traditional, Taiwan)"); } } diff --git a/tools/GenerateLanguages/Program.cs b/tools/GenerateLanguages/Program.cs index 1b81b5a00..6911b350d 100644 --- a/tools/GenerateLanguages/Program.cs +++ b/tools/GenerateLanguages/Program.cs @@ -7,20 +7,20 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.IO; +using System.Linq; using System.Text; namespace GenerateLanguages { - public class Program + public static class Program { public static void Main() { - var languageCodesFile = new FileInfo("../../src/Squidex.Infrastructure/language-codes.csv"); + var languageCodesFile = new FileInfo("../../../../../src/Squidex.Infrastructure/language-codes.csv"); var languageFile = Path.Combine(languageCodesFile.DirectoryName, "Languages.cs"); - var resourceStream = new FileStream(languageCodesFile.FullName, FileMode.Open); - var writer = new StringWriter(); writer.WriteLine("// =========================================================================="); writer.WriteLine("// Languages.cs"); @@ -39,25 +39,22 @@ namespace GenerateLanguages writer.WriteLine(" partial class Language"); writer.WriteLine(" {"); - var uniqueCodes = new HashSet(new [] { "iv" }); - - using (var reader = new StreamReader(resourceStream, Encoding.UTF8)) + var languages = GetLanguages(languageCodesFile).ToList(); + + foreach (var language in languages) { - reader.ReadLine(); + var fieldName = language.Iso2Code.ToUpperInvariant(); - while (!reader.EndOfStream) - { - var languageLine = reader.ReadLine(); - var languageIso2Code = languageLine.Substring(1, 2); - var languageEnglishName = languageLine.Substring(6, languageLine.Length - 7); + writer.WriteLine($" public static readonly Language {fieldName} = AddLanguage(\"{language.Iso2Code}\", \"{language.EnglishName}\");"); + } - if (!uniqueCodes.Add(languageIso2Code)) - { - Console.WriteLine("Languages contains duplicate {0}", languageIso2Code); - } + writer.WriteLine(); - writer.WriteLine(" public static readonly Language {0} = AddLanguage(\"{1}\", \"{2}\");", languageIso2Code.ToUpperInvariant(), languageIso2Code, languageEnglishName); - } + foreach (var culture in GetCultures(languages)) + { + var fieldName = culture.EnglishName.ToFieldName(); + + writer.WriteLine($" public static readonly Language {fieldName} = AddLanguage(\"{culture.Code}\", \"{culture.EnglishName}\");"); } writer.WriteLine(" }"); @@ -65,5 +62,59 @@ namespace GenerateLanguages File.WriteAllText(languageFile, writer.ToString()); } + + private static string ToFieldName(this string name) + { + var sb = new StringBuilder(); + + foreach (var c in name) + { + if (char.IsLetterOrDigit(c)) + { + sb.Append(c); + } + } + + return sb.ToString(); + } + + private static IEnumerable<(string Code, string EnglishName)> GetCultures(List<(string Iso2Code, string EnglishName)> languages) + { + return CultureInfo.GetCultures(CultureTypes.SpecificCultures) + .Where(x => x.ToString().Length == 5) + .Where(x => languages.Any(l => l.Iso2Code.Equals(x.TwoLetterISOLanguageName, StringComparison.OrdinalIgnoreCase))) + .GroupBy(x => x.TwoLetterISOLanguageName) + .Where(x => x.Count() > 1) + .SelectMany(x => x) + .Select(x => (x.ToString(), x.EnglishName)); + } + + private static IEnumerable<(string Iso2Code, string EnglishName)> GetLanguages(FileInfo file) + { + var uniqueCodes = new HashSet(new[] { "iv" }); + + var resourceStream = file.OpenRead(); + + using (var reader = new StreamReader(resourceStream, Encoding.UTF8)) + { + reader.ReadLine(); + + while (!reader.EndOfStream) + { + var line = reader.ReadLine(); + + var iso2Code = line.Substring(1, 2); + + if (uniqueCodes.Add(iso2Code)) + { + yield return (iso2Code, line.Substring(6, line.Length - 7)); + } + else + { + Console.WriteLine("Languages contains duplicate {0}", iso2Code); + } + } + } + } } } From 54dc994e8dd49838b8986d8c7814737572a172e3 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 3 Oct 2018 15:00:03 +0200 Subject: [PATCH 11/40] Various UI improvements --- .../guards/user-must-exist.guard.ts | 2 +- .../event-consumers-page.component.ts | 3 +- .../pages/restore/restore-page.component.ts | 8 +- src/Squidex/app/features/content/module.ts | 4 +- .../pages/content/content-page.component.ts | 12 +- .../pages/contents/contents-page.component.ts | 35 +++--- .../pages/schemas/schemas-page.component.html | 1 + .../content-changed-trigger.component.ts | 2 +- .../pages/schema/schema-page.component.ts | 6 +- .../forms/date-time-editor.component.ts | 2 +- .../angular/forms/stars.component.ts | 2 +- .../angular/image-source.directive.ts | 2 +- .../angular/modals/modal-view.directive.ts | 2 +- .../framework/angular/routers/router-utils.ts | 22 +++- .../geolocation-editor.component.ts | 5 +- .../components/schema-category.component.html | 2 +- .../components/schema-category.component.ts | 7 ++ .../guards/content-must-exist.guard.spec.ts | 4 +- .../shared/guards/content-must-exist.guard.ts | 2 +- .../must-be-authenticated.guard.spec.ts | 4 +- .../must-be-not-authenticated.guard.spec.ts | 4 +- .../schema-must-exist-published.guard.spec.ts | 41 +------ .../schema-must-exist-published.guard.ts | 10 +- .../guards/schema-must-exist.guard.spec.ts | 2 - .../shared/guards/schema-must-exist.guard.ts | 2 +- ...schema-must-not-be-singleton.guard.spec.ts | 105 ++++++++++++++++++ .../schema-must-not-be-singleton.guard.ts | 42 +++++++ src/Squidex/app/shared/internal.ts | 1 + src/Squidex/app/shared/module.ts | 2 + .../app/shared/state/contents.forms.ts | 2 +- .../app/shared/state/contents.state.ts | 2 +- src/Squidex/app/shared/state/queries.spec.ts | 4 + tools/GenerateLanguages/GenerateLanguages.sln | 25 +++++ 33 files changed, 274 insertions(+), 95 deletions(-) create mode 100644 src/Squidex/app/shared/guards/schema-must-not-be-singleton.guard.spec.ts create mode 100644 src/Squidex/app/shared/guards/schema-must-not-be-singleton.guard.ts create mode 100644 tools/GenerateLanguages/GenerateLanguages.sln diff --git a/src/Squidex/app/features/administration/guards/user-must-exist.guard.ts b/src/Squidex/app/features/administration/guards/user-must-exist.guard.ts index db67514f9..63fc2bba1 100644 --- a/src/Squidex/app/features/administration/guards/user-must-exist.guard.ts +++ b/src/Squidex/app/features/administration/guards/user-must-exist.guard.ts @@ -32,7 +32,7 @@ export class UserMustExistGuard implements CanActivate { this.router.navigate(['/404']); } }), - map(u => u !== null)); + map(u => !!u)); return result; } diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts index 30161a18b..a8df38179 100644 --- a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts +++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts @@ -38,8 +38,7 @@ export class EventConsumersPageComponent implements OnDestroy, OnInit { this.eventConsumersState.load(false, true).pipe(onErrorResumeNext()).subscribe(); this.timerSubscription = - timer(2000, 2000).pipe( - switchMap(x => this.eventConsumersState.load(true, true)), onErrorResumeNext()) + timer(2000, 2000).pipe(switchMap(x => this.eventConsumersState.load(true, true)), onErrorResumeNext()) .subscribe(); } diff --git a/src/Squidex/app/features/administration/pages/restore/restore-page.component.ts b/src/Squidex/app/features/administration/pages/restore/restore-page.component.ts index fa8977ccf..32884a7d2 100644 --- a/src/Squidex/app/features/administration/pages/restore/restore-page.component.ts +++ b/src/Squidex/app/features/administration/pages/restore/restore-page.component.ts @@ -8,7 +8,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { Subscription, timer } from 'rxjs'; -import { switchMap } from 'rxjs/operators'; +import { filter, switchMap } from 'rxjs/operators'; import { AuthService, @@ -43,11 +43,9 @@ export class RestorePageComponent implements OnDestroy, OnInit { public ngOnInit() { this.timerSubscription = - timer(0, 2000).pipe(switchMap(() => this.backupsService.getRestore())) + timer(0, 2000).pipe(switchMap(() => this.backupsService.getRestore()), filter(x => !!x)) .subscribe(dto => { - if (dto !== null) { - this.restoreJob = dto; - } + this.restoreJob = dto!; }); } diff --git a/src/Squidex/app/features/content/module.ts b/src/Squidex/app/features/content/module.ts index 832b7c161..f08988fc9 100644 --- a/src/Squidex/app/features/content/module.ts +++ b/src/Squidex/app/features/content/module.ts @@ -15,6 +15,7 @@ import { ContentMustExistGuard, LoadLanguagesGuard, SchemaMustExistPublishedGuard, + SchemaMustNotBeSingletonGuard, SqxFrameworkModule, SqxSharedModule, UnsetContentGuard @@ -52,12 +53,13 @@ const routes: Routes = [ { path: '', component: ContentsPageComponent, + canActivate: [SchemaMustNotBeSingletonGuard], canDeactivate: [CanDeactivateGuard] }, { path: 'new', component: ContentPageComponent, - canActivate: [UnsetContentGuard], + canActivate: [SchemaMustNotBeSingletonGuard, UnsetContentGuard], canDeactivate: [CanDeactivateGuard] }, { diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.ts b/src/Squidex/app/features/content/pages/content/content-page.component.ts index d8466fdcd..53b9f47b9 100644 --- a/src/Squidex/app/features/content/pages/content/content-page.component.ts +++ b/src/Squidex/app/features/content/pages/content/content-page.component.ts @@ -8,7 +8,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Observable, of, Subscription } from 'rxjs'; -import { filter, map, onErrorResumeNext, switchMap } from 'rxjs/operators'; +import { filter, onErrorResumeNext, switchMap } from 'rxjs/operators'; import { ContentVersionSelected } from './../messages'; @@ -88,19 +88,19 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, }); this.selectedSchemaSubscription = - this.schemasState.selectedSchema.pipe(filter(s => !!s), map(s => s!)) + this.schemasState.selectedSchema.pipe(filter(s => !!s)) .subscribe(schema => { - this.schema = schema; + this.schema = schema!; this.contentForm = new EditContentForm(this.schema, this.languages); }); this.contentSubscription = - this.contentsState.selectedContent.pipe(filter(c => !!c), map(c => c!)) + this.contentsState.selectedContent.pipe(filter(c => !!c)) .subscribe(content => { - this.content = content; + this.content = content!; - this.loadContent(content.dataDraft); + this.loadContent(this.content.dataDraft); }); this.contentVersionSelectedSubscription = diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts index 5f68b0ab2..b3a3acbd4 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts @@ -6,8 +6,9 @@ */ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; import { Subscription } from 'rxjs'; -import { onErrorResumeNext, switchMap, tap } from 'rxjs/operators'; +import { filter, onErrorResumeNext, switchMap, takeUntil, tap } from 'rxjs/operators'; import { AppLanguageDto, @@ -17,6 +18,7 @@ import { ImmutableArray, LanguagesState, ModalModel, + navigatedToOtherComponent, Queries, SchemaDetailsDto, SchemasState, @@ -59,6 +61,7 @@ export class ContentsPageComponent implements OnDestroy, OnInit { public readonly contentsState: ContentsState, private readonly languagesState: LanguagesState, private readonly schemasState: SchemasState, + private readonly router: Router, private readonly uiState: UIState ) { } @@ -70,8 +73,10 @@ export class ContentsPageComponent implements OnDestroy, OnInit { } public ngOnInit() { + const routeChanged = this.router.events.pipe(filter(navigatedToOtherComponent(this.router))); + this.selectedSchemaSubscription = - this.schemasState.selectedSchema + this.schemasState.selectedSchema.pipe(takeUntil(routeChanged)) .subscribe(schema => { this.resetSelection(); @@ -82,7 +87,7 @@ export class ContentsPageComponent implements OnDestroy, OnInit { }); this.contentsSubscription = - this.contentsState.contents + this.contentsState.contents.pipe(takeUntil(routeChanged)) .subscribe(() => { this.updateSelectionSummary(); }); @@ -100,7 +105,7 @@ export class ContentsPageComponent implements OnDestroy, OnInit { } public deleteSelected() { - this.contentsState.deleteMany(this.select()).pipe(onErrorResumeNext()).subscribe(); + this.contentsState.deleteMany(this.selectItems()).pipe(onErrorResumeNext()).subscribe(); } public delete(content: ContentDto) { @@ -112,7 +117,7 @@ export class ContentsPageComponent implements OnDestroy, OnInit { } public publishSelected() { - this.changeContentItems(this.select(c => c.status !== 'Published'), 'Publish'); + this.changeContentItems(this.selectItems(c => c.status !== 'Published'), 'Publish'); } public unpublish(content: ContentDto) { @@ -120,7 +125,7 @@ export class ContentsPageComponent implements OnDestroy, OnInit { } public unpublishSelected() { - this.changeContentItems(this.select(c => c.status === 'Published'), 'Unpublish'); + this.changeContentItems(this.selectItems(c => c.status === 'Published'), 'Unpublish'); } public archive(content: ContentDto) { @@ -128,15 +133,15 @@ export class ContentsPageComponent implements OnDestroy, OnInit { } public archiveSelected() { - this.changeContentItems(this.select(), 'Archive'); + this.changeContentItems(this.selectItems(), 'Archive'); } public restore(content: ContentDto) { this.changeContentItems([content], 'Restore'); } - public restoreSelected(scheduled: boolean) { - this.changeContentItems(this.select(), 'Restore'); + public restoreSelected() { + this.changeContentItems(this.selectItems(), 'Restore'); } public clone(content: ContentDto) { @@ -185,12 +190,16 @@ export class ContentsPageComponent implements OnDestroy, OnInit { this.contentsState.search(query).pipe(onErrorResumeNext()).subscribe(); } + public selectLanguage(language: AppLanguageDto) { + this.language = language; + } + public isItemSelected(content: ContentDto): boolean { return !!this.selectedItems[content.id]; } - public selectLanguage(language: AppLanguageDto) { - this.language = language; + private selectItems(predicate?: (content: ContentDto) => boolean) { + return this.contentsState.snapshot.contents.values.filter(c => this.selectedItems[c.id] && (!predicate || predicate(c))); } public selectItem(content: ContentDto, isSelected: boolean) { @@ -215,10 +224,6 @@ export class ContentsPageComponent implements OnDestroy, OnInit { return content.id; } - private select(predicate?: (content: ContentDto) => boolean) { - return this.contentsState.snapshot.contents.values.filter(c => this.selectedItems[c.id] && (!predicate || predicate(c))); - } - private resetSelection() { this.selectedItems = {}; diff --git a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html index 1903873f2..a270463cd 100644 --- a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html +++ b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html @@ -21,6 +21,7 @@ [name]="category" [schemas]="schemas" [schemasFilter]="schemasFilter.valueChanges | async" + [routeSingletonToContent]="true" [isReadonly]="true"> diff --git a/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.ts b/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.ts index 0405d9426..ba2eaad1d 100644 --- a/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.ts +++ b/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.ts @@ -82,7 +82,7 @@ export class ContentChangedTriggerComponent implements OnInit { } else { return null; } - }).filter(s => s !== null).map(s => s!)).sortByStringAsc(s => s.schema.name); + }).filter(s => !!s).map(s => s!)).sortByStringAsc(s => s.schema.name); this.schemasToAdd = this.schemas.filter(schema => diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts index 92ab4699e..81c86168f 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts @@ -10,7 +10,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Subscription } from 'rxjs'; -import { filter, map, onErrorResumeNext } from 'rxjs/operators'; +import { filter, onErrorResumeNext } from 'rxjs/operators'; import { AppsState, @@ -73,9 +73,9 @@ export class SchemaPageComponent implements OnDestroy, OnInit { this.patternsState.load().pipe(onErrorResumeNext()).subscribe(); this.selectedSchemaSubscription = - this.schemasState.selectedSchema.pipe(filter(s => !!s), map(s => s!)) + this.schemasState.selectedSchema.pipe(filter(s => !!s)) .subscribe(schema => { - this.schema = schema; + this.schema = schema!; this.export(); }); diff --git a/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts b/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts index 6dbc72276..85f2d2b18 100644 --- a/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts @@ -52,7 +52,7 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, } public get hasValue() { - return this.dateValue !== null; + return !!this.dateValue; } @ViewChild('dateInput') diff --git a/src/Squidex/app/framework/angular/forms/stars.component.ts b/src/Squidex/app/framework/angular/forms/stars.component.ts index 0b3b0c728..b3b17eb9c 100644 --- a/src/Squidex/app/framework/angular/forms/stars.component.ts +++ b/src/Squidex/app/framework/angular/forms/stars.component.ts @@ -88,7 +88,7 @@ export class StarsComponent implements ControlValueAccessor { return false; } - if (this.value !== null) { + if (this.value) { this.value = null; this.stars = 0; diff --git a/src/Squidex/app/framework/angular/image-source.directive.ts b/src/Squidex/app/framework/angular/image-source.directive.ts index 2bc972977..ecb517ccc 100644 --- a/src/Squidex/app/framework/angular/image-source.directive.ts +++ b/src/Squidex/app/framework/angular/image-source.directive.ts @@ -96,7 +96,7 @@ export class ImageSourceDirective implements OnChanges, OnDestroy, OnInit, After if (w > 0 && h > 0) { let source = `${this.imageSource}&width=${w}&height=${h}&mode=Crop`; - if (this.loadQuery !== null) { + if (this.loadQuery) { source += `&q=${this.loadQuery}`; } diff --git a/src/Squidex/app/framework/angular/modals/modal-view.directive.ts b/src/Squidex/app/framework/angular/modals/modal-view.directive.ts index 160488675..16a4834d3 100644 --- a/src/Squidex/app/framework/angular/modals/modal-view.directive.ts +++ b/src/Squidex/app/framework/angular/modals/modal-view.directive.ts @@ -71,7 +71,7 @@ export class ModalViewDirective implements OnChanges, OnDestroy { } private update(isOpen: boolean) { - if (isOpen === (this.renderedView !== null)) { + if (isOpen === (!!this.renderedView)) { return; } diff --git a/src/Squidex/app/framework/angular/routers/router-utils.ts b/src/Squidex/app/framework/angular/routers/router-utils.ts index 6dbfe0831..4dd16a7a8 100644 --- a/src/Squidex/app/framework/angular/routers/router-utils.ts +++ b/src/Squidex/app/framework/angular/routers/router-utils.ts @@ -5,7 +5,9 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ActivatedRoute, ActivatedRouteSnapshot, Data, Params } from '@angular/router'; +import { ActivatedRoute, ActivatedRouteSnapshot, Data, Params, Router, RouterEvent, RouterStateSnapshot, RoutesRecognized } from '@angular/router'; + +import { Types } from './../../utils/types'; export function allData(value: ActivatedRouteSnapshot | ActivatedRoute): Data { let snapshot: ActivatedRouteSnapshot | null = value['snapshot'] || value; @@ -40,4 +42,22 @@ export function allParams(value: ActivatedRouteSnapshot | ActivatedRoute): Param } return result; +} + +export function childComponent(value: RouterStateSnapshot) { + let current = value.root; + + while (true) { + if (current.firstChild) { + current = current.firstChild; + } else { + break; + } + } + + return current.component; +} + +export function navigatedToOtherComponent(router: Router) { + return (e: RouterEvent) => Types.is(e, RoutesRecognized) && childComponent(e.state) !== childComponent(router.routerState.snapshot); } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/geolocation-editor.component.ts b/src/Squidex/app/shared/components/geolocation-editor.component.ts index 7239840db..2b4709ce3 100644 --- a/src/Squidex/app/shared/components/geolocation-editor.component.ts +++ b/src/Squidex/app/shared/components/geolocation-editor.component.ts @@ -144,8 +144,9 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi } public updateValueByInput() { - let updateMap = this.geolocationForm.controls['latitude'].value !== null && - this.geolocationForm.controls['longitude'].value !== null; + let updateMap = + !!this.geolocationForm.controls['latitude'].value && + !!this.geolocationForm.controls['longitude'].value; this.value = this.geolocationForm.value; diff --git a/src/Squidex/app/shared/components/schema-category.component.html b/src/Squidex/app/shared/components/schema-category.component.html index 570ae4798..f86bc7c42 100644 --- a/src/Squidex/app/shared/components/schema-category.component.html +++ b/src/Squidex/app/shared/components/schema-category.component.html @@ -16,7 +16,7 @@
-
-
-
+
diff --git a/src/Squidex/app/shared/components/asset.component.scss b/src/Squidex/app/shared/components/asset.component.scss index 27f07083a..1caa49e4b 100644 --- a/src/Squidex/app/shared/components/asset.component.scss +++ b/src/Squidex/app/shared/components/asset.component.scss @@ -254,6 +254,10 @@ $list-height: 2.375rem; min-width: 12rem; } } + + .upload-progress { + padding: .25rem 0; + } } .drop-overlay { @@ -279,22 +283,6 @@ $list-height: 2.375rem; } } -.progress { - &-background { - background: $color-border; - margin: (($list-height - .25rem) / 2) 0; - } - - &-bar { - background: $color-theme-blue; - } - - &-background, - &-bar { - height: .25rem; - } -} - .selectable { cursor: pointer; } diff --git a/src/Squidex/app/shared/components/asset.component.ts b/src/Squidex/app/shared/components/asset.component.ts index 3de754ff8..822d7bea2 100644 --- a/src/Squidex/app/shared/components/asset.component.ts +++ b/src/Squidex/app/shared/components/asset.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, EventEmitter, HostBinding, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostBinding, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { FormBuilder, FormControl } from '@angular/forms'; import { Subscription } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; @@ -31,7 +31,8 @@ import { templateUrl: './asset.component.html', animations: [ fadeAnimation - ] + ], + changeDetection: ChangeDetectionStrategy.OnPush }) export class AssetComponent implements OnDestroy, OnInit { private tagSubscription: Subscription; @@ -91,6 +92,7 @@ export class AssetComponent implements OnDestroy, OnInit { private readonly appsState: AppsState, private readonly assetsService: AssetsService, private readonly authState: AuthService, + private readonly changeDetector: ChangeDetectorRef, private readonly dialogs: DialogService, private readonly formBuilder: FormBuilder ) { @@ -105,7 +107,7 @@ export class AssetComponent implements OnDestroy, OnInit { if (Types.is(dto, AssetDto)) { this.emitLoaded(dto); } else { - this.progress = dto; + this.setProgress(dto); } }, error => { this.dialogs.notifyError(error); @@ -145,7 +147,7 @@ export class AssetComponent implements OnDestroy, OnInit { }, error => { this.dialogs.notifyError(error); - this.setProgress(); + this.setProgress(0); }); } } @@ -159,8 +161,6 @@ export class AssetComponent implements OnDestroy, OnInit { this.assetsService.putAsset(this.appsState.appName, this.asset.id, requestDto, this.asset.version) .subscribe(dto => { this.updateAsset(this.asset.rename(requestDto.fileName, this.authState.user!.token, dto.version), true); - - this.renameCancel(); }, error => { this.dialogs.notifyError(error); @@ -194,10 +194,6 @@ export class AssetComponent implements OnDestroy, OnInit { this.renaming = false; } - private setProgress(progress = 0) { - this.progress = progress; - } - private emitFailed(error: any) { this.failed.emit(error); } @@ -210,6 +206,12 @@ export class AssetComponent implements OnDestroy, OnInit { this.updated.emit(asset); } + private setProgress(progress: number) { + this.progress = progress; + + this.changeDetector.markForCheck(); + } + private updateAsset(asset: AssetDto, emitEvent: boolean) { this.asset = asset; this.progress = 0; @@ -221,5 +223,7 @@ export class AssetComponent implements OnDestroy, OnInit { } this.renameCancel(); + + this.changeDetector.markForCheck(); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/assets-list.component.ts b/src/Squidex/app/shared/components/assets-list.component.ts index 75d5601b3..51f3a1e16 100644 --- a/src/Squidex/app/shared/components/assets-list.component.ts +++ b/src/Squidex/app/shared/components/assets-list.component.ts @@ -7,7 +7,7 @@ // tslint:disable:prefer-for-of -import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; import { onErrorResumeNext } from 'rxjs/operators'; import { @@ -19,7 +19,8 @@ import { @Component({ selector: 'sqx-assets-list', styleUrls: ['./assets-list.component.scss'], - templateUrl: './assets-list.component.html' + templateUrl: './assets-list.component.html', + changeDetection: ChangeDetectionStrategy.OnPush }) export class AssetsListComponent { public newFiles = ImmutableArray.empty(); diff --git a/src/Squidex/app/shared/components/assets-selector.component.ts b/src/Squidex/app/shared/components/assets-selector.component.ts index 457929c2d..9dca033c3 100644 --- a/src/Squidex/app/shared/components/assets-selector.component.ts +++ b/src/Squidex/app/shared/components/assets-selector.component.ts @@ -7,7 +7,7 @@ // tslint:disable:prefer-for-of -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, OnInit, Output } from '@angular/core'; import { onErrorResumeNext } from 'rxjs/operators'; import { @@ -23,7 +23,8 @@ import { templateUrl: './assets-selector.component.html', animations: [ fadeAnimation - ] + ], + changeDetection: ChangeDetectionStrategy.OnPush }) export class AssetsSelectorComponent implements OnInit { public selectedAssets: { [id: string]: AssetDto } = {}; diff --git a/src/Squidex/app/shared/components/geolocation-editor.component.ts b/src/Squidex/app/shared/components/geolocation-editor.component.ts index 3531b0731..88d13df64 100644 --- a/src/Squidex/app/shared/components/geolocation-editor.component.ts +++ b/src/Squidex/app/shared/components/geolocation-editor.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AfterViewInit, Component, ElementRef, forwardRef, ViewChild } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, forwardRef, ViewChild } from '@angular/core'; import { ControlValueAccessor, FormBuilder, NG_VALUE_ACCESSOR } from '@angular/forms'; import { @@ -31,7 +31,8 @@ interface Geolocation { selector: 'sqx-geolocation-editor', styleUrls: ['./geolocation-editor.component.scss'], templateUrl: './geolocation-editor.component.html', - providers: [SQX_GEOLOCATION_EDITOR_CONTROL_VALUE_ACCESSOR] + providers: [SQX_GEOLOCATION_EDITOR_CONTROL_VALUE_ACCESSOR], + changeDetection: ChangeDetectionStrategy.OnPush }) export class GeolocationEditorComponent implements ControlValueAccessor, AfterViewInit { private callChange = (v: any) => { /* NOOP */ }; diff --git a/src/Squidex/app/shared/components/help.component.ts b/src/Squidex/app/shared/components/help.component.ts index f7d7bf68f..c7679636c 100644 --- a/src/Squidex/app/shared/components/help.component.ts +++ b/src/Squidex/app/shared/components/help.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { HelpService } from '@app/shared/internal'; @@ -13,7 +13,8 @@ import { HelpService } from '@app/shared/internal'; @Component({ selector: 'sqx-help', styleUrls: ['./help.component.scss'], - templateUrl: './help.component.html' + templateUrl: './help.component.html', + changeDetection: ChangeDetectionStrategy.OnPush }) export class HelpComponent { public helpSections = diff --git a/src/Squidex/app/shared/components/history-list.component.ts b/src/Squidex/app/shared/components/history-list.component.ts index e5a7acb93..bbb8417cd 100644 --- a/src/Squidex/app/shared/components/history-list.component.ts +++ b/src/Squidex/app/shared/components/history-list.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Observable } from 'rxjs'; import { @@ -17,7 +17,8 @@ import { @Component({ selector: 'sqx-history-list', styleUrls: ['./history-list.component.scss'], - templateUrl: './history-list.component.html' + templateUrl: './history-list.component.html', + changeDetection: ChangeDetectionStrategy.OnPush }) export class HistoryListComponent { @Input() diff --git a/src/Squidex/app/shared/components/history.component.ts b/src/Squidex/app/shared/components/history.component.ts index 727e53247..7182caec2 100644 --- a/src/Squidex/app/shared/components/history.component.ts +++ b/src/Squidex/app/shared/components/history.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { merge, Observable, timer } from 'rxjs'; import { delay, switchMap } from 'rxjs/operators'; @@ -22,7 +22,8 @@ import { @Component({ selector: 'sqx-history', styleUrls: ['./history.component.scss'], - templateUrl: './history.component.html' + templateUrl: './history.component.html', + changeDetection: ChangeDetectionStrategy.OnPush }) export class HistoryComponent { private readonly channel = this.calculateChannel(); @@ -32,7 +33,7 @@ export class HistoryComponent { timer(0, 10000), this.messageBus.of(HistoryChannelUpdated).pipe(delay(1000)) ).pipe( - switchMap(app => this.historyService.getHistory(this.appsState.appName, this.channel))); + switchMap(() => this.historyService.getHistory(this.appsState.appName, this.channel))); constructor( private readonly appsState: AppsState, From 03a6f5a99c55faeadceed8a4001bb1e8326f7f1e Mon Sep 17 00:00:00 2001 From: Avd6977 Date: Tue, 9 Oct 2018 08:07:02 -0500 Subject: [PATCH 16/40] Pending should be false when changing status Fixing a weird state on content 1. Create and publish a content item 2. Make a pending change 3. Select "Unpublish" and the pending data is still there. If you're unpublished, you shouldn't be able to have a pending version. --- src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs b/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs index fd5b9a343..27c06a038 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs @@ -86,6 +86,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.State protected void On(ContentStatusChanged @event) { ScheduleJob = null; + IsPending = false; Status = @event.Status; From f95c0cc722ff1f8c89f9ec4d1852039f7a58108d Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 9 Oct 2018 17:50:32 +0200 Subject: [PATCH 17/40] Performance improvements. --- .../content/content-field.component.html | 2 +- .../pages/content/content-field.component.ts | 13 +- .../content/content-history.component.html | 5 +- .../content/content-history.component.ts | 4 + .../contents/contents-page.component.html | 8 +- .../pages/contents/contents-page.component.ts | 14 +- .../content/shared/assets-editor.component.ts | 2 +- .../content/shared/content-item.component.ts | 5 +- .../shared/references-editor.component.ts | 10 +- .../forms/date-time-editor.component.ts | 2 +- .../angular/http/loading.interceptor.ts | 31 + .../modals/dialog-renderer.component.ts | 20 +- .../modals/onboarding-tooltip.component.ts | 5 +- .../angular/modals/root-view.component.ts | 5 +- .../app/framework/angular/panel.component.ts | 9 +- .../framework/angular/shortcut.component.ts | 5 +- .../app/framework/angular/title.component.ts | 5 +- .../angular/user-report.component.ts | 5 +- src/Squidex/app/framework/declarations.ts | 1 + src/Squidex/app/framework/internal.ts | 1 + src/Squidex/app/framework/module.ts | 11 +- .../services/loading.service.spec.ts | 114 + .../app/framework/services/loading.service.ts | 68 + .../shared/components/asset.component.html | 4 +- .../shared/components/asset.component.scss | 8 + .../app/shared/components/asset.component.ts | 4 +- .../geolocation-editor.component.ts | 37 +- .../app/shared/components/help.component.ts | 3 +- .../components/history-list.component.html | 2 +- src/Squidex/app/shared/components/pipes.ts | 2 +- .../internal/internal-area.component.html | 8 +- .../internal/internal-area.component.scss | 4 + .../pages/internal/internal-area.component.ts | 8 +- src/Squidex/app/theme/_common.scss | 14 + .../app/theme/icomoon/demo-files/demo.css | 4 +- src/Squidex/app/theme/icomoon/demo.html | 776 +++-- .../app/theme/icomoon/fonts/icomoon.eot | Bin 25328 -> 25540 bytes .../app/theme/icomoon/fonts/icomoon.svg | 1 + .../app/theme/icomoon/fonts/icomoon.ttf | Bin 25164 -> 25376 bytes .../app/theme/icomoon/fonts/icomoon.woff | Bin 25240 -> 25452 bytes src/Squidex/app/theme/icomoon/selection.json | 3056 +---------------- src/Squidex/app/theme/icomoon/style.css | 124 +- src/Squidex/wwwroot/images/loader-white.gif | Bin 0 -> 33782 bytes 43 files changed, 838 insertions(+), 3562 deletions(-) create mode 100644 src/Squidex/app/framework/angular/http/loading.interceptor.ts create mode 100644 src/Squidex/app/framework/services/loading.service.spec.ts create mode 100644 src/Squidex/app/framework/services/loading.service.ts create mode 100644 src/Squidex/wwwroot/images/loader-white.gif diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.html b/src/Squidex/app/features/content/pages/content/content-field.component.html index 3b7f60e12..b4ea1e648 100644 --- a/src/Squidex/app/features/content/pages/content/content-field.component.html +++ b/src/Squidex/app/features/content/pages/content/content-field.component.html @@ -1,4 +1,4 @@ -
+
; + public ngOnChanges(changes: SimpleChanges) { if (this.field.isLocalizable) { this.selectedFormControl = this.fieldForm.controls[this.language.iso2Code]; @@ -55,6 +60,10 @@ export class ContentFieldComponent implements OnChanges { this.selectedFormControl['_clearChangeFns'](); } } + + if (changes['fieldForm']) { + this.isInvalid = this.fieldForm.statusChanges.pipe(startWith(this.fieldForm.invalid), map(x => this.fieldForm.invalid)); + } } } diff --git a/src/Squidex/app/features/content/pages/content/content-history.component.html b/src/Squidex/app/features/content/pages/content/content-history.component.html index f9026f3dc..d2847fc45 100644 --- a/src/Squidex/app/features/content/pages/content/content-history.component.html +++ b/src/Squidex/app/features/content/pages/content/content-history.component.html @@ -4,13 +4,14 @@ -
+
- {{event.actor | sqxUserNameRef:null}} + {{event.actor | sqxUserNameRef:null}} +
{{event.created | sqxFromNow}}
diff --git a/src/Squidex/app/features/content/pages/content/content-history.component.ts b/src/Squidex/app/features/content/pages/content/content-history.component.ts index 09763dc08..087690153 100644 --- a/src/Squidex/app/features/content/pages/content/content-history.component.ts +++ b/src/Squidex/app/features/content/pages/content/content-history.component.ts @@ -71,4 +71,8 @@ export class ContentHistoryComponent { public format(message: string): Observable { return formatHistoryMessage(message, this.users); } + + public trackByEvent(index: number, event: HistoryEventDto) { + return event.eventId; + } } \ No newline at end of file diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-page.component.html index 0434c823e..74a81a361 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.html +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.html @@ -73,19 +73,19 @@
{{selectionCount}} items selected:   - - - - diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts index b3a3acbd4..be82c3a40 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts @@ -149,7 +149,7 @@ export class ContentsPageComponent implements OnDestroy, OnInit { } public isSelectedQuery(query: string) { - return query === this.contentsState.snapshot.contentsQuery || (!query && !this.contentsState.contentsQuery); + return query === this.contentsState.snapshot.contentsQuery || (!query && !this.contentsState.snapshot.contentsQuery); } private changeContentItems(contents: ContentDto[], action: string) { @@ -208,6 +208,12 @@ export class ContentsPageComponent implements OnDestroy, OnInit { this.updateSelectionSummary(); } + private resetSelection() { + this.selectedItems = {}; + + this.updateSelectionSummary(); + } + public selectAll(isSelected: boolean) { this.selectedItems = {}; @@ -224,12 +230,6 @@ export class ContentsPageComponent implements OnDestroy, OnInit { return content.id; } - private resetSelection() { - this.selectedItems = {}; - - this.updateSelectionSummary(); - } - private updateSelectionSummary() { this.isAllSelected = this.contentsState.snapshot.contents.length > 0; diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.ts b/src/Squidex/app/features/content/shared/assets-editor.component.ts index 4fdc69ade..b2ff9fa2f 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.ts +++ b/src/Squidex/app/features/content/shared/assets-editor.component.ts @@ -132,7 +132,7 @@ export class AssetsEditorComponent implements ControlValueAccessor { this.callTouched(); this.callChange(ids); - this.changeDetector.markForCheck(); + this.changeDetector.detectChanges(); } public sort(assets: AssetDto[]) { diff --git a/src/Squidex/app/features/content/shared/content-item.component.ts b/src/Squidex/app/features/content/shared/content-item.component.ts index 567915cd4..697f9044e 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.ts +++ b/src/Squidex/app/features/content/shared/content-item.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { AppLanguageDto, @@ -29,7 +29,8 @@ import { templateUrl: './content-item.component.html', animations: [ fadeAnimation - ] + ], + changeDetection: ChangeDetectionStrategy.OnPush }) export class ContentItemComponent implements OnChanges { @Output() diff --git a/src/Squidex/app/features/content/shared/references-editor.component.ts b/src/Squidex/app/features/content/shared/references-editor.component.ts index 855594365..f0defad85 100644 --- a/src/Squidex/app/features/content/shared/references-editor.component.ts +++ b/src/Squidex/app/features/content/shared/references-editor.component.ts @@ -74,11 +74,11 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit { .subscribe(dto => { this.schema = dto; - this.changeDetector.markForCheck(); + this.changeDetector.detectChanges(); }, () => { this.isInvalidSchema = true; - this.changeDetector.markForCheck(); + this.changeDetector.detectChanges(); }); } @@ -95,11 +95,11 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit { this.updateValue(); } - this.changeDetector.markForCheck(); + this.changeDetector.detectChanges(); }, () => { this.contentItems = ImmutableArray.empty(); - this.changeDetector.markForCheck(); + this.changeDetector.detectChanges(); }); } } else { @@ -157,6 +157,6 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit { this.callTouched(); this.callChange(ids); - this.changeDetector.markForCheck(); + this.changeDetector.detectChanges(); } } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts b/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts index 0021ed2c8..a98d02f29 100644 --- a/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts @@ -144,7 +144,7 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, this.touched(); if (false) { - this.changeDetector.markForCheck(); + this.changeDetector.detectChanges(); } } }); diff --git a/src/Squidex/app/framework/angular/http/loading.interceptor.ts b/src/Squidex/app/framework/angular/http/loading.interceptor.ts new file mode 100644 index 000000000..af6611f67 --- /dev/null +++ b/src/Squidex/app/framework/angular/http/loading.interceptor.ts @@ -0,0 +1,31 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'; +import { Injectable} from '@angular/core'; +import { Observable } from 'rxjs'; +import { finalize } from 'rxjs/operators'; + +import { LoadingService, MathHelper } from './../../internal'; + +@Injectable() +export class LoadingInterceptor implements HttpInterceptor { + constructor( + private readonly loadingService: LoadingService + ) { + } + + public intercept(req: HttpRequest, next: HttpHandler): Observable> { + const id = MathHelper.guid(); + + this.loadingService.startLoading(id); + + return next.handle(req).pipe(finalize(() => { + this.loadingService.completeLoading(id); + })); + } +} \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts b/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts index 2dabc425a..17c184f0c 100644 --- a/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts +++ b/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Sebastian Stehle. All rights r vbeserved */ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; import { @@ -22,7 +22,8 @@ import { templateUrl: './dialog-renderer.component.html', animations: [ fadeAnimation - ] + ], + changeDetection: ChangeDetectionStrategy.OnPush }) export class DialogRendererComponent implements OnDestroy, OnInit { private dialogSubscription: Subscription; @@ -38,6 +39,7 @@ export class DialogRendererComponent implements OnDestroy, OnInit { public position = 'bottomright'; constructor( + private readonly changeDetector: ChangeDetectorRef, private readonly dialogs: DialogService ) { } @@ -53,6 +55,8 @@ export class DialogRendererComponent implements OnDestroy, OnInit { this.dialogView.isOpen.subscribe(isOpen => { if (!isOpen) { this.cancel(); + + this.changeDetector.detectChanges(); } }); @@ -65,6 +69,8 @@ export class DialogRendererComponent implements OnDestroy, OnInit { this.close(notification); }, notification.displayTime); } + + this.changeDetector.detectChanges(); }); this.dialogsSubscription = @@ -74,6 +80,8 @@ export class DialogRendererComponent implements OnDestroy, OnInit { this.dialogRequest = request; this.dialogView.show(); + + this.changeDetector.detectChanges(); }); } @@ -94,6 +102,12 @@ export class DialogRendererComponent implements OnDestroy, OnInit { } public close(notification: Notification) { - this.notifications.splice(this.notifications.indexOf(notification), 1); + const index = this.notifications.indexOf(notification); + + if (index >= 0) { + this.notifications.splice(index, 1); + + this.changeDetector.detectChanges(); + } } } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts b/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts index b6cee0c64..a0cf8ab7a 100644 --- a/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts +++ b/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, Input, OnDestroy, OnInit, Renderer2 } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit, Renderer2 } from '@angular/core'; import { fadeAnimation, @@ -20,7 +20,8 @@ import { templateUrl: './onboarding-tooltip.component.html', animations: [ fadeAnimation - ] + ], + changeDetection: ChangeDetectionStrategy.OnPush }) export class OnboardingTooltipComponent implements OnDestroy, OnInit { private showTimer: any; diff --git a/src/Squidex/app/framework/angular/modals/root-view.component.ts b/src/Squidex/app/framework/angular/modals/root-view.component.ts index 4017109d9..2f3ec887c 100644 --- a/src/Squidex/app/framework/angular/modals/root-view.component.ts +++ b/src/Squidex/app/framework/angular/modals/root-view.component.ts @@ -5,12 +5,13 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, ViewChild, ViewContainerRef } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ViewChild, ViewContainerRef } from '@angular/core'; @Component({ selector: 'sqx-root-view', styleUrls: ['./root-view.component.scss'], - templateUrl: './root-view.component.html' + templateUrl: './root-view.component.html', + changeDetection: ChangeDetectionStrategy.OnPush }) export class RootViewComponent { @ViewChild('element', { read: ViewContainerRef }) diff --git a/src/Squidex/app/framework/angular/panel.component.ts b/src/Squidex/app/framework/angular/panel.component.ts index 7c70ef8fc..ed7ae21c2 100644 --- a/src/Squidex/app/framework/angular/panel.component.ts +++ b/src/Squidex/app/framework/angular/panel.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AfterViewInit, Component, ElementRef, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core'; import { slideRightAnimation } from './animations'; @@ -17,7 +17,8 @@ import { PanelContainerDirective } from './panel-container.directive'; templateUrl: './panel.component.html', animations: [ slideRightAnimation - ] + ], + changeDetection: ChangeDetectionStrategy.OnPush }) export class PanelComponent implements AfterViewInit, OnDestroy, OnInit { private styleWidth: string; @@ -62,6 +63,7 @@ export class PanelComponent implements AfterViewInit, OnDestroy, OnInit { constructor( private readonly container: PanelContainerDirective, + private readonly changeDetector: ChangeDetectorRef, private readonly renderer: Renderer2 ) { } @@ -83,8 +85,9 @@ export class PanelComponent implements AfterViewInit, OnDestroy, OnInit { this.styleWidth = size; this.renderer.setStyle(this.panel.nativeElement, 'width', size); - this.renderWidth = this.panel.nativeElement.getBoundingClientRect().width; + + this.changeDetector.detectChanges(); } } diff --git a/src/Squidex/app/framework/angular/shortcut.component.ts b/src/Squidex/app/framework/angular/shortcut.component.ts index 01148f3fb..26191b2eb 100644 --- a/src/Squidex/app/framework/angular/shortcut.component.ts +++ b/src/Squidex/app/framework/angular/shortcut.component.ts @@ -5,13 +5,14 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output } from '@angular/core'; import { ShortcutService } from './../services/shortcut.service'; @Component({ selector: 'sqx-shortcut', - template: '' + template: '', + changeDetection: ChangeDetectionStrategy.OnPush }) export class ShortcutComponent implements OnDestroy, OnInit { @Input() diff --git a/src/Squidex/app/framework/angular/title.component.ts b/src/Squidex/app/framework/angular/title.component.ts index 636e14a7b..20161b09a 100644 --- a/src/Squidex/app/framework/angular/title.component.ts +++ b/src/Squidex/app/framework/angular/title.component.ts @@ -5,13 +5,14 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, Input, OnChanges } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { TitleService } from './../services/title.service'; @Component({ selector: 'sqx-title', - template: '' + template: '', + changeDetection: ChangeDetectionStrategy.OnPush }) export class TitleComponent implements OnChanges { @Input() diff --git a/src/Squidex/app/framework/angular/user-report.component.ts b/src/Squidex/app/framework/angular/user-report.component.ts index 497a4b56f..0cb33edb7 100644 --- a/src/Squidex/app/framework/angular/user-report.component.ts +++ b/src/Squidex/app/framework/angular/user-report.component.ts @@ -5,14 +5,15 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { UserReportConfig } from './../configurations'; import { ResourceLoaderService } from './../services/resource-loader.service'; @Component({ selector: 'sqx-user-report', - template: '' + template: '', + changeDetection: ChangeDetectionStrategy.OnPush }) export class UserReportComponent implements OnDestroy, OnInit { private loadingTimer: any; diff --git a/src/Squidex/app/framework/declarations.ts b/src/Squidex/app/framework/declarations.ts index dda4dbf42..16cc7f7dd 100644 --- a/src/Squidex/app/framework/declarations.ts +++ b/src/Squidex/app/framework/declarations.ts @@ -27,6 +27,7 @@ export * from './angular/forms/toggle.component'; export * from './angular/forms/transform-input.directive'; export * from './angular/forms/validators'; +export * from './angular/http/loading.interceptor'; export * from './angular/http/http-extensions'; export * from './angular/modals/dialog-renderer.component'; diff --git a/src/Squidex/app/framework/internal.ts b/src/Squidex/app/framework/internal.ts index b3771aa42..299635a8b 100644 --- a/src/Squidex/app/framework/internal.ts +++ b/src/Squidex/app/framework/internal.ts @@ -11,6 +11,7 @@ export * from './angular/animations'; export * from './services/analytics.service'; export * from './services/clipboard.service'; export * from './services/dialog.service'; +export * from './services/loading.service'; export * from './services/local-store.service'; export * from './services/message-bus.service'; export * from './services/onboarding.service'; diff --git a/src/Squidex/app/framework/module.ts b/src/Squidex/app/framework/module.ts index 210f86a97..b5b802278 100644 --- a/src/Squidex/app/framework/module.ts +++ b/src/Squidex/app/framework/module.ts @@ -6,6 +6,7 @@ */ import { CommonModule } from '@angular/common'; +import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { ModuleWithProviders, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @@ -44,6 +45,8 @@ import { KeysPipe, KNumberPipe, LightenPipe, + LoadingInterceptor, + LoadingService, LocalStoreService, MessageBus, ModalDialogComponent, @@ -220,11 +223,17 @@ export class SqxFrameworkModule { ClipboardService, DialogService, LocalStoreService, + LoadingService, MessageBus, OnboardingService, ResourceLoaderService, ShortcutService, - TitleService + TitleService, + { + provide: HTTP_INTERCEPTORS, + useClass: LoadingInterceptor, + multi: true + } ] }; } diff --git a/src/Squidex/app/framework/services/loading.service.spec.ts b/src/Squidex/app/framework/services/loading.service.spec.ts new file mode 100644 index 000000000..2e7b8128d --- /dev/null +++ b/src/Squidex/app/framework/services/loading.service.spec.ts @@ -0,0 +1,114 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { Event, NavigationError, NavigationStart } from '@angular/router'; +import { Subject } from 'rxjs'; + +import { LoadingService, LoadingServiceFactory } from './loading.service'; + +describe('LoadingService', () => { + let events = new Subject(); + + it('should instantiate from factory', () => { + const loadingService = LoadingServiceFactory({ events }); + + expect(loadingService).toBeDefined(); + }); + + it('should instantiate', () => { + const loadingService = new LoadingService({ events }); + + expect(loadingService).toBeDefined(); + + loadingService.ngOnDestroy(); + }); + + it('should set to loaded', () => { + const loadingService = new LoadingService({ events }); + + let state = false; + + loadingService.loading.subscribe(v => state = v); + loadingService.startLoading('1'); + + expect(state).toBeTruthy(); + }); + + it('should set to loaded on navigation start', () => { + const loadingService = new LoadingService({ events }); + + let state = false; + + loadingService.loading.subscribe(v => state = v); + + events.next(new NavigationStart(0, '')); + + expect(state).toBeTruthy(); + }); + + it('should not unset from loaded immediately', () => { + const loadingService = new LoadingService({ events }); + + let state = false; + + loadingService.loading.subscribe(v => state = v); + loadingService.startLoading('1'); + loadingService.completeLoading('1'); + + expect(state).toBeTruthy(); + }); + + it('should not unset from loaded delayed', (cb) => { + const loadingService = new LoadingService({ events }); + + let state = false; + + loadingService.loading.subscribe(v => state = v); + loadingService.startLoading('1'); + loadingService.completeLoading('1'); + + setTimeout(() => { + expect(state).toBeFalsy(); + + cb(); + }, 400); + }); + + it('should not unset from loaded delayed on navigation event', (cb) => { + const loadingService = new LoadingService({ events }); + + let state = false; + + loadingService.loading.subscribe(v => state = v); + events.next(new NavigationStart(0, '')); + events.next(new NavigationError(0, '', 0)); + + setTimeout(() => { + expect(state).toBeFalsy(); + + cb(); + }, 400); + }); + + it('should set back to loaded after several completions', (cb) => { + const loadingService = new LoadingService({ events }); + + let state = false; + + loadingService.loading.subscribe(v => state = v); + loadingService.startLoading('1'); + loadingService.completeLoading('1'); + loadingService.completeLoading('1'); + loadingService.startLoading('2'); + + setTimeout(() => { + expect(state).toBeTruthy(); + + cb(); + }, 400); + }); +}); diff --git a/src/Squidex/app/framework/services/loading.service.ts b/src/Squidex/app/framework/services/loading.service.ts new file mode 100644 index 000000000..78598a271 --- /dev/null +++ b/src/Squidex/app/framework/services/loading.service.ts @@ -0,0 +1,68 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { Injectable, OnDestroy } from '@angular/core'; +import { NavigationCancel, NavigationEnd, NavigationError, NavigationStart, Router } from '@angular/router'; +import { BehaviorSubject, Observable, Subscription } from 'rxjs'; +import { map } from 'rxjs/operators'; + +import { Types } from './../utils/types'; + +export const LoadingServiceFactory = (router: Router) => { + return new LoadingService(router); +}; + +@Injectable() +export class LoadingService implements OnDestroy { + private readonly routerSubscription: Subscription; + private readonly loading$ = new BehaviorSubject(0); + private readonly loadingOperations: { [key: string]: boolean } = {}; + + public get loading(): Observable { + return this.loading$.pipe(map(x => x > 0)); + } + + constructor(router: Router) { + this.routerSubscription = + router.events.subscribe(event => { + if (Types.is(event, NavigationStart)) { + this.startLoading(event.id.toString()); + } else if ( + Types.is(event, NavigationEnd) || + Types.is(event, NavigationCancel) || + Types.is(event, NavigationError)) { + this.completeLoading(event.id.toString()); + } + }); + } + + public ngOnDestroy() { + this.routerSubscription.unsubscribe(); + } + + public startLoading(key: string) { + if (!this.loadingOperations[key]) { + this.loadingOperations[key] = true; + + this.loading$.next(this.loading$.value + 1); + } + } + + public completeLoading(key: string) { + if (this.loadingOperations[key]) { + delete this.loadingOperations[key]; + + setTimeout(() => { + const value = this.loading$.value; + + if (value > 0) { + this.loading$.next(value - 1); + } + }, 250); + } + } +} \ No newline at end of file diff --git a/src/Squidex/app/shared/components/asset.component.html b/src/Squidex/app/shared/components/asset.component.html index 94a882c16..b3399d2c8 100644 --- a/src/Squidex/app/shared/components/asset.component.html +++ b/src/Squidex/app/shared/components/asset.component.html @@ -7,7 +7,7 @@
- +
@@ -89,7 +89,7 @@
- +
diff --git a/src/Squidex/app/shared/components/asset.component.scss b/src/Squidex/app/shared/components/asset.component.scss index 1caa49e4b..0ccea99d0 100644 --- a/src/Squidex/app/shared/components/asset.component.scss +++ b/src/Squidex/app/shared/components/asset.component.scss @@ -287,6 +287,14 @@ $list-height: 2.375rem; cursor: pointer; } +.bg { + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAIAAAC1nk4lAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjEuMWMqnEsAAACbSURBVGhD7c6hDQAxAMPA33+m7vYlJh7AoFKOBMbfyfyZRRsPgUUbD4FFGw+BRRsPgUUbD4FFGw+BRRsPgUUbD4FFGw+BRRsPgUUbD4FFGw+BRRsPgUUbD4E3o9kA7YFFGw+BRRsPgUUbD4FFGw+BRRsPgUUbD4FFGw+BRRsPgUUbD4FFGw+BRRsPgUUbD4FFGw+BRRsPgQejz7nPYYKl8IqSfgAAAABJRU5ErkJggg=='); +} + +.bg2 { + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjEuMWMqnEsAAAAsSURBVDhPY9iDF/zHC0Y1YwCoKhxgRGqG0jgA1AwcYFQzBoCqwgFGnuY9ewCdSg6FRg4gMAAAAABJRU5ErkJggg=='); +} + .tags { min-height: 26px; } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/asset.component.ts b/src/Squidex/app/shared/components/asset.component.ts index 822d7bea2..02c40c200 100644 --- a/src/Squidex/app/shared/components/asset.component.ts +++ b/src/Squidex/app/shared/components/asset.component.ts @@ -209,7 +209,7 @@ export class AssetComponent implements OnDestroy, OnInit { private setProgress(progress: number) { this.progress = progress; - this.changeDetector.markForCheck(); + this.changeDetector.detectChanges(); } private updateAsset(asset: AssetDto, emitEvent: boolean) { @@ -224,6 +224,6 @@ export class AssetComponent implements OnDestroy, OnInit { this.renameCancel(); - this.changeDetector.markForCheck(); + this.changeDetector.detectChanges(); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/geolocation-editor.component.ts b/src/Squidex/app/shared/components/geolocation-editor.component.ts index 88d13df64..b47014d41 100644 --- a/src/Squidex/app/shared/components/geolocation-editor.component.ts +++ b/src/Squidex/app/shared/components/geolocation-editor.component.ts @@ -272,13 +272,24 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi private updateMarker(zoom: boolean, fireEvent: boolean) { if (!this.isGoogleMaps) { - this.updateMarkerOSM(zoom, fireEvent); + this.updateMarkerOSM(zoom); } else { - this.updateMarkerGoogle(zoom, fireEvent); + this.updateMarkerGoogle(zoom); + } + + if (this.value) { + this.geolocationForm.setValue(this.value, { emitEvent: true, onlySelf: false }); + } else { + this.geolocationForm.reset(undefined, { emitEvent: true, onlySelf: false }); + } + + if (fireEvent) { + this.callChange(this.value); + this.callTouched(); } } - private updateMarkerOSM(zoom: boolean, fireEvent: boolean) { + private updateMarkerOSM(zoom: boolean) { if (this.value) { if (!this.marker) { this.marker = L.marker([0, 90], { draggable: true }).addTo(this.map); @@ -307,8 +318,6 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi } this.marker.setLatLng(latLng); - - this.geolocationForm.setValue(this.value, { emitEvent: false, onlySelf: false }); } else { if (this.marker) { this.marker.removeFrom(this.map); @@ -316,17 +325,10 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi } this.map.fitWorld(); - - this.geolocationForm.reset(undefined, { emitEvent: false, onlySelf: false }); - } - - if (fireEvent) { - this.callChange(this.value); - this.callTouched(); } } - private updateMarkerGoogle(zoom: boolean, fireEvent: boolean) { + private updateMarkerGoogle(zoom: boolean) { if (this.value) { if (!this.marker) { this.marker = new google.maps.Marker({ @@ -361,8 +363,6 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi this.marker.setPosition(latLng); this.map.setZoom(12); - - this.geolocationForm.setValue(this.value, { emitEvent: false, onlySelf: false }); } else { if (this.marker) { this.marker.setMap(null); @@ -370,13 +370,6 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi } this.map.setCenter({ lat: 0, lng: 0 }); - - this.geolocationForm.reset(undefined, { emitEvent: false, onlySelf: false }); - } - - if (fireEvent) { - this.callChange(this.value); - this.callTouched(); } } } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/help.component.ts b/src/Squidex/app/shared/components/help.component.ts index c7679636c..19059f168 100644 --- a/src/Squidex/app/shared/components/help.component.ts +++ b/src/Squidex/app/shared/components/help.component.ts @@ -17,8 +17,7 @@ import { HelpService } from '@app/shared/internal'; changeDetection: ChangeDetectionStrategy.OnPush }) export class HelpComponent { - public helpSections = - this.helpService.getHelp(this.route.snapshot.data['helpPage']); + public helpSections = this.helpService.getHelp(this.route.snapshot.data['helpPage']); constructor( private readonly helpService: HelpService, diff --git a/src/Squidex/app/shared/components/history-list.component.html b/src/Squidex/app/shared/components/history-list.component.html index 1581365f1..516f50197 100644 --- a/src/Squidex/app/shared/components/history-list.component.html +++ b/src/Squidex/app/shared/components/history-list.component.html @@ -1,5 +1,5 @@ -
+
diff --git a/src/Squidex/app/shared/components/pipes.ts b/src/Squidex/app/shared/components/pipes.ts index 860296f39..a5096bfe0 100644 --- a/src/Squidex/app/shared/components/pipes.ts +++ b/src/Squidex/app/shared/components/pipes.ts @@ -44,7 +44,7 @@ class UserAsyncPipe implements OnDestroy { this.subscription = transform(this.users).subscribe(value => { this.lastValue = value; - this.changeDetector.markForCheck(); + this.changeDetector.detectChanges(); }); } diff --git a/src/Squidex/app/shell/pages/internal/internal-area.component.html b/src/Squidex/app/shell/pages/internal/internal-area.component.html index c6bbe47b6..ddd4dcbb5 100644 --- a/src/Squidex/app/shell/pages/internal/internal-area.component.html +++ b/src/Squidex/app/shell/pages/internal/internal-area.component.html @@ -1,6 +1,12 @@