From c8bc076ba25ba106f08694d1165f56b216b92c62 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 15 Jan 2020 17:25:57 +0100 Subject: [PATCH] Guid parsing fixed and panel fixed. --- .../Contents/Visitors/AdaptionVisitor.cs | 11 ++++++++-- .../app/framework/angular/panel.component.ts | 22 ++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/AdaptionVisitor.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/AdaptionVisitor.cs index 5715d12dc..50464e265 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/AdaptionVisitor.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/AdaptionVisitor.cs @@ -41,9 +41,16 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors result = new CompareFilter(path, nodeIn.Operator, nodeIn.Value); } - if (path.Count == 1 && path[0] == "_id" && result.Value.Value is List guidList) + if (path.Count == 1 && path[0] == "_id") { - result = new CompareFilter(path, nodeIn.Operator, guidList.Select(x => x.ToString()).ToList()); + if (result.Value.Value is List guidList) + { + result = new CompareFilter(path, nodeIn.Operator, guidList.Select(x => x.ToString()).ToList()); + } + else if (result.Value.Value is Guid guid) + { + result = new CompareFilter(path, nodeIn.Operator, guid.ToString()); + } } return result; diff --git a/frontend/app/framework/angular/panel.component.ts b/frontend/app/framework/angular/panel.component.ts index e8e2bfb31..ed62f38dc 100644 --- a/frontend/app/framework/angular/panel.component.ts +++ b/frontend/app/framework/angular/panel.component.ts @@ -25,14 +25,6 @@ export class PanelComponent implements AfterViewInit, OnChanges, OnDestroy, OnIn private renderWidthField = 0; private isViewInitField = false; - public get renderWidth() { - return this.renderWidthField; - } - - public get isViewInit() { - return this.isViewInitField; - } - @Output() public close = new EventEmitter(); @@ -75,6 +67,12 @@ export class PanelComponent implements AfterViewInit, OnChanges, OnDestroy, OnIn @Input() public sidebarClass = ''; + @Input() + public grid = false; + + @Input() + public noPadding = false; + @ViewChild('panel', { static: false }) public panel: ElementRef; @@ -82,6 +80,14 @@ export class PanelComponent implements AfterViewInit, OnChanges, OnDestroy, OnIn return this.close.observers.length > 0; } + public get renderWidth() { + return this.renderWidthField; + } + + public get isViewInit() { + return this.isViewInitField; + } + constructor( private readonly container: PanelContainerDirective, private readonly renderer: Renderer2