From b02588aeb6c7a9fe7e49b7c03ce0c08517fcfcf1 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 9 Dec 2020 15:10:18 +0100 Subject: [PATCH] Feature/refs view (#608) * Views for references. * Cleanup contents state. * Temorary * Paging simplified. * Cleanup and test improvements. * Minor fixes after testing. --- backend/i18n/frontend_en.json | 7 +- backend/i18n/frontend_it.json | 5 + backend/i18n/frontend_nl.json | 5 + backend/i18n/source/frontend_en.json | 9 +- .../Assets/MongoAssetRepository.cs | 25 +- .../Contents/MongoContentCollection.cs | 2 +- .../Contents/Operations/QueryByIds.cs | 14 +- .../Contents/Operations/QueryByQuery.cs | 37 +- .../Rules/MongoRuleEventRepository.cs | 11 +- .../Assets/AssetDomainObject.cs | 37 +- .../Assets/AssetFolderDomainObject.cs | 4 + .../Contents/BulkUpdateCommandMiddleware.cs | 64 +++- .../Contents/Commands/BulkUpdateJob.cs | 10 +- .../Contents/Commands/BulkUpdateType.cs | 3 +- .../Contents/ContentDomainObject.cs | 6 +- .../Contents/IContentQueryService.cs | 2 + .../Operations/ContentOperationContext.cs | 19 +- .../Contents/Queries/ContentQueryService.cs | 22 +- .../Contents/ValidationResult.cs | 16 - .../Rules/RuleDomainObject.cs | 19 +- backend/src/Squidex.Shared/Permissions.cs | 2 +- backend/src/Squidex.Web/Resources.cs | 2 - .../Contents/ContentsController.cs | 13 +- .../Contents/Models/BulkUpdateDto.cs | 5 + .../Contents/Models/BulkUpdateJobDto.cs | 12 +- .../Controllers/Contents/Models/ContentDto.cs | 12 +- .../Contents/Models/ValidationResultDto.cs | 29 -- .../BulkUpdateCommandMiddlewareTests.cs | 355 ++++++++---------- .../Contents/ContentDomainObjectTests.cs | 7 +- .../Rules/RuleDomainObjectTests.cs | 4 +- frontend/app-config/webpack.config.js | 2 +- frontend/app/app.module.ts | 15 +- frontend/app/app.routes.ts | 2 +- .../pages/users/users-page.component.html | 2 +- .../pages/users/users-page.component.ts | 2 +- .../services/event-consumers.service.ts | 2 +- .../administration/services/users.service.ts | 2 +- .../administration/state/users.forms.ts | 6 +- .../administration/state/users.state.spec.ts | 28 +- .../administration/state/users.state.ts | 61 ++- .../pages/assets-filters-page.component.html | 2 +- .../assets/pages/assets-page.component.html | 7 +- frontend/app/features/content/declarations.ts | 8 +- frontend/app/features/content/module.ts | 5 +- .../pages/content/content-page.component.html | 102 +++-- .../pages/content/content-page.component.scss | 8 + .../pages/content/content-page.component.ts | 48 ++- .../editor/content-editor.component.html | 24 ++ .../content-editor.component.scss} | 0 .../editor/content-editor.component.ts | 47 +++ .../{ => editor}/content-field.component.html | 0 .../{ => editor}/content-field.component.scss | 0 .../{ => editor}/content-field.component.ts | 4 +- .../content-section.component.html | 6 +- .../content-section.component.scss | 0 .../{ => editor}/content-section.component.ts | 35 +- .../field-languages.component.html | 0 .../editor/field-languages.component.scss | 0 .../{ => editor}/field-languages.component.ts | 0 .../content-references.component.html | 20 + .../content-references.component.scss | 10 + .../content-references.component.ts | 57 +++ .../contents-filters-page.component.html | 6 +- .../contents/contents-page.component.html | 8 +- .../pages/sidebar/sidebar-page.component.ts | 2 +- .../shared/forms/array-item.component.html | 6 +- .../shared/forms/array-item.component.ts | 23 +- .../shared/forms/assets-editor.component.ts | 18 +- .../forms/stock-photo-editor.component.ts | 14 +- .../list/content-list-cell.directive.ts | 18 +- .../list/content-list-field.component.html | 2 +- .../list/content-list-field.component.ts | 19 +- .../list/content-value-editor.component.ts | 2 +- .../references/content-creator.component.html | 2 +- .../content-selector.component.html | 6 +- .../references/reference-item.component.html | 7 +- .../references/reference-item.component.scss | 5 + .../references/reference-item.component.ts | 17 +- .../references-editor.component.html | 2 +- .../references/references-editor.component.ts | 15 +- .../cards/content-summary-card.component.html | 2 +- .../cards/content-summary-card.component.ts | 25 +- .../events/rule-events-page.component.html | 2 +- .../contributors-page.component.html | 7 +- .../angular/forms/control-errors.component.ts | 20 +- .../forms/editors/autocomplete.component.ts | 6 +- .../forms/editors/checkbox-group.component.ts | 4 +- .../forms/editors/code-editor.component.ts | 9 +- .../forms/editors/color-picker.component.ts | 8 +- .../editors/date-time-editor.component.html | 4 +- .../editors/date-time-editor.component.ts | 25 +- .../forms/editors/dropdown.component.ts | 6 +- .../forms/editors/iframe-editor.component.ts | 9 +- .../editors/localized-input.component.html | 6 +- .../editors/localized-input.component.ts | 29 +- .../angular/forms/editors/stars.component.ts | 12 +- .../forms/editors/tag-editor.component.ts | 18 +- .../angular/forms/editors/toggle.component.ts | 4 +- .../angular/forms/progress-bar.component.ts | 2 +- .../app/framework/angular/forms/validators.ts | 2 +- .../framework/angular/http/http-extensions.ts | 4 + .../angular/image-source.directive.ts | 4 +- .../angular/language-selector.component.ts | 2 +- .../framework/angular/list-view.component.ts | 26 +- .../modals/dialog-renderer.component.ts | 17 +- .../framework/angular/pager.component.html | 10 +- .../framework/angular/pager.component.spec.ts | 138 +++++++ .../app/framework/angular/pager.component.ts | 55 ++- .../angular/panel-container.directive.ts | 4 +- .../app/framework/angular/panel.component.ts | 12 +- .../framework/angular/pipes/colors.pipes.ts | 8 +- .../app/framework/angular/pipes/money.pipe.ts | 6 +- .../framework/angular/pipes/numbers.pipes.ts | 5 +- .../angular/routers/router-2-state.spec.ts | 126 +++---- .../angular/routers/router-2-state.ts | 144 +++---- .../framework/angular/stateful.component.ts | 6 +- frontend/app/framework/configurations.ts | 2 +- frontend/app/framework/internal.ts | 1 - .../framework/services/analytics.service.ts | 2 +- .../framework/services/message-bus.service.ts | 9 +- .../services/resource-loader.service.ts | 4 +- frontend/app/framework/state.ts | 44 ++- frontend/app/framework/utils/cookies.ts | 2 +- frontend/app/framework/utils/date-time.ts | 2 +- frontend/app/framework/utils/math-helper.ts | 10 +- frontend/app/framework/utils/pager.spec.ts | 214 ----------- frontend/app/framework/utils/pager.ts | 85 ----- .../app/framework/utils/rxjs-extensions.ts | 2 +- frontend/app/framework/utils/types.ts | 6 +- .../assets/asset-dialog.component.html | 11 +- .../assets/asset-dialog.component.ts | 5 +- .../assets/asset-folder-dialog.component.ts | 5 +- .../components/assets/asset.component.html | 12 +- .../components/assets/asset.component.ts | 23 +- .../assets/assets-list.component.html | 37 +- .../assets/assets-list.component.ts | 50 ++- .../assets/assets-selector.component.html | 10 +- .../assets/assets-selector.component.ts | 2 +- .../comments/comment.component.html | 32 +- .../components/comments/comment.component.ts | 21 +- .../components/comments/comments.component.ts | 2 +- .../forms/geolocation-editor.component.ts | 6 +- .../forms/markdown-editor.component.ts | 2 +- .../forms/references-checkboxes.component.ts | 4 +- .../forms/references-dropdown.component.ts | 12 +- .../forms/references-tags.component.ts | 4 +- .../components/forms/rich-editor.component.ts | 11 +- .../app/shared/components/notifo.component.ts | 7 +- frontend/app/shared/services/apps.service.ts | 2 +- .../app/shared/services/assets.service.ts | 10 +- .../shared/services/autosave.service.spec.ts | 18 +- .../app/shared/services/autosave.service.ts | 4 +- .../app/shared/services/backups.service.ts | 2 +- .../shared/services/clients.service.spec.ts | 2 +- .../shared/services/comments.service.spec.ts | 6 +- .../shared/services/contents.service.spec.ts | 60 ++- .../app/shared/services/contents.service.ts | 190 +++++++--- .../services/contributors.service.spec.ts | 2 +- .../shared/services/patterns.service.spec.ts | 2 +- .../app/shared/services/roles.service.spec.ts | 2 +- frontend/app/shared/services/rules.service.ts | 2 +- .../app/shared/services/schemas.service.ts | 2 +- .../shared/services/workflows.service.spec.ts | 4 +- .../app/shared/services/workflows.service.ts | 3 +- frontend/app/shared/state/_test-helpers.ts | 4 +- .../shared/state/asset-uploader.state.spec.ts | 8 +- .../app/shared/state/assets.state.spec.ts | 47 ++- frontend/app/shared/state/assets.state.ts | 208 +++++----- frontend/app/shared/state/contents.forms.ts | 2 +- frontend/app/shared/state/contents.state.ts | 307 +++++++-------- .../shared/state/contributors.state.spec.ts | 21 +- .../app/shared/state/contributors.state.ts | 90 ++--- frontend/app/shared/state/languages.state.ts | 4 +- frontend/app/shared/state/plans.state.ts | 2 +- frontend/app/shared/state/queries.ts | 6 +- frontend/app/shared/state/query.spec.ts | 32 +- frontend/app/shared/state/query.ts | 16 +- .../shared/state/rule-events.state.spec.ts | 8 +- .../app/shared/state/rule-events.state.ts | 44 +-- frontend/app/shared/state/rules.state.spec.ts | 8 +- frontend/app/shared/state/ui.state.ts | 3 +- frontend/app/shared/utils/array-helper.ts | 10 - .../internal/profile-menu.component.html | 5 +- .../pages/internal/profile-menu.component.ts | 17 +- .../pages/internal/search-menu.component.html | 3 +- .../pages/internal/search-menu.component.ts | 2 - frontend/tslint.json | 4 + 187 files changed, 2148 insertions(+), 1855 deletions(-) delete mode 100644 backend/src/Squidex.Domain.Apps.Entities/Contents/ValidationResult.cs delete mode 100644 backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ValidationResultDto.cs create mode 100644 frontend/app/features/content/pages/content/editor/content-editor.component.html rename frontend/app/features/content/pages/content/{field-languages.component.scss => editor/content-editor.component.scss} (100%) create mode 100644 frontend/app/features/content/pages/content/editor/content-editor.component.ts rename frontend/app/features/content/pages/content/{ => editor}/content-field.component.html (100%) rename frontend/app/features/content/pages/content/{ => editor}/content-field.component.scss (100%) rename frontend/app/features/content/pages/content/{ => editor}/content-field.component.ts (98%) rename frontend/app/features/content/pages/content/{ => editor}/content-section.component.html (81%) rename frontend/app/features/content/pages/content/{ => editor}/content-section.component.scss (100%) rename frontend/app/features/content/pages/content/{ => editor}/content-section.component.ts (60%) rename frontend/app/features/content/pages/content/{ => editor}/field-languages.component.html (100%) create mode 100644 frontend/app/features/content/pages/content/editor/field-languages.component.scss rename frontend/app/features/content/pages/content/{ => editor}/field-languages.component.ts (100%) create mode 100644 frontend/app/features/content/pages/content/references/content-references.component.html create mode 100644 frontend/app/features/content/pages/content/references/content-references.component.scss create mode 100644 frontend/app/features/content/pages/content/references/content-references.component.ts create mode 100644 frontend/app/framework/angular/pager.component.spec.ts delete mode 100644 frontend/app/framework/utils/pager.spec.ts delete mode 100644 frontend/app/framework/utils/pager.ts delete mode 100644 frontend/app/shared/utils/array-helper.ts diff --git a/backend/i18n/frontend_en.json b/backend/i18n/frontend_en.json index cf9d4950d..c94ecb42f 100644 --- a/backend/i18n/frontend_en.json +++ b/backend/i18n/frontend_en.json @@ -353,6 +353,9 @@ "contents.changeStatusToImmediately": "Set to {action} immediately.", "contents.changeStatusToLater": "Set to {action} at a later point date and time.", "contents.contentNotValid": "Content element not valid, please check the field with the red bar on the left in all languages (if localizable).", + "contents.contentTab.editor": "Editor", + "contents.contentTab.references": "References", + "contents.contentTab.referencing": "Referencing", "contents.create": "New", "contents.createContentTooltip": "New Content (CTRL + SHIFT + G)", "contents.created": "Content created successfully.", @@ -366,7 +369,7 @@ "contents.deleteConfirmTitle": "Delete content", "contents.deleteFailed": "Failed to delete content. Please reload.", "contents.deleteManyConfirmText": "Do you really want to delete the selected content items?", - "contents.deleteReferrerConfirmText": "The content is referenced by another content item.\n\nDo you really want to delete the content?", + "contents.deleteReferrerConfirmText": "The content is referenced by another content item.\n\nDo you really want to delete this content?", "contents.deleteReferrerConfirmTitle": "Delete content", "contents.deleteVersionConfirmText": "Do you really want to delete this version?", "contents.deleteVersionFailed": "Failed to delete version. Please reload.", @@ -391,6 +394,7 @@ "contents.pendingChangesTextToChange": "You have unsaved changes.\n\nWhen you change the status you will lose them.\n\n**Do you want to continue anyway?**", "contents.pendingChangesTextToClose": "You have unsaved changes.\n\nWhen you close the current content view you will lose them.\n\n**Do you want to continue anyway?**", "contents.pendingChangesTitle": "Unsaved changes", + "contents.publishAll": "Publish All", "contents.referencesCreateNew": "Add New", "contents.referencesCreatePublish": "Create and Publish", "contents.referencesLink": "Link selected contents ({count})", @@ -428,6 +432,7 @@ "contents.unsavedChangesTitle": "Unsaved changes", "contents.updated": "Content updated successfully.", "contents.updateFailed": "Failed to update content. Please reload.", + "contents.validate": "Validate", "contents.validationHint": "Please remember to check all languages when you see validation errors.", "contents.versionCompare": "Compare", "contents.versionDelete": "Delete this Version", diff --git a/backend/i18n/frontend_it.json b/backend/i18n/frontend_it.json index efe762f51..3ba2452f2 100644 --- a/backend/i18n/frontend_it.json +++ b/backend/i18n/frontend_it.json @@ -353,6 +353,9 @@ "contents.changeStatusToImmediately": "Imposta {action} immediatamente.", "contents.changeStatusToLater": "Imposta {action} ad una data e ora successiva.", "contents.contentNotValid": "Un elemento del contenuto non è valido, verifica il campo con la barra rossa per tutte le lingue impostate (se presenti).", + "contents.contentTab.editor": "Editor", + "contents.contentTab.references": "References", + "contents.contentTab.referencing": "Referencing", "contents.create": "Nuovo", "contents.createContentTooltip": "Nuovo contenuto (CTRL + SHIFT + G)", "contents.created": "Contenuto creato con successo.", @@ -391,6 +394,7 @@ "contents.pendingChangesTextToChange": "Non hai salvato le modifiche.\n\nSe cambi lo stato perderai le modifiche.\n\n**Sei sicuro di voler continuare?**", "contents.pendingChangesTextToClose": "Non hai salvato le modifiche.\n\nChiudendo il contenuto corrente perderai tutte le modifiche.\n\n**Sei sicuro di voler continuare?**", "contents.pendingChangesTitle": "Modifiche non salvate", + "contents.publishAll": "Publish All", "contents.referencesCreateNew": "Aggiungi nuovo", "contents.referencesCreatePublish": "Crea e pubblica", "contents.referencesLink": "Collega i contenuti selezionati ({count})", @@ -428,6 +432,7 @@ "contents.unsavedChangesTitle": "Modifiche non salvate", "contents.updated": "Contenuto aggiornato con successo.", "contents.updateFailed": "Non è stato possibile aggiornare il contenuto. Per favore ricarica.", + "contents.validate": "Validate", "contents.validationHint": "Ricorda di verificare tutte le lingue quando vedi errori di validazione.", "contents.versionCompare": "Confronta", "contents.versionDelete": "Cancella questa Versione", diff --git a/backend/i18n/frontend_nl.json b/backend/i18n/frontend_nl.json index 4dede1bec..b944fd00d 100644 --- a/backend/i18n/frontend_nl.json +++ b/backend/i18n/frontend_nl.json @@ -353,6 +353,9 @@ "contents.changeStatusToImmediately": "Zet onmiddellijk op {action}.", "contents.changeStatusToLater": "Zet op {action} op een latere datum en tijd.", "contents.contentNotValid": "Inhoudselement niet geldig, controleer het veld met de rode balk aan de linkerkant in alle talen (indien lokaliseerbaar).", + "contents.contentTab.editor": "Editor", + "contents.contentTab.references": "References", + "contents.contentTab.referencing": "Referencing", "contents.create": "Nieuw", "contents.createContentTooltip": "Nieuwe inhoud (CTRL + SHIFT + G)", "contents.created": "Inhoud succesvol aangemaakt.", @@ -391,6 +394,7 @@ "contents.pendingChangesTextToChange": "Je hebt niet-opgeslagen wijzigingen. \n \n Wanneer je de status wijzigt, raak je ze kwijt. \n \n **Wil je toch doorgaan?**", "contents.pendingChangesTextToClose": "Je hebt niet-opgeslagen wijzigingen. \n \n Wanneer je de huidige inhoudsweergave sluit, raak je ze kwijt. \n n **Wil je toch doorgaan?**", "contents.pendingChangesTitle": "Niet-opgeslagen wijzigingen", + "contents.publishAll": "Publish All", "contents.referencesCreateNew": "Nieuwe toevoegen", "contents.referencesCreatePublish": "Maken en publiceren", "contents.referencesLink": "Link geselecteerde inhoud ({count})", @@ -428,6 +432,7 @@ "contents.unsavedChangesTitle": "Niet-opgeslagen wijzigingen", "contents.updated": "Inhoud succesvol bijgewerkt.", "contents.updateFailed": "Bijwerken van inhoud is mislukt. Laad opnieuw.", + "contents.validate": "Validate", "contents.validationHint": "Denk eraan om alle talen te controleren wanneer je validatiefouten ziet.", "contents.versionCompare": "Vergelijk", "contents.versionDelete": "Verwijder deze versie", diff --git a/backend/i18n/source/frontend_en.json b/backend/i18n/source/frontend_en.json index dd313a50f..c94ecb42f 100644 --- a/backend/i18n/source/frontend_en.json +++ b/backend/i18n/source/frontend_en.json @@ -353,6 +353,9 @@ "contents.changeStatusToImmediately": "Set to {action} immediately.", "contents.changeStatusToLater": "Set to {action} at a later point date and time.", "contents.contentNotValid": "Content element not valid, please check the field with the red bar on the left in all languages (if localizable).", + "contents.contentTab.editor": "Editor", + "contents.contentTab.references": "References", + "contents.contentTab.referencing": "Referencing", "contents.create": "New", "contents.createContentTooltip": "New Content (CTRL + SHIFT + G)", "contents.created": "Content created successfully.", @@ -368,8 +371,6 @@ "contents.deleteManyConfirmText": "Do you really want to delete the selected content items?", "contents.deleteReferrerConfirmText": "The content is referenced by another content item.\n\nDo you really want to delete this content?", "contents.deleteReferrerConfirmTitle": "Delete content", - "contents.unpublishReferrerConfirmText": "The content is referenced by another published content item.\n\nDo you really want to unpublish this content?", - "contents.unpublishReferrerConfirmTitle": "Unpublish content", "contents.deleteVersionConfirmText": "Do you really want to delete this version?", "contents.deleteVersionFailed": "Failed to delete version. Please reload.", "contents.draftNew": "New Draft", @@ -393,6 +394,7 @@ "contents.pendingChangesTextToChange": "You have unsaved changes.\n\nWhen you change the status you will lose them.\n\n**Do you want to continue anyway?**", "contents.pendingChangesTextToClose": "You have unsaved changes.\n\nWhen you close the current content view you will lose them.\n\n**Do you want to continue anyway?**", "contents.pendingChangesTitle": "Unsaved changes", + "contents.publishAll": "Publish All", "contents.referencesCreateNew": "Add New", "contents.referencesCreatePublish": "Create and Publish", "contents.referencesLink": "Link selected contents ({count})", @@ -424,10 +426,13 @@ "contents.tableHeaders.nextStatus": "Next Status", "contents.tableHeaders.status": "Status", "contents.tableHeaders.version": "Version", + "contents.unpublishReferrerConfirmText": "The content is referenced by another published content item.\n\nDo you really want to unpublish this content?", + "contents.unpublishReferrerConfirmTitle": "Unpublish content", "contents.unsavedChangesText": "You have unsaved changes. Do you want to load them now?", "contents.unsavedChangesTitle": "Unsaved changes", "contents.updated": "Content updated successfully.", "contents.updateFailed": "Failed to update content. Please reload.", + "contents.validate": "Validate", "contents.validationHint": "Please remember to check all languages when you see validation errors.", "contents.versionCompare": "Compare", "contents.versionDelete": "Delete this Version", diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs index 4bf245c0c..c6a405970 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs @@ -89,13 +89,21 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets { if (q.Ids != null && q.Ids.Count > 0) { + var filter = BuildFilter(appId, q.Ids.ToHashSet()); + var assetEntities = - await Collection.Find(BuildFilter(appId, q.Ids.ToHashSet())).SortByDescending(x => x.LastModified) + await Collection.Find(filter).SortByDescending(x => x.LastModified) .QueryLimit(q.Query) .QuerySkip(q.Query) .ToListAsync(); + long assetTotal = assetEntities.Count; + + if (assetTotal >= q.Query.Take || q.Query.Skip > 0) + { + assetTotal = await Collection.Find(filter).CountDocumentsAsync(); + } - return ResultList.Create(assetEntities.Count, assetEntities.OfType()); + return ResultList.Create(assetTotal, assetEntities.OfType()); } else { @@ -103,17 +111,20 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets var filter = query.BuildFilter(appId, parentId); - var assetCount = Collection.Find(filter).CountDocumentsAsync(); - var assetItems = - Collection.Find(filter) + var assetEntities = + await Collection.Find(filter) .QueryLimit(query) .QuerySkip(query) .QuerySort(query) .ToListAsync(); + long assetTotal = assetEntities.Count; - var (items, total) = await AsyncHelper.WhenAll(assetItems, assetCount); + if (assetTotal >= q.Query.Take || q.Query.Skip > 0) + { + assetTotal = await Collection.Find(filter).CountDocumentsAsync(); + } - return ResultList.Create(total, items); + return ResultList.Create(assetTotal, assetEntities); } } catch (MongoQueryException ex) when (ex.Message.Contains("17406")) diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs index abb2186c1..83d6a853b 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentCollection.cs @@ -102,7 +102,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { using (Profiler.TraceMethod()) { - if (q.Ids != null && q.Ids.Count > 0l) + if (q.Ids != null && q.Ids.Count > 0) { return await queryByIds.QueryAsync(app.Id, new List { schema }, q); } diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Operations/QueryByIds.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Operations/QueryByIds.cs index a1475e935..1af002a3b 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Operations/QueryByIds.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Operations/QueryByIds.cs @@ -50,13 +50,19 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Operations var filter = CreateFilter(appId, schemas.Select(x => x.Id), q.Ids.ToHashSet()); - var items = await FindContentsAsync(q.Query, filter); + var contentEntities = await FindContentsAsync(q.Query, filter); + var contentTotal = (long)contentEntities.Count; - if (items.Count > 0) + if (contentEntities.Count > 0) { + if (contentTotal >= q.Query.Take || q.Query.Skip > 0) + { + contentTotal = await Collection.Find(filter).CountDocumentsAsync(); + } + var contentSchemas = schemas.ToDictionary(x => x.Id); - foreach (var content in items) + foreach (var content in contentEntities) { var schema = contentSchemas[content.SchemaId.Id]; @@ -64,7 +70,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Operations } } - return ResultList.Create(items.Count, items); + return ResultList.Create(contentTotal, contentEntities); } private async Task> FindContentsAsync(ClrQuery query, FilterDefinition filter) diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Operations/QueryByQuery.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Operations/QueryByQuery.cs index feb45e63b..064269047 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Operations/QueryByQuery.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Operations/QueryByQuery.cs @@ -116,22 +116,25 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Operations var filter = CreateFilter(app.Id, schemas.Select(x => x.Id), fullTextIds, query, q.Reference); - var contentCount = Collection.Find(filter).CountDocumentsAsync(); - var contentItems = FindContentsAsync(query, filter); + var contentEntities = await FindContentsAsync(query, filter); + var contentTotal = (long)contentEntities.Count; - var (items, total) = await AsyncHelper.WhenAll(contentItems, contentCount); - - if (items.Count > 0) + if (contentEntities.Count > 0) { + if (contentTotal >= q.Query.Take || q.Query.Skip > 0) + { + contentTotal = await Collection.Find(filter).CountDocumentsAsync(); + } + var contentSchemas = schemas.ToDictionary(x => x.Id); - foreach (var entity in items) + foreach (var entity in contentEntities) { entity.ParseData(contentSchemas[entity.IndexedSchemaId].SchemaDef, DataConverter); } } - return ResultList.Create(total, items); + return ResultList.Create(contentTotal, contentEntities); } catch (MongoCommandException ex) when (ex.Code == 96) { @@ -169,17 +172,23 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Operations var filter = CreateFilter(schema.AppId.Id, Enumerable.Repeat(schema.Id, 1), fullTextIds, query, q.Reference); - var contentCount = Collection.Find(filter).CountDocumentsAsync(); - var contentItems = FindContentsAsync(query, filter); - - var (items, total) = await AsyncHelper.WhenAll(contentItems, contentCount); + var contentEntities = await FindContentsAsync(query, filter); + var contentTotal = (long)contentEntities.Count; - foreach (var entity in items) + if (contentEntities.Count > 0) { - entity.ParseData(schema.SchemaDef, DataConverter); + if (contentTotal >= q.Query.Take || q.Query.Skip > 0) + { + contentTotal = await Collection.Find(filter).CountDocumentsAsync(); + } + + foreach (var entity in contentEntities) + { + entity.ParseData(schema.SchemaDef, DataConverter); + } } - return ResultList.Create(total, items); + return ResultList.Create(contentTotal, contentEntities); } catch (MongoCommandException ex) when (ex.Code == 96) { diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs index 65952f99d..b06b7e2b7 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs @@ -73,12 +73,15 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Rules filter = Filter.And(filter, Filter.Eq(x => x.RuleId, ruleId.Value)); } - var taskForItems = Collection.Find(filter).Skip(skip).Limit(take).SortByDescending(x => x.Created).ToListAsync(); - var taskForCount = Collection.Find(filter).CountDocumentsAsync(); + var ruleEventEntities = await Collection.Find(filter).Skip(skip).Limit(take).SortByDescending(x => x.Created).ToListAsync(); + var ruleEventTotal = (long)ruleEventEntities.Count; - var (items, total) = await AsyncHelper.WhenAll(taskForItems, taskForCount); + if (ruleEventTotal >= take || skip > 0) + { + ruleEventTotal = await Collection.Find(filter).CountDocumentsAsync(); + } - return ResultList.Create(total, items); + return ResultList.Create(ruleEventTotal, ruleEventEntities); } public async Task FindAsync(DomainId id) diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetDomainObject.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetDomainObject.cs index fa76b72de..e9314c967 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetDomainObject.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetDomainObject.cs @@ -72,32 +72,41 @@ namespace Squidex.Domain.Apps.Entities.Assets { await GuardAsset.CanCreate(c, assetQuery); - c.Tags = await NormalizeTagsAsync(c.AppId.Id, c.Tags); + if (c.Tags != null) + { + c.Tags = await NormalizeTagsAsync(c.AppId.Id, c.Tags); + } Create(c); return Snapshot; }); - case UpdateAsset updateAsset: - return UpdateReturn(updateAsset, c => - { - GuardAsset.CanUpdate(c); - - Update(c); - return Snapshot; - }); case AnnotateAsset annotateAsset: return UpdateReturnAsync(annotateAsset, async c => { GuardAsset.CanAnnotate(c); - c.Tags = await NormalizeTagsAsync(Snapshot.AppId.Id, c.Tags); + if (c.Tags != null) + { + c.Tags = await NormalizeTagsAsync(Snapshot.AppId.Id, c.Tags); + } Annotate(c); return Snapshot; }); + + case UpdateAsset updateAsset: + return UpdateReturn(updateAsset, c => + { + GuardAsset.CanUpdate(c); + + Update(c); + + return Snapshot; + }); + case MoveAsset moveAsset: return UpdateReturnAsync(moveAsset, async c => { @@ -107,6 +116,7 @@ namespace Squidex.Domain.Apps.Entities.Assets return Snapshot; }); + case DeleteAsset deleteAsset: return UpdateAsync(deleteAsset, async c => { @@ -121,13 +131,8 @@ namespace Squidex.Domain.Apps.Entities.Assets } } - private async Task?> NormalizeTagsAsync(DomainId appId, HashSet tags) + private async Task> NormalizeTagsAsync(DomainId appId, HashSet tags) { - if (tags == null) - { - return null; - } - var normalized = await assetTags.NormalizeTagsAsync(appId, TagGroups.Assets, tags, Snapshot.Tags); return new HashSet(normalized.Values); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetFolderDomainObject.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetFolderDomainObject.cs index 45137f887..c58784a3d 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetFolderDomainObject.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetFolderDomainObject.cs @@ -64,6 +64,7 @@ namespace Squidex.Domain.Apps.Entities.Assets return Snapshot; }); + case MoveAssetFolder moveAssetFolder: return UpdateReturnAsync(moveAssetFolder, async c => { @@ -73,6 +74,7 @@ namespace Squidex.Domain.Apps.Entities.Assets return Snapshot; }); + case RenameAssetFolder renameAssetFolder: return UpdateReturn(renameAssetFolder, c => { @@ -82,6 +84,7 @@ namespace Squidex.Domain.Apps.Entities.Assets return Snapshot; }); + case DeleteAssetFolder deleteAssetFolder: return Update(deleteAssetFolder, c => { @@ -89,6 +92,7 @@ namespace Squidex.Domain.Apps.Entities.Assets Delete(c); }); + default: throw new NotSupportedException(); } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/BulkUpdateCommandMiddleware.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/BulkUpdateCommandMiddleware.cs index b876e822a..673cf6c62 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/BulkUpdateCommandMiddleware.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/BulkUpdateCommandMiddleware.cs @@ -10,10 +10,13 @@ using System.Linq; using System.Threading.Tasks; using System.Threading.Tasks.Dataflow; using Squidex.Domain.Apps.Entities.Contents.Commands; +using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Reflection; +using Squidex.Infrastructure.Security; using Squidex.Infrastructure.Translations; +using Squidex.Shared; #pragma warning disable CA1826 // Do not use Enumerable methods on indexable collections @@ -42,6 +45,29 @@ namespace Squidex.Domain.Apps.Entities.Contents var requestContext = contextProvider.Context.WithoutContentEnrichment().WithUnpublished(true); var requestedSchema = bulkUpdates.SchemaId.Name; + async Task PublishAsync(BulkUpdateJob job, TCommand command, string permissionId) where TCommand : ContentCommand + { + SimpleMapper.Map(bulkUpdates, command); + + if (!string.IsNullOrWhiteSpace(job.Schema)) + { + var schema = await contentQuery.GetSchemaOrThrowAsync(requestContext, job.Schema); + + command.SchemaId = schema.NamedId(); + } + + var permission = Permissions.ForApp(permissionId, command.AppId.Name, command.SchemaId.Name); + + if (!requestContext.Permissions.Allows(permission)) + { + throw new DomainForbiddenException("Forbidden"); + } + + command.ExpectedVersion = job.ExpectedVersion; + + await context.CommandBus.PublishAsync(command); + } + var results = new BulkUpdateResultItem[bulkUpdates.Jobs.Length]; var actionBlock = new ActionBlock(async index => @@ -54,13 +80,18 @@ namespace Squidex.Domain.Apps.Entities.Contents { var id = await FindIdAsync(requestContext, requestedSchema, job); + if (job.Type != BulkUpdateType.Upsert && (id == null || id == DomainId.Empty)) + { + throw new DomainObjectNotFoundException("undefined"); + } + result.ContentId = id; switch (job.Type) { case BulkUpdateType.Upsert: { - var command = SimpleMapper.Map(bulkUpdates, new UpsertContent { Data = job.Data }); + var command = new UpsertContent { Data = job.Data! }; if (id != null && id != DomainId.Empty) { @@ -69,38 +100,31 @@ namespace Squidex.Domain.Apps.Entities.Contents result.ContentId = command.ContentId; - await context.CommandBus.PublishAsync(command); + await PublishAsync(job, command, Permissions.AppContentsUpsert); break; } - case BulkUpdateType.ChangeStatus: + case BulkUpdateType.Validate: { - if (id == null || id == DomainId.Empty) - { - throw new DomainObjectNotFoundException("undefined"); - } + var command = new ValidateContent { ContentId = id.Value }; - var command = SimpleMapper.Map(bulkUpdates, new ChangeContentStatus { ContentId = id.Value }); + await PublishAsync(job, command, Permissions.AppContentsRead); + break; + } - if (job.Status != null) - { - command.Status = job.Status.Value; - } + case BulkUpdateType.ChangeStatus: + { + var command = new ChangeContentStatus { ContentId = id.Value, Status = job.Status }; - await context.CommandBus.PublishAsync(command); + await PublishAsync(job, command, Permissions.AppContentsUpdate); break; } case BulkUpdateType.Delete: { - if (id == null || id == DomainId.Empty) - { - throw new DomainObjectNotFoundException("undefined"); - } - - var command = SimpleMapper.Map(bulkUpdates, new DeleteContent { ContentId = id.Value }); + var command = new DeleteContent { ContentId = id.Value }; - await context.CommandBus.PublishAsync(command); + await PublishAsync(job, command, Permissions.AppContentsDelete); break; } } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Commands/BulkUpdateJob.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Commands/BulkUpdateJob.cs index e28824871..ffe55f49d 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Commands/BulkUpdateJob.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Commands/BulkUpdateJob.cs @@ -18,10 +18,14 @@ namespace Squidex.Domain.Apps.Entities.Contents.Commands public DomainId? Id { get; set; } - public NamedContentData Data { get; set; } - - public Status? Status { get; set; } + public Status Status { get; set; } public BulkUpdateType Type { get; set; } + + public NamedContentData? Data { get; set; } + + public string? Schema { get; set; } + + public long ExpectedVersion { get; set; } = EtagVersion.Any; } } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Commands/BulkUpdateType.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Commands/BulkUpdateType.cs index eadfbd212..47107999d 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Commands/BulkUpdateType.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Commands/BulkUpdateType.cs @@ -11,6 +11,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Commands { Upsert, ChangeStatus, - Delete + Delete, + Validate } } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentDomainObject.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentDomainObject.cs index d7d7a68d9..25d49bb5c 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentDomainObject.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentDomainObject.cs @@ -132,11 +132,9 @@ namespace Squidex.Domain.Apps.Entities.Contents { await LoadContext(c); - var errors = await context.GetErrorsAsync(Snapshot.Data); + await context.ValidateContentAndInputAsync(Snapshot.Data); - var result = new ValidationResult { Errors = errors.ToArray() }; - - return result; + return true; }); case CreateContentDraft createContentDraft: diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/IContentQueryService.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/IContentQueryService.cs index ce9f61cd4..d488707b2 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/IContentQueryService.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/IContentQueryService.cs @@ -21,5 +21,7 @@ namespace Squidex.Domain.Apps.Entities.Contents Task FindAsync(Context context, string schemaIdOrName, DomainId id, long version = EtagVersion.Any); Task GetSchemaOrThrowAsync(Context context, string schemaIdOrName); + + Task GetSchemaAsync(Context context, string schemaIdOrName); } } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Operations/ContentOperationContext.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Operations/ContentOperationContext.cs index 97c8efd9c..452e786fb 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Operations/ContentOperationContext.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Operations/ContentOperationContext.cs @@ -146,33 +146,26 @@ namespace Squidex.Domain.Apps.Entities.Contents.Operations CheckErrors(validator); } - public async Task> GetErrorsAsync(NamedContentData data) + public async Task ValidateContentAndInputAsync(NamedContentData data) { var validator = new ContentValidator(Partition(), - validationContext, validators, log); + validationContext.AsPublishing(), validators, log); await validator.ValidateInputAsync(data); await validator.ValidateContentAsync(data); - return validator.Errors; + CheckErrors(validator); } - public async Task ValidateOnPublishAsync(NamedContentData data) + public Task ValidateOnPublishAsync(NamedContentData data) { if (!schema.SchemaDef.Properties.ValidateOnPublish) { - return; + return Task.CompletedTask; } - var validator = - new ContentValidator(Partition(), - validationContext.AsPublishing(), validators, log); - - await validator.ValidateInputAsync(data); - await validator.ValidateContentAsync(data); - - CheckErrors(validator); + return ValidateContentAndInputAsync(data); } private static void CheckErrors(ContentValidator validator) diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryService.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryService.cs index e5aa2a57c..28828bf0c 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryService.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryService.cs @@ -162,6 +162,21 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries public async Task GetSchemaOrThrowAsync(Context context, string schemaIdOrName) { + var schema = await GetSchemaAsync(context, schemaIdOrName); + + if (schema == null) + { + throw new DomainObjectNotFoundException(schemaIdOrName); + } + + return schema; + } + + public async Task GetSchemaAsync(Context context, string schemaIdOrName) + { + Guard.NotNull(context, nameof(context)); + Guard.NotNullOrEmpty(schemaIdOrName, nameof(schemaIdOrName)); + ISchemaEntity? schema = null; var canCache = !context.IsFrontendClient; @@ -178,12 +193,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries schema = await appProvider.GetSchemaAsync(context.App.Id, schemaIdOrName, canCache); } - if (schema == null) - { - throw new DomainObjectNotFoundException(schemaIdOrName); - } - - if (!HasPermission(context, schema)) + if (schema != null && !HasPermission(context, schema)) { throw new DomainForbiddenException(T.Get("schemas.noPermission")); } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/ValidationResult.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/ValidationResult.cs deleted file mode 100644 index 220cfc64d..000000000 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/ValidationResult.cs +++ /dev/null @@ -1,16 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using Squidex.Infrastructure.Validation; - -namespace Squidex.Domain.Apps.Entities.Contents -{ - public sealed class ValidationResult - { - public ValidationError[] Errors { get; set; } - } -} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs b/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs index ecf3f251c..6a5f76722 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs @@ -67,6 +67,7 @@ namespace Squidex.Domain.Apps.Entities.Rules return Snapshot; }); + case UpdateRule updateRule: return UpdateReturnAsync(updateRule, async c => { @@ -76,6 +77,7 @@ namespace Squidex.Domain.Apps.Entities.Rules return Snapshot; }); + case EnableRule enableRule: return UpdateReturn(enableRule, c => { @@ -85,6 +87,7 @@ namespace Squidex.Domain.Apps.Entities.Rules return Snapshot; }); + case DisableRule disableRule: return UpdateReturn(disableRule, c => { @@ -94,6 +97,7 @@ namespace Squidex.Domain.Apps.Entities.Rules return Snapshot; }); + case DeleteRule deleteRule: return Update(deleteRule, c => { @@ -101,22 +105,25 @@ namespace Squidex.Domain.Apps.Entities.Rules Delete(c); }); + case TriggerRule triggerRule: - return Trigger(triggerRule); + return UpdateReturnAsync(triggerRule, async c => + { + await Trigger(triggerRule); + + return true; + }); + default: throw new NotSupportedException(); } } - private async Task Trigger(TriggerRule command) + private async Task Trigger(TriggerRule command) { - await EnsureLoadedAsync(); - var @event = SimpleMapper.Map(command, new RuleManuallyTriggered { RuleId = Snapshot.Id, AppId = Snapshot.AppId }); await ruleEnqueuer.EnqueueAsync(Snapshot.RuleDef, Snapshot.Id, Envelope.Create(@event)); - - return null; } public void Create(CreateRule command) diff --git a/backend/src/Squidex.Shared/Permissions.cs b/backend/src/Squidex.Shared/Permissions.cs index fb476e64b..0d78e45e9 100644 --- a/backend/src/Squidex.Shared/Permissions.cs +++ b/backend/src/Squidex.Shared/Permissions.cs @@ -140,7 +140,7 @@ namespace Squidex.Shared public const string AppContentsRead = "squidex.apps.{app}.contents.{name}.read"; public const string AppContentsCreate = "squidex.apps.{app}.contents.{name}.create"; public const string AppContentsUpdate = "squidex.apps.{app}.contents.{name}.update"; - public const string AppContentsUpdatePartial = "squidex.apps.{app}.contents.{name}.update.partial"; + public const string AppContentsUpsert = "squidex.apps.{app}.contents.{name}.upsert"; public const string AppContentsVersionCreate = "squidex.apps.{app}.contents.{name}.version.create"; public const string AppContentsVersionDelete = "squidex.apps.{app}.contents.{name}.version.delete"; public const string AppContentsDelete = "squidex.apps.{app}.contents.{name}.delete"; diff --git a/backend/src/Squidex.Web/Resources.cs b/backend/src/Squidex.Web/Resources.cs index 75763f401..1d7a81d2a 100644 --- a/backend/src/Squidex.Web/Resources.cs +++ b/backend/src/Squidex.Web/Resources.cs @@ -32,8 +32,6 @@ namespace Squidex.Web public bool CanUpdateContent(string schema) => IsAllowedForSchema(P.AppContentsUpdate, schema); - public bool CanUpdateContentPartial(string schema) => IsAllowedForSchema(P.AppContentsUpdatePartial, schema); - // Schemas public bool CanUpdateSchema(string schema) => IsAllowedForSchema(P.AppSchemasDelete, schema); diff --git a/backend/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs b/backend/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs index c3a825c09..0ed3600a9 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs @@ -292,7 +292,8 @@ namespace Squidex.Areas.Api.Controllers.Contents /// The name of the schema. /// The id of the content to fetch. /// - /// 200 => Content validation result returned. + /// 204 => Content is valid. + /// 400 => Content not valid. /// 404 => Content, schema or app not found. /// /// @@ -300,19 +301,15 @@ namespace Squidex.Areas.Api.Controllers.Contents /// [HttpGet] [Route("content/{app}/{name}/{id}/validity")] - [ProducesResponseType(typeof(ValidationResultDto), 200)] [ApiPermissionOrAnonymous] [ApiCosts(1)] public async Task GetContentValidity(string app, string name, DomainId id) { var command = new ValidateContent { ContentId = id }; - var context = await CommandBus.PublishAsync(command); - - var result = context.Result(); - var response = ValidationResultDto.FromResult(result); + await CommandBus.PublishAsync(command); - return Ok(response); + return NoContent(); } /// @@ -520,7 +517,7 @@ namespace Squidex.Areas.Api.Controllers.Contents [HttpPost] [Route("content/{app}/{name}/{id}/")] [ProducesResponseType(typeof(ContentsDto), 200)] - [ApiPermissionOrAnonymous(Permissions.AppContentsUpdate)] + [ApiPermissionOrAnonymous(Permissions.AppContentsUpsert)] [ApiCosts(1)] public async Task PostContent(string app, string name, DomainId id, [FromBody] NamedContentData request, [FromQuery] bool publish = false) { diff --git a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/BulkUpdateDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/BulkUpdateDto.cs index 8e920634a..7c83b07af 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/BulkUpdateDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/BulkUpdateDto.cs @@ -30,6 +30,11 @@ namespace Squidex.Areas.Api.Controllers.Contents.Models /// public bool DoNotScript { get; set; } = true; + /// + /// True to check referrers of this content. + /// + public bool CheckReferrers { get; set; } + /// /// True to turn off costly validation: Unique checks, asset checks and reference checks. Default: true. /// diff --git a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/BulkUpdateJobDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/BulkUpdateJobDto.cs index 68e2df912..8ea57c571 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/BulkUpdateJobDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/BulkUpdateJobDto.cs @@ -34,13 +34,23 @@ namespace Squidex.Areas.Api.Controllers.Contents.Models /// /// The new status when the type is set to 'ChangeStatus'. /// - public Status? Status { get; set; } + public Status Status { get; set; } /// /// The update type. /// public BulkUpdateType Type { get; set; } + /// + /// The optional schema id or name. + /// + public string? Schema { get; set; } + + /// + /// The expected version. + /// + public long ExpectedVersion { get; set; } = EtagVersion.Any; + public BulkUpdateJob ToJob() { return SimpleMapper.Map(this, new BulkUpdateJob()); diff --git a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs index 19e1939a7..693158bc2 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs @@ -177,17 +177,11 @@ namespace Squidex.Areas.Api.Controllers.Contents.Models AddDeleteLink("delete", resources.Url(x => nameof(x.DeleteContent), values)); } - if (content.CanUpdate) + if (content.CanUpdate && resources.CanUpdateContent(schema)) { - if (resources.CanUpdateContent(schema)) - { - AddPutLink("update", resources.Url(x => nameof(x.PutContent), values)); - } + AddPutLink("update", resources.Url(x => nameof(x.PutContent), values)); - if (resources.CanUpdateContentPartial(schema)) - { - AddPatchLink("patch", resources.Url(x => nameof(x.PatchContent), values)); - } + AddPatchLink("patch", resources.Url(x => nameof(x.PatchContent), values)); } return this; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ValidationResultDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ValidationResultDto.cs deleted file mode 100644 index f972ba1e9..000000000 --- a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/ValidationResultDto.cs +++ /dev/null @@ -1,29 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System.Linq; -using Squidex.Domain.Apps.Entities.Contents; -using Squidex.Web; - -namespace Squidex.Areas.Api.Controllers.Contents.Models -{ - public class ValidationResultDto - { - /// - /// The validation errors. - /// - public string[] Errors { get; set; } - - public static ValidationResultDto FromResult(ValidationResult result) - { - return new ValidationResultDto - { - Errors = ApiExceptionConverter.ToErrors(result.Errors).ToArray() - }; - } - } -} diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/BulkUpdateCommandMiddlewareTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/BulkUpdateCommandMiddlewareTests.cs index f93a2da71..181450dde 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/BulkUpdateCommandMiddlewareTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/BulkUpdateCommandMiddlewareTests.cs @@ -7,6 +7,7 @@ using System; using System.Linq; +using System.Security.Claims; using System.Threading.Tasks; using FakeItEasy; using Squidex.Domain.Apps.Core.Contents; @@ -15,6 +16,8 @@ using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Json.Objects; using Squidex.Infrastructure.Queries; +using Squidex.Shared; +using Squidex.Shared.Identity; using Xunit; namespace Squidex.Domain.Apps.Entities.Contents @@ -24,15 +27,12 @@ namespace Squidex.Domain.Apps.Entities.Contents private readonly IContentQueryService contentQuery = A.Fake(); private readonly IContextProvider contextProvider = A.Fake(); private readonly ICommandBus commandBus = A.Dummy(); - private readonly Context requestContext = Context.Anonymous(); + private readonly NamedId appId = NamedId.Of(DomainId.NewGuid(), "my-app"); private readonly NamedId schemaId = NamedId.Of(DomainId.NewGuid(), "my-schema"); private readonly BulkUpdateCommandMiddleware sut; public BulkUpdateCommandMiddlewareTests() { - A.CallTo(() => contextProvider.Context) - .Returns(requestContext); - sut = new BulkUpdateCommandMiddleware(contentQuery, contextProvider); } @@ -41,11 +41,9 @@ namespace Squidex.Domain.Apps.Entities.Contents { var command = new BulkUpdateContents(); - var context = new CommandContext(command, commandBus); - - await sut.HandleAsync(context); + var result = await PublishAsync(command); - Assert.True(context.PlainResult is BulkUpdateResult); + Assert.Empty(result); } [Fact] @@ -53,39 +51,63 @@ namespace Squidex.Domain.Apps.Entities.Contents { var command = new BulkUpdateContents { Jobs = Array.Empty() }; - var context = new CommandContext(command, commandBus); + var result = await PublishAsync(command); - await sut.HandleAsync(context); + Assert.Empty(result); + } + + [Fact] + public async Task Should_throw_exception_when_content_cannot_be_resolved() + { + SetupContext(Permissions.AppContentsUpdate); - Assert.True(context.PlainResult is BulkUpdateResult); + var (_, _, query) = CreateTestData(true); + + var command = BulkCommand(BulkUpdateType.ChangeStatus); + + var result = await PublishAsync(command); + + Assert.Single(result, x => x.ContentId == null && x.Exception is DomainObjectNotFoundException); + + A.CallTo(() => commandBus.PublishAsync(A._)) + .MustNotHaveHappened(); } [Fact] - public async Task Should_upsert_content_with_random_id_if_no_query_and_id_defined() + public async Task Should_throw_exception_when_query_resolves_multiple_contents() { - var (_, data, _) = CreateTestData(false); + var requestContext = SetupContext(Permissions.AppContentsUpdate); - var command = new BulkUpdateContents - { - Jobs = new[] - { - new BulkUpdateJob - { - Type = BulkUpdateType.Upsert, - Data = data - } - }, - SchemaId = schemaId - }; + var (id, data, query) = CreateTestData(true); - var context = new CommandContext(command, commandBus); + A.CallTo(() => contentQuery.QueryAsync(requestContext, A._, A.That.Matches(x => x.JsonQuery == query))) + .Returns(ResultList.CreateFrom(2, CreateContent(id), CreateContent(id))); - await sut.HandleAsync(context); + var command = BulkCommand(BulkUpdateType.ChangeStatus, query); + + var result = await PublishAsync(command); + + Assert.Single(result, x => x.ContentId == null && x.Exception is DomainException); + + A.CallTo(() => commandBus.PublishAsync(A._)) + .MustNotHaveHappened(); + } + + [Fact] + public async Task Should_upsert_content_with_with_resolved_id() + { + var requestContext = SetupContext(Permissions.AppContentsUpsert); + + var (id, data, query) = CreateTestData(false); + + A.CallTo(() => contentQuery.QueryAsync(requestContext, A._, A.That.Matches(x => x.JsonQuery == query))) + .Returns(ResultList.CreateFrom(1, CreateContent(id))); - var result = context.Result(); + var command = BulkCommand(BulkUpdateType.Upsert, query: query, data: data); - Assert.Single(result); - Assert.Equal(1, result.Count(x => x.ContentId != default && x.Exception == null)); + var result = await PublishAsync(command); + + Assert.Single(result, x => x.ContentId != default && x.Exception == null); A.CallTo(() => commandBus.PublishAsync( A.That.Matches(x => x.Data == data && x.ContentId.ToString().Length == 36))) @@ -93,32 +115,35 @@ namespace Squidex.Domain.Apps.Entities.Contents } [Fact] - public async Task Should_upsert_content_with_random_id_if_query_returns_no_result() + public async Task Should_upsert_content_with_random_id_if_no_query_and_id_defined() { - var (_, data, query) = CreateTestData(false); + SetupContext(Permissions.AppContentsUpsert); - var command = new BulkUpdateContents - { - Jobs = new[] - { - new BulkUpdateJob - { - Type = BulkUpdateType.Upsert, - Data = data, - Query = query - } - }, - SchemaId = schemaId - }; + var (_, data, _) = CreateTestData(false); - var context = new CommandContext(command, commandBus); + var command = BulkCommand(BulkUpdateType.Upsert, data: data); - await sut.HandleAsync(context); + var result = await PublishAsync(command); + + Assert.Single(result, x => x.ContentId != default && x.Exception == null); + + A.CallTo(() => commandBus.PublishAsync( + A.That.Matches(x => x.Data == data && x.ContentId.ToString().Length == 36))) + .MustHaveHappenedOnceExactly(); + } + + [Fact] + public async Task Should_upsert_content_with_random_id_if_query_returns_no_result() + { + SetupContext(Permissions.AppContentsUpsert); - var result = context.Result(); + var (_, data, query) = CreateTestData(false); + + var command = BulkCommand(BulkUpdateType.Upsert, query: query, data: data); + + var result = await PublishAsync(command); - Assert.Single(result); - Assert.Equal(1, result.Count(x => x.ContentId != default && x.Exception == null)); + Assert.Single(result, x => x.ContentId != default && x.Exception == null); A.CallTo(() => commandBus.PublishAsync( A.That.Matches(x => x.Data == data && x.ContentId.ToString().Length == 36))) @@ -128,30 +153,15 @@ namespace Squidex.Domain.Apps.Entities.Contents [Fact] public async Task Should_upsert_content_when_id_defined() { - var (id, data, _) = CreateTestData(false); - - var command = new BulkUpdateContents - { - Jobs = new[] - { - new BulkUpdateJob - { - Type = BulkUpdateType.Upsert, - Data = data, - Id = id - } - }, - SchemaId = schemaId - }; + SetupContext(Permissions.AppContentsUpsert); - var context = new CommandContext(command, commandBus); + var (id, data, _) = CreateTestData(false); - await sut.HandleAsync(context); + var command = BulkCommand(BulkUpdateType.Upsert, id: id, data: data); - var result = context.Result(); + var result = await PublishAsync(command); - Assert.Single(result); - Assert.Equal(1, result.Count(x => x.ContentId != default && x.Exception == null)); + Assert.Single(result, x => x.ContentId != default && x.Exception == null); A.CallTo(() => commandBus.PublishAsync( A.That.Matches(x => x.Data == data && x.ContentId == id))) @@ -161,33 +171,15 @@ namespace Squidex.Domain.Apps.Entities.Contents [Fact] public async Task Should_upsert_content_with_custom_id() { - var (id, data, query) = CreateTestData(true); + var requestContext = SetupContext(Permissions.AppContentsUpsert); - A.CallTo(() => contentQuery.QueryAsync(requestContext, A._, A.That.Matches(x => x.JsonQuery == query))) - .Returns(ResultList.CreateFrom(1, CreateContent(id))); + var (id, data, _) = CreateTestData(true); - var command = new BulkUpdateContents - { - Jobs = new[] - { - new BulkUpdateJob - { - Type = BulkUpdateType.Upsert, - Data = data, - Query = query - } - }, - SchemaId = schemaId - }; + var command = BulkCommand(BulkUpdateType.Upsert, id: id, data: data); - var context = new CommandContext(command, commandBus); - - await sut.HandleAsync(context); + var result = await PublishAsync(command); - var result = context.Result(); - - Assert.Single(result); - Assert.Equal(1, result.Count(x => x.ContentId != default && x.Exception == null)); + Assert.Single(result, x => x.ContentId != default && x.Exception == null); A.CallTo(() => commandBus.PublishAsync( A.That.Matches(x => x.Data == data && x.ContentId == id))) @@ -195,97 +187,69 @@ namespace Squidex.Domain.Apps.Entities.Contents } [Fact] - public async Task Should_throw_exception_when_query_resolves_multiple_contents() + public async Task Should_change_content_status() { - var (id, data, query) = CreateTestData(true); + SetupContext(Permissions.AppContentsUpdate); - A.CallTo(() => contentQuery.QueryAsync(requestContext, A._, A.That.Matches(x => x.JsonQuery == query))) - .Returns(ResultList.CreateFrom(2, CreateContent(id), CreateContent(id))); + var (id, _, _) = CreateTestData(false); - var command = new BulkUpdateContents - { - Jobs = new[] - { - new BulkUpdateJob - { - Type = BulkUpdateType.Upsert, - Data = data, - Query = query - } - }, - SchemaId = schemaId - }; + var command = BulkCommand(BulkUpdateType.ChangeStatus, id: id); - var context = new CommandContext(command, commandBus); + var result = await PublishAsync(command); - await sut.HandleAsync(context); + Assert.Single(result, x => x.ContentId == id && x.Exception == null); + + A.CallTo(() => commandBus.PublishAsync(A.That.Matches(x => x.ContentId == id))) + .MustHaveHappened(); + } + + [Fact] + public async Task Should_throw_security_exception_when_user_has_no_permission_for_changing_status() + { + SetupContext(Permissions.AppContentsRead); + + var (id, _, _) = CreateTestData(false); + + var command = BulkCommand(BulkUpdateType.ChangeStatus, id: id); - var result = context.Result(); + var result = await PublishAsync(command); - Assert.Single(result); - Assert.Equal(1, result.Count(x => x.ContentId == null && x.Exception is DomainException)); + Assert.Single(result, x => x.ContentId == id && x.Exception is DomainForbiddenException); A.CallTo(() => commandBus.PublishAsync(A._)) .MustNotHaveHappened(); } [Fact] - public async Task Should_change_content_status() + public async Task Should_validate_content() { - var (id, _, _) = CreateTestData(false); + SetupContext(Permissions.AppContentsRead); - var command = new BulkUpdateContents - { - Jobs = new[] - { - new BulkUpdateJob - { - Type = BulkUpdateType.ChangeStatus, - Id = id - } - }, - SchemaId = schemaId - }; - - var context = new CommandContext(command, commandBus); + var (id, _, _) = CreateTestData(false); - await sut.HandleAsync(context); + var command = BulkCommand(BulkUpdateType.Validate, id: id); - var result = context.Result(); + var result = await PublishAsync(command); - Assert.Single(result); - Assert.Equal(1, result.Count(x => x.ContentId == id)); + Assert.Single(result, x => x.ContentId == id && x.Exception == null); - A.CallTo(() => commandBus.PublishAsync(A.That.Matches(x => x.ContentId == id))) + A.CallTo(() => commandBus.PublishAsync( + A.That.Matches(x => x.ContentId == id))) .MustHaveHappened(); } [Fact] - public async Task Should_throw_exception_when_content_id_to_change_cannot_be_resolved() + public async Task Should_throw_security_exception_when_user_has_no_permission_for_validation() { - var (_, _, query) = CreateTestData(true); + SetupContext(Permissions.AppContentsDelete); - var command = new BulkUpdateContents - { - Jobs = new[] - { - new BulkUpdateJob - { - Type = BulkUpdateType.ChangeStatus, - Query = query - } - }, - SchemaId = schemaId - }; - - var context = new CommandContext(command, commandBus); + var (id, _, _) = CreateTestData(false); - await sut.HandleAsync(context); + var command = BulkCommand(BulkUpdateType.Validate, id: id); - var result = context.Result(); + var result = await PublishAsync(command); - Assert.Single(result); - Assert.Equal(1, result.Count(x => x.ContentId == null && x.Exception is DomainObjectNotFoundException)); + Assert.Single(result, x => x.ContentId == id && x.Exception is DomainForbiddenException); A.CallTo(() => commandBus.PublishAsync(A._)) .MustNotHaveHappened(); @@ -294,29 +258,15 @@ namespace Squidex.Domain.Apps.Entities.Contents [Fact] public async Task Should_delete_content() { - var (id, _, _) = CreateTestData(false); + SetupContext(Permissions.AppContentsDelete); - var command = new BulkUpdateContents - { - Jobs = new[] - { - new BulkUpdateJob - { - Type = BulkUpdateType.Delete, - Id = id - } - }, - SchemaId = schemaId - }; - - var context = new CommandContext(command, commandBus); + var (id, _, _) = CreateTestData(false); - await sut.HandleAsync(context); + var command = BulkCommand(BulkUpdateType.Delete, id: id); - var result = context.Result(); + var result = await PublishAsync(command); - Assert.Single(result); - Assert.Equal(1, result.Count(x => x.ContentId == id)); + Assert.Single(result, x => x.ContentId == id && x.Exception == null); A.CallTo(() => commandBus.PublishAsync( A.That.Matches(x => x.ContentId == id))) @@ -324,34 +274,59 @@ namespace Squidex.Domain.Apps.Entities.Contents } [Fact] - public async Task Should_throw_exception_when_content_id_to_delete_cannot_be_resolved() + public async Task Should_throw_security_exception_when_user_has_no_permission_for_deletion() { - var (_, _, query) = CreateTestData(true); + SetupContext(Permissions.AppContentsRead); + + var (id, _, _) = CreateTestData(false); + + var command = BulkCommand(BulkUpdateType.Delete, id: id); + + var result = await PublishAsync(command); - var command = new BulkUpdateContents + Assert.Single(result, x => x.ContentId == id && x.Exception is DomainForbiddenException); + + A.CallTo(() => commandBus.PublishAsync(A._)) + .MustNotHaveHappened(); + } + + private async Task PublishAsync(ICommand command) + { + var context = new CommandContext(command, commandBus); + + await sut.HandleAsync(context); + + return (context.PlainResult as BulkUpdateResult)!; + } + + private BulkUpdateContents BulkCommand(BulkUpdateType type, Query? query = null, DomainId? id = null, NamedContentData? data = null) + { + return new BulkUpdateContents { + AppId = appId, Jobs = new[] { - new BulkUpdateJob - { - Type = BulkUpdateType.Delete, - Query = query - } + new BulkUpdateJob { Type = type, Query = query, Id = id, Data = data! } }, SchemaId = schemaId }; + } - var context = new CommandContext(command, commandBus); + private Context SetupContext(string id) + { + var permission = Permissions.ForApp(id, appId.Name, schemaId.Name).Id; - await sut.HandleAsync(context); + var claimsIdentity = new ClaimsIdentity(); + var claimsPrincipal = new ClaimsPrincipal(claimsIdentity); - var result = context.Result(); + claimsIdentity.AddClaim(new Claim(SquidexClaimTypes.Permissions, permission)); - Assert.Single(result); - Assert.Equal(1, result.Count(x => x.ContentId == null && x.Exception is DomainObjectNotFoundException)); + var requestContext = new Context(claimsPrincipal); - A.CallTo(() => commandBus.PublishAsync(A._)) - .MustNotHaveHappened(); + A.CallTo(() => contextProvider.Context) + .Returns(requestContext); + + return requestContext; } private static (DomainId Id, NamedContentData Data, Query? Query) CreateTestData(bool withQuery) diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs index 062077628..808319b47 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Linq; using System.Threading.Tasks; using FakeItEasy; @@ -600,11 +599,9 @@ namespace Squidex.Domain.Apps.Entities.Contents var command = new ValidateContent(); - var result = await PublishAsync(command); - - result.ShouldBeEquivalent(new ValidationResult { Errors = Array.Empty() }); + await PublishAsync(command); - Assert.Equal(0, sut.Snapshot.Version); + Assert.Equal(0, sut.Version); } [Fact] diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs index 5c7fa6bef..f1124daeb 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs @@ -160,9 +160,9 @@ namespace Squidex.Domain.Apps.Entities.Rules await ExecuteCreateAsync(); - var result = await PublishAsync(command); + await PublishAsync(command); - Assert.Null(result); + Assert.Equal(0, sut.Version); A.CallTo(() => ruleEnqueuer.EnqueueAsync(sut.Snapshot.RuleDef, sut.Snapshot.Id, A>.That.Matches(x => x.Payload is RuleManuallyTriggered))) diff --git a/frontend/app-config/webpack.config.js b/frontend/app-config/webpack.config.js index cf5deeebe..4987a78f6 100644 --- a/frontend/app-config/webpack.config.js +++ b/frontend/app-config/webpack.config.js @@ -43,7 +43,7 @@ module.exports = function (env) { const isTests = env && env.target === 'tests'; const isTestCoverage = env && env.coverage; const isAnalyzing = isProduction && env.analyze; - const isAot = !isDevServer; + const isAot = !isDevServer && !isTests && !isTestCoverage; const configFile = isTests ? 'tsconfig.spec.json' : 'tsconfig.app.json'; diff --git a/frontend/app/app.module.ts b/frontend/app/app.module.ts index fa0dedd2d..90bcfbf7e 100644 --- a/frontend/app/app.module.ts +++ b/frontend/app/app.module.ts @@ -1,3 +1,4 @@ + /* * Squidex Headless CMS * @@ -19,7 +20,7 @@ import { SqxShellModule } from './shell'; DateHelper.setlocale(window['options']?.more?.culture); -export function configApiUrl() { +function configApiUrl() { const baseElements = document.getElementsByTagName('base'); let baseHref = null; @@ -35,27 +36,27 @@ export function configApiUrl() { if (baseHref.indexOf(window.location.protocol) === 0) { return new ApiUrlConfig(baseHref); } else { - return new ApiUrlConfig(window.location.protocol + '//' + window.location.host + baseHref); + return new ApiUrlConfig(`${window.location.protocol}//${window.location.host}${baseHref}`); } } -export function configUIOptions() { +function configUIOptions() { return new UIOptions(window['options']); } -export function configTitles() { +function configTitles() { return new TitlesConfig(undefined, 'i18n:common.product'); } -export function configDecimalSeparator() { +function configDecimalSeparator() { return new DecimalSeparatorConfig('.'); } -export function configCurrency() { +function configCurrency() { return new CurrencyConfig('EUR', '€', true); } -export function configLocalizerService() { +function configLocalizerService() { if (process.env.NODE_ENV === 'production') { return new LocalizerService(window['texts']); } else { diff --git a/frontend/app/app.routes.ts b/frontend/app/app.routes.ts index e8ed6b9e2..5f4e58d98 100644 --- a/frontend/app/app.routes.ts +++ b/frontend/app/app.routes.ts @@ -10,7 +10,7 @@ import { RouterModule, Routes } from '@angular/router'; import { AppMustExistGuard, LoadAppsGuard, MustBeAuthenticatedGuard, MustBeNotAuthenticatedGuard, UnsetAppGuard } from './shared'; import { AppAreaComponent, ForbiddenPageComponent, HomePageComponent, InternalAreaComponent, LoginPageComponent, LogoutPageComponent, NotFoundPageComponent } from './shell'; -export const routes: Routes = [ +const routes: Routes = [ { path: '', component: HomePageComponent, diff --git a/frontend/app/features/administration/pages/users/users-page.component.html b/frontend/app/features/administration/pages/users/users-page.component.html index 429fd1e25..4db957e2d 100644 --- a/frontend/app/features/administration/pages/users/users-page.component.html +++ b/frontend/app/features/administration/pages/users/users-page.component.html @@ -58,7 +58,7 @@ - + diff --git a/frontend/app/features/administration/pages/users/users-page.component.ts b/frontend/app/features/administration/pages/users/users-page.component.ts index e45532772..ba0f33629 100644 --- a/frontend/app/features/administration/pages/users/users-page.component.ts +++ b/frontend/app/features/administration/pages/users/users-page.component.ts @@ -28,7 +28,7 @@ export class UsersPageComponent extends ResourceOwner implements OnInit { super(); this.own( - this.usersState.usersQuery + this.usersState.query .subscribe(q => this.usersFilter.setValue(q || ''))); } diff --git a/frontend/app/features/administration/services/event-consumers.service.ts b/frontend/app/features/administration/services/event-consumers.service.ts index dd3996378..de78b8efa 100644 --- a/frontend/app/features/administration/services/event-consumers.service.ts +++ b/frontend/app/features/administration/services/event-consumers.service.ts @@ -57,7 +57,7 @@ export class EventConsumersService { return this.http.get<{ items: any[] } & Resource>(url).pipe( map(({ items, _links }) => { - const eventConsumers = items.map(item => parseEventConsumer(item)); + const eventConsumers = items.map(parseEventConsumer); return new EventConsumersDto(eventConsumers, _links); }), diff --git a/frontend/app/features/administration/services/users.service.ts b/frontend/app/features/administration/services/users.service.ts index 0012ed121..b6c32af22 100644 --- a/frontend/app/features/administration/services/users.service.ts +++ b/frontend/app/features/administration/services/users.service.ts @@ -66,7 +66,7 @@ export class UsersService { return this.http.get<{ total: number, items: any[] } & Resource>(url).pipe( map(({ total, items, _links }) => { - const users = items.map(item => parseUser(item)); + const users = items.map(parseUser); return new UsersDto(total, users, _links); }), diff --git a/frontend/app/features/administration/state/users.forms.ts b/frontend/app/features/administration/state/users.forms.ts index 31c7aa396..1029aa6f3 100644 --- a/frontend/app/features/administration/state/users.forms.ts +++ b/frontend/app/features/administration/state/users.forms.ts @@ -54,10 +54,12 @@ export class UserForm extends Form { protected transformLoad(user: Partial) { const permissions = user.permissions?.join('\n') || ''; - return { ...user, permissions: permissions }; + return { ...user, permissions }; } protected transformSubmit(value: any) { - return { ...value, permissions: value['permissions'].split('\n').filter((x: any) => !!x) }; + const permissions = value['permissions'].split('\n').filter((x: any) => !!x); + + return { ...value, permissions }; } } \ No newline at end of file diff --git a/frontend/app/features/administration/state/users.state.spec.ts b/frontend/app/features/administration/state/users.state.spec.ts index 1e47f0e05..24a3a1419 100644 --- a/frontend/app/features/administration/state/users.state.spec.ts +++ b/frontend/app/features/administration/state/users.state.spec.ts @@ -6,7 +6,7 @@ */ import { UserDto, UsersDto, UsersService } from '@app/features/administration/internal'; -import { DialogService, Pager } from '@app/shared'; +import { DialogService } from '@app/shared'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; @@ -46,10 +46,10 @@ describe('UsersState', () => { usersState.load().subscribe(); + expect(usersState.snapshot.users).toEqual([user1, user2]); expect(usersState.snapshot.isLoaded).toBeTruthy(); expect(usersState.snapshot.isLoading).toBeFalsy(); - expect(usersState.snapshot.users).toEqual([user1, user2]); - expect(usersState.snapshot.usersPager.numberOfItems).toEqual(200); + expect(usersState.snapshot.total).toEqual(200); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); @@ -97,7 +97,7 @@ describe('UsersState', () => { usersService.setup(x => x.getUsers(10, 10, undefined)) .returns(() => of(new UsersDto(200, []))).verifiable(); - usersState.setPager(new Pager(200, 1, 10)).subscribe(); + usersState.page({ page: 1, pageSize: 10 }).subscribe(); expect().nothing(); }); @@ -108,7 +108,7 @@ describe('UsersState', () => { usersState.search('my-query').subscribe(); - expect(usersState.snapshot.usersQuery).toEqual('my-query'); + expect(usersState.snapshot.query).toEqual('my-query'); }); it('should load when synchronizer triggered', () => { @@ -239,7 +239,23 @@ describe('UsersState', () => { usersState.create(request).subscribe(); expect(usersState.snapshot.users).toEqual([newUser, user1, user2]); - expect(usersState.snapshot.usersPager.numberOfItems).toBe(201); + expect(usersState.snapshot.total).toBe(201); + }); + + it('should truncate users when page size reached', () => { + const request = { ...newUser, password: 'password' }; + + usersService.setup(x => x.getUsers(2, 0, undefined)) + .returns(() => of(new UsersDto(200, [user1, user2]))).verifiable(); + + usersService.setup(x => x.postUser(request)) + .returns(() => of(newUser)).verifiable(); + + usersState.page({ page: 0, pageSize: 2 }).subscribe(); + usersState.create(request).subscribe(); + + expect(usersState.snapshot.users).toEqual([newUser, user1]); + expect(usersState.snapshot.total).toBe(201); }); }); }); \ No newline at end of file diff --git a/frontend/app/features/administration/state/users.state.ts b/frontend/app/features/administration/state/users.state.ts index 3434c439c..aea22a04e 100644 --- a/frontend/app/features/administration/state/users.state.ts +++ b/frontend/app/features/administration/state/users.state.ts @@ -7,26 +7,14 @@ import { Injectable } from '@angular/core'; import '@app/framework/utils/rxjs-extensions'; -import { DialogService, Pager, shareSubscribed, State, StateSynchronizer } from '@app/shared'; +import { DialogService, getPagingInfo, ListState, shareSubscribed, State, StateSynchronizer } from '@app/shared'; import { Observable, of } from 'rxjs'; import { catchError, finalize, tap } from 'rxjs/operators'; import { CreateUserDto, UpdateUserDto, UserDto, UsersService } from './../services/users.service'; -interface Snapshot { +interface Snapshot extends ListState { // The current users. - users: UsersList; - - // The pagination information. - usersPager: Pager; - - // The query to filter users. - usersQuery?: string; - - // Indicates if the users are loaded. - isLoaded?: boolean; - - // Indicates if the users are loading. - isLoading?: boolean; + users: ReadonlyArray; // The selected user. selectedUser?: UserDto | null; @@ -43,11 +31,11 @@ export class UsersState extends State { public users = this.project(x => x.users); - public usersPager = - this.project(x => x.usersPager); + public paging = + this.project(x => getPagingInfo(x, x.users.length)); - public usersQuery = - this.project(x => x.usersQuery); + public query = + this.project(x => x.query); public selectedUser = this.project(x => x.selectedUser); @@ -67,14 +55,16 @@ export class UsersState extends State { ) { super({ users: [], - usersPager: new Pager(0) + page: 0, + pageSize: 10, + total: 0 }); } public select(id: string | null): Observable { return this.loadUser(id).pipe( tap(selectedUser => { - this.next(s => ({ ...s, selectedUser })); + this.next({ selectedUser }); }), shareSubscribed(this.dialogs, { silent: true })); } @@ -96,8 +86,8 @@ export class UsersState extends State { public loadAndListen(synchronizer: StateSynchronizer) { synchronizer.mapTo(this) .keep('selectedUser') - .withPager('usersPager', 'users', 10) - .withString('usersQuery', 'q') + .withPaging('users', 10) + .withString('query', 'q') .whenSynced(() => this.loadInternal(false)) .build(); } @@ -113,18 +103,18 @@ export class UsersState extends State { private loadInternal(isReload: boolean): Observable { this.next({ isLoading: true }); + const { page, pageSize, query } = this.snapshot; + return this.usersService.getUsers( - this.snapshot.usersPager.pageSize, - this.snapshot.usersPager.skip, - this.snapshot.usersQuery).pipe( + pageSize, + pageSize * page, + query).pipe( tap(({ total, items: users, canCreate }) => { if (isReload) { this.dialogs.notifyInfo('i18n:users.reloaded'); } this.next(s => { - const usersPager = s.usersPager.setCount(total); - let selectedUser = s.selectedUser; if (selectedUser) { @@ -133,11 +123,11 @@ export class UsersState extends State { return { ...s, canCreate, + users, isLoaded: true, isLoading: false, selectedUser, - users, - usersPager + total }; }); }), @@ -151,10 +141,9 @@ export class UsersState extends State { return this.usersService.postUser(request).pipe( tap(created => { this.next(s => { - const users = [created, ...s.users]; - const usersPager = s.usersPager.incrementCount(); + const users = [created, ...s.users].slice(0, s.pageSize); - return { ...s, users, usersPager }; + return { ...s, users, total: s.total + 1 }; }); }), shareSubscribed(this.dialogs, { silent: true })); @@ -185,13 +174,13 @@ export class UsersState extends State { } public search(query: string): Observable { - this.next(s => ({ ...s, usersPager: s.usersPager.reset(), usersQuery: query })); + this.next({ query, page: 0 }); return this.loadInternal(false); } - public setPager(usersPager: Pager) { - this.next({ usersPager }); + public page(paging: { page: number, pageSize: number }) { + this.next(paging); return this.loadInternal(false); } diff --git a/frontend/app/features/assets/pages/assets-filters-page.component.html b/frontend/app/features/assets/pages/assets-filters-page.component.html index 41f7258cf..730c9cb1e 100644 --- a/frontend/app/features/assets/pages/assets-filters-page.component.html +++ b/frontend/app/features/assets/pages/assets-filters-page.component.html @@ -16,7 +16,7 @@ diff --git a/frontend/app/features/assets/pages/assets-page.component.html b/frontend/app/features/assets/pages/assets-page.component.html index 1e52189ea..a2debdc6a 100644 --- a/frontend/app/features/assets/pages/assets-page.component.html +++ b/frontend/app/features/assets/pages/assets-page.component.html @@ -26,13 +26,14 @@
+
@@ -61,11 +62,11 @@
- +
- + diff --git a/frontend/app/features/content/declarations.ts b/frontend/app/features/content/declarations.ts index 7b1c41dcf..85b34b406 100644 --- a/frontend/app/features/content/declarations.ts +++ b/frontend/app/features/content/declarations.ts @@ -7,11 +7,13 @@ export * from './pages/comments/comments-page.component'; export * from './pages/content/content-event.component'; -export * from './pages/content/content-field.component'; export * from './pages/content/content-history-page.component'; export * from './pages/content/content-page.component'; -export * from './pages/content/content-section.component'; -export * from './pages/content/field-languages.component'; +export * from './pages/content/editor/content-editor.component'; +export * from './pages/content/editor/content-field.component'; +export * from './pages/content/editor/content-section.component'; +export * from './pages/content/editor/field-languages.component'; +export * from './pages/content/references/content-references.component'; export * from './pages/contents/contents-filters-page.component'; export * from './pages/contents/contents-page.component'; export * from './pages/contents/custom-view-editor.component'; diff --git a/frontend/app/features/content/module.ts b/frontend/app/features/content/module.ts index 4848f56f9..bbea70e91 100644 --- a/frontend/app/features/content/module.ts +++ b/frontend/app/features/content/module.ts @@ -10,7 +10,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { CanDeactivateGuard, ContentMustExistGuard, LoadLanguagesGuard, SchemaMustExistPublishedGuard, SchemaMustNotBeSingletonGuard, SqxFrameworkModule, SqxSharedModule, UnsetContentGuard } from '@app/shared'; -import { ArrayEditorComponent, ArrayItemComponent, ArraySectionComponent, AssetsEditorComponent, CommentsPageComponent, ContentComponent, ContentCreatorComponent, ContentEventComponent, ContentFieldComponent, ContentHistoryPageComponent, ContentListCellDirective, ContentListFieldComponent, ContentListHeaderComponent, ContentListWidthPipe, ContentPageComponent, ContentSectionComponent, ContentSelectorComponent, ContentSelectorItemComponent, ContentsFiltersPageComponent, ContentsPageComponent, ContentStatusComponent, ContentValueComponent, ContentValueEditorComponent, CustomViewEditorComponent, DueTimeSelectorComponent, FieldEditorComponent, FieldLanguagesComponent, PreviewButtonComponent, ReferenceItemComponent, ReferencesEditorComponent, SchemasPageComponent, SidebarPageComponent, StockPhotoEditorComponent } from './declarations'; +import { ArrayEditorComponent, ArrayItemComponent, ArraySectionComponent, AssetsEditorComponent, CommentsPageComponent, ContentComponent, ContentCreatorComponent, ContentEditorComponent, ContentEventComponent, ContentFieldComponent, ContentHistoryPageComponent, ContentListCellDirective, ContentListFieldComponent, ContentListHeaderComponent, ContentListWidthPipe, ContentPageComponent, ContentReferencesComponent, ContentsColumnsPipe, ContentSectionComponent, ContentSelectorComponent, ContentSelectorItemComponent, ContentsFiltersPageComponent, ContentsPageComponent, ContentStatusComponent, ContentValueComponent, ContentValueEditorComponent, CustomViewEditorComponent, DueTimeSelectorComponent, FieldEditorComponent, FieldLanguagesComponent, PreviewButtonComponent, ReferenceItemComponent, ReferencesEditorComponent, SchemasPageComponent, SidebarPageComponent, StockPhotoEditorComponent } from './declarations'; const routes: Routes = [ { @@ -89,6 +89,7 @@ const routes: Routes = [ CommentsPageComponent, ContentComponent, ContentCreatorComponent, + ContentEditorComponent, ContentEventComponent, ContentFieldComponent, ContentHistoryPageComponent, @@ -96,12 +97,14 @@ const routes: Routes = [ ContentListFieldComponent, ContentListHeaderComponent, ContentListWidthPipe, + ContentsColumnsPipe, ContentPageComponent, ContentSectionComponent, ContentSelectorComponent, ContentSelectorItemComponent, ContentsFiltersPageComponent, ContentsPageComponent, + ContentReferencesComponent, ContentStatusComponent, ContentValueComponent, ContentValueEditorComponent, diff --git a/frontend/app/features/content/pages/content/content-page.component.html b/frontend/app/features/content/pages/content/content-page.component.html index c992a5e47..1ea1aa459 100644 --- a/frontend/app/features/content/pages/content/content-page.component.html +++ b/frontend/app/features/content/pages/content/content-page.component.html @@ -7,22 +7,29 @@ - - - - {{ 'contents.editTitle' | sqxTranslate }} - - + {{ 'contents.createTitle' | sqxTranslate }} - + + + + + + + + + - - + + @@ -43,15 +50,25 @@
- - - + + + + + + + - - + + @@ -70,30 +87,41 @@ - - -
-
- {{ 'contents.viewLatest' | sqxTranslate }} -
- -
-
+ + + + + + + + + + + + + + + -
- - -
- - + + + + diff --git a/frontend/app/features/content/pages/content/content-page.component.scss b/frontend/app/features/content/pages/content/content-page.component.scss index aeff91dbe..7f2a04d32 100644 --- a/frontend/app/features/content/pages/content/content-page.component.scss +++ b/frontend/app/features/content/pages/content/content-page.component.scss @@ -4,4 +4,12 @@ .btn-outline-secondary { color: $color-text; +} + +.nav-tabs2 { + @include absolute(auto, auto, 0, 5rem); + + a { + padding-bottom: 1.5rem; + } } \ No newline at end of file diff --git a/frontend/app/features/content/pages/content/content-page.component.ts b/frontend/app/features/content/pages/content/content-page.component.ts index ede263e82..d93ebca4a 100644 --- a/frontend/app/features/content/pages/content/content-page.component.ts +++ b/frontend/app/features/content/pages/content/content-page.component.ts @@ -7,11 +7,18 @@ // tslint:disable: max-line-length -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { ApiUrlConfig, AppLanguageDto, AppsState, AuthService, AutoSaveKey, AutoSaveService, CanComponentDeactivate, ContentDto, ContentsState, DialogService, EditContentForm, fadeAnimation, FieldForm, FieldSection, LanguagesState, ModalModel, ResourceOwner, RootFieldDto, SchemaDetailsDto, SchemasState, TempService, Version } from '@app/shared'; +import { ApiUrlConfig, AppLanguageDto, AppsState, AuthService, AutoSaveKey, AutoSaveService, CanComponentDeactivate, ContentDto, ContentsState, DialogService, EditContentForm, fadeAnimation, LanguagesState, ModalModel, ResourceOwner, SchemaDetailsDto, SchemasState, TempService, Version } from '@app/shared'; import { Observable, of } from 'rxjs'; import { filter, tap } from 'rxjs/operators'; +import { ContentReferencesComponent } from './references/content-references.component'; + +const TABS: ReadonlyArray = [ + 'i18n:contents.contentTab.editor', + 'i18n:contents.contentTab.references', + 'i18n:contents.contentTab.referencing' +]; @Component({ selector: 'sqx-content-page', @@ -25,6 +32,9 @@ export class ContentPageComponent extends ResourceOwner implements CanComponentD private isLoadingContent: boolean; private autoSaveKey: AutoSaveKey; + @ViewChild(ContentReferencesComponent) + public references: ContentReferencesComponent; + public schema: SchemaDetailsDto; public formContext: any; @@ -34,6 +44,9 @@ export class ContentPageComponent extends ResourceOwner implements CanComponentD public contentForm: EditContentForm; public contentFormCompare: EditContentForm | null = null; + public selectableTabs = TABS; + public selectedTab = this.selectableTabs[0]; + public dropdown = new ModalModel(); public language: AppLanguageDto; @@ -92,21 +105,16 @@ export class ContentPageComponent extends ResourceOwner implements CanComponentD contentId: content?.id }; - const autosaved = this.autoSaveService.get(this.autoSaveKey); + const dataAutosaved = this.autoSaveService.fetch(this.autoSaveKey); + const dataCloned = this.tempService.fetch(); - if (content) { - this.loadContent(content.data, true); - } + this.loadContent(dataCloned || content?.data || {}, true); - const clone = this.tempService.fetch(); - - if (clone) { - this.loadContent(clone, true); - } else if (isNewContent && autosaved && this.contentForm.hasChanges(autosaved)) { + if (isNewContent && dataAutosaved && this.contentForm.hasChanges(dataAutosaved)) { this.dialogs.confirm('i18n:contents.unsavedChangesTitle', 'i18n:contents.unsavedChangesText') .subscribe(shouldLoad => { if (shouldLoad) { - this.loadContent(autosaved, false); + this.loadContent(dataAutosaved, false); } else { this.autoSaveService.remove(this.autoSaveKey); } @@ -131,6 +139,18 @@ export class ContentPageComponent extends ResourceOwner implements CanComponentD ); } + public selectTab(tab: string) { + this.selectedTab = tab; + } + + public validate() { + this.references?.validate(); + } + + public publish() { + this.references?.publish(); + } + public saveAndPublish() { this.saveContent(true); } @@ -257,10 +277,6 @@ export class ContentPageComponent extends ResourceOwner implements CanComponentD this.isLoadingContent = false; } } - - public trackBySection(_index: number, section: FieldSection) { - return section.separator?.fieldId; - } } function isOtherContent(lhs: ContentDto | null | undefined, rhs: ContentDto | null | undefined) { diff --git a/frontend/app/features/content/pages/content/editor/content-editor.component.html b/frontend/app/features/content/pages/content/editor/content-editor.component.html new file mode 100644 index 000000000..386366201 --- /dev/null +++ b/frontend/app/features/content/pages/content/editor/content-editor.component.html @@ -0,0 +1,24 @@ + + + +
+
+ {{ 'contents.viewLatest' | sqxTranslate }} +
+ +
+
+ + +
+ + +
+ \ No newline at end of file diff --git a/frontend/app/features/content/pages/content/field-languages.component.scss b/frontend/app/features/content/pages/content/editor/content-editor.component.scss similarity index 100% rename from frontend/app/features/content/pages/content/field-languages.component.scss rename to frontend/app/features/content/pages/content/editor/content-editor.component.scss diff --git a/frontend/app/features/content/pages/content/editor/content-editor.component.ts b/frontend/app/features/content/pages/content/editor/content-editor.component.ts new file mode 100644 index 000000000..fa2705eb6c --- /dev/null +++ b/frontend/app/features/content/pages/content/editor/content-editor.component.ts @@ -0,0 +1,47 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { AppLanguageDto, EditContentForm, FieldForm, FieldSection, RootFieldDto, SchemaDetailsDto, Version } from '@app/shared'; + +@Component({ + selector: 'sqx-content-editor', + styleUrls: ['./content-editor.component.scss'], + templateUrl: './content-editor.component.html' +}) +export class ContentEditorComponent { + @Output() + public languageChange = new EventEmitter(); + + @Output() + public loadLatest = new EventEmitter(); + + @Input() + public contentForm: EditContentForm; + + @Input() + public contentVersion: Version | null; + + @Input() + public contentFormCompare?: EditContentForm; + + @Input() + public schema: SchemaDetailsDto; + + @Input() + public formContext: any; + + @Input() + public languages: ReadonlyArray; + + @Input() + public language: AppLanguageDto; + + public trackBySection(_index: number, section: FieldSection) { + return section.separator?.fieldId; + } +} \ No newline at end of file diff --git a/frontend/app/features/content/pages/content/content-field.component.html b/frontend/app/features/content/pages/content/editor/content-field.component.html similarity index 100% rename from frontend/app/features/content/pages/content/content-field.component.html rename to frontend/app/features/content/pages/content/editor/content-field.component.html diff --git a/frontend/app/features/content/pages/content/content-field.component.scss b/frontend/app/features/content/pages/content/editor/content-field.component.scss similarity index 100% rename from frontend/app/features/content/pages/content/content-field.component.scss rename to frontend/app/features/content/pages/content/editor/content-field.component.scss diff --git a/frontend/app/features/content/pages/content/content-field.component.ts b/frontend/app/features/content/pages/content/editor/content-field.component.ts similarity index 98% rename from frontend/app/features/content/pages/content/content-field.component.ts rename to frontend/app/features/content/pages/content/editor/content-field.component.ts index bea1b080f..f44a23fbe 100644 --- a/frontend/app/features/content/pages/content/content-field.component.ts +++ b/frontend/app/features/content/pages/content/editor/content-field.component.ts @@ -20,7 +20,7 @@ export class ContentFieldComponent implements OnChanges { public languageChange = new EventEmitter(); @Input() - public compact = false; + public isCompact = false; @Input() public form: EditContentForm; @@ -52,7 +52,7 @@ export class ContentFieldComponent implements OnChanges { } public get isHalfWidth() { - return this.formModel.field.properties.isHalfWidth && !this.compact && !this.formCompare; + return this.formModel.field.properties.isHalfWidth && !this.isCompact && !this.formCompare; } public showAllControls = false; diff --git a/frontend/app/features/content/pages/content/content-section.component.html b/frontend/app/features/content/pages/content/editor/content-section.component.html similarity index 81% rename from frontend/app/features/content/pages/content/content-section.component.html rename to frontend/app/features/content/pages/content/editor/content-section.component.html index 179d8f92a..1ee96da7b 100644 --- a/frontend/app/features/content/pages/content/content-section.component.html +++ b/frontend/app/features/content/pages/content/editor/content-section.component.html @@ -3,7 +3,7 @@
@@ -17,10 +17,10 @@
-
+
implements OnChanges { @Output() public languageChange = new EventEmitter(); @Input() - public compact = false; + public isCompact = false; @Input() public form: EditContentForm; @@ -42,21 +47,29 @@ export class ContentSectionComponent implements OnChanges { @Input() public languages: ReadonlyArray; - public isCollapsed: boolean; - - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly localStore: LocalStoreService ) { + super(changeDetector, { + isCollapsed: false + }); + + this.changes.subscribe(state => { + this.localStore.setBoolean(this.configKey(), state.isCollapsed); + }); } public ngOnChanges() { - this.isCollapsed = this.localStore.getBoolean(this.configKey()); + const isCollapsed = this.localStore.getBoolean(this.configKey()); + + this.next({ isCollapsed }); } public toggle() { - this.isCollapsed = !this.isCollapsed; - - this.localStore.setBoolean(this.configKey(), this.isCollapsed); + this.next(s => ({ + ...s, + isCollapsed: !s.isCollapsed + })); } public getFieldFormCompare(formState: FieldForm) { diff --git a/frontend/app/features/content/pages/content/field-languages.component.html b/frontend/app/features/content/pages/content/editor/field-languages.component.html similarity index 100% rename from frontend/app/features/content/pages/content/field-languages.component.html rename to frontend/app/features/content/pages/content/editor/field-languages.component.html diff --git a/frontend/app/features/content/pages/content/editor/field-languages.component.scss b/frontend/app/features/content/pages/content/editor/field-languages.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/frontend/app/features/content/pages/content/field-languages.component.ts b/frontend/app/features/content/pages/content/editor/field-languages.component.ts similarity index 100% rename from frontend/app/features/content/pages/content/field-languages.component.ts rename to frontend/app/features/content/pages/content/editor/field-languages.component.ts diff --git a/frontend/app/features/content/pages/content/references/content-references.component.html b/frontend/app/features/content/pages/content/references/content-references.component.html new file mode 100644 index 000000000..052e1f355 --- /dev/null +++ b/frontend/app/features/content/pages/content/references/content-references.component.html @@ -0,0 +1,20 @@ + + + + + +
+ + + + + + \ No newline at end of file diff --git a/frontend/app/features/content/pages/content/references/content-references.component.scss b/frontend/app/features/content/pages/content/references/content-references.component.scss new file mode 100644 index 000000000..0ab531df6 --- /dev/null +++ b/frontend/app/features/content/pages/content/references/content-references.component.scss @@ -0,0 +1,10 @@ +:host { + display: flex; + flex-direction: column; + flex-grow: 1; + max-height: 100%; +} + +.table { + margin: 1rem 0; +} \ No newline at end of file diff --git a/frontend/app/features/content/pages/content/references/content-references.component.ts b/frontend/app/features/content/pages/content/references/content-references.component.ts new file mode 100644 index 000000000..33ae19b40 --- /dev/null +++ b/frontend/app/features/content/pages/content/references/content-references.component.ts @@ -0,0 +1,57 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; +import { AppLanguageDto, ContentDto, ManualContentsState } from '@app/shared'; + +@Component({ + selector: 'sqx-content-references', + styleUrls: ['./content-references.component.scss'], + templateUrl: './content-references.component.html', + providers: [ + ManualContentsState + ] +}) +export class ContentReferencesComponent implements OnChanges { + @Input() + public content: ContentDto; + + @Input() + public language: AppLanguageDto; + + @Input() + public mode: 'references' | 'referencing' = 'references'; + + constructor( + public readonly contentsState: ManualContentsState + ) { + } + + public ngOnChanges(changes: SimpleChanges) { + if (changes['content'] || changes['mode']) { + this.contentsState.schema = { name: this.content.schemaName }; + + if (this.mode === 'references') { + this.contentsState.loadReference(this.content.id); + } else { + this.contentsState.loadReferencing(this.content.id); + } + } + } + + public validate() { + this.contentsState.validate(this.contentsState.snapshot.contents); + } + + public publish() { + this.contentsState.changeManyStatus(this.contentsState.snapshot.contents.filter(x => x.canPublish), 'Published'); + } + + public trackByContent(_index: number, content: ContentDto) { + return content.id; + } +} \ No newline at end of file diff --git a/frontend/app/features/content/pages/contents/contents-filters-page.component.html b/frontend/app/features/content/pages/contents/contents-filters-page.component.html index 09351f80a..4b578fb50 100644 --- a/frontend/app/features/content/pages/contents/contents-filters-page.component.html +++ b/frontend/app/features/content/pages/contents/contents-filters-page.component.html @@ -6,7 +6,7 @@ @@ -18,7 +18,7 @@ @@ -28,7 +28,7 @@ diff --git a/frontend/app/features/content/pages/contents/contents-page.component.html b/frontend/app/features/content/pages/contents/contents-page.component.html index 241524d64..2f844dbb1 100644 --- a/frontend/app/features/content/pages/contents/contents-page.component.html +++ b/frontend/app/features/content/pages/contents/contents-page.component.html @@ -8,7 +8,7 @@
- + @@ -19,7 +19,7 @@
@@ -97,7 +97,7 @@ @@ -126,7 +126,7 @@ - + diff --git a/frontend/app/features/content/pages/sidebar/sidebar-page.component.ts b/frontend/app/features/content/pages/sidebar/sidebar-page.component.ts index e54fee3d8..9f8f7e29a 100644 --- a/frontend/app/features/content/pages/sidebar/sidebar-page.component.ts +++ b/frontend/app/features/content/pages/sidebar/sidebar-page.component.ts @@ -79,7 +79,7 @@ export class SidebarPageComponent extends ResourceOwner implements AfterViewInit } else if (type === 'resize') { const { height } = event.data; - this.iframe.nativeElement.height = height + 'px'; + this.iframe.nativeElement.height = `${height}px`; } else if (type === 'navigate') { const { url } = event.data; diff --git a/frontend/app/features/content/shared/forms/array-item.component.html b/frontend/app/features/content/shared/forms/array-item.component.html index f9a5a0daa..218987d44 100644 --- a/frontend/app/features/content/shared/forms/array-item.component.html +++ b/frontend/app/features/content/shared/forms/array-item.component.html @@ -23,10 +23,10 @@ - -
@@ -42,7 +42,7 @@
-
+
implements OnChanges { @Output() public remove = new EventEmitter(); @@ -66,9 +71,11 @@ export class ArrayItemComponent implements OnChanges { public title: Observable; - constructor( - private readonly changeDetector: ChangeDetectorRef + constructor(changeDetector: ChangeDetectorRef ) { + super(changeDetector, { + isCollapsed: false + }); } public ngOnChanges(changes: SimpleChanges) { @@ -98,15 +105,11 @@ export class ArrayItemComponent implements OnChanges { } public collapse() { - this.isCollapsed = true; - - this.changeDetector.markForCheck(); + this.next({ isCollapsed: true }); } public expand() { - this.isCollapsed = false; - - this.changeDetector.markForCheck(); + this.next({ isCollapsed: false }); } public moveTop() { diff --git a/frontend/app/features/content/shared/forms/assets-editor.component.ts b/frontend/app/features/content/shared/forms/assets-editor.component.ts index e5a8586d6..4c6ee2399 100644 --- a/frontend/app/features/content/shared/forms/assets-editor.component.ts +++ b/frontend/app/features/content/shared/forms/assets-editor.component.ts @@ -46,8 +46,6 @@ interface State { changeDetection: ChangeDetectionStrategy.OnPush }) export class AssetsEditorComponent extends StatefulControlComponent> implements OnInit { - public isCompact = false; - public assetsDialog = new DialogModel(); constructor(changeDetector: ChangeDetectorRef, @@ -99,16 +97,19 @@ export class AssetsEditorComponent extends StatefulControlComponent ({ ...s, isCompact: isCompact })); + this.next({ isCompact }); } public setAssets(assets: ReadonlyArray) { - this.next(s => ({ ...s, assets })); + this.next({ assets }); } public addFiles(files: ReadonlyArray) { for (const file of files) { - this.next(s => ({ ...s, assetFiles: [file, ...s.assetFiles] })); + this.next(s => ({ + ...s, + assetFiles: [file, ...s.assetFiles] + })); } } @@ -151,11 +152,14 @@ export class AssetsEditorComponent extends StatefulControlComponent ({ ...s, assetFiles: s.assetFiles.removed(file) })); + this.next(s => ({ + ...s, assetFiles: + s.assetFiles.removed(file) + })); } public changeView(isListView: boolean) { - this.next(s => ({ ...s, isListView })); + this.next({ isListView }); this.localStore.setBoolean('squidex.assets.list-view', isListView); } diff --git a/frontend/app/features/content/shared/forms/stock-photo-editor.component.ts b/frontend/app/features/content/shared/forms/stock-photo-editor.component.ts index 688b0973f..4b9f18d23 100644 --- a/frontend/app/features/content/shared/forms/stock-photo-editor.component.ts +++ b/frontend/app/features/content/shared/forms/stock-photo-editor.component.ts @@ -11,6 +11,12 @@ import { StatefulControlComponent, StockPhotoDto, StockPhotoService, thumbnail, import { of } from 'rxjs'; import { debounceTime, map, switchMap, tap } from 'rxjs/operators'; +export const SQX_STOCK_PHOTO_EDITOR_CONTROL_VALUE_ACCESSOR: any = { + provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => StockPhotoEditorComponent), multi: true +}; + +const NO_EMIT = { emitEvent: false }; + interface State { // True when loading assets. isLoading?: boolean; @@ -19,12 +25,6 @@ interface State { isCompact?: boolean; } -export const SQX_STOCK_PHOTO_EDITOR_CONTROL_VALUE_ACCESSOR: any = { - provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => StockPhotoEditorComponent), multi: true -}; - -const NO_EMIT = { emitEvent: false }; - @Component({ selector: 'sqx-stock-photo-editor', styleUrls: ['./stock-photo-editor.component.scss'], @@ -93,7 +93,7 @@ export class StockPhotoEditorComponent extends StatefulControlComponent ({ ...s, isCompact: isCompact })); + this.next({ isCompact }); } public selectPhoto(photo: StockPhotoDto) { diff --git a/frontend/app/features/content/shared/list/content-list-cell.directive.ts b/frontend/app/features/content/shared/list/content-list-cell.directive.ts index d8a296bdf..d6e312e58 100644 --- a/frontend/app/features/content/shared/list/content-list-cell.directive.ts +++ b/frontend/app/features/content/shared/list/content-list-cell.directive.ts @@ -6,7 +6,7 @@ */ import { Directive, ElementRef, Input, OnChanges, Pipe, PipeTransform, Renderer2 } from '@angular/core'; -import { MetaFields, RootFieldDto, TableField, Types } from '@app/shared'; +import { ContentDto, MetaFields, RootFieldDto, TableField, Types } from '@app/shared'; export function getTableWidth(fields: ReadonlyArray) { let result = 0; @@ -51,6 +51,22 @@ export function getCellWidth(field: TableField) { } } +@Pipe({ + name: 'sqxContentsColumns', + pure: true +}) +export class ContentsColumnsPipe implements PipeTransform { + public transform(value: ReadonlyArray) { + let columns = 1; + + for (const content of value) { + columns = Math.max(columns, content.referenceFields.length); + } + + return columns; + } +} + @Pipe({ name: 'sqxContentListWidth', pure: true diff --git a/frontend/app/features/content/shared/list/content-list-field.component.html b/frontend/app/features/content/shared/list/content-list-field.component.html index 3bafdb10e..91e675751 100644 --- a/frontend/app/features/content/shared/list/content-list-field.component.html +++ b/frontend/app/features/content/shared/list/content-list-field.component.html @@ -99,7 +99,7 @@ - + \ No newline at end of file diff --git a/frontend/app/features/content/shared/list/content-list-field.component.ts b/frontend/app/features/content/shared/list/content-list-field.component.ts index 15caacb1a..a52b0813d 100644 --- a/frontend/app/features/content/shared/list/content-list-field.component.ts +++ b/frontend/app/features/content/shared/list/content-list-field.component.ts @@ -5,9 +5,14 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { ContentDto, getContentValue, LanguageDto, MetaFields, RootFieldDto, TableField, Types } from '@app/shared'; +import { ContentDto, FieldValue, getContentValue, LanguageDto, MetaFields, RootFieldDto, StatefulComponent, TableField, Types } from '@app/shared'; + +interface State { + // The formatted value. + formatted: FieldValue; +} @Component({ selector: 'sqx-content-list-field', @@ -15,7 +20,7 @@ import { ContentDto, getContentValue, LanguageDto, MetaFields, RootFieldDto, Tab templateUrl: './content-list-field.component.html', changeDetection: ChangeDetectionStrategy.OnPush }) -export class ContentListFieldComponent implements OnChanges { +export class ContentListFieldComponent extends StatefulComponent implements OnChanges { @Input() public field: TableField; @@ -31,7 +36,11 @@ export class ContentListFieldComponent implements OnChanges { @Input() public language: LanguageDto; - public value: any; + constructor(changeDetector: ChangeDetectorRef) { + super(changeDetector, { + formatted: '' + }); + } public ngOnChanges() { this.reset(); @@ -49,7 +58,7 @@ export class ContentListFieldComponent implements OnChanges { } } - this.value = formatted; + this.next({ formatted }); } } diff --git a/frontend/app/features/content/shared/list/content-value-editor.component.ts b/frontend/app/features/content/shared/list/content-value-editor.component.ts index 566df9c9f..64d0d5add 100644 --- a/frontend/app/features/content/shared/list/content-value-editor.component.ts +++ b/frontend/app/features/content/shared/list/content-value-editor.component.ts @@ -22,5 +22,5 @@ export class ContentValueEditorComponent { @Input() public form: FormGroup; - public uniqueId = MathHelper.guid(); + public readonly uniqueId = MathHelper.guid(); } \ No newline at end of file diff --git a/frontend/app/features/content/shared/references/content-creator.component.html b/frontend/app/features/content/shared/references/content-creator.component.html index 3c4a8fad8..ff268187f 100644 --- a/frontend/app/features/content/shared/references/content-creator.component.html +++ b/frontend/app/features/content/shared/references/content-creator.component.html @@ -38,7 +38,7 @@
@@ -54,7 +54,7 @@ @@ -83,7 +83,7 @@ - + diff --git a/frontend/app/features/content/shared/references/reference-item.component.html b/frontend/app/features/content/shared/references/reference-item.component.html index 10318c83d..c3afb7707 100644 --- a/frontend/app/features/content/shared/references/reference-item.component.html +++ b/frontend/app/features/content/shared/references/reference-item.component.html @@ -11,6 +11,11 @@ + + VALID + INVALID + + @@ -30,7 +35,7 @@ -
\ No newline at end of file diff --git a/frontend/app/features/dashboard/pages/cards/content-summary-card.component.ts b/frontend/app/features/dashboard/pages/cards/content-summary-card.component.ts index a22fd86cd..ac2129d57 100644 --- a/frontend/app/features/dashboard/pages/cards/content-summary-card.component.ts +++ b/frontend/app/features/dashboard/pages/cards/content-summary-card.component.ts @@ -6,7 +6,12 @@ */ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; -import { AppDto, ContentsService, fadeAnimation, Types } from '@app/shared'; +import { AppDto, ContentsService, fadeAnimation, StatefulComponent, Types } from '@app/shared'; + +interface State { + // The number of items. + itemCount: number; +} @Component({ selector: 'sqx-content-summary-card', @@ -17,19 +22,19 @@ import { AppDto, ContentsService, fadeAnimation, Types } from '@app/shared'; ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class ContentSummaryCardComponent implements OnInit { +export class ContentSummaryCardComponent extends StatefulComponent implements OnInit { @Input() public app: AppDto; @Input() public options: any; - public itemCount = 0; - - constructor( - private readonly changeDetector: ChangeDetectorRef, + constructor(changeDetector: ChangeDetectorRef, private readonly contentsService: ContentsService ) { + super(changeDetector, { + itemCount: 0 + }); } public ngOnInit() { @@ -46,13 +51,11 @@ export class ContentSummaryCardComponent implements OnInit { query.take = 0; this.contentsService.getContents(this.app.name, this.options.schema, { query }) - .subscribe(dto => { - this.itemCount = dto.total; - - this.changeDetector.detectChanges(); + .subscribe(({ total: itemCount }) => { + this.next({ itemCount }); }, () => { - this.itemCount = 0; + this.next({ itemCount: 0 }); }); } } \ No newline at end of file diff --git a/frontend/app/features/rules/pages/events/rule-events-page.component.html b/frontend/app/features/rules/pages/events/rule-events-page.component.html index eab2ecc61..0a0f96f29 100644 --- a/frontend/app/features/rules/pages/events/rule-events-page.component.html +++ b/frontend/app/features/rules/pages/events/rule-events-page.component.html @@ -92,7 +92,7 @@ - + diff --git a/frontend/app/features/settings/pages/contributors/contributors-page.component.html b/frontend/app/features/settings/pages/contributors/contributors-page.component.html index a797ed0b7..ef47064e6 100644 --- a/frontend/app/features/settings/pages/contributors/contributors-page.component.html +++ b/frontend/app/features/settings/pages/contributors/contributors-page.component.html @@ -41,11 +41,12 @@
- + - +
@@ -60,7 +61,7 @@
- + diff --git a/frontend/app/framework/angular/forms/control-errors.component.ts b/frontend/app/framework/angular/forms/control-errors.component.ts index 4dd217379..791dc567e 100644 --- a/frontend/app/framework/angular/forms/control-errors.component.ts +++ b/frontend/app/framework/angular/forms/control-errors.component.ts @@ -28,7 +28,7 @@ interface State { export class ControlErrorsComponent extends StatefulComponent implements OnChanges, OnDestroy { private displayFieldName: string; private control: AbstractControl; - private originalMarkAsTouched: any; + private controlOriginalMarkAsTouched: any; @Input() public for: string | AbstractControl; @@ -95,12 +95,12 @@ export class ControlErrorsComponent extends StatefulComponent implements this.createMessages(); })); - this.originalMarkAsTouched = this.control.markAsTouched; + this.controlOriginalMarkAsTouched = this.control.markAsTouched; const self = this; this.control['markAsTouched'] = function () { - self.originalMarkAsTouched.apply(this, arguments); + self.controlOriginalMarkAsTouched.apply(this, arguments); self.createMessages(); }; @@ -111,13 +111,13 @@ export class ControlErrorsComponent extends StatefulComponent implements } private unsetCustomMarkAsTouchedFunction() { - if (this.control && this.originalMarkAsTouched) { - this.control['markAsTouched'] = this.originalMarkAsTouched; + if (this.control && this.controlOriginalMarkAsTouched) { + this.control['markAsTouched'] = this.controlOriginalMarkAsTouched; } } private createMessages() { - const errors: string[] = []; + const errorMessages: string[] = []; if (this.control && this.control.invalid && this.isTouched && this.control.errors) { for (const key in this.control.errors) { @@ -125,18 +125,16 @@ export class ControlErrorsComponent extends StatefulComponent implements const message = formatError(this.localizer, this.displayFieldName, key, this.control.errors[key], this.control.value); if (Types.isString(message)) { - errors.push(message); + errorMessages.push(message); } else if (Types.isArray(message)) { for (const error of message) { - errors.push(error); + errorMessages.push(error); } } } } } - if (errors.length !== this.snapshot.errorMessages.length || errors.length > 0) { - this.next(s => ({ ...s, errorMessages: errors })); - } + this.next({ errorMessages }); } } diff --git a/frontend/app/framework/angular/forms/editors/autocomplete.component.ts b/frontend/app/framework/angular/forms/editors/autocomplete.component.ts index de35bc71b..290dd01f9 100644 --- a/frontend/app/framework/angular/forms/editors/autocomplete.component.ts +++ b/frontend/app/framework/angular/forms/editors/autocomplete.component.ts @@ -231,10 +231,10 @@ export class AutocompleteComponent extends StatefulControlComponent ({ ...s, isLoading: true })); + this.next({ isLoading: true }); } else { this.timer = setTimeout(() => { - this.next(s => ({ ...s, isLoading: false })); + this.next({ isLoading: false }); }, 250); } } @@ -248,7 +248,7 @@ export class AutocompleteComponent extends StatefulControlComponent ({ ...s, suggestedIndex })); + this.next({ suggestedIndex }); } private up() { diff --git a/frontend/app/framework/angular/forms/editors/checkbox-group.component.ts b/frontend/app/framework/angular/forms/editors/checkbox-group.component.ts index e4c5a71c2..0010c773f 100644 --- a/frontend/app/framework/angular/forms/editors/checkbox-group.component.ts +++ b/frontend/app/framework/angular/forms/editors/checkbox-group.component.ts @@ -153,7 +153,7 @@ export class CheckboxGroupComponent extends StatefulControlComponent obj.indexOf(x.value) >= 0); } - this.next(s => ({ ...s, checkedValues })); + this.next({ checkedValues }); } public check(isChecked: boolean, value: TagValue) { @@ -165,7 +165,7 @@ export class CheckboxGroupComponent extends StatefulControlComponent ({ ...s, checkedValues })); + this.next({ checkedValues }); this.callChange(checkedValues.map(x => x.id)); } diff --git a/frontend/app/framework/angular/forms/editors/code-editor.component.ts b/frontend/app/framework/angular/forms/editors/code-editor.component.ts index bf4d6a10f..de1a5bab4 100644 --- a/frontend/app/framework/angular/forms/editors/code-editor.component.ts +++ b/frontend/app/framework/angular/forms/editors/code-editor.component.ts @@ -27,11 +27,10 @@ export const SQX_CODE_EDITOR_CONTROL_VALUE_ACCESSOR: any = { ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class CodeEditorComponent extends StatefulControlComponent implements AfterViewInit, FocusComponent { +export class CodeEditorComponent extends StatefulControlComponent<{}, string> implements AfterViewInit, FocusComponent { private valueChanged = new Subject(); private aceEditor: any; private value: string; - private isDisabled = false; @ViewChild('editor', { static: false }) public editor: ElementRef; @@ -48,7 +47,7 @@ export class CodeEditorComponent extends StatefulControlComponent ({ ...s, value: obj, foreground })); + this.next({ value, foreground }); } } diff --git a/frontend/app/framework/angular/forms/editors/date-time-editor.component.html b/frontend/app/framework/angular/forms/editors/date-time-editor.component.html index f9f763363..f94f2ede9 100644 --- a/frontend/app/framework/angular/forms/editors/date-time-editor.component.html +++ b/frontend/app/framework/angular/forms/editors/date-time-editor.component.html @@ -2,10 +2,10 @@
- -
diff --git a/frontend/app/framework/angular/forms/editors/date-time-editor.component.ts b/frontend/app/framework/angular/forms/editors/date-time-editor.component.ts index 9e5bdddd4..fd5e051bd 100644 --- a/frontend/app/framework/angular/forms/editors/date-time-editor.component.ts +++ b/frontend/app/framework/angular/forms/editors/date-time-editor.component.ts @@ -20,6 +20,11 @@ export const SQX_DATE_TIME_EDITOR_CONTROL_VALUE_ACCESSOR: any = { const NO_EMIT = { emitEvent: false }; +interface State { + // True when the editor is in local mode. + isLocal: boolean; +} + @Component({ selector: 'sqx-date-time-editor', styleUrls: ['./date-time-editor.component.scss'], @@ -29,7 +34,7 @@ const NO_EMIT = { emitEvent: false }; ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class DateTimeEditorComponent extends StatefulControlComponent<{}, string | null> implements OnInit, AfterViewInit, FocusComponent { +export class DateTimeEditorComponent extends StatefulControlComponent implements OnInit, AfterViewInit, FocusComponent { private readonly hideDateButtonsSettings: boolean; private readonly hideDateTimeModeButtonSetting: boolean; private picker: any; @@ -63,8 +68,6 @@ export class DateTimeEditorComponent extends StatefulControlComponent<{}, string public timeControl = new FormControl(); public dateControl = new FormControl(); - public isLocalMode = true; - public get shouldShowDateButtons() { return !this.hideDateButtonsSettings && !this.hideDateButtons; } @@ -82,7 +85,9 @@ export class DateTimeEditorComponent extends StatefulControlComponent<{}, string } constructor(changeDetector: ChangeDetectorRef, uiOptions: UIOptions) { - super(changeDetector, {}); + super(changeDetector, { + isLocal: false + }); this.hideDateButtonsSettings = !!uiOptions.get('hideDateButtons'); this.hideDateTimeModeButtonSetting = !!uiOptions.get('hideDateTimeModeButton'); @@ -199,7 +204,7 @@ export class DateTimeEditorComponent extends StatefulControlComponent<{}, string if (this.isDateTimeMode && this.timeControl.value) { const combined = `${this.dateControl.value}T${this.timeControl.value}`; - return DateTime.tryParseISO(combined, !this.isLocalMode); + return DateTime.tryParseISO(combined, !this.snapshot.isLocal); } return DateTime.tryParseISO(this.dateControl.value); @@ -209,7 +214,7 @@ export class DateTimeEditorComponent extends StatefulControlComponent<{}, string this.suppressEvents = true; if (this.dateTime && this.isDateTimeMode) { - if (this.isLocalMode) { + if (this.snapshot.isLocal) { this.timeControl.setValue(this.dateTime.toStringFormat('HH:mm:ss'), NO_EMIT); } else { this.timeControl.setValue(this.dateTime.toStringFormatUTC('HH:mm:ss'), NO_EMIT); @@ -221,7 +226,7 @@ export class DateTimeEditorComponent extends StatefulControlComponent<{}, string if (this.dateTime && this.picker) { let dateString: string; - if (this.isDateTimeMode && this.isLocalMode) { + if (this.isDateTimeMode && this.snapshot.isLocal) { dateString = this.dateTime.toStringFormat('yyyy-MM-dd'); this.picker.setDate(DateHelper.getLocalDate(this.dateTime.raw), true); @@ -239,14 +244,14 @@ export class DateTimeEditorComponent extends StatefulControlComponent<{}, string this.suppressEvents = false; } - public setLocalMode(isLocalMode: boolean) { - this.isLocalMode = isLocalMode; + public setLocalMode(isLocal: boolean) { + this.next({ isLocal }); this.updateControls(); } public setCompact(isCompact: boolean) { - this.next(s => ({ ...s, isCompact })); + this.isCompact = isCompact; } } diff --git a/frontend/app/framework/angular/forms/editors/dropdown.component.ts b/frontend/app/framework/angular/forms/editors/dropdown.component.ts index a3f305787..2405a83d4 100644 --- a/frontend/app/framework/angular/forms/editors/dropdown.component.ts +++ b/frontend/app/framework/angular/forms/editors/dropdown.component.ts @@ -16,6 +16,8 @@ export const SQX_DROPDOWN_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => DropdownComponent), multi: true }; +const NO_EMIT = { emitEvent: false }; + interface State { // The suggested item. suggestedItems: ReadonlyArray; @@ -27,8 +29,6 @@ interface State { query?: RegExp; } -const NO_EMIT = { emitEvent: false }; - @Component({ selector: 'sqx-dropdown', styleUrls: ['./dropdown.component.scss'], @@ -229,7 +229,7 @@ export class DropdownComponent extends StatefulControlComponent ({ ...s, selectedIndex })); + this.next({ selectedIndex }); } private getSelectedIndex(value: any) { diff --git a/frontend/app/framework/angular/forms/editors/iframe-editor.component.ts b/frontend/app/framework/angular/forms/editors/iframe-editor.component.ts index 3fd9bf35d..18f4517fd 100644 --- a/frontend/app/framework/angular/forms/editors/iframe-editor.component.ts +++ b/frontend/app/framework/angular/forms/editors/iframe-editor.component.ts @@ -30,7 +30,6 @@ interface State { }) export class IFrameEditorComponent extends StatefulControlComponent implements OnChanges, OnDestroy, AfterViewInit { private value: any; - private isDisabled = false; private isInitialized = false; @ViewChild('iframe', { static: false }) @@ -109,7 +108,7 @@ export class IFrameEditorComponent extends StatefulControlComponent } else if (type === 'resize') { const { height } = event.data; - this.renderer.setStyle(this.iframe.nativeElement, 'height', height + 'px'); + this.renderer.setStyle(this.iframe.nativeElement, 'height', `${height}px`); } else if (type === 'navigate') { const { url } = event.data; @@ -144,7 +143,7 @@ export class IFrameEditorComponent extends StatefulControlComponent } public setDisabledState(isDisabled: boolean): void { - this.isDisabled = isDisabled; + super.setDisabledState(isDisabled); this.sendDisabled(); } @@ -162,7 +161,7 @@ export class IFrameEditorComponent extends StatefulControlComponent } private sendDisabled() { - this.sendMessage('disabled', { isDisabled: this.isDisabled }); + this.sendMessage('disabled', { isDisabled: this.snapshot.isDisabled }); } private sendFormValue() { @@ -178,7 +177,7 @@ export class IFrameEditorComponent extends StatefulControlComponent } private toggleFullscreen(isFullscreen: boolean) { - this.next(s => ({ ...s, isFullscreen })); + this.next({ isFullscreen }); let target = this.container.nativeElement; diff --git a/frontend/app/framework/angular/forms/editors/localized-input.component.html b/frontend/app/framework/angular/forms/editors/localized-input.component.html index be9d70a9e..0a61a2156 100644 --- a/frontend/app/framework/angular/forms/editors/localized-input.component.html +++ b/frontend/app/framework/angular/forms/editors/localized-input.component.html @@ -1,6 +1,10 @@
- + +
- diff --git a/frontend/app/framework/angular/pager.component.spec.ts b/frontend/app/framework/angular/pager.component.spec.ts new file mode 100644 index 000000000..abc83d8e0 --- /dev/null +++ b/frontend/app/framework/angular/pager.component.spec.ts @@ -0,0 +1,138 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { PagerComponent } from './pager.component'; + +describe('Pager', () => { + it('should init with default values', () => { + const pager = new PagerComponent(); + + pager.paging = { page: 0, pageSize: 10, count: 0, total: 0 }; + pager.ngOnChanges(); + + expect(pager.canGoNext).toBeFalse(); + expect(pager.canGoPrev).toBeFalse(); + + expect(pager.itemFirst).toEqual(0); + expect(pager.itemLast).toEqual(0); + }); + + it('should init with first full page', () => { + const pager = new PagerComponent(); + + pager.paging = { page: 0, pageSize: 10, count: 10, total: 100 }; + pager.ngOnChanges(); + + expect(pager.canGoNext).toBeTrue(); + expect(pager.canGoPrev).toBeFalse(); + + expect(pager.itemFirst).toEqual(1); + expect(pager.itemLast).toEqual(10); + }); + it('should init with middle page', () => { + const pager = new PagerComponent(); + + pager.paging = { page: 4, pageSize: 10, count: 10, total: 100 }; + pager.ngOnChanges(); + + expect(pager.canGoNext).toBeTrue(); + expect(pager.canGoPrev).toBeTrue(); + + expect(pager.itemFirst).toEqual(41); + expect(pager.itemLast).toEqual(50); + }); + + it('should init with last full page', () => { + const pager = new PagerComponent(); + + pager.paging = { page: 9, pageSize: 10, count: 10, total: 100 }; + pager.ngOnChanges(); + + expect(pager.canGoNext).toBeFalse(); + expect(pager.canGoPrev).toBeTrue(); + + expect(pager.itemFirst).toEqual(91); + expect(pager.itemLast).toEqual(100); + }); + + it('should init with last partly page', () => { + const pager = new PagerComponent(); + + pager.paging = { page: 9, pageSize: 10, count: 4, total: 100 }; + pager.ngOnChanges(); + + expect(pager.canGoNext).toBeFalse(); + expect(pager.canGoPrev).toBeTrue(); + + expect(pager.itemFirst).toEqual(91); + expect(pager.itemLast).toEqual(94); + }); + + it('should init with last partly page 2', () => { + const pager = new PagerComponent(); + + pager.paging = { page: 9, pageSize: 10, count: 9, total: 100 }; + pager.ngOnChanges(); + + expect(pager.canGoNext).toBeFalse(); + expect(pager.canGoPrev).toBeTrue(); + + expect(pager.itemFirst).toEqual(91); + expect(pager.itemLast).toEqual(99); + }); + + it('should emit when changing size', () => { + const pager = new PagerComponent(); + + pager.paging = { page: 4, pageSize: 10, count: 10, total: 100 }; + pager.ngOnChanges(); + + let emitted: any; + + pager.pagingChange.subscribe((value: any) => { + emitted = value; + }); + + pager.setPageSize(20); + + expect(emitted).toEqual({ page: 0, pageSize: 20 }); + }); + + it('should emit when going next', () => { + const pager = new PagerComponent(); + + pager.paging = { page: 4, pageSize: 10, count: 10, total: 100 }; + pager.ngOnChanges(); + + let emitted: any; + + pager.pagingChange.subscribe((value: any) => { + emitted = value; + }); + + pager.goNext(); + + expect(emitted).toEqual({ page: 5, pageSize: 10 }); + }); + + it('should emit when going prev', () => { + const pager = new PagerComponent(); + + pager.paging = { page: 4, pageSize: 10, count: 10, total: 100 }; + pager.ngOnChanges(); + + let emitted: any; + + pager.pagingChange.subscribe((value: any) => { + emitted = value; + }); + + pager.goPrev(); + + expect(emitted).toEqual({ page: 3, pageSize: 10 }); + }); +}); \ No newline at end of file diff --git a/frontend/app/framework/angular/pager.component.ts b/frontend/app/framework/angular/pager.component.ts index 5225eac80..b1804fe10 100644 --- a/frontend/app/framework/angular/pager.component.ts +++ b/frontend/app/framework/angular/pager.component.ts @@ -5,8 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; -import { Pager } from '@app/framework/internal'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; +import { PagingInfo } from '../state'; export const PAGE_SIZES: ReadonlyArray = [10, 20, 30, 50]; @@ -16,27 +16,66 @@ export const PAGE_SIZES: ReadonlyArray = [10, 20, 30, 50]; templateUrl: './pager.component.html', changeDetection: ChangeDetectionStrategy.OnPush }) -export class PagerComponent { +export class PagerComponent implements OnChanges { @Output() - public pagerChange = new EventEmitter(); + public pagingChange = new EventEmitter<{ page: number, pageSize: number }>(); @Input() - public pager: Pager; + public paging: PagingInfo; @Input() public autoHide = false; + public totalPages = 0; + + public itemFirst = 0; + public itemLast = 0; + + public canGoPrev = false; + public canGoNext = false; + + public translationInfo: any; + public pageSizes = PAGE_SIZES; + public ngOnChanges() { + const { page, pageSize, count, total } = this.paging; + + const totalPages = Math.ceil(total / pageSize); + + if (count > 0) { + const offset = page * pageSize; + + this.itemFirst = offset + 1; + this.itemLast = offset + count; + + this.canGoNext = page < totalPages - 1; + this.canGoPrev = page > 0; + } else { + this.canGoNext = false; + this.canGoPrev = false; + } + + this.translationInfo = { + itemFirst: this.itemFirst, + itemLast: this.itemLast, + numberOfItems: total + }; + } + public goPrev() { - this.pagerChange.emit(this.pager.goPrev()); + const { page, pageSize } = this.paging; + + this.pagingChange.emit({ page: page - 1, pageSize }); } public goNext() { - this.pagerChange.emit(this.pager.goNext()); + const { page, pageSize } = this.paging; + + this.pagingChange.emit({ page: page + 1, pageSize }); } public setPageSize(pageSize: number) { - this.pagerChange.emit(this.pager.setPageSize(pageSize)); + this.pagingChange.emit({ page: 0, pageSize }); } } \ No newline at end of file diff --git a/frontend/app/framework/angular/panel-container.directive.ts b/frontend/app/framework/angular/panel-container.directive.ts index c7cc849f4..81a859cf0 100644 --- a/frontend/app/framework/angular/panel-container.directive.ts +++ b/frontend/app/framework/angular/panel-container.directive.ts @@ -81,7 +81,7 @@ export class PanelContainerDirective implements AfterViewInit { if (panel.desiredWidth === '*') { const layoutWidth = (this.containerWidth - currentSize) / panelsWidthSpread; - panel.measure(layoutWidth + 'px'); + panel.measure(`${layoutWidth}px`); currentSize += panel.renderWidth; } @@ -91,7 +91,7 @@ export class PanelContainerDirective implements AfterViewInit { let currentLayer = panels.length * 10; for (const panel of panels) { - panel.arrange(currentPosition + 'px', currentLayer.toString()); + panel.arrange(`${currentPosition}px`, currentLayer.toString()); currentPosition += panel.renderWidth; currentLayer -= 10; diff --git a/frontend/app/framework/angular/panel.component.ts b/frontend/app/framework/angular/panel.component.ts index ee413871c..3d6c1204b 100644 --- a/frontend/app/framework/angular/panel.component.ts +++ b/frontend/app/framework/angular/panel.component.ts @@ -20,8 +20,8 @@ import { PanelContainerDirective } from './panel-container.directive'; changeDetection: ChangeDetectionStrategy.OnPush }) export class PanelComponent implements AfterViewInit, OnChanges, OnDestroy, OnInit { - private styleWidth: string; - private renderWidthField = 0; + private widthPrevious: string; + private widthToRender = 0; private isViewInitField = false; @Output() @@ -83,7 +83,7 @@ export class PanelComponent implements AfterViewInit, OnChanges, OnDestroy, OnIn } public get renderWidth() { - return this.renderWidthField; + return this.widthToRender; } public get isViewInit() { @@ -117,8 +117,8 @@ export class PanelComponent implements AfterViewInit, OnChanges, OnDestroy, OnIn } public measure(size: string) { - if (this.styleWidth !== size && this.isViewInitField) { - this.styleWidth = size; + if (this.widthPrevious !== size && this.isViewInitField) { + this.widthPrevious = size; const element = this.panel.nativeElement; @@ -126,7 +126,7 @@ export class PanelComponent implements AfterViewInit, OnChanges, OnDestroy, OnIn this.renderer.setStyle(element, 'width', size); this.renderer.setStyle(element, 'minWidth', this.minWidth); - this.renderWidthField = element.offsetWidth; + this.widthToRender = element.offsetWidth; } } } diff --git a/frontend/app/framework/angular/pipes/colors.pipes.ts b/frontend/app/framework/angular/pipes/colors.pipes.ts index 62ce70879..17f7f3215 100644 --- a/frontend/app/framework/angular/pipes/colors.pipes.ts +++ b/frontend/app/framework/angular/pipes/colors.pipes.ts @@ -121,16 +121,16 @@ function colorString({ r, g, b }: RGBColor) { let bs = Math.round(b * 255).toString(16); if (rs.length === 1) { - rs = '0' + rs; + rs = `0${rs}`; } if (gs.length === 1) { - gs = '0' + gs; + gs = `0${gs}`; } if (bs.length === 1) { - bs = '0' + bs; + bs = `0${bs}`; } - return '#' + rs + gs + bs; + return `#${rs}${gs}${bs}`; } @Pipe({ diff --git a/frontend/app/framework/angular/pipes/money.pipe.ts b/frontend/app/framework/angular/pipes/money.pipe.ts index 7c27afd6e..b8840a046 100644 --- a/frontend/app/framework/angular/pipes/money.pipe.ts +++ b/frontend/app/framework/angular/pipes/money.pipe.ts @@ -22,12 +22,12 @@ export class MoneyPipe implements PipeTransform { public transform(value: number): any { const money = value.toFixed(2).toString(); - let result = money.substr(0, money.length - 3) + this.separator.value + '' + money.substr(money.length - 2, 2) + ''; + let result = `${money.substr(0, money.length - 3) + this.separator.value}${money.substr(money.length - 2, 2)}`; if (this.currency.showAfter) { - result = result + ' ' + this.currency.symbol; + result = `${result} ${this.currency.symbol}`; } else { - result = this.currency.symbol + ' ' + result; + result = `${this.currency.symbol} ${result}`; } return result; diff --git a/frontend/app/framework/angular/pipes/numbers.pipes.ts b/frontend/app/framework/angular/pipes/numbers.pipes.ts index 5a69154f5..46d3e8b1c 100644 --- a/frontend/app/framework/angular/pipes/numbers.pipes.ts +++ b/frontend/app/framework/angular/pipes/numbers.pipes.ts @@ -22,7 +22,7 @@ export class KNumberPipe implements PipeTransform { value = Math.round(value); } - return value + 'k'; + return `${value}k`; } else if (value < 0) { return ''; } else { @@ -49,5 +49,6 @@ export function calculateFileSize(value: number, factor = 1024) { u++; } - return (u ? value.toFixed(1) + ' ' : value) + ' kMGTPEZY'[u] + 'B'; + // tslint:disable-next-line: prefer-template + return (u ? `${value.toFixed(1)} ` : value) + ' kMGTPEZY'[u] + 'B'; } \ No newline at end of file diff --git a/frontend/app/framework/angular/routers/router-2-state.spec.ts b/frontend/app/framework/angular/routers/router-2-state.spec.ts index bd4f80602..2e0067b3b 100644 --- a/frontend/app/framework/angular/routers/router-2-state.spec.ts +++ b/frontend/app/framework/angular/routers/router-2-state.spec.ts @@ -6,22 +6,22 @@ */ import { NavigationEnd, NavigationExtras, NavigationStart, Params, Router } from '@angular/router'; -import { LocalStoreService, MathHelper, Pager } from '@app/framework/internal'; +import { LocalStoreService, MathHelper } from '@app/framework/internal'; import { BehaviorSubject, Subject } from 'rxjs'; import { IMock, It, Mock, Times } from 'typemoq'; import { State } from './../../state'; -import { PagerSynchronizer, Router2State, StringKeysSynchronizer, StringSynchronizer } from './router-2-state'; +import { PagingSynchronizer, Router2State, StringKeysSynchronizer, StringSynchronizer } from './router-2-state'; describe('Router2State', () => { describe('Strings', () => { - const synchronizer = new StringSynchronizer('key'); + const synchronizer = new StringSynchronizer('key', 'key'); it('should write string to route', () => { const params: Params = {}; const value = 'my-string'; - synchronizer.writeValue(value, params); + synchronizer.writeValuesToRoute({ key: value }, params); expect(params).toEqual({ key: 'my-string' }); }); @@ -31,7 +31,7 @@ describe('Router2State', () => { const value = 123; - synchronizer.writeValue(value, params); + synchronizer.writeValuesToRoute(value, params); expect(params).toEqual({ key: undefined }); }); @@ -41,14 +41,14 @@ describe('Router2State', () => { key: 'my-string' }; - const value = synchronizer.getValue(params); + const value = synchronizer.parseValuesFromRoute(params); - expect(value).toEqual('my-string'); + expect(value).toEqual({ key: 'my-string' }); }); }); describe('StringKeys', () => { - const synchronizer = new StringKeysSynchronizer('key'); + const synchronizer = new StringKeysSynchronizer('key', 'key'); it('should write object keys to route', () => { const params: Params = {}; @@ -58,7 +58,7 @@ describe('Router2State', () => { flag2: false }; - synchronizer.writeValue(value, params); + synchronizer.writeValuesToRoute({ key: value }, params); expect(params).toEqual({ key: 'flag1,flag2' }); }); @@ -68,7 +68,7 @@ describe('Router2State', () => { const value = {}; - synchronizer.writeValue(value, params); + synchronizer.writeValuesToRoute({ key: value }, params); expect(params).toEqual({ key: undefined }); }); @@ -78,7 +78,7 @@ describe('Router2State', () => { const value = 123; - synchronizer.writeValue(value, params); + synchronizer.writeValuesToRoute({ key: value }, params); expect(params).toEqual({ key: undefined }); }); @@ -86,84 +86,36 @@ describe('Router2State', () => { it('should get object from route', () => { const params: Params = { key: 'flag1,flag2' }; - const value = synchronizer.getValue(params); + const value = synchronizer.parseValuesFromRoute(params); - expect(value).toEqual({ flag1: true, flag2: true }); + expect(value).toEqual({ key: { flag1: true, flag2: true } }); }); it('should get object with empty keys from route', () => { const params: Params = { key: 'flag1,,,flag2' }; - const value = synchronizer.getValue(params); + const value = synchronizer.parseValuesFromRoute(params); - expect(value).toEqual({ flag1: true, flag2: true }); + expect(value).toEqual({ key: { flag1: true, flag2: true } }); }); }); - describe('Pager', () => { - let synchronizer: PagerSynchronizer; + describe('Paging', () => { + let synchronizer: PagingSynchronizer; let localStore: IMock; beforeEach(() => { localStore = Mock.ofType(); - synchronizer = new PagerSynchronizer(localStore.object, 'contents', 30); - }); - - it('should write pager to route and local store', () => { - const params: Params = {}; - - const value = new Pager(0, 10, 20, true); - - synchronizer.writeValue(value, params); - - expect(params).toEqual({ take: '20', page: '10' }); - - localStore.verify(x => x.setInt('contents.pageSize', 20), Times.once()); - }); - - it('Should write undefined when page number is zero', () => { - const params: Params = {}; - - const value = new Pager(0, 0, 20, true); - - synchronizer.writeValue(value, params); - - expect(params).toEqual({ take: '20', page: undefined }); - - localStore.verify(x => x.setInt('contents.pageSize', 20), Times.once()); - }); - - it('should write undefined when value not a pager', () => { - const params: Params = {}; - - const value = 123; - - synchronizer.writeValue(value, params); - - expect(params).toEqual({ take: undefined, page: undefined }); - - localStore.verify(x => x.setInt('contents.pageSize', 20), Times.never()); - }); - - it('should write undefined when value is null', () => { - const params: Params = {}; - - const value = null; - - synchronizer.writeValue(value, params); - - expect(params).toEqual({ take: undefined, page: undefined }); - - localStore.verify(x => x.setInt('contents.pageSize', 20), Times.never()); + synchronizer = new PagingSynchronizer(localStore.object, 'contents', 30); }); it('should get page and size from route', () => { - const params: Params = { page: '10', take: '40' }; + const params: Params = { page: '10', pageSize: '40' }; - const value = synchronizer.getValue(params); + const value = synchronizer.parseValuesFromRoute(params); - expect(value).toEqual(new Pager(0, 10, 40, true)); + expect(value).toEqual({ page: 10, pageSize: 40 }); }); it('should get page size from local store as fallback', () => { @@ -172,9 +124,9 @@ describe('Router2State', () => { const params: Params = { page: '10' }; - const value = synchronizer.getValue(params); + const value = synchronizer.parseValuesFromRoute(params); - expect(value).toEqual(new Pager(0, 10, 40, true)); + expect(value).toEqual({ page: 10, pageSize: 40 }); }); it('should get page size from default if local store is invalid', () => { @@ -183,25 +135,45 @@ describe('Router2State', () => { const params: Params = { page: '10' }; - const value = synchronizer.getValue(params); + const value = synchronizer.parseValuesFromRoute(params); - expect(value).toEqual(new Pager(0, 10, 30, true)); + expect(value).toEqual({ page: 10, pageSize: 30 }); }); it('should get page size from default as last fallback', () => { const params: Params = { page: '10' }; - const value = synchronizer.getValue(params); + const value = synchronizer.parseValuesFromRoute(params); - expect(value).toEqual(new Pager(0, 10, 30, true)); + expect(value).toEqual({ page: 10, pageSize: 30 }); }); it('should fix page number if invalid', () => { const params: Params = { page: '-10' }; - const value = synchronizer.getValue(params); + const value = synchronizer.parseValuesFromRoute(params); + + expect(value).toEqual({ page: 0, pageSize: 30 }); + }); + + it('should write pager to route and local store', () => { + const params: Params = {}; + + synchronizer.writeValuesToRoute({ page: 10, pageSize: 20 }, params); + + expect(params).toEqual({ page: '10', pageSize: '20' }); + + localStore.verify(x => x.setInt('contents.pageSize', 20), Times.once()); + }); + + it('Should write undefined when page number is zero', () => { + const params: Params = {}; + + synchronizer.writeValuesToRoute({ page: 0, pageSize: 20 }, params); + + expect(params).toEqual({ page: undefined, pageSize: '20' }); - expect(value).toEqual(new Pager(0, 0, 30, true)); + localStore.verify(x => x.setInt('contents.pageSize', 20), Times.once()); }); }); diff --git a/frontend/app/framework/angular/routers/router-2-state.ts b/frontend/app/framework/angular/routers/router-2-state.ts index 0e934f73f..4eb928f5f 100644 --- a/frontend/app/framework/angular/routers/router-2-state.ts +++ b/frontend/app/framework/angular/routers/router-2-state.ts @@ -9,17 +9,17 @@ import { Injectable, OnDestroy } from '@angular/core'; import { ActivatedRoute, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, Params, Router } from '@angular/router'; -import { LocalStoreService, Pager, Types } from '@app/framework/internal'; +import { LocalStoreService, Types } from '@app/framework/internal'; import { State } from '@app/framework/state'; import { Subscription } from 'rxjs'; export interface RouteSynchronizer { - getValue(params: Params): any; + parseValuesFromRoute(params: Params): object; - writeValue(state: any, params: Params): void; + writeValuesToRoute(state: any, params: Params): void; } -export class PagerSynchronizer implements RouteSynchronizer { +export class PagingSynchronizer implements RouteSynchronizer { constructor( private readonly localStore: LocalStoreService, private readonly storeName: string, @@ -27,10 +27,10 @@ export class PagerSynchronizer implements RouteSynchronizer { ) { } - public getValue(params: Params) { + public parseValuesFromRoute(params: Params) { let pageSize = 0; - const pageSizeValue = params['take']; + const pageSizeValue = params['pageSize']; if (Types.isString(pageSizeValue)) { pageSize = parseInt(pageSizeValue, 10); @@ -50,56 +50,59 @@ export class PagerSynchronizer implements RouteSynchronizer { page = 0; } - return new Pager(0, page, pageSize, true); + return { page, pageSize }; } - public writeValue(state: any, params: Params) { - params['page'] = undefined; - params['take'] = undefined; + public writeValuesToRoute(state: any, params: Params) { + const page: number = state.page; - if (Types.is(state, Pager)) { - if (state.page > 0) { - params['page'] = state.page.toString(); - } + if (page > 0) { + params['page'] = page.toString(); + } else { + params['page'] = undefined; + } - if (state.pageSize > 0) { - params['take'] = state.pageSize.toString(); + const pageSize: number = state.pageSize; - this.localStore.setInt(`${this.storeName}.pageSize`, state.pageSize); - } - } + params['pageSize'] = pageSize.toString(); + + this.localStore.setInt(`${this.storeName}.pageSize`, pageSize); } } export class StringSynchronizer implements RouteSynchronizer { constructor( - private readonly name: string + private readonly nameState: string, + private readonly nameUrl: string ) { } - public getValue(params: Params) { - const value = params[this.name]; + public parseValuesFromRoute(params: Params) { + const value = params[this.nameUrl]; - return value; + return { [this.nameState]: value }; } - public writeValue(state: any, params: Params) { - params[this.name] = undefined; + public writeValuesToRoute(state: any, params: Params) { + params[this.nameUrl] = undefined; - if (Types.isString(state)) { - params[this.name] = state; + const value = state[this.nameState]; + + if (Types.isString(value)) { + params[this.nameUrl] = value; } } } export class StringKeysSynchronizer implements RouteSynchronizer { constructor( - private readonly name: string + private readonly nameState: string, + private readonly nameUrl: string ) { } - public getValue(params: Params) { - const value = params[this.name]; + public parseValuesFromRoute(params: Params) { + const value = params[this.nameUrl]; const result: { [key: string]: boolean } = {}; @@ -111,17 +114,19 @@ export class StringKeysSynchronizer implements RouteSynchronizer { } } - return result; + return { [this.nameState]: result }; } - public writeValue(state: any, params: Params) { - params[this.name] = undefined; + public writeValuesToRoute(state: any, params: Params) { + params[this.nameUrl] = undefined; + + const value = state[this.nameState]; - if (Types.isObject(state)) { - const value = Object.keys(state).join(','); + if (Types.isObject(value)) { + const items = Object.keys(value).join(','); - if (value.length > 0) { - params[this.name] = value; + if (items.length > 0) { + params[this.nameUrl] = items; } } } @@ -138,11 +143,11 @@ export interface StateSynchronizerMap { withStrings(key: keyof T & string, urlName: string): this; - withPager(key: keyof T & string, storeName: string, defaultSize: number): this; + withPaging(storeName: string, defaultSize: number): this; whenSynced(action: () => void): this; - withSynchronizer(key: keyof T & string, synchronizer: RouteSynchronizer): this; + withSynchronizer(synchronizer: RouteSynchronizer): this; build(): void; } @@ -171,7 +176,7 @@ export class Router2State implements OnDestroy, StateSynchronizer { } export class Router2StateMap implements StateSynchronizerMap { - private readonly syncs: { [field: string]: { synchronizer: RouteSynchronizer, value: any } } = {}; + private readonly syncs: { synchronizer: RouteSynchronizer, value: object }[] = []; private readonly keysToKeep: string[] = []; private syncDone: (() => void)[] = []; private lastSyncedParams: Params | undefined; @@ -227,18 +232,21 @@ export class Router2StateMap implements StateSynchronizerMap implements StateSynchronizerMap implements StateSynchronizerMap = {}; - for (const key in this.syncs) { - if (this.syncs.hasOwnProperty(key)) { - const target = this.syncs[key]; - - const value = target.synchronizer.getValue(query); + for (const target of this.syncs) { + const values = target.synchronizer.parseValuesFromRoute(query); - if (value) { - update[key] = value; + for (const key in values) { + if (values.hasOwnProperty(key)) { + update[key] = values[key]; } } + + target.value = values; } for (const key of this.keysToKeep) { @@ -313,27 +317,25 @@ export class Router2StateMap implements StateSynchronizerMap void) { - this.syncDone.push(action); + public withSynchronizer(synchronizer: RouteSynchronizer) { + this.syncs.push({ synchronizer, value: {} }); return this; } - public withSynchronizer(key: keyof T & string, synchronizer: RouteSynchronizer) { - const previous = this.syncs[key]; - - this.syncs[key] = { synchronizer, value: previous?.value }; + public whenSynced(action: () => void) { + this.syncDone.push(action); return this; } diff --git a/frontend/app/framework/angular/stateful.component.ts b/frontend/app/framework/angular/stateful.component.ts index 5e5410740..db98c05f4 100644 --- a/frontend/app/framework/angular/stateful.component.ts +++ b/frontend/app/framework/angular/stateful.component.ts @@ -92,7 +92,9 @@ export abstract class StatefulComponent extends State implements OnD } } -export abstract class StatefulControlComponent extends StatefulComponent implements ControlValueAccessor { +type Disabled = { isDisabled: boolean }; + +export abstract class StatefulControlComponent extends StatefulComponent implements ControlValueAccessor { private fnChanged = (v: any) => { /* NOOP */ }; private fnTouched = () => { /* NOOP */ }; @@ -117,7 +119,7 @@ export abstract class StatefulControlComponent extends StatefulCompon } public setDisabledState(isDisabled: boolean): void { - this.next(s => ({ ...s, isDisabled })); + this.next({ isDisabled } as any); } public abstract writeValue(obj: any): void; diff --git a/frontend/app/framework/configurations.ts b/frontend/app/framework/configurations.ts index 2ad33cdb3..86e9ec84c 100644 --- a/frontend/app/framework/configurations.ts +++ b/frontend/app/framework/configurations.ts @@ -39,7 +39,7 @@ export class ApiUrlConfig { constructor(value: string) { if (value.indexOf('/', value.length - 1) < 0) { - value = value + '/'; + value = `${value}/`; } this.value = value; diff --git a/frontend/app/framework/internal.ts b/frontend/app/framework/internal.ts index 01355f25c..cbf09e27c 100644 --- a/frontend/app/framework/internal.ts +++ b/frontend/app/framework/internal.ts @@ -35,7 +35,6 @@ export * from './utils/keys'; export * from './utils/math-helper'; export * from './utils/modal-positioner'; export * from './utils/modal-view'; -export * from './utils/pager'; export * from './utils/picasso'; export * from './utils/rxjs-extensions'; export * from './utils/string-helper'; diff --git a/frontend/app/framework/services/analytics.service.ts b/frontend/app/framework/services/analytics.service.ts index 9700c072b..6bcada103 100644 --- a/frontend/app/framework/services/analytics.service.ts +++ b/frontend/app/framework/services/analytics.service.ts @@ -46,7 +46,7 @@ export class AnalyticsService { event_category: category, event_action: action, event_label: label, - value: value + value }); } diff --git a/frontend/app/framework/services/message-bus.service.ts b/frontend/app/framework/services/message-bus.service.ts index 58f1811a1..0204774d4 100644 --- a/frontend/app/framework/services/message-bus.service.ts +++ b/frontend/app/framework/services/message-bus.service.ts @@ -10,7 +10,10 @@ import { Observable, Subject } from 'rxjs'; import { filter, map } from 'rxjs/operators'; interface Message { + // The target. channel: string; + + // The message payload. data: any; } @@ -22,10 +25,10 @@ export const MessageBusFactory = () => { export class MessageBus { private message$ = new Subject(); - public emit(message: T): void { - const channel = ((message)['constructor']).name; + public emit(data: T): void { + const channel = ((data)['constructor']).name; - this.message$.next({ channel: channel, data: message }); + this.message$.next({ channel, data }); } public of(messageType: { new(...args: ReadonlyArray): T }): Observable { diff --git a/frontend/app/framework/services/resource-loader.service.ts b/frontend/app/framework/services/resource-loader.service.ts index a4002c1a1..f0f2a61ef 100644 --- a/frontend/app/framework/services/resource-loader.service.ts +++ b/frontend/app/framework/services/resource-loader.service.ts @@ -25,7 +25,7 @@ export class ResourceLoaderService { result = new Promise(resolve => { const style = this.renderer.createElement('link'); - this.renderer.listen(style, 'load', () => resolve()); + this.renderer.listen(style, 'load', resolve); this.renderer.setProperty(style, 'rel', 'stylesheet'); this.renderer.setProperty(style, 'href', url); this.renderer.setProperty(style, 'type', 'text/css'); @@ -51,7 +51,7 @@ export class ResourceLoaderService { this.renderer.appendChild(document.body, script); result = new Promise((resolve) => { - this.renderer.listen(script, 'load', () => resolve()); + this.renderer.listen(script, 'load', resolve); }); this.cache[key] = result; diff --git a/frontend/app/framework/state.ts b/frontend/app/framework/state.ts index 24fe34164..00bf7bd4b 100644 --- a/frontend/app/framework/state.ts +++ b/frontend/app/framework/state.ts @@ -60,6 +60,46 @@ export class ResultSet { } } +export interface PagingInfo { + // The current page. + page: number; + + // The current page size. + pageSize: number; + + // The total number of items. + total: number; + + // The current number of items. + count: number; +} + +export function getPagingInfo(state: ListState, count: number) { + const { page, pageSize, total } = state; + + return { page, pageSize, total, count }; +} + +export interface ListState { + // The total number of items. + total: number; + + // True if currently loading. + isLoading?: boolean; + + // True if already loaded. + isLoaded?: boolean; + + // The current page. + page: number; + + // The current page size. + pageSize: number; + + // The query. + query?: TQuery; +} + export class State { private readonly state: BehaviorSubject>; @@ -73,12 +113,12 @@ export class State { public project(project: (value: T) => M, compare?: (x: M, y: M) => boolean) { return this.changes.pipe( - map(x => project(x)), distinctUntilChanged(compare), shareReplay(1)); + map(project), distinctUntilChanged(compare), shareReplay(1)); } public projectFrom(source: Observable, project: (value: M) => N, compare?: (x: N, y: N) => boolean) { return source.pipe( - map(x => project(x)), distinctUntilChanged(compare), shareReplay(1)); + map(project), distinctUntilChanged(compare), shareReplay(1)); } public projectFrom2(lhs: Observable, rhs: Observable, project: (l: M, r: N) => O, compare?: (x: O, y: O) => boolean) { diff --git a/frontend/app/framework/utils/cookies.ts b/frontend/app/framework/utils/cookies.ts index b3b3cbaf6..26bb64096 100644 --- a/frontend/app/framework/utils/cookies.ts +++ b/frontend/app/framework/utils/cookies.ts @@ -14,7 +14,7 @@ export module Cookies { date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); - expires = '; expires=' + date.toUTCString(); + expires = `; expires=${date.toUTCString()}`; } document.cookie = `${name}=${value || ''}${expires}; path=/`; diff --git a/frontend/app/framework/utils/date-time.ts b/frontend/app/framework/utils/date-time.ts index 1ed217185..ba9079009 100644 --- a/frontend/app/framework/utils/date-time.ts +++ b/frontend/app/framework/utils/date-time.ts @@ -197,7 +197,7 @@ export class DateTime { let result = this.value.toISOString(); if (withoutMilliseconds) { - result = result.slice(0, 19) + 'Z'; + result = `${result.slice(0, 19)}Z`; } return result; diff --git a/frontend/app/framework/utils/math-helper.ts b/frontend/app/framework/utils/math-helper.ts index 81852679f..585126a40 100644 --- a/frontend/app/framework/utils/math-helper.ts +++ b/frontend/app/framework/utils/math-helper.ts @@ -91,7 +91,7 @@ export module MathHelper { } export function guid(): string { - return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4(); + return `${s4() + s4()}-${s4()}-${s4()}-${s4()}-${s4()}${s4()}${s4()}`; } export function s4(): string { @@ -170,16 +170,16 @@ export module MathHelper { let b = Math.round(color.b * 255).toString(16); if (r.length === 1) { - r = '0' + r; + r = `0${r}`; } if (g.length === 1) { - g = '0' + g; + g = `0${g}`; } if (b.length === 1) { - b = '0' + b; + b = `0${b}`; } - return '#' + r + g + b; + return `#${r}${g}${b}`; } export function colorFromHsv(h: number, s: number, v: number): Color { diff --git a/frontend/app/framework/utils/pager.spec.ts b/frontend/app/framework/utils/pager.spec.ts deleted file mode 100644 index 96e2e7fc2..000000000 --- a/frontend/app/framework/utils/pager.spec.ts +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { Pager } from './pager'; - -describe('Pager', () => { - it('should init with default values', () => { - const pager_1 = new Pager(0); - - expect(Object.assign({}, pager_1)).toEqual({ - page: 0, - pageSize: 10, - itemFirst: 0, - itemLast: 0, - skip: 0, - numberOfItems: 0, - canGoNext: false, - canGoPrev: false - }); - }); - - it('should init with page size and page', () => { - const pager_1 = new Pager(23, 2, 10); - - expect(Object.assign({}, pager_1)).toEqual({ - page: 2, - pageSize: 10, - itemFirst: 21, - itemLast: 23, - skip: 20, - numberOfItems: 23, - canGoNext: false, - canGoPrev: true - }); - }); - - it('should reset page on reset', () => { - const pager_1 = new Pager(23, 2, 10); - const pager_2 = pager_1.reset(); - - expect(Object.assign({}, pager_2)).toEqual({ - page: 0, - pageSize: 10, - itemFirst: 0, - itemLast: 0, - skip: 0, - numberOfItems: 0, - canGoNext: false, - canGoPrev: false - }); - }); - - it('should return same instance when go next and being on last page', () => { - const pager_1 = new Pager(23, 2, 10); - const pager_2 = pager_1.goNext(); - - expect(pager_2).toBe(pager_1); - }); - - it('should update page when going next', () => { - const pager_1 = new Pager(23, 0, 10); - const pager_2 = pager_1.goNext(); - - expect(Object.assign({}, pager_2)).toEqual({ - page: 1, - pageSize: 10, - itemFirst: 11, - itemLast: 20, - skip: 10, - numberOfItems: 23, - canGoNext: true, - canGoPrev: true - }); - }); - - it('should return same instance when go prev and being on first page', () => { - const pager_1 = new Pager(23, 0, 10); - const pager_2 = pager_1.goPrev(); - - expect(pager_2).toBe(pager_1); - }); - - it('should update page when going prev', () => { - const pager_1 = new Pager(23, 2, 10); - const pager_2 = pager_1.goPrev(); - - expect(Object.assign({}, pager_2)).toEqual({ - page: 1, - pageSize: 10, - itemFirst: 11, - itemLast: 20, - skip: 10, - numberOfItems: 23, - canGoNext: true, - canGoPrev: true - }); - }); - - it('should update count when setting it', () => { - const pager_1 = new Pager(23, 2, 10); - const pager_2 = pager_1.setCount(30); - - expect(Object.assign({}, pager_2)).toEqual({ - page: 2, - pageSize: 10, - itemFirst: 21, - itemLast: 30, - skip: 20, - numberOfItems: 30, - canGoNext: false, - canGoPrev: true - }); - }); - - it('should update count when incrementing it', () => { - const pager_1 = new Pager(23, 1, 10); - const pager_2 = pager_1.incrementCount().incrementCount(); - - expect(Object.assign({}, pager_2)).toEqual({ - page: 1, - pageSize: 10, - itemFirst: 11, - itemLast: 22, - skip: 10, - numberOfItems: 25, - canGoNext: true, - canGoPrev: true - }); - }); - - it('should update count for last page when incrementing it', () => { - const pager_1 = new Pager(23, 2, 10); - const pager_2 = pager_1.incrementCount(); - - expect(Object.assign({}, pager_2)).toEqual({ - page: 2, - pageSize: 10, - itemFirst: 21, - itemLast: 24, - skip: 20, - numberOfItems: 24, - canGoNext: false, - canGoPrev: true - }); - }); - - it('should update count when decrementing it', () => { - const pager_1 = new Pager(23, 1, 10); - const pager_2 = pager_1.decrementCount().decrementCount(); - - expect(Object.assign({}, pager_2)).toEqual({ - page: 1, - pageSize: 10, - itemFirst: 11, - itemLast: 18, - skip: 10, - numberOfItems: 21, - canGoNext: true, - canGoPrev: true - }); - }); - - it('should update count for last page when decrementing it', () => { - const pager_1 = new Pager(23, 2, 10); - const pager_2 = pager_1.decrementCount(); - - expect(Object.assign({}, pager_2)).toEqual({ - page: 2, - pageSize: 10, - itemFirst: 21, - itemLast: 22, - skip: 20, - numberOfItems: 22, - canGoNext: false, - canGoPrev: true - }); - }); - - it('should also update page when new page is bigger than max page', () => { - const pager_1 = new Pager(21, 2, 10); - const pager_2 = pager_1.decrementCount(); - - expect(Object.assign({}, pager_2)).toEqual({ - page: 1, - pageSize: 10, - itemFirst: 11, - itemLast: 20, - skip: 10, - numberOfItems: 20, - canGoNext: false, - canGoPrev: true - }); - }); - - it('should update page size', () => { - const pager_1 = new Pager(21, 0, 10); - const pager_2 = pager_1.setPageSize(30); - - expect(Object.assign({}, pager_2)).toEqual({ - page: 0, - pageSize: 30, - itemFirst: 1, - itemLast: 21, - skip: 0, - numberOfItems: 21, - canGoNext: false, - canGoPrev: false - }); - }); -}); \ No newline at end of file diff --git a/frontend/app/framework/utils/pager.ts b/frontend/app/framework/utils/pager.ts deleted file mode 100644 index d751fa3cb..000000000 --- a/frontend/app/framework/utils/pager.ts +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -export class Pager { - public canGoNext = false; - public canGoPrev = false; - - public itemFirst = 0; - public itemLast = 0; - - public skip = 0; - - constructor( - public readonly numberOfItems: number, - public readonly page = 0, - public readonly pageSize = 10, - unsafe = false - ) { - const totalPages = Math.ceil(numberOfItems / this.pageSize); - - if (this.page >= totalPages && this.page > 0 && !unsafe) { - this.page = page = totalPages - 1; - } - - this.itemFirst = numberOfItems === 0 ? 0 : page * this.pageSize + 1; - this.itemLast = Math.min(numberOfItems, (page + 1) * this.pageSize); - - this.canGoNext = page < totalPages - 1; - this.canGoPrev = page > 0; - - this.skip = page * pageSize; - } - - public goNext(): Pager { - if (!this.canGoNext) { - return this; - } - - return new Pager(this.numberOfItems, this.page + 1, this.pageSize); - } - - public goPrev(): Pager { - if (!this.canGoPrev) { - return this; - } - - return new Pager(this.numberOfItems, this.page - 1, this.pageSize); - } - - public reset(): Pager { - return new Pager(0, 0, this.pageSize); - } - - public setPageSize(pageSize: number): Pager { - return new Pager(this.numberOfItems, this.page, pageSize); - } - - public setCount(numberOfItems: number): Pager { - return new Pager(numberOfItems, this.page, this.pageSize); - } - - public incrementCount(): Pager { - const result = new Pager(this.numberOfItems + 1, this.page, this.pageSize); - - if (result.canGoNext) { - result.itemLast = this.itemLast + 1; - } - - return result; - } - - public decrementCount(): Pager { - const result = new Pager(this.numberOfItems - 1, this.page, this.pageSize); - - if (result.canGoNext) { - result.itemLast = this.itemLast - 1; - } - - return result; - } -} \ No newline at end of file diff --git a/frontend/app/framework/utils/rxjs-extensions.ts b/frontend/app/framework/utils/rxjs-extensions.ts index b4197965f..a8124d054 100644 --- a/frontend/app/framework/utils/rxjs-extensions.ts +++ b/frontend/app/framework/utils/rxjs-extensions.ts @@ -44,7 +44,7 @@ export function shareMapSubscribed(dialogs: DialogService, project: (v })) .subscribe(); - return shared.pipe(map(x => project(x))); + return shared.pipe(map(project)); }; } diff --git a/frontend/app/framework/utils/types.ts b/frontend/app/framework/utils/types.ts index 65d1cccf7..23edcb6cb 100644 --- a/frontend/app/framework/utils/types.ts +++ b/frontend/app/framework/utils/types.ts @@ -53,15 +53,15 @@ export module Types { } export function isArrayOfNumber(value: any): value is Array { - return isArrayOf(value, v => isNumber(v)); + return isArrayOf(value, isNumber); } export function isArrayOfObject(value: any): value is Array { - return isArrayOf(value, v => isObject(v)); + return isArrayOf(value, isObject); } export function isArrayOfString(value: any): value is Array { - return isArrayOf(value, v => isString(v)); + return isArrayOf(value, isString); } export function isArrayOf(value: any, validator: (v: any) => boolean): boolean { diff --git a/frontend/app/shared/components/assets/asset-dialog.component.html b/frontend/app/shared/components/assets/asset-dialog.component.html index b07ce7203..7e58ce5e8 100644 --- a/frontend/app/shared/components/assets/asset-dialog.component.html +++ b/frontend/app/shared/components/assets/asset-dialog.component.html @@ -8,6 +8,11 @@ + + + - - - @@ -57,7 +57,6 @@ -
diff --git a/frontend/app/shared/components/assets/asset-dialog.component.ts b/frontend/app/shared/components/assets/asset-dialog.component.ts index 0d8e7cd58..f8d6baccc 100644 --- a/frontend/app/shared/components/assets/asset-dialog.component.ts +++ b/frontend/app/shared/components/assets/asset-dialog.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output, QueryList, ViewChildren } from '@angular/core'; +import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output, QueryList, ViewChildren } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { AnnotateAssetDto, AnnotateAssetForm, AppsState, AssetDto, AssetsState, AssetUploaderState, AuthService, DialogService, Types, UploadCanceled } from '@app/shared/internal'; import { AssetsService } from '@app/shared/services/assets.service'; @@ -30,8 +30,7 @@ const TABS_DEFAULT: ReadonlyArray = [ @Component({ selector: 'sqx-asset-dialog', styleUrls: ['./asset-dialog.component.scss'], - templateUrl: './asset-dialog.component.html', - changeDetection: ChangeDetectionStrategy.OnPush + templateUrl: './asset-dialog.component.html' }) export class AssetDialogComponent implements OnChanges { @Output() diff --git a/frontend/app/shared/components/assets/asset-folder-dialog.component.ts b/frontend/app/shared/components/assets/asset-folder-dialog.component.ts index 53ce89627..2866df8d4 100644 --- a/frontend/app/shared/components/assets/asset-folder-dialog.component.ts +++ b/frontend/app/shared/components/assets/asset-folder-dialog.component.ts @@ -5,15 +5,14 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { AssetFolderDto, AssetsState, RenameAssetFolderForm } from '@app/shared/internal'; @Component({ selector: 'sqx-asset-folder-dialog', styleUrls: ['./asset-folder-dialog.component.scss'], - templateUrl: './asset-folder-dialog.component.html', - changeDetection: ChangeDetectionStrategy.OnPush + templateUrl: './asset-folder-dialog.component.html' }) export class AssetFolderDialogComponent implements OnInit { @Output() diff --git a/frontend/app/shared/components/assets/asset.component.html b/frontend/app/shared/components/assets/asset.component.html index 604d2f59b..02c8dce47 100644 --- a/frontend/app/shared/components/assets/asset.component.html +++ b/frontend/app/shared/components/assets/asset.component.html @@ -6,7 +6,7 @@ [sqxDropDisabled]="!asset || !asset.canUpload" [sqxDropNoPaste]="true">
-
+
{{asset.fileType}} @@ -77,8 +77,8 @@
-
- +
+
@@ -109,7 +109,7 @@ [sqxDropNoPaste]="true">
- +
@@ -175,9 +175,9 @@
-
+
diff --git a/frontend/app/shared/components/assets/asset.component.ts b/frontend/app/shared/components/assets/asset.component.ts index c905858c1..d93223c41 100644 --- a/frontend/app/shared/components/assets/asset.component.ts +++ b/frontend/app/shared/components/assets/asset.component.ts @@ -6,7 +6,12 @@ */ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostBinding, Input, OnInit, Output } from '@angular/core'; -import { AssetDto, AssetsState, AssetUploaderState, DialogModel, DialogService, Types, UploadCanceled } from '@app/shared/internal'; +import { AssetDto, AssetsState, AssetUploaderState, DialogModel, DialogService, StatefulComponent, Types, UploadCanceled } from '@app/shared/internal'; + +interface State { + // The download progress. + progress: number; +} @Component({ selector: 'sqx-asset', @@ -14,7 +19,7 @@ import { AssetDto, AssetsState, AssetUploaderState, DialogModel, DialogService, templateUrl: './asset.component.html', changeDetection: ChangeDetectionStrategy.OnPush }) -export class AssetComponent implements OnInit { +export class AssetComponent extends StatefulComponent implements OnInit { @Output() public load = new EventEmitter(); @@ -63,15 +68,15 @@ export class AssetComponent implements OnInit { @Input() public allTags: ReadonlyArray; - public progress = 0; - public editDialog = new DialogModel(); - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly assetUploader: AssetUploaderState, - private readonly changeDetector: ChangeDetectorRef, private readonly dialogs: DialogService ) { + super(changeDetector, { + progress: 0 + }); } public ngOnInit() { @@ -141,12 +146,10 @@ export class AssetComponent implements OnInit { public setAsset(asset: AssetDto) { this.asset = asset; - this.changeDetector.markForCheck(); + this.detectChanges(); } public setProgress(progress: number) { - this.progress = progress; - - this.changeDetector.markForCheck(); + this.next({ progress }); } } \ No newline at end of file diff --git a/frontend/app/shared/components/assets/assets-list.component.html b/frontend/app/shared/components/assets/assets-list.component.html index b2657ddf9..66bff600e 100644 --- a/frontend/app/shared/components/assets/assets-list.component.html +++ b/frontend/app/shared/components/assets/assets-list.component.html @@ -1,4 +1,4 @@ -
+

{{ 'assets.uploadByDrop' | sqxTranslate }}

{{ 'common.or' | sqxTranslate }}
@@ -14,54 +14,55 @@
{{ 'assets.uploadHint' | sqxTranslate }}
- +
-
- +
+
{{ 'common.folders' | sqxTranslate }}
-
+ (navigate)="assetsState.navigate($event.id)">
-
+ (cdkDropListDropped)="move($event)">
+ (navigate)="assetsState.navigate($event.id)" (delete)="deleteAssetFolder($event)">
- - + +
{{ 'common.files' | sqxTranslate }}
 -
- @@ -72,7 +73,7 @@ [cdkDragData]="asset" [cdkDragDisabled]="isDisabled || !asset.canMove" [asset]="asset" - [assetsState]="state" + [assetsState]="assetsState" [isListView]="isListView" [isDisabled]="isDisabled" [isSelectable]="!!selectedIds" @@ -88,5 +89,5 @@ - + \ No newline at end of file diff --git a/frontend/app/shared/components/assets/assets-list.component.ts b/frontend/app/shared/components/assets/assets-list.component.ts index 93bdf9613..4b5b60198 100644 --- a/frontend/app/shared/components/assets/assets-list.component.ts +++ b/frontend/app/shared/components/assets/assets-list.component.ts @@ -7,7 +7,12 @@ import { CdkDrag, CdkDragDrop, CdkDropList } from '@angular/cdk/drag-drop'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, Output } from '@angular/core'; -import { AssetDto, AssetFolderDto, AssetsState, getFiles, Types } from '@app/shared/internal'; +import { AssetDto, AssetFolderDto, AssetsState, getFiles, StatefulComponent, Types } from '@app/shared/internal'; + +interface State { + // The new files. + newFiles: ReadonlyArray; +} @Component({ selector: 'sqx-assets-list', @@ -15,12 +20,12 @@ import { AssetDto, AssetFolderDto, AssetsState, getFiles, Types } from '@app/sha templateUrl: './assets-list.component.html', changeDetection: ChangeDetectionStrategy.OnPush }) -export class AssetsListComponent { +export class AssetsListComponent extends StatefulComponent { @Output() public select = new EventEmitter(); @Input() - public state: AssetsState; + public assetsState: AssetsState; @Input() public isDisabled = false; @@ -37,24 +42,21 @@ export class AssetsListComponent { @Input() public showPager = true; - public newFiles: ReadonlyArray = []; - - constructor( - private readonly changeDetector: ChangeDetectorRef - ) { + constructor(changeDetector: ChangeDetectorRef) { + super(changeDetector, { + newFiles: [] + }); } public add(file: File, asset: AssetDto) { if (asset.isDuplicate) { setTimeout(() => { - this.newFiles = this.newFiles.removed(file); - - this.changeDetector.markForCheck(); + this.remove(file); }, 2000); } else { - this.newFiles = this.newFiles.removed(file); + this.remove(file); - this.state.addAsset(asset); + this.assetsState.addAsset(asset); } } @@ -63,23 +65,23 @@ export class AssetsListComponent { const item = drag.item.data; if (Types.is(item, AssetDto)) { - this.state.moveAsset(item, drag.container.data); + this.assetsState.moveAsset(item, drag.container.data); } else { - this.state.moveAssetFolder(item, drag.container.data); + this.assetsState.moveAssetFolder(item, drag.container.data); } } } public selectFolder(asset: AssetDto) { - this.state.navigate(asset.parentId); + this.assetsState.navigate(asset.parentId); } public deleteAsset(asset: AssetDto) { - this.state.deleteAsset(asset); + this.assetsState.deleteAsset(asset); } public deleteAssetFolder(assetFolder: AssetFolderDto) { - this.state.deleteAssetFolder(assetFolder); + this.assetsState.deleteAssetFolder(assetFolder); } public isSelected(asset: AssetDto) { @@ -87,11 +89,19 @@ export class AssetsListComponent { } public remove(file: File) { - this.newFiles = this.newFiles.removed(file); + this.next(s => ({ + ...s, + newFiles: s.newFiles.removed(file) + })); + + return true; } public addFiles(files: ReadonlyArray) { - this.newFiles = [...getFiles(files), ...this.newFiles]; + this.next(s => ({ + ...s, + newFiles: [...getFiles(files), ...s.newFiles] + })); return true; } diff --git a/frontend/app/shared/components/assets/assets-selector.component.html b/frontend/app/shared/components/assets/assets-selector.component.html index 893afc567..2aa0c5eb9 100644 --- a/frontend/app/shared/components/assets/assets-selector.component.html +++ b/frontend/app/shared/components/assets/assets-selector.component.html @@ -17,7 +17,7 @@
- +
@@ -36,7 +36,13 @@ - + diff --git a/frontend/app/shared/components/assets/assets-selector.component.ts b/frontend/app/shared/components/assets/assets-selector.component.ts index dd78362e0..b3171087c 100644 --- a/frontend/app/shared/components/assets/assets-selector.component.ts +++ b/frontend/app/shared/components/assets/assets-selector.component.ts @@ -81,7 +81,7 @@ export class AssetsSelectorComponent extends StatefulComponent implements } public changeView(isListView: boolean) { - this.next(s => ({ ...s, isListView })); + this.next({ isListView }); this.localStore.setBoolean(Settings.Local.ASSETS_MODE, isListView); } diff --git a/frontend/app/shared/components/comments/comment.component.html b/frontend/app/shared/components/comments/comment.component.html index 33c468cfc..c3a37ad39 100644 --- a/frontend/app/shared/components/comments/comment.component.html +++ b/frontend/app/shared/components/comments/comment.component.html @@ -3,7 +3,7 @@
- +
@@ -21,6 +21,21 @@
+ +
+ + + +
@@ -40,19 +55,4 @@
- -
- - - -
\ No newline at end of file diff --git a/frontend/app/shared/components/comments/comment.component.ts b/frontend/app/shared/components/comments/comment.component.ts index 7659e5be8..0ab95f23d 100644 --- a/frontend/app/shared/components/comments/comment.component.ts +++ b/frontend/app/shared/components/comments/comment.component.ts @@ -5,17 +5,21 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; -import { CommentDto, CommentsState, ContributorDto, DialogService, Keys } from '@app/shared/internal'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges } from '@angular/core'; +import { CommentDto, CommentsState, ContributorDto, DialogService, Keys, StatefulComponent } from '@app/shared/internal'; import { MentionConfig } from 'angular-mentions'; +interface State { + isEditing: boolean; +} + @Component({ selector: 'sqx-comment', styleUrls: ['./comment.component.scss'], templateUrl: './comment.component.html', changeDetection: ChangeDetectionStrategy.OnPush }) -export class CommentComponent implements OnChanges { +export class CommentComponent extends StatefulComponent implements OnChanges { @Input() public canFollow = false; @@ -45,13 +49,14 @@ export class CommentComponent implements OnChanges { public isDeletable = false; public isEditable = false; - public isEditing = false; - public editingText: string; - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly dialogs: DialogService ) { + super(changeDetector, { + isEditing: false + }); } public ngOnChanges() { @@ -64,11 +69,11 @@ export class CommentComponent implements OnChanges { public startEdit() { this.editingText = this.comment.text; - this.isEditing = true; + this.next({ isEditing: true }); } public cancelEdit() { - this.isEditing = false; + this.next({ isEditing: false }); } public delete() { diff --git a/frontend/app/shared/components/comments/comments.component.ts b/frontend/app/shared/components/comments/comments.component.ts index 0e092d7e3..2758bebe9 100644 --- a/frontend/app/shared/components/comments/comments.component.ts +++ b/frontend/app/shared/components/comments/comments.component.ts @@ -66,7 +66,7 @@ export class CommentsComponent extends ResourceOwner implements OnChanges { let isEditing = false; this.children.forEach(x => { - isEditing = isEditing || x.isEditing; + isEditing = isEditing || x.snapshot.isEditing; }); if (!isEditing) { diff --git a/frontend/app/shared/components/forms/geolocation-editor.component.ts b/frontend/app/shared/components/forms/geolocation-editor.component.ts index 1613de959..3fc0d2b0c 100644 --- a/frontend/app/shared/components/forms/geolocation-editor.component.ts +++ b/frontend/app/shared/components/forms/geolocation-editor.component.ts @@ -76,7 +76,9 @@ export class GeolocationEditorComponent extends StatefulControlComponent ({ ...s, isCompact: isCompact })); + this.next({ isCompact }); } } \ No newline at end of file diff --git a/frontend/app/shared/components/forms/markdown-editor.component.ts b/frontend/app/shared/components/forms/markdown-editor.component.ts index 3faaf8edb..1239aaa99 100644 --- a/frontend/app/shared/components/forms/markdown-editor.component.ts +++ b/frontend/app/shared/components/forms/markdown-editor.component.ts @@ -279,6 +279,6 @@ export class MarkdownEditorComponent extends StatefulControlComponent ({ ...s, isFullscreen })); + this.next({ isFullscreen }); } } \ No newline at end of file diff --git a/frontend/app/shared/components/forms/references-checkboxes.component.ts b/frontend/app/shared/components/forms/references-checkboxes.component.ts index ade5e5137..da93e165b 100644 --- a/frontend/app/shared/components/forms/references-checkboxes.component.ts +++ b/frontend/app/shared/components/forms/references-checkboxes.component.ts @@ -51,7 +51,9 @@ export class ReferencesCheckboxesComponent extends StatefulControlComponent ({ ...s, contentNames: this.createContentNames(s.contents) })); + this.next(s => ({ + ...s, + contentNames: this.createContentNames(s.contents) + })); } public get isValid() { @@ -102,11 +105,10 @@ export class ReferencesDropdownComponent extends StatefulControlComponent { - const contentItems = contents.items; - const contentNames = this.createContentNames(contentItems); + .subscribe(({ items: contents }) => { + const contentNames = this.createContentNames(contents); - this.next(s => ({ ...s, contents: contentItems, contentNames })); + this.next({ contents, contentNames }); this.selectContent(); }, () => { diff --git a/frontend/app/shared/components/forms/references-tags.component.ts b/frontend/app/shared/components/forms/references-tags.component.ts index dca5d2909..5fff6e54d 100644 --- a/frontend/app/shared/components/forms/references-tags.component.ts +++ b/frontend/app/shared/components/forms/references-tags.component.ts @@ -51,7 +51,9 @@ export class ReferencesTagsComponent extends StatefulControlComponent = [ ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class RichEditorComponent extends StatefulControlComponent implements AfterViewInit, OnDestroy { +export class RichEditorComponent extends StatefulControlComponent<{}, string> implements AfterViewInit, OnDestroy { private tinyEditor: any; private value: string; - private isDisabled = false; @Output() public assetPluginClick = new EventEmitter(); @@ -52,7 +51,7 @@ export class RichEditorComponent extends StatefulControlComponent { - if (this.isDisabled) { + if (this.snapshot.isDisabled) { return; } @@ -202,7 +201,7 @@ export class RichEditorComponent extends StatefulControlComponent) { diff --git a/frontend/app/shared/components/notifo.component.ts b/frontend/app/shared/components/notifo.component.ts index 0e9ec074c..c8e2b9ee1 100644 --- a/frontend/app/shared/components/notifo.component.ts +++ b/frontend/app/shared/components/notifo.component.ts @@ -5,8 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, Output, Renderer2, SimpleChanges, ViewChild } from '@angular/core'; -import { Pager, ResourceLoaderService, UIOptions } from '@app/framework'; +import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Input, OnChanges, OnDestroy, Renderer2, SimpleChanges, ViewChild } from '@angular/core'; +import { ResourceLoaderService, UIOptions } from '@app/framework'; import { AuthService } from '@app/shared/internal'; @Component({ @@ -19,9 +19,6 @@ export class NotifoComponent implements AfterViewInit, OnChanges, OnDestroy { private readonly notifoApiUrl: string; private readonly notifoApiKey: string | undefined; - @Output() - public pagerChange = new EventEmitter(); - @Input() public topic: string; diff --git a/frontend/app/shared/services/apps.service.ts b/frontend/app/shared/services/apps.service.ts index 6f5a255c4..240e0fdf3 100644 --- a/frontend/app/shared/services/apps.service.ts +++ b/frontend/app/shared/services/apps.service.ts @@ -98,7 +98,7 @@ export class AppsService { return this.http.get(url).pipe( map(body => { - const apps = body.map(item => parseApp(item)); + const apps = body.map(parseApp); return apps; }), diff --git a/frontend/app/shared/services/assets.service.ts b/frontend/app/shared/services/assets.service.ts index 3a9bc885d..80712927d 100644 --- a/frontend/app/shared/services/assets.service.ts +++ b/frontend/app/shared/services/assets.service.ts @@ -238,7 +238,7 @@ export class AssetsService { return this.http.post<{ total: number, items: any[], folders: any[] } & Resource>(url, body).pipe( map(({ total, items, _links }) => { - const assets = items.map(item => parseAsset(item)); + const assets = items.map(parseAsset); return new AssetsDto(total, assets, _links); }), @@ -248,7 +248,7 @@ export class AssetsService { return this.http.get<{ total: number, items: any[], folders: any[] } & Resource>(url).pipe( map(({ total, items, _links }) => { - const assets = items.map(item => parseAsset(item)); + const assets = items.map(parseAsset); return new AssetsDto(total, assets, _links); }), @@ -261,8 +261,8 @@ export class AssetsService { return this.http.get<{ total: number, items: any[], folders: any[], path: any[] } & Resource>(url).pipe( map(({ total, items, path, _links }) => { - const assetFolders = items.map(item => parseAssetFolder(item)); - const assetPath = path.map(item => parseAssetFolder(item)); + const assetFolders = items.map(parseAssetFolder); + const assetPath = path.map(parseAssetFolder); return new AssetFoldersDto(total, assetFolders, assetPath, _links); }), @@ -411,7 +411,7 @@ export class AssetsService { public deleteAssetItem(appName: string, asset: Resource, checkReferrers: boolean, version: Version): Observable> { const link = asset._links['delete']; - const url = this.apiUrl.buildUrl(link.href) + `?checkReferrers=${checkReferrers}`; + const url = `${this.apiUrl.buildUrl(link.href)}?checkReferrers=${checkReferrers}`; return HTTP.requestVersioned(this.http, link.method, url, version).pipe( tap(() => { diff --git a/frontend/app/shared/services/autosave.service.spec.ts b/frontend/app/shared/services/autosave.service.spec.ts index 4d47cbacc..0434e9b05 100644 --- a/frontend/app/shared/services/autosave.service.spec.ts +++ b/frontend/app/shared/services/autosave.service.spec.ts @@ -75,28 +75,36 @@ describe('AutoSaveService', () => { localStore.verify(x => x.set(It.isAnyString(), It.isAnyString()), Times.never()); }); - it('should get unsaved created content', () => { + it('should get unsaved created content and delete', () => { localStore.setup(x => x.get('autosave.1-2')) .returns(() => '{"text":"Hello"}'); - const content = autoSaveService.get({ schemaId: '1', schemaVersion: new Version('2') }); + const key = { schemaId: '1', schemaVersion: new Version('2') }; + + const content = autoSaveService.fetch(key); expect(content).toEqual({ text: 'Hello' }); + + localStore.verify(x => x.remove(It.isAnyString()), Times.once()); }); - it('should get unsaved edited content', () => { + it('should get unsaved edited content and remove', () => { localStore.setup(x => x.get('autosave.1-2.3')) .returns(() => '{"text":"Hello"}'); - const content = autoSaveService.get({ schemaId: '1', schemaVersion: new Version('2'), contentId: '3' }); + const key = { schemaId: '1', schemaVersion: new Version('2'), contentId: '3' }; + + const content = autoSaveService.fetch(key); expect(content).toEqual({ text: 'Hello' }); + + localStore.verify(x => x.remove(It.isAnyString()), Times.once()); }); it('should not get content if key is not defined', () => { autoSaveService.remove(null!); - const content = autoSaveService.get(null!); + const content = autoSaveService.fetch(null!); expect(content).toBeNull(); diff --git a/frontend/app/shared/services/autosave.service.ts b/frontend/app/shared/services/autosave.service.ts index cab935bd1..849367126 100644 --- a/frontend/app/shared/services/autosave.service.ts +++ b/frontend/app/shared/services/autosave.service.ts @@ -17,7 +17,7 @@ export class AutoSaveService { ) { } - public get(key: AutoSaveKey): object | null { + public fetch(key: AutoSaveKey): object | null { if (!key) { return null; } @@ -25,6 +25,8 @@ export class AutoSaveService { const value = this.localStore.get(getKey(key)); if (value) { + this.remove(key); + return JSON.parse(value); } diff --git a/frontend/app/shared/services/backups.service.ts b/frontend/app/shared/services/backups.service.ts index d32f13067..6003620b1 100644 --- a/frontend/app/shared/services/backups.service.ts +++ b/frontend/app/shared/services/backups.service.ts @@ -77,7 +77,7 @@ export class BackupsService { return this.http.get<{ items: any[], _links: {} } & Resource>(url).pipe( map(({ items, _links }) => { - const backups = items.map(item => parseBackup(item)); + const backups = items.map(parseBackup); return new BackupsDto(backups.length, backups, _links); }), diff --git a/frontend/app/shared/services/clients.service.spec.ts b/frontend/app/shared/services/clients.service.spec.ts index 0f6be91d6..28e6c4235 100644 --- a/frontend/app/shared/services/clients.service.spec.ts +++ b/frontend/app/shared/services/clients.service.spec.ts @@ -181,7 +181,7 @@ describe('ClientsService', () => { export function createClients(...ids: ReadonlyArray): ClientsPayload { return { - items: ids.map(id => createClient(id)), + items: ids.map(createClient), _links: { create: { method: 'POST', href: '/clients' } }, diff --git a/frontend/app/shared/services/comments.service.spec.ts b/frontend/app/shared/services/comments.service.spec.ts index 11cccaf98..d1468ec29 100644 --- a/frontend/app/shared/services/comments.service.spec.ts +++ b/frontend/app/shared/services/comments.service.spec.ts @@ -48,13 +48,13 @@ describe('CommentsService', () => { id: '123', text: 'text1', time: '2016-10-12T10:10', - user: user + user }], updatedComments: [{ id: '456', text: 'text2', time: '2017-11-12T12:12', - user: user + user }], deletedComments: ['789'], version: '9' @@ -93,7 +93,7 @@ describe('CommentsService', () => { id: '123', text: 'text1', time: '2016-10-12T10:10', - user: user + user }); expect(comment!).toEqual(new CommentDto('123', DateTime.parseISO('2016-10-12T10:10Z'), 'text1', undefined, user)); diff --git a/frontend/app/shared/services/contents.service.spec.ts b/frontend/app/shared/services/contents.service.spec.ts index 1921a95e1..f37140be9 100644 --- a/frontend/app/shared/services/contents.service.spec.ts +++ b/frontend/app/shared/services/contents.service.spec.ts @@ -7,8 +7,10 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; +import { ErrorDto } from '@app/framework'; import { AnalyticsService, ApiUrlConfig, ContentDto, ContentsDto, ContentsService, DateTime, Resource, ResourceLinks, ScheduleDto, Version, Versioned } from '@app/shared/internal'; import { encodeQuery, sanitize } from './../state/query'; +import { BulkResultDto, BulkUpdateDto } from './contents.service'; describe('ContentsService', () => { const version = new Version('1'); @@ -355,48 +357,44 @@ describe('ContentsService', () => { expect(content!).toEqual(createContent(12)); })); - it('should make put request to change content status', + it('should make post request to for bulk update', inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => { - const resource: Resource = { - _links: { - ['status/published']: { method: 'PUT', href: '/api/content/my-app/my-schema/content1/status' } - } + const dto: BulkUpdateDto = { + jobs: [{ + id: '123', + type: 'Delete' + }, { + id: '456', + type: 'Delete' + }] }; - let content: ContentDto; + let results: ReadonlyArray; - contentsService.putStatus('my-app', resource, 'published', true, '2016-12-12T10:10:00', version).subscribe(result => { - content = result; + contentsService.bulkUpdate('my-app', 'my-schema', dto).subscribe(result => { + results = result; }); - const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/content1/status'); + const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/bulk'); - expect(req.request.method).toEqual('PUT'); - expect(req.request.headers.get('If-Match')).toEqual(version.value); - - req.flush(contentResponse(12)); - - expect(content!).toEqual(createContent(12)); - })); - - it('should make delete request to delete content', - inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => { + expect(req.request.method).toEqual('POST'); + expect(req.request.headers.get('If-Match')).toBeNull(); - const resource: Resource = { - _links: { - delete: { method: 'DELETE', href: '/api/content/my-app/my-schema/content1' } + req.flush([{ + contentId: '123' + }, { + contentId: '456', + error: { + statusCode: 400, + message: 'Invalid' } - }; - - contentsService.deleteContent('my-app', resource, true, version).subscribe(); - - const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/content1?checkReferrers=true'); - - expect(req.request.method).toEqual('DELETE'); - expect(req.request.headers.get('If-Match')).toEqual(version.value); + }]); - req.flush({}); + expect(results!).toEqual([ + new BulkResultDto('123'), + new BulkResultDto('456', new ErrorDto(400, 'Invalid')) + ]); })); function contentResponse(id: number) { diff --git a/frontend/app/shared/services/contents.service.ts b/frontend/app/shared/services/contents.service.ts index eafe8891e..6d1456fc1 100644 --- a/frontend/app/shared/services/contents.service.ts +++ b/frontend/app/shared/services/contents.service.ts @@ -5,9 +5,11 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ +// tslint:disable: no-shadowed-variable + import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, DateTime, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, ResultSet, Version, Versioned } from '@app/framework'; +import { AnalyticsService, ApiUrlConfig, DateTime, ErrorDto, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, ResultSet, Version, Versioned } from '@app/framework'; import { Observable } from 'rxjs'; import { map, tap } from 'rxjs/operators'; import { encodeQuery, Query } from './../state/query'; @@ -59,6 +61,10 @@ export class ContentDto { public readonly canDraftCreate: boolean; public readonly canUpdate: boolean; + public get canPublish() { + return this.statusUpdates.find(x => x.status === 'Published'); + } + constructor(links: ResourceLinks, public readonly id: string, public readonly status: string, @@ -84,10 +90,42 @@ export class ContentDto { this.canDraftDelete = hasAnyLink(links, 'draft/delete'); this.canUpdate = hasAnyLink(links, 'update'); - this.statusUpdates = Object.keys(links).filter(x => x.startsWith('status/')).map(x => ({ status: x.substr(7), color: links[x].metadata! })); + const updates: StatusInfo[] = []; + + for (const link in links) { + if (link.startsWith('status/')) { + const status = link.substr(7); + + updates.push({ status, color: links[link].metadata! }); + } + } + + this.statusUpdates = updates; } } +export class BulkResultDto { + constructor( + public readonly contentId: string, + public readonly error?: ErrorDto + ) { + } +} + +export interface BulkUpdateDto { + readonly jobs: ReadonlyArray; + readonly checkReferrers?: boolean; +} + +export interface BulkUpdateJobDto { + readonly id: string; + readonly type: 'Upsert' | 'ChangeStatus' | 'Delete' | 'Validate'; + readonly status?: string; + readonly schema?: string; + readonly dueTime?: string | null; + readonly expectedVersion?: number; +} + export interface ContentQueryDto { readonly ids?: ReadonlyArray; readonly maxLength?: number; @@ -106,43 +144,9 @@ export class ContentsService { } public getContents(appName: string, schemaName: string, q?: ContentQueryDto): Observable { - const { ids, maxLength, query, skip, take } = q || {}; + const { ids, maxLength } = q || {}; - const queryParts: string[] = []; - const queryOdataParts: string[] = []; - - let queryObj: Query | undefined; - - if (ids && ids.length > 0) { - queryParts.push(`ids=${ids.join(',')}`); - } else { - - if (query && query.fullText && query.fullText.indexOf('$') >= 0) { - queryOdataParts.push(`${query.fullText.trim()}`); - - if (take && take > 0) { - queryOdataParts.push(`$top=${take}`); - } - - if (skip && skip > 0) { - queryOdataParts.push(`$skip=${skip}`); - } - } else { - queryObj = { ...query }; - - if (take && take > 0) { - queryObj.take = take; - } - - if (skip && skip > 0) { - queryObj.skip = skip; - } - - queryParts.push(`q=${encodeQuery(queryObj)}`); - } - } - - const fullQuery = [...queryParts, ...queryOdataParts].join('&'); + const { fullQuery, queryOdataParts, queryObj } = buildQuery(q); if (fullQuery.length > (maxLength || 2000)) { const body: any = {}; @@ -161,7 +165,7 @@ export class ContentsService { return this.http.post<{ total: number, items: [], statuses: StatusInfo[] } & Resource>(url, body).pipe( map(({ total, items, statuses, _links }) => { - const contents = items.map(x => parseContent(x)); + const contents = items.map(parseContent); return new ContentsDto(statuses, total, contents, _links); }), @@ -171,7 +175,7 @@ export class ContentsService { return this.http.get<{ total: number, items: [], statuses: StatusInfo[] } & Resource>(url).pipe( map(({ total, items, statuses, _links }) => { - const contents = items.map(x => parseContent(x)); + const contents = items.map(parseContent); return new ContentsDto(statuses, total, contents, _links); }), @@ -189,7 +193,7 @@ export class ContentsService { return this.http.post<{ total: number, items: [], statuses: StatusInfo[] } & Resource>(url, body).pipe( map(({ total, items, statuses, _links }) => { - const contents = items.map(x => parseContent(x)); + const contents = items.map(parseContent); return new ContentsDto(statuses, total, contents, _links); }), @@ -200,7 +204,7 @@ export class ContentsService { return this.http.get<{ total: number, items: [], statuses: StatusInfo[] } & Resource>(url).pipe( map(({ total, items, statuses, _links }) => { - const contents = items.map(x => parseContent(x)); + const contents = items.map(parseContent); return new ContentsDto(statuses, total, contents, _links); }), @@ -218,6 +222,34 @@ export class ContentsService { pretifyError('i18n:contents.loadContentFailed')); } + public getContentReferences(appName: string, schemaName: string, id: string, q?: ContentQueryDto): Observable { + const { fullQuery } = buildQuery(q); + + const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}/references?${fullQuery}`); + + return this.http.get<{ total: number, items: [], statuses: StatusInfo[] } & Resource>(url).pipe( + map(({ total, items, statuses, _links }) => { + const contents = items.map(parseContent); + + return new ContentsDto(statuses, total, contents, _links); + }), + pretifyError('i18n:contents.loadFailed')); + } + + public getContentReferencing(appName: string, schemaName: string, id: string, q?: ContentQueryDto): Observable { + const { fullQuery } = buildQuery(q); + + const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}/referencing?${fullQuery}`); + + return this.http.get<{ total: number, items: [], statuses: StatusInfo[] } & Resource>(url).pipe( + map(({ total, items, statuses, _links }) => { + const contents = items.map(parseContent); + + return new ContentsDto(statuses, total, contents, _links); + }), + pretifyError('i18n:contents.loadFailed')); + } + public getVersionData(appName: string, schemaName: string, id: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}/${version.value}`); @@ -301,32 +333,59 @@ export class ContentsService { pretifyError('i18n:contents.deleteVersionFailed')); } - public putStatus(appName: string, resource: Resource, status: string, checkReferrers: boolean, dueTime: string | null, version: Version): Observable { - const link = resource._links[`status/${status}`]; + public bulkUpdate(appName: string, schemaName: string, dto: BulkUpdateDto): Observable> { + const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/bulk`); - const url = this.apiUrl.buildUrl(link.href); - - return HTTP.requestVersioned(this.http, link.method, url, version, { status, dueTime, checkReferrers }).pipe( - map(({ payload }) => { - return parseContent(payload.body); + return this.http.post(url, dto).pipe( + map(body => { + return body.map(x => new BulkResultDto(x.contentId, parseError(x.error))); }), tap(() => { - this.analytics.trackEvent('Content', 'Archived', appName); + this.analytics.trackEvent('Content', 'Deleted', appName); }), - pretifyError(`Failed to ${status} content. Please reload.`)); + pretifyError('i18n:contents.bulkFailed')); } +} - public deleteContent(appName: string, resource: Resource, checkReferrers: boolean, version: Version): Observable> { - const link = resource._links['delete']; +function buildQuery(q?: ContentQueryDto) { + const { ids, query, skip, take } = q || {}; - const url = this.apiUrl.buildUrl(link.href) + `?checkReferrers=${checkReferrers}`; + const queryParts: string[] = []; + const queryOdataParts: string[] = []; - return HTTP.requestVersioned(this.http, link.method, url, version).pipe( - tap(() => { - this.analytics.trackEvent('Content', 'Deleted', appName); - }), - pretifyError('i18n:contents.deleteFailed')); + let queryObj: Query | undefined; + + if (ids && ids.length > 0) { + queryParts.push(`ids=${ids.join(',')}`); + } else { + + if (query && query.fullText && query.fullText.indexOf('$') >= 0) { + queryOdataParts.push(`${query.fullText.trim()}`); + + if (take && take > 0) { + queryOdataParts.push(`$top=${take}`); + } + + if (skip && skip > 0) { + queryOdataParts.push(`$skip=${skip}`); + } + } else { + queryObj = { ...query }; + + if (take && take > 0) { + queryObj.take = take; + } + + if (skip && skip > 0) { + queryObj.skip = skip; + } + + queryParts.push(`q=${encodeQuery(queryObj)}`); + } } + + const fullQuery = [...queryParts, ...queryOdataParts].join('&'); + return { fullQuery, queryOdataParts, queryObj }; } function parseContent(response: any) { @@ -343,7 +402,7 @@ function parseContent(response: any) { response.schemaName, response.schemaDisplayName, response.referenceData, - response.referenceFields.map((item: any) => parseField(item)), + response.referenceFields.map(parseField), new Version(response.version.toString())); } @@ -357,4 +416,15 @@ function parseScheduleJob(response: any) { response.scheduledBy, response.color, DateTime.parseISO(response.dueTime)); +} + +function parseError(response: any) { + if (!response) { + return undefined; + } + + return new ErrorDto( + response.statusCode, + response.message, + response.details); } \ No newline at end of file diff --git a/frontend/app/shared/services/contributors.service.spec.ts b/frontend/app/shared/services/contributors.service.spec.ts index e61506aa1..eaad71ba1 100644 --- a/frontend/app/shared/services/contributors.service.spec.ts +++ b/frontend/app/shared/services/contributors.service.spec.ts @@ -130,7 +130,7 @@ describe('ContributorsService', () => { export function createContributors(...ids: ReadonlyArray): ContributorsPayload { return { - items: ids.map(id => createContributor(id)), + items: ids.map(createContributor), maxContributors: ids.length * 13, _links: { create: { method: 'POST', href: '/contributors' } diff --git a/frontend/app/shared/services/patterns.service.spec.ts b/frontend/app/shared/services/patterns.service.spec.ts index 23b18b4f5..703730b97 100644 --- a/frontend/app/shared/services/patterns.service.spec.ts +++ b/frontend/app/shared/services/patterns.service.spec.ts @@ -157,7 +157,7 @@ describe('PatternsService', () => { export function createPatterns(...ids: ReadonlyArray): PatternsPayload { return { - items: ids.map(id => createPattern(id)), + items: ids.map(createPattern), _links: { create: { method: 'POST', href: '/patterns' } }, diff --git a/frontend/app/shared/services/roles.service.spec.ts b/frontend/app/shared/services/roles.service.spec.ts index f3742db48..ecc11d14a 100644 --- a/frontend/app/shared/services/roles.service.spec.ts +++ b/frontend/app/shared/services/roles.service.spec.ts @@ -178,7 +178,7 @@ describe('RolesService', () => { export function createRoles(...ids: ReadonlyArray): RolesPayload { return { - items: ids.map(id => createRole(id)), + items: ids.map(createRole), _links: { create: { method: 'POST', href: '/roles' } }, diff --git a/frontend/app/shared/services/rules.service.ts b/frontend/app/shared/services/rules.service.ts index 83546aa9e..ac5f440bc 100644 --- a/frontend/app/shared/services/rules.service.ts +++ b/frontend/app/shared/services/rules.service.ts @@ -255,7 +255,7 @@ export class RulesService { return this.http.get<{ items: [] } & Resource & { runningRuleId?: string }>(url).pipe( map(({ items, _links, runningRuleId }) => { - const rules = items.map(item => parseRule(item)); + const rules = items.map(parseRule); return new RulesDto(rules, _links, runningRuleId); }), diff --git a/frontend/app/shared/services/schemas.service.ts b/frontend/app/shared/services/schemas.service.ts index decb75d47..40a9faa09 100644 --- a/frontend/app/shared/services/schemas.service.ts +++ b/frontend/app/shared/services/schemas.service.ts @@ -719,7 +719,7 @@ function parseSchemas(response: any) { } function parseSchemaWithDetails(response: any) { - const fields = response.fields.map((item: any) => parseField(item)); + const fields = response.fields.map(parseField); return new SchemaDetailsDto(response._links, response.id, diff --git a/frontend/app/shared/services/workflows.service.spec.ts b/frontend/app/shared/services/workflows.service.spec.ts index b9c3ac07c..ea95939a3 100644 --- a/frontend/app/shared/services/workflows.service.spec.ts +++ b/frontend/app/shared/services/workflows.service.spec.ts @@ -140,7 +140,7 @@ describe('WorkflowsService', () => { 'Error1', 'Error2' ], - items: names.map(name => workflowResponse(name)), + items: names.map(workflowResponse), _links: { create: { method: 'POST', href: '/workflows' } } @@ -184,7 +184,7 @@ export function createWorkflows(...names: ReadonlyArray): WorkflowsPaylo 'Error1', 'Error2' ], - items: names.map(name => createWorkflow(name)), + items: names.map(createWorkflow), _links: { create: { method: 'POST', href: '/workflows' } }, diff --git a/frontend/app/shared/services/workflows.service.ts b/frontend/app/shared/services/workflows.service.ts index fb839d336..e551492c9 100644 --- a/frontend/app/shared/services/workflows.service.ts +++ b/frontend/app/shared/services/workflows.service.ts @@ -274,8 +274,7 @@ export class WorkflowsService { function parseWorkflows(response: any) { const raw: any[] = response.items; - const items = raw.map(item => - parseWorkflow(item)); + const items = raw.map(parseWorkflow); const { errors, _links } = response; diff --git a/frontend/app/shared/state/_test-helpers.ts b/frontend/app/shared/state/_test-helpers.ts index 2cc0fcd57..82b0be1dd 100644 --- a/frontend/app/shared/state/_test-helpers.ts +++ b/frontend/app/shared/state/_test-helpers.ts @@ -60,7 +60,7 @@ class DummySynchronizer implements StateSynchronizer, StateSynchronizerMap return this; } - public withPager() { + public withPaging() { return this; } @@ -69,7 +69,7 @@ class DummySynchronizer implements StateSynchronizer, StateSynchronizerMap } public whenSynced(action: () => void) { - this.subject.subscribe(() => action()); + this.subject.subscribe(action); return this; } diff --git a/frontend/app/shared/state/asset-uploader.state.spec.ts b/frontend/app/shared/state/asset-uploader.state.spec.ts index 62f7109e6..8227fdc49 100644 --- a/frontend/app/shared/state/asset-uploader.state.spec.ts +++ b/frontend/app/shared/state/asset-uploader.state.spec.ts @@ -6,7 +6,7 @@ */ import { AssetDto, AssetsService, AssetsState, AssetUploaderState, DialogService, ofForever, Types } from '@app/shared/internal'; -import { never, of, throwError } from 'rxjs'; +import { NEVER, of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, Mock } from 'typemoq'; import { createAsset } from './../services/assets.service.spec'; @@ -39,7 +39,7 @@ describe('AssetUploaderState', () => { const file: File = { name: 'my-file' }; assetsService.setup(x => x.postAssetFile(app, file, undefined)) - .returns(() => never()).verifiable(); + .returns(() => NEVER).verifiable(); assetUploader.uploadFile(file).subscribe(); @@ -58,7 +58,7 @@ describe('AssetUploaderState', () => { const file: File = { name: 'my-file' }; assetsService.setup(x => x.postAssetFile(app, file, 'parent1')) - .returns(() => never()).verifiable(); + .returns(() => NEVER).verifiable(); assetUploader.uploadFile(file, assetsState.object).subscribe(); @@ -120,7 +120,7 @@ describe('AssetUploaderState', () => { const file: File = { name: 'my-file' }; assetsService.setup(x => x.putAssetFile(app, asset, file, asset.version)) - .returns(() => never()).verifiable(); + .returns(() => NEVER).verifiable(); assetUploader.uploadAsset(asset, file).subscribe(); diff --git a/frontend/app/shared/state/assets.state.spec.ts b/frontend/app/shared/state/assets.state.spec.ts index d2e75f056..a870a3243 100644 --- a/frontend/app/shared/state/assets.state.spec.ts +++ b/frontend/app/shared/state/assets.state.spec.ts @@ -1,4 +1,3 @@ -import { ErrorDto } from '@app/framework'; /* * Squidex Headless CMS * @@ -6,7 +5,8 @@ import { ErrorDto } from '@app/framework'; * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AssetFoldersDto, AssetsDto, AssetsService, AssetsState, DialogService, MathHelper, Pager, versioned } from '@app/shared/internal'; +import { ErrorDto } from '@app/framework'; +import { AssetFoldersDto, AssetsDto, AssetsService, AssetsState, DialogService, MathHelper, versioned } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; @@ -60,9 +60,9 @@ describe('AssetsState', () => { assetsState.load().subscribe(); expect(assetsState.snapshot.assets).toEqual([asset1, asset2]); - expect(assetsState.snapshot.assetsPager.numberOfItems).toEqual(200); expect(assetsState.snapshot.isLoaded).toBeTruthy(); expect(assetsState.snapshot.isLoading).toBeFalsy(); + expect(assetsState.snapshot.total).toEqual(200); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); @@ -104,7 +104,7 @@ describe('AssetsState', () => { assetsService.setup(x => x.getAssets(app, { take: 30, skip: 30, parentId: MathHelper.EMPTY_GUID })) .returns(() => of(new AssetsDto(200, []))).verifiable(); - assetsState.setPager(new Pager(200, 1, 30)).subscribe(); + assetsState.page({ page: 1, pageSize: 30 }).subscribe(); expect().nothing(); }); @@ -165,7 +165,7 @@ describe('AssetsState', () => { assetsState.search(query).subscribe(); - expect(assetsState.snapshot.assetsQuery).toEqual(query); + expect(assetsState.snapshot.query).toEqual(query); }); }); @@ -177,6 +177,9 @@ describe('AssetsState', () => { assetsService.setup(x => x.getAssets(app, { take: 30, skip: 0, parentId: MathHelper.EMPTY_GUID })) .returns(() => of(new AssetsDto(200, [asset1, asset2]))).verifiable(); + assetsService.setup(x => x.getAssets(app, { take: 2, skip: 0, parentId: MathHelper.EMPTY_GUID })) + .returns(() => of(new AssetsDto(200, [asset1, asset2]))); + assetsState.load(true).subscribe(); }); @@ -186,7 +189,17 @@ describe('AssetsState', () => { assetsState.addAsset(newAsset); expect(assetsState.snapshot.assets).toEqual([newAsset, asset1, asset2]); - expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(201); + expect(assetsState.snapshot.total).toBe(201); + }); + + it('should truncate assets when page size reached', () => { + const newAsset = createAsset(5, ['new']); + + assetsState.page({ page: 0, pageSize: 2 }).subscribe(); + assetsState.addAsset(newAsset); + + expect(assetsState.snapshot.assets).toEqual([newAsset, asset1]); + expect(assetsState.snapshot.total).toBe(201); }); it('should not add asset to snapshot when parent id is not the same', () => { @@ -195,7 +208,7 @@ describe('AssetsState', () => { assetsState.addAsset(newAsset); expect(assetsState.snapshot.assets).toEqual([asset1, asset2]); - expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(200); + expect(assetsState.snapshot.total).toBe(200); }); it('should increment tags when asset added', () => { @@ -213,7 +226,7 @@ describe('AssetsState', () => { assetsState.createAssetFolder(request.folderName); - expect(assetsState.snapshot.assetFolders).toEqual([newAssetFolder, assetFolder1, assetFolder2]); + expect(assetsState.snapshot.folders).toEqual([newAssetFolder, assetFolder1, assetFolder2]); }); it('should add asset folder when path has changed', () => { @@ -226,7 +239,7 @@ describe('AssetsState', () => { assetsState.createAssetFolder(request.folderName); - expect(assetsState.snapshot.assetFolders).toEqual([assetFolder1, assetFolder2]); + expect(assetsState.snapshot.folders).toEqual([assetFolder1, assetFolder2]); }); it('should update asset when updated', () => { @@ -255,7 +268,7 @@ describe('AssetsState', () => { assetsState.updateAssetFolder(assetFolder1, request); - const assetFolder1New = assetsState.snapshot.assetFolders[0]; + const assetFolder1New = assetsState.snapshot.folders[0]; expect(assetFolder1New).toEqual(updated); }); @@ -269,7 +282,7 @@ describe('AssetsState', () => { assetsState.moveAsset(asset1, request.parentId).subscribe(); expect(assetsState.snapshot.assets.length).toBe(1); - expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(200); + expect(assetsState.snapshot.total).toBe(200); }); it('should not do anything when moving asset to current parent', () => { @@ -278,7 +291,7 @@ describe('AssetsState', () => { assetsState.moveAsset(asset1, request.parentId).pipe(onErrorResumeNext()).subscribe(); expect(assetsState.snapshot.assets.length).toBe(2); - expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(200); + expect(assetsState.snapshot.total).toBe(200); }); it('should move asset back to snapshot when moving via api failed', () => { @@ -290,7 +303,7 @@ describe('AssetsState', () => { assetsState.moveAsset(asset1, request.parentId).pipe(onErrorResumeNext()).subscribe(); expect(assetsState.snapshot.assets.length).toBe(2); - expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(200); + expect(assetsState.snapshot.total).toBe(200); }); it('should remove asset folder from snapshot when moved to other folder', () => { @@ -301,7 +314,7 @@ describe('AssetsState', () => { assetsState.moveAssetFolder(assetFolder1, request.parentId).subscribe(); - expect(assetsState.snapshot.assetFolders.length).toBe(1); + expect(assetsState.snapshot.folders.length).toBe(1); }); it('should not do anything when moving asset folder to itself', () => { @@ -338,7 +351,7 @@ describe('AssetsState', () => { assetsState.deleteAsset(asset1).subscribe(); expect(assetsState.snapshot.assets.length).toBe(1); - expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(199); + expect(assetsState.snapshot.total).toBe(199); expect(assetsState.snapshot.tagsAvailable).toEqual({ shared: 1, tag2: 1 }); }); @@ -355,7 +368,7 @@ describe('AssetsState', () => { assetsState.deleteAsset(asset1).subscribe(); expect(assetsState.snapshot.assets.length).toBe(1); - expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(199); + expect(assetsState.snapshot.total).toBe(199); expect(assetsState.snapshot.tagsAvailable).toEqual({ shared: 1, tag2: 1 }); }); @@ -377,7 +390,7 @@ describe('AssetsState', () => { assetsState.deleteAssetFolder(assetFolder1).subscribe(); - expect(assetsState.snapshot.assetFolders.length).toBe(1); + expect(assetsState.snapshot.folders.length).toBe(1); }); }); }); \ No newline at end of file diff --git a/frontend/app/shared/state/assets.state.ts b/frontend/app/shared/state/assets.state.ts index f654c72db..f4c9f9acd 100644 --- a/frontend/app/shared/state/assets.state.ts +++ b/frontend/app/shared/state/assets.state.ts @@ -6,10 +6,10 @@ */ import { Injectable } from '@angular/core'; -import { compareStrings, DialogService, ErrorDto, MathHelper, Pager, shareSubscribed, State, StateSynchronizer } from '@app/framework'; +import { compareStrings, DialogService, ErrorDto, getPagingInfo, ListState, MathHelper, shareSubscribed, State, StateSynchronizer } from '@app/framework'; import { EMPTY, forkJoin, Observable, of, throwError } from 'rxjs'; import { catchError, finalize, switchMap, tap } from 'rxjs/operators'; -import { AnnotateAssetDto, AssetDto, AssetFolderDto, AssetsService, RenameAssetFolderDto } from './../services/assets.service'; +import { AnnotateAssetDto, AssetDto, AssetFolderDto, AssetFoldersDto, AssetsService, RenameAssetFolderDto } from './../services/assets.service'; import { AppsState } from './apps.state'; import { Query, QueryFullTextSynchronizer } from './query'; @@ -19,28 +19,22 @@ export type TagsAvailable = { [name: string]: number }; export type TagsSelected = { [name: string]: boolean }; export type Tag = { name: string, count: number; }; -const EMPTY_FOLDERS: { canCreate: boolean, items: ReadonlyArray, path?: ReadonlyArray } = { canCreate: false, items: [] }; - export const ROOT_ITEM: AssetPathItem = { id: MathHelper.EMPTY_GUID, folderName: 'i18n:assets.specialFolder.root' }; -interface Snapshot { +const EMPTY_FOLDERS: AssetFoldersDto = { canCreate: false, items: [] } as any; + +interface Snapshot extends ListState { + // The current assets. + assets: ReadonlyArray; + // All assets tags. tagsAvailable: TagsAvailable; // The selected asset tags. tagsSelected: TagsSelected; - // The current assets. - assets: ReadonlyArray; - // The current asset folders. - assetFolders: ReadonlyArray; - - // The pagination information. - assetsPager: Pager; - - // The query to filter assets. - assetsQuery?: Query; + folders: ReadonlyArray; // The folder path. path: ReadonlyArray; @@ -51,12 +45,6 @@ interface Snapshot { // Indicates if the assets are loaded once. isLoadedOnce?: boolean; - // Indicates if the assets are loaded. - isLoaded?: boolean; - - // Indicates if the assets are loading. - isLoading?: boolean; - // Indicates if the user can create assets. canCreate?: boolean; @@ -73,7 +61,7 @@ export class AssetsState extends State { this.project(x => x.tagsSelected); public tags = - this.projectFrom(this.tagsUnsorted, x => sort(x)); + this.projectFrom(this.tagsUnsorted, getSortedTags); public tagsNames = this.projectFrom(this.tagsUnsorted, x => Object.keys(x)); @@ -84,14 +72,17 @@ export class AssetsState extends State { public assets = this.project(x => x.assets); - public assetFolders = - this.project(x => x.assetFolders); + public paging = + this.project(x => getPagingInfo(x, x.assets.length)); + + public query = + this.project(x => x.query); - public assetsQuery = - this.project(x => x.assetsQuery); + public folders = + this.project(x => x.folders); - public assetsPager = - this.project(x => x.assetsPager); + public hasFolders = + this.project(x => x.folders.length > 0); public isLoaded = this.project(x => x.isLoaded === true); @@ -120,22 +111,24 @@ export class AssetsState extends State { private readonly dialogs: DialogService ) { super({ - assetFolders: [], + folders: [], assets: [], - assetsPager: new Pager(0, 0, 30), + page: 0, + pageSize: 30, parentId: ROOT_ITEM.id, path: [ROOT_ITEM], tagsAvailable: {}, - tagsSelected: {} + tagsSelected: {}, + total: 0 }); } public loadAndListen(synchronizer: StateSynchronizer) { synchronizer.mapTo(this) - .withPager('assetsPager', 'assets', 20) + .withPaging('assets', 30) .withString('parentId', 'parent') .withStrings('tagsSelected', 'tags') - .withSynchronizer('assetsQuery', QueryFullTextSynchronizer.INSTANCE) + .withSynchronizer(QueryFullTextSynchronizer.INSTANCE) .whenSynced(() => this.loadInternal(false)) .build(); } @@ -151,62 +144,63 @@ export class AssetsState extends State { private loadInternal(isReload: boolean): Observable { this.next({ isLoading: true }); - const query: any = { - take: this.snapshot.assetsPager.pageSize, - skip: this.snapshot.assetsPager.skip - }; + const { page, pageSize, query, tagsSelected } = this.snapshot; - const withQuery = hasQuery(this.snapshot); + const q: any = { take: pageSize, skip: pageSize * page }; - if (withQuery) { - if (this.snapshot.assetsQuery) { - query.query = this.snapshot.assetsQuery; + const hasQuery = !!query?.fullText || Object.keys(tagsSelected).length > 0; + + if (hasQuery) { + if (query) { + q.query = query; } const searchTags = Object.keys(this.snapshot.tagsSelected); if (searchTags.length > 0) { - query.tags = searchTags; + q.tags = searchTags; } } else { - query.parentId = this.snapshot.parentId; + q.parentId = this.snapshot.parentId; } const assets$ = - this.assetsService.getAssets(this.appName, query); + this.assetsService.getAssets(this.appName, q); const assetFolders$ = - !withQuery ? + !hasQuery ? this.assetsService.getAssetFolders(this.appName, this.snapshot.parentId) : of(EMPTY_FOLDERS); const tags$ = - !withQuery || !this.snapshot.isLoadedOnce ? + !hasQuery || !this.snapshot.isLoadedOnce ? this.assetsService.getTags(this.appName) : of(this.snapshot.tagsAvailable); return forkJoin(([assets$, assetFolders$, tags$])).pipe( - tap(([assets, assetFolders, tagsAvailable]) => { + tap(([assetsResult, foldersResult, tagsAvailable]) => { if (isReload) { this.dialogs.notifyInfo('i18n:assets.reloaded'); } - const path = assetFolders.path ? - [ROOT_ITEM, ...assetFolders.path] : + const path = foldersResult.path ? + [ROOT_ITEM, ...foldersResult.path] : []; + const { items: assets, total } = assetsResult; + this.next(s => ({ ...s, - assetFolders: assetFolders.items, - assets: assets.items, - assetsPager: s.assetsPager.setCount(assets.total), - canCreate: assets.canCreate, - canCreateFolders: assetFolders.canCreate, + assets, + folders: foldersResult.items, + canCreate: assetsResult.canCreate, + canCreateFolders: foldersResult.canCreate, isLoaded: true, isLoadedOnce: true, isLoading: false, path, - tagsAvailable + tagsAvailable, + total })); }), finalize(() => { @@ -221,26 +215,25 @@ export class AssetsState extends State { } this.next(s => { - const assets = [asset, ...s.assets]; - const assetsPager = s.assetsPager.incrementCount(); + const assets = [asset, ...s.assets].slice(0, s.pageSize); const tags = updateTags(s, asset); - return { ...s, assets, assetsPager, ...tags }; + return { ...s, assets, total: s.total + 1, ...tags }; }); } public createAssetFolder(folderName: string) { return this.assetsService.postAssetFolder(this.appName, { folderName, parentId: this.snapshot.parentId }).pipe( - tap(assetFolder => { - if (assetFolder.parentId !== this.snapshot.parentId) { + tap(folder => { + if (folder.parentId !== this.snapshot.parentId) { return; } this.next(s => { - const assetFolders = [...s.assetFolders, assetFolder].sortedByString(x => x.folderName); + const folders = [...s.folders, folder].sortedByString(x => x.folderName); - return { ...s, assetFolders }; + return { ...s, folders }; }); }), shareSubscribed(this.dialogs)); @@ -260,13 +253,13 @@ export class AssetsState extends State { shareSubscribed(this.dialogs, { silent: true })); } - public updateAssetFolder(assetFolder: AssetFolderDto, request: RenameAssetFolderDto) { - return this.assetsService.putAssetFolder(this.appName, assetFolder, request, assetFolder.version).pipe( + public updateAssetFolder(folder: AssetFolderDto, request: RenameAssetFolderDto) { + return this.assetsService.putAssetFolder(this.appName, folder, request, folder.version).pipe( tap(updated => { this.next(s => { - const assetFolders = s.assetFolders.replaceBy('id', updated); + const folders = s.folders.replaceBy('id', updated); - return { ...s, assetFolders }; + return { ...s, folders }; }); }), shareSubscribed(this.dialogs, { silent: true })); @@ -296,23 +289,23 @@ export class AssetsState extends State { shareSubscribed(this.dialogs)); } - public moveAssetFolder(assetFolder: AssetFolderDto, parentId?: string) { - if (assetFolder.id === parentId || assetFolder.parentId === parentId) { + public moveAssetFolder(folder: AssetFolderDto, parentId?: string) { + if (folder.id === parentId || folder.parentId === parentId) { return EMPTY; } this.next(s => { - const assetFolders = s.assetFolders.filter(x => x.id !== assetFolder.id); + const folders = s.folders.filter(x => x.id !== folder.id); - return { ...s, assetFolders }; + return { ...s, folders }; }); - return this.assetsService.putAssetItemParent(this.appName, assetFolder, { parentId }, assetFolder.version).pipe( + return this.assetsService.putAssetItemParent(this.appName, folder, { parentId }, folder.version).pipe( catchError(error => { this.next(s => { - const assetFolders = [...s.assetFolders, assetFolder].sortedByString(x => x.folderName); + const folders = [...s.folders, folder].sortedByString(x => x.folderName); - return { ...s, assetFolders }; + return { ...s, folders }; }); return throwError(error); @@ -344,54 +337,35 @@ export class AssetsState extends State { tap(() => { this.next(s => { const assets = s.assets.filter(x => x.id !== asset.id); - const assetsPager = s.assetsPager.decrementCount(); const tags = updateTags(s, undefined, asset); - return { ...s, assets, assetsPager, ...tags }; + return { ...s, assets, total: s.total - 1, ...tags }; }); }), shareSubscribed(this.dialogs)); } - public deleteAssetFolder(assetFolder: AssetFolderDto): Observable { - return this.assetsService.deleteAssetItem(this.appName, assetFolder, false, assetFolder.version).pipe( + public deleteAssetFolder(folder: AssetFolderDto): Observable { + return this.assetsService.deleteAssetItem(this.appName, folder, false, folder.version).pipe( tap(() => { this.next(s => { - const assetFolders = s.assetFolders.filter(x => x.id !== assetFolder.id); + const folders = s.folders.filter(x => x.id !== folder.id); - return { ...s, assetFolders }; + return { ...s, folders }; }); }), shareSubscribed(this.dialogs)); } public navigate(parentId: string) { - this.next({ parentId, assetsQuery: undefined, tagsSelected: {} }); + this.next({ parentId, query: undefined, tagsSelected: {} }); return this.loadInternal(false); } - public setPager(assetsPager: Pager) { - this.next({ assetsPager }); - - return this.loadInternal(false); - } - - public searchInternal(query?: Query | null, tags?: TagsSelected) { - this.next(s => { - const newState = { ...s, assetsPager: s.assetsPager.reset() }; - - if (query !== null) { - newState.assetsQuery = query; - } - - if (tags) { - newState.tagsSelected = tags; - } - - return newState; - }); + public page(paging: { page: number, pageSize: number }) { + this.next(paging); return this.loadInternal(false); } @@ -426,6 +400,24 @@ export class AssetsState extends State { return this.searchInternal(query); } + private searchInternal(query?: Query | null, tags?: TagsSelected) { + this.next(s => { + const newState = { ...s, page: 0 }; + + if (query !== null) { + newState.query = query; + } + + if (tags) { + newState.tagsSelected = tags; + } + + return newState; + }); + + return this.loadInternal(false); + } + public get parentId() { return this.snapshot.parentId; } @@ -467,16 +459,16 @@ function updateTags(snapshot: Snapshot, newAsset?: AssetDto, oldAsset?: AssetDto return { tagsAvailable, tagsSelected }; } -function sort(tags: { [name: string]: number }) { - return Object.keys(tags).sort(compareStrings).map(name => ({ name, count: tags[name] })); -} - -function hasQuery(state: Snapshot) { - return (state.assetsQuery && !!state.assetsQuery.fullText) || Object.keys(state.tagsSelected).length > 0; +function getParent(path: ReadonlyArray) { + if (path.length > 1) { + return { folderName: 'i18n:assets.specialFolder.parent', id: path[path.length - 2].id }; + } else { + return undefined; + } } -function getParent(path: ReadonlyArray) { - return path.length > 1 ? { folderName: 'i18n:assets.specialFolder.parent', id: path[path.length - 2].id } : undefined; +function getSortedTags(tags: { [name: string]: number }) { + return Object.keys(tags).sort(compareStrings).map(name => ({ name, count: tags[name] })); } @Injectable() diff --git a/frontend/app/shared/state/contents.forms.ts b/frontend/app/shared/state/contents.forms.ts index 9f58bf89f..ed534bb32 100644 --- a/frontend/app/shared/state/contents.forms.ts +++ b/frontend/app/shared/state/contents.forms.ts @@ -157,7 +157,7 @@ export class EditContentForm extends Form { } public hasChanges(changes: any) { - return !Types.equals(changes, this.value, true); + return !Types.equals(this.initialData, changes, true); } public load(value: any, isInitial?: boolean) { diff --git a/frontend/app/shared/state/contents.state.ts b/frontend/app/shared/state/contents.state.ts index e857570ed..f942084e3 100644 --- a/frontend/app/shared/state/contents.state.ts +++ b/frontend/app/shared/state/contents.state.ts @@ -6,33 +6,24 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, ErrorDto, Pager, shareSubscribed, State, StateSynchronizer, Types, Version, Versioned } from '@app/framework'; -import { EMPTY, forkJoin, Observable, of } from 'rxjs'; +import { DialogService, getPagingInfo, ListState, shareSubscribed, State, StateSynchronizer, Types, Version, Versioned } from '@app/framework'; +import { EMPTY, Observable, of } from 'rxjs'; import { catchError, finalize, map, switchMap, tap } from 'rxjs/operators'; -import { ContentDto, ContentsService, StatusInfo } from './../services/contents.service'; -import { SchemaDto } from './../services/schemas.service'; +import { BulkResultDto, BulkUpdateJobDto, ContentDto, ContentsDto, ContentsService, StatusInfo } from './../services/contents.service'; import { AppsState } from './apps.state'; import { SavedQuery } from './queries'; import { Query, QuerySynchronizer } from './query'; import { SchemasState } from './schemas.state'; -type Updated = { content: ContentDto, error?: ErrorDto }; - -interface Snapshot { - // The current comments. +interface Snapshot extends ListState { + // The current contents. contents: ReadonlyArray; - // The pagination information. - contentsPager: Pager; - - // The query to filter and sort contents. - contentsQuery?: Query; + // The referencing content id. + referencing?: string; - // Indicates if the contents are loaded. - isLoaded?: boolean; - - // Indicates if the contents are loading. - isLoading?: boolean; + // The reference content id. + reference?: string; // The statuses. statuses?: ReadonlyArray; @@ -40,6 +31,9 @@ interface Snapshot { // The selected content. selectedContent?: ContentDto | null; + // The validation results. + validationResults: { [id: string]: boolean }; + // Indicates if the user can create a content. canCreate?: boolean; @@ -54,11 +48,14 @@ export abstract class ContentsStateBase extends State { public contents = this.project(x => x.contents); - public contentsPager = - this.project(x => x.contentsPager); + public paging = + this.project(x => getPagingInfo(x, x.contents.length)); - public contentsQuery = - this.project(x => x.contentsQuery); + public query = + this.project(x => x.query); + + public validationResults = + this.project(x => x.validationResults); public isLoaded = this.project(x => x.isLoaded === true); @@ -79,7 +76,7 @@ export abstract class ContentsStateBase extends State { this.project(x => x.statuses); public statusQueries = - this.projectFrom(this.statuses, x => buildStatusQueries(x)); + this.projectFrom(this.statuses, buildStatusQueries); public get appName() { return this.appsState.appName; @@ -96,7 +93,10 @@ export abstract class ContentsStateBase extends State { ) { super({ contents: [], - contentsPager: new Pager(0) + page: 0, + pageSize: 10, + total: 0, + validationResults: {} }); } @@ -127,12 +127,24 @@ export abstract class ContentsStateBase extends State { public loadAndListen(synchronizer: StateSynchronizer) { synchronizer.mapTo(this) .keep('selectedContent') - .withPager('contentsPager', 'contents', 10) - .withSynchronizer('contentsQuery', QuerySynchronizer.INSTANCE) + .withPaging('contents', 10) + .withSynchronizer(QuerySynchronizer.INSTANCE) .whenSynced(() => this.loadInternal(false)) .build(); } + public loadReference(contentId: string) { + this.resetState({ reference: contentId }); + + return this.loadInternal(false); + } + + public loadReferencing(contentId: string) { + this.resetState({ referencing: contentId }); + + return this.loadInternal(false); + } + public load(isReload = false): Observable { if (!isReload) { this.resetState({ selectedContent: this.snapshot.selectedContent }); @@ -160,24 +172,31 @@ export abstract class ContentsStateBase extends State { this.next({ isLoading: true }); - const query: any = { - take: this.snapshot.contentsPager.pageSize, - skip: this.snapshot.contentsPager.skip - }; + const { page, pageSize, query, reference, referencing } = this.snapshot; + + const q: any = { take: pageSize, skip: pageSize * page }; - if (this.snapshot.contentsQuery) { - query.query = this.snapshot.contentsQuery; + if (query) { + q.query = query; } - return this.contentsService.getContents(this.appName, this.schemaName, query).pipe( + let content$: Observable; + + if (referencing) { + content$ = this.contentsService.getContentReferencing(this.appName, this.schemaName, referencing, q); + } else if (reference) { + content$ = this.contentsService.getContentReferences(this.appName, this.schemaName, reference, q); + } else { + content$ = this.contentsService.getContents(this.appName, this.schemaName, q); + } + + return content$.pipe( tap(({ total, items: contents, canCreate, canCreateAndPublish, statuses }) => { if (isReload) { this.dialogs.notifyInfo('i18n:contents.reloaded'); } return this.next(s => { - const contentsPager = s.contentsPager.setCount(total); - statuses = s.statuses || statuses; let selectedContent = s.selectedContent; @@ -186,15 +205,16 @@ export abstract class ContentsStateBase extends State { selectedContent = contents.find(x => x.id === selectedContent!.id) || selectedContent; } - return { ...s, + return { + ...s, canCreate, canCreateAndPublish, - contents, - contentsPager, isLoaded: true, isLoading: false, + contents, selectedContent, - statuses + statuses, + total }; }); }), @@ -214,114 +234,51 @@ export abstract class ContentsStateBase extends State { this.dialogs.notifyInfo('i18n:contents.created'); return this.next(s => { - const contents = [payload, ...s.contents]; - const contentsPager = s.contentsPager.incrementCount(); + const contents = [payload, ...s.contents].slice(s.pageSize); - return { ...s, contents, contentsPager }; + return { ...s, contents, total: s.total + 1 }; }); }), - shareSubscribed(this.dialogs, {silent: true})); + shareSubscribed(this.dialogs, { silent: true })); } - public changeManyStatus(contentsToChange: ReadonlyArray, status: string, dueTime: string | null): Observable { - return this.changeManyStatusCore(contentsToChange, status, true, dueTime).pipe( - switchMap(results => { - const referenced = results.filter(x => x.error?.statusCode === 400).map(x => x.content); - - if (referenced.length > 0) { - return this.dialogs.confirm( - 'i18n:contents.unpublishReferrerConfirmTitle', - 'i18n:contents.unpublishReferrerConfirmText', - 'unpublishReferencngContent' - ).pipe( - switchMap(confirmed => { - if (confirmed) { - return this.changeManyStatusCore(referenced, status, false, dueTime); - } else { - return of([]); - } - }) - ); - } else { - return of(results); - } - }), - tap(results => { - const errors = results.filter(x => !!x.error); - - if (errors.length > 0) { - const errror = errors[0].error!; - - if (errors.length === contentsToChange.length) { - throw errror; - } else { - this.dialogs.notifyError(errror); - } - } + public validate(contents: ReadonlyArray): Observable { + const job: Partial = { type: 'Validate' }; - this.next(s => { - let contents = s.contents; + return this.bulkMany(contents, false, job).pipe( + tap(results => { + return this.next(s => { + const validationResults = { ...s.validationResults || {} }; - for (const updated of results.filter(x => !x.error).map(x => x.content)) { - contents = contents.replaceBy('id', updated); + for (const result of results) { + validationResults[result.contentId] = !result.error; } - return { ...s, contents }; + return { ...s, validationResults }; }); }), - shareSubscribed(this.dialogs)); + shareSubscribed(this.dialogs, { silent: true })); } - public deleteMany(contentsToDelete: ReadonlyArray) { - return this.deleteManyCore(contentsToDelete, true).pipe( - switchMap(results => { - const referenced = results.filter(x => x.error?.statusCode === 400).map(x => x.content); - - if (referenced.length > 0) { - return this.dialogs.confirm( - 'i18n:contents.deleteReferrerConfirmTitle', - 'i18n:contents.deleteReferrerConfirmText', - 'deleteReferencingContent' - ).pipe( - switchMap(confirmed => { - if (confirmed) { - return this.deleteManyCore(referenced, false); - } else { - return of([]); - } - }) - ); - } else { - return of(results); - } - }), - tap(results => { - const errors = results.filter(x => !!x.error); - - if (errors.length > 0) { - const errror = errors[0].error!; - - if (errors.length === contentsToDelete.length) { - throw errror; - } else { - this.dialogs.notifyError(errror); - } - } + public changeManyStatus(contents: ReadonlyArray, status: string, dueTime?: string | null): Observable { + const job: Partial = { type: 'ChangeStatus', status, dueTime }; - this.next(s => { - let contents = s.contents; - let contentsPager = s.contentsPager; + return this.bulkWithRetry(contents, job, + 'i18n:contents.unpublishReferrerConfirmTitle', + 'i18n:contents.unpublishReferrerConfirmText', + 'unpublishReferencngContent').pipe( + switchMap(() => this.loadInternalCore(false)), shareSubscribed(this.dialogs)); + } - for (const content of results.filter(x => !x.error).map(x => x.content)) { - contents = contents.filter(x => x.id !== content.id); - contentsPager = contentsPager.decrementCount(); - } + public deleteMany(contents: ReadonlyArray) { + const job: Partial = { type: 'Delete' }; - return { ...s, contents, contentsPager }; - }); - }), - shareSubscribed(this.dialogs, { silent: true })); - } + return this.bulkWithRetry(contents, job, + 'i18n:contents.deleteReferrerConfirmTitle', + 'i18n:contents.deleteReferrerConfirmText', + 'deleteReferencngContent').pipe( + switchMap(() => this.loadInternalCore(false)), shareSubscribed(this.dialogs)); +} public update(content: ContentDto, request: any): Observable { return this.contentsService.putContent(this.appName, content, request, content.version).pipe( @@ -355,14 +312,14 @@ export abstract class ContentsStateBase extends State { shareSubscribed(this.dialogs)); } - public search(contentsQuery?: Query): Observable { - this.next(s => ({ ...s, contentsPager: s.contentsPager.reset(), contentsQuery })); + public search(query?: Query): Observable { + this.next({ query, page: 0 }); return this.loadInternal(false); } - public setPager(contentsPager: Pager) { - this.next(s => ({ ...s, contentsPager })); + public page(paging: { page: number, pageSize: number }) { + this.next(paging); return this.loadInternal(false); } @@ -378,36 +335,66 @@ export abstract class ContentsStateBase extends State { const selectedContent = s.selectedContent && - s.selectedContent.id === content.id ? - content : - s.selectedContent; + s.selectedContent.id === content.id ? + content : + s.selectedContent; return { ...s, contents, selectedContent }; }); } } - private deleteManyCore(contents: ReadonlyArray, checkReferrers: boolean): Observable> { - return forkJoin( - contents.map(c => this.deleteCore(c, checkReferrers))); - } + private bulkWithRetry(contents: ReadonlyArray, job: Partial, confirmTitle: string, confirmText: string, confirmKey: string): Observable> { + return this.bulkMany(contents, true, job).pipe( + switchMap(results => { + const failed = contents.filter(x => results.find(r => r.contentId === x.id)?.error?.statusCode === 400); - private changeManyStatusCore(contents: ReadonlyArray, status: string, checkReferrers: boolean, dueTime: string | null): Observable> { - return forkJoin( - contents.map(c => this.changeStatusCore(c, status, checkReferrers, dueTime))); - } + if (failed.length > 0) { + return this.dialogs.confirm(confirmTitle, confirmText, confirmKey).pipe( + switchMap(confirmed => { + if (confirmed) { + return this.bulkMany(failed, false, job); + } else { + return of([]); + } + }), + map(results2 => { + return [...results, ...results2]; + }) + ); + } else { + return of(results); + } + }), + tap(results => { + const errors = results.filter(x => !!x.error); - private deleteCore(content: ContentDto, checkReferrers: boolean): Observable { - return this.contentsService.deleteContent(this.appName, content, checkReferrers, content.version).pipe( - map(() => ({ content })), catchError(error => of({ content, error }))); - } + if (errors.length > 0) { + const errror = errors[0].error!; - private changeStatusCore(content: ContentDto, status: string, checkReferrers: boolean, dueTime: string | null): Observable { - return this.contentsService.putStatus(this.appName, content, status, checkReferrers, dueTime, content.version).pipe( - map(x => ({ content: x })), catchError(error => of({ content, error }))); + if (errors.length >= contents.length) { + throw errror; + } else { + this.dialogs.notifyError(errror); + } + } + })); } - public abstract get schemaId(): string; + private bulkMany(contents: ReadonlyArray, checkReferrers: boolean, job: Partial): Observable> { + const update = { + jobs: contents.map(x => ({ + id: x.id, + schema: x.schemaName, + status: undefined, + expectedVersion: parseInt(x.version.value, 10), + ...job + })), + checkReferrers + }; + + return this.contentsService.bulkUpdate(this.appName, this.schemaName, update as any); + } public abstract get schemaName(): string; } @@ -420,10 +407,6 @@ export class ContentsState extends ContentsStateBase { super(appsState, contentsService, dialogs); } - public get schemaId() { - return this.schemasState.schemaId; - } - public get schemaName() { return this.schemasState.schemaName; } @@ -431,7 +414,7 @@ export class ContentsState extends ContentsStateBase { @Injectable() export class ManualContentsState extends ContentsStateBase { - public schema: SchemaDto; + public schema: { name: string }; constructor( appsState: AppsState, contentsService: ContentsService, dialogs: DialogService @@ -439,17 +422,13 @@ export class ManualContentsState extends ContentsStateBase { super(appsState, contentsService, dialogs); } - public get schemaId() { - return this.schema.id; - } - public get schemaName() { return this.schema.name; } } function buildStatusQueries(statuses: ReadonlyArray | undefined): ReadonlyArray { - return statuses?.map(s => buildStatusQuery(s)) || []; + return statuses?.map(buildStatusQuery) || []; } function buildStatusQuery(s: StatusInfo) { diff --git a/frontend/app/shared/state/contributors.state.spec.ts b/frontend/app/shared/state/contributors.state.spec.ts index 794962a54..1d9ea1f4c 100644 --- a/frontend/app/shared/state/contributors.state.spec.ts +++ b/frontend/app/shared/state/contributors.state.spec.ts @@ -6,7 +6,7 @@ */ import { ErrorDto } from '@app/framework'; -import { ContributorDto, ContributorsPayload, ContributorsService, ContributorsState, DialogService, Pager, versioned } from '@app/shared/internal'; +import { ContributorDto, ContributorsPayload, ContributorsService, ContributorsState, DialogService, versioned } from '@app/shared/internal'; import { EMPTY, of, throwError } from 'rxjs'; import { catchError, onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; @@ -53,9 +53,9 @@ describe('ContributorsState', () => { contributorsState.load().subscribe(); expect(contributorsState.snapshot.contributors).toEqual(oldContributors.items); - expect(contributorsState.snapshot.contributorsPager).toEqual(new Pager(20, 0, 10)); expect(contributorsState.snapshot.isLoaded).toBeTruthy(); expect(contributorsState.snapshot.isLoading).toBeFalsy(); + expect(contributorsState.snapshot.total).toEqual(20); expect(contributorsState.snapshot.maxContributors).toBe(oldContributors.maxContributors); expect(contributorsState.snapshot.version).toEqual(version); @@ -83,26 +83,28 @@ describe('ContributorsState', () => { let contributors: ReadonlyArray; - contributorsState.contributorsPaged.subscribe(result => { + contributorsState.contributorsFiltered.subscribe(result => { contributors = result; }); expect(contributors!).toEqual(oldContributors.items.slice(0, 10)); - expect(contributorsState.snapshot.contributorsPager).toEqual(new Pager(20, 0, 10)); + expect(contributorsState.snapshot.page).toEqual(0); + expect(contributorsState.snapshot.pageSize).toEqual(10); }); it('should show with new pagination when paging', () => { contributorsState.load().subscribe(); - contributorsState.setPager(new Pager(20, 1, 10)); + contributorsState.page({ page: 1, pageSize: 10 }); let contributors: ReadonlyArray; - contributorsState.contributorsPaged.subscribe(result => { + contributorsState.contributorsFiltered.subscribe(result => { contributors = result; }); expect(contributors!).toEqual(oldContributors.items.slice(10, 20)); - expect(contributorsState.snapshot.contributorsPager).toEqual(new Pager(20, 1, 10)); + expect(contributorsState.snapshot.page).toEqual(1); + expect(contributorsState.snapshot.pageSize).toEqual(10); }); it('should show filtered contributors when searching', () => { @@ -111,12 +113,13 @@ describe('ContributorsState', () => { let contributors: ReadonlyArray; - contributorsState.contributorsPaged.subscribe(result => { + contributorsState.contributorsFiltered.subscribe(result => { contributors = result; }); expect(contributors!).toEqual(createContributors(4, 14).items); - expect(contributorsState.snapshot.contributorsPager.page).toEqual(0); + expect(contributorsState.snapshot.page).toEqual(0); + expect(contributorsState.snapshot.pageSize).toEqual(10); }); it('should load when synchronizer triggered', () => { diff --git a/frontend/app/shared/state/contributors.state.ts b/frontend/app/shared/state/contributors.state.ts index 5155bde44..7ed09a4b5 100644 --- a/frontend/app/shared/state/contributors.state.ts +++ b/frontend/app/shared/state/contributors.state.ts @@ -6,31 +6,19 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, ErrorDto, Pager, shareMapSubscribed, shareSubscribed, State, StateSynchronizer, Types, Version } from '@app/framework'; +import { DialogService, ErrorDto, getPagingInfo, ListState, shareMapSubscribed, shareSubscribed, State, StateSynchronizer, Types, Version } from '@app/framework'; import { EMPTY, Observable, throwError } from 'rxjs'; import { catchError, finalize, tap } from 'rxjs/operators'; import { AssignContributorDto, ContributorDto, ContributorsPayload, ContributorsService } from './../services/contributors.service'; import { AppsState } from './apps.state'; -interface Snapshot { - // All loaded contributors. - contributors: ContributorsList; - - // The pagination information. - contributorsPager: Pager; - - // Indicates if the contributors are loaded. - isLoaded?: boolean; - - // Indicates if the contributors are loading. - isLoading?: boolean; +interface Snapshot extends ListState { + // The current contributors. + contributors: ReadonlyArray; // The maximum allowed users. maxContributors: number; - // The search query. - query?: string; - // The app version. version: Version; @@ -38,18 +26,19 @@ interface Snapshot { canCreate?: boolean; } -type ContributorsList = ReadonlyArray; - @Injectable() export class ContributorsState extends State { public contributors = this.project(x => x.contributors); + public paging = + this.project(x => getPagingInfo(x, x.contributors.length)); + public query = this.project(x => x.query); public queryRegex = - this.projectFrom(this.query, q => q ? new RegExp(q, 'i') : undefined); + this.projectFrom(this.query, x => x ? new RegExp(x, 'i') : undefined); public maxContributors = this.project(x => x.maxContributors); @@ -63,14 +52,8 @@ export class ContributorsState extends State { public canCreate = this.project(x => x.canCreate === true); - public filtered = - this.projectFrom2(this.queryRegex, this.contributors, (q, c) => getFilteredContributors(c, q)); - - public contributorsPager = - this.project(x => x.contributorsPager); - - public contributorsPaged = - this.projectFrom2(this.contributorsPager, this.filtered, (p, c) => getPagedContributors(c, p)); + public contributorsFiltered = + this.project(getFilteredContributors); public get appId() { return this.appsState.appId; @@ -83,8 +66,10 @@ export class ContributorsState extends State { ) { super({ contributors: [], - contributorsPager: new Pager(0), maxContributors: -1, + page: 0, + pageSize: 10, + total: 0, version: Version.EMPTY }); } @@ -92,7 +77,7 @@ export class ContributorsState extends State { public loadAndListen(synchronizer: StateSynchronizer) { synchronizer.mapTo(this) .withString('query', 'q') - .withPager('contributorsPager', 'contributors', 10) + .withPaging('contributors', 10) .whenSynced(() => this.loadInternal(false)) .build(); } @@ -107,9 +92,7 @@ export class ContributorsState extends State { public load(isReload = false): Observable { if (!isReload) { - const contributorsPager = this.snapshot.contributorsPager.reset(); - - this.resetState({ contributorsPager }); + this.resetState({ page: 0 }); } return this.loadInternal(isReload); @@ -132,12 +115,12 @@ export class ContributorsState extends State { shareSubscribed(this.dialogs)); } - public setPager(contributorsPager: Pager) { - this.next(s => ({ ...s, contributorsPager })); + public page(paging: { page: number, pageSize: number }) { + this.next(paging); } public search(query: string) { - this.next(s => ({ ...s, query })); + this.next({ query }); } public revoke(contributor: ContributorDto): Observable { @@ -163,22 +146,15 @@ export class ContributorsState extends State { shareMapSubscribed(this.dialogs, x => x.payload._meta && x.payload._meta['isInvited'] === '1', options)); } - private replaceContributors(version: Version, payload: ContributorsPayload) { - this.next(s => { - const { canCreate, items: contributors, maxContributors } = payload; - - const contributorsPager = s.contributorsPager.setCount(contributors.length); - - return { - ...s, - canCreate, - contributors, - contributorsPager, - isLoaded: true, - isLoading: false, - maxContributors, - version - }; + private replaceContributors(version: Version, { canCreate, items, maxContributors }: ContributorsPayload) { + this.next({ + canCreate, + contributors: items, + isLoaded: true, + isLoading: false, + maxContributors, + total: items.length, + version }); } @@ -191,16 +167,16 @@ export class ContributorsState extends State { } } -function getPagedContributors(contributors: ContributorsList, pager: Pager) { - return contributors.slice(pager.page * pager.pageSize, (pager.page + 1) * pager.pageSize); -} +function getFilteredContributors(snapshot: Snapshot) { + const { contributors, query, page, pageSize } = snapshot; -function getFilteredContributors(contributors: ContributorsList, query?: RegExp) { let filtered = contributors; if (query) { - filtered = filtered.filter(x => query.test(x.contributorName)); + const regex = new RegExp(query, 'i'); + + filtered = filtered.filter(x => regex.test(x.contributorName)); } - return filtered; + return filtered.slice(page * pageSize, (page + 1) * pageSize); } diff --git a/frontend/app/shared/state/languages.state.ts b/frontend/app/shared/state/languages.state.ts index bb43f218e..fe3ea5056 100644 --- a/frontend/app/shared/state/languages.state.ts +++ b/frontend/app/shared/state/languages.state.ts @@ -149,13 +149,13 @@ export class LanguagesState extends State { return { ...s, - allLanguages: allLanguages, + allLanguages, allLanguagesNew: allLanguages.filter(x => !languages.find(l => l.iso2Code === x.iso2Code)), canCreate, isLoaded: true, isLoading: false, languages: languages.map(x => this.createLanguage(x, languages)), - version: version + version }; }); } diff --git a/frontend/app/shared/state/plans.state.ts b/frontend/app/shared/state/plans.state.ts index 56b718f97..b651ec694 100644 --- a/frontend/app/shared/state/plans.state.ts +++ b/frontend/app/shared/state/plans.state.ts @@ -104,7 +104,7 @@ export class PlansState extends State { isLoaded: true, isLoading: false, isOwner: !payload.planOwner || payload.planOwner === this.userId, - plans: plans, + plans, version }); }), diff --git a/frontend/app/shared/state/queries.ts b/frontend/app/shared/state/queries.ts index 80c10588f..13b576b34 100644 --- a/frontend/app/shared/state/queries.ts +++ b/frontend/app/shared/state/queries.ts @@ -45,13 +45,13 @@ export class Queries { const path = `${prefix}.queries`; this.queries = this.uiState.get(path, {}).pipe( - map(settings => parseQueries(settings)), shareReplay(1)); + map(parseQueries), shareReplay(1)); this.queriesShared = this.uiState.getShared(path, {}).pipe( - map(settings => parseQueries(settings)), shareReplay(1)); + map(parseQueries), shareReplay(1)); this.queriesUser = this.uiState.getUser(path, {}).pipe( - map(settings => parseQueries(settings)), shareReplay(1)); + map(parseQueries), shareReplay(1)); } public add(key: string, query: Query, user = false) { diff --git a/frontend/app/shared/state/query.spec.ts b/frontend/app/shared/state/query.spec.ts index 0165115ca..a4803cb3c 100644 --- a/frontend/app/shared/state/query.spec.ts +++ b/frontend/app/shared/state/query.spec.ts @@ -1,4 +1,3 @@ -import { Params } from '@angular/router'; /* * Squidex Headless CMS * @@ -6,6 +5,7 @@ import { Params } from '@angular/router'; * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ +import { Params } from '@angular/router'; import { Query } from '@app/shared/internal'; import { equalsQuery, QueryFullTextSynchronizer, QuerySynchronizer } from './query'; @@ -64,7 +64,7 @@ describe('QueryFullTextSynchronizer', () => { const value = { fullText: 'my-query' }; - synchronizer.writeValue(value, params); + synchronizer.writeValuesToRoute(value, params); expect(params).toEqual({ query: 'my-query' }); }); @@ -74,7 +74,7 @@ describe('QueryFullTextSynchronizer', () => { const value = 123; - synchronizer.writeValue(value, params); + synchronizer.writeValuesToRoute(value, params); expect(params).toEqual({ query: undefined }); }); @@ -84,7 +84,7 @@ describe('QueryFullTextSynchronizer', () => { const value = { fullText: '' }; - synchronizer.writeValue(value, params); + synchronizer.writeValuesToRoute(value, params); expect(params).toEqual({ query: undefined }); }); @@ -94,17 +94,17 @@ describe('QueryFullTextSynchronizer', () => { query: 'my-query' }; - const value = synchronizer.getValue(params); + const value = synchronizer.parseValuesFromRoute(params); - expect(value).toEqual({ fullText: 'my-query' }); + expect(value).toEqual({ query: { fullText: 'my-query' } }); }); it('should get query as undefined from route', () => { const params: Params = {}; - const value = synchronizer.getValue(params); + const value = synchronizer.parseValuesFromRoute(params); - expect(value).toBeUndefined(); + expect(value).toEqual({ query: undefined }); }); }); @@ -116,7 +116,7 @@ describe('QuerySynchronizer', () => { const value = { filter: 'my-filter' }; - synchronizer.writeValue(value, params); + synchronizer.writeValuesToRoute(value, params); expect(params).toEqual({ query: '{"filter":"my-filter","sort":[]}' }); }); @@ -126,7 +126,7 @@ describe('QuerySynchronizer', () => { const value = 123; - synchronizer.writeValue(value, params); + synchronizer.writeValuesToRoute(value, params); expect(params).toEqual({ query: undefined }); }); @@ -136,9 +136,9 @@ describe('QuerySynchronizer', () => { query: '{"filter":"my-filter"}' }; - const value = synchronizer.getValue(params) as any; + const value = synchronizer.parseValuesFromRoute(params) as any; - expect(value).toEqual({ filter: 'my-filter' }); + expect(value).toEqual({ query: { filter: 'my-filter' } }); }); it('should get query full text from route', () => { @@ -146,16 +146,16 @@ describe('QuerySynchronizer', () => { query: 'my-query' }; - const value = synchronizer.getValue(params); + const value = synchronizer.parseValuesFromRoute(params); - expect(value).toEqual({ fullText: 'my-query' }); + expect(value).toEqual({ query: { fullText: 'my-query' } }); }); it('should get query as undefined from route', () => { const params: Params = {}; - const value = synchronizer.getValue(params); + const value = synchronizer.parseValuesFromRoute(params); - expect(value).toBeUndefined(); + expect(value).toEqual({ query: undefined }); }); }); \ No newline at end of file diff --git a/frontend/app/shared/state/query.ts b/frontend/app/shared/state/query.ts index a01bfe322..784b1c9ce 100644 --- a/frontend/app/shared/state/query.ts +++ b/frontend/app/shared/state/query.ts @@ -122,15 +122,17 @@ const DEFAULT_QUERY = { export class QueryFullTextSynchronizer implements RouteSynchronizer { public static readonly INSTANCE = new QueryFullTextSynchronizer(); - public getValue(params: Params) { + public parseValuesFromRoute(params: Params) { const query = params['query']; if (Types.isString(query)) { - return { fullText: query }; + return { query: { fullText: query } }; } + + return { query: undefined }; } - public writeValue(state: any, params: Params) { + public writeValuesToRoute(state: any, params: Params) { params['query'] = undefined; if (Types.isObject(state) && Types.isString(state.fullText) && state.fullText.length > 0) { @@ -142,15 +144,17 @@ export class QueryFullTextSynchronizer implements RouteSynchronizer { export class QuerySynchronizer implements RouteSynchronizer { public static readonly INSTANCE = new QuerySynchronizer(); - public getValue(params: Params) { + public parseValuesFromRoute(params: Params) { const query = params['query']; if (Types.isString(query)) { - return deserializeQuery(query); + return { query: deserializeQuery(query) }; } + + return { query: undefined }; } - public writeValue(state: any, params: Params) { + public writeValuesToRoute(state: any, params: Params) { params['query'] = undefined; if (Types.isObject(state)) { diff --git a/frontend/app/shared/state/rule-events.state.spec.ts b/frontend/app/shared/state/rule-events.state.spec.ts index 7333d3e1f..34f04f6c4 100644 --- a/frontend/app/shared/state/rule-events.state.spec.ts +++ b/frontend/app/shared/state/rule-events.state.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DialogService, Pager, RuleEventsDto, RuleEventsState, RulesService } from '@app/shared/internal'; +import { DialogService, RuleEventsDto, RuleEventsState, RulesService } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; @@ -39,10 +39,10 @@ describe('RuleEventsState', () => { }); it('should load ruleEvents', () => { + expect(ruleEventsState.snapshot.ruleEvents).toEqual(oldRuleEvents); expect(ruleEventsState.snapshot.isLoaded).toBeTruthy(); expect(ruleEventsState.snapshot.isLoading).toBeFalsy(); - expect(ruleEventsState.snapshot.ruleEvents).toEqual(oldRuleEvents); - expect(ruleEventsState.snapshot.ruleEventsPager.numberOfItems).toEqual(200); + expect(ruleEventsState.snapshot.total).toEqual(200); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); @@ -68,7 +68,7 @@ describe('RuleEventsState', () => { rulesService.setup(x => x.getEvents(app, 10, 10, undefined)) .returns(() => of(new RuleEventsDto(200, []))); - ruleEventsState.setPager(new Pager(200, 1, 10)).subscribe(); + ruleEventsState.page({ page: 1, pageSize: 10 }).subscribe(); expect().nothing(); diff --git a/frontend/app/shared/state/rule-events.state.ts b/frontend/app/shared/state/rule-events.state.ts index 9c714087b..c035e8c3a 100644 --- a/frontend/app/shared/state/rule-events.state.ts +++ b/frontend/app/shared/state/rule-events.state.ts @@ -6,25 +6,16 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, Pager, Router2State, shareSubscribed, State } from '@app/framework'; +import { DialogService, getPagingInfo, ListState, Router2State, shareSubscribed, State } from '@app/framework'; import { EMPTY, Observable } from 'rxjs'; import { finalize, tap } from 'rxjs/operators'; import { RuleEventDto, RulesService } from './../services/rules.service'; import { AppsState } from './apps.state'; -interface Snapshot { +interface Snapshot extends ListState { // The current rule events. ruleEvents: ReadonlyArray; - // The pagination information. - ruleEventsPager: Pager; - - // Indicates if the rule events are loaded. - isLoaded?: boolean; - - // Indicates if the rule events are loading. - isLoading?: boolean; - // The current rule id. ruleId?: string; } @@ -34,8 +25,11 @@ export class RuleEventsState extends State { public ruleEvents = this.project(x => x.ruleEvents); - public ruleEventsPager = - this.project(x => x.ruleEventsPager); + public paging = + this.project(x => getPagingInfo(x, x.ruleEvents.length)); + + public query = + this.project(x => x.query); public isLoaded = this.project(x => x.isLoaded === true); @@ -50,13 +44,15 @@ export class RuleEventsState extends State { ) { super({ ruleEvents: [], - ruleEventsPager: new Pager(0) + page: 0, + pageSize: 10, + total: 0 }); } public loadAndListen(route: Router2State) { route.mapTo(this) - .withPager('ruleEventsPager', 'ruleEvents', 30) + .withPaging('ruleEvents', 30) .withString('ruleId', 'ruleId') .whenSynced(() => this.loadInternal(false)) .build(); @@ -73,24 +69,24 @@ export class RuleEventsState extends State { private loadInternal(isReload: boolean): Observable { this.next({ isLoading: true }); + const { page, pageSize, ruleId } = this.snapshot; + return this.rulesService.getEvents(this.appName, - this.snapshot.ruleEventsPager.pageSize, - this.snapshot.ruleEventsPager.skip, - this.snapshot.ruleId).pipe( + pageSize, + pageSize * page, + ruleId).pipe( tap(({ total, items: ruleEvents }) => { if (isReload) { this.dialogs.notifyInfo('i18n:rules.ruleEvents.reloaded'); } return this.next(s => { - const ruleEventsPager = s.ruleEventsPager.setCount(total); - return { ...s, isLoaded: true, isLoading: false, ruleEvents, - ruleEventsPager + total }; }); }), @@ -125,13 +121,13 @@ export class RuleEventsState extends State { return EMPTY; } - this.next(s => ({ ...s, ruleEventsPager: s.ruleEventsPager.reset(), ruleId })); + this.next({ page: 0, ruleId }); return this.loadInternal(false); } - public setPager(ruleEventsPager: Pager): Observable { - this.next(s => ({ ...s, ruleEventsPager })); + public page(paging: { page: number, pageSize: number }) { + this.next(paging); return this.loadInternal(false); } diff --git a/frontend/app/shared/state/rules.state.spec.ts b/frontend/app/shared/state/rules.state.spec.ts index 4dd2ca3d7..dbd80a89c 100644 --- a/frontend/app/shared/state/rules.state.spec.ts +++ b/frontend/app/shared/state/rules.state.spec.ts @@ -166,7 +166,7 @@ describe('RulesState', () => { it('should not update rule when triggered', () => { rulesService.setup(x => x.triggerRule(app, rule1)) - .returns(() => of()).verifiable(); + .returns(of).verifiable(); rulesState.trigger(rule1).subscribe(); @@ -177,7 +177,7 @@ describe('RulesState', () => { it('should not update rule when rurunningn', () => { rulesService.setup(x => x.runRule(app, rule1)) - .returns(() => of()).verifiable(); + .returns(of).verifiable(); rulesState.run(rule1).subscribe(); @@ -188,7 +188,7 @@ describe('RulesState', () => { it('should not update rule when running from snapshots', () => { rulesService.setup(x => x.runRuleFromSnapshots(app, rule1)) - .returns(() => of()).verifiable(); + .returns(of).verifiable(); rulesState.runFromSnapshots(rule1).subscribe(); @@ -221,7 +221,7 @@ describe('RulesState', () => { it('should invoke rule service when run is cancelled', () => { rulesService.setup(x => x.runCancel(app)) - .returns(() => of()).verifiable(); + .returns(of).verifiable(); rulesState.runCancel().subscribe(); diff --git a/frontend/app/shared/state/ui.state.ts b/frontend/app/shared/state/ui.state.ts index 879d1480e..019deaf8f 100644 --- a/frontend/app/shared/state/ui.state.ts +++ b/frontend/app/shared/state/ui.state.ts @@ -129,7 +129,8 @@ export class UIState extends State { private loadResources() { this.usersService.getResources() .subscribe(payload => { - this.next(s => ({ ...s, + this.next(s => ({ + ...s, canReadEvents: hasAnyLink(payload, 'admin/events'), canReadUsers: hasAnyLink(payload, 'admin/users'), canRestore: hasAnyLink(payload, 'admin/restore'), diff --git a/frontend/app/shared/utils/array-helper.ts b/frontend/app/shared/utils/array-helper.ts deleted file mode 100644 index 4e4a24315..000000000 --- a/frontend/app/shared/utils/array-helper.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -export function compareStrings(a: string, b: string) { - return a.localeCompare(b, undefined, { sensitivity: 'base' }); -} \ No newline at end of file diff --git a/frontend/app/shell/pages/internal/profile-menu.component.html b/frontend/app/shell/pages/internal/profile-menu.component.html index 00f338513..9dc28002b 100644 --- a/frontend/app/shell/pages/internal/profile-menu.component.html +++ b/frontend/app/shell/pages/internal/profile-menu.component.html @@ -36,9 +36,8 @@ {{ 'common.language' | sqxTranslate }} -
- +
+ {{ availableLanguage.localName }}
diff --git a/frontend/app/shell/pages/internal/profile-menu.component.ts b/frontend/app/shell/pages/internal/profile-menu.component.ts index 68a83b592..db038a500 100644 --- a/frontend/app/shell/pages/internal/profile-menu.component.ts +++ b/frontend/app/shell/pages/internal/profile-menu.component.ts @@ -20,6 +20,10 @@ interface State { // The url to the user profile. profileUrl: string; + + // True when the submenu should be open. + showSubmenu: boolean; + } @Component({ @@ -34,8 +38,6 @@ interface State { export class ProfileMenuComponent extends StatefulComponent implements OnInit { public modalMenu = new ModalModel(); - public showSubmenu = false; - public language = this.uiOptions.get('more.culture'); public languages = UILanguages.ALL; @@ -48,7 +50,8 @@ export class ProfileMenuComponent extends StatefulComponent implements On profileDisplayName: '', profileEmail: '', profileId: '', - profileUrl: apiUrl.buildUrl('/identity-server/account/profile') + profileUrl: apiUrl.buildUrl('/identity-server/account/profile'), + showSubmenu: false }); } @@ -61,7 +64,8 @@ export class ProfileMenuComponent extends StatefulComponent implements On const profileEmail = user.email; const profileDisplayName = user.displayName; - this.next(s => ({ ...s, + this.next(s => ({ + ...s, profileId, profileEmail, profileDisplayName @@ -78,7 +82,10 @@ export class ProfileMenuComponent extends StatefulComponent implements On } public toggle() { - this.showSubmenu = !this.showSubmenu; + this.next(s => ({ + ...s, + showSubmenu: !s.showSubmenu + })); } public logout() { diff --git a/frontend/app/shell/pages/internal/search-menu.component.html b/frontend/app/shell/pages/internal/search-menu.component.html index 1d1a86417..0d1bcf071 100644 --- a/frontend/app/shell/pages/internal/search-menu.component.html +++ b/frontend/app/shell/pages/internal/search-menu.component.html @@ -1,6 +1,7 @@
- +
diff --git a/frontend/app/shell/pages/internal/search-menu.component.ts b/frontend/app/shell/pages/internal/search-menu.component.ts index 832f6c18a..0d4e8cea9 100644 --- a/frontend/app/shell/pages/internal/search-menu.component.ts +++ b/frontend/app/shell/pages/internal/search-menu.component.ts @@ -42,8 +42,6 @@ export class SearchMenuComponent { @ViewChild(AutocompleteComponent, { static: false }) public searchControl: AutocompleteComponent; - public selection: SearchResultDto; - constructor( private readonly router: Router, private readonly apiUrl: ApiUrlConfig, diff --git a/frontend/tslint.json b/frontend/tslint.json index 74e273c52..55463906f 100644 --- a/frontend/tslint.json +++ b/frontend/tslint.json @@ -6,6 +6,7 @@ ], "rules": { "angular-whitespace": false, + "arrow-return-shorthand": true, "class-name": true, "comment-format": [ true, @@ -70,9 +71,11 @@ "no-string-literal": false, "no-switch-case-fall-through": true, "no-trailing-whitespace": true, + "no-unnecessary-callback-wrapper": true, "no-unused-expression": true, "no-use-before-declare": false, "no-var-keyword": true, + "object-literal-shorthand": true, "object-literal-sort-keys": false, "one-line": [ true, @@ -94,6 +97,7 @@ ], "prefer-const": true, "prefer-for-of": true, + "prefer-template": true, "quotemark": [ true, "single"