Fixed grid column and row index

Author: usercode

src/DragonFly.AspNetCore/Interceptors/WebHookInterceptor.cs

@@ -27,12 +27,7 @@ public WebHookInterceptor(
     /// </summary>
     public HttpClient HttpClient { get; }
 
-    public ILogger<WebHookInterceptor> Logger { get; }
-
-    public async Task OnDeletedAsync(IDataStorage storage, ContentItem contentItem)
-    {
-        
-    }
+    public ILogger<WebHookInterceptor> Logger { get; }    
 
     public async Task OnPublishedAsync(IDataStorage storage, ContentItem contentItem)
     {
@@ -112,8 +107,18 @@ public async Task OnUnpublishedAsync(IDataStorage storage, ContentItem contentIt
         }
     }
 
+    public async Task OnCreatedAsync(IDataStorage storage, ContentItem contentItem)
+    {
+
+    }
+
     public async Task OnUpdatedAsync(IDataStorage storage, ContentItem contentItem)
     {
-        
+
+    }
+
+    public async Task OnDeletedAsync(IDataStorage storage, ContentItem contentItem)
+    {
+
     }
 }

src/DragonFly.BlockField.Client/Pages/Blocks/GridBlockView.razor

@@ -99,7 +99,7 @@
         {
             GridItem currentItem = item;
 
-            <div class="grid-item" style="grid-column: @(item.ColumnStart * 2 - 1 + 3) / @(item.ColumnEnd * 2 - 1 + 3); grid-row: @(item.RowStart * 2 + 2) / @(item.RowEnd * 2 + 2)">
+            <div class="grid-item" style="grid-column: @(CalcPosStart(item.ColumnStart)) / @(CalcPosEnd(item.ColumnEnd)); grid-row: @(CalcPosStart(item.RowStart)) / @(CalcPosEnd(item.RowEnd))">
                 <div style="display:grid; grid-template-columns: auto 1fr auto; grid-template-rows: auto 1fr auto; width: 100%; height: 100%;">
                     <!--left-->
                     <div style="display:flex; flex-direction: column; align-items: stretch; justify-content: center; grid-column: 1; grid-row: 2">
@@ -125,6 +125,10 @@
                     <div style="display:flex; grid-column: 3; grid-row: 1">
                         <BSButton Color="BSColor.Light" OnClick="x => Block.Items.Remove(currentItem)" title="Remove block"><i class="fas fa-times"></i></BSButton>
                     </div>
+                    <!--position-->
+                    <div style="display:flex; grid-column: 1; grid-row: 1; justify-content: center; align-items: center">
+                        <span>@item.ColumnStart / @item.ColumnEnd</span>
+                    </div>
                     <!--field-->
                     <div style="display:flex; grid-column: 2; grid-row: 2; align-items:center; justify-content: center">
                         @ComponentManager.CreateComponent(item.Block)
@@ -147,6 +151,16 @@
 
     }
 
+    private int CalcPosStart(int value)
+    {
+        return  value * 2 + 2;
+    }
+
+    private int CalcPosEnd(int value)
+    {
+        return value * 2 + 1;
+    }
+
     private string GetTemplate(ICollection<GridSpan> spans)
     {
         List<string> builder = new List<string>(spans.Count * 2 + 3);

src/DragonFly.Core/Interceptors/IContentInterceptor.cs

@@ -6,6 +6,8 @@ namespace DragonFly;
 
 public interface IContentInterceptor
 {
+    Task OnCreatedAsync(IDataStorage storage, ContentItem contentItem);
+
     Task OnUpdatedAsync(IDataStorage storage, ContentItem contentItem);
 
     Task OnDeletedAsync(IDataStorage storage, ContentItem contentItem);

src/DragonFly.MongoDB/Storages/MongoStorage.ContentItem.cs

@@ -194,27 +194,33 @@ public async Task<QueryResult<ContentItem>> QueryAsync(ContentQuery query)
         return queryResult;
     }
 
-    public async Task CreateAsync(ContentItem contentItem)
+    public async Task CreateAsync(ContentItem content)
     {
-        if (contentItem.Id == Guid.Empty)
+        if (content.Id == Guid.Empty)
         {
-            contentItem.Id = Guid.NewGuid();
+            content.Id = Guid.NewGuid();
         }
 
         DateTime now = DateTimeService.Current();
 
-        contentItem.CreatedAt = now;
-        contentItem.ModifiedAt = now;
+        content.CreatedAt = now;
+        content.ModifiedAt = now;
 
-        var items = GetMongoCollection(contentItem.Schema.Name);
+        var items = GetMongoCollection(content.Schema.Name);
 
-        contentItem.Validate();
+        content.Validate();
 
-        MongoContentItem mongo = contentItem.ToMongo();
+        MongoContentItem mongo = content.ToMongo();
 
         await items.InsertOneAsync(mongo);
 
-        contentItem.Id = mongo.Id;
+        content.Id = mongo.Id;
+
+        //execute interceptors
+        foreach (IContentInterceptor interceptor in Interceptors)
+        {
+            await interceptor.OnCreatedAsync(this, content);
+        }
     }
 
     public async Task UpdateAsync(ContentItem contentItem)