Allows to query referenced content

Author: usercode

src/DragonFly.ApiKeys/DragonFly.ApiKeys.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<ItemGroup>
-		<PackageReference Include="MongoDB.Driver" Version="3.3.0" />
+		<PackageReference Include="MongoDB.Driver" Version="3.4.0" />
 	</ItemGroup>
 
 	<ItemGroup>

src/DragonFly.Assets.ImageSharp/Actions/CropWhitespacesAssetAction.cs

@@ -13,8 +13,6 @@ public class CropWhitespacesAssetAction : IAssetAction
 {
     public string Name => "CropWhitespaces";
 
-    public string[] MimeTypes => throw new NotImplementedException();
-
     public async Task<bool> ProcessAsync(IAssetActionContext context)
     {
         Image<Rgb24> image;

src/DragonFly.Client/Extensions/NavigationManagerExtensions.cs

@@ -27,4 +27,9 @@ public static void NavigateToContent(this NavigationManager manager, ContentItem
     {
         manager.NavigateTo($"content/{content.Schema.Name}/{content.Id}");
     }
+
+    public static void NavigateToContentQuery(this NavigationManager manager, string schema, ContentReference? reference)
+    {
+        manager.NavigateTo($"content/{schema}?ref={reference}");
+    }
 }

src/DragonFly.Client/Pages/ContentItems/ContentItemDetail.razor.cs

@@ -5,10 +5,6 @@
 using BlazorStrap;
 using DragonFly.Razor.Base;
 using Microsoft.AspNetCore.Components;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.JSInterop;
 using BlazorStrap.V5;
 using DragonFly.Razor.Extensions;

src/DragonFly.Client/Pages/ContentItems/ContentItemList.razor.cs

@@ -4,10 +4,6 @@
 
 using BlazorStrap;
 using Microsoft.AspNetCore.Components;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace DragonFly.Client.Pages.ContentItems;
 
@@ -48,6 +44,9 @@ public partial class ContentItemList
     [SupplyParameterFromQuery]
     public string State { get; set; }
 
+    [SupplyParameterFromQuery]
+    public string? Ref { get; set; }
+
     protected override void BuildToolbarItems(IList<ToolbarItem> toolbarItems)
     {
         base.BuildToolbarItems(toolbarItems);
@@ -88,9 +87,14 @@ protected override async Task RefreshActionAsync()
                 }
             }
 
-            ContentQuery quey = CreateQuery();
+            ContentQuery query = CreateQuery();
+
+            if (ContentReference.TryParse(Ref, null, out ContentReference contentReference))
+            {
+                query.Reference = contentReference;
+            }
 
-            SearchResult = await ContentService.QueryAsync(quey);
+            SearchResult = await ContentService.QueryAsync(query);
         }
     }
 

src/DragonFly.Client/Pages/ContentReferences/ReferencedBy.razor

@@ -1,9 +1,11 @@
-<BSListGroup>
+@inject NavigationManager NavigationManager
+
+<BSListGroup>
     @if (ReferenceIndex != null)
     {
         foreach (var content in ReferenceIndex.Entries)
         {
-            <BSListGroupItem>@content.Schema (@content.Count)</BSListGroupItem>
+            <BSListGroupItem> <BSButton Color="BSColor.Primary" OnClick="x => NavigateToQuery(content.Schema)">@content.Schema (@content.Count)</BSButton></BSListGroupItem>
         }
     }
 </BSListGroup>
@@ -26,4 +28,9 @@
 
         ReferenceIndex = result.Value;
     }
+
+    private void NavigateToQuery(string schema)
+    {
+        NavigationManager.NavigateToContentQuery(schema, new ContentReference(Schema, Id));
+    }
 }

src/DragonFly.Core/Modules/ContentItems/Models/References/ContentReference.cs

@@ -2,6 +2,8 @@
 // https://github.com/usercode/DragonFly
 // MIT License
 
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 using DragonFly.Core;
 
@@ -10,9 +12,43 @@ namespace DragonFly;
 /// <summary>
 /// ContentReference
 /// </summary>
-[JsonConverter(typeof(ContentReferenceConverter))]
-public readonly struct ContentReference : IEquatable<ContentReference>
+[JsonConverter(typeof(ContentReferenceJsonConverter))]
+[TypeConverter(typeof(ContentReferenceTypeConverter))]
+public readonly struct ContentReference : IEquatable<ContentReference>, IParsable<ContentReference>
 {
+    public static ContentReference Parse(string s, IFormatProvider? provider)
+    {
+        if (TryParse(s, provider, out ContentReference result))
+        {
+            return result;
+        }
+
+        throw new Exception();
+    }
+
+    public static bool TryParse([NotNullWhen(true)] string? s, IFormatProvider? provider, [MaybeNullWhen(false)] out ContentReference result)
+    {
+        if (s == null)
+        {
+            result = default;
+
+            return false;
+        }
+
+        int pos = s.IndexOf('/');
+
+        if (pos == -1)
+        {
+            result = default;
+
+            return false;
+        }
+
+        result = new ContentReference(s[..pos], Guid.Parse(s[(pos + 1)..]));
+
+        return true;
+    }
+
     public ContentReference(string schema, Guid id)
     {
         Schema = schema;
@@ -52,7 +88,7 @@ public override int GetHashCode()
     public override string ToString()
     {
         return $"{Schema}/{Id}";
-    }
+    }   
 
     public static bool operator ==(ContentReference left, ContentReference right)
     {

…/References/ContentReferenceConverter.cs …erences/ContentReferenceJsonConverter.cssrc/DragonFly.Core/Modules/ContentItems/Models/References/ContentReferenceConverter.cs renamed to src/DragonFly.Core/Modules/ContentItems/Models/References/ContentReferenceJsonConverter.cs src/DragonFly.Core/Modules/ContentItems/Models/References/ContentReferenceConverter.cs renamed to src/DragonFly.Core/Modules/ContentItems/Models/References/ContentReferenceJsonConverter.cs

@@ -2,12 +2,13 @@
 // https://github.com/usercode/DragonFly
 // MIT License
 
+using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace DragonFly.Core;
 
-internal class ContentReferenceConverter : JsonConverter<ContentReference>
+internal class ContentReferenceJsonConverter : JsonConverter<ContentReference>
 {
     public override ContentReference Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
@@ -18,9 +19,7 @@ public override ContentReference Read(ref Utf8JsonReader reader, Type typeToConv
             throw new Exception();
         }
 
-        int pos = value.IndexOf('/');
-
-        return new ContentReference(value[..pos], Guid.Parse(value[(pos + 1)..]));
+        return ContentReference.Parse(value, CultureInfo.InvariantCulture);
     }
 
     public override void Write(Utf8JsonWriter writer, ContentReference value, JsonSerializerOptions options)

src/DragonFly.Core/Modules/ContentItems/Models/References/ContentReferenceTypeConverter.cs

@@ -0,0 +1,26 @@
+// Copyright (c) usercode
+// https://github.com/usercode/DragonFly
+// MIT License
+
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DragonFly.Core;
+
+internal class ContentReferenceTypeConverter : TypeConverter
+{
+    public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
+    {
+        return sourceType == typeof(string);
+    }
+
+    public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
+    {
+        if (value is string stringValue)
+        {
+            return ContentReference.Parse(stringValue, culture);
+        }
+
+        return base.ConvertFrom(context, culture, value);
+    }
+}

src/DragonFly.Identity/DragonFly.Identity.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<ItemGroup>
-		<PackageReference Include="MongoDB.Driver" Version="3.3.0" />
+		<PackageReference Include="MongoDB.Driver" Version="3.4.0" />
 	</ItemGroup>
 
 	<ItemGroup>