From 29d61cb7791d865934f70e207101b69d042aeeae Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Tue, 27 Jul 2021 20:21:14 +0200
Subject: [PATCH] OData fixes and alert fixes.

---
 .../Assets/Queries/AssetQueryParser.cs                 |  6 +++++-
 .../Contents/Queries/ContentQueryParser.cs             |  4 ++++
 frontend/app/_theme.html                               |  1 +
 .../angular/modals/dialog-renderer.component.html      |  7 +++----
 .../angular/modals/dialog-renderer.component.scss      | 10 ++++++++--
 frontend/app/theme/_bootstrap-vars.scss                |  2 ++
 frontend/app/theme/_bootstrap.scss                     |  2 ++
 7 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs
index c5d09dbcb..886acbb2a 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs
@@ -1,4 +1,4 @@
-// ==========================================================================
+// ==========================================================================
 //  Squidex Headless CMS
 // ==========================================================================
 //  Copyright (c) Squidex UG (haftungsbeschraenkt)
@@ -128,6 +128,10 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries
             {
                 return edmModel.ParseQuery(odata).ToQuery();
             }
+            catch (ValidationException)
+            {
+                throw;
+            }
             catch (NotSupportedException)
             {
                 throw new ValidationException(T.Get("common.odataNotSupported", new { odata }));
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs
index 6175508a4..bfb14c32d 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs
@@ -193,6 +193,10 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries
 
                 return model.ParseQuery(odata).ToQuery();
             }
+            catch (ValidationException)
+            {
+                throw;
+            }
             catch (NotSupportedException)
             {
                 throw new ValidationException(T.Get("common.odataNotSupported", new { odata }));
diff --git a/frontend/app/_theme.html b/frontend/app/_theme.html
index 5aed4d7e3..ff2b9936e 100644
--- a/frontend/app/_theme.html
+++ b/frontend/app/_theme.html
@@ -1119,6 +1119,7 @@
                     <div class="bs-component">
                         <div class="alert alert-dismissible alert-warning mt-2">
                             <button type="button" class="btn-close" data-dismiss="alert"></button>
+                            <div class="overlay"></div>
 
                             <h4>Warning!</h4>
 
diff --git a/frontend/app/framework/angular/modals/dialog-renderer.component.html b/frontend/app/framework/angular/modals/dialog-renderer.component.html
index 27b3fd95d..e81780cb0 100644
--- a/frontend/app/framework/angular/modals/dialog-renderer.component.html
+++ b/frontend/app/framework/angular/modals/dialog-renderer.component.html
@@ -31,12 +31,11 @@
 </ng-container>
 
 <div class="notification-container notification-container-bottom-right">
-    <div class="alert alert-dismissible alert-{{notification.messageType}} overlayed" *ngFor="let notification of snapshot.notifications" (click)="close(notification)" @fade>
+    <div class="alert alert-dismissible alert-{{notification.messageType}} shadowed" *ngFor="let notification of snapshot.notifications" (click)="close(notification)" @fade>
         <button type="button" class="btn-close" data-dismiss="alert" (close)="close(notification)"></button>
 
-        <span [innerHTML]="notification.message | sqxTranslate | sqxMarkdown"></span>
-
-        <div class="overlay"></div>
+        <div class="shadow"></div>
+        <div class="shadowed" [innerHTML]="notification.message | sqxTranslate | sqxMarkdown"></div>
     </div>
 </div>
 
diff --git a/frontend/app/framework/angular/modals/dialog-renderer.component.scss b/frontend/app/framework/angular/modals/dialog-renderer.component.scss
index 7e919c742..a28b95ab8 100644
--- a/frontend/app/framework/angular/modals/dialog-renderer.component.scss
+++ b/frontend/app/framework/angular/modals/dialog-renderer.component.scss
@@ -32,11 +32,16 @@
         @include fixed(auto, auto, 0, 0);
     }
 
-    .overlayed {
+    .shadow,
+    .shadowed {
         position: relative;
     }
 
-    .overlay {
+    .shadowed {
+        z-index: 2;
+    }
+
+    .shadow {
         @include absolute(0, auto, 0, 0);
         animation: width 10s 1 linear;
         background: $color-black;
@@ -44,6 +49,7 @@
         opacity: .1;
         overflow: hidden;
         width: 100%;
+        z-index: 1;
     }
 }
 
diff --git a/frontend/app/theme/_bootstrap-vars.scss b/frontend/app/theme/_bootstrap-vars.scss
index 1b6dc433d..68764b3bf 100644
--- a/frontend/app/theme/_bootstrap-vars.scss
+++ b/frontend/app/theme/_bootstrap-vars.scss
@@ -53,6 +53,8 @@ $btn-border-width:              1px;
 $btn-white-space:               nowrap;
 
 // Alerts
+$alert-color-scale:             -100%;
+$alert-bg-scale:                0%;
 $alert-link-font-weight:        normal;
 
 // Labels
diff --git a/frontend/app/theme/_bootstrap.scss b/frontend/app/theme/_bootstrap.scss
index 3d13479ee..82e154b02 100644
--- a/frontend/app/theme/_bootstrap.scss
+++ b/frontend/app/theme/_bootstrap.scss
@@ -57,6 +57,8 @@
 }
 
 .alert {
+    word-break: break-word;
+
     .alert-link {
         color: inherit;
     }