From d2ac88df4fb9a701ca7776dca8e89cc3e7fd67b5 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Thu, 25 Jul 2019 17:01:30 +0200 Subject: [PATCH] Fallback for reference fields. --- .../Assets/IAssetQueryService.cs | 2 +- src/Squidex/app/framework/declarations.ts | 1 - src/Squidex/app/framework/module.ts | 3 -- .../app/shared/services/schemas.service.ts | 28 +++++++++---------- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Assets/IAssetQueryService.cs b/src/Squidex.Domain.Apps.Entities/Assets/IAssetQueryService.cs index bec9309a6..ed2f78da7 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/IAssetQueryService.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/IAssetQueryService.cs @@ -18,7 +18,7 @@ namespace Squidex.Domain.Apps.Entities.Assets Task> QueryByHashAsync(Guid appId, string hash); - Task> QueryAsync(Context contex, Q query); + Task> QueryAsync(Context context, Q query); Task FindAssetAsync(Guid id); } diff --git a/src/Squidex/app/framework/declarations.ts b/src/Squidex/app/framework/declarations.ts index 45a77e5f4..689aeaf68 100644 --- a/src/Squidex/app/framework/declarations.ts +++ b/src/Squidex/app/framework/declarations.ts @@ -67,7 +67,6 @@ export * from './angular/scroll-active.directive'; export * from './angular/shortcut.component'; export * from './angular/sorted.directive'; export * from './angular/stop-click.directive'; -export * from './angular/sync-scrolling.directive'; export * from './angular/template-wrapper.directive'; export * from './angular/title.component'; diff --git a/src/Squidex/app/framework/module.ts b/src/Squidex/app/framework/module.ts index dbc533533..eb5937a90 100644 --- a/src/Squidex/app/framework/module.ts +++ b/src/Squidex/app/framework/module.ts @@ -82,7 +82,6 @@ import { SortedDirective, StarsComponent, StopClickDirective, - SyncScollingDirective, TagEditorComponent, TemplateWrapperDirective, TitleComponent, @@ -158,7 +157,6 @@ import { SortedDirective, StarsComponent, StopClickDirective, - SyncScollingDirective, TagEditorComponent, TemplateWrapperDirective, TitleComponent, @@ -228,7 +226,6 @@ import { SortedDirective, StarsComponent, StopClickDirective, - SyncScollingDirective, TagEditorComponent, TemplateWrapperDirective, TitleComponent, diff --git a/src/Squidex/app/shared/services/schemas.service.ts b/src/Squidex/app/shared/services/schemas.service.ts index 2439b6bd0..89c3f80b7 100644 --- a/src/Squidex/app/shared/services/schemas.service.ts +++ b/src/Squidex/app/shared/services/schemas.service.ts @@ -100,24 +100,24 @@ export class SchemaDetailsDto extends SchemaDto { super(links, id, name, category, properties, isSingleton, isPublished, created, createdBy, lastModified, lastModifiedBy, version); if (fields) { - this.listFields = this.getField(x => x.properties.isListField); - this.listFieldsEditable = this.listFields.filter(x => x.isInlineEditable); + this.listFields = this.fields.filter(x => x.properties.isListField && x.properties.isContentField); - this.referenceFields = this.getField(x => x.properties.isReferenceField); - } - } + if (this.listFields.length === 0 && this.fields.length > 0) { + this.listFields = [this.fields[0]]; + } - private getField(predicate: (field: RootFieldDto) => boolean) { - let fields = this.fields.filter(x => predicate(x) && x.properties.isContentField); + if (this.listFields.length === 0) { + this.listFields = NONE_FIELDS; + } - if (fields.length === 0 && this.fields.length > 0) { - fields = [this.fields[0]]; - } - if (fields.length === 0) { - fields = NONE_FIELDS; - } + this.listFieldsEditable = this.listFields.filter(x => x.isInlineEditable); + + this.referenceFields = this.fields.filter(x => x.properties.isReferenceField && x.properties.isContentField); - return fields; + if (this.referenceFields.length === 0) { + this.referenceFields = this.listFields; + } + } } public export(): any {