diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/EnrichedEvents/EnrichedAssetEventType.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/EnrichedEvents/EnrichedAssetEventType.cs index 0e66499b2..b4c3ebde0 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/EnrichedEvents/EnrichedAssetEventType.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/EnrichedEvents/EnrichedAssetEventType.cs @@ -11,7 +11,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules.EnrichedEvents { Created, Deleted, - Renamed, + Annotated, Updated } } \ No newline at end of file diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/IAssetInfo.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/IAssetInfo.cs index aeeae13d6..9e7ff611d 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/IAssetInfo.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/IAssetInfo.cs @@ -23,6 +23,6 @@ namespace Squidex.Domain.Apps.Core.ValidateContent string FileName { get; } - string FileNameSlug { get; } + string Slug { get; } } } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetEntity.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetEntity.cs index 11073b902..8850ef500 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetEntity.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetEntity.cs @@ -40,7 +40,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets [BsonIgnoreIfDefault] [BsonElement] - public string FileNameSlug { get; set; } + public string Slug { get; set; } [BsonRequired] [BsonElement] diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs index a64cf8949..e203ac95d 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs @@ -46,7 +46,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets .Ascending(x => x.Tags) .Descending(x => x.LastModified)), new CreateIndexModel( - Index.Ascending(x => x.FileNameSlug)) + Index.Ascending(x => x.Slug)) }, ct); } @@ -107,7 +107,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets using (Profiler.TraceMethod()) { var assetEntity = - await Collection.Find(x => x.FileNameSlug == slug) + await Collection.Find(x => x.Slug == slug) .FirstOrDefaultAsync(); return assetEntity; diff --git a/src/Squidex.Domain.Apps.Entities/Assets/AssetChangedTriggerHandler.cs b/src/Squidex.Domain.Apps.Entities/Assets/AssetChangedTriggerHandler.cs index 7c23af11e..e7e9f0cf5 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/AssetChangedTriggerHandler.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/AssetChangedTriggerHandler.cs @@ -49,8 +49,8 @@ namespace Squidex.Domain.Apps.Entities.Assets case AssetCreated _: result.Type = EnrichedAssetEventType.Created; break; - case AssetRenamed _: - result.Type = EnrichedAssetEventType.Renamed; + case AssetAnnotated _: + result.Type = EnrichedAssetEventType.Annotated; break; case AssetUpdated _: result.Type = EnrichedAssetEventType.Updated; diff --git a/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs b/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs index 7ba5ea4ab..ec7b92db2 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs @@ -62,15 +62,6 @@ namespace Squidex.Domain.Apps.Entities.Assets return new AssetSavedResult(Version, Snapshot.FileVersion); }); - case TagAsset tagAsset: - return UpdateAsync(tagAsset, async c => - { - GuardAsset.CanTag(c); - - c.Tags = await NormalizeTagsAsync(Snapshot.AppId.Id, c.Tags); - - Tag(c); - }); case DeleteAsset deleteAsset: return UpdateAsync(deleteAsset, async c => { @@ -80,12 +71,17 @@ namespace Squidex.Domain.Apps.Entities.Assets Delete(c); }); - case RenameAsset renameAsset: - return UpdateAsync(renameAsset, c => + case AnnotateAsset annotateAsset: + return UpdateAsync(annotateAsset, async c => { - GuardAsset.CanRename(c, Snapshot.FileName); + GuardAsset.CanAnnotate(c, Snapshot.FileName, Snapshot.Slug); + + if (c.Tags != null) + { + c.Tags = await NormalizeTagsAsync(Snapshot.AppId.Id, c.Tags); + } - Rename(c); + Annotate(c); }); default: throw new NotSupportedException(); @@ -109,7 +105,8 @@ namespace Squidex.Domain.Apps.Entities.Assets MimeType = command.File.MimeType, PixelWidth = command.ImageInfo?.PixelWidth, PixelHeight = command.ImageInfo?.PixelHeight, - IsImage = command.ImageInfo != null + IsImage = command.ImageInfo != null, + Slug = command.File.FileName.ToAssetSlug() }); RaiseEvent(@event); @@ -137,14 +134,9 @@ namespace Squidex.Domain.Apps.Entities.Assets RaiseEvent(SimpleMapper.Map(command, new AssetDeleted { DeletedSize = Snapshot.TotalSize })); } - public void Rename(RenameAsset command) - { - RaiseEvent(SimpleMapper.Map(command, new AssetRenamed())); - } - - public void Tag(TagAsset command) + public void Annotate(AnnotateAsset command) { - RaiseEvent(SimpleMapper.Map(command, new AssetTagged())); + RaiseEvent(SimpleMapper.Map(command, new AssetAnnotated())); } private void RaiseEvent(AppEvent @event) diff --git a/src/Squidex.Domain.Apps.Entities/Assets/Commands/TagAsset.cs b/src/Squidex.Domain.Apps.Entities/Assets/Commands/AnnotateAsset.cs similarity index 78% rename from src/Squidex.Domain.Apps.Entities/Assets/Commands/TagAsset.cs rename to src/Squidex.Domain.Apps.Entities/Assets/Commands/AnnotateAsset.cs index 7ca591f53..4d9059168 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/Commands/TagAsset.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/Commands/AnnotateAsset.cs @@ -9,8 +9,12 @@ using System.Collections.Generic; namespace Squidex.Domain.Apps.Entities.Assets.Commands { - public sealed class TagAsset : AssetCommand + public sealed class AnnotateAsset : AssetCommand { + public string FileName { get; set; } + + public string Slug { get; set; } + public HashSet Tags { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Assets/Commands/RenameAsset.cs b/src/Squidex.Domain.Apps.Entities/Assets/Commands/RenameAsset.cs deleted file mode 100644 index 65cba7f35..000000000 --- a/src/Squidex.Domain.Apps.Entities/Assets/Commands/RenameAsset.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.Domain.Apps.Entities.Assets.Commands -{ - public sealed class RenameAsset : AssetCommand - { - public string FileName { get; set; } - } -} diff --git a/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAsset.cs b/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAsset.cs index 68d727f4c..4cf2fbfe9 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAsset.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAsset.cs @@ -12,21 +12,28 @@ namespace Squidex.Domain.Apps.Entities.Assets.Guards { public static class GuardAsset { - public static void CanRename(RenameAsset command, string oldName) + public static void CanAnnotate(AnnotateAsset command, string oldFileName, string oldSlug) { Guard.NotNull(command, nameof(command)); Validate.It(() => "Cannot rename asset.", e => { - if (string.IsNullOrWhiteSpace(command.FileName)) + if (string.IsNullOrWhiteSpace(command.FileName) && + string.IsNullOrWhiteSpace(command.Slug) && + command.Tags == null) { - e(Not.Defined("Name"), nameof(command.FileName)); + e("Either file name, slug or tags must be defined.", nameof(command.FileName), nameof(command.Slug), nameof(command.Tags)); } - if (string.Equals(command.FileName, oldName)) + if (!string.IsNullOrWhiteSpace(command.FileName) && string.Equals(command.FileName, oldFileName)) { e(Not.New("Asset", "name"), nameof(command.FileName)); } + + if (!string.IsNullOrWhiteSpace(command.Slug) && string.Equals(command.Slug, oldSlug)) + { + e(Not.New("Asset", "slug"), nameof(command.Slug)); + } }); } @@ -35,11 +42,6 @@ namespace Squidex.Domain.Apps.Entities.Assets.Guards Guard.NotNull(command, nameof(command)); } - public static void CanTag(TagAsset command) - { - Guard.NotNull(command, nameof(command)); - } - public static void CanUpdate(UpdateAsset command) { Guard.NotNull(command, nameof(command)); diff --git a/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs b/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs index d5503c1ec..2ea47f7ab 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs @@ -30,7 +30,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.State public string MimeType { get; set; } [DataMember] - public string FileNameSlug { get; set; } + public string Slug { get; set; } [DataMember] public long FileVersion { get; set; } @@ -66,7 +66,15 @@ namespace Squidex.Domain.Apps.Entities.Assets.State SimpleMapper.Map(@event, this); FileName = @event.FileName; - FileNameSlug = @event.FileName.ToAssetSlug(); + + if (string.IsNullOrWhiteSpace(@event.Slug)) + { + Slug = @event.FileName.ToAssetSlug(); + } + else + { + Slug = @event.Slug; + } TotalSize += @event.FileSize; } @@ -78,15 +86,22 @@ namespace Squidex.Domain.Apps.Entities.Assets.State TotalSize += @event.FileSize; } - protected void On(AssetRenamed @event) - { - FileName = @event.FileName; - FileNameSlug = @event.FileName.ToAssetSlug(); - } - - protected void On(AssetTagged @event) + protected void On(AssetAnnotated @event) { - Tags = @event.Tags; + if (!string.IsNullOrWhiteSpace(@event.FileName)) + { + FileName = @event.FileName; + } + + if (!string.IsNullOrWhiteSpace(@event.Slug)) + { + Slug = @event.Slug; + } + + if (@event.Tags != null) + { + Tags = @event.Tags; + } } protected void On(AssetDeleted @event) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetGraphType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetGraphType.cs index 9275af29f..b5d470564 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetGraphType.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetGraphType.cs @@ -101,9 +101,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types AddField(new FieldType { - Name = "fileNameSlug", + Name = "slug", ResolvedType = AllTypes.NonNullString, - Resolver = Resolve(x => x.FileNameSlug), + Resolver = Resolve(x => x.Slug), Description = "The file name as slug." }); diff --git a/src/Squidex.Domain.Apps.Events/Assets/AssetTagged.cs b/src/Squidex.Domain.Apps.Events/Assets/AssetAnnotated.cs similarity index 75% rename from src/Squidex.Domain.Apps.Events/Assets/AssetTagged.cs rename to src/Squidex.Domain.Apps.Events/Assets/AssetAnnotated.cs index fb555b515..d2cec90a8 100644 --- a/src/Squidex.Domain.Apps.Events/Assets/AssetTagged.cs +++ b/src/Squidex.Domain.Apps.Events/Assets/AssetAnnotated.cs @@ -10,9 +10,13 @@ using Squidex.Infrastructure.EventSourcing; namespace Squidex.Domain.Apps.Events.Assets { - [EventType(nameof(AssetTagged))] - public sealed class AssetTagged : AssetEvent + [EventType(nameof(AssetAnnotated))] + public sealed class AssetAnnotated : AssetEvent { + public string FileName { get; set; } + + public string Slug { get; set; } + public HashSet Tags { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Events/Assets/AssetCreated.cs b/src/Squidex.Domain.Apps.Events/Assets/AssetCreated.cs index 2266f7f2e..568c324e0 100644 --- a/src/Squidex.Domain.Apps.Events/Assets/AssetCreated.cs +++ b/src/Squidex.Domain.Apps.Events/Assets/AssetCreated.cs @@ -17,6 +17,8 @@ namespace Squidex.Domain.Apps.Events.Assets public string MimeType { get; set; } + public string Slug { get; set; } + public long FileVersion { get; set; } public long FileSize { get; set; } diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs index 0d00940d3..041adcdde 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs @@ -237,7 +237,7 @@ namespace Squidex.Areas.Api.Controllers.Assets [AssetRequestSizeLimit] [ApiPermission(Permissions.AppAssetsUpdate)] [ApiCosts(1)] - public async Task PutAsset(string app, Guid id, [FromBody] UpdateAssetDto request) + public async Task PutAsset(string app, Guid id, [FromBody] AnnotateAssetDto request) { await CommandBus.PublishAsync(request.ToCommand(id)); diff --git a/src/Squidex/Areas/Api/Controllers/Assets/Models/UpdateAssetDto.cs b/src/Squidex/Areas/Api/Controllers/Assets/Models/AnnotateAssetDto.cs similarity index 75% rename from src/Squidex/Areas/Api/Controllers/Assets/Models/UpdateAssetDto.cs rename to src/Squidex/Areas/Api/Controllers/Assets/Models/AnnotateAssetDto.cs index 092ec196d..60c645d02 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/Models/UpdateAssetDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/Models/AnnotateAssetDto.cs @@ -8,16 +8,22 @@ using System; using System.Collections.Generic; using Squidex.Domain.Apps.Entities.Assets.Commands; +using Squidex.Infrastructure.Reflection; namespace Squidex.Areas.Api.Controllers.Assets.Models { - public sealed class UpdateAssetDto + public sealed class AnnotateAssetDto { /// /// The new name of the asset. /// public string FileName { get; set; } + /// + /// The new slug of the asset. + /// + public string Slug { get; set; } + /// /// The new asset tags. /// @@ -25,14 +31,7 @@ namespace Squidex.Areas.Api.Controllers.Assets.Models public AssetCommand ToCommand(Guid id) { - if (Tags != null) - { - return new TagAsset { AssetId = id, Tags = Tags }; - } - else - { - return new RenameAsset { AssetId = id, FileName = FileName }; - } + return SimpleMapper.Map(this, new AnnotateAsset { AssetId = id }); } } } diff --git a/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetCreatedDto.cs b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetCreatedDto.cs index 428435d2a..0b1807312 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetCreatedDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetCreatedDto.cs @@ -33,6 +33,12 @@ namespace Squidex.Areas.Api.Controllers.Assets.Models [Required] public string FileName { get; set; } + /// + /// The slug. + /// + [Required] + public string Slug { get; set; } + /// /// The mime type. /// diff --git a/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs index 6c099c78f..e13b76993 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs @@ -30,10 +30,10 @@ namespace Squidex.Areas.Api.Controllers.Assets.Models public string FileName { get; set; } /// - /// The file name as a slug. + /// The slug. /// [Required] - public string FileNameSlug { get; set; } + public string Slug { get; set; } /// /// The mime type. 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 59a73c5e1..6664745ac 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 @@ -59,7 +59,7 @@ - + Error diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.html b/src/Squidex/app/features/apps/pages/apps-page.component.html index 753c903af..7451b1e7b 100644 --- a/src/Squidex/app/features/apps/pages/apps-page.component.html +++ b/src/Squidex/app/features/apps/pages/apps-page.component.html @@ -95,18 +95,18 @@ + (complete)="addAppDialog.hide()"> + (close)="onboardingDialog.hide()"> + (close)="newsDialog.hide()"> \ No newline at end of file diff --git a/src/Squidex/app/features/apps/pages/news-dialog.component.html b/src/Squidex/app/features/apps/pages/news-dialog.component.html index ae21142e0..3b8e5dc4f 100644 --- a/src/Squidex/app/features/apps/pages/news-dialog.component.html +++ b/src/Squidex/app/features/apps/pages/news-dialog.component.html @@ -1,4 +1,4 @@ - + New Features diff --git a/src/Squidex/app/features/apps/pages/news-dialog.component.ts b/src/Squidex/app/features/apps/pages/news-dialog.component.ts index 2a924341e..01d0ce8d9 100644 --- a/src/Squidex/app/features/apps/pages/news-dialog.component.ts +++ b/src/Squidex/app/features/apps/pages/news-dialog.component.ts @@ -19,9 +19,9 @@ export class NewsDialogComponent { public features: FeatureDto[]; @Output() - public closed = new EventEmitter(); + public close = new EventEmitter(); - public close() { - this.closed.emit(); + public emitClose() { + this.close.emit(); } } \ No newline at end of file diff --git a/src/Squidex/app/features/apps/pages/onboarding-dialog.component.html b/src/Squidex/app/features/apps/pages/onboarding-dialog.component.html index 48f5725fc..d60e4716b 100644 --- a/src/Squidex/app/features/apps/pages/onboarding-dialog.component.html +++ b/src/Squidex/app/features/apps/pages/onboarding-dialog.component.html @@ -1,6 +1,6 @@ - Skip Tour + Skip Tour
diff --git a/src/Squidex/app/features/apps/pages/onboarding-dialog.component.ts b/src/Squidex/app/features/apps/pages/onboarding-dialog.component.ts index fa8bde035..9d2ea10f6 100644 --- a/src/Squidex/app/features/apps/pages/onboarding-dialog.component.ts +++ b/src/Squidex/app/features/apps/pages/onboarding-dialog.component.ts @@ -21,10 +21,10 @@ export class OnboardingDialogComponent { public step = 0; @Output() - public closed = new EventEmitter(); + public close = new EventEmitter(); - public close() { - this.closed.emit(); + public emitClose() { + this.close.emit(); } public next() { 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 2e6170d44..79f324003 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.html +++ b/src/Squidex/app/features/assets/pages/assets-page.component.html @@ -26,7 +26,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 e4da7203b..01c728105 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 @@ -22,10 +22,10 @@
+ (unpublishe)="unpublish(content)" + (publishe)="publish(content)" + (archive)="archive(content)" + (restore)="restore(content)" + (delete)="delete(content)" + (clone)="clone(content)"> diff --git a/src/Squidex/app/features/content/shared/array-editor.component.html b/src/Squidex/app/features/content/shared/array-editor.component.html index d4caa05a7..b78db6a95 100644 --- a/src/Squidex/app/features/content/shared/array-editor.component.html +++ b/src/Squidex/app/features/content/shared/array-editor.component.html @@ -1,6 +1,6 @@
+ (sqxSort)="sort($event)">
+ (move)="move(itemForm, $event)" + (clone)="addItem(itemForm)" + (remove)="removeItem(i)">
diff --git a/src/Squidex/app/features/content/shared/array-item.component.html b/src/Squidex/app/features/content/shared/array-item.component.html index 2283e2e54..658f6e19d 100644 --- a/src/Squidex/app/features/content/shared/array-item.component.html +++ b/src/Squidex/app/features/content/shared/array-item.component.html @@ -5,32 +5,32 @@ Item #{{index + 1}} - - - - - - - - diff --git a/src/Squidex/app/features/content/shared/array-item.component.ts b/src/Squidex/app/features/content/shared/array-item.component.ts index 666e63068..d6154dfbc 100644 --- a/src/Squidex/app/features/content/shared/array-item.component.ts +++ b/src/Squidex/app/features/content/shared/array-item.component.ts @@ -25,13 +25,13 @@ import { }) export class ArrayItemComponent implements OnChanges { @Output() - public removing = new EventEmitter(); + public remove = new EventEmitter(); @Output() - public moving = new EventEmitter(); + public move = new EventEmitter(); @Output() - public cloning = new EventEmitter(); + public clone = new EventEmitter(); @Output() public toggle = new EventEmitter(); @@ -77,19 +77,31 @@ export class ArrayItemComponent implements OnChanges { } } - public moveTop() { - this.moving.emit(0); + public emitToggle(value: boolean) { + this.toggle.emit(value); } - public moveUp() { - this.moving.emit(this.index - 1); + public emitClone() { + this.clone.emit(); } - public moveDown() { - this.moving.emit(this.index + 1); + public emitRemove() { + this.remove.emit(); } - public moveBottom() { - this.moving.emit(99999); + public emitMoveTop() { + this.move.emit(0); + } + + public emitMoveUp() { + this.move.emit(this.index - 1); + } + + public emitMoveDown() { + this.move.emit(this.index + 1); + } + + public emitMoveBottom() { + this.move.emit(99999); } } \ No newline at end of file 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 030114620..22767f5bd 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.html +++ b/src/Squidex/app/features/content/shared/assets-editor.component.html @@ -24,10 +24,10 @@
+ (faile)="removeLoadingAsset(file)" (load)="addAsset(file, $event)"> + (update)="notifyOthers($event)" (remove)="removeLoadedAsset($event)">
@@ -35,17 +35,19 @@
+ [isListView]="true" + (loadError)="removeLoadingAsset(file)" + (load)="addAsset(file, $event)">
+ (sqxSort)="sortAssets($event)">
+ (update)="notifyOthers($event)" (remove)="removeLoadedAsset($event)">
@@ -56,6 +58,6 @@ + (select)="selectAssets($event)"> \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/content-item.component.html b/src/Squidex/app/features/content/shared/content-item.component.html index 925663fb5..716014df4 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.html +++ b/src/Squidex/app/features/content/shared/content-item.component.html @@ -54,26 +54,26 @@
- + Publish - + Unpublish - + Archive - + Restore - + Clone
Delete @@ -82,7 +82,7 @@
- \ No newline at end of file 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 606a027d3..f97f9baab 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.ts +++ b/src/Squidex/app/features/content/shared/content-item.component.ts @@ -35,22 +35,22 @@ import { }) export class ContentItemComponent implements OnChanges { @Output() - public cloning = new EventEmitter(); + public clone = new EventEmitter(); @Output() - public deleting = new EventEmitter(); + public delete = new EventEmitter(); @Output() - public archiving = new EventEmitter(); + public archive = new EventEmitter(); @Output() - public restoring = new EventEmitter(); + public restore = new EventEmitter(); @Output() - public publishing = new EventEmitter(); + public publish = new EventEmitter(); @Output() - public unpublishing = new EventEmitter(); + public unpublish = new EventEmitter(); @Output() public selectedChange = new EventEmitter(); @@ -128,6 +128,30 @@ export class ContentItemComponent implements OnChanges { this.updateValues(); } + public emitDelete() { + this.delete.emit(); + } + + public emitPublish() { + this.publish.emit(); + } + + public emitUnpublish() { + this.unpublish.emit(); + } + + public emitArchive() { + this.archive.emit(); + } + + public emitRestore() { + this.unpublish.emit(); + } + + public emitClone() { + this.clone.emit(); + } + private updateValues() { this.values = []; diff --git a/src/Squidex/app/features/content/shared/contents-selector.component.html b/src/Squidex/app/features/content/shared/contents-selector.component.html index 6b57c596f..0a7cfc92e 100644 --- a/src/Squidex/app/features/content/shared/contents-selector.component.html +++ b/src/Squidex/app/features/content/shared/contents-selector.component.html @@ -1,4 +1,4 @@ - + Select contents @@ -13,7 +13,7 @@
@@ -68,7 +68,7 @@ - - + + \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/contents-selector.component.ts b/src/Squidex/app/features/content/shared/contents-selector.component.ts index f88608fba..f753d22c5 100644 --- a/src/Squidex/app/features/content/shared/contents-selector.component.ts +++ b/src/Squidex/app/features/content/shared/contents-selector.component.ts @@ -35,7 +35,7 @@ export class ContentsSelectorComponent implements OnInit { public schema: SchemaDetailsDto; @Output() - public selected = new EventEmitter(); + public select = new EventEmitter(); public searchModal = new ModalModel(); @@ -75,12 +75,12 @@ export class ContentsSelectorComponent implements OnInit { return this.selectedItems[content.id]; } - public complete() { - this.selected.emit([]); + public emitComplete() { + this.select.emit([]); } - public select() { - this.selected.emit(Object.values(this.selectedItems)); + public emitSelect() { + this.select.emit(Object.values(this.selectedItems)); } public selectLanguage(language: LanguageDto) { diff --git a/src/Squidex/app/features/content/shared/due-time-selector.component.html b/src/Squidex/app/features/content/shared/due-time-selector.component.html index cbc420c11..6cee22404 100644 --- a/src/Squidex/app/features/content/shared/due-time-selector.component.html +++ b/src/Squidex/app/features/content/shared/due-time-selector.component.html @@ -1,4 +1,4 @@ - + {{dueTimeAction}} content item(s) 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 83a7d5553..2ca51947a 100644 --- a/src/Squidex/app/features/content/shared/references-editor.component.html +++ b/src/Squidex/app/features/content/shared/references-editor.component.html @@ -8,7 +8,7 @@ + (sqxSort)="sort($event)"> + (delete)="remove(content)">
@@ -32,6 +32,6 @@ [language]="language" [languages]="languages" [schema]="snapshot.schema" - (selected)="select($event)"> + (select)="select($event)"> \ No newline at end of file diff --git a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html index 9c5b40f42..fbe0b104a 100644 --- a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html @@ -1,4 +1,4 @@ - + Edit Trigger @@ -92,17 +92,17 @@
- + - + - +
diff --git a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts index bfdb88f5e..5d493db2b 100644 --- a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts +++ b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts @@ -39,7 +39,7 @@ export class RuleWizardComponent implements OnInit { public step = 1; @Output() - public completed = new EventEmitter(); + public complete = new EventEmitter(); @Input() public ruleActions: { [name: string]: RuleElementDto }; @@ -75,8 +75,8 @@ export class RuleWizardComponent implements OnInit { } } - public complete() { - this.completed.emit(); + public emitComplete() { + this.complete.emit(); } public selectTriggerType(type: string) { @@ -122,7 +122,7 @@ export class RuleWizardComponent implements OnInit { this.rulesState.create(requestDto) .subscribe(() => { - this.complete(); + this.emitComplete(); this.actionForm.submitCompleted(); this.triggerForm.submitCompleted(); @@ -135,7 +135,7 @@ export class RuleWizardComponent implements OnInit { private updateTrigger() { this.rulesState.updateTrigger(this.rule, this.trigger) .subscribe(() => { - this.complete(); + this.emitComplete(); this.triggerForm.submitCompleted(); }, error => { @@ -146,7 +146,7 @@ export class RuleWizardComponent implements OnInit { private updateAction() { this.rulesState.updateAction(this.rule, this.action) .subscribe(() => { - this.complete(); + this.emitComplete(); this.actionForm.submitCompleted(); }, error => { diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html index ba7e7a540..d6102c1be 100644 --- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html @@ -70,7 +70,7 @@ [ruleActions]="ruleActions" [ruleTriggers]="ruleTriggers" [mode]="wizardMode" - (completed)="addRuleDialog.hide()"> + (complete)="addRuleDialog.hide()"> diff --git a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html index ab56d064c..99b6d48b8 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html @@ -1,4 +1,4 @@ - + Add Nested Field @@ -91,7 +91,7 @@ - +
diff --git a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.ts b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.ts index 1562127b1..fb2471233 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.ts @@ -38,7 +38,7 @@ export class FieldWizardComponent implements OnInit { public parent: RootFieldDto; @Output() - public completed = new EventEmitter(); + public complete = new EventEmitter(); public fieldTypes = fieldTypes; public field: FieldDto; @@ -62,8 +62,8 @@ export class FieldWizardComponent implements OnInit { } } - public complete() { - this.completed.emit(); + public emitComplete() { + this.complete.emit(); } public addField(addNew: boolean, edit: boolean) { @@ -85,7 +85,7 @@ export class FieldWizardComponent implements OnInit { this.isEditing = true; } else { - this.complete(); + this.emitComplete(); } }, error => { this.addFieldForm.submitFailed(error); @@ -110,7 +110,7 @@ export class FieldWizardComponent implements OnInit { if (addNew) { this.isEditing = false; } else { - this.complete(); + this.emitComplete(); } }, error => { this.editForm.submitFailed(error); 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 03d3495c2..46ec4f82f 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.html @@ -107,7 +107,7 @@ -
+
@@ -125,7 +125,7 @@ + (complete)="addFieldDialog.hide()"> diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.html index aecd08bd7..4fda1eae7 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.html @@ -1,5 +1,5 @@
- + Edit Schema @@ -29,7 +29,7 @@ - + diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts index 653216265..15148f23f 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts @@ -21,7 +21,7 @@ import { }) export class SchemaEditFormComponent implements OnInit { @Output() - public completed = new EventEmitter(); + public complete = new EventEmitter(); @Input() public schema: SchemaDetailsDto; @@ -38,8 +38,8 @@ export class SchemaEditFormComponent implements OnInit { this.editForm.load(this.schema.properties); } - public complete() { - this.completed.emit(); + public emitComplete() { + this.complete.emit(); } public saveSchema() { @@ -48,7 +48,7 @@ export class SchemaEditFormComponent implements OnInit { if (value) { this.schemasState.update(this.schema, value) .subscribe(() => { - this.complete(); + this.emitComplete(); }, error => { this.editForm.submitFailed(error); }); 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 3e1bbe227..69ccaa9fc 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 @@ -69,7 +69,7 @@
+ (sqxSort)="sortFields($event)">
@@ -94,30 +94,30 @@ + (complete)="editSchemaDialog.hide()"> + (complete)="addFieldDialog.hide()"> + (complete)="configureScriptsDialog.hide()"> + (complete)="configurePreviewUrlsDialog.hide()"> - + Export Schema diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-preview-urls-form.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-preview-urls-form.component.html index de9a7f24e..1cb6487a4 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-preview-urls-form.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/schema-preview-urls-form.component.html @@ -1,5 +1,5 @@ - + Preview Urls @@ -58,7 +58,7 @@ - + diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-preview-urls-form.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-preview-urls-form.component.ts index 3cacef528..8522190d5 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-preview-urls-form.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/schema-preview-urls-form.component.ts @@ -22,7 +22,7 @@ import { }) export class SchemaPreviewUrlsFormComponent implements OnInit { @Output() - public completed = new EventEmitter(); + public complete = new EventEmitter(); @Input() public schema: SchemaDetailsDto; @@ -41,8 +41,8 @@ export class SchemaPreviewUrlsFormComponent implements OnInit { this.editForm.load(this.schema.previewUrls); } - public complete() { - this.completed.emit(); + public emitComplete() { + this.complete.emit(); } public cancelAdd() { @@ -65,7 +65,7 @@ export class SchemaPreviewUrlsFormComponent implements OnInit { if (value) { this.schemasState.configurePreviewUrls(this.schema, value) .subscribe(() => { - this.complete(); + this.emitComplete(); }, error => { this.editForm.submitFailed(error); }); diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html index 74f2705aa..8ca7245d0 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html @@ -1,5 +1,5 @@ - + Scripts @@ -23,7 +23,7 @@ - + diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.ts index ba545655a..25ea72bf5 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.ts @@ -21,7 +21,7 @@ import { }) export class SchemaScriptsFormComponent implements OnInit { @Output() - public completed = new EventEmitter(); + public complete = new EventEmitter(); @Input() public schema: SchemaDetailsDto; @@ -40,8 +40,8 @@ export class SchemaScriptsFormComponent implements OnInit { this.editForm.load(this.schema.scripts); } - public complete() { - this.completed.emit(); + public emitComplete() { + this.complete.emit(); } public selectField(field: string) { @@ -54,7 +54,7 @@ export class SchemaScriptsFormComponent implements OnInit { if (value) { this.schemasState.configureScripts(this.schema, value) .subscribe(() => { - this.complete(); + this.emitComplete(); }, error => { this.editForm.submitFailed(error); }); diff --git a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html index 41a5a348c..aace70a40 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html +++ b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html @@ -1,5 +1,5 @@ - + Clone Schema @@ -84,7 +84,7 @@ - + diff --git a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts index a11932317..fdac8d2fd 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts +++ b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts @@ -23,10 +23,10 @@ import { }) export class SchemaFormComponent implements OnInit { @Output() - public created = new EventEmitter(); + public complete = new EventEmitter(); @Output() - public cancelled = new EventEmitter(); + public cancel = new EventEmitter(); @Input() public import: any; @@ -55,12 +55,12 @@ export class SchemaFormComponent implements OnInit { return false; } - public complete(schema: SchemaDto) { - this.created.emit(schema); + public emitComplete(value: SchemaDto) { + this.complete.emit(value); } - public cancel() { - this.cancelled.emit(); + public emitCancel() { + this.cancel.emit(); } public createSchema() { @@ -71,7 +71,7 @@ export class SchemaFormComponent implements OnInit { this.schemasState.create(schemaDto) .subscribe(dto => { - this.complete(dto); + this.emitComplete(dto); }, error => { this.createForm.submitFailed(error); }); diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html index 07341296a..3fb249b18 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html @@ -25,7 +25,7 @@ [name]="category" [schemas]="schemasState.schemas | async" [schemasFilter]="schemasFilter.valueChanges | async" - (removing)="removeCategory(category)"> + (remove)="removeCategory(category)"> @@ -36,8 +36,8 @@ + (cancel)="addSchemaDialog.hide()" + (create)="redirectSchema($event)"> 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 476038fd9..9ebb54ab5 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.html +++ b/src/Squidex/app/features/settings/pages/clients/client.component.html @@ -80,7 +80,7 @@
- + Connect diff --git a/src/Squidex/app/framework/angular/forms/tag-editor.component.ts b/src/Squidex/app/framework/angular/forms/tag-editor.component.ts index db787842b..210825dc0 100644 --- a/src/Squidex/app/framework/angular/forms/tag-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/tag-editor.component.ts @@ -91,6 +91,12 @@ interface State { changeDetection: ChangeDetectionStrategy.OnPush }) export class TagEditorComponent extends StatefulControlComponent implements AfterViewInit, OnInit { + @ViewChild('form') + public formElement: ElementRef; + + @ViewChild('input') + public inputElement: ElementRef; + @Input() public converter: Converter = new StringConverter(); @@ -118,11 +124,10 @@ export class TagEditorComponent extends StatefulControlComponent i @Input() public inputName = 'tag-editor'; - @ViewChild('form') - public formElement: ElementRef; - - @ViewChild('input') - public inputElement: ElementRef; + @Input() + public set disabled(value: boolean) { + this.setDisabledState(value); + } public addInput = new FormControl(); diff --git a/src/Squidex/app/framework/angular/modals/dialog-renderer.component.html b/src/Squidex/app/framework/angular/modals/dialog-renderer.component.html index 6e2782474..ee5960905 100644 --- a/src/Squidex/app/framework/angular/modals/dialog-renderer.component.html +++ b/src/Squidex/app/framework/angular/modals/dialog-renderer.component.html @@ -1,6 +1,6 @@ - + {{snapshot.dialogRequest?.title}} @@ -17,7 +17,7 @@
- +
diff --git a/src/Squidex/app/framework/angular/modals/modal-dialog.component.html b/src/Squidex/app/framework/angular/modals/modal-dialog.component.html index bf7383621..86afe1fc3 100644 --- a/src/Squidex/app/framework/angular/modals/modal-dialog.component.html +++ b/src/Squidex/app/framework/angular/modals/modal-dialog.component.html @@ -8,7 +8,7 @@ -
@@ -30,4 +30,4 @@
- \ No newline at end of file + \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/modals/modal-dialog.component.ts b/src/Squidex/app/framework/angular/modals/modal-dialog.component.ts index e845e9bd2..d549ae62c 100644 --- a/src/Squidex/app/framework/angular/modals/modal-dialog.component.ts +++ b/src/Squidex/app/framework/angular/modals/modal-dialog.component.ts @@ -49,7 +49,7 @@ export class ModalDialogComponent extends StatefulComponent implements Af public contentClass = ''; @Output() - public closed = new EventEmitter(); + public close = new EventEmitter(); @ViewChild('tabsElement') public tabsElement: ElementRef; @@ -70,4 +70,8 @@ export class ModalDialogComponent extends StatefulComponent implements Af this.next(() => ({ hasTabs, hasFooter })); } + + public emitClose() { + this.close.emit(); + } } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/pager.component.html b/src/Squidex/app/framework/angular/pager.component.html index e54c52966..36b3a6e42 100644 --- a/src/Squidex/app/framework/angular/pager.component.html +++ b/src/Squidex/app/framework/angular/pager.component.html @@ -2,10 +2,10 @@ diff --git a/src/Squidex/app/framework/angular/pager.component.ts b/src/Squidex/app/framework/angular/pager.component.ts index c85eaf9cd..0be4db6ae 100644 --- a/src/Squidex/app/framework/angular/pager.component.ts +++ b/src/Squidex/app/framework/angular/pager.component.ts @@ -27,4 +27,12 @@ export class PagerComponent { @Input() public hideWhenButtonsDisabled = false; + + public emitNext() { + this.nextPage.emit(); + } + + public emitPrev() { + this.prevPage.emit(); + } } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/sorted.directive.ts b/src/Squidex/app/framework/angular/sorted.directive.ts index 4e15dc7e3..13127fc40 100644 --- a/src/Squidex/app/framework/angular/sorted.directive.ts +++ b/src/Squidex/app/framework/angular/sorted.directive.ts @@ -21,8 +21,8 @@ export class SortedDirective implements OnDestroy, OnInit { @Input('sqxSortModel') public sortModel: any[]; - @Output('sqxSorted') - public sorted = new EventEmitter(); + @Output('sqxSort') + public sort = new EventEmitter(); constructor( private readonly elementRef: ElementRef @@ -49,7 +49,7 @@ export class SortedDirective implements OnDestroy, OnInit { newModel.splice(event.oldIndex, 1); newModel.splice(event.newIndex, 0, item); - this.sorted.emit(newModel); + this.sort.emit(newModel); } }, diff --git a/src/Squidex/app/framework/state.ts b/src/Squidex/app/framework/state.ts index 4a911778d..c6d37da5b 100644 --- a/src/Squidex/app/framework/state.ts +++ b/src/Squidex/app/framework/state.ts @@ -98,7 +98,7 @@ export class Form { } export class Model { - protected clone(update: ((v: any) => object) | object): any { + protected clone(update: ((v: any) => object) | object, validOnly = false): any { let values: object; if (Types.isFunction(update)) { values = update(this); @@ -106,7 +106,17 @@ export class Model { values = update; } - const clone = Object.assign(Object.create(Object.getPrototypeOf(this)), this, values); + const clone = Object.assign(Object.create(Object.getPrototypeOf(this)), this); + + for (let key in values) { + if (values.hasOwnProperty(key)) { + let value = values[key]; + + if (value || validOnly) { + clone[key] = value; + } + } + } if (Types.isFunction(clone.onCloned)) { clone.onCloned(); diff --git a/src/Squidex/app/shared/components/app-form.component.html b/src/Squidex/app/shared/components/app-form.component.html index f8086c1c1..5412343e4 100644 --- a/src/Squidex/app/shared/components/app-form.component.html +++ b/src/Squidex/app/shared/components/app-form.component.html @@ -1,5 +1,5 @@ - + Create {{template}} Sample @@ -33,7 +33,7 @@ - + diff --git a/src/Squidex/app/shared/components/app-form.component.ts b/src/Squidex/app/shared/components/app-form.component.ts index 7ebd576ad..1b812a6c6 100644 --- a/src/Squidex/app/shared/components/app-form.component.ts +++ b/src/Squidex/app/shared/components/app-form.component.ts @@ -23,7 +23,7 @@ import { }) export class AppFormComponent { @Output() - public completed = new EventEmitter(); + public complete = new EventEmitter(); @Input() public template = ''; @@ -37,8 +37,8 @@ export class AppFormComponent { ) { } - public complete() { - this.completed.emit(); + public emitComplete() { + this.complete.emit(); } public createApp() { @@ -49,7 +49,7 @@ export class AppFormComponent { this.appsStore.create(request) .subscribe(() => { - this.complete(); + this.emitComplete(); }, error => { this.createForm.submitFailed(error); }); diff --git a/src/Squidex/app/shared/components/asset-dialog.component.html b/src/Squidex/app/shared/components/asset-dialog.component.html new file mode 100644 index 000000000..4f436aafc --- /dev/null +++ b/src/Squidex/app/shared/components/asset-dialog.component.html @@ -0,0 +1,40 @@ + + + + Update Asset + + + + + +
+ + + + + +
+ +
+ + + + + +
+ +
+ + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/src/Squidex/app/shared/components/asset-dialog.component.scss b/src/Squidex/app/shared/components/asset-dialog.component.scss new file mode 100644 index 000000000..fbb752506 --- /dev/null +++ b/src/Squidex/app/shared/components/asset-dialog.component.scss @@ -0,0 +1,2 @@ +@import '_vars'; +@import '_mixins'; \ No newline at end of file diff --git a/src/Squidex/app/shared/components/asset-dialog.component.ts b/src/Squidex/app/shared/components/asset-dialog.component.ts new file mode 100644 index 000000000..19a8f33a7 --- /dev/null +++ b/src/Squidex/app/shared/components/asset-dialog.component.ts @@ -0,0 +1,78 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { FormBuilder } from '@angular/forms'; + +import { + AnnotateAssetForm, + AppsState, + AssetDto, + AssetsService, + AuthService, + StatefulComponent +} from '@app/shared/internal'; + +@Component({ + selector: 'sqx-asset-dialog', + styleUrls: ['./asset-dialog.component.scss'], + templateUrl: './asset-dialog.component.html', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class AssetDialogComponent extends StatefulComponent implements OnInit { + @Input() + public asset: AssetDto; + + @Input() + public allTags: string[]; + + @Output() + public cancel = new EventEmitter(); + + @Output() + public complete = new EventEmitter(); + + public annotateForm = new AnnotateAssetForm(this.formBuilder); + + constructor(changeDetector: ChangeDetectorRef, + private readonly appsState: AppsState, + private readonly assetsService: AssetsService, + private readonly authState: AuthService, + private readonly formBuilder: FormBuilder + ) { + super(changeDetector, { + isRenaming: false, + isTagging: false, + progress: 0 + }); + } + + public ngOnInit() { + this.annotateForm.load(this.asset); + } + + public emitCancel() { + this.cancel.emit(); + } + + public emitComplete(asset: AssetDto) { + this.complete.emit(asset); + } + + public annotateAsset() { + const value = this.annotateForm.submit(this.asset); + + if (value) { + this.assetsService.putAsset(this.appsState.appName, this.asset.id, value, this.asset.version) + .subscribe(dto => { + this.emitComplete(this.asset.annnotate(value, this.authState.user!.token, dto.version)); + }, error => { + this.annotateForm.submitFailed(error); + }); + } + } +} \ 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 f8cd3a23a..c37b4b26c 100644 --- a/src/Squidex/app/shared/components/asset.component.html +++ b/src/Squidex/app/shared/components/asset.component.html @@ -1,5 +1,5 @@ -
+
@@ -17,14 +17,16 @@
- + + + + - - + - +
@@ -53,28 +55,15 @@
Drop to update
-
+
-
+
{{asset.fileName}}
-
-
- - - -
-
- - +
{{asset.pixelWidth}}x{{asset.pixelHeight}}px, {{asset.fileSize | sqxFileSize}} @@ -85,7 +74,7 @@ -
+
@@ -98,16 +87,9 @@ @@ -140,4 +122,12 @@
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.ts b/src/Squidex/app/shared/components/asset.component.ts index 9a082df4a..6550d3bda 100644 --- a/src/Squidex/app/shared/components/asset.component.ts +++ b/src/Squidex/app/shared/components/asset.component.ts @@ -5,9 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostBinding, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; -import { FormBuilder, FormControl } from '@angular/forms'; -import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostBinding, Input, OnInit, Output } from '@angular/core'; import { AppsState, @@ -15,20 +13,15 @@ import { AssetsService, AuthService, DateTime, + DialogModel, DialogService, fadeAnimation, - RenameAssetDto, - RenameAssetForm, StatefulComponent, - TagAssetDto, Types, Versioned } from '@app/shared/internal'; interface State { - isTagging: boolean; - isRenaming: boolean; - progress: number; } @@ -41,7 +34,7 @@ interface State { ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class AssetComponent extends StatefulComponent implements OnChanges, OnInit { +export class AssetComponent extends StatefulComponent implements OnInit { @Input() public initFile: File; @@ -70,37 +63,32 @@ export class AssetComponent extends StatefulComponent implements OnChange public allTags: string[]; @Output() - public loaded = new EventEmitter(); + public load = new EventEmitter(); @Output() - public removing = new EventEmitter(); + public loadError = new EventEmitter(); @Output() - public updated = new EventEmitter(); + public remove = new EventEmitter(); @Output() - public deleting = new EventEmitter(); + public update = new EventEmitter(); @Output() - public selected = new EventEmitter(); + public delete = new EventEmitter(); @Output() - public failed = new EventEmitter(); - - public renameForm = new RenameAssetForm(this.formBuilder); + public select = new EventEmitter(); - public tagInput = new FormControl(); + public editDialog = new DialogModel(); constructor(changeDetector: ChangeDetectorRef, private readonly appsState: AppsState, private readonly assetsService: AssetsService, private readonly authState: AuthService, - private readonly dialogs: DialogService, - private readonly formBuilder: FormBuilder + private readonly dialogs: DialogService ) { super(changeDetector, { - isRenaming: false, - isTagging: false, progress: 0 }); } @@ -114,30 +102,16 @@ export class AssetComponent extends StatefulComponent implements OnChange this.assetsService.uploadFile(this.appsState.appName, initFile, this.authState.user!.token, DateTime.now()) .subscribe(dto => { if (Types.is(dto, AssetDto)) { - this.emitLoaded(dto); + this.emitLoad(dto); } else { this.setProgress(dto); } }, error => { this.dialogs.notifyError(error); - this.emitFailed(error); + this.emitLoadError(error); }); } - - this.own( - this.tagInput.valueChanges.pipe( - distinctUntilChanged(), - debounceTime(2000) - ).subscribe(tags => { - this.tagAsset(tags); - })); - } - - public ngOnChanges(changes: SimpleChanges) { - if (changes['asset'] && this.asset) { - this.tagInput.setValue(this.asset.tags, { emitEvent: false }); - } } public updateFile(files: FileList) { @@ -159,77 +133,53 @@ export class AssetComponent extends StatefulComponent implements OnChange } } - public renameAsset() { - const value = this.renameForm.submit(this.asset); - - if (value) { - const requestDto = new RenameAssetDto(value.name); - - 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); - }, error => { - this.dialogs.notifyError(error); - - this.renameForm.submitFailed(error); - }); + public edit() { + if (!this.isDisabled) { + this.editDialog.show(); } } - public tagAsset(tags: string[]) { - if (tags) { - const requestDto = new TagAssetDto(tags); - - this.assetsService.putAsset(this.appsState.appName, this.asset.id, requestDto, this.asset.version) - .subscribe(dto => { - this.updateAsset(this.asset.tag(tags, this.authState.user!.token, dto.version), true); - }, error => { - this.dialogs.notifyError(error); - }); - } + public cancelEdit() { + this.editDialog.hide(); } - public renameStart() { - if (!this.isDisabled) { - this.renameForm.load(this.asset); - - this.next(s => ({ ...s, isRenaming: true })); - } + public emitSelect() { + this.select.emit(this.asset); } - public renameCancel() { - this.renameForm.submitCompleted(); + public emitDelete() { + this.delete.emit(this.asset); + } - this.next(s => ({ ...s, isRenaming: false })); + public emitLoad(asset: AssetDto) { + this.load.emit(asset); } - private emitFailed(error: any) { - this.failed.emit(error); + public emitLoadError(error: any) { + this.loadError.emit(error); } - private emitLoaded(asset: AssetDto) { - this.loaded.emit(asset); + public emitUpdate() { + this.update.emit(this.asset); } - private emitUpdated(asset: AssetDto) { - this.updated.emit(asset); + public emitRemove() { + this.remove.emit(this.asset); } private setProgress(progress: number) { this.next(s => ({ ...s, progress })); } - private updateAsset(asset: AssetDto, emitEvent: boolean) { + public updateAsset(asset: AssetDto, emitEvent: boolean) { this.asset = asset; - this.tagInput.setValue(asset.tags, { emitEvent: false }); - if (emitEvent) { - this.emitUpdated(asset); + this.emitUpdate(); } - this.renameCancel(); - this.next(s => ({ ...s, progress: 0 })); + + this.cancelEdit(); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/assets-list.component.html b/src/Squidex/app/shared/components/assets-list.component.html index 48eb6cc2f..592e44e29 100644 --- a/src/Squidex/app/shared/components/assets-list.component.html +++ b/src/Squidex/app/shared/components/assets-list.component.html @@ -17,8 +17,8 @@
+ (loadError)="remove(file)" + (load)="add(file, $event)"> @@ -28,9 +28,9 @@ [isSelectable]="selectedIds" [isSelected]="isSelected(asset)" [allTags]="tags" - (updated)="update($event)" - (selected)="select($event)" - (deleting)="delete($event)"> + (update)="update($event)" + (select)="emitSelect($event)" + (delete)="delete($event)">
diff --git a/src/Squidex/app/shared/components/assets-list.component.ts b/src/Squidex/app/shared/components/assets-list.component.ts index eb518e3c9..dd2339e48 100644 --- a/src/Squidex/app/shared/components/assets-list.component.ts +++ b/src/Squidex/app/shared/components/assets-list.component.ts @@ -36,7 +36,7 @@ export class AssetsListComponent { public selectedIds: object; @Output() - public selected = new EventEmitter(); + public select = new EventEmitter(); public add(file: File, asset: AssetDto) { this.newFiles = this.newFiles.remove(file); @@ -64,8 +64,8 @@ export class AssetsListComponent { this.state.update(asset); } - public select(asset: AssetDto) { - this.selected.emit(asset); + public emitSelect(asset: AssetDto) { + this.select.emit(asset); } public isSelected(asset: AssetDto) { diff --git a/src/Squidex/app/shared/components/assets-selector.component.html b/src/Squidex/app/shared/components/assets-selector.component.html index 237f4cab2..51790e24e 100644 --- a/src/Squidex/app/shared/components/assets-selector.component.html +++ b/src/Squidex/app/shared/components/assets-selector.component.html @@ -1,4 +1,4 @@ - + Select assets @@ -22,7 +22,7 @@
@@ -45,14 +45,14 @@ - - + + \ No newline at end of file diff --git a/src/Squidex/app/shared/components/assets-selector.component.ts b/src/Squidex/app/shared/components/assets-selector.component.ts index 30bf9307a..5fa7c70a5 100644 --- a/src/Squidex/app/shared/components/assets-selector.component.ts +++ b/src/Squidex/app/shared/components/assets-selector.component.ts @@ -34,7 +34,7 @@ interface State { }) export class AssetsSelectorComponent extends StatefulComponent implements OnInit { @Output() - public selected = new EventEmitter(); + public select = new EventEmitter(); constructor(changeDector: ChangeDetectorRef, public readonly assetsState: AssetsDialogState, @@ -59,12 +59,12 @@ export class AssetsSelectorComponent extends StatefulComponent implements this.assetsState.search(query).pipe(onErrorResumeNext()).subscribe(); } - public complete() { - this.selected.emit([]); + public emitComplete() { + this.select.emit([]); } - public select() { - this.selected.emit(Object.values(this.snapshot.selectedAssets)); + public emitSelect() { + this.select.emit(Object.values(this.snapshot.selectedAssets)); } public selectTags(tags: string[]) { diff --git a/src/Squidex/app/shared/components/comment.component.html b/src/Squidex/app/shared/components/comment.component.html index 78fa943ee..8e959524b 100644 --- a/src/Squidex/app/shared/components/comment.component.html +++ b/src/Squidex/app/shared/components/comment.component.html @@ -7,7 +7,7 @@
{{comment.user | sqxUserNameRef}}
-
diff --git a/src/Squidex/app/shared/components/comment.component.ts b/src/Squidex/app/shared/components/comment.component.ts index c1803eeb4..ca2a75db3 100644 --- a/src/Squidex/app/shared/components/comment.component.ts +++ b/src/Squidex/app/shared/components/comment.component.ts @@ -26,13 +26,17 @@ export class CommentComponent { public userId: string; @Output() - public deleting = new EventEmitter(); + public delete = new EventEmitter(); @Output() - public updated = new EventEmitter(); + public update = new EventEmitter(); constructor( private readonly formBuilder: FormBuilder ) { } + + public emitDelete() { + this.delete.emit(); + } } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/comments.component.html b/src/Squidex/app/shared/components/comments.component.html index 1cca0ed08..26f7a7c9c 100644 --- a/src/Squidex/app/shared/components/comments.component.html +++ b/src/Squidex/app/shared/components/comments.component.html @@ -8,8 +8,8 @@ + (update)="update(comment, $event)" + (delete)="delete(comment)">
diff --git a/src/Squidex/app/shared/components/markdown-editor.component.html b/src/Squidex/app/shared/components/markdown-editor.component.html index 9fe76c972..322e46392 100644 --- a/src/Squidex/app/shared/components/markdown-editor.component.html +++ b/src/Squidex/app/shared/components/markdown-editor.component.html @@ -6,6 +6,6 @@ + (select)="insertAssets($event)"> \ No newline at end of file diff --git a/src/Squidex/app/shared/components/rich-editor.component.html b/src/Squidex/app/shared/components/rich-editor.component.html index 1fe5b907e..36cb40d19 100644 --- a/src/Squidex/app/shared/components/rich-editor.component.html +++ b/src/Squidex/app/shared/components/rich-editor.component.html @@ -4,6 +4,6 @@ + (select)="insertAssets($event)"> \ No newline at end of file diff --git a/src/Squidex/app/shared/components/rich-editor.component.ts b/src/Squidex/app/shared/components/rich-editor.component.ts index b5417e1c6..2d4e5e84a 100644 --- a/src/Squidex/app/shared/components/rich-editor.component.ts +++ b/src/Squidex/app/shared/components/rich-editor.component.ts @@ -52,7 +52,7 @@ export class RichEditorComponent extends StatefulControlComponent i public editor: ElementRef; @Output() - public assetPluginClicked = new EventEmitter(); + public assetPluginClick = new EventEmitter(); public assetsDialog = new DialogModel(); diff --git a/src/Squidex/app/shared/components/schema-category.component.html b/src/Squidex/app/shared/components/schema-category.component.html index dce6a0904..ee0a6cb79 100644 --- a/src/Squidex/app/shared/components/schema-category.component.html +++ b/src/Squidex/app/shared/components/schema-category.component.html @@ -8,7 +8,7 @@

{{snapshot.displayName}} ({{snapshot.schemasFiltered.length}})

- diff --git a/src/Squidex/app/shared/components/schema-category.component.ts b/src/Squidex/app/shared/components/schema-category.component.ts index 9b17d2e59..103bdf481 100644 --- a/src/Squidex/app/shared/components/schema-category.component.ts +++ b/src/Squidex/app/shared/components/schema-category.component.ts @@ -38,9 +38,6 @@ interface State { changeDetection: ChangeDetectionStrategy.OnPush }) export class SchemaCategoryComponent extends StatefulComponent implements OnInit, OnChanges { - @Output() - public removing = new EventEmitter(); - @Input() public name: string; @@ -56,6 +53,9 @@ export class SchemaCategoryComponent extends StatefulComponent implements @Input() public schemas: ImmutableArray; + @Output() + public remove = new EventEmitter(); + public allowDrop = (schema: any) => { return (Types.is(schema, SchemaDto) || Types.is(schema, SchemaDetailsDto)) && !this.isSameCategory(schema); } @@ -130,6 +130,10 @@ export class SchemaCategoryComponent extends StatefulComponent implements this.schemasState.changeCategory(schema, this.name).pipe(onErrorResumeNext()).subscribe(); } + public emitRemove() { + this.remove.emit(); + } + public trackBySchema(index: number, schema: SchemaDto) { return schema.id; } diff --git a/src/Squidex/app/shared/components/search-form.component.html b/src/Squidex/app/shared/components/search-form.component.html index bedafc4e3..b6dbf5f71 100644 --- a/src/Squidex/app/shared/components/search-form.component.html +++ b/src/Squidex/app/shared/components/search-form.component.html @@ -77,7 +77,7 @@
- + Name your query diff --git a/src/Squidex/app/shared/components/search-form.component.ts b/src/Squidex/app/shared/components/search-form.component.ts index 20529e113..472518acd 100644 --- a/src/Squidex/app/shared/components/search-form.component.ts +++ b/src/Squidex/app/shared/components/search-form.component.ts @@ -40,13 +40,13 @@ export class SearchFormComponent implements OnChanges, OnInit { public query = ''; @Output() - public queryChanged = new EventEmitter(); + public queryChange = new EventEmitter(); @Input() public archived = false; @Output() - public archivedChanged = new EventEmitter(); + public archivedChange = new EventEmitter(); @Input() public schemaName = ''; @@ -113,7 +113,7 @@ export class SearchFormComponent implements OnChanges, OnInit { public search() { this.invalidate(this.contentsFilter.value); - this.queryChanged.emit(this.contentsFilter.value); + this.queryChange.emit(this.contentsFilter.value); } private invalidate(query: string) { @@ -186,7 +186,7 @@ export class SearchFormComponent implements OnChanges, OnInit { } if (query !== this.query) { - this.queryChanged.emit(query); + this.queryChange.emit(query); } this.contentsFilter.setValue(query); diff --git a/src/Squidex/app/shared/declarations.ts b/src/Squidex/app/shared/declarations.ts index bf704c175..dad8d561a 100644 --- a/src/Squidex/app/shared/declarations.ts +++ b/src/Squidex/app/shared/declarations.ts @@ -6,6 +6,7 @@ */ export * from './components/app-form.component'; +export * from './components/asset-dialog.component'; export * from './components/asset.component'; export * from './components/assets-list.component'; export * from './components/assets-selector.component'; diff --git a/src/Squidex/app/shared/module.ts b/src/Squidex/app/shared/module.ts index 2b0d7c1ae..89d5d63b3 100644 --- a/src/Squidex/app/shared/module.ts +++ b/src/Squidex/app/shared/module.ts @@ -23,6 +23,7 @@ import { AppsService, AppsState, AssetComponent, + AssetDialogComponent, AssetPreviewUrlPipe, AssetsDialogState, AssetsListComponent, @@ -102,6 +103,7 @@ import { declarations: [ AppFormComponent, AssetComponent, + AssetDialogComponent, AssetPreviewUrlPipe, AssetUrlPipe, AssetsListComponent, @@ -131,6 +133,7 @@ import { exports: [ AppFormComponent, AssetComponent, + AssetDialogComponent, AssetPreviewUrlPipe, AssetUrlPipe, AssetsListComponent, diff --git a/src/Squidex/app/shared/services/assets.service.spec.ts b/src/Squidex/app/shared/services/assets.service.spec.ts index 3ff92f625..fb0c87344 100644 --- a/src/Squidex/app/shared/services/assets.service.spec.ts +++ b/src/Squidex/app/shared/services/assets.service.spec.ts @@ -10,6 +10,7 @@ import { inject, TestBed } from '@angular/core/testing'; import { AnalyticsService, + AnnotateAssetDto, ApiUrlConfig, AssetDto, AssetReplacedDto, @@ -17,8 +18,6 @@ import { AssetsService, DateTime, ErrorDto, - RenameAssetDto, - TagAssetDto, Version, Versioned } from './../'; @@ -31,21 +30,15 @@ describe('AssetDto', () => { const version = new Version('1'); const newVersion = new Version('2'); - it('should update name property and user info when renaming', () => { - const asset_1 = new AssetDto('1', creator, creator, creation, creation, 'name.png', 'png', 1, 1, 'image/png', false, 1, 1, [], 'url', version); - const asset_2 = asset_1.rename('new-name.png', modifier, newVersion, modified); + it('should update tag property and user info when annnoting', () => { + const update = new AnnotateAssetDto('NewName.png', null, null); - expect(asset_2.fileName).toEqual('new-name.png'); - expect(asset_2.lastModified).toEqual(modified); - expect(asset_2.lastModifiedBy).toEqual(modifier); - expect(asset_2.version).toEqual(newVersion); - }); + const asset_1 = new AssetDto('1', creator, creator, creation, creation, 'Name.png', 'png', 1, 1, 'image/png', false, 1, 1, 'name.png', [], 'url', version); + const asset_2 = asset_1.annnotate(update, modifier, newVersion, modified); - it('should update tag property and user info when tagged', () => { - const asset_1 = new AssetDto('1', creator, creator, creation, creation, 'name.png', 'png', 1, 1, 'image/png', false, 1, 1, [], 'url', version); - const asset_2 = asset_1.tag(['tag1', 'tag2'], modifier, newVersion, modified); - - expect(asset_2.tags).toEqual(['tag1', 'tag2']); + expect(asset_2.fileName).toEqual('NewName.png'); + expect(asset_2.tags).toEqual([]); + expect(asset_2.slug).toEqual(asset_1.slug); expect(asset_2.lastModified).toEqual(modified); expect(asset_2.lastModifiedBy).toEqual(modifier); expect(asset_2.version).toEqual(newVersion); @@ -54,7 +47,7 @@ describe('AssetDto', () => { it('should update file properties when uploading', () => { const update = new AssetReplacedDto(2, 2, 'image/jpeg', true, 2, 2); - const asset_1 = new AssetDto('1', creator, creator, creation, creation, 'name.png', 'png', 1, 1, 'image/png', false, 1, 1, [], 'url', version); + const asset_1 = new AssetDto('1', creator, creator, creation, creation, 'Name.png', 'png', 1, 1, 'image/png', false, 1, 1, 'name.png', [], 'url', version); const asset_2 = asset_1.update(update, modifier, newVersion, modified); expect(asset_2.fileSize).toEqual(2); @@ -139,7 +132,7 @@ describe('AssetsService', () => { createdBy: 'Created1', lastModified: '2017-12-12T10:10', lastModifiedBy: 'LastModifiedBy1', - fileName: 'my-asset1.png', + fileName: 'My Asset1.png', fileType: 'png', fileSize: 1024, fileVersion: 2000, @@ -147,6 +140,7 @@ describe('AssetsService', () => { isImage: true, pixelWidth: 1024, pixelHeight: 2048, + slug: 'my-asset1.png', tags: undefined, version: 11 }, @@ -156,7 +150,7 @@ describe('AssetsService', () => { createdBy: 'Created2', lastModified: '2017-10-12T10:10', lastModifiedBy: 'LastModifiedBy2', - fileName: 'my-asset2.png', + fileName: 'My Asset2.png', fileType: 'png', fileSize: 1024, fileVersion: 2000, @@ -164,6 +158,7 @@ describe('AssetsService', () => { isImage: true, pixelWidth: 1024, pixelHeight: 2048, + slug: 'my-asset2.png', tags: ['tag1', 'tag2'], version: 22 } @@ -176,7 +171,7 @@ describe('AssetsService', () => { 'id1', 'Created1', 'LastModifiedBy1', DateTime.parseISO_UTC('2016-12-12T10:10'), DateTime.parseISO_UTC('2017-12-12T10:10'), - 'my-asset1.png', + 'My Asset1.png', 'png', 1024, 2000, @@ -184,13 +179,14 @@ describe('AssetsService', () => { true, 1024, 2048, + 'my-asset1.png', [], 'http://service/p/api/assets/id1', new Version('11')), new AssetDto('id2', 'Created2', 'LastModifiedBy2', DateTime.parseISO_UTC('2016-10-12T10:10'), DateTime.parseISO_UTC('2017-10-12T10:10'), - 'my-asset2.png', + 'My Asset2.png', 'png', 1024, 2000, @@ -198,6 +194,7 @@ describe('AssetsService', () => { true, 1024, 2048, + 'my-asset2.png', ['tag1', 'tag2'], 'http://service/p/api/assets/id2', new Version('22')) @@ -224,7 +221,7 @@ describe('AssetsService', () => { createdBy: 'Created1', lastModified: '2017-12-12T10:10', lastModifiedBy: 'LastModifiedBy1', - fileName: 'my-asset1.png', + fileName: 'My Asset1.png', fileType: 'png', fileSize: 1024, fileVersion: 2000, @@ -232,6 +229,7 @@ describe('AssetsService', () => { isImage: true, pixelWidth: 1024, pixelHeight: 2048, + slug: 'my-asset1.png', tags: ['tag1', 'tag2'] }, { headers: { @@ -244,7 +242,7 @@ describe('AssetsService', () => { 'id1', 'Created1', 'LastModifiedBy1', DateTime.parseISO_UTC('2016-12-12T10:10'), DateTime.parseISO_UTC('2017-12-12T10:10'), - 'my-asset1.png', + 'My Asset1.png', 'png', 1024, 2000, @@ -252,6 +250,7 @@ describe('AssetsService', () => { true, 1024, 2048, + 'my-asset1.png', ['tag1', 'tag2'], 'http://service/p/api/assets/id1', new Version('2'))); @@ -312,7 +311,7 @@ describe('AssetsService', () => { req.flush({ id: 'id1', - fileName: 'my-asset1.png', + fileName: 'My Asset1.png', fileType: 'png', fileSize: 1024, fileVersion: 2, @@ -320,6 +319,7 @@ describe('AssetsService', () => { isImage: true, pixelWidth: 1024, pixelHeight: 2048, + slug: 'my-asset1.png', tags: ['tag1', 'tag2'] }, { headers: { @@ -334,13 +334,14 @@ describe('AssetsService', () => { user, now, now, - 'my-asset1.png', + 'My Asset1.png', 'png', 1024, 2, 'image/png', true, 1024, 2048, + 'my-asset1.png', ['tag1', 'tag2'], 'http://service/p/api/assets/id1', new Version('2'))); @@ -424,25 +425,10 @@ describe('AssetsService', () => { expect(error!).toEqual(new ErrorDto(413, 'Asset is too big.')); })); - it('should make put request to update asset', - inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => { - - const dto = new RenameAssetDto('My-Asset.pdf'); - - assetsService.putAsset('my-app', '123', dto, version).subscribe(); - - const req = httpMock.expectOne('http://service/p/api/apps/my-app/assets/123'); - - expect(req.request.method).toEqual('PUT'); - expect(req.request.headers.get('If-Match')).toEqual(version.value); - - req.flush({}); - })); - - it('should make put request to update asset', + it('should make put request to annotate asset', inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => { - const dto = new TagAssetDto(['tag1', 'tag2']); + const dto = new AnnotateAssetDto('My Asset.pdf', 'my-asset.pdf', ['tag1', 'tag2']); assetsService.putAsset('my-app', '123', dto, version).subscribe(); diff --git a/src/Squidex/app/shared/services/assets.service.ts b/src/Squidex/app/shared/services/assets.service.ts index cb4da15de..7fa7d0cb3 100644 --- a/src/Squidex/app/shared/services/assets.service.ts +++ b/src/Squidex/app/shared/services/assets.service.ts @@ -51,6 +51,7 @@ export class AssetDto extends Model { public readonly isImage: boolean, public readonly pixelWidth: number | null, public readonly pixelHeight: number | null, + public readonly slug: string, public readonly tags: string[], public readonly url: string, public readonly version: Version @@ -58,8 +59,8 @@ export class AssetDto extends Model { super(); } - public with(value: Partial): AssetDto { - return this.clone(value); + public with(value: Partial, validOnly = false): AssetDto { + return this.clone(value, validOnly); } public update(update: AssetReplacedDto, user: string, version: Version, now?: DateTime): AssetDto { @@ -71,35 +72,21 @@ export class AssetDto extends Model { }); } - public tag(tags: string[], user: string, version: Version, now?: DateTime): AssetDto { + public annnotate(update: AnnotateAssetDto, user: string, version: Version, now?: DateTime): AssetDto { return this.with({ - tags, + ...update, lastModified: now || DateTime.now(), lastModifiedBy: user, version - }); - } - - public rename(fileName: string, user: string, version: Version, now?: DateTime): AssetDto { - return this.with({ - fileName, - lastModified: now || DateTime.now(), - lastModifiedBy: user, - version - }); - } -} - -export class RenameAssetDto { - constructor( - public readonly fileName: string - ) { + }, true); } } -export class TagAssetDto { +export class AnnotateAssetDto { constructor( - public readonly tags: string[] + public readonly fileName: string | null, + public readonly slug: string | null, + public readonly tags: string[] | null ) { } } @@ -189,6 +176,7 @@ export class AssetsService { item.isImage, item.pixelWidth, item.pixelHeight, + item.slug, item.tags || [], assetUrl, new Version(item.version.toString())); @@ -231,6 +219,7 @@ export class AssetsService { response.isImage, response.pixelWidth, response.pixelHeight, + response.slug, response.tags || [], assetUrl, new Version(event.headers.get('etag')!)); @@ -278,6 +267,7 @@ export class AssetsService { body.isImage, body.pixelWidth, body.pixelHeight, + body.slug, body.tags || [], assetUrl, response.version); @@ -340,7 +330,7 @@ export class AssetsService { pretifyError('Failed to delete asset. Please reload.')); } - public putAsset(appName: string, id: string, dto: RenameAssetDto | TagAssetDto, version: Version): Observable> { + public putAsset(appName: string, id: string, dto: AnnotateAssetDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets/${id}`); return HTTP.putVersioned(this.http, url, dto, version).pipe( diff --git a/src/Squidex/app/shared/state/assets.forms.ts b/src/Squidex/app/shared/state/assets.forms.ts index 3cc5426a2..dec393dd7 100644 --- a/src/Squidex/app/shared/state/assets.forms.ts +++ b/src/Squidex/app/shared/state/assets.forms.ts @@ -7,14 +7,24 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { Form } from '@app/framework'; +import { Form, Types } from '@app/framework'; import { AssetDto } from './../services/assets.service'; -export class RenameAssetForm extends Form { +export class AnnotateAssetForm extends Form { constructor(formBuilder: FormBuilder) { super(formBuilder.group({ - name: ['', + fileName: ['', + [ + Validators.required + ] + ], + slug: ['', + [ + Validators.required + ] + ], + tags: ['', [ Validators.required ] @@ -27,8 +37,25 @@ export class RenameAssetForm extends Form { if (asset) { let index = asset.fileName.lastIndexOf('.'); + if (index > 0) { - result.name += asset.fileName.substr(index); + result.fileName += asset.fileName.substr(index); + } + + if (result.fileName === asset.fileName) { + delete result.fileName; + } + + if (result.slug === asset.slug) { + delete result.slug; + } + + if (Types.jsJsonEquals(result.tags, asset.tags)) { + delete result.tags; + } + + if (Object.keys(result).length === 0) { + return null; } } @@ -36,13 +63,14 @@ export class RenameAssetForm extends Form { } public load(asset: AssetDto) { - let name = asset.fileName; + let fileName = asset.fileName; + + let index = fileName.lastIndexOf('.'); - let index = name.lastIndexOf('.'); if (index > 0) { - name = name.substr(0, index); + fileName = fileName.substr(0, index); } - super.load({ name }); + super.load({ fileName, slug: asset.slug, tags: asset.tags }); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/state/assets.state.spec.ts b/src/Squidex/app/shared/state/assets.state.spec.ts index 93597d820..b6c11a579 100644 --- a/src/Squidex/app/shared/state/assets.state.spec.ts +++ b/src/Squidex/app/shared/state/assets.state.spec.ts @@ -30,8 +30,8 @@ describe('AssetsState', () => { const newVersion = new Version('2'); const oldAssets = [ - new AssetDto('id1', creator, creator, creation, creation, 'name1', 'type1', 1, 1, 'mime1', false, null, null, ['tag1', 'shared'], 'url1', version), - new AssetDto('id2', creator, creator, creation, creation, 'name2', 'type2', 2, 2, 'mime2', false, null, null, ['tag2', 'shared'], 'url2', version) + new AssetDto('id1', creator, creator, creation, creation, 'name1', 'type1', 1, 1, 'mime1', false, null, null, 'slug1', ['tag1', 'shared'], 'url1', version), + new AssetDto('id2', creator, creator, creation, creation, 'name2', 'type2', 2, 2, 'mime2', false, null, null, 'slug2', ['tag2', 'shared'], 'url2', version) ]; let dialogs: IMock; @@ -81,7 +81,7 @@ describe('AssetsState', () => { }); it('should add asset to snapshot when created', () => { - const newAsset = new AssetDto('id3', creator, creator, creation, creation, 'name3', 'type3', 3, 3, 'mime3', true, 0, 0, [], 'url3', version); + const newAsset = new AssetDto('id3', creator, creator, creation, creation, 'name3', 'type3', 3, 3, 'mime3', true, 0, 0, 'slug2', [], 'url3', version); assetsState.add(newAsset); @@ -90,7 +90,7 @@ describe('AssetsState', () => { }); it('should update properties when updated', () => { - const newAsset = new AssetDto('id1', modifier, modifier, modified, modified, 'name3', 'type3', 3, 3, 'mime3', true, 0, 0, ['new'], 'url3', version); + const newAsset = new AssetDto('id1', modifier, modifier, modified, modified, 'name3', 'type3', 3, 3, 'mime3', true, 0, 0, 'slug3', ['new'], 'url3', version); assetsState.update(newAsset); diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.html b/src/Squidex/app/shell/pages/internal/apps-menu.component.html index 5bbb6aa34..59222a51b 100644 --- a/src/Squidex/app/shell/pages/internal/apps-menu.component.html +++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.html @@ -57,6 +57,6 @@ + (complete)="addAppDialog.hide()"> \ No newline at end of file diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json index bf4e2d583..99f85ff90 100644 --- a/src/Squidex/appsettings.json +++ b/src/Squidex/appsettings.json @@ -189,7 +189,7 @@ * * Supported: MongoDB, Development */ - "clustering": "MongoDb", + "clustering": "Development", /* * The port is used to share messages between all cluster members. Must be accessible within your cluster or network. */ diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/AssetsFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/AssetsFieldTests.cs index f2bfe8bc4..b0cd01ea5 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/AssetsFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/AssetsFieldTests.cs @@ -28,7 +28,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent public string FileName { get; set; } - public string FileNameSlug { get; set; } + public string Slug { get; set; } public long FileSize { get; set; } diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetChangedTriggerHandlerTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetChangedTriggerHandlerTests.cs index 584a1c50e..48f125d12 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetChangedTriggerHandlerTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetChangedTriggerHandlerTests.cs @@ -46,7 +46,7 @@ namespace Squidex.Domain.Apps.Entities.Assets { new object[] { new AssetCreated(), EnrichedAssetEventType.Created }, new object[] { new AssetUpdated(), EnrichedAssetEventType.Updated }, - new object[] { new AssetRenamed(), EnrichedAssetEventType.Renamed }, + new object[] { new AssetAnnotated(), EnrichedAssetEventType.Annotated }, new object[] { new AssetDeleted(), EnrichedAssetEventType.Deleted } }; diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetGrainTests.cs index 82c578265..1846de4b4 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetGrainTests.cs @@ -76,7 +76,8 @@ namespace Squidex.Domain.Apps.Entities.Assets MimeType = file.MimeType, PixelWidth = image.PixelWidth, PixelHeight = image.PixelHeight, - Tags = new HashSet() + Tags = new HashSet(), + Slug = file.FileName.ToAssetSlug() }) ); } @@ -109,9 +110,9 @@ namespace Squidex.Domain.Apps.Entities.Assets } [Fact] - public async Task Rename_should_create_events() + public async Task AnnotateName_should_create_events() { - var command = new RenameAsset { FileName = "My New Image.png" }; + var command = new AnnotateAsset { FileName = "My New Image.png" }; await ExecuteCreateAsync(); @@ -120,18 +121,36 @@ namespace Squidex.Domain.Apps.Entities.Assets result.ShouldBeEquivalent(new EntitySavedResult(1)); Assert.Equal("My New Image.png", sut.Snapshot.FileName); - Assert.Equal("my-new-image.png", sut.Snapshot.FileNameSlug); LastEvents .ShouldHaveSameEvents( - CreateAssetEvent(new AssetRenamed { FileName = "My New Image.png" }) + CreateAssetEvent(new AssetAnnotated { FileName = "My New Image.png" }) ); } [Fact] - public async Task Tag_should_create_events() + public async Task AnnotateSlug_should_create_events() { - var command = new TagAsset(); + var command = new AnnotateAsset { Slug = "my-new-image.png" }; + + await ExecuteCreateAsync(); + + var result = await sut.ExecuteAsync(CreateAssetCommand(command)); + + result.ShouldBeEquivalent(new EntitySavedResult(1)); + + Assert.Equal("my-new-image.png", sut.Snapshot.Slug); + + LastEvents + .ShouldHaveSameEvents( + CreateAssetEvent(new AssetAnnotated { Slug = "my-new-image.png" }) + ); + } + + [Fact] + public async Task AnnotateTag_should_create_events() + { + var command = new AnnotateAsset { Tags = new HashSet() }; await ExecuteCreateAsync(); @@ -141,7 +160,7 @@ namespace Squidex.Domain.Apps.Entities.Assets LastEvents .ShouldHaveSameEvents( - CreateAssetEvent(new AssetTagged { Tags = new HashSet() }) + CreateAssetEvent(new AssetAnnotated { Tags = new HashSet() }) ); } diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Guards/GuardAssetTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Guards/GuardAssetTests.cs index 2c5e2c85f..55f8edc64 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Guards/GuardAssetTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Guards/GuardAssetTests.cs @@ -15,29 +15,38 @@ namespace Squidex.Domain.Apps.Entities.Assets.Guards public class GuardAssetTests { [Fact] - public void CanRename_should_throw_exception_if_name_not_defined() + public void CanAnnotate_should_throw_exception_if_nothing_defined() { - var command = new RenameAsset(); + var command = new AnnotateAsset(); - ValidationAssert.Throws(() => GuardAsset.CanRename(command, "asset-name"), - new ValidationError("Name is required.", "FileName")); + ValidationAssert.Throws(() => GuardAsset.CanAnnotate(command, "asset-name", "asset-slug"), + new ValidationError("Either file name, slug or tags must be defined.", "FileName", "Slug", "Tags")); } [Fact] - public void CanRename_should_throw_exception_if_name_are_the_same() + public void CanAnnotate_should_throw_exception_if_names_are_the_same() { - var command = new RenameAsset { FileName = "asset-name" }; + var command = new AnnotateAsset { FileName = "asset-name" }; - ValidationAssert.Throws(() => GuardAsset.CanRename(command, "asset-name"), + ValidationAssert.Throws(() => GuardAsset.CanAnnotate(command, "asset-name", "asset-slug"), new ValidationError("Asset has already this name.", "FileName")); } [Fact] - public void CanRename_should_not_throw_exception_if_name_are_different() + public void CanAnnotate_should_throw_exception_if_slugs_are_the_same() { - var command = new RenameAsset { FileName = "new-name" }; + var command = new AnnotateAsset { Slug = "asset-slug" }; - GuardAsset.CanRename(command, "asset-name"); + ValidationAssert.Throws(() => GuardAsset.CanAnnotate(command, "asset-name", "asset-slug"), + new ValidationError("Asset has already this slug.", "Slug")); + } + + [Fact] + public void CanAnnotate_should_not_throw_exception_if_names_are_different() + { + var command = new AnnotateAsset { FileName = "new-name", Slug = "new-slug" }; + + GuardAsset.CanAnnotate(command, "asset-name", "asset-slug"); } [Fact] diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs index 524955036..5ce16495d 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs @@ -51,12 +51,12 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL sourceUrl mimeType fileName - fileNameSlug fileSize fileVersion isImage pixelWidth pixelHeight + slug } }"; @@ -86,12 +86,12 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL sourceUrl = $"assets/source/{asset.Id}", mimeType = "image/png", fileName = "MyFile.png", - fileNameSlug = "myfile.png", fileSize = 1024, fileVersion = 123, isImage = true, pixelWidth = 800, - pixelHeight = 600 + pixelHeight = 600, + slug = "myfile.png" } } } @@ -119,12 +119,12 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL sourceUrl mimeType fileName - fileNameSlug fileSize fileVersion isImage pixelWidth pixelHeight + slug } } }"; @@ -158,12 +158,12 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL sourceUrl = $"assets/source/{asset.Id}", mimeType = "image/png", fileName = "MyFile.png", - fileNameSlug = "myfile.png", fileSize = 1024, fileVersion = 123, isImage = true, pixelWidth = 800, - pixelHeight = 600 + pixelHeight = 600, + slug = "myfile.png" } } } @@ -193,12 +193,12 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL sourceUrl mimeType fileName - fileNameSlug fileSize fileVersion isImage pixelWidth pixelHeight + slug }} }}"; @@ -224,12 +224,12 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL sourceUrl = $"assets/source/{asset.Id}", mimeType = "image/png", fileName = "MyFile.png", - fileNameSlug = "myfile.png", fileSize = 1024, fileVersion = 123, isImage = true, pixelWidth = 800, - pixelHeight = 600 + pixelHeight = 600, + slug = "myfile.png" } } }; diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs index 60bc92d97..fb1ea1376 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs @@ -170,7 +170,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL LastModified = now, LastModifiedBy = new RefToken(RefTokenType.Subject, "user2"), FileName = "MyFile.png", - FileNameSlug = "myfile.png", + Slug = "myfile.png", FileSize = 1024, FileVersion = 123, MimeType = "image/png", diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/TestData/FakeAssetEntity.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/TestData/FakeAssetEntity.cs index 4dfb34856..d51659fca 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/TestData/FakeAssetEntity.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/TestData/FakeAssetEntity.cs @@ -37,7 +37,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.TestData public string FileName { get; set; } - public string FileNameSlug { get; set; } + public string Slug { get; set; } public long FileSize { get; set; } diff --git a/tests/Squidex.Infrastructure.Tests/Queries/ODataConversionTests.cs b/tests/Squidex.Infrastructure.Tests/Queries/ODataConversionTests.cs index 5ec8c24f1..90154a9c5 100644 --- a/tests/Squidex.Infrastructure.Tests/Queries/ODataConversionTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Queries/ODataConversionTests.cs @@ -355,6 +355,15 @@ namespace Squidex.Infrastructure.Queries Assert.Equal(o, i); } + [Fact] + public void Should_parse_filter_with_full_text_numbers() + { + var i = Q("$search=\"33k\""); + var o = C("FullText: '33k'"); + + Assert.Equal(o, i); + } + [Fact] public void Should_parse_filter_with_full_text() { diff --git a/tools/Migrate_01/Migrations/CreateAssetSlugs.cs b/tools/Migrate_01/Migrations/CreateAssetSlugs.cs index 70249d441..cf85cc195 100644 --- a/tools/Migrate_01/Migrations/CreateAssetSlugs.cs +++ b/tools/Migrate_01/Migrations/CreateAssetSlugs.cs @@ -27,7 +27,7 @@ namespace Migrate_01.Migrations { return stateForAssets.ReadAllAsync(async (state, version) => { - state.FileNameSlug = state.FileName.ToAssetSlug(); + state.Slug = state.FileName.ToAssetSlug(); await stateForAssets.WriteAsync(state.Id, state, version, version); }); diff --git a/src/Squidex.Domain.Apps.Events/Assets/AssetRenamed.cs b/tools/Migrate_01/OldEvents/AssetRenamed.cs similarity index 61% rename from src/Squidex.Domain.Apps.Events/Assets/AssetRenamed.cs rename to tools/Migrate_01/OldEvents/AssetRenamed.cs index 68b3b94e9..44c899953 100644 --- a/src/Squidex.Domain.Apps.Events/Assets/AssetRenamed.cs +++ b/tools/Migrate_01/OldEvents/AssetRenamed.cs @@ -5,13 +5,22 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; +using Squidex.Domain.Apps.Events.Assets; +using Squidex.Infrastructure; using Squidex.Infrastructure.EventSourcing; -namespace Squidex.Domain.Apps.Events.Assets +namespace Migrate_01.OldEvents { [EventType(nameof(AssetRenamed))] - public sealed class AssetRenamed : AssetEvent + [Obsolete] + public sealed class AssetRenamed : AssetEvent, IMigrated { public string FileName { get; set; } + + public IEvent Migrate() + { + return new AssetAnnotated { FileName = FileName }; + } } } diff --git a/tools/Migrate_01/OldEvents/AssetTagged.cs b/tools/Migrate_01/OldEvents/AssetTagged.cs new file mode 100644 index 000000000..d3c12807e --- /dev/null +++ b/tools/Migrate_01/OldEvents/AssetTagged.cs @@ -0,0 +1,27 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using Squidex.Domain.Apps.Events.Assets; +using Squidex.Infrastructure; +using Squidex.Infrastructure.EventSourcing; + +namespace Migrate_01.OldEvents +{ + [EventType(nameof(AssetTagged))] + [Obsolete] + public sealed class AssetTagged : AssetEvent, IMigrated + { + public HashSet Tags { get; set; } + + public IEvent Migrate() + { + return new AssetAnnotated { Tags = Tags }; + } + } +} diff --git a/tools/Migrate_01/OldTriggers/AssetChangedTrigger.cs b/tools/Migrate_01/OldTriggers/AssetChangedTrigger.cs index ad124dac1..9319af0ba 100644 --- a/tools/Migrate_01/OldTriggers/AssetChangedTrigger.cs +++ b/tools/Migrate_01/OldTriggers/AssetChangedTrigger.cs @@ -46,7 +46,7 @@ namespace Migrate_01.OldTriggers if (SendRename) { - conditions.Add($"event.type == '{EnrichedAssetEventType.Renamed}'"); + conditions.Add($"event.type == '{EnrichedAssetEventType.Annotated}'"); } if (SendDelete)
-
+
{{asset.fileName}}
-
-
- - - -
-
{{asset.pixelWidth}}x{{asset.pixelHeight}}px, {{asset.fileSize | sqxFileSize}} @@ -121,10 +103,10 @@ - -