diff --git a/src/Squidex.Core/LanguagesConfig.cs b/src/Squidex.Core/LanguagesConfig.cs index 4bf5187b8..39e343451 100644 --- a/src/Squidex.Core/LanguagesConfig.cs +++ b/src/Squidex.Core/LanguagesConfig.cs @@ -81,24 +81,25 @@ namespace Squidex.Core return new LanguagesConfig(newLanguages, master ?? newLanguages.Values.First()); } - public LanguagesConfig Update(Language language, bool isOptional, IEnumerable fallback) + public LanguagesConfig Update(Language language, bool isOptional, bool isMaster, IEnumerable fallback) { ThrowIfNotFound(language); if (isOptional) { - ThrowIfMaster(language, () => $"Cannot cannot make language '{language.Iso2Code}' optional"); + ThrowIfMaster(language, isMaster, () => $"Cannot cannot make language '{language.Iso2Code}' optional"); } - var newLanguages = ValidateLanguages(languages.SetItem(language, new LanguageConfig(language, isOptional, fallback))); + var newLanguage = new LanguageConfig(language, isOptional, fallback); + var newLanguages = ValidateLanguages(languages.SetItem(language, newLanguage)); - return new LanguagesConfig(newLanguages, master); + return new LanguagesConfig(newLanguages, isMaster ? newLanguage : master); } public LanguagesConfig Remove(Language language) { ThrowIfNotFound(language); - ThrowIfMaster(language, () => $"Cannot remove language '{language.Iso2Code}'"); + ThrowIfMaster(language, false, () => $"Cannot remove language '{language.Iso2Code}'"); var newLanguages = languages.Remove(language); @@ -171,9 +172,9 @@ namespace Squidex.Core } } - private void ThrowIfMaster(Language language, Func message) + private void ThrowIfMaster(Language language, bool isMaster, Func message) { - if (master?.Language == language) + if (master?.Language == language || isMaster) { var error = new ValidationError("Language is the master language", "Language"); diff --git a/src/Squidex.Events/Apps/AppLanguageUpdated.cs b/src/Squidex.Events/Apps/AppLanguageUpdated.cs index 10b0afda0..3a2b5ed4c 100644 --- a/src/Squidex.Events/Apps/AppLanguageUpdated.cs +++ b/src/Squidex.Events/Apps/AppLanguageUpdated.cs @@ -18,6 +18,8 @@ namespace Squidex.Events.Apps public bool IsOptional { get; set; } + public bool IsMaster { get; set; } + public List Fallback { get; set; } } } diff --git a/src/Squidex.Events/Apps/AppMasterLanguageSet.cs b/src/Squidex.Events/Apps/AppMasterLanguageSet.cs index a0ae5b073..4407d2d51 100644 --- a/src/Squidex.Events/Apps/AppMasterLanguageSet.cs +++ b/src/Squidex.Events/Apps/AppMasterLanguageSet.cs @@ -6,6 +6,7 @@ // All rights reserved. // ========================================================================== +using System; using Squidex.Infrastructure; namespace Squidex.Events.Apps diff --git a/src/Squidex.Infrastructure/CQRS/Commands/DefaultDomainObjectRepository.cs b/src/Squidex.Infrastructure/CQRS/Commands/DefaultDomainObjectRepository.cs index 3c163beb2..f4180a4c3 100644 --- a/src/Squidex.Infrastructure/CQRS/Commands/DefaultDomainObjectRepository.cs +++ b/src/Squidex.Infrastructure/CQRS/Commands/DefaultDomainObjectRepository.cs @@ -54,9 +54,12 @@ namespace Squidex.Infrastructure.CQRS.Commands foreach (var storedEvent in events) { - var envelope = formatter.Parse(storedEvent.Data); + var envelope = TryParseEvent(storedEvent); - domainObject.ApplyEvent(envelope); + if (envelope != null) + { + domainObject.ApplyEvent(envelope); + } } if (expectedVersion != null && domainObject.Version != expectedVersion.Value) @@ -87,5 +90,17 @@ namespace Squidex.Infrastructure.CQRS.Commands throw new DomainObjectVersionException(domainObject.Id.ToString(), domainObject.GetType(), versionCurrent, versionExpected); } } + + private Envelope TryParseEvent(StoredEvent storedEvent) + { + try + { + return formatter.Parse(storedEvent.Data); + } + catch (TypeNameNotFoundException) + { + return null; + } + } } } diff --git a/src/Squidex.Infrastructure/CQRS/Events/EventReceiver.cs b/src/Squidex.Infrastructure/CQRS/Events/EventReceiver.cs index c9bf4a866..08b169e32 100644 --- a/src/Squidex.Infrastructure/CQRS/Events/EventReceiver.cs +++ b/src/Squidex.Infrastructure/CQRS/Events/EventReceiver.cs @@ -218,7 +218,7 @@ namespace Squidex.Infrastructure.CQRS.Events return @event; } - catch (ArgumentException) + catch (TypeNameNotFoundException) { return null; } diff --git a/src/Squidex.Infrastructure/TypeNameNotFoundException.cs b/src/Squidex.Infrastructure/TypeNameNotFoundException.cs new file mode 100644 index 000000000..35c5db9ff --- /dev/null +++ b/src/Squidex.Infrastructure/TypeNameNotFoundException.cs @@ -0,0 +1,29 @@ +// ========================================================================== +// TypeNameNotFoundException.cs +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex Group +// All rights reserved. +// ========================================================================== + +using System; + +namespace Squidex.Infrastructure +{ + public class TypeNameNotFoundException : Exception + { + public TypeNameNotFoundException() + { + } + + public TypeNameNotFoundException(string message) + : base(message) + { + } + + public TypeNameNotFoundException(string message, Exception inner) + : base(message, inner) + { + } + } +} diff --git a/src/Squidex.Infrastructure/TypeNameRegistry.cs b/src/Squidex.Infrastructure/TypeNameRegistry.cs index 08457747d..24c099e04 100644 --- a/src/Squidex.Infrastructure/TypeNameRegistry.cs +++ b/src/Squidex.Infrastructure/TypeNameRegistry.cs @@ -90,7 +90,7 @@ namespace Squidex.Infrastructure if (result == null) { - throw new ArgumentException($"There is no name for type '{type}"); + throw new TypeNameNotFoundException($"There is no name for type '{type}"); } return result; @@ -102,7 +102,7 @@ namespace Squidex.Infrastructure if (result == null) { - throw new ArgumentException($"There is no type for name '{name}"); + throw new TypeNameNotFoundException($"There is no type for name '{name}"); } return result; diff --git a/src/Squidex.Read.MongoDb/Apps/MongoAppEntity.cs b/src/Squidex.Read.MongoDb/Apps/MongoAppEntity.cs index 46cc40ff8..050b84bd9 100644 --- a/src/Squidex.Read.MongoDb/Apps/MongoAppEntity.cs +++ b/src/Squidex.Read.MongoDb/Apps/MongoAppEntity.cs @@ -22,7 +22,7 @@ namespace Squidex.Read.MongoDb.Apps { public sealed class MongoAppEntity : MongoEntity, IAppEntity { - private LanguagesConfig languagesConfig = LanguagesConfig.Empty; + private LanguagesConfig languagesConfig; [BsonRequired] [BsonElement] @@ -78,7 +78,14 @@ namespace Squidex.Read.MongoDb.Apps private LanguagesConfig CreateLanguagesConfig() { - return LanguagesConfig.Create(Languages.Select(ToLanguageConfig).ToList()).MakeMaster(MasterLanguage); + languagesConfig = LanguagesConfig.Create(Languages.Select(ToLanguageConfig).ToList()); + + if (MasterLanguage != null) + { + languagesConfig = languagesConfig.MakeMaster(MasterLanguage); + } + + return languagesConfig; } private static MongoAppLanguage FromLanguageConfig(LanguageConfig l) diff --git a/src/Squidex.Read.MongoDb/Apps/MongoAppRepository_EventHandling.cs b/src/Squidex.Read.MongoDb/Apps/MongoAppRepository_EventHandling.cs index 952a2ffa7..8bcd87252 100644 --- a/src/Squidex.Read.MongoDb/Apps/MongoAppRepository_EventHandling.cs +++ b/src/Squidex.Read.MongoDb/Apps/MongoAppRepository_EventHandling.cs @@ -93,15 +93,7 @@ namespace Squidex.Read.MongoDb.Apps { return Collection.UpdateAsync(@event, headers, a => { - a.UpdateLanguages(c => c.Update(@event.Language, @event.IsOptional, @event.Fallback)); - }); - } - - protected Task On(AppMasterLanguageSet @event, EnvelopeHeaders headers) - { - return Collection.UpdateAsync(@event, headers, a => - { - a.UpdateLanguages(c => c.MakeMaster(@event.Language)); + a.UpdateLanguages(c => c.Update(@event.Language, @event.IsOptional, @event.IsMaster, @event.Fallback)); }); } diff --git a/src/Squidex.Read/Apps/AppHistoryEventsCreator.cs b/src/Squidex.Read/Apps/AppHistoryEventsCreator.cs index e561c70e2..241ffe479 100644 --- a/src/Squidex.Read/Apps/AppHistoryEventsCreator.cs +++ b/src/Squidex.Read/Apps/AppHistoryEventsCreator.cs @@ -43,6 +43,9 @@ namespace Squidex.Read.Apps AddEventMessage( "removed language {[Language]}"); + AddEventMessage( + "updated language {[Language]}"); + AddEventMessage( "changed master language to {[Language]}"); } @@ -110,6 +113,15 @@ namespace Squidex.Read.Apps .AddParameter("Language", @event.Language)); } + protected Task On(AppLanguageUpdated @event, EnvelopeHeaders headers) + { + const string channel = "settings.languages"; + + return Task.FromResult( + ForEvent(@event, channel) + .AddParameter("Language", @event.Language)); + } + protected Task On(AppMasterLanguageSet @event, EnvelopeHeaders headers) { const string channel = "settings.languages"; diff --git a/src/Squidex.Read/Apps/Services/Implementations/CachingAppProvider.cs b/src/Squidex.Read/Apps/Services/Implementations/CachingAppProvider.cs index b983bd71a..4bf422b87 100644 --- a/src/Squidex.Read/Apps/Services/Implementations/CachingAppProvider.cs +++ b/src/Squidex.Read/Apps/Services/Implementations/CachingAppProvider.cs @@ -107,6 +107,7 @@ namespace Squidex.Read.Apps.Services.Implementations @event.Payload is AppCreated || @event.Payload is AppLanguageAdded || @event.Payload is AppLanguageRemoved || + @event.Payload is AppLanguageUpdated || @event.Payload is AppMasterLanguageSet) { Remove(((AppEvent)@event.Payload).AppId); diff --git a/src/Squidex.Write/Apps/AppCommandHandler.cs b/src/Squidex.Write/Apps/AppCommandHandler.cs index 54fe46b6f..c449247a4 100644 --- a/src/Squidex.Write/Apps/AppCommandHandler.cs +++ b/src/Squidex.Write/Apps/AppCommandHandler.cs @@ -114,11 +114,6 @@ namespace Squidex.Write.Apps return handler.UpdateAsync(context, a => a.UpdateLanguage(command)); } - protected Task On(SetMasterLanguage command, CommandContext context) - { - return handler.UpdateAsync(context, a => a.SetMasterLanguage(command)); - } - public Task HandleAsync(CommandContext context) { return context.IsHandled ? TaskHelper.False : this.DispatchActionAsync(context.Command, context); diff --git a/src/Squidex.Write/Apps/AppDomainObject.cs b/src/Squidex.Write/Apps/AppDomainObject.cs index 12d27f499..1fbe9917c 100644 --- a/src/Squidex.Write/Apps/AppDomainObject.cs +++ b/src/Squidex.Write/Apps/AppDomainObject.cs @@ -88,12 +88,7 @@ namespace Squidex.Write.Apps protected void On(AppLanguageUpdated @event) { - languagesConfig = languagesConfig.Update(@event.Language, @event.IsOptional, @event.Fallback); - } - - protected void On(AppMasterLanguageSet @event) - { - languagesConfig = languagesConfig.MakeMaster(@event.Language); + languagesConfig = languagesConfig.Update(@event.Language, @event.IsOptional, @event.IsMaster, @event.Fallback); } protected override void DispatchEvent(Envelope @event) @@ -205,17 +200,6 @@ namespace Squidex.Write.Apps return this; } - public AppDomainObject SetMasterLanguage(SetMasterLanguage command) - { - Guard.Valid(command, nameof(command), () => "Cannot set master language"); - - ThrowIfNotCreated(); - - RaiseEvent(SimpleMapper.Map(command, new AppMasterLanguageSet())); - - return this; - } - private void RaiseEvent(AppEvent @event) { if (@event.AppId == null) diff --git a/src/Squidex.Write/Apps/Commands/SetMasterLanguage.cs b/src/Squidex.Write/Apps/Commands/SetMasterLanguage.cs deleted file mode 100644 index 0b5c06409..000000000 --- a/src/Squidex.Write/Apps/Commands/SetMasterLanguage.cs +++ /dev/null @@ -1,26 +0,0 @@ -// ========================================================================== -// SetMasterLanguage.cs -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex Group -// All rights reserved. -// ========================================================================== - -using System.Collections.Generic; -using Squidex.Infrastructure; - -namespace Squidex.Write.Apps.Commands -{ - public sealed class SetMasterLanguage : AppAggregateCommand, IValidatable - { - public Language Language { get; set; } - - public void Validate(IList errors) - { - if (Language == null) - { - errors.Add(new ValidationError("Language cannot be null", nameof(Language))); - } - } - } -} diff --git a/src/Squidex.Write/Apps/Commands/UpdateLanguage.cs b/src/Squidex.Write/Apps/Commands/UpdateLanguage.cs index b1497a40c..65603b69c 100644 --- a/src/Squidex.Write/Apps/Commands/UpdateLanguage.cs +++ b/src/Squidex.Write/Apps/Commands/UpdateLanguage.cs @@ -17,6 +17,8 @@ namespace Squidex.Write.Apps.Commands public bool IsOptional { get; set; } + public bool IsMaster { get; set; } + public List Fallback { get; set; } public void Validate(IList errors) diff --git a/src/Squidex/Controllers/Api/Apps/AppLanguagesController.cs b/src/Squidex/Controllers/Api/Apps/AppLanguagesController.cs index 55ddad316..ea5b76c7b 100644 --- a/src/Squidex/Controllers/Api/Apps/AppLanguagesController.cs +++ b/src/Squidex/Controllers/Api/Apps/AppLanguagesController.cs @@ -66,8 +66,9 @@ namespace Squidex.Controllers.Api.Apps new AppLanguageDto { IsMaster = x == entity.LanguagesConfig.Master, - IsOptional = x.IsOptional - })).ToList(); + IsOptional = x.IsOptional, + Fallback = x.Fallback.ToList() + })).OrderByDescending(x => x.IsMaster).ThenBy(x => x.Iso2Code).ToList(); Response.Headers["ETag"] = new StringValues(entity.Version.ToString()); @@ -114,13 +115,8 @@ namespace Squidex.Controllers.Api.Apps [Route("apps/{app}/languages/{language}")] public async Task Update(string app, string language, [FromBody] UpdateAppLanguageDto model) { - await CommandBus.PublishAsync(SimpleMapper.Map(model, new UpdateLanguage())); - - if (model.IsMaster == true) - { - await CommandBus.PublishAsync(new SetMasterLanguage { Language = ParseLanguage(language) }); - } - + await CommandBus.PublishAsync(SimpleMapper.Map(model, new UpdateLanguage { Language = language })); + return NoContent(); } diff --git a/src/Squidex/Controllers/Api/Apps/Models/AppLanguageDto.cs b/src/Squidex/Controllers/Api/Apps/Models/AppLanguageDto.cs index 97de2029d..b194cd01b 100644 --- a/src/Squidex/Controllers/Api/Apps/Models/AppLanguageDto.cs +++ b/src/Squidex/Controllers/Api/Apps/Models/AppLanguageDto.cs @@ -6,7 +6,9 @@ // All rights reserved. // ========================================================================== +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Squidex.Infrastructure; namespace Squidex.Controllers.Api.Apps.Models { @@ -24,6 +26,12 @@ namespace Squidex.Controllers.Api.Apps.Models [Required] public string EnglishName { get; set; } + /// + /// The fallback languages. + /// + [Required] + public List Fallback { get; set; } + /// /// Indicates if the language is the master language. /// diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html index f8b161d69..59452d34e 100644 --- a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html +++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html @@ -48,13 +48,13 @@ {{eventConsumer.lastHandledEventNumber}} - - - diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.html b/src/Squidex/app/features/administration/pages/users/users-page.component.html index 1cf3240e4..8354c1c19 100644 --- a/src/Squidex/app/features/administration/pages/users/users-page.component.html +++ b/src/Squidex/app/features/administration/pages/users/users-page.component.html @@ -4,7 +4,7 @@
- @@ -64,10 +64,10 @@ - - @@ -82,10 +82,10 @@ 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 f0e825dd3..cf933e6eb 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.html +++ b/src/Squidex/app/features/assets/pages/assets-page.component.html @@ -4,7 +4,7 @@
- @@ -56,10 +56,10 @@ diff --git a/src/Squidex/app/features/content/pages/contents/content-item.component.html b/src/Squidex/app/features/content/pages/contents/content-item.component.html index 9cae38ff1..3bcc29e84 100644 --- a/src/Squidex/app/features/content/pages/contents/content-item.component.html +++ b/src/Squidex/app/features/content/pages/contents/content-item.component.html @@ -12,7 +12,7 @@
-
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 af09083be..e9a6c10e6 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 @@ -4,7 +4,7 @@
- @@ -77,10 +77,10 @@ diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.html b/src/Squidex/app/features/schemas/pages/schema/field.component.html index e22bd3e5b..7ee970201 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.html @@ -22,7 +22,7 @@
-
@@ -111,15 +111,19 @@
-
+
+ +
+ List fields are shown as a column in the content list. If no list field is defined, the first field is shown. +
-
+
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html index ab6e3664d..6af09ea26 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html @@ -14,7 +14,7 @@
-
diff --git a/src/Squidex/app/features/settings/declarations.ts b/src/Squidex/app/features/settings/declarations.ts index 9eb9360d4..701d495c6 100644 --- a/src/Squidex/app/features/settings/declarations.ts +++ b/src/Squidex/app/features/settings/declarations.ts @@ -8,6 +8,7 @@ export * from './pages/clients/client.component'; export * from './pages/clients/clients-page.component'; export * from './pages/contributors/contributors-page.component'; +export * from './pages/languages/language.component'; export * from './pages/languages/languages-page.component'; export * from './settings-area.component'; \ No newline at end of file diff --git a/src/Squidex/app/features/settings/module.ts b/src/Squidex/app/features/settings/module.ts index ed94f73c0..9ebb7639a 100644 --- a/src/Squidex/app/features/settings/module.ts +++ b/src/Squidex/app/features/settings/module.ts @@ -7,6 +7,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { DndModule } from 'ng2-dnd'; import { HelpComponent, @@ -19,6 +20,7 @@ import { ClientComponent, ClientsPageComponent, ContributorsPageComponent, + LanguageComponent, LanguagesPageComponent, SettingsAreaComponent } from './declarations'; @@ -97,6 +99,7 @@ const routes: Routes = [ @NgModule({ imports: [ + DndModule, SqxFrameworkModule, SqxSharedModule, RouterModule.forChild(routes) @@ -105,6 +108,7 @@ const routes: Routes = [ ClientComponent, ClientsPageComponent, ContributorsPageComponent, + LanguageComponent, LanguagesPageComponent, SettingsAreaComponent ] diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.html b/src/Squidex/app/features/settings/pages/clients/client.component.html index cb98e2425..e5831d678 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.html +++ b/src/Squidex/app/features/settings/pages/clients/client.component.html @@ -22,7 +22,7 @@ - diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html index f5bba22c7..70032a0a9 100644 --- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html +++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html @@ -22,23 +22,6 @@ - - - -   - - - Name - - - Email - - - Actions - - - - diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.html b/src/Squidex/app/features/settings/pages/languages/language.component.html new file mode 100644 index 000000000..58f2e25dc --- /dev/null +++ b/src/Squidex/app/features/settings/pages/languages/language.component.html @@ -0,0 +1,82 @@ +
+
+
+
+ {{language.iso2Code}} +
+
+ {{language.englishName}} +
+
+
+ + + +
+
+
+
+ +
+
+
+
+ + +
+
+ +
+
+ + +
+
+
+ {{language.englishName}} + + +
+
+ + +
+ +
+ + + +
+
+ +
+ + +
+ Master language is the last fallback language, when no value for a content and a language is available. +
+
+ +
+ + +
+ Values for optional languages must not be specified, even if the field is set to required. +
+
+
+ +
+
\ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.scss b/src/Squidex/app/features/settings/pages/languages/language.component.scss new file mode 100644 index 000000000..d4f7b2d16 --- /dev/null +++ b/src/Squidex/app/features/settings/pages/languages/language.component.scss @@ -0,0 +1,110 @@ +@import '_vars'; +@import '_mixins'; + +$field-header: #e7ebef; + +.table-items-row { + padding: 0; +} + +.language { + &-summary { + padding: 1rem 1.25rem; + position: relative; + line-height: 2.5rem; + } + + &-edit-button { + & { + color: $color-theme-blue; + line-height: 1rem; + font-size: 1rem; + font-weight: normal; + } + + &:hover { + color: $color-theme-blue-dark; + } + + &.active { + background: $color-theme-blue; + border-color: $color-theme-blue; + color: $color-dark-foreground; + } + } + + &-name { + @include truncate; + } + + &-master { + font-weight: bold; + } + + &-details { + & { + position: relative; + } + + &::before { + @include caret-top; + @include absolute(-.5rem, 5.5rem, auto, auto); + border-color: transparent transparent $color-border; + border-width: .6rem; + } + + &-tab { + padding: 1rem 1.25rem 1.25rem; + } + + &-tabs { + background: $color-border; + position: relative; + padding: 1rem 1.25rem; + } + } +} + +.btn-danger { + width: 3.2rem; +} + +.master { + font-weight: bold; +} + +.fallback { + &-languages { + @include border-radius; + min-height: 2rem; + background: $color-border; + border: 0; + padding: .5rem; + } + + &-language { + & { + @include border-radius(2px); + padding: .5rem; + background: $color-dark-foreground; + border: 0; + margin-bottom: .5rem; + } + + &:last-child { + margin: 0; + } + } + + &-label { + margin-top: .4rem; + } + + &-form { + margin-top: .5rem; + } + + &-select { + width: 14rem; + } +} \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.ts b/src/Squidex/app/features/settings/pages/languages/language.component.ts new file mode 100644 index 000000000..88441683d --- /dev/null +++ b/src/Squidex/app/features/settings/pages/languages/language.component.ts @@ -0,0 +1,131 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Sebastian Stehle. All rights reserved + */ + +import { Component, EventEmitter, Input, OnChanges, Output, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; + +import { + AppLanguageDto, + fadeAnimation, + ImmutableArray +} from 'shared'; + +@Component({ + selector: 'sqx-language', + styleUrls: ['./language.component.scss'], + templateUrl: './language.component.html', + animations: [ + fadeAnimation + ] +}) +export class LanguageComponent implements OnInit, OnChanges { + @Input() + public language: AppLanguageDto; + + @Input() + public allLanguages: ImmutableArray; + + @Output() + public removing = new EventEmitter(); + + @Output() + public saving = new EventEmitter(); + + public otherLanguages: ImmutableArray; + + public fallbackLanguages: AppLanguageDto[] = []; + + public isEditing = false; + + public editFormSubmitted = false; + public editForm: FormGroup = + this.formBuilder.group({ + isMaster: [false, []], + isOptional: [false, []] + }); + + public addLanguageForm: FormGroup = + this.formBuilder.group({ + language: [null, + Validators.required + ] + }); + + constructor( + private readonly formBuilder: FormBuilder + ) { + } + + public ngOnInit() { + this.resetForm(); + } + + public ngOnChanges() { + this.resetForm(); + } + + public cancel() { + this.resetForm(); + } + + public toggleEditing() { + this.isEditing = !this.isEditing; + } + + public addLanguage() { + this.addFallbackLanguage(this.addLanguageForm.get('language')!.value); + } + + public removeFallbackLanguage(language: AppLanguageDto) { + this.fallbackLanguages.splice(this.fallbackLanguages.indexOf(language), 1); + + this.otherLanguages = this.otherLanguages.push(language); + } + + public addFallbackLanguage(language: AppLanguageDto) { + this.fallbackLanguages.push(language); + + this.otherLanguages = this.otherLanguages.filter(l => l.iso2Code !== language.iso2Code); + } + + public save() { + this.editFormSubmitted = true; + + if (this.editForm.valid) { + const newLanguage = + new AppLanguageDto( + this.language.iso2Code, + this.language.englishName, + this.editForm.get('isMaster')!.value, + this.editForm.get('isOptional')!.value, + this.fallbackLanguages.map(l => l.iso2Code)); + + this.saving.emit(newLanguage); + } + } + + private resetForm() { + this.editFormSubmitted = false; + this.editForm.reset(this.language); + + this.isEditing = false; + + if (this.language && this.allLanguages) { + this.otherLanguages = + this.allLanguages.filter(l => + this.language.iso2Code !== l.iso2Code && + this.language.fallback.indexOf(l.iso2Code) < 0); + } + + if (this.language) { + this.fallbackLanguages = + this.allLanguages.filter(l => + this.language.fallback.indexOf(l.iso2Code) >= 0).values; + } + } +} + diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.html b/src/Squidex/app/features/settings/pages/languages/languages-page.component.html index 657067bc1..74cfe2709 100644 --- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.html +++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.html @@ -13,56 +13,11 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Code - - Name - - Actions -
- - {{language.iso2Code}} - - - - {{language.englishName}} - - - - - -
+
+ +
diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts index a9992e90f..546cdc58a 100644 --- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts +++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts @@ -20,7 +20,6 @@ import { LanguageDto, LanguageService, NotificationService, - UpdateAppLanguageDto, Version } from 'shared'; @@ -33,6 +32,7 @@ export class LanguagesPageComponent extends AppComponentBase implements OnInit { private version = new Version(); public allLanguages: LanguageDto[] = []; + public newLanguages: LanguageDto[] = []; public appLanguages = ImmutableArray.empty(); public addLanguageForm: FormGroup = @@ -42,10 +42,6 @@ export class LanguagesPageComponent extends AppComponentBase implements OnInit { ] }); - public get newLanguages(): LanguageDto[] { - return this.allLanguages.filter(x => !this.appLanguages.find(l => l.iso2Code === x.iso2Code)); - } - constructor(apps: AppsStoreService, notifications: NotificationService, private readonly appLanguagesService: AppLanguagesService, private readonly languagesService: LanguageService, @@ -76,6 +72,16 @@ export class LanguagesPageComponent extends AppComponentBase implements OnInit { }); } + public updateLanguage(language: AppLanguageDto) { + this.appNameOnce() + .switchMap(app => this.appLanguagesService.updateLanguage(app, language.iso2Code, language, this.version)) + .subscribe(dto => { + this.updateLanguages(this.appLanguages.map(l => l.iso2Code === language.iso2Code ? language : l)); + }, error => { + this.notifyError(error); + }); + } + public removeLanguage(language: AppLanguageDto) { this.appNameOnce() .switchMap(app => this.appLanguagesService.deleteLanguage(app, language.iso2Code, this.version)) @@ -98,32 +104,12 @@ export class LanguagesPageComponent extends AppComponentBase implements OnInit { }); } - public setMasterLanguage(language: AppLanguageDto) { - const request = new UpdateAppLanguageDto(true); - - this.appNameOnce() - .switchMap(app => this.appLanguagesService.updateLanguage(app, language.iso2Code, request, this.version)) - .subscribe(() => { - this.updateLanguages(this.appLanguages.map(l => { - const isMasterLanguage = l === language; - - if (isMasterLanguage !== l.isMasterLanguage) { - return new AppLanguageDto(l.iso2Code, l.englishName, isMasterLanguage); - } else { - return l; - } - })); - }, error => { - this.notifyError(error); - }); - - return false; - } - private updateLanguages(languages: ImmutableArray) { this.addLanguageForm.reset(); this.appLanguages = languages; + this.newLanguages = this.allLanguages.filter(x => !this.appLanguages.find(l => l.iso2Code === x.iso2Code)); + this.messageBus.publish(new HistoryChannelUpdated()); } } diff --git a/src/Squidex/app/shared/services/app-languages.service.spec.ts b/src/Squidex/app/shared/services/app-languages.service.spec.ts index 708f27479..8a2d97d00 100644 --- a/src/Squidex/app/shared/services/app-languages.service.spec.ts +++ b/src/Squidex/app/shared/services/app-languages.service.spec.ts @@ -38,7 +38,9 @@ describe('AppLanguagesService', () => { { iso2Code: 'de', englishName: 'German', - isMasterLanguage: true + isMaster: true, + isOptional: true, + fallback: ['de', 'en'] }, { iso2Code: 'en', @@ -58,8 +60,8 @@ describe('AppLanguagesService', () => { expect(languages).toEqual( [ - new AppLanguageDto('de', 'German', true), - new AppLanguageDto('en', 'English', false) + new AppLanguageDto('de', 'German', true, true, ['de', 'en']), + new AppLanguageDto('en', 'English', false, false, undefined) ]); authService.verifyAll(); @@ -88,13 +90,13 @@ describe('AppLanguagesService', () => { }); expect(language).toEqual( - new AppLanguageDto('de', 'German', false)); + new AppLanguageDto('de', 'German', false, false, undefined)); authService.verifyAll(); }); it('should make put request to make master language', () => { - const dto = new UpdateAppLanguageDto(true); + const dto = new UpdateAppLanguageDto(true, true, []); authService.setup(x => x.authPut('http://service/p/api/apps/my-app/languages/de', dto, version)) .returns(() => Observable.of( diff --git a/src/Squidex/app/shared/services/app-languages.service.ts b/src/Squidex/app/shared/services/app-languages.service.ts index 0077be52f..451cb64b9 100644 --- a/src/Squidex/app/shared/services/app-languages.service.ts +++ b/src/Squidex/app/shared/services/app-languages.service.ts @@ -17,7 +17,9 @@ export class AppLanguageDto { constructor( public readonly iso2Code: string, public readonly englishName: string, - public readonly isMasterLanguage: boolean + public readonly isMaster: boolean, + public readonly isOptional: boolean, + public readonly fallback: string[] ) { } } @@ -31,7 +33,9 @@ export class AddAppLanguageDto { export class UpdateAppLanguageDto { constructor( - public readonly isMasterLanguage: boolean + public readonly isMaster: boolean, + public readonly isOptional: boolean, + public readonly fallback: string[] ) { } } @@ -56,7 +60,9 @@ export class AppLanguagesService { return new AppLanguageDto( item.iso2Code, item.englishName, - item.isMasterLanguage === true); + item.isMaster === true, + item.isOptional === true, + item.fallback); }); }) .catchError('Failed to load languages. Please reload.'); @@ -71,7 +77,9 @@ export class AppLanguagesService { return new AppLanguageDto( response.iso2Code, response.englishName, - response.isMasterLanguage === true); + response.isMaster === true, + response.isOptional === true, + response.fallback); }) .catchError('Failed to add language. Please reload.'); } diff --git a/src/Squidex/app/theme/_bootstrap.scss b/src/Squidex/app/theme/_bootstrap.scss index d1590ac54..0a2e202dc 100644 --- a/src/Squidex/app/theme/_bootstrap.scss +++ b/src/Squidex/app/theme/_bootstrap.scss @@ -167,7 +167,7 @@ body { } .btn { - &-simple { + &-decent { & { background: transparent; color: $color-border-dark; @@ -230,12 +230,16 @@ body { } &-link { + & { + @include link-button($color-theme-blue); + } + &.btn-danger { @include link-button($color-theme-error); } - &.btn-primary { - @include link-button($color-theme-blue); + &.btn-success { + @include link-button($color-theme-green); } } } diff --git a/src/Squidex/app/theme/_common.scss b/src/Squidex/app/theme/_common.scss index 5466b4c63..5f45eb60d 100644 --- a/src/Squidex/app/theme/_common.scss +++ b/src/Squidex/app/theme/_common.scss @@ -77,6 +77,10 @@ h1 { display: none; } +.invisible { + visibility: hidden; +} + .item-modified { font-size: .8rem; } \ No newline at end of file diff --git a/tests/Squidex.Core.Tests/ContentValidationTests.cs b/tests/Squidex.Core.Tests/ContentValidationTests.cs index 40e0992f4..97355dfce 100644 --- a/tests/Squidex.Core.Tests/ContentValidationTests.cs +++ b/tests/Squidex.Core.Tests/ContentValidationTests.cs @@ -141,7 +141,7 @@ namespace Squidex.Core public async Task Should_not_add_error_if_required_field_has_no_value_for_optional_language() { var optionalConfig = - LanguagesConfig.Create(Language.ES, Language.IT).Update(Language.IT, true, null); + LanguagesConfig.Create(Language.ES, Language.IT).Update(Language.IT, true, false, null); schema = schema.AddOrUpdateField(new StringField(1, "my-field", new StringFieldProperties { IsLocalizable = true, IsRequired = true })); diff --git a/tests/Squidex.Core.Tests/Contents/ContentDataTests.cs b/tests/Squidex.Core.Tests/Contents/ContentDataTests.cs index 435a3e5b3..62eca4396 100644 --- a/tests/Squidex.Core.Tests/Contents/ContentDataTests.cs +++ b/tests/Squidex.Core.Tests/Contents/ContentDataTests.cs @@ -276,7 +276,7 @@ namespace Squidex.Core.Contents var fallbackConfig = LanguagesConfig.Create(Language.DE).Add(Language.EN) - .Update(Language.DE, false, new[] { Language.EN }); + .Update(Language.DE, false, false, new[] { Language.EN }); var output = (Dictionary)data.ToLanguageModel(fallbackConfig, new List { Language.DE }); diff --git a/tests/Squidex.Core.Tests/LanguagesConfigTests.cs b/tests/Squidex.Core.Tests/LanguagesConfigTests.cs index 3a6d1f519..aeb5d6a3c 100644 --- a/tests/Squidex.Core.Tests/LanguagesConfigTests.cs +++ b/tests/Squidex.Core.Tests/LanguagesConfigTests.cs @@ -136,8 +136,8 @@ namespace Squidex.Core LanguagesConfig.Create(Language.DE) .Add(Language.IT) .Add(Language.RU) - .Update(Language.DE, false, new[] { Language.RU, Language.IT }) - .Update(Language.RU, false, new[] { Language.DE, Language.IT }) + .Update(Language.DE, false, false, new[] { Language.RU, Language.IT }) + .Update(Language.RU, false, false, new[] { Language.DE, Language.IT }) .Remove(Language.IT); config.ToList().ShouldBeEquivalentTo( @@ -167,7 +167,7 @@ namespace Squidex.Core [Fact] public void Should_update_language() { - var config = LanguagesConfig.Create(Language.DE).Add(Language.IT).Update(Language.IT, true, new[] { Language.DE }); + var config = LanguagesConfig.Create(Language.DE).Add(Language.IT).Update(Language.IT, true, false, new[] { Language.DE }); config.ToList().ShouldBeEquivalentTo( new List @@ -177,12 +177,20 @@ namespace Squidex.Core }); } + [Fact] + public void Should_also_set_make_master_when_updating_language() + { + var config = LanguagesConfig.Create(Language.DE).Add(Language.IT).Update(Language.IT, true, true, null); + + Assert.Equal(Language.IT, config.Master.Language); + } + [Fact] public void Should_throw_exception_if_language_to_update_is_not_found() { var config = LanguagesConfig.Create(Language.DE); - Assert.Throws(() => config.Update(Language.EN, true, null)); + Assert.Throws(() => config.Update(Language.EN, true, false, null)); } [Fact] @@ -190,7 +198,7 @@ namespace Squidex.Core { var config = LanguagesConfig.Create(Language.DE); - Assert.Throws(() => config.Update(Language.DE, true, new [] { Language.EN })); + Assert.Throws(() => config.Update(Language.DE, true, false, new[] { Language.EN })); } [Fact] @@ -198,7 +206,15 @@ namespace Squidex.Core { var config = LanguagesConfig.Create(Language.DE); - Assert.Throws(() => config.Update(Language.DE, true, null)); + Assert.Throws(() => config.Update(Language.DE, true, false, null)); + } + + [Fact] + public void Should_throw_exception_if_language_to_make_optional_must_be_set_to_master() + { + var config = LanguagesConfig.Create(Language.DE).Add(Language.IT); + + Assert.Throws(() => config.Update(Language.DE, true, true, null)); } [Fact] diff --git a/tests/Squidex.Infrastructure.Tests/TypeNameRegistryTests.cs b/tests/Squidex.Infrastructure.Tests/TypeNameRegistryTests.cs index 0133c55a5..2a72a2512 100644 --- a/tests/Squidex.Infrastructure.Tests/TypeNameRegistryTests.cs +++ b/tests/Squidex.Infrastructure.Tests/TypeNameRegistryTests.cs @@ -7,6 +7,7 @@ // ========================================================================== using System; +using System.Collections.Generic; using System.Reflection; using Xunit; @@ -83,13 +84,13 @@ namespace Squidex.Infrastructure [Fact] public void Should_throw_if_name_is_not_supported() { - Assert.Throws(() => sut.GetType("unsupported")); + Assert.Throws(() => sut.GetType("unsupported")); } [Fact] public void Should_throw_if_type_is_not_supported() { - Assert.Throws(() => sut.GetName()); + Assert.Throws(() => sut.GetName()); } } } diff --git a/tests/Squidex.Write.Tests/Apps/AppCommandHandlerTests.cs b/tests/Squidex.Write.Tests/Apps/AppCommandHandlerTests.cs index 45e940379..a939c7e9f 100644 --- a/tests/Squidex.Write.Tests/Apps/AppCommandHandlerTests.cs +++ b/tests/Squidex.Write.Tests/Apps/AppCommandHandlerTests.cs @@ -213,20 +213,6 @@ namespace Squidex.Write.Apps }); } - [Fact] - public async Task SetMasterLanguage_should_update_domain_object() - { - CreateApp() - .AddLanguage(CreateCommand(new AddLanguage { Language = language })); - - var context = CreateContextForCommand(new SetMasterLanguage { Language = language }); - - await TestUpdate(app, async _ => - { - await sut.HandleAsync(context); - }); - } - [Fact] public async Task UpdateLanguage_should_update_domain_object() { diff --git a/tests/Squidex.Write.Tests/Apps/AppDomainObjectTests.cs b/tests/Squidex.Write.Tests/Apps/AppDomainObjectTests.cs index 523680dbf..5572fd1d0 100644 --- a/tests/Squidex.Write.Tests/Apps/AppDomainObjectTests.cs +++ b/tests/Squidex.Write.Tests/Apps/AppDomainObjectTests.cs @@ -442,51 +442,6 @@ namespace Squidex.Write.Apps ); } - [Fact] - public void SetMasterLanguage_should_throw_if_not_created() - { - Assert.Throws(() => - { - sut.SetMasterLanguage(CreateCommand(new SetMasterLanguage { Language = Language.EN })); - }); - } - - [Fact] - public void SetMasterLanguage_should_throw_if_command_is_not_valid() - { - CreateApp(); - - Assert.Throws(() => - { - sut.SetMasterLanguage(CreateCommand(new SetMasterLanguage())); - }); - } - - [Fact] - public void SetMasterLanguage_should_throw_if_language_not_found() - { - CreateApp(); - - Assert.Throws(() => - { - sut.SetMasterLanguage(CreateCommand(new SetMasterLanguage { Language = Language.DE })); - }); - } - - [Fact] - public void SetMasterLanguage_should_create_events() - { - CreateApp(); - CreateLanguage(Language.DE); - - sut.SetMasterLanguage(CreateCommand(new SetMasterLanguage { Language = Language.DE })); - - sut.GetUncomittedEvents() - .ShouldHaveSameEvents( - CreateEvent(new AppMasterLanguageSet { Language = Language.DE }) - ); - } - [Fact] public void UpdateLanguage_should_throw_if_not_created() {