diff --git a/backend/i18n/frontend_en.json b/backend/i18n/frontend_en.json index ced0c5b82..0a2c6655e 100644 --- a/backend/i18n/frontend_en.json +++ b/backend/i18n/frontend_en.json @@ -403,6 +403,7 @@ "contents.componentsNoSchema": "Add at least one schema to add components.", "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.inspect": "Inspect", "contents.contentTab.references": "References", "contents.contentTab.referencing": "Referencing", "contents.create": "New", @@ -425,6 +426,9 @@ "contents.draftStatus": "New Version", "contents.editPageTitle": "Edit Content", "contents.idPlaceholder": "Define a custom ID or leave empty to let Squidex generate one.", + "contents.inspectContent": "Content", + "contents.inspectData": "Data", + "contents.inspectFlatData": "Flat Data", "contents.invariantFieldDescription": "The '{fieldName}' field of the content item.", "contents.languageModeAll": "All Languages", "contents.languageModeSingle": "Single Language", diff --git a/backend/i18n/frontend_it.json b/backend/i18n/frontend_it.json index 5806e823b..e8ec3b583 100644 --- a/backend/i18n/frontend_it.json +++ b/backend/i18n/frontend_it.json @@ -403,6 +403,7 @@ "contents.componentsNoSchema": "Add at least one schema to add components.", "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.inspect": "Inspect", "contents.contentTab.references": "Collegato a", "contents.contentTab.referencing": "Collegato da", "contents.create": "Nuovo", @@ -425,6 +426,9 @@ "contents.draftStatus": "Nuova versione", "contents.editPageTitle": "Modifica contenuto", "contents.idPlaceholder": "Define a custom ID or leave empty to let Squidex generate one.", + "contents.inspectContent": "Content", + "contents.inspectData": "Data", + "contents.inspectFlatData": "Flat Data", "contents.invariantFieldDescription": "Il campo '{fieldName}' del contenuto.", "contents.languageModeAll": "Tutte le lingue", "contents.languageModeSingle": "Una sola lingua", diff --git a/backend/i18n/frontend_nl.json b/backend/i18n/frontend_nl.json index 000df8033..10bcb5e9d 100644 --- a/backend/i18n/frontend_nl.json +++ b/backend/i18n/frontend_nl.json @@ -403,6 +403,7 @@ "contents.componentsNoSchema": "Add at least one schema to add components.", "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.inspect": "Inspect", "contents.contentTab.references": "References", "contents.contentTab.referencing": "Referencing", "contents.create": "Nieuw", @@ -425,6 +426,9 @@ "contents.draftStatus": "Nieuwe versie", "contents.editPageTitle": "Inhoud bewerken", "contents.idPlaceholder": "Define a custom ID or leave empty to let Squidex generate one.", + "contents.inspectContent": "Content", + "contents.inspectData": "Data", + "contents.inspectFlatData": "Flat Data", "contents.invariantFieldDescription": "Het veld '{fieldName}' van het inhoudsitem.", "contents.languageModeAll": "Alle talen", "contents.languageModeSingle": "Enkele taal", diff --git a/backend/i18n/frontend_zh.json b/backend/i18n/frontend_zh.json index bf43a97c8..e1fc9eb9a 100644 --- a/backend/i18n/frontend_zh.json +++ b/backend/i18n/frontend_zh.json @@ -403,6 +403,7 @@ "contents.componentsNoSchema": "添加至少一个Schemas来添加组件。", "contents.contentNotValid": "内容元素无效，请用所有语言（如果可本地化）检查左侧带有红色条的字段。", "contents.contentTab.editor": "编辑器", + "contents.contentTab.inspect": "Inspect", "contents.contentTab.references": "参考资料", "contents.contentTab.referencing": "引用", "contents.create": "新建", @@ -425,6 +426,9 @@ "contents.draftStatus": "新版本", "contents.editPageTitle": "编辑内容", "contents.idPlaceholder": "Define a custom ID or leave empty to let Squidex generate one.", + "contents.inspectContent": "Content", + "contents.inspectData": "Data", + "contents.inspectFlatData": "Flat Data", "contents.invariantFieldDescription": "内容项的 '{fieldName}' 字段。", "contents.languageModeAll": "所有语言", "contents.languageModeSingle": "单一语言", diff --git a/backend/i18n/source/frontend_en.json b/backend/i18n/source/frontend_en.json index ced0c5b82..0a2c6655e 100644 --- a/backend/i18n/source/frontend_en.json +++ b/backend/i18n/source/frontend_en.json @@ -403,6 +403,7 @@ "contents.componentsNoSchema": "Add at least one schema to add components.", "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.inspect": "Inspect", "contents.contentTab.references": "References", "contents.contentTab.referencing": "Referencing", "contents.create": "New", @@ -425,6 +426,9 @@ "contents.draftStatus": "New Version", "contents.editPageTitle": "Edit Content", "contents.idPlaceholder": "Define a custom ID or leave empty to let Squidex generate one.", + "contents.inspectContent": "Content", + "contents.inspectData": "Data", + "contents.inspectFlatData": "Flat Data", "contents.invariantFieldDescription": "The '{fieldName}' field of the content item.", "contents.languageModeAll": "All Languages", "contents.languageModeSingle": "Single Language", diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs index 913b3aea8..6059e1345 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs @@ -203,10 +203,11 @@ namespace Squidex.Domain.Apps.Core.HandleRules return; } + var skipReason = SkipReason.None; + if (!triggerHandler.Trigger(typed, context)) { - jobs.Add(JobResult.ConditionDoesNotMatch); - return; + skipReason = SkipReason.ConditionDoesNotMatch; } await foreach (var enrichedEvent in triggerHandler.CreateEnrichedEventsAsync(typed, context, ct)) @@ -222,17 +223,12 @@ namespace Squidex.Domain.Apps.Core.HandleRules if (!triggerHandler.Trigger(enrichedEvent, context)) { - if (jobs.Count == 0) - { - jobs.Add(JobResult.ConditionDoesNotMatch); - } - - continue; + skipReason = SkipReason.ConditionDoesNotMatch; } var job = await CreateJobAsync(actionHandler, enrichedEvent, context, now); - jobs.Add(job); + jobs.Add(job with { SkipReason = skipReason }); } catch (Exception ex) { diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs index 2fe4af2e4..126eea198 100644 --- a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs @@ -411,6 +411,8 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules { var context = Rule(); + var enrichedEvent = new EnrichedContentEvent { AppId = appId }; + var @event = Envelope.Create(new ContentCreated()); A.CallTo(() => ruleTriggerHandler.Handles(@event.Payload)) @@ -419,12 +421,13 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules A.CallTo(() => ruleTriggerHandler.Trigger(MatchPayload(@event), context)) .Returns(false); - var (_, _, reason) = await sut.CreateJobsAsync(@event, context).SingleAsync(); + A.CallTo(() => ruleTriggerHandler.CreateEnrichedEventsAsync(MatchPayload(@event), context, default)) + .Returns(new List { enrichedEvent }.ToAsyncEnumerable()); - Assert.Equal(SkipReason.ConditionDoesNotMatch, reason); + var (job, _, reason) = await sut.CreateJobsAsync(@event, context).SingleAsync(); - A.CallTo(() => ruleTriggerHandler.CreateEnrichedEventsAsync(A>._, A._, default)) - .MustNotHaveHappened(); + Assert.Equal(SkipReason.ConditionDoesNotMatch, reason); + Assert.NotNull(job); } [Fact] diff --git a/frontend/app-config/webpack.config.js b/frontend/app-config/webpack.config.js index a5e739e69..049aaba0a 100644 --- a/frontend/app-config/webpack.config.js +++ b/frontend/app-config/webpack.config.js @@ -53,7 +53,7 @@ module.exports = function calculateConfig(env) { const configFile = isTests ? 'tsconfig.spec.json' : 'tsconfig.app.json'; // eslint-disable-next-line no-console - console.log(`Use ${configFile}, Production: ${isProduction}`); + console.log(`Use ${configFile}, Production: ${!!isProduction}`); const config = { mode: isProduction ? 'production' : 'development', diff --git a/frontend/app/features/administration/guards/user-must-exist.guard.ts b/frontend/app/features/administration/guards/user-must-exist.guard.ts index 127af87b5..f5113a357 100644 --- a/frontend/app/features/administration/guards/user-must-exist.guard.ts +++ b/frontend/app/features/administration/guards/user-must-exist.guard.ts @@ -9,8 +9,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { UsersState } from '@app/features/administration/internal'; import { allParams } from '@app/framework'; -import { Observable } from 'rxjs'; -import { map, tap } from 'rxjs/operators'; +import { Observable, map, tap } from 'rxjs'; @Injectable() export class UserMustExistGuard implements CanActivate { diff --git a/frontend/app/features/content/declarations.ts b/frontend/app/features/content/declarations.ts index 8c7e14f86..c4b082b80 100644 --- a/frontend/app/features/content/declarations.ts +++ b/frontend/app/features/content/declarations.ts @@ -14,6 +14,7 @@ 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/inspecting/content-inspection.component'; export * from './pages/content/references/content-references.component'; export * from './pages/contents/contents-filters-page.component'; export * from './pages/contents/contents-page.component'; diff --git a/frontend/app/features/content/module.ts b/frontend/app/features/content/module.ts index deba1a432..e5683a1c2 100644 --- a/frontend/app/features/content/module.ts +++ b/frontend/app/features/content/module.ts @@ -10,8 +10,7 @@ import { RouterModule, Routes } from '@angular/router'; import { CanDeactivateGuard, ContentMustExistGuard, LoadLanguagesGuard, LoadSchemasGuard, SchemaMustExistPublishedGuard, SchemaMustNotBeSingletonGuard, SqxFrameworkModule, SqxSharedModule } from '@app/shared'; import { ScrollingModule } from '@angular/cdk/scrolling'; import { ScrollingModule as ScrollingModuleExperimental } from '@angular/cdk-experimental/scrolling'; -import { ArrayEditorComponent, ArrayItemComponent, AssetsEditorComponent, CommentsPageComponent, ComponentComponent, ComponentSectionComponent, ContentComponent, ContentCreatorComponent, ContentEditorComponent, ContentEventComponent, ContentExtensionComponent, ContentFieldComponent, ContentHistoryPageComponent, ContentPageComponent, ContentReferencesComponent, ContentSectionComponent, ContentsFiltersPageComponent, ContentsPageComponent, CustomViewEditorComponent, DueTimeSelectorComponent, FieldEditorComponent, FieldLanguagesComponent, IFrameEditorComponent, PreviewButtonComponent, ReferenceItemComponent, ReferencesEditorComponent, SchemasPageComponent, SidebarPageComponent, StockPhotoEditorComponent } from './declarations'; -import { CalendarPageComponent } from './pages/calendar/calendar-page.component'; +import { ArrayEditorComponent, ArrayItemComponent, AssetsEditorComponent, CalendarPageComponent, CommentsPageComponent, ComponentComponent, ComponentSectionComponent, ContentComponent, ContentCreatorComponent, ContentEditorComponent, ContentEventComponent, ContentExtensionComponent, ContentFieldComponent, ContentHistoryPageComponent, ContentInspectionComponent, ContentPageComponent, ContentReferencesComponent, ContentSectionComponent, ContentsFiltersPageComponent, ContentsPageComponent, CustomViewEditorComponent, DueTimeSelectorComponent, FieldEditorComponent, FieldLanguagesComponent, IFrameEditorComponent, PreviewButtonComponent, ReferenceItemComponent, ReferencesEditorComponent, SchemasPageComponent, SidebarPageComponent, StockPhotoEditorComponent } from './declarations'; const routes: Routes = [ { @@ -95,14 +94,15 @@ const routes: Routes = [ CalendarPageComponent, CommentsPageComponent, ComponentComponent, - ContentCreatorComponent, ComponentSectionComponent, ContentComponent, + ContentCreatorComponent, ContentEditorComponent, ContentEventComponent, ContentExtensionComponent, ContentFieldComponent, ContentHistoryPageComponent, + ContentInspectionComponent, ContentPageComponent, ContentReferencesComponent, ContentSectionComponent, 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 0d68850a1..7b365b182 100644 --- a/frontend/app/features/content/pages/content/content-page.component.html +++ b/frontend/app/features/content/pages/content/content-page.component.html @@ -17,12 +17,8 @@ - - - - - -
    + + - + - + - - - - - - - - +
    + + + + + - - - - - - - -
    - - {{ 'common.delete' | sqxTranslate }} - -
    + + + + + + +
    + + {{ 'contents.publishAll' | sqxTranslate }} + + + {{ 'contents.validate' | sqxTranslate }} + +
    +     - - - -     + + + + + + + +
    + + {{ 'common.delete' | sqxTranslate }} + +
    +     +     + + + + +     +     - - - + + - - + + - + +
    @@ -122,6 +138,14 @@ [languages]="languages"> + + + + + [schema]="schema" + [(contentId)]="contentId"> 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 7f2a04d32..93ba9c96e 100644 --- a/frontend/app/features/content/pages/content/content-page.component.scss +++ b/frontend/app/features/content/pages/content/content-page.component.scss @@ -8,8 +8,21 @@ .nav-tabs2 { @include absolute(auto, auto, 0, 5rem); + flex-wrap: nowrap; a { padding-bottom: 1.5rem; } +} + +.menu { + @include absolute(0, 0, 0); + align-items: center; + background: white; + border-radius: 0; + border: 0; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + padding: $panel-padding; } \ No newline at end of file diff --git a/frontend/app/features/content/pages/content/inspecting/content-inspection.component.html b/frontend/app/features/content/pages/content/inspecting/content-inspection.component.html new file mode 100644 index 000000000..4bc47c80a --- /dev/null +++ b/frontend/app/features/content/pages/content/inspecting/content-inspection.component.html @@ -0,0 +1,23 @@ +
    + +
    + +
    + +
    diff --git a/frontend/app/features/content/pages/content/inspecting/content-inspection.component.scss b/frontend/app/features/content/pages/content/inspecting/content-inspection.component.scss new file mode 100644 index 000000000..ee8250bf4 --- /dev/null +++ b/frontend/app/features/content/pages/content/inspecting/content-inspection.component.scss @@ -0,0 +1,28 @@ + +:host, +.inner-main { + display: flex; + flex-direction: column; + flex-grow: 1; +} + +:host ::ng-deep { + .editor { + @include absolute(0, 0, 0, 0); + } +} + +.inner-menu, +.inner-main { + position: relative; +} + +.inner-menu { + border-bottom: 1px solid $color-border; + border-radius: 0; + height: 4rem; +} + +.nav { + @include absolute(null, null, 0, 2rem); +} \ No newline at end of file diff --git a/frontend/app/features/content/pages/content/inspecting/content-inspection.component.ts b/frontend/app/features/content/pages/content/inspecting/content-inspection.component.ts new file mode 100644 index 000000000..2d0727b30 --- /dev/null +++ b/frontend/app/features/content/pages/content/inspecting/content-inspection.component.ts @@ -0,0 +1,72 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core'; +import { AppLanguageDto, ContentDto, ContentsService } from '@app/shared'; +import { BehaviorSubject, combineLatest, of } from 'rxjs'; +import { filter, map, switchMap } from 'rxjs/operators'; + +type Mode = 'Content' | 'Data' | 'FlatData'; + +@Component({ + selector: 'sqx-content-inspection[appName][content][language][languages]', + styleUrls: ['./content-inspection.component.scss'], + templateUrl: './content-inspection.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class ContentInspectionComponent implements OnChanges { + private languageChanges$ = new BehaviorSubject(null); + + @Input() + public appName: string; + + @Input() + public language: AppLanguageDto; + + @Input() + public languages: ReadonlyArray; + + @Input() + public content: ContentDto; + + public mode = new BehaviorSubject('Content'); + + public actualData = + combineLatest([ + this.languageChanges$, + this.mode, + ]).pipe( + filter(x => !!x[0]), + switchMap(([language, mode]) => { + if (mode === 'Content') { + return of(this.content); + } else if (mode === 'Data') { + return of(this.content.data); + } else { + return this.contentsService.getContent(this.appName, + this.content.schemaName, + this.content.id, + language?.iso2Code).pipe( + map(x => x.data)); + } + })); + + constructor( + private readonly contentsService: ContentsService, + ) { + } + + public ngOnChanges(changes: SimpleChanges) { + if (changes['language']) { + this.languageChanges$.next(this.language); + } + } + + public setMode(mode: Mode) { + this.mode.next(mode); + } +} diff --git a/frontend/app/framework/angular/http/http-extensions.ts b/frontend/app/framework/angular/http/http-extensions.ts index f547d5bf0..6f0531ce0 100644 --- a/frontend/app/framework/angular/http/http-extensions.ts +++ b/frontend/app/framework/angular/http/http-extensions.ts @@ -14,43 +14,49 @@ import { catchError, map } from 'rxjs/operators'; export module HTTP { export function upload(http: HttpClient, method: string, url: string, file: Blob, version?: Version): Observable> { - const req = new HttpRequest(method, url, getFormData(file), { headers: createHeaders(version), reportProgress: true }); + const req = new HttpRequest(method, url, getFormData(file), { headers: createHeaders(version, undefined), reportProgress: true }); return http.request(req); } - export function getVersioned(http: HttpClient, url: string, version?: Version): Observable>> { - const headers = createHeaders(version); + export function getVersioned(http: HttpClient, url: string, + version?: Version, customHeaders?: HttpHeaders): Observable>> { + const headers = createHeaders(version, customHeaders); return handleVersion(http.get(url, { observe: 'response', headers })); } - export function postVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable>> { - const headers = createHeaders(version); + export function postVersioned(http: HttpClient, url: string, body: any, + version?: Version, customHeaders?: HttpHeaders): Observable>> { + const headers = createHeaders(version, customHeaders); return handleVersion(http.post(url, body, { observe: 'response', headers })); } - export function putVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable>> { - const headers = createHeaders(version); + export function putVersioned(http: HttpClient, url: string, body: any, + version?: Version, customHeaders?: HttpHeaders): Observable>> { + const headers = createHeaders(version, customHeaders); return handleVersion(http.put(url, body, { observe: 'response', headers })); } - export function patchVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable>> { - const headers = createHeaders(version); + export function patchVersioned(http: HttpClient, url: string, body: any, + version?: Version, customHeaders?: HttpHeaders): Observable>> { + const headers = createHeaders(version, customHeaders); return handleVersion(http.request('PATCH', url, { body, observe: 'response', headers })); } - export function deleteVersioned(http: HttpClient, url: string, version?: Version): Observable>> { - const headers = createHeaders(version); + export function deleteVersioned(http: HttpClient, url: string, + version?: Version, customHeaders?: HttpHeaders): Observable>> { + const headers = createHeaders(version, customHeaders); return handleVersion(http.delete(url, { observe: 'response', headers })); } - export function requestVersioned(http: HttpClient, method: string, url: string, version?: Version, body?: any): Observable>> { - const headers = createHeaders(version); + export function requestVersioned(http: HttpClient, method: string, url: string, + version?: Version, body?: any, customHeaders?: HttpHeaders): Observable>> { + const headers = createHeaders(version, customHeaders); return handleVersion(http.request(method, url, { observe: 'response', headers, body })); } @@ -63,12 +69,14 @@ export module HTTP { return formData; } - function createHeaders(version?: Version): HttpHeaders { + function createHeaders(version: Version | undefined, customHeaders: HttpHeaders | undefined): HttpHeaders { + customHeaders ||= new HttpHeaders(); + if (version && version.value && version.value.length > 0) { - return new HttpHeaders().set('If-Match', version.value); - } else { - return new HttpHeaders(); + return customHeaders.set('If-Match', version.value); } + + return customHeaders; } function handleVersion(httpRequest: Observable>): Observable>> { diff --git a/frontend/app/shared/services/contents.service.ts b/frontend/app/shared/services/contents.service.ts index f5e20a13e..06ae7a6fb 100644 --- a/frontend/app/shared/services/contents.service.ts +++ b/frontend/app/shared/services/contents.service.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { AnalyticsService, ApiUrlConfig, DateTime, ErrorDto, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, ResultSet, Version, Versioned } from '@app/framework'; import { Observable } from 'rxjs'; @@ -165,6 +165,23 @@ export class ContentsService { pretifyError('i18n:contents.loadFailed')); } + public getContent(appName: string, schemaName: string, id: string, language?: string): Observable { + const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}`); + + let headers = new HttpHeaders(); + + if (language) { + headers = headers.set('X-Flatten', '1'); + headers = headers.set('X-Languages', language); + } + + return HTTP.getVersioned(this.http, url, undefined, headers).pipe( + map(({ payload }) => { + return parseContent(payload.body); + }), + pretifyError('i18n:contents.loadContentFailed')); + } + public getAllContents(appName: string, q: ContentsByIds | ContentsBySchedule): Observable { const url = this.apiUrl.buildUrl(`/api/content/${appName}`); @@ -177,16 +194,6 @@ export class ContentsService { pretifyError('i18n:contents.loadFailed')); } - public getContent(appName: string, schemaName: string, id: string): Observable { - const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}`); - - return HTTP.getVersioned(this.http, url).pipe( - map(({ payload }) => { - return parseContent(payload.body); - }), - pretifyError('i18n:contents.loadContentFailed')); - } - public getContentReferences(appName: string, schemaName: string, id: string, q?: ContentsByQuery): Observable { const { fullQuery } = buildQuery(q);