Merge pull request #25 from jcdcdev/dev/v14

jcdcdev · web-flow · commit 79687bc2b102 · 2024-07-04T21:58:46.000+01:00
14.0.1
diff --git a/.github/README.md b/.github/README.md
@@ -3,6 +3,7 @@
 [![Umbraco Marketplace](https://img.shields.io/badge/Umbraco-Marketplace-%233544B1?style=flat&logo=umbraco)](https://marketplace.umbraco.com/package/jcdcdev.umbraco.readingtime)
 [![GitHub License](https://img.shields.io/github/license/jcdcdev/jcdcdev.Umbraco.ReadingTime?color=8AB803&label=License&logo=github)](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/blob/main/LICENSE)
 [![NuGet Downloads](https://img.shields.io/nuget/dt/jcdcdev.Umbraco.ReadingTime?color=cc9900&label=Downloads&logo=nuget)](https://www.nuget.org/packages/jcdcdev.Umbraco.ReadingTime/)
+[![Project Website](https://img.shields.io/badge/Project%20Website-jcdc.dev-jcdcdev?style=flat&color=3c4834&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0id2hpdGUiIGNsYXNzPSJiaSBiaS1wYy1kaXNwbGF5IiB2aWV3Qm94PSIwIDAgMTYgMTYiPgogIDxwYXRoIGQ9Ik04IDFhMSAxIDAgMCAxIDEtMWg2YTEgMSAwIDAgMSAxIDF2MTRhMSAxIDAgMCAxLTEgMUg5YTEgMSAwIDAgMS0xLTF6bTEgMTMuNWEuNS41IDAgMSAwIDEgMCAuNS41IDAgMCAwLTEgMG0yIDBhLjUuNSAwIDEgMCAxIDAgLjUuNSAwIDAgMC0xIDBNOS41IDFhLjUuNSAwIDAgMCAwIDFoNWEuNS41IDAgMCAwIDAtMXpNOSAzLjVhLjUuNSAwIDAgMCAuNS41aDVhLjUuNSAwIDAgMCAwLTFoLTVhLjUuNSAwIDAgMC0uNS41TTEuNSAyQTEuNSAxLjUgMCAwIDAgMCAzLjV2N0ExLjUgMS41IDAgMCAwIDEuNSAxMkg2djJoLS41YS41LjUgMCAwIDAgMCAxSDd2LTRIMS41YS41LjUgMCAwIDEtLjUtLjV2LTdhLjUuNSAwIDAgMSAuNS0uNUg3VjJ6Ii8+Cjwvc3ZnPg==)](https://jcdc.dev/umbraco-packages/reading-time)
 
 Custom Data Type for calculating reading time. With full variant support! 
 
diff --git a/docs/README_nuget.md b/docs/README_nuget.md
@@ -4,6 +4,7 @@
 [![Umbraco Marketplace](https://img.shields.io/badge/Umbraco-Marketplace-%233544B1?style=flat&logo=umbraco)](https://marketplace.umbraco.com/package/jcdcdev.umbraco.readingtime)
 [![GitHub License](https://img.shields.io/github/license/jcdcdev/jcdcdev.Umbraco.ReadingTime?color=8AB803&label=License&logo=github)](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/blob/main/LICENSE)
 [![NuGet Downloads](https://img.shields.io/nuget/dt/jcdcdev.Umbraco.ReadingTime?color=cc9900&label=Downloads&logo=nuget)](https://www.nuget.org/packages/jcdcdev.Umbraco.ReadingTime/)
+[![Project Website](https://img.shields.io/badge/Project%20Website-jcdc.dev-jcdcdev?style=flat&color=3c4834&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0id2hpdGUiIGNsYXNzPSJiaSBiaS1wYy1kaXNwbGF5IiB2aWV3Qm94PSIwIDAgMTYgMTYiPgogIDxwYXRoIGQ9Ik04IDFhMSAxIDAgMCAxIDEtMWg2YTEgMSAwIDAgMSAxIDF2MTRhMSAxIDAgMCAxLTEgMUg5YTEgMSAwIDAgMS0xLTF6bTEgMTMuNWEuNS41IDAgMSAwIDEgMCAuNS41IDAgMCAwLTEgMG0yIDBhLjUuNSAwIDEgMCAxIDAgLjUuNSAwIDAgMC0xIDBNOS41IDFhLjUuNSAwIDAgMCAwIDFoNWEuNS41IDAgMCAwIDAtMXpNOSAzLjVhLjUuNSAwIDAgMCAuNS41aDVhLjUuNSAwIDAgMCAwLTFoLTVhLjUuNSAwIDAgMC0uNS41TTEuNSAyQTEuNSAxLjUgMCAwIDAgMCAzLjV2N0ExLjUgMS41IDAgMCAwIDEuNSAxMkg2djJoLS41YS41LjUgMCAwIDAgMCAxSDd2LTRIMS41YS41LjUgMCAwIDEtLjUtLjV2LTdhLjUuNSAwIDAgMSAuNS0uNUg3VjJ6Ii8+Cjwvc3ZnPg==)](https://jcdc.dev/umbraco-packages/reading-time)
 
 Custom Data Type for calculating reading time. With full variant support!
 
diff --git a/src/jcdcdev.Umbraco.ReadingTime.Client/package-lock.json b/src/jcdcdev.Umbraco.ReadingTime.Client/package-lock.json
diff --git a/src/jcdcdev.Umbraco.ReadingTime.Client/package.json b/src/jcdcdev.Umbraco.ReadingTime.Client/package.json
@@ -16,7 +16,7 @@
 		"@hey-api/openapi-ts": "^0.46.3",
 		"@umbraco-cms/backoffice": "^14.0.0",
 		"typescript": "^5.0.2",
-		"vite": "^4.4.5"
+		"vite": "^4.5.3"
 	},
 	"volta": {
 		"node": "21.7.3"
diff --git a/src/jcdcdev.Umbraco.ReadingTime.Client/src/context/reading-time.context.ts b/src/jcdcdev.Umbraco.ReadingTime.Client/src/context/reading-time.context.ts
@@ -10,8 +10,8 @@ export class ReadingTimeContext extends UmbControllerBase {
 
     constructor(host: UmbControllerHost) {
         super(host);
-        this.provideContext(READING_TIME_CONTEXT_TOKEN, this);
         this.#repository = new ReadingTimeRepository(this);
+        this.provideContext(READING_TIME_CONTEXT_TOKEN, this);
     }
 
     async getReadingTime(contentKey: string, dataTypeKey: string, culture?: string): Promise<UmbDataSourceResponse<ReadingTimeResponse>> {
diff --git a/src/jcdcdev.Umbraco.ReadingTime.Client/src/editors/reading-time.editor.ts b/src/jcdcdev.Umbraco.ReadingTime.Client/src/editors/reading-time.editor.ts
@@ -6,7 +6,7 @@ import {UMB_ENTITY_CONTEXT} from "@umbraco-cms/backoffice/entity";
 import {UMB_PROPERTY_CONTEXT} from "@umbraco-cms/backoffice/property";
 import {UMB_CONTENT_PROPERTY_CONTEXT} from "@umbraco-cms/backoffice/content";
 import {ReadingTimeResponse} from "../api";
-import {ReadingTimeContext} from "../context/reading-time.context.ts";
+import {READING_TIME_CONTEXT_TOKEN, ReadingTimeContext} from "../context/reading-time.context.ts";
 import {css, nothing, PropertyValues} from "lit";
 import {UMB_ACTION_EVENT_CONTEXT} from "@umbraco-cms/backoffice/action";
 import {UmbRequestReloadStructureForEntityEvent} from "@umbraco-cms/backoffice/entity-action";
@@ -51,7 +51,11 @@ export default class ReadingTimePropertyEditorUi extends UmbElementMixin(LitElem
 
     constructor() {
         super();
-        this.#readingTimeContext = new ReadingTimeContext(this);
+
+        this.consumeContext(READING_TIME_CONTEXT_TOKEN, (context) => {
+            this.#readingTimeContext = context;
+        });
+
         this.consumeContext(UMB_ENTITY_CONTEXT, (context) => {
             this.contentKey = context.getUnique() ?? undefined;
         });
diff --git a/src/jcdcdev.Umbraco.ReadingTime.Client/src/index.ts b/src/jcdcdev.Umbraco.ReadingTime.Client/src/index.ts
@@ -3,8 +3,10 @@ import {manifests as editors} from './editors/manifest.ts';
 import {UMB_AUTH_CONTEXT} from "@umbraco-cms/backoffice/auth";
 import {OpenAPI} from "./api";
 import {UmbEntryPointOnInit} from "@umbraco-cms/backoffice/extension-api";
+import {ReadingTimeContext} from "./context/reading-time.context.ts";
 
 export const onInit: UmbEntryPointOnInit = (_host, extensionRegistry) => {
+    new ReadingTimeContext(_host);
     extensionRegistry.registerMany([
         ...editors,
     ]);
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Core/Composing/ReadingTimeValueProviderCollection.cs b/src/jcdcdev.Umbraco.ReadingTime/Core/Composing/ReadingTimeValueProviderCollection.cs
@@ -2,9 +2,4 @@
 
 namespace jcdcdev.Umbraco.ReadingTime.Core.Composing;
 
-public class ReadingTimeValueProviderCollection : BuilderCollectionBase<IReadingTimeValueProvider>
-{
-    public ReadingTimeValueProviderCollection(Func<IEnumerable<IReadingTimeValueProvider>> items) : base(items)
-    {
-    }
-}
+public class ReadingTimeValueProviderCollection(Func<IEnumerable<IReadingTimeValueProvider>> items) : BuilderCollectionBase<IReadingTimeValueProvider>(items);
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Core/Extensions/UmbracoBuilderExtensions.cs b/src/jcdcdev.Umbraco.ReadingTime/Core/Extensions/UmbracoBuilderExtensions.cs
@@ -5,7 +5,6 @@
 using jcdcdev.Umbraco.ReadingTime.Infrastructure.Persistence;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Extensions;
 
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Core/Models/ReadingTimeValueModel.cs b/src/jcdcdev.Umbraco.ReadingTime/Core/Models/ReadingTimeValueModel.cs
@@ -3,20 +3,12 @@
 
 namespace jcdcdev.Umbraco.ReadingTime.Core.Models;
 
-public class ReadingTimeValueModel
+public class ReadingTimeValueModel(TimeSpan? readingTime, TimeUnit minUnit, TimeUnit maxUnit, string? culture)
 {
-    public ReadingTimeValueModel(TimeSpan? readingTime, TimeUnit minUnit, TimeUnit maxUnit, string? culture)
-    {
-        MinUnit = minUnit;
-        MaxUnit = maxUnit;
-        ReadingTime = readingTime;
-        Culture = culture;
-    }
-
-    public string? Culture { get; }
-    public TimeSpan? ReadingTime { get; }
-    public TimeUnit MinUnit { get; }
-    public TimeUnit MaxUnit { get; }
+    public string? Culture { get; } = culture;
+    public TimeSpan? ReadingTime { get; } = readingTime;
+    public TimeUnit MinUnit { get; } = minUnit;
+    public TimeUnit MaxUnit { get; } = maxUnit;
 
     public string DisplayTime(TimeUnit? minUnit = null, TimeUnit? maxUnit = null)
     {
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Core/Models/ReadingTimeVariantDto.cs b/src/jcdcdev.Umbraco.ReadingTime/Core/Models/ReadingTimeVariantDto.cs
@@ -4,8 +4,7 @@ namespace jcdcdev.Umbraco.ReadingTime.Core.Models;
 
 public class ReadingTimeVariantDto
 {
-    [DataMember(Name = "culture")]
-    public string? Culture { get; set; }
-    [DataMember(Name = "readingTime")]
-    public TimeSpan? ReadingTime { get; set; }
+    [DataMember(Name = "culture")] public string? Culture { get; set; }
+
+    [DataMember(Name = "readingTime")] public TimeSpan? ReadingTime { get; set; }
 }
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Core/PropertyEditors/ReadingTimeConfigurationEditor.cs b/src/jcdcdev.Umbraco.ReadingTime/Core/PropertyEditors/ReadingTimeConfigurationEditor.cs
@@ -3,9 +3,4 @@
 
 namespace jcdcdev.Umbraco.ReadingTime.Core.PropertyEditors;
 
-public class ReadingTimeConfigurationEditor : ConfigurationEditor<ReadingTimeConfiguration>
-{
-    public ReadingTimeConfigurationEditor(IIOHelper ioHelper) : base(ioHelper)
-    {
-    }
-}
+public class ReadingTimeConfigurationEditor(IIOHelper ioHelper) : ConfigurationEditor<ReadingTimeConfiguration>(ioHelper);
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Core/PropertyEditors/ReadingTimeDataEditor.cs b/src/jcdcdev.Umbraco.ReadingTime/Core/PropertyEditors/ReadingTimeDataEditor.cs
@@ -9,21 +9,14 @@
 namespace jcdcdev.Umbraco.ReadingTime.Core.PropertyEditors;
 
 [DataEditor(Constants.PropertyEditorUIAlias)]
-public class ReadingTimeDataEditor : DataEditor
+public class ReadingTimeDataEditor(IDataValueEditorFactory dataValueEditorFactory, IIOHelper ioHelper, ILogger<ReadingTimeDataEditor> logger)
+    : DataEditor(dataValueEditorFactory)
 {
-    private readonly IIOHelper _ioHelper;
-    private readonly ILogger _logger;
-
-    public ReadingTimeDataEditor(IDataValueEditorFactory dataValueEditorFactory, IIOHelper ioHelper, ILogger<ReadingTimeDataEditor> logger) : base(
-        dataValueEditorFactory)
-    {
-        _ioHelper = ioHelper;
-        _logger = logger;
-    }
+    private readonly ILogger _logger = logger;
 
     protected override IConfigurationEditor CreateConfigurationEditor()
     {
-        var config = new ReadingTimeConfigurationEditor(_ioHelper);
+        var config = new ReadingTimeConfigurationEditor(ioHelper);
         foreach (var field in config.Fields)
         {
             field.Config["prevalues"] = new List<DropDownPreValue>
@@ -52,14 +45,8 @@ private string GetName(TimeUnit timeUnit)
     }
 }
 
-public class DropDownPreValue
+public class DropDownPreValue(string label, int value)
 {
-    [JsonProperty("label")] public string Label;
-    [JsonProperty("value")] public int Value;
-
-    public DropDownPreValue(string label, int value)
-    {
-        Label = label;
-        Value = value;
-    }
+    [JsonProperty("label")] public string Label = label;
+    [JsonProperty("value")] public int Value = value;
 }
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Core/PropertyEditors/ReadingTimePropertyValueConverter.cs b/src/jcdcdev.Umbraco.ReadingTime/Core/PropertyEditors/ReadingTimePropertyValueConverter.cs
@@ -5,21 +5,13 @@
 
 namespace jcdcdev.Umbraco.ReadingTime.Core.PropertyEditors;
 
-public class ReadingTimePropertyValueConverter : PropertyValueConverterBase
+public class ReadingTimePropertyValueConverter(
+    IReadingTimeService readingTimeService,
+    IVariationContextAccessor variationContextAccessor,
+    ILogger<ReadingTimePropertyValueConverter> logger)
+    : PropertyValueConverterBase
 {
-    private readonly ILogger _logger;
-    private readonly IReadingTimeService _readingTimeService;
-    private readonly IVariationContextAccessor _variationContextAccessor;
-
-    public ReadingTimePropertyValueConverter(
-        IReadingTimeService readingTimeService,
-        IVariationContextAccessor variationContextAccessor,
-        ILogger<ReadingTimePropertyValueConverter> logger)
-    {
-        _readingTimeService = readingTimeService;
-        _variationContextAccessor = variationContextAccessor;
-        _logger = logger;
-    }
+    private readonly ILogger _logger = logger;
 
     public override object? ConvertIntermediateToObject(
         IPublishedElement owner,
@@ -33,8 +25,8 @@ public ReadingTimePropertyValueConverter(
             return null;
         }
 
-        var model = _readingTimeService.GetAsync(key, propertyType.DataType.Id).GetAwaiter().GetResult();
-        var culture = _variationContextAccessor.VariationContext?.Culture;
+        var model = readingTimeService.GetAsync(key, propertyType.DataType.Id).GetAwaiter().GetResult();
+        var culture = variationContextAccessor.VariationContext?.Culture;
         var config = propertyType.DataType.ConfigurationAs<ReadingTimeConfiguration>();
         if (config is null)
         {
@@ -60,5 +52,4 @@ public ReadingTimePropertyValueConverter(
     public override Type GetPropertyValueType(IPublishedPropertyType propertyType) => typeof(ReadingTimeValueModel);
 
     public override bool IsConverter(IPublishedPropertyType propertyType) => propertyType.EditorAlias == Constants.PropertyEditorAlias;
-
 }
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Core/ReadingTimeNotificationHandler.cs b/src/jcdcdev.Umbraco.ReadingTime/Core/ReadingTimeNotificationHandler.cs
@@ -5,32 +5,25 @@
 
 namespace jcdcdev.Umbraco.ReadingTime.Core;
 
-public class ReadingTimeNotificationHandler :
+public class ReadingTimeNotificationHandler(IReadingTimeService readingTimeService, ILocalizedTextService localizedTextService) :
     INotificationAsyncHandler<ContentPublishedNotification>,
     INotificationAsyncHandler<ContentDeletingNotification>
 {
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly IReadingTimeService _readingTimeService;
-
-    public ReadingTimeNotificationHandler(IReadingTimeService readingTimeService, ILocalizedTextService localizedTextService)
-    {
-        _readingTimeService = readingTimeService;
-        _localizedTextService = localizedTextService;
-    }
+    private readonly ILocalizedTextService _localizedTextService = localizedTextService;
 
     public async Task HandleAsync(ContentDeletingNotification notification, CancellationToken cancellationToken)
     {
         foreach (var content in notification.DeletedEntities)
         {
-            await _readingTimeService.DeleteAsync(content.Key);
+            await readingTimeService.DeleteAsync(content.Key);
         }
     }
 
     public async Task HandleAsync(ContentPublishedNotification notification, CancellationToken cancellationToken)
     {
         foreach (var item in notification.PublishedEntities)
         {
-            await _readingTimeService.Process(item);
+            await readingTimeService.Process(item);
         }
     }
 
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Indexing/BlockReadingTimeValueProvider.cs b/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Indexing/BlockReadingTimeValueProvider.cs
@@ -6,25 +6,16 @@
 
 namespace jcdcdev.Umbraco.ReadingTime.Infrastructure.Indexing;
 
-public class BlockReadingTimeValueProvider : ReadingTimeValueProviderBase
+public class BlockReadingTimeValueProvider(IBlockValuePropertyIndexValueFactory converter, IContentTypeService contentTypeService) : ReadingTimeValueProviderBase
 {
-    private readonly IBlockValuePropertyIndexValueFactory _converter;
-    private readonly IContentTypeService _contentTypeService;
-
-    public BlockReadingTimeValueProvider(IBlockValuePropertyIndexValueFactory converter, IContentTypeService contentTypeService)
-    {
-        _converter = converter;
-        _contentTypeService = contentTypeService;
-    }
-
     public override bool CanConvert(IPropertyType type) =>
         type.PropertyEditorAlias is Constants.PropertyEditors.Aliases.BlockGrid or Constants.PropertyEditors.Aliases.BlockList;
 
     public override TimeSpan? GetReadingTime(IProperty property, string? culture, string? segment, IEnumerable<string> availableCultures, ReadingTimeConfiguration config)
     {
         // TODO - Improve this
-        var contentTypeDictionary = _contentTypeService.GetAll().ToDictionary(x => x.Key, x => x);
-        var values = _converter.GetIndexValues(property, culture, segment, true, availableCultures, contentTypeDictionary);
+        var contentTypeDictionary = contentTypeService.GetAll().ToDictionary(x => x.Key, x => x);
+        var values = converter.GetIndexValues(property, culture, segment, true, availableCultures, contentTypeDictionary);
         return ProcessIndexValues(values, config.WordsPerMinute);
     }
 }
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Indexing/LegacyNestedContentReadingTimeValueProvider.cs b/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Indexing/LegacyNestedContentReadingTimeValueProvider.cs
@@ -6,23 +6,16 @@
 
 namespace jcdcdev.Umbraco.ReadingTime.Infrastructure.Indexing;
 
-public class LegacyNestedContentReadingTimeValueProvider : ReadingTimeValueProviderBase
+public class LegacyNestedContentReadingTimeValueProvider(IContentTypeService contentTypeService) : ReadingTimeValueProviderBase
 {
-    private readonly DefaultPropertyIndexValueFactory _converter;
-    private readonly IContentTypeService _contentTypeService;
-
-    public LegacyNestedContentReadingTimeValueProvider(IContentTypeService contentTypeService)
-    {
-        _contentTypeService = contentTypeService;
-        _converter = new DefaultPropertyIndexValueFactory();
-    }
+    private readonly DefaultPropertyIndexValueFactory _converter = new();
 
     public override bool CanConvert(IPropertyType type) => type.PropertyEditorAlias is Constants.PropertyEditors.Aliases.NestedContent;
 
     public override TimeSpan? GetReadingTime(IProperty property, string? culture, string? segment, IEnumerable<string> availableCultures, ReadingTimeConfiguration config)
     {
         // TODO - Improve this
-        var contentTypeDictionary = _contentTypeService.GetAll().ToDictionary(x => x.Key, x => x);
+        var contentTypeDictionary = contentTypeService.GetAll().ToDictionary(x => x.Key, x => x);
         var values = _converter.GetIndexValues(property, culture, segment, true, availableCultures, contentTypeDictionary);
         return ProcessIndexValues(values, config.WordsPerMinute);
     }
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Indexing/ReadingTimeTextValueProvider.cs b/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Indexing/ReadingTimeTextValueProvider.cs
@@ -14,7 +14,7 @@ internal class ReadingTimeTextValueProvider : ReadingTimeValueProviderBase
         Constants.PropertyEditors.Aliases.TextBox,
         Constants.PropertyEditors.Aliases.MultipleTextstring,
         Constants.PropertyEditors.Aliases.TinyMce,
-        Constants.PropertyEditors.Aliases.RichText,
+        Constants.PropertyEditors.Aliases.RichText
     };
 
     public override bool CanConvert(IPropertyType type) => _supported.Contains(type.PropertyEditorAlias);
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Migrations/0.1.0/InitialMigration.cs b/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Migrations/0.1.0/InitialMigration.cs
@@ -2,9 +2,4 @@
 
 namespace jcdcdev.Umbraco.ReadingTime.Infrastructure.Migrations;
 
-public class InitialMigration : NoopMigration
-{
-    public InitialMigration(IMigrationContext context) : base(context)
-    {
-    }
-}
+public class InitialMigration(IMigrationContext context) : NoopMigration(context);
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Migrations/0.3.0/MultiplePropertyEditorSupport.cs b/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Migrations/0.3.0/MultiplePropertyEditorSupport.cs
@@ -2,9 +2,4 @@
 
 namespace jcdcdev.Umbraco.ReadingTime.Infrastructure.Migrations;
 
-public class MultiplePropertyEditorSupport : NoopMigration
-{
-    public MultiplePropertyEditorSupport(IMigrationContext context) : base(context)
-    {
-    }
-}
+public class MultiplePropertyEditorSupport(IMigrationContext context) : NoopMigration(context);
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Migrations/0.3.1/RebuildDatabase.cs b/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Migrations/0.3.1/RebuildDatabase.cs
@@ -1,17 +1,14 @@
 using jcdcdev.Umbraco.ReadingTime.Core;
 using jcdcdev.Umbraco.ReadingTime.Infrastructure.Persistence;
 using Microsoft.Extensions.Logging;
+using NPoco;
 using Umbraco.Cms.Infrastructure.Migrations;
 using Umbraco.Cms.Infrastructure.Persistence;
 
 namespace jcdcdev.Umbraco.ReadingTime.Infrastructure.Migrations;
 
-public class RebuildDatabase : MigrationBase
+public class RebuildDatabase(IMigrationContext context) : MigrationBase(context)
 {
-    public RebuildDatabase(IMigrationContext context) : base(context)
-    {
-    }
-
     protected override void Migrate()
     {
         Logger.LogInformation("Rebuilding ReadingTime database");
@@ -34,7 +31,7 @@ protected override void Migrate()
     private static bool ConstraintExists(IUmbracoDatabase database, string tableName, string key)
     {
         string sql;
-        if (database.SqlContext.DatabaseType == NPoco.DatabaseType.SQLite)
+        if (database.SqlContext.DatabaseType == DatabaseType.SQLite)
         {
             sql = $"SELECT COUNT(*) FROM sqlite_master WHERE type = 'index' AND name = '{key}' AND tbl_name = '{tableName}'";
         }
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Migrations/14.0.0/AddUpdateDate.cs b/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Migrations/14.0.0/AddUpdateDate.cs
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Migrations/MigrationPlan.cs b/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Migrations/MigrationPlan.cs
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Persistence/ReadingTimeRepository.cs b/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Persistence/ReadingTimeRepository.cs
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/ReadingTimeService.cs b/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/ReadingTimeService.cs
diff --git a/src/jcdcdev.Umbraco.ReadingTime/Web/Controllers/ReadingTimeController.cs b/src/jcdcdev.Umbraco.ReadingTime/Web/Controllers/ReadingTimeController.cs
diff --git a/src/jcdcdev.Umbraco.ReadingTime/jcdcdev.Umbraco.ReadingTime.csproj b/src/jcdcdev.Umbraco.ReadingTime/jcdcdev.Umbraco.ReadingTime.csproj

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ export class ReadingTimeContext extends UmbControllerBase {`
`10`	`10`
`11`	`11`	`constructor(host: UmbControllerHost) {`
`12`	`12`	`super(host);`
`13`		`- this.provideContext(READING_TIME_CONTEXT_TOKEN, this);`
`14`	`13`	`this.#repository = new ReadingTimeRepository(this);`
	`14`	`+ this.provideContext(READING_TIME_CONTEXT_TOKEN, this);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`async getReadingTime(contentKey: string, dataTypeKey: string, culture?: string): Promise<UmbDataSourceResponse<ReadingTimeResponse>> {`