From f390b432d585357a8adc0efb6ecc4a199b69b8d0 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Wed, 28 Feb 2024 20:58:41 +0100
Subject: [PATCH] Fix ydotnet sync.

---
 backend/src/Squidex/Config/Web/WebServices.cs   |  1 +
 backend/src/Squidex/Squidex.csproj              | 12 ++++++------
 .../Contents/GraphQL/TestAsset.cs               | 10 +++++-----
 .../editor/content-editor.component.html        |  6 +++---
 .../editor/content-editor.component.scss        |  1 +
 .../framework/angular/list-view.component.html  |  2 +-
 .../framework/angular/list-view.component.ts    |  3 +++
 .../shared/components/cursors.component.html    | 17 ++++++++---------
 .../shared/components/cursors.component.scss    |  6 ++----
 9 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/backend/src/Squidex/Config/Web/WebServices.cs b/backend/src/Squidex/Config/Web/WebServices.cs
index 36987d0f1..529683a0b 100644
--- a/backend/src/Squidex/Config/Web/WebServices.cs
+++ b/backend/src/Squidex/Config/Web/WebServices.cs
@@ -76,6 +76,7 @@ public static class WebServices
         services.AddLocalization();
 
         services.AddYDotNet()
+            .AutoCleanup()
             .AddWebSockets();
 
         services.AddMvc(options =>
diff --git a/backend/src/Squidex/Squidex.csproj b/backend/src/Squidex/Squidex.csproj
index d1e17a3fe..0794d4439 100644
--- a/backend/src/Squidex/Squidex.csproj
+++ b/backend/src/Squidex/Squidex.csproj
@@ -76,13 +76,13 @@
     <PackageReference Include="Squidex.Messaging.All" Version="6.3.7" />
     <PackageReference Include="Squidex.Messaging.Subscriptions" Version="6.3.7" />
     <PackageReference Include="Squidex.OpenIddict.MongoDb" Version="5.1.0" />
-    <PackageReference Include="Squidex.YDotNet" Version="0.2.9" />
-    <PackageReference Include="Squidex.YDotNet.Native" Version="0.2.9" />
-    <PackageReference Include="Squidex.YDotNet.Server" Version="0.2.9" />
-    <PackageReference Include="Squidex.YDotNet.Server.MongoDB" Version="0.2.9" />
-    <PackageReference Include="Squidex.YDotNet.Server.Redis" Version="0.2.9" />
-    <PackageReference Include="Squidex.YDotNet.Server.WebSockets" Version="0.2.9" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
+    <PackageReference Include="YDotNet" Version="0.3.0" />
+    <PackageReference Include="YDotNet.Native" Version="0.3.0" />
+    <PackageReference Include="YDotNet.Server" Version="0.3.0" />
+    <PackageReference Include="YDotNet.Server.MongoDB" Version="0.3.0" />
+    <PackageReference Include="YDotNet.Server.Redis" Version="0.3.0" />
+    <PackageReference Include="YDotNet.Server.WebSockets" Version="0.3.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs
index de9fd1414..79c1b6cca 100644
--- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs
+++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs
@@ -76,16 +76,16 @@ public static class TestAsset
             MimeType = "image/png",
             Type = AssetType.Image,
             MetadataText = "metadata-text",
-            Metadata =new AssetMetadata
+            Metadata = new AssetMetadata
             {
                 [KnownMetadataKeys.PixelWidth] = 800,
                 [KnownMetadataKeys.PixelHeight] = 600,
             },
-            TagNames = new[]
-            {
+            TagNames =
+            [
                 "tag1",
-                "tag2"
-            }.ToHashSet()
+                "tag2",
+            ]
         };
 
         return asset;
diff --git a/frontend/src/app/features/content/pages/content/editor/content-editor.component.html b/frontend/src/app/features/content/pages/content/editor/content-editor.component.html
index 683820fac..e96238501 100644
--- a/frontend/src/app/features/content/pages/content/editor/content-editor.component.html
+++ b/frontend/src/app/features/content/pages/content/editor/content-editor.component.html
@@ -1,6 +1,6 @@
 <sqx-form-error bubble="true" closeable="true" [error]="(contentForm.error | async)"></sqx-form-error>
 
-<sqx-list-view>
+<sqx-list-view noPadding="true">
     <ng-container topHeader>        
         <div class="alert alert-danger" *ngIf="!contentVersion && isDeleted">
             {{ 'contents.deleted' | sqxTranslate }}
@@ -29,6 +29,8 @@
 
     <ng-container>
         <div class="cursors" sqxCursors>
+            <sqx-cursors></sqx-cursors>
+
             <sqx-content-section *ngFor="let section of contentForm.sections; trackBy: trackBySection"
                 [form]="contentForm"
                 [formCompare]="contentFormCompare"
@@ -40,8 +42,6 @@
                 [languages]="languages"
                 [schema]="schema">
             </sqx-content-section>
-
-            <sqx-cursors></sqx-cursors>
         </div>
     </ng-container>
 </sqx-list-view>
\ No newline at end of file
diff --git a/frontend/src/app/features/content/pages/content/editor/content-editor.component.scss b/frontend/src/app/features/content/pages/content/editor/content-editor.component.scss
index ebbf7ffc0..3625928d3 100644
--- a/frontend/src/app/features/content/pages/content/editor/content-editor.component.scss
+++ b/frontend/src/app/features/content/pages/content/editor/content-editor.component.scss
@@ -39,4 +39,5 @@
 
 .cursors {
     position: relative;
+    padding: 1.5rem;
 }
\ No newline at end of file
diff --git a/frontend/src/app/framework/angular/list-view.component.html b/frontend/src/app/framework/angular/list-view.component.html
index 2f29f4efa..b2f6f668b 100644
--- a/frontend/src/app/framework/angular/list-view.component.html
+++ b/frontend/src/app/framework/angular/list-view.component.html
@@ -10,7 +10,7 @@
     </div>
     
     <div class="list-content normal" [class.loading-indicator]="isLoading" #contentElement sqxCompensateScrollbar>
-        <div class="inner normal" [style.minWidth]="innerWidth" [style.maxWidth]="innerWidth" [class.tabled]="table">
+        <div class="inner normal" [style.minWidth]="innerWidth" [style.maxWidth]="innerWidth" [class.tabled]="table" [class.tabled2]="noPadding">
             <ng-container *ngTemplateOutlet="contentTemplate"></ng-container>
         </div>
     </div>
diff --git a/frontend/src/app/framework/angular/list-view.component.ts b/frontend/src/app/framework/angular/list-view.component.ts
index 172b5c593..d08bac8fb 100644
--- a/frontend/src/app/framework/angular/list-view.component.ts
+++ b/frontend/src/app/framework/angular/list-view.component.ts
@@ -58,6 +58,9 @@ export class ListViewComponent extends StatefulComponent<State> implements After
     @Input({ transform: booleanAttribute })
     public tableNoPadding?: boolean | null;
 
+    @Input({ transform: booleanAttribute })
+    public noPadding?: boolean | null;
+
     @Input({ transform: booleanAttribute })
     public isLoaded: boolean | undefined | null = true;
 
diff --git a/frontend/src/app/shared/components/cursors.component.html b/frontend/src/app/shared/components/cursors.component.html
index b13c309cc..1ab93c01e 100644
--- a/frontend/src/app/shared/components/cursors.component.html
+++ b/frontend/src/app/shared/components/cursors.component.html
@@ -1,11 +1,10 @@
-<div class="cursors">
-    <div *ngFor="let cursor of otherCursor | async; trackBy: trackByUser" class="cursor"
-        [style.left]="sizeInPx(cursor.cursor.x)"
-        [style.top]="sizeInPx(cursor.cursor.y)">
-        <div class="user" [style.background]="cursor.user.id | sqxStringColor">
-            {{cursor.user.displayName}}
-        </div>
-
-        <i [style.color]="cursor.user.id | sqxStringColor" class="icon-mouse-pointer"></i>
+<div *ngFor="let cursor of otherCursor | async; trackBy: trackByUser" class="cursor"
+    [style.left]="sizeInPx(cursor.cursor.x)"
+    [style.top]="sizeInPx(cursor.cursor.y)"
+    [class.hidden]="cursor.cursor.x < 0">
+    <div class="user" [style.background]="cursor.user.id | sqxStringColor">
+        {{cursor.user.displayName}}
     </div>
+
+    <i [style.color]="cursor.user.id | sqxStringColor" class="icon-mouse-pointer"></i>
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/shared/components/cursors.component.scss b/frontend/src/app/shared/components/cursors.component.scss
index 5985bc6b1..01223c36a 100644
--- a/frontend/src/app/shared/components/cursors.component.scss
+++ b/frontend/src/app/shared/components/cursors.component.scss
@@ -1,12 +1,10 @@
 @import 'mixins';
 @import 'vars';
 
-.root {
-    position: relative;
-}
-
 .cursor {
     position: absolute;
+    pointer-events: none;
+    z-index: 100;
 }
 
 .user {