diff --git a/src/Inc.TeamAssistant.Appraiser.Application/Services/AppraiserSettingSectionProvider.cs b/src/Inc.TeamAssistant.Appraiser.Application/Services/AppraiserSettingSectionProvider.cs index 9d40b889..9938b76a 100644 --- a/src/Inc.TeamAssistant.Appraiser.Application/Services/AppraiserSettingSectionProvider.cs +++ b/src/Inc.TeamAssistant.Appraiser.Application/Services/AppraiserSettingSectionProvider.cs @@ -1,15 +1,16 @@ using Inc.TeamAssistant.Appraiser.Domain; using Inc.TeamAssistant.Primitives.FeatureProperties; +using Inc.TeamAssistant.Primitives.Languages; namespace Inc.TeamAssistant.Appraiser.Application.Services; internal sealed class AppraiserSettingSectionProvider : ISettingSectionProvider { - private readonly IReadOnlyDictionary _storyType = new Dictionary + private readonly IReadOnlyDictionary _storyType = new Dictionary { - [StoryType.Fibonacci] = "Constructor_FormSectionSetSettingsFibonacciDescription", - [StoryType.TShirt] = "Constructor_FormSectionSetSettingsTShirtDescription", - [StoryType.PowerOfTwo] = "Constructor_FormSectionSetSettingsPowerOfTwoDescription" + [StoryType.Fibonacci] = new("Constructor_FormSectionSetSettingsFibonacciDescription"), + [StoryType.TShirt] = new("Constructor_FormSectionSetSettingsTShirtDescription"), + [StoryType.PowerOfTwo] = new("Constructor_FormSectionSetSettingsPowerOfTwoDescription") }; public string FeatureName => "Appraiser"; @@ -19,12 +20,12 @@ public IReadOnlyCollection GetSections() return [ new SettingSection( - "Constructor_FormSectionSetSettingsAppraiserHeader", - "Constructor_FormSectionSetSettingsAppraiserHelp", + new("Constructor_FormSectionSetSettingsAppraiserHeader"), + new("Constructor_FormSectionSetSettingsAppraiserHelp"), [ new( AppraiserProperties.StoryTypeKey, - "Constructor_FormSectionSetSettingsStoryTypeFieldLabel", + new("Constructor_FormSectionSetSettingsStoryTypeFieldLabel"), GetValuesForStoryType().ToArray()) ]) ]; diff --git a/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategies/FibonacciEstimationStrategy.cs b/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategies/FibonacciEstimationStrategy.cs index 44182577..0a929818 100644 --- a/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategies/FibonacciEstimationStrategy.cs +++ b/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategies/FibonacciEstimationStrategy.cs @@ -31,10 +31,7 @@ public Estimation GetValue(int value) if (Estimations.TryGetValue(value, out var estimation)) return estimation; - throw new ArgumentOutOfRangeException( - nameof(value), - value, - $"Value is not valid for {nameof(FibonacciEstimationStrategy)}."); + throw new ArgumentOutOfRangeException(nameof(value), value, "State out of range."); } public int GetWeight(Story story) diff --git a/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategies/PowerOfTwoEstimationStrategy.cs b/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategies/PowerOfTwoEstimationStrategy.cs index d42baf4f..05228c77 100644 --- a/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategies/PowerOfTwoEstimationStrategy.cs +++ b/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategies/PowerOfTwoEstimationStrategy.cs @@ -31,10 +31,7 @@ public Estimation GetValue(int value) if (Estimations.TryGetValue(value, out var estimation)) return estimation; - throw new ArgumentOutOfRangeException( - nameof(value), - value, - $"Value is not valid for {nameof(FibonacciEstimationStrategy)}."); + throw new ArgumentOutOfRangeException(nameof(value), value, "State out of range."); } public int GetWeight(Story story) diff --git a/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategies/TShirtEstimationStrategy.cs b/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategies/TShirtEstimationStrategy.cs index aed665b1..3508fdd2 100644 --- a/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategies/TShirtEstimationStrategy.cs +++ b/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategies/TShirtEstimationStrategy.cs @@ -30,10 +30,7 @@ public Estimation GetValue(int value) if (Estimations.TryGetValue(value, out var estimation)) return estimation; - throw new ArgumentOutOfRangeException( - nameof(value), - value, - $"Value is not valid for {nameof(TShirtEstimationStrategy)}."); + throw new ArgumentOutOfRangeException(nameof(value), value, "State out of range."); } public int GetWeight(Story story) diff --git a/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategyFactory.cs b/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategyFactory.cs index dd189be5..188baa18 100644 --- a/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategyFactory.cs +++ b/src/Inc.TeamAssistant.Appraiser.Domain/EstimationStrategyFactory.cs @@ -24,8 +24,6 @@ public static IEstimationStrategy Create(StoryType storyType) { return Strategies.TryGetValue(storyType, out var strategy) ? strategy - : throw new ArgumentOutOfRangeException(nameof(storyType), - storyType, - $"StoryType is not valid for {nameof(EstimationStrategyFactory)}."); + : throw new ArgumentOutOfRangeException(nameof(storyType), storyType, "State out of range."); } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/GeoJsonParser.cs b/src/Inc.TeamAssistant.CheckIn.Geo/GeoJsonParser.cs deleted file mode 100644 index 0751041f..00000000 --- a/src/Inc.TeamAssistant.CheckIn.Geo/GeoJsonParser.cs +++ /dev/null @@ -1,54 +0,0 @@ -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; - -namespace Inc.TeamAssistant.CheckIn.Geo; - -internal sealed class GeoJsonParser -{ - public IEnumerable Convert(string json) - { - return Convert(JsonConvert.DeserializeObject(json)); - } - - private IEnumerable Convert(dynamic json) - { - foreach (var coordinates in ToPoints(json.geometry)) - { - yield return new ParsedGeoJson - { - Id = json.id, - Geometry = coordinates, - Properties = ((IEnumerable>)json.properties).ToDictionary( - k => k.Key.ToLowerInvariant(), - v => v.Value.ToString()) - }; - } - } - - private IEnumerable ToPoints(dynamic geometry) - { - if (null == geometry) yield break; - switch ((string)geometry.type) - { - case "Polygon": - yield return ((IEnumerable)ParseCoordinates(geometry.coordinates[0])).ToArray(); - break; - case "MultiPolygon": - foreach (dynamic item in geometry.coordinates) - { - yield return ((IEnumerable)ParseCoordinates(item[0])).ToArray(); - } - break; - default: - throw new NotImplementedException((string)geometry.type); - } - } - - private IEnumerable ParseCoordinates(dynamic coordinates) - { - foreach (var coordinate in coordinates) - { - yield return [(float)coordinate[0], (float)coordinate[1]]; - } - } -} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/GeoParser.cs b/src/Inc.TeamAssistant.CheckIn.Geo/GeoParser.cs new file mode 100644 index 00000000..16137172 --- /dev/null +++ b/src/Inc.TeamAssistant.CheckIn.Geo/GeoParser.cs @@ -0,0 +1,31 @@ +using System.Text.Json; +using Inc.TeamAssistant.CheckIn.Application.Contracts; +using Inc.TeamAssistant.CheckIn.Geo.Models; + +namespace Inc.TeamAssistant.CheckIn.Geo; + +internal sealed class GeoParser +{ + private static readonly JsonSerializerOptions JsonSerializerOptions = new() + { + PropertyNameCaseInsensitive = true, + TypeInfoResolver = new GeometryResolver() + }; + + public IEnumerable Parse(IEnumerable json) + { + ArgumentNullException.ThrowIfNull(json); + + foreach (var line in json) + { + var item = JsonSerializer.Deserialize(line, JsonSerializerOptions); + + if (item is not null) + yield return new Region( + item.Properties.Name, + item.Id, + item.Properties.Type == "country" ? RegionType.Country : RegionType.Ocean, + item.Geometry.GetCoordinates().ToArray()); + } + } +} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/GeoService.cs b/src/Inc.TeamAssistant.CheckIn.Geo/GeoService.cs index 58186e58..b34517ae 100644 --- a/src/Inc.TeamAssistant.CheckIn.Geo/GeoService.cs +++ b/src/Inc.TeamAssistant.CheckIn.Geo/GeoService.cs @@ -1,33 +1,33 @@ using GeoTimeZone; using Inc.TeamAssistant.CheckIn.Application.Contracts; +using Inc.TeamAssistant.CheckIn.Geo.Models; namespace Inc.TeamAssistant.CheckIn.Geo; internal sealed class GeoService : IGeoService { - private readonly GeoJsonParser _geoJsonParser; private readonly Region[] _regions; - public GeoService(RegionLoader regionLoader, GeoJsonParser geoJsonParser) + public GeoService(RegionLoader regionLoader, GeoParser geoParser) { - _geoJsonParser = geoJsonParser; - _regions = ParseInput(regionLoader.LoadFile()).ToArray(); + ArgumentNullException.ThrowIfNull(regionLoader); + ArgumentNullException.ThrowIfNull(geoParser); + + _regions = geoParser.Parse(regionLoader.LoadFile()).ToArray(); } public Region? FindCountry(double lat, double lng, params RegionType[] types) { - var coords = new[] { (float)lng, (float)lat }; - var subset = types.Any() + ArgumentNullException.ThrowIfNull(types); + + var point = new Point((float)lng, (float)lat); + var items = types.Any() ? _regions.Where(x => types.Any(y => y == x.Type)) : _regions; - foreach (var country in subset) - { - if (InPolygon(coords, country.Polygon)) - { - return country; - } - } + foreach (var item in items) + if (InPolygon(point, item.Polygon)) + return item; return null; } @@ -38,37 +38,21 @@ public TimeZoneInfo GetTimeZone(double lat, double lng) return TimeZoneInfo.FindSystemTimeZoneById(timeZoneId.Result); } - private bool InPolygon(float[] point, float[][] polygon) + private bool InPolygon(Point point, float[][] polygon) { - var polygonLength = polygon.Length; - var c = false; + ArgumentNullException.ThrowIfNull(point); + ArgumentNullException.ThrowIfNull(polygon); + + var result = false; var i = 0; var j = 0; - for (i = 0, j = polygonLength - 1; i < polygonLength; j = i++) - { - if (polygon[i][1] > point[1] != (polygon[j][1] > point[1]) && - point[0] < (polygon[j][0] - polygon[i][0]) * (point[1] - polygon[i][1]) / + + for (i = 0, j = polygon.Length - 1; i < polygon.Length; j = i++) + if (polygon[i][1] > point.Lat != polygon[j][1] > point.Lat && + point.Lng < (polygon[j][0] - polygon[i][0]) * (point.Lat - polygon[i][1]) / (polygon[j][1] - polygon[i][1]) + polygon[i][0]) - { - c = !c; - } - } + result = !result; - return c; - } - - private IEnumerable ParseInput(IEnumerable geojson) - { - foreach (var line in geojson) - { - foreach (var polygon in _geoJsonParser.Convert(line)) - { - yield return new Region( - polygon.Properties["name"], - polygon.Id, - polygon.Properties["type"] == "country" ? RegionType.Country : RegionType.Ocean, - polygon.Geometry); - } - } + return result; } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/GeometryResolver.cs b/src/Inc.TeamAssistant.CheckIn.Geo/GeometryResolver.cs new file mode 100644 index 00000000..ab21fb39 --- /dev/null +++ b/src/Inc.TeamAssistant.CheckIn.Geo/GeometryResolver.cs @@ -0,0 +1,34 @@ +using System.Text.Json; +using System.Text.Json.Serialization; +using System.Text.Json.Serialization.Metadata; +using Inc.TeamAssistant.CheckIn.Geo.Models; + +namespace Inc.TeamAssistant.CheckIn.Geo; + +internal sealed class GeometryResolver : DefaultJsonTypeInfoResolver +{ + public override JsonTypeInfo GetTypeInfo(Type type, JsonSerializerOptions options) + { + ArgumentNullException.ThrowIfNull(type); + ArgumentNullException.ThrowIfNull(options); + + var jsonTypeInfo = base.GetTypeInfo(type, options); + + if (jsonTypeInfo.Type == typeof(IGeometry)) + { + jsonTypeInfo.PolymorphismOptions = new JsonPolymorphismOptions + { + TypeDiscriminatorPropertyName = "type", + IgnoreUnrecognizedTypeDiscriminators = false, + UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FailSerialization, + DerivedTypes = + { + new JsonDerivedType(typeof(PolygonGeometry), "Polygon"), + new JsonDerivedType(typeof(MultiPolygonGeometry), "MultiPolygon"), + } + }; + } + + return jsonTypeInfo; + } +} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/Inc.TeamAssistant.CheckIn.Geo.csproj b/src/Inc.TeamAssistant.CheckIn.Geo/Inc.TeamAssistant.CheckIn.Geo.csproj index e7a15c9c..84f43f60 100644 --- a/src/Inc.TeamAssistant.CheckIn.Geo/Inc.TeamAssistant.CheckIn.Geo.csproj +++ b/src/Inc.TeamAssistant.CheckIn.Geo/Inc.TeamAssistant.CheckIn.Geo.csproj @@ -3,7 +3,6 @@ - \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/Models/GeoItem.cs b/src/Inc.TeamAssistant.CheckIn.Geo/Models/GeoItem.cs new file mode 100644 index 00000000..c6389006 --- /dev/null +++ b/src/Inc.TeamAssistant.CheckIn.Geo/Models/GeoItem.cs @@ -0,0 +1,6 @@ +namespace Inc.TeamAssistant.CheckIn.Geo.Models; + +internal sealed record GeoItem( + string Id, + GeoProperties Properties, + IGeometry Geometry); \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/Models/GeoProperties.cs b/src/Inc.TeamAssistant.CheckIn.Geo/Models/GeoProperties.cs new file mode 100644 index 00000000..9661b525 --- /dev/null +++ b/src/Inc.TeamAssistant.CheckIn.Geo/Models/GeoProperties.cs @@ -0,0 +1,3 @@ +namespace Inc.TeamAssistant.CheckIn.Geo.Models; + +internal sealed record GeoProperties(string Type, string Name); \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/Models/IGeometry.cs b/src/Inc.TeamAssistant.CheckIn.Geo/Models/IGeometry.cs new file mode 100644 index 00000000..ee415eb8 --- /dev/null +++ b/src/Inc.TeamAssistant.CheckIn.Geo/Models/IGeometry.cs @@ -0,0 +1,6 @@ +namespace Inc.TeamAssistant.CheckIn.Geo.Models; + +internal interface IGeometry +{ + IEnumerable GetCoordinates(); +} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/Models/MultiPolygonGeometry.cs b/src/Inc.TeamAssistant.CheckIn.Geo/Models/MultiPolygonGeometry.cs new file mode 100644 index 00000000..eb54e575 --- /dev/null +++ b/src/Inc.TeamAssistant.CheckIn.Geo/Models/MultiPolygonGeometry.cs @@ -0,0 +1,12 @@ +namespace Inc.TeamAssistant.CheckIn.Geo.Models; + +internal sealed record MultiPolygonGeometry(float[][][][] Coordinates) + : IGeometry +{ + public IEnumerable GetCoordinates() + { + foreach (var coordinate in Coordinates) + foreach (var item in coordinate[0]) + yield return [item[0], item[1]]; + } +} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/Models/Point.cs b/src/Inc.TeamAssistant.CheckIn.Geo/Models/Point.cs new file mode 100644 index 00000000..16c2ea9e --- /dev/null +++ b/src/Inc.TeamAssistant.CheckIn.Geo/Models/Point.cs @@ -0,0 +1,3 @@ +namespace Inc.TeamAssistant.CheckIn.Geo.Models; + +internal sealed record Point(float Lng, float Lat); \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/Models/PolygonGeometry.cs b/src/Inc.TeamAssistant.CheckIn.Geo/Models/PolygonGeometry.cs new file mode 100644 index 00000000..09dfb3db --- /dev/null +++ b/src/Inc.TeamAssistant.CheckIn.Geo/Models/PolygonGeometry.cs @@ -0,0 +1,11 @@ +namespace Inc.TeamAssistant.CheckIn.Geo.Models; + +internal sealed record PolygonGeometry(float[][][] Coordinates) + : IGeometry +{ + public IEnumerable GetCoordinates() + { + foreach (var item in Coordinates[0]) + yield return [item[0], item[1]]; + } +} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/ParsedGeoJson.cs b/src/Inc.TeamAssistant.CheckIn.Geo/ParsedGeoJson.cs deleted file mode 100644 index 17034bce..00000000 --- a/src/Inc.TeamAssistant.CheckIn.Geo/ParsedGeoJson.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Inc.TeamAssistant.CheckIn.Geo; - -internal sealed class ParsedGeoJson -{ - public string Id { get; set; } = default!; - public IDictionary Properties { get; set; } = default!; - public float[][] Geometry { get; set; } = default!; -} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.CheckIn.Geo/ServiceCollectionExtensions.cs b/src/Inc.TeamAssistant.CheckIn.Geo/ServiceCollectionExtensions.cs index 9a809dd8..e0ef8bc9 100644 --- a/src/Inc.TeamAssistant.CheckIn.Geo/ServiceCollectionExtensions.cs +++ b/src/Inc.TeamAssistant.CheckIn.Geo/ServiceCollectionExtensions.cs @@ -12,7 +12,7 @@ public static IServiceCollection AddCheckInGeo(this IServiceCollection services, services .AddSingleton(sp => ActivatorUtilities.CreateInstance(sp, webRootPath)) - .AddSingleton() + .AddSingleton() .AddSingleton(); return services; diff --git a/src/Inc.TeamAssistant.Connector.Application/QueryHandlers/GetWidgets/Converters/DashboardSettingsConverter.cs b/src/Inc.TeamAssistant.Connector.Application/QueryHandlers/GetWidgets/Converters/DashboardSettingsConverter.cs index 461a92f9..f153f8b6 100644 --- a/src/Inc.TeamAssistant.Connector.Application/QueryHandlers/GetWidgets/Converters/DashboardSettingsConverter.cs +++ b/src/Inc.TeamAssistant.Connector.Application/QueryHandlers/GetWidgets/Converters/DashboardSettingsConverter.cs @@ -13,7 +13,11 @@ public static IReadOnlyCollection Convert( ArgumentNullException.ThrowIfNull(features); return settings.Widgets - .Select(w => new WidgetDto(w.Type, w.Position, CanEnabled(w), w.IsEnabled)) + .Select(w => new WidgetDto( + w.Type, + w.Feature, + w.Position, + CanEnabled(w), w.IsEnabled)) .ToArray(); bool CanEnabled(DashboardWidget widget) => diff --git a/src/Inc.TeamAssistant.Connector.Application/Services/ContextCommandConverter.cs b/src/Inc.TeamAssistant.Connector.Application/Services/ContextCommandConverter.cs index 783911c9..66a9a7c6 100644 --- a/src/Inc.TeamAssistant.Connector.Application/Services/ContextCommandConverter.cs +++ b/src/Inc.TeamAssistant.Connector.Application/Services/ContextCommandConverter.cs @@ -68,10 +68,7 @@ private static BotCommandScope ToBotCommandScope(ContextScope contextScope) { ContextScope.Chats => BotCommandScope.AllGroupChats(), ContextScope.Private => BotCommandScope.Default(), - _ => throw new ArgumentOutOfRangeException( - nameof(contextScope), - contextScope, - "ContextScope value was out of range.") + _ => throw new ArgumentOutOfRangeException(nameof(contextScope), contextScope, "State out of range.") }; } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Connector.DataAccess/Messages.cs b/src/Inc.TeamAssistant.Connector.DataAccess/Messages.cs new file mode 100644 index 00000000..368b934c --- /dev/null +++ b/src/Inc.TeamAssistant.Connector.DataAccess/Messages.cs @@ -0,0 +1,8 @@ +using Inc.TeamAssistant.Primitives.Languages; + +namespace Inc.TeamAssistant.Connector.DataAccess; + +public static class Messages +{ + public static readonly MessageId Connector_PersonNotFound = new(nameof(Connector_PersonNotFound)); +} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Connector.DataAccess/TeamAccessor.cs b/src/Inc.TeamAssistant.Connector.DataAccess/TeamAccessor.cs index 437fe6e5..63152bc2 100644 --- a/src/Inc.TeamAssistant.Connector.DataAccess/TeamAccessor.cs +++ b/src/Inc.TeamAssistant.Connector.DataAccess/TeamAccessor.cs @@ -44,6 +44,15 @@ public async Task> GetTeammates( return await _personRepository.Find(personId, token); } + public async Task GetPerson(long personId, CancellationToken token) + { + var person = await _personRepository.Find(personId, token); + if (person is null) + throw new TeamAssistantUserException(Messages.Connector_PersonNotFound, personId); + + return person; + } + public async Task GetClientLanguage(Guid botId, long personId, CancellationToken token) { return await _clientLanguageRepository.Get(botId, personId, token); diff --git a/src/Inc.TeamAssistant.Connector.Model/Queries/GetWidgets/WidgetDto.cs b/src/Inc.TeamAssistant.Connector.Model/Queries/GetWidgets/WidgetDto.cs index 633d3a8a..310bf990 100644 --- a/src/Inc.TeamAssistant.Connector.Model/Queries/GetWidgets/WidgetDto.cs +++ b/src/Inc.TeamAssistant.Connector.Model/Queries/GetWidgets/WidgetDto.cs @@ -2,6 +2,7 @@ namespace Inc.TeamAssistant.Connector.Model.Queries.GetWidgets; public sealed record WidgetDto( string Type, + string Feature, int Position, bool CanEnabled, bool IsEnabled) diff --git a/src/Inc.TeamAssistant.Gateway/Apps/MainApp.razor b/src/Inc.TeamAssistant.Gateway/Apps/MainApp.razor index 8f7a41a3..bb3d1992 100644 --- a/src/Inc.TeamAssistant.Gateway/Apps/MainApp.razor +++ b/src/Inc.TeamAssistant.Gateway/Apps/MainApp.razor @@ -4,8 +4,8 @@ @using Microsoft.AspNetCore.Components.Web @using Inc.TeamAssistant.WebUI.Features -@inject IRenderContext RenderContext @inject AnalyticsOptions AnalyticsOptions +@inject IRenderContext RenderContext diff --git a/src/Inc.TeamAssistant.Gateway/Services/Clients/MessageProviderCached.cs b/src/Inc.TeamAssistant.Gateway/Services/Clients/MessageProviderCached.cs index d095c0c0..e851b439 100644 --- a/src/Inc.TeamAssistant.Gateway/Services/Clients/MessageProviderCached.cs +++ b/src/Inc.TeamAssistant.Gateway/Services/Clients/MessageProviderCached.cs @@ -6,18 +6,15 @@ namespace Inc.TeamAssistant.Gateway.Services.Clients; internal sealed class MessageProviderCached : IMessageProvider { private readonly IMemoryCache _memoryCache; - private readonly ILogger _logger; private readonly IMessageProvider _messageProvider; private readonly TimeSpan _cacheAbsoluteExpiration; public MessageProviderCached( IMemoryCache memoryCache, - ILogger logger, IMessageProvider messageProvider, TimeSpan cacheAbsoluteExpiration) { _memoryCache = memoryCache ?? throw new ArgumentNullException(nameof(memoryCache)); - _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _messageProvider = messageProvider ?? throw new ArgumentNullException(nameof(messageProvider)); _cacheAbsoluteExpiration = cacheAbsoluteExpiration; } @@ -32,13 +29,7 @@ public async Task>> Get(Cancellati c.SetAbsoluteExpiration(_cacheAbsoluteExpiration); return await _messageProvider.Get(token); }); - - if (cacheItem is null) - { - _logger.LogWarning("Can not get object with key {CacheKey} from cache", cacheKey); - return await _messageProvider.Get(token); - } - return cacheItem; + return cacheItem ?? await _messageProvider.Get(token); } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Gateway/Services/ServerCore/QuickResponseCodeGeneratorCached.cs b/src/Inc.TeamAssistant.Gateway/Services/ServerCore/QuickResponseCodeGeneratorCached.cs index 394ae848..b6161648 100644 --- a/src/Inc.TeamAssistant.Gateway/Services/ServerCore/QuickResponseCodeGeneratorCached.cs +++ b/src/Inc.TeamAssistant.Gateway/Services/ServerCore/QuickResponseCodeGeneratorCached.cs @@ -6,18 +6,15 @@ namespace Inc.TeamAssistant.Gateway.Services.ServerCore; internal sealed class QuickResponseCodeGeneratorCached : IQuickResponseCodeGenerator { private readonly IMemoryCache _memoryCache; - private readonly ILogger _logger; private readonly IQuickResponseCodeGenerator _generator; private readonly TimeSpan _cacheAbsoluteExpiration; public QuickResponseCodeGeneratorCached( IMemoryCache memoryCache, - ILogger logger, IQuickResponseCodeGenerator generator, TimeSpan cacheAbsoluteExpiration) { _memoryCache = memoryCache ?? throw new ArgumentNullException(nameof(memoryCache)); - _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _generator = generator ?? throw new ArgumentNullException(nameof(generator)); _cacheAbsoluteExpiration = cacheAbsoluteExpiration; } @@ -37,11 +34,7 @@ public string Generate(string data, string foreground, string background) return _generator.Generate(data, foreground, background); }); - - if (cacheItem is not null) - return cacheItem; - _logger.LogWarning("Can not get object with key {CacheKey} from cache", key); - return _generator.Generate(key, foreground, background); + return cacheItem ?? _generator.Generate(key, foreground, background); } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Gateway/wwwroot/langs/en.json b/src/Inc.TeamAssistant.Gateway/wwwroot/langs/en.json index c4e8a6f4..205db892 100644 --- a/src/Inc.TeamAssistant.Gateway/wwwroot/langs/en.json +++ b/src/Inc.TeamAssistant.Gateway/wwwroot/langs/en.json @@ -94,7 +94,6 @@ "Navigation_Logout": "Logout", "CheckIn_GetStarted": "To get started, please add the bot to your chat room", - "CheckIn_PageTitle": "Our locations", "CheckIn_DefaultLayerTitle": "All", "CheckIn_ConnectLinkText": "Use {0} to see our locations", "CheckIn_AddLocationHelp": "Add location to the map", @@ -123,15 +122,16 @@ "Reviewer_NeedEndReview": "There is a review that needs to be done.", "Reviewer_NeedCorrection": "Revisions need to be made.", "Reviewer_StatsAttempts": "Attempts: {0}", - "Reviewer_StatsFirstTouch": "First touch time: {0} | {1} (average)", - "Reviewer_StatsFirstTouchAverage": "First touch time (average): {0}", - "Reviewer_StatsReview": "Review time: {0} | {1} (average)", - "Reviewer_StatsReviewAverage": "Review time (average): {0}", - "Reviewer_StatsCorrection": "Correction time: {0} | {1} (average)", - "Reviewer_StatsCorrectionAverage": "Correction time (average): {0}", + "Reviewer_StatsFirstTouch": "First touch: {0} | {1} (average)", + "Reviewer_StatsFirstTouchAverage": "First touch (average): {0}", + "Reviewer_StatsReview": "Review: {0} | {1} (average)", + "Reviewer_StatsReviewAverage": "Review (average): {0}", + "Reviewer_StatsCorrection": "Correction: {0} | {1} (average)", + "Reviewer_StatsCorrectionAverage": "Correction (average): {0}", "Reviewer_PreviewTitle": "Previewing a draft of the task for review.", "Reviewer_PreviewReviewerTemplate": "The task will be assigned to {0}", "Reviewer_PreviewCheckDescription": "You need to provide a link to the source code and a description.", + "Reviewer_PreviewCheckTeammate": "Participant {0} is not part of team {1}.", "Reviewer_PreviewEditHelp": "To edit a draft, please edit the original post.", "Reviewer_PreviewMoveToReview": "Submit", "Reviewer_PreviewRemoveDraft": "Cancel", @@ -189,8 +189,11 @@ "Dashboard_ReviewStateAccept": "Accept", "Dashboard_ReviewStats": "Stats", "Dashboard_FirstTouch": "First touch", + "Dashboard_FirstTouchHelp": "Time spent before the review begins", "Dashboard_Correction": "Correction", + "Dashboard_CorrectionHelp": "Time spent on adjustments", "Dashboard_Review": "Review", + "Dashboard_ReviewHelp": "Time spent on the review", "Dashboard_NoData": "No data", "Dashboard_TeammatesWidgetTitle": "Teammates", "Dashboard_BotWidgetTitle": "Bot has not selected", @@ -230,6 +233,7 @@ "Dashboard_Settings": "Settings", "Dashboard_Apply": "Apply", "Dashboard_SettingsApplied": "Settings applied", + "Dashboard_DisableWidgetHelpTemplate": "To enable the widget, you need to activate the feature \"{0}\"", "Footer_GroupNavigation": "Navigation", "Footer_GroupTech": "Tech", @@ -277,10 +281,10 @@ "Constructor_FeatureReviewerName": "Tasks review", "Constructor_FeatureRandomCoffeeName": "Random coffee", "Constructor_FeatureCheckInName": "Check in on map", - "Constructor_FeatureAppraiserDescription": "Conduct an estimate of tasks", - "Constructor_FeatureReviewerDescription": "Organize code review process", - "Constructor_FeatureRandomCoffeeDescription": "Collect a random coffee meetings", - "Constructor_FeatureCheckInDescription": "Manage distributed development teams", + "Constructor_FeatureAppraiserDescription": "Evaluate tasks using the planning poker method. Fibonacci numbers and degrees of two, as well as T-shirt sizes, are available for evaluation.", + "Constructor_FeatureReviewerDescription": "Organization of the code review process: passing tasks for review, notifying participants, and reviewing statistics.", + "Constructor_FeatureRandomCoffeeDescription": "Holding informal meetings over a cup of coffee, with random pairing of participants selected at intervals.", + "Constructor_FeatureCheckInDescription": "Manage a distributed development team by marking your location on the map and finding the locations of your colleagues.", "Constructor_FeatureAdd": "Add", "Constructor_FeatureRemove": "Remove", "Constructor_FormSectionFeaturesAvailableEmptyText": "No available features", diff --git a/src/Inc.TeamAssistant.Gateway/wwwroot/langs/ru.json b/src/Inc.TeamAssistant.Gateway/wwwroot/langs/ru.json index dd08c7ec..a4a7901f 100644 --- a/src/Inc.TeamAssistant.Gateway/wwwroot/langs/ru.json +++ b/src/Inc.TeamAssistant.Gateway/wwwroot/langs/ru.json @@ -59,7 +59,7 @@ "MetaAppraiserTitle": "Телеграм бот для оценки задач через planning poker", "MetaAppraiserDescription": "Инструмент для организации командной оценки задач с использованием planning poker online", "MetaAppraiserKeywords": "Телеграм бот, оценка задач, оценка, planning poker, planning poker online", - "MetaCheckInTitle": "Наши геолокаций", + "MetaCheckInTitle": "Наше местоположение", "MetaCheckInDescription": "Карта с указанием наших геолокаций", "MetaCheckInKeywords": "Карта, геолокация, регистрация геолокации, бот для регистрации геолокации, бот для регистрации геолокации в telegram", @@ -69,7 +69,7 @@ "OgAppraiserTitle": "Оценщик", "OgAppraiserDescription": "Телеграм бот для оценки задач через planning poker", "OgAppraiserImageText": "Оценщик - телеграм бот для оценки задач через planning poker", - "OgCheckInTitle": "Перемещения", + "OgCheckInTitle": "Наше местоположение", "OgCheckInDescription": "Телеграм бот для регистрации перемещений", "OgCheckInImageText": "CheckIn - телеграм бот для регистрации перемещений", @@ -94,7 +94,6 @@ "Navigation_Logout": "Выйти", "CheckIn_GetStarted": "Добавьте бота в чат для начала работы", - "CheckIn_PageTitle": "Наше местоположение", "CheckIn_DefaultLayerTitle": "Все", "CheckIn_ConnectLinkText": "Перейдите по ссылке {0} чтобы увидеть наши локации", "CheckIn_AddLocationHelp": "Добавить мою геолокацию на карту", @@ -123,15 +122,16 @@ "Reviewer_NeedEndReview": "Необходимо провести ревью.", "Reviewer_NeedCorrection": "Необходимо внести изменения.", "Reviewer_StatsAttempts": "Кол-во попыток: {0}", - "Reviewer_StatsFirstTouch": "Время первого касания: {0} | {1} (среднее)", - "Reviewer_StatsFirstTouchAverage": "Время первого касания (среднее): {0}", - "Reviewer_StatsReview": "Время ревью: {0} | {1} (среднее)", - "Reviewer_StatsReviewAverage": "Время ревью (среднее): {0}", - "Reviewer_StatsCorrection": "Время коррекции: {0} | {1} (среднее)", - "Reviewer_StatsCorrectionAverage": "Время коррекции (среднее): {0}", + "Reviewer_StatsFirstTouch": "Первое касание: {0} | {1} (среднее)", + "Reviewer_StatsFirstTouchAverage": "Первое касание (среднее): {0}", + "Reviewer_StatsReview": "Ревью: {0} | {1} (среднее)", + "Reviewer_StatsReviewAverage": "Ревью (среднее): {0}", + "Reviewer_StatsCorrection": "Коррекция: {0} | {1} (среднее)", + "Reviewer_StatsCorrectionAverage": "Коррекция (среднее): {0}", "Reviewer_PreviewTitle": "Предварительный просмотр черновика задачи на ревью.", "Reviewer_PreviewReviewerTemplate": "Задача будет назначена на {0}", "Reviewer_PreviewCheckDescription": "Необходимо указать ссылку на исходный код и описание.", + "Reviewer_PreviewCheckTeammate": "Участник {0} не подключен к команде {1}.", "Reviewer_PreviewEditHelp": "Для редактирования черновика необходимо отредактировать исходное сообщение.", "Reviewer_PreviewMoveToReview": "Отправить на ревью", "Reviewer_PreviewRemoveDraft": "Отменить", @@ -189,8 +189,11 @@ "Dashboard_ReviewStateAccept": "Принята", "Dashboard_ReviewStats": "Статистика", "Dashboard_FirstTouch": "Время первого касания", + "Dashboard_FirstTouchHelp": "Время, затраченное до начала проверки", "Dashboard_Correction": "Время корректировки", + "Dashboard_CorrectionHelp": "Время, затраченное на корректировку", "Dashboard_Review": "Время ревью", + "Dashboard_ReviewHelp": "Время, затраченное на проверку", "Dashboard_NoData": "Нет данных", "Dashboard_TeammatesWidgetTitle": "Товарищи по команде", "Dashboard_BotWidgetTitle": "Бот не выбран", @@ -230,6 +233,7 @@ "Dashboard_Settings": "Настройка", "Dashboard_Apply": "Применить", "Dashboard_SettingsApplied": "Настройки применены", + "Dashboard_DisableWidgetHelpTemplate": "Для включения виджета необходимо активировать функцию «{0}»", "Footer_GroupNavigation": "Навигация", "Footer_GroupTech": "Технологии", @@ -277,10 +281,10 @@ "Constructor_FeatureReviewerName": "Код ревью", "Constructor_FeatureRandomCoffeeName": "Проведение кофейных перерывов", "Constructor_FeatureCheckInName": "Отметки на карте", - "Constructor_FeatureAppraiserDescription": "Проведите оценку задач", - "Constructor_FeatureReviewerDescription": "Организуйте процесс рецензирования кода", - "Constructor_FeatureRandomCoffeeDescription": "Собирайте случайные встречи за чашкой кофе", - "Constructor_FeatureCheckInDescription": "Управляйте распределенными командами разработчиков", + "Constructor_FeatureAppraiserDescription": "Проведение оценки задач при помощи planning poker. Для оценки доступны числа Фибоначчи, майки, степени двойки.", + "Constructor_FeatureReviewerDescription": "Организация процесса code review. Передача задачи на ревью, оповещения участников, статистика по ревью.", + "Constructor_FeatureRandomCoffeeDescription": "Проведение неформальных встреч за чашкой кофе. Случайное формирование пар участников с выбранной периодичностью.", + "Constructor_FeatureCheckInDescription": "Управление распределенной командой разработчиков. Отмечайте свое местоположение на карте и узнавайте местоположение коллег.", "Constructor_FeatureAdd": "Добавить", "Constructor_FeatureRemove": "Удалить", "Constructor_FormSectionFeaturesAvailableEmptyText": "Нет доступных функций", diff --git a/src/Inc.TeamAssistant.Primitives/FeatureProperties/SelectValue.cs b/src/Inc.TeamAssistant.Primitives/FeatureProperties/SelectValue.cs index 110e12b2..757b9f89 100644 --- a/src/Inc.TeamAssistant.Primitives/FeatureProperties/SelectValue.cs +++ b/src/Inc.TeamAssistant.Primitives/FeatureProperties/SelectValue.cs @@ -1,3 +1,5 @@ +using Inc.TeamAssistant.Primitives.Languages; + namespace Inc.TeamAssistant.Primitives.FeatureProperties; -public sealed record SelectValue(string MessageId, string Value); \ No newline at end of file +public sealed record SelectValue(MessageId MessageId, string Value); \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Primitives/FeatureProperties/SettingItem.cs b/src/Inc.TeamAssistant.Primitives/FeatureProperties/SettingItem.cs index 5b36149e..a90a752a 100644 --- a/src/Inc.TeamAssistant.Primitives/FeatureProperties/SettingItem.cs +++ b/src/Inc.TeamAssistant.Primitives/FeatureProperties/SettingItem.cs @@ -1,6 +1,8 @@ +using Inc.TeamAssistant.Primitives.Languages; + namespace Inc.TeamAssistant.Primitives.FeatureProperties; public sealed record SettingItem( string PropertyName, - string LabelMessageId, + MessageId LabelMessageId, IReadOnlyCollection Values); \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Primitives/FeatureProperties/SettingSection.cs b/src/Inc.TeamAssistant.Primitives/FeatureProperties/SettingSection.cs index b3ab12e3..052ade13 100644 --- a/src/Inc.TeamAssistant.Primitives/FeatureProperties/SettingSection.cs +++ b/src/Inc.TeamAssistant.Primitives/FeatureProperties/SettingSection.cs @@ -1,6 +1,8 @@ +using Inc.TeamAssistant.Primitives.Languages; + namespace Inc.TeamAssistant.Primitives.FeatureProperties; public sealed record SettingSection( - string HeaderMessageId, - string HelpMessageId, + MessageId HeaderMessageId, + MessageId HelpMessageId, IReadOnlyCollection SettingItems); \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Primitives/GlobalSettings.cs b/src/Inc.TeamAssistant.Primitives/GlobalSettings.cs index a8ec78aa..ec26c89f 100644 --- a/src/Inc.TeamAssistant.Primitives/GlobalSettings.cs +++ b/src/Inc.TeamAssistant.Primitives/GlobalSettings.cs @@ -11,4 +11,6 @@ public static class GlobalSettings public static readonly string LinkForConnectTemplate = "https://t.me/{0}?start={1}"; public static readonly TimeSpan MinLoadingDelay = TimeSpan.FromMilliseconds(700); + + public static string TimeFormat = @"d\.hh\:mm"; } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Primitives/ITeamAccessor.cs b/src/Inc.TeamAssistant.Primitives/ITeamAccessor.cs index 151c6c7e..db8ba5ec 100644 --- a/src/Inc.TeamAssistant.Primitives/ITeamAccessor.cs +++ b/src/Inc.TeamAssistant.Primitives/ITeamAccessor.cs @@ -7,5 +7,6 @@ public interface ITeamAccessor Task<(Guid BotId, string TeamName)> GetTeamContext(Guid teamId, CancellationToken token); Task> GetTeammates(Guid teamId, DateTimeOffset now, CancellationToken token); Task FindPerson(long personId, CancellationToken token); + Task GetPerson(long personId, CancellationToken token); Task GetClientLanguage(Guid botId, long personId, CancellationToken token); } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Primitives/Icons.cs b/src/Inc.TeamAssistant.Primitives/Icons.cs new file mode 100644 index 00000000..fb1e8630 --- /dev/null +++ b/src/Inc.TeamAssistant.Primitives/Icons.cs @@ -0,0 +1,15 @@ +namespace Inc.TeamAssistant.Primitives; + +public static class Icons +{ + public static readonly string TrendUp = "👍"; + public static readonly string TrendDown = "👎"; + public static readonly string Alert = "❗"; + public static readonly string Waiting = "⏳"; + public static readonly string InProgress = "🤩"; + public static readonly string OnCorrection = "😱"; + public static readonly string Accept = "🤝"; + public static readonly string Comment = "💬"; + public static readonly string Start = "⭐"; + public static readonly string Ok = "👌"; +} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.RandomCoffee.Application/Services/RandomCoffeeSettingSectionProvider.cs b/src/Inc.TeamAssistant.RandomCoffee.Application/Services/RandomCoffeeSettingSectionProvider.cs index d1c8f77e..d5bc18a3 100644 --- a/src/Inc.TeamAssistant.RandomCoffee.Application/Services/RandomCoffeeSettingSectionProvider.cs +++ b/src/Inc.TeamAssistant.RandomCoffee.Application/Services/RandomCoffeeSettingSectionProvider.cs @@ -12,16 +12,16 @@ public IReadOnlyCollection GetSections() return [ new SettingSection( - "Constructor_FormSectionSetSettingsRandomCoffeeHeader", - "Constructor_FormSectionSetSettingsRandomCoffeeHelp", + new("Constructor_FormSectionSetSettingsRandomCoffeeHeader"), + new("Constructor_FormSectionSetSettingsRandomCoffeeHelp"), [ new( RandomCoffeeProperties.RoundIntervalKey, - "Constructor_FormSectionSetSettingsRoundIntervalFieldLabel", + new("Constructor_FormSectionSetSettingsRoundIntervalFieldLabel"), GetValuesForRoundInterval().ToArray()), new( RandomCoffeeProperties.VotingIntervalKey, - "Constructor_FormSectionSetSettingsVotingIntervalFieldLabel", + new("Constructor_FormSectionSetSettingsVotingIntervalFieldLabel"), GetValuesForVotingInterval().ToArray()) ]) ]; @@ -29,17 +29,17 @@ public IReadOnlyCollection GetSections() private IEnumerable GetValuesForRoundInterval() { - yield return new SelectValue("Constructor_FormSectionSetSettingsRoundInterval1Description", "7.00:00:00"); - yield return new SelectValue("Constructor_FormSectionSetSettingsRoundInterval2Description", "14.00:00:00"); - yield return new SelectValue("Constructor_FormSectionSetSettingsRoundInterval3Description", "21.00:00:00"); - yield return new SelectValue("Constructor_FormSectionSetSettingsRoundInterval4Description", "28.00:00:00"); + yield return new SelectValue(new("Constructor_FormSectionSetSettingsRoundInterval1Description"), "7.00:00:00"); + yield return new SelectValue(new("Constructor_FormSectionSetSettingsRoundInterval2Description"), "14.00:00:00"); + yield return new SelectValue(new("Constructor_FormSectionSetSettingsRoundInterval3Description"), "21.00:00:00"); + yield return new SelectValue(new("Constructor_FormSectionSetSettingsRoundInterval4Description"), "28.00:00:00"); } private IEnumerable GetValuesForVotingInterval() { - yield return new SelectValue("Constructor_FormSectionSetSettingsVotingInterval1Description", "02:00:00"); - yield return new SelectValue("Constructor_FormSectionSetSettingsVotingInterval2Description", "04:00:00"); - yield return new SelectValue("Constructor_FormSectionSetSettingsVotingInterval3Description", "1.00:00:00"); - yield return new SelectValue("Constructor_FormSectionSetSettingsVotingInterval4Description", "2.00:00:00"); + yield return new SelectValue(new("Constructor_FormSectionSetSettingsVotingInterval1Description"), "02:00:00"); + yield return new SelectValue(new("Constructor_FormSectionSetSettingsVotingInterval2Description"), "04:00:00"); + yield return new SelectValue(new("Constructor_FormSectionSetSettingsVotingInterval3Description"), "1.00:00:00"); + yield return new SelectValue(new("Constructor_FormSectionSetSettingsVotingInterval4Description"), "2.00:00:00"); } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.RandomCoffee.Application/Services/ScheduleService.cs b/src/Inc.TeamAssistant.RandomCoffee.Application/Services/ScheduleService.cs index c1c8b3dd..455b668e 100644 --- a/src/Inc.TeamAssistant.RandomCoffee.Application/Services/ScheduleService.cs +++ b/src/Inc.TeamAssistant.RandomCoffee.Application/Services/ScheduleService.cs @@ -49,20 +49,20 @@ protected override async Task ExecuteAsync(CancellationToken token) private async Task Execute(CancellationToken token) { var now = DateTimeOffset.UtcNow; - var randomCoffeeEntries = await _reader.GetByDate(now, token); + var entries = await _reader.GetByDate(now, token); - foreach (var randomCoffeeEntry in randomCoffeeEntries) + foreach (var entry in entries) { - if (!await _holidayService.IsWorkTime(randomCoffeeEntry.BotId, now, token)) + if (!await _holidayService.IsWorkTime(entry.BotId, now, token)) continue; - var messageContext = MessageContext.CreateFromBackground(randomCoffeeEntry.BotId, randomCoffeeEntry.ChatId); + var messageContext = MessageContext.CreateFromBackground(entry.BotId, entry.ChatId); - IDialogCommand command = randomCoffeeEntry.State switch + IDialogCommand command = entry.State switch { - RandomCoffeeState.Waiting => new SelectPairsCommand(messageContext, randomCoffeeEntry.Id), + RandomCoffeeState.Waiting => new SelectPairsCommand(messageContext, entry.Id), RandomCoffeeState.Idle => new InviteForCoffeeCommand(messageContext, OnDemand: false), - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(nameof(entry.State), entry.State, "State out of range.") }; await _commandExecutor.Execute(command, token); diff --git a/src/Inc.TeamAssistant.Reviewer.Application/CommandHandlers/EditDraft/EditDraftCommandHandler.cs b/src/Inc.TeamAssistant.Reviewer.Application/CommandHandlers/EditDraft/EditDraftCommandHandler.cs index b0d4d8ca..c51b47fa 100644 --- a/src/Inc.TeamAssistant.Reviewer.Application/CommandHandlers/EditDraft/EditDraftCommandHandler.cs +++ b/src/Inc.TeamAssistant.Reviewer.Application/CommandHandlers/EditDraft/EditDraftCommandHandler.cs @@ -28,9 +28,11 @@ public async Task Handle(EditDraftCommand command, CancellationTo if (draft is not null) { draft.WithDescription(command.Description); - + if (command.MessageContext.TargetPersonId.HasValue) draft.WithTargetPerson(command.MessageContext.TargetPersonId.Value); + else + draft.WithoutTargetPerson(); var notification = await _reviewMessageBuilder.Build(draft, command.MessageContext.LanguageId, token); diff --git a/src/Inc.TeamAssistant.Reviewer.Application/CommandHandlers/MoveToDecline/MoveToDeclineCommandHandler.cs b/src/Inc.TeamAssistant.Reviewer.Application/CommandHandlers/MoveToDecline/MoveToDeclineCommandHandler.cs index 28f7a114..9a34010a 100644 --- a/src/Inc.TeamAssistant.Reviewer.Application/CommandHandlers/MoveToDecline/MoveToDeclineCommandHandler.cs +++ b/src/Inc.TeamAssistant.Reviewer.Application/CommandHandlers/MoveToDecline/MoveToDeclineCommandHandler.cs @@ -1,7 +1,9 @@ using Inc.TeamAssistant.Primitives; +using Inc.TeamAssistant.Primitives.Bots; using Inc.TeamAssistant.Primitives.Commands; using Inc.TeamAssistant.Primitives.Exceptions; using Inc.TeamAssistant.Reviewer.Application.Contracts; +using Inc.TeamAssistant.Reviewer.Domain; using Inc.TeamAssistant.Reviewer.Model.Commands.MoveToDecline; using MediatR; @@ -9,27 +11,30 @@ namespace Inc.TeamAssistant.Reviewer.Application.CommandHandlers.MoveToDecline; internal sealed class MoveToDeclineCommandHandler : IRequestHandler { - private readonly ITaskForReviewRepository _taskForReviewRepository; + private readonly ITaskForReviewRepository _repository; private readonly IReviewMessageBuilder _reviewMessageBuilder; private readonly ITeamAccessor _teamAccessor; + private readonly IBotAccessor _botAccessor; public MoveToDeclineCommandHandler( - ITaskForReviewRepository taskForReviewRepository, + ITaskForReviewRepository repository, IReviewMessageBuilder reviewMessageBuilder, - ITeamAccessor teamAccessor) + ITeamAccessor teamAccessor, + IBotAccessor botAccessor) { - _taskForReviewRepository = - taskForReviewRepository ?? throw new ArgumentNullException(nameof(taskForReviewRepository)); - _reviewMessageBuilder = - reviewMessageBuilder ?? throw new ArgumentNullException(nameof(reviewMessageBuilder)); + _repository = repository ?? throw new ArgumentNullException(nameof(repository)); + _reviewMessageBuilder = reviewMessageBuilder ?? throw new ArgumentNullException(nameof(reviewMessageBuilder)); _teamAccessor = teamAccessor ?? throw new ArgumentNullException(nameof(teamAccessor)); + _botAccessor = botAccessor ?? throw new ArgumentNullException(nameof(botAccessor)); } public async Task Handle(MoveToDeclineCommand command, CancellationToken token) { ArgumentNullException.ThrowIfNull(command); - var taskForReview = await _taskForReviewRepository.GetById(command.TaskId, token); + var taskForReview = await _repository.GetById(command.TaskId, token); + var botContext = await _botAccessor.GetBotContext(taskForReview.BotId, token); + if (!taskForReview.CanAccept()) return CommandResult.Empty; @@ -41,7 +46,7 @@ public async Task Handle(MoveToDeclineCommand command, Cancellati if (owner is null) throw new TeamAssistantUserException(Messages.Connector_PersonNotFound, taskForReview.OwnerId); - taskForReview.Decline(DateTimeOffset.UtcNow); + taskForReview.Decline(DateTimeOffset.UtcNow, botContext.GetNotificationIntervals()); var notifications = await _reviewMessageBuilder.Build( command.MessageContext.ChatMessage.MessageId, @@ -50,7 +55,7 @@ public async Task Handle(MoveToDeclineCommand command, Cancellati owner, token); - await _taskForReviewRepository.Upsert(taskForReview, token); + await _repository.Upsert(taskForReview, token); return CommandResult.Build(notifications.ToArray()); } diff --git a/src/Inc.TeamAssistant.Reviewer.Application/CommandHandlers/MoveToReview/Validators/MoveToReviewCommandValidator.cs b/src/Inc.TeamAssistant.Reviewer.Application/CommandHandlers/MoveToReview/Validators/MoveToReviewCommandValidator.cs index e9afd85a..2466bc03 100644 --- a/src/Inc.TeamAssistant.Reviewer.Application/CommandHandlers/MoveToReview/Validators/MoveToReviewCommandValidator.cs +++ b/src/Inc.TeamAssistant.Reviewer.Application/CommandHandlers/MoveToReview/Validators/MoveToReviewCommandValidator.cs @@ -21,14 +21,25 @@ public MoveToReviewCommandValidator( RuleFor(e => e.DraftId) .NotEmpty() - .MustAsync(HasDescriptionAndLinks) - .WithMessage("'Description' must contains a link to the source code and some description"); + .CustomAsync(ValidateDraft); } - private async Task HasDescriptionAndLinks(Guid draftId, CancellationToken token) + private async Task ValidateDraft( + Guid draftId, + ValidationContext context, + CancellationToken token) { + ArgumentNullException.ThrowIfNull(context); + var draft = await _draftTaskForReviewRepository.GetById(draftId, token); - return _draftTaskForReviewService.HasDescriptionAndLinks(draft.Description); + if (!_draftTaskForReviewService.HasDescriptionAndLinks(draft.Description)) + context.AddFailure( + nameof(draft.Description), + "Must contains a link to the source code and some description"); + + if (draft.TargetPersonId.HasValue && + !await _draftTaskForReviewService.HasTeammate(draft.TeamId, draft.TargetPersonId.Value, token)) + context.AddFailure(nameof(draft.TargetPersonId), "Teammate not found"); } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Reviewer.Application/Contracts/IReviewMessageBuilder.cs b/src/Inc.TeamAssistant.Reviewer.Application/Contracts/IReviewMessageBuilder.cs index 29704528..1ce791e7 100644 --- a/src/Inc.TeamAssistant.Reviewer.Application/Contracts/IReviewMessageBuilder.cs +++ b/src/Inc.TeamAssistant.Reviewer.Application/Contracts/IReviewMessageBuilder.cs @@ -9,12 +9,12 @@ public interface IReviewMessageBuilder { Task> Build( int messageId, - TaskForReview taskForReview, + TaskForReview task, Person reviewer, Person owner, CancellationToken token); - Task Push(TaskForReview taskForReview, CancellationToken token); + Task Push(TaskForReview task, CancellationToken token); Task Build(DraftTaskForReview draft, LanguageId languageId, CancellationToken token); } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Reviewer.Application/Messages.cs b/src/Inc.TeamAssistant.Reviewer.Application/Messages.cs index e6099c74..e57d02ef 100644 --- a/src/Inc.TeamAssistant.Reviewer.Application/Messages.cs +++ b/src/Inc.TeamAssistant.Reviewer.Application/Messages.cs @@ -32,6 +32,7 @@ internal static class Messages public static readonly MessageId Reviewer_PreviewTitle = new(nameof(Reviewer_PreviewTitle)); public static readonly MessageId Reviewer_PreviewReviewerTemplate = new(nameof(Reviewer_PreviewReviewerTemplate)); public static readonly MessageId Reviewer_PreviewCheckDescription = new(nameof(Reviewer_PreviewCheckDescription)); + public static readonly MessageId Reviewer_PreviewCheckTeammate = new(nameof(Reviewer_PreviewCheckTeammate)); public static readonly MessageId Reviewer_PreviewEditHelp = new(nameof(Reviewer_PreviewEditHelp)); public static readonly MessageId Reviewer_PreviewMoveToReview = new(nameof(Reviewer_PreviewMoveToReview)); public static readonly MessageId Reviewer_PreviewRemoveDraft = new(nameof(Reviewer_PreviewRemoveDraft)); diff --git a/src/Inc.TeamAssistant.Reviewer.Application/Services/DraftTaskForReviewService.cs b/src/Inc.TeamAssistant.Reviewer.Application/Services/DraftTaskForReviewService.cs index ff86ef4d..ab3d4d20 100644 --- a/src/Inc.TeamAssistant.Reviewer.Application/Services/DraftTaskForReviewService.cs +++ b/src/Inc.TeamAssistant.Reviewer.Application/Services/DraftTaskForReviewService.cs @@ -8,11 +8,22 @@ namespace Inc.TeamAssistant.Reviewer.Application.Services; internal sealed class DraftTaskForReviewService { private readonly IDraftTaskForReviewRepository _draftTaskForReviewRepository; + private readonly ITeamAccessor _teamAccessor; - public DraftTaskForReviewService(IDraftTaskForReviewRepository draftTaskForReviewRepository) + public DraftTaskForReviewService( + IDraftTaskForReviewRepository draftTaskForReviewRepository, + ITeamAccessor teamAccessor) { _draftTaskForReviewRepository = draftTaskForReviewRepository ?? throw new ArgumentNullException(nameof(draftTaskForReviewRepository)); + _teamAccessor = teamAccessor ?? throw new ArgumentNullException(nameof(teamAccessor)); + } + + public async Task HasTeammate(Guid teamId, long personId, CancellationToken token) + { + var teammates = await _teamAccessor.GetTeammates(teamId, DateTimeOffset.UtcNow, token); + + return teammates.Any(t => t.Id == personId); } public bool HasDescriptionAndLinks(string description) diff --git a/src/Inc.TeamAssistant.Reviewer.Application/Services/ReviewMessageBuilder.cs b/src/Inc.TeamAssistant.Reviewer.Application/Services/ReviewMessageBuilder.cs index 4fbc1947..b22fa2b0 100644 --- a/src/Inc.TeamAssistant.Reviewer.Application/Services/ReviewMessageBuilder.cs +++ b/src/Inc.TeamAssistant.Reviewer.Application/Services/ReviewMessageBuilder.cs @@ -1,7 +1,6 @@ using System.Text; using Inc.TeamAssistant.Holidays.Extensions; using Inc.TeamAssistant.Primitives; -using Inc.TeamAssistant.Primitives.Exceptions; using Inc.TeamAssistant.Primitives.Languages; using Inc.TeamAssistant.Primitives.Notifications; using Inc.TeamAssistant.Reviewer.Application.Contracts; @@ -13,84 +12,87 @@ namespace Inc.TeamAssistant.Reviewer.Application.Services; internal sealed class ReviewMessageBuilder : IReviewMessageBuilder { - private const string TimeFormat = @"d\.hh\:mm"; - private readonly IMessageBuilder _messageBuilder; private readonly ITeamAccessor _teamAccessor; - private readonly ITaskForReviewReader _taskForReviewReader; - private readonly IReviewMetricsProvider _reviewMetricsProvider; + private readonly ITaskForReviewReader _taskReader; + private readonly IReviewMetricsProvider _metricsProvider; private readonly ReviewTeamMetricsFactory _metricsFactory; - private readonly DraftTaskForReviewService _service; + private readonly DraftTaskForReviewService _draftService; public ReviewMessageBuilder( IMessageBuilder messageBuilder, ITeamAccessor teamAccessor, - ITaskForReviewReader taskForReviewReader, - IReviewMetricsProvider reviewMetricsProvider, + ITaskForReviewReader taskReader, + IReviewMetricsProvider metricsProvider, ReviewTeamMetricsFactory metricsFactory, - DraftTaskForReviewService service) + DraftTaskForReviewService draftService) { _messageBuilder = messageBuilder ?? throw new ArgumentNullException(nameof(messageBuilder)); _teamAccessor = teamAccessor ?? throw new ArgumentNullException(nameof(teamAccessor)); - _taskForReviewReader = taskForReviewReader ?? throw new ArgumentNullException(nameof(taskForReviewReader)); - _reviewMetricsProvider = reviewMetricsProvider ?? throw new ArgumentNullException(nameof(reviewMetricsProvider)); + _taskReader = taskReader ?? throw new ArgumentNullException(nameof(taskReader)); + _metricsProvider = metricsProvider ?? throw new ArgumentNullException(nameof(metricsProvider)); _metricsFactory = metricsFactory ?? throw new ArgumentNullException(nameof(metricsFactory)); - _service = service ?? throw new ArgumentNullException(nameof(service)); + _draftService = draftService ?? throw new ArgumentNullException(nameof(draftService)); } public async Task> Build( int messageId, - TaskForReview taskForReview, + TaskForReview task, Person reviewer, Person owner, CancellationToken token) { - ArgumentNullException.ThrowIfNull(taskForReview); + ArgumentNullException.ThrowIfNull(task); ArgumentNullException.ThrowIfNull(reviewer); ArgumentNullException.ThrowIfNull(owner); - var metricsByTeam = _reviewMetricsProvider.Get(taskForReview.TeamId); - var metricsByTask = await _metricsFactory.Create(taskForReview, token); + var metricsByTeam = _metricsProvider.Get(task.TeamId); + var metricsByTask = await _metricsFactory.Create(task, token); + var hasOwnerAction = messageId == task.OwnerMessageId; var notifications = new List { - await MessageForTeam(taskForReview, reviewer, owner, metricsByTeam, metricsByTask, token), - await MessageForReviewer(taskForReview, metricsByTeam, metricsByTask, token) + await MessageForTeam(task, reviewer, owner, metricsByTeam, metricsByTask, token), + await MessageForReviewer(task, metricsByTeam, metricsByTask, token) }; - if (!taskForReview.ReviewerMessageId.HasValue && taskForReview.OriginalReviewerId.HasValue) - notifications.Add(await HideControlsForReviewer(taskForReview.OriginalReviewerId.Value, messageId, taskForReview, token)); + if (!task.ReviewerMessageId.HasValue && task.OriginalReviewerId.HasValue) + notifications.Add(await HideControlsForOriginalReviewer( + task.OriginalReviewerId.Value, + messageId, + task, + token)); - if (taskForReview.State == TaskForReviewState.OnCorrection || messageId == taskForReview.OwnerMessageId) - notifications.Add(await MessageForOwner(taskForReview, metricsByTeam, metricsByTask, token)); + if (task.State == TaskForReviewState.OnCorrection || hasOwnerAction) + notifications.Add(await MessageForOwner(task, metricsByTeam, metricsByTask, token)); - if (taskForReview.State == TaskForReviewState.Accept) - notifications.Add(await ReviewFinish(taskForReview, token)); + if (task.State == TaskForReviewState.Accept) + notifications.Add(await ReviewFinish(task, token)); return notifications; } - public async Task Push(TaskForReview taskForReview, CancellationToken token) + public async Task Push(TaskForReview task, CancellationToken token) { - ArgumentNullException.ThrowIfNull(taskForReview); + ArgumentNullException.ThrowIfNull(task); - var totalTime = taskForReview.GetTotalTime(DateTimeOffset.UtcNow); + var totalTime = task.GetTotalTime(DateTimeOffset.UtcNow); - return taskForReview switch + return task switch { { State: TaskForReviewState.New or TaskForReviewState.InProgress, ReviewerMessageId: not null } => await CreatePushMessage( - taskForReview.BotId, - taskForReview.ReviewerId, - taskForReview.ReviewerMessageId.Value, + task.BotId, + task.ReviewerId, + task.ReviewerMessageId.Value, Messages.Reviewer_NeedEndReview, totalTime, token), { State: TaskForReviewState.OnCorrection, OwnerMessageId: not null } => await CreatePushMessage( - taskForReview.BotId, - taskForReview.OwnerId, - taskForReview.OwnerMessageId.Value, + task.BotId, + task.OwnerId, + task.OwnerMessageId.Value, Messages.Reviewer_NeedCorrection, totalTime, token), @@ -106,35 +108,48 @@ public async Task Build( ArgumentNullException.ThrowIfNull(draft); ArgumentNullException.ThrowIfNull(languageId); - var messageBuilder = new StringBuilder(); - messageBuilder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_PreviewTitle, languageId)); - messageBuilder.AppendLine(); - messageBuilder.AppendLine(draft.Description); + var teamContext = await _teamAccessor.GetTeamContext(draft.TeamId, token); + var reviewTargetMessageTemplate = await _messageBuilder.Build( + Messages.Reviewer_PreviewReviewerTemplate, + languageId); + var builder = new StringBuilder(); + + builder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_PreviewTitle, languageId)); + builder.AppendLine(); + builder.AppendLine(draft.Description); + builder.AppendLine(); if (draft.TargetPersonId.HasValue) { - var targetPersonMessageTemplate = await _messageBuilder.Build( - Messages.Reviewer_PreviewReviewerTemplate, - languageId); - var targetPerson = await _teamAccessor.FindPerson(draft.TargetPersonId.Value, token); - if (targetPerson is null) - throw new TeamAssistantUserException(Messages.Connector_PersonNotFound, draft.TargetPersonId.Value); + var reviewTarget = await _teamAccessor.GetPerson(draft.TargetPersonId.Value, token); + builder.AppendLine(string.Format(reviewTargetMessageTemplate, reviewTarget.DisplayName)); - messageBuilder.AppendLine(); - messageBuilder.AppendLine(string.Format(targetPersonMessageTemplate, targetPerson.DisplayName)); + if (!await _draftService.HasTeammate(draft.TeamId, draft.TargetPersonId.Value, token)) + { + builder.AppendLine(); + builder.Append(Icons.Alert); + builder.Append(await _messageBuilder.Build( + Messages.Reviewer_PreviewCheckTeammate, + languageId, + reviewTarget.DisplayName, + teamContext.TeamName)); + builder.AppendLine(); + } } - - if (!_service.HasDescriptionAndLinks(draft.Description)) + else + builder.AppendLine(string.Format(reviewTargetMessageTemplate, teamContext.TeamName)); + + if (!_draftService.HasDescriptionAndLinks(draft.Description)) { - messageBuilder.AppendLine(); - messageBuilder.Append('❗'); - messageBuilder.Append(await _messageBuilder.Build(Messages.Reviewer_PreviewCheckDescription, languageId)); - messageBuilder.AppendLine(); + builder.AppendLine(); + builder.Append(Icons.Alert); + builder.Append(await _messageBuilder.Build(Messages.Reviewer_PreviewCheckDescription, languageId)); + builder.AppendLine(); } - messageBuilder.AppendLine(); - messageBuilder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_PreviewEditHelp, languageId)); - var message = messageBuilder.ToString(); + builder.AppendLine(); + builder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_PreviewEditHelp, languageId)); + var message = builder.ToString(); var notificationMessage = draft.PreviewMessageId.HasValue ? NotificationMessage.Edit(new ChatMessage(draft.ChatId, draft.PreviewMessageId.Value), message) @@ -163,305 +178,225 @@ await _messageBuilder.Build(Messages.Reviewer_PreviewRemoveDraft, languageId), var languageId = await _teamAccessor.GetClientLanguage(botId, personId, token); - var messageBuilder = new StringBuilder(); - messageBuilder.AppendLine(await _messageBuilder.Build(messageTextId, languageId)); - messageBuilder.AppendLine(); - messageBuilder.AppendLine(await _messageBuilder.Build( + var builder = new StringBuilder(); + builder.AppendLine(await _messageBuilder.Build(messageTextId, languageId)); + builder.AppendLine(); + builder.AppendLine(await _messageBuilder.Build( Messages.Reviewer_TotalTime, languageId, - workTimeTotal.ToString(TimeFormat))); + workTimeTotal.ToString(GlobalSettings.TimeFormat))); return NotificationMessage - .Create(personId, messageBuilder.ToString()) + .Create(personId, builder.ToString()) .ReplyTo(messageId); } private async Task MessageForTeam( - TaskForReview taskForReview, + TaskForReview task, Person reviewer, Person owner, ReviewTeamMetrics metricsByTeam, ReviewTeamMetrics metricsByTask, CancellationToken token) { - ArgumentNullException.ThrowIfNull(taskForReview); + ArgumentNullException.ThrowIfNull(task); ArgumentNullException.ThrowIfNull(reviewer); ArgumentNullException.ThrowIfNull(owner); ArgumentNullException.ThrowIfNull(metricsByTeam); ArgumentNullException.ThrowIfNull(metricsByTask); Func attachPersons = n => n; - var languageId = await _teamAccessor.GetClientLanguage(taskForReview.BotId, owner.Id, token); - var state = taskForReview.State switch - { - TaskForReviewState.New => "⏳", - TaskForReviewState.InProgress => "🤩", - TaskForReviewState.OnCorrection => "😱", - TaskForReviewState.Accept => "🤝", - _ => throw new ArgumentOutOfRangeException($"State {taskForReview.State} out of range for {nameof(TaskForReviewState)}.") - }; - var reviewerTargetMessageKey = taskForReview.HasConcreteReviewer + var languageId = await _teamAccessor.GetClientLanguage(task.BotId, owner.Id, token); + var reviewerTargetMessageKey = task.HasConcreteReviewer ? Messages.Reviewer_TargetManually : Messages.Reviewer_TargetAutomatically; - var messageBuilder = new StringBuilder(); - messageBuilder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_NewTaskForReview, languageId)); - messageBuilder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_Owner, languageId, owner.DisplayName)); + var builder = new StringBuilder(); + builder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_NewTaskForReview, languageId)); + builder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_Owner, languageId, owner.DisplayName)); - messageBuilder.Append(await _messageBuilder.Build(reviewerTargetMessageKey, languageId)); - reviewer.Append(messageBuilder, (p, o) => attachPersons += n => n.AttachPerson(p, o)); - messageBuilder.AppendLine(); - - messageBuilder.AppendLine(); - messageBuilder.AppendLine(taskForReview.Description); - messageBuilder.AppendLine(state); + builder.Append(await _messageBuilder.Build(reviewerTargetMessageKey, languageId)); + reviewer.Append(builder, (p, o) => attachPersons += n => n.AttachPerson(p, o)); + builder.AppendLine(); - await AddStats( - messageBuilder, - taskForReview, - metricsByTeam, - metricsByTask, - languageId, - hasReviewMetrics: true, - hasCorrectionMetrics: true); - var message = messageBuilder.ToString(); + builder.AppendLine(); + builder.AppendLine(task.Description); + builder.AppendLine(StateAsIcon(task)); + + var stats = await ReviewStatsBuilder + .Create(_messageBuilder) + .WithReviewMetrics() + .WithCorrectionMetrics() + .Build(task, metricsByTeam, metricsByTask, languageId); + builder.Append(stats); - var notification = taskForReview.MessageId.HasValue - ? NotificationMessage.Edit(new ChatMessage(taskForReview.ChatId, taskForReview.MessageId.Value), message) + var message = builder.ToString(); + var notification = task.MessageId.HasValue + ? NotificationMessage.Edit(new ChatMessage(task.ChatId, task.MessageId.Value), message) : NotificationMessage - .Create(taskForReview.ChatId, message) + .Create(task.ChatId, message) .AddHandler((c, p) => new AttachMessageCommand( c, - taskForReview.Id, + task.Id, int.Parse(p), MessageType.Shared.ToString())); return attachPersons(notification); } - private async Task HideControlsForReviewer( + private async Task HideControlsForOriginalReviewer( long reviewerId, int messageId, - TaskForReview taskForReview, + TaskForReview task, CancellationToken token) { - ArgumentNullException.ThrowIfNull(taskForReview); + ArgumentNullException.ThrowIfNull(task); - var languageId = await _teamAccessor.GetClientLanguage(taskForReview.BotId, reviewerId, token); + var languageId = await _teamAccessor.GetClientLanguage(task.BotId, reviewerId, token); - var messageBuilder = new StringBuilder(); - messageBuilder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_NeedReview, languageId)); - messageBuilder.AppendLine(); - messageBuilder.AppendLine(taskForReview.Description); + var builder = new StringBuilder(); + builder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_NeedReview, languageId)); + builder.AppendLine(); + builder.AppendLine(task.Description); - return NotificationMessage.Edit(new(reviewerId, messageId), messageBuilder.ToString()); + return NotificationMessage.Edit(new(reviewerId, messageId), builder.ToString()); } private async Task MessageForReviewer( - TaskForReview taskForReview, + TaskForReview task, ReviewTeamMetrics metricsByTeam, ReviewTeamMetrics metricsByTask, CancellationToken token) { - ArgumentNullException.ThrowIfNull(taskForReview); + ArgumentNullException.ThrowIfNull(task); ArgumentNullException.ThrowIfNull(metricsByTeam); ArgumentNullException.ThrowIfNull(metricsByTask); - var languageId = await _teamAccessor.GetClientLanguage(taskForReview.BotId, taskForReview.ReviewerId, token); - var messageBuilder = new StringBuilder(); - messageBuilder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_NeedReview, languageId)); - messageBuilder.AppendLine(); - messageBuilder.AppendLine(taskForReview.Description); + var languageId = await _teamAccessor.GetClientLanguage(task.BotId, task.ReviewerId, token); + var builder = new StringBuilder(); + builder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_NeedReview, languageId)); + builder.AppendLine(); + builder.AppendLine(task.Description); - await AddStats( - messageBuilder, - taskForReview, - metricsByTeam, - metricsByTask, - languageId, - hasReviewMetrics: true, - hasCorrectionMetrics: false); + var stats = await ReviewStatsBuilder + .Create(_messageBuilder) + .WithReviewMetrics() + .Build(task, metricsByTeam, metricsByTask, languageId); + builder.Append(stats); - var message = messageBuilder.ToString(); - var notification = taskForReview.ReviewerMessageId.HasValue - ? NotificationMessage.Edit(new(taskForReview.ReviewerId, taskForReview.ReviewerMessageId.Value), message) + var message = builder.ToString(); + var notification = task.ReviewerMessageId.HasValue + ? NotificationMessage.Edit(new(task.ReviewerId, task.ReviewerMessageId.Value), message) : NotificationMessage - .Create(taskForReview.ReviewerId, message) + .Create(task.ReviewerId, message) .AddHandler((c, p) => new AttachMessageCommand( c, - taskForReview.Id, + task.Id, int.Parse(p), MessageType.Reviewer.ToString())); - if (taskForReview.State == TaskForReviewState.New) + if (task.State == TaskForReviewState.New) { var inProgressButton = await _messageBuilder.Build(Messages.Reviewer_MoveToInProgress, languageId); - notification.WithButton(new Button(inProgressButton, $"{CommandList.MoveToInProgress}{taskForReview.Id:N}")); + notification.WithButton(new Button( + inProgressButton, + $"{CommandList.MoveToInProgress}{task.Id:N}")); var fromDate = DateTimeOffset.UtcNow.GetLastDayOfWeek(DayOfWeek.Monday); - var hasReassign = await _taskForReviewReader.HasReassignFromDate(taskForReview.ReviewerId, fromDate, token); - if (!taskForReview.OriginalReviewerId.HasValue && !hasReassign) + var hasReassign = await _taskReader.HasReassignFromDate(task.ReviewerId, fromDate, token); + if (!task.OriginalReviewerId.HasValue && !hasReassign) { var reassignReviewButton = await _messageBuilder.Build(Messages.Reviewer_Reassign, languageId); - notification.WithButton(new Button(reassignReviewButton, $"{CommandList.ReassignReview}{taskForReview.Id:N}")); + notification.WithButton(new Button( + reassignReviewButton, + $"{CommandList.ReassignReview}{task.Id:N}")); } } - if (taskForReview.State == TaskForReviewState.InProgress) + if (task.State == TaskForReviewState.InProgress) { var moveToAcceptButton = await _messageBuilder.Build(Messages.Reviewer_MoveToAccept, languageId); - notification.WithButton(new Button(moveToAcceptButton, $"{CommandList.Accept}{taskForReview.Id:N}")); + notification.WithButton(new Button(moveToAcceptButton, $"{CommandList.Accept}{task.Id:N}")); var moveToDeclineButton = await _messageBuilder.Build(Messages.Reviewer_MoveToDecline, languageId); - notification.WithButton(new Button(moveToDeclineButton, $"{CommandList.Decline}{taskForReview.Id:N}")); + notification.WithButton(new Button(moveToDeclineButton, $"{CommandList.Decline}{task.Id:N}")); } return notification; } private async Task MessageForOwner( - TaskForReview taskForReview, + TaskForReview task, ReviewTeamMetrics metricsByTeam, ReviewTeamMetrics metricsByTask, CancellationToken token) { - ArgumentNullException.ThrowIfNull(taskForReview); + ArgumentNullException.ThrowIfNull(task); ArgumentNullException.ThrowIfNull(metricsByTeam); ArgumentNullException.ThrowIfNull(metricsByTask); - var languageId = await _teamAccessor.GetClientLanguage(taskForReview.BotId, taskForReview.OwnerId, token); - var messageBuilder = new StringBuilder(); - messageBuilder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_ReviewDeclined, languageId)); - messageBuilder.AppendLine(); - messageBuilder.AppendLine(taskForReview.Description); + var languageId = await _teamAccessor.GetClientLanguage(task.BotId, task.OwnerId, token); + var builder = new StringBuilder(); + builder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_ReviewDeclined, languageId)); + builder.AppendLine(); + builder.AppendLine(task.Description); - await AddStats( - messageBuilder, - taskForReview, - metricsByTeam, - metricsByTask, - languageId, - hasReviewMetrics: false, - hasCorrectionMetrics: true); + var stats = await ReviewStatsBuilder + .Create(_messageBuilder) + .WithCorrectionMetrics() + .Build(task, metricsByTeam, metricsByTask, languageId); + builder.Append(stats); - var message = messageBuilder.ToString(); - var notification = taskForReview.OwnerMessageId.HasValue - ? NotificationMessage.Edit(new(taskForReview.OwnerId, taskForReview.OwnerMessageId.Value), message) + var message = builder.ToString(); + var notification = task.OwnerMessageId.HasValue + ? NotificationMessage.Edit(new(task.OwnerId, task.OwnerMessageId.Value), message) : NotificationMessage - .Create(taskForReview.OwnerId, message) + .Create(task.OwnerId, message) .AddHandler((c, p) => new AttachMessageCommand( c, - taskForReview.Id, + task.Id, int.Parse(p), MessageType.Owner.ToString())); - if (taskForReview.State == TaskForReviewState.OnCorrection) + if (task.State == TaskForReviewState.OnCorrection) { var moveToNextRoundButton = await _messageBuilder.Build(Messages.Reviewer_MoveToNextRound, languageId); notification.WithButton(new Button(moveToNextRoundButton, - $"{CommandList.MoveToNextRound}{taskForReview.Id:N}")); + $"{CommandList.MoveToNextRound}{task.Id:N}")); } return notification; } - private async Task ReviewFinish(TaskForReview taskForReview, CancellationToken token) + private async Task ReviewFinish(TaskForReview task, CancellationToken token) { - ArgumentNullException.ThrowIfNull(taskForReview); + ArgumentNullException.ThrowIfNull(task); - var languageId = await _teamAccessor.GetClientLanguage(taskForReview.BotId, taskForReview.OwnerId, token); - var totalTime = taskForReview.GetTotalTime(DateTimeOffset.UtcNow); + var languageId = await _teamAccessor.GetClientLanguage(task.BotId, task.OwnerId, token); + var totalTime = task.GetTotalTime(DateTimeOffset.UtcNow); - var messageBuilder = new StringBuilder(); - messageBuilder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_Accepted, languageId)); - messageBuilder.AppendLine(); - messageBuilder.AppendLine(taskForReview.Description); - messageBuilder.AppendLine(); - messageBuilder.AppendLine(await _messageBuilder.Build( + var builder = new StringBuilder(); + builder.AppendLine(await _messageBuilder.Build(Messages.Reviewer_Accepted, languageId)); + builder.AppendLine(); + builder.AppendLine(task.Description); + builder.AppendLine(); + builder.AppendLine(await _messageBuilder.Build( Messages.Reviewer_TotalTime, languageId, - totalTime.ToString(TimeFormat))); + totalTime.ToString(GlobalSettings.TimeFormat))); - return NotificationMessage.Create(taskForReview.OwnerId, messageBuilder.ToString()); + return NotificationMessage.Create(task.OwnerId, builder.ToString()); } - private async Task AddStats( - StringBuilder builder, - TaskForReview taskForReview, - ReviewTeamMetrics metricsByTeam, - ReviewTeamMetrics metricsByTask, - LanguageId languageId, - bool hasReviewMetrics, - bool hasCorrectionMetrics) + private string StateAsIcon(TaskForReview task) { - ArgumentNullException.ThrowIfNull(builder); - ArgumentNullException.ThrowIfNull(taskForReview); - ArgumentNullException.ThrowIfNull(metricsByTeam); - ArgumentNullException.ThrowIfNull(metricsByTask); - ArgumentNullException.ThrowIfNull(languageId); - - builder.AppendLine(); - var attempts = taskForReview.GetAttempts(); - if (attempts.HasValue) - builder.AppendLine(await _messageBuilder.Build( - Messages.Reviewer_StatsAttempts, - languageId, - attempts.Value)); - - if (taskForReview.State == TaskForReviewState.Accept) + return task.State switch { - const string trendUp = "👍"; - const string trendDown = "👎"; - - if (hasReviewMetrics) - { - var firstTouchTrend = metricsByTask.FirstTouch <= metricsByTeam.FirstTouch ? trendUp : trendDown; - var firstTouchMessage = await _messageBuilder.Build( - Messages.Reviewer_StatsFirstTouch, - languageId, - metricsByTask.FirstTouch.ToString(TimeFormat), - metricsByTeam.FirstTouch.ToString(TimeFormat)); - builder.AppendLine($"{firstTouchMessage} {firstTouchTrend}"); - - var reviewTrend = metricsByTask.Review <= metricsByTeam.Review ? trendUp : trendDown; - var reviewMessage = await _messageBuilder.Build( - Messages.Reviewer_StatsReview, - languageId, - metricsByTask.Review.ToString(TimeFormat), - metricsByTeam.Review.ToString(TimeFormat)); - builder.AppendLine($"{reviewMessage} {reviewTrend}"); - } - - if (hasCorrectionMetrics && attempts.HasValue) - { - var correctionTrend = metricsByTask.Correction <= metricsByTeam.Correction ? trendUp : trendDown; - var correctionMessage = await _messageBuilder.Build( - Messages.Reviewer_StatsCorrection, - languageId, - metricsByTask.Correction.ToString(TimeFormat), - metricsByTeam.Correction.ToString(TimeFormat)); - builder.AppendLine($"{correctionMessage} {correctionTrend}"); - } - } - else - { - if (hasReviewMetrics) - { - builder.AppendLine(await _messageBuilder.Build( - Messages.Reviewer_StatsFirstTouchAverage, - languageId, - metricsByTeam.FirstTouch.ToString(TimeFormat))); - builder.AppendLine(await _messageBuilder.Build( - Messages.Reviewer_StatsReviewAverage, - languageId, - metricsByTeam.Review.ToString(TimeFormat))); - } - - if (hasCorrectionMetrics && attempts.HasValue) - builder.AppendLine(await _messageBuilder.Build( - Messages.Reviewer_StatsCorrectionAverage, - languageId, - metricsByTeam.Correction.ToString(TimeFormat))); - } + TaskForReviewState.New => Icons.Waiting, + TaskForReviewState.InProgress => Icons.InProgress, + TaskForReviewState.OnCorrection => Icons.OnCorrection, + TaskForReviewState.Accept => Icons.Accept, + _ => throw new ArgumentOutOfRangeException(nameof(task.State), task.State, "State out of range.") + }; } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Reviewer.Application/Services/ReviewStatsBuilder.cs b/src/Inc.TeamAssistant.Reviewer.Application/Services/ReviewStatsBuilder.cs new file mode 100644 index 00000000..2088d1e1 --- /dev/null +++ b/src/Inc.TeamAssistant.Reviewer.Application/Services/ReviewStatsBuilder.cs @@ -0,0 +1,141 @@ +using System.Text; +using Inc.TeamAssistant.Primitives; +using Inc.TeamAssistant.Primitives.Languages; +using Inc.TeamAssistant.Reviewer.Application.Contracts; +using Inc.TeamAssistant.Reviewer.Domain; + +namespace Inc.TeamAssistant.Reviewer.Application.Services; + +internal sealed class ReviewStatsBuilder +{ + private readonly IMessageBuilder _messageBuilder; + private readonly StringBuilder _builder; + + private bool _hasReviewMetrics; + private bool _hasCorrectionMetrics; + + private ReviewStatsBuilder(IMessageBuilder messageBuilder, StringBuilder builder) + { + _messageBuilder = messageBuilder ?? throw new ArgumentNullException(nameof(messageBuilder)); + _builder = builder ?? throw new ArgumentNullException(nameof(builder)); + } + + public static ReviewStatsBuilder Create(IMessageBuilder messageBuilder) + { + ArgumentNullException.ThrowIfNull(messageBuilder); + + return new ReviewStatsBuilder(messageBuilder, new StringBuilder()); + } + + public ReviewStatsBuilder WithReviewMetrics() + { + _hasReviewMetrics = true; + + return this; + } + + public ReviewStatsBuilder WithCorrectionMetrics() + { + _hasCorrectionMetrics = true; + + return this; + } + + public async Task Build( + TaskForReview task, + ReviewTeamMetrics metricsByTeam, + ReviewTeamMetrics metricsByTask, + LanguageId languageId) + { + ArgumentNullException.ThrowIfNull(task); + ArgumentNullException.ThrowIfNull(metricsByTeam); + ArgumentNullException.ThrowIfNull(metricsByTask); + ArgumentNullException.ThrowIfNull(languageId); + + _builder.AppendLine(); + var attempts = task.GetAttempts(); + if (attempts.HasValue) + _builder.AppendLine(await _messageBuilder.Build( + Messages.Reviewer_StatsAttempts, + languageId, + attempts.Value)); + + if (task.State == TaskForReviewState.Accept) + await ByAccept(metricsByTeam, metricsByTask, languageId, attempts); + else + await ByInProgress(metricsByTeam, languageId, attempts); + + return _builder.ToString(); + } + + private async Task ByInProgress(ReviewTeamMetrics metricsByTeam, LanguageId languageId, int? attempts) + { + ArgumentNullException.ThrowIfNull(metricsByTeam); + ArgumentNullException.ThrowIfNull(languageId); + + if (_hasReviewMetrics) + { + _builder.AppendLine(await _messageBuilder.Build( + Messages.Reviewer_StatsFirstTouchAverage, + languageId, + metricsByTeam.FirstTouch.ToString(GlobalSettings.TimeFormat))); + _builder.AppendLine(await _messageBuilder.Build( + Messages.Reviewer_StatsReviewAverage, + languageId, + metricsByTeam.Review.ToString(GlobalSettings.TimeFormat))); + } + + if (_hasCorrectionMetrics && attempts.HasValue) + _builder.AppendLine(await _messageBuilder.Build( + Messages.Reviewer_StatsCorrectionAverage, + languageId, + metricsByTeam.Correction.ToString(GlobalSettings.TimeFormat))); + } + + private async Task ByAccept( + ReviewTeamMetrics metricsByTeam, + ReviewTeamMetrics metricsByTask, + LanguageId languageId, + int? attempts) + { + ArgumentNullException.ThrowIfNull(metricsByTeam); + ArgumentNullException.ThrowIfNull(metricsByTask); + ArgumentNullException.ThrowIfNull(languageId); + + if (_hasReviewMetrics) + { + var firstTouchTrend = metricsByTask.FirstTouch <= metricsByTeam.FirstTouch + ? Icons.TrendUp + : Icons.TrendDown; + var firstTouchMessage = await _messageBuilder.Build( + Messages.Reviewer_StatsFirstTouch, + languageId, + metricsByTask.FirstTouch.ToString(GlobalSettings.TimeFormat), + metricsByTeam.FirstTouch.ToString(GlobalSettings.TimeFormat)); + _builder.AppendLine($"{firstTouchMessage} {firstTouchTrend}"); + + var reviewTrend = metricsByTask.Review <= metricsByTeam.Review + ? Icons.TrendUp + : Icons.TrendDown; + var reviewMessage = await _messageBuilder.Build( + Messages.Reviewer_StatsReview, + languageId, + metricsByTask.Review.ToString(GlobalSettings.TimeFormat), + metricsByTeam.Review.ToString(GlobalSettings.TimeFormat)); + _builder.AppendLine($"{reviewMessage} {reviewTrend}"); + } + + if (_hasCorrectionMetrics && attempts.HasValue) + { + var correctionTrend = metricsByTask.Correction <= metricsByTeam.Correction + ? Icons.TrendUp + : Icons.TrendDown; + var correctionMessage = await _messageBuilder.Build( + Messages.Reviewer_StatsCorrection, + languageId, + metricsByTask.Correction.ToString(GlobalSettings.TimeFormat), + metricsByTeam.Correction.ToString(GlobalSettings.TimeFormat)); + _builder.AppendLine($"{correctionMessage} {correctionTrend}"); + } + } +} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Reviewer.Application/Services/ReviewerSettingSectionProvider.cs b/src/Inc.TeamAssistant.Reviewer.Application/Services/ReviewerSettingSectionProvider.cs index 6bdee13c..84e46232 100644 --- a/src/Inc.TeamAssistant.Reviewer.Application/Services/ReviewerSettingSectionProvider.cs +++ b/src/Inc.TeamAssistant.Reviewer.Application/Services/ReviewerSettingSectionProvider.cs @@ -1,14 +1,15 @@ using Inc.TeamAssistant.Primitives.FeatureProperties; +using Inc.TeamAssistant.Primitives.Languages; using Inc.TeamAssistant.Reviewer.Domain; namespace Inc.TeamAssistant.Reviewer.Application.Services; internal sealed class ReviewerSettingSectionProvider : ISettingSectionProvider { - private readonly IReadOnlyDictionary _storyType = new Dictionary + private readonly IReadOnlyDictionary _storyType = new Dictionary { - [NextReviewerType.RoundRobin] = "Constructor_FormSectionSetSettingsRoundRobinDescription", - [NextReviewerType.Random] = "Constructor_FormSectionSetSettingsRandomDescription" + [NextReviewerType.RoundRobin] = new("Constructor_FormSectionSetSettingsRoundRobinDescription"), + [NextReviewerType.Random] = new("Constructor_FormSectionSetSettingsRandomDescription") }; public string FeatureName => "Reviewer"; @@ -18,20 +19,20 @@ public IReadOnlyCollection GetSections() return [ new SettingSection( - "Constructor_FormSectionSetSettingsReviewerHeader", - "Constructor_FormSectionSetSettingsReviewerHelp", + new("Constructor_FormSectionSetSettingsReviewerHeader"), + new("Constructor_FormSectionSetSettingsReviewerHelp"), [ new( ReviewerProperties.NextReviewerTypeKey, - "Constructor_FormSectionSetSettingsNextReviewerStrategyFieldLabel", + new("Constructor_FormSectionSetSettingsNextReviewerStrategyFieldLabel"), GetValuesForNextReviewerType().ToArray()), new( ReviewerProperties.WaitingNotificationIntervalKey, - "Constructor_FormSectionSetSettingsWaitingNotificationIntervalFieldLabel", + new("Constructor_FormSectionSetSettingsWaitingNotificationIntervalFieldLabel"), GetValuesForNotificationInterval().ToArray()), new( ReviewerProperties.InProgressNotificationIntervalKey, - "Constructor_FormSectionSetSettingsInProgressNotificationIntervalFieldLabel", + new("Constructor_FormSectionSetSettingsInProgressNotificationIntervalFieldLabel"), GetValuesForNotificationInterval().ToArray()) ]) ]; @@ -46,9 +47,9 @@ private IEnumerable GetValuesForNextReviewerType() private IEnumerable GetValuesForNotificationInterval() { - yield return new SelectValue("Constructor_FormSectionSetSettingsNotificationInterval1Description", "00:30:00"); - yield return new SelectValue("Constructor_FormSectionSetSettingsNotificationInterval2Description", "01:00:00"); - yield return new SelectValue("Constructor_FormSectionSetSettingsNotificationInterval3Description", "01:30:00"); - yield return new SelectValue("Constructor_FormSectionSetSettingsNotificationInterval4Description", "02:00:00"); + yield return new SelectValue(new("Constructor_FormSectionSetSettingsNotificationInterval1Description"), "00:30:00"); + yield return new SelectValue(new("Constructor_FormSectionSetSettingsNotificationInterval2Description"), "01:00:00"); + yield return new SelectValue(new("Constructor_FormSectionSetSettingsNotificationInterval3Description"), "01:30:00"); + yield return new SelectValue(new("Constructor_FormSectionSetSettingsNotificationInterval4Description"), "02:00:00"); } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.Reviewer.Domain/DraftTaskForReview.cs b/src/Inc.TeamAssistant.Reviewer.Domain/DraftTaskForReview.cs index 3375201c..1f5b7a08 100644 --- a/src/Inc.TeamAssistant.Reviewer.Domain/DraftTaskForReview.cs +++ b/src/Inc.TeamAssistant.Reviewer.Domain/DraftTaskForReview.cs @@ -58,6 +58,13 @@ public DraftTaskForReview WithTargetPerson(long personId) return this; } + public DraftTaskForReview WithoutTargetPerson() + { + TargetPersonId = null; + + return this; + } + public DraftTaskForReview WithPreviewMessage(int messageId) { PreviewMessageId = messageId; diff --git a/src/Inc.TeamAssistant.Reviewer.Domain/TaskForReview.cs b/src/Inc.TeamAssistant.Reviewer.Domain/TaskForReview.cs index e325bce7..cc560eea 100644 --- a/src/Inc.TeamAssistant.Reviewer.Domain/TaskForReview.cs +++ b/src/Inc.TeamAssistant.Reviewer.Domain/TaskForReview.cs @@ -65,10 +65,7 @@ public void AttachMessage(MessageType messageType, int messageId) OwnerMessageId = messageId; break; default: - throw new ArgumentOutOfRangeException( - nameof(messageType), - messageType, - "MessageType was not supported."); + throw new ArgumentOutOfRangeException(nameof(messageType), messageType, "State out of range."); } } @@ -92,12 +89,17 @@ public void Accept(DateTimeOffset now) public void MoveToAccept() => State = TaskForReviewState.Accept; - public void Decline(DateTimeOffset now) + public void Decline(DateTimeOffset now, NotificationIntervals notificationIntervals) { + ArgumentNullException.ThrowIfNull(notificationIntervals); + AddReviewInterval(ReviewerId, now); State = TaskForReviewState.OnCorrection; NextNotification = now; + + if (ReviewIntervals.All(i => i.State != TaskForReviewState.OnCorrection)) + SetNextNotificationTime(now, notificationIntervals); } public bool CanMoveToNextRound() => State == TaskForReviewState.OnCorrection; diff --git a/src/Inc.TeamAssistant.WebUI/Extensions/IJsFunction.cs b/src/Inc.TeamAssistant.WebUI/Extensions/IJsFunction.cs index 9cb6e084..06fa7251 100644 --- a/src/Inc.TeamAssistant.WebUI/Extensions/IJsFunction.cs +++ b/src/Inc.TeamAssistant.WebUI/Extensions/IJsFunction.cs @@ -5,4 +5,6 @@ public interface IJsFunction string Identifier { get; } object?[]? Args { get; } + + Action? OnExecuted { get; } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Extensions/JsFunctions.cs b/src/Inc.TeamAssistant.WebUI/Extensions/JsFunctions.cs index 4c31a2d8..f0a6961d 100644 --- a/src/Inc.TeamAssistant.WebUI/Extensions/JsFunctions.cs +++ b/src/Inc.TeamAssistant.WebUI/Extensions/JsFunctions.cs @@ -4,26 +4,32 @@ public static class JsFunctions { public static IJsFunction GetTimezone() { - return new JsFunction("window.browserJsFunctions.getTimezone", args: null); + return new JsFunction("window.browserJsFunctions.getTimezone", postAction: null, args: null); } - public static IJsFunction ChangeUrl(string url) + public static IJsFunction ChangeUrl(string url, Action onChanged) { - ArgumentException.ThrowIfNullOrWhiteSpace(url); - - return new JsFunction("window.browserJsFunctions.changeUrl", url); + ArgumentNullException.ThrowIfNull(url); + ArgumentNullException.ThrowIfNull(onChanged); + + return new JsFunction( + "window.browserJsFunctions.changeUrl", + () => onChanged(url), + url); } private sealed record JsFunction : IJsFunction { public string Identifier { get; } + public Action? OnExecuted { get; } public object?[]? Args { get; } - internal JsFunction(string identifier, params object?[]? args) + internal JsFunction(string identifier, Action? postAction, params object?[]? args) { ArgumentException.ThrowIfNullOrWhiteSpace(identifier); Identifier = identifier; + OnExecuted = postAction; Args = args; } } diff --git a/src/Inc.TeamAssistant.WebUI/Extensions/JsRuntimeExtensions.cs b/src/Inc.TeamAssistant.WebUI/Extensions/JsRuntimeExtensions.cs index f5a86565..6a8ecc44 100644 --- a/src/Inc.TeamAssistant.WebUI/Extensions/JsRuntimeExtensions.cs +++ b/src/Inc.TeamAssistant.WebUI/Extensions/JsRuntimeExtensions.cs @@ -9,7 +9,11 @@ public static async ValueTask Execute(this IJSRuntime jsRuntime, ArgumentNullException.ThrowIfNull(jsRuntime); ArgumentNullException.ThrowIfNull(jsFunction); - return await jsRuntime.InvokeAsync(jsFunction.Identifier, jsFunction.Args); + var result = await jsRuntime.InvokeAsync(jsFunction.Identifier, jsFunction.Args); + + jsFunction.OnExecuted?.Invoke(); + + return result; } public static async ValueTask Execute(this IJSRuntime jsRuntime, IJsFunction jsFunction) @@ -18,5 +22,7 @@ public static async ValueTask Execute(this IJSRuntime jsRuntime, IJsFunction @foreach (var item in _items) { - + @item.AssessmentDate.ToString("dd-MM-yyyy") - @item.StoriesCount @Resources[Messages.GUI_Tasks] } @@ -24,13 +24,8 @@ private IReadOnlyCollection _items = Array.Empty(); - private string MoveToItem(AssessmentHistoryDto historyItem) - { - if (historyItem is null) - throw new ArgumentNullException(nameof(historyItem)); - - return LinkBuilder.Build($"assessment-history/{TeamId:N}/{historyItem.AssessmentDate:yyyy-MM-dd}"); - } + private string CreateMoveToHistoryLink(AssessmentHistoryDto historyItem) + => NavRouter.CreateRoute($"assessment-history/{TeamId:N}/{historyItem.AssessmentDate:yyyy-MM-dd}"); protected override Task OnParametersSetAsync() => Load(); diff --git a/src/Inc.TeamAssistant.WebUI/Features/AssessmentSession/AssessmentSessionHistoryPage.razor b/src/Inc.TeamAssistant.WebUI/Features/AssessmentSession/AssessmentSessionHistoryPage.razor index 6e173569..87e8e34a 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/AssessmentSession/AssessmentSessionHistoryPage.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/AssessmentSession/AssessmentSessionHistoryPage.razor @@ -7,9 +7,8 @@ @inject IAppraiserService AppraiserService @inject ResourcesManager Resources -@inject LinkBuilder LinkBuilder +@inject NavRouter NavRouter @inject RequestProcessor RequestProcessor -@inject IJSRuntime JsRuntime > _breadcrumbs = Array.Empty>(); + private IReadOnlyCollection> _breadcrumbs = Array.Empty>(); private IReadOnlyCollection _items = Array.Empty(); protected override async Task OnParametersSetAsync() @@ -72,8 +71,8 @@ _breadcrumbs = [ - new(Resources[Messages.GUI_AssessmentSession], LinkBuilder.Build($"assessment-session/{TeamId:N}")), - new(Date, LinkBuilder.Build($"assessment-history/{TeamId:N}/{Date}")) + new(Resources[Messages.GUI_AssessmentSession], NavRouter.CreateRoute($"assessment-session/{TeamId:N}")), + new(Date, NavRouter.CreateRoute($"assessment-history/{TeamId:N}/{Date}")) ]; await Load(); @@ -81,11 +80,11 @@ private async Task OnViewChanged(AssessmentType assessmentType) { - var url = LinkBuilder.Build($"assessment-history/{TeamId:N}/{Date}/{assessmentType}".ToLowerInvariant()); + var routeSegment = $"assessment-history/{TeamId:N}/{Date}/{assessmentType}".ToLowerInvariant(); _currentView = assessmentType; - - await JsRuntime.Execute(JsFunctions.ChangeUrl(url)); + + await NavRouter.MoveToRoute(routeSegment, RoutingType.Browser); } private async Task Load() diff --git a/src/Inc.TeamAssistant.WebUI/Features/AssessmentSession/AssessmentSessionPage.razor b/src/Inc.TeamAssistant.WebUI/Features/AssessmentSession/AssessmentSessionPage.razor index cdff5d70..5246cb55 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/AssessmentSession/AssessmentSessionPage.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/AssessmentSession/AssessmentSessionPage.razor @@ -10,9 +10,8 @@ @inject IAppraiserService AppraiserService @inject IServiceProvider ServiceProvider @inject ResourcesManager Resources -@inject LinkBuilder LinkBuilder +@inject NavRouter NavRouter @inject RequestProcessor RequestProcessor -@inject IJSRuntime JsRuntime > _breadcrumbs = Array.Empty>(); + private IReadOnlyCollection> _breadcrumbs = Array.Empty>(); private GetActiveStoryResult _item = new(string.Empty, string.Empty, Story: null); private IAsyncDisposable? _eventListener; @@ -99,8 +98,8 @@ var date = DateTimeOffset.UtcNow.ToString("yyyy-MM-dd"); _breadcrumbs = [ - new(Resources[Messages.GUI_AssessmentSession], LinkBuilder.Build($"assessment-session/{Id:N}")), - new(date, LinkBuilder.Build($"assessment-history/{Id:N}/{date}")) + new(Resources[Messages.GUI_AssessmentSession], NavRouter.CreateRoute($"assessment-session/{Id:N}")), + new(date, NavRouter.CreateRoute($"assessment-history/{Id:N}/{date}")) ]; await Load(); @@ -146,11 +145,11 @@ private async Task OnViewChanged(AssessmentType assessmentType) { - var url = LinkBuilder.Build($"assessment-session/{Id:N}/{assessmentType}".ToLowerInvariant()); + var routeSegment = $"assessment-session/{Id:N}/{assessmentType}".ToLowerInvariant(); _currentView = assessmentType; - - await JsRuntime.Execute(JsFunctions.ChangeUrl(url)); + + await NavRouter.MoveToRoute(routeSegment, RoutingType.Browser); } public async ValueTask DisposeAsync() diff --git a/src/Inc.TeamAssistant.WebUI/Features/AssessmentSession/Breadcrumbs.razor b/src/Inc.TeamAssistant.WebUI/Features/AssessmentSession/Breadcrumbs.razor index d96163e0..a2b2ed9a 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/AssessmentSession/Breadcrumbs.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/AssessmentSession/Breadcrumbs.razor @@ -9,5 +9,5 @@ @code { [Parameter, EditorRequired] - public IReadOnlyCollection> Items { get; set; } = Array.Empty>(); + public IReadOnlyCollection> Items { get; set; } = Array.Empty>(); } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Features/Auth/RedirectToLogin.razor b/src/Inc.TeamAssistant.WebUI/Features/Auth/RedirectToLogin.razor index 71560874..39e6100c 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Auth/RedirectToLogin.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Auth/RedirectToLogin.razor @@ -1,10 +1,8 @@ -@inject NavigationManager NavigationManager +@inject NavRouter NavRouter @code { - private string CurrentUrl => NavigationManager.Uri; - - protected override void OnInitialized() + protected override async Task OnInitializedAsync() { - NavigationManager.NavigateTo($"/login?returnUrl={CurrentUrl}"); + await NavRouter.MoveToRoute($"login?returnUrl={NavRouter.CurrentUrl}"); } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Features/Constructor/BotSelector.razor b/src/Inc.TeamAssistant.WebUI/Features/Constructor/BotSelector.razor index 3f5d71c2..673efd0f 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Constructor/BotSelector.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Constructor/BotSelector.razor @@ -1,10 +1,9 @@ @using Inc.TeamAssistant.Connector.Model.Queries.GetBotsByCurrentUser @inject IBotService BotService -@inject NavigationManager NavigationManager @inject ResourcesManager Resources @inject RequestProcessor RequestProcessor -@inject LinkBuilder LinkBuilder +@inject NavRouter NavRouter @@ -25,7 +24,7 @@ { - + @Resources[Messages.Dashboard_MoveToDashboard] @@ -74,16 +73,16 @@ }); } - private void MoveToAdd() => MoveToEdit(botId: null); + private Task MoveToAdd() => MoveToEdit(botId: null); - private void MoveToEdit(Guid? botId) + private async Task MoveToEdit(Guid? botId) { var stage = Stage.CheckBot.ToString().ToLowerInvariant(); - var link = botId.HasValue + var routeSegment = botId.HasValue ? $"constructor/{botId.Value:N}/{stage}" : $"constructor/{stage}"; - NavigationManager.NavigateTo(LinkBuilder.Build(link)); + await NavRouter.MoveToRoute(routeSegment); } private void MoveToRemove(BotDto bot) @@ -93,13 +92,13 @@ _confirmDialog?.Open(); } - private string MoveToDashboardLink(BotDto bot) + private string CreateMoveToDashboardLink(BotDto bot) { var teamId = bot.Teams.FirstOrDefault()?.Id; return teamId.HasValue - ? LinkBuilder.Build($"dashboard/{bot.Id:N}/{teamId.Value:N}") - : LinkBuilder.Build($"dashboard/{bot.Id:N}"); + ? NavRouter.CreateRoute($"dashboard/{bot.Id:N}/{teamId.Value:N}") + : NavRouter.CreateRoute($"dashboard/{bot.Id:N}"); } private async Task Remove() diff --git a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/NavigationStages.razor b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/NavigationStages.razor index a992e585..5ebecd72 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/NavigationStages.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/NavigationStages.razor @@ -26,7 +26,7 @@ ? "nav-stages__item_can-move" : string.Empty; - private string GetStageTitle(Stage stage) => $"Constructor_Stage{stage}"; + private MessageId GetStageTitle(Stage stage) => new($"Constructor_Stage{stage}"); private void MoveTo(Stage stage) { diff --git a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage1/CheckBot.razor b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage1/CheckBot.razor index 931b7d0c..87a7fd8e 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage1/CheckBot.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage1/CheckBot.razor @@ -47,7 +47,7 @@ public StagesState StagesState { get; set; } = default!; [Parameter, EditorRequired] - public Func LinkFactory { get; set; } = default!; + public Func LinkFactory { get; set; } = default!; [Parameter, EditorRequired] public Func MoveToNext { get; set; } = default!; diff --git a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage2/InputFeatures.razor b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage2/InputFeatures.razor index f8b36d8b..82faeb55 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage2/InputFeatures.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage2/InputFeatures.razor @@ -3,7 +3,7 @@ @inherits InputBase> @inject DragAndDropService DragAndDropService -@inject ResourcesManager ResourcesManager +@inject ResourcesManager Resources @inject FeaturesFactory FeaturesFactory
@@ -24,7 +24,7 @@ Description="@FeaturesFactory.CreateDescription(feature.Name)"> @@ -32,7 +32,7 @@ } else { -

@FeaturesAvailableEmptyText

+

@Resources[Messages.Constructor_FormSectionFeaturesAvailableEmptyText]

}
@@ -60,7 +60,7 @@ } else { -

@FeaturesSelectedEmptyText

+

@Resources[Messages.Constructor_FormSectionFeaturesSelectedEmptyText]

} @if (Validation is not null) { @@ -73,21 +73,9 @@ [Parameter, EditorRequired] public IReadOnlyCollection Features { get; set; } = default!; - [Parameter, EditorRequired] - public string AddText { get; set; } = default!; - - [Parameter, EditorRequired] - public string RemoveText { get; set; } = default!; - [Parameter, EditorRequired] public EventCallback> ValuesChanged { get; set; } - [Parameter] - public string? FeaturesAvailableEmptyText { get; set; } - - [Parameter] - public string? FeaturesSelectedEmptyText { get; set; } - [Parameter] public RenderFragment? Validation { get; set; } diff --git a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage2/SelectFeatures.razor b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage2/SelectFeatures.razor index edcaf1b9..37f9b7f2 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage2/SelectFeatures.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage2/SelectFeatures.razor @@ -17,11 +17,7 @@ Value="_formModel.FeatureIds" ValueExpression="@(() => _formModel.FeatureIds)" ValuesChanged="(IEnumerable v) => _formModel.SetFeatures(v)" - Features="StagesState.AvailableFeatures" - AddText="@Resources[Messages.Constructor_FeatureAdd]" - RemoveText="@Resources[Messages.Constructor_FeatureRemove]" - FeaturesAvailableEmptyText="@Resources[Messages.Constructor_FormSectionFeaturesAvailableEmptyText]" - FeaturesSelectedEmptyText="@Resources[Messages.Constructor_FormSectionFeaturesSelectedEmptyText]"> + Features="StagesState.AvailableFeatures"> @@ -37,7 +33,7 @@ public StagesState StagesState { get; set; } = default!; [Parameter, EditorRequired] - public Func LinkFactory { get; set; } = default!; + public Func LinkFactory { get; set; } = default!; [Parameter, EditorRequired] public Func MoveToNext { get; set; } = default!; diff --git a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage3/CalendarEditor.razor b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage3/CalendarEditor.razor index 6d6d7f12..4c374227 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage3/CalendarEditor.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage3/CalendarEditor.razor @@ -184,7 +184,7 @@ StateHasChanged(); } - private string GetDayOfWeekTitle(DayOfWeek dayOfWeek) => $"Constructor_DayOfWeek{dayOfWeek}"; + private MessageId GetDayOfWeekTitle(DayOfWeek dayOfWeek) => new($"Constructor_DayOfWeek{dayOfWeek}"); public async Task SubmitForm() { diff --git a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage3/SetSettings.razor b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage3/SetSettings.razor index 5bdc0f4f..62640dcf 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage3/SetSettings.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage3/SetSettings.razor @@ -1,5 +1,3 @@ -@using Inc.TeamAssistant.Primitives.Languages - @inject IServiceProvider ServiceProvider @inject ResourcesManager Resources @@ -82,7 +80,7 @@ public StagesState StagesState { get; set; } = default!; [Parameter, EditorRequired] - public Func LinkFactory { get; set; } = default!; + public Func LinkFactory { get; set; } = default!; [Parameter, EditorRequired] public Func MoveToNext { get; set; } = default!; diff --git a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage4/Complete.razor b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage4/Complete.razor index d05ee19d..290d7d52 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage4/Complete.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage4/Complete.razor @@ -1,5 +1,4 @@ @using Inc.TeamAssistant.Primitives.FeatureProperties -@using Inc.TeamAssistant.Primitives.Languages @inject IBotService BotService @inject IServiceProvider ServiceProvider @@ -152,7 +151,7 @@ public StagesState StagesState { get; set; } = default!; [Parameter, EditorRequired] - public Func LinkFactory { get; set; } = default!; + public Func LinkFactory { get; set; } = default!; [Parameter, EditorRequired] public Func MoveToNext { get; set; } = default!; diff --git a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/StagesPage.razor b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/StagesPage.razor index 5b21c7d8..8a71b183 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/StagesPage.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/StagesPage.razor @@ -15,10 +15,8 @@ @inject ICalendarService CalendarService @inject IServiceProvider ServiceProvider @inject ResourcesManager Resources -@inject LinkBuilder LinkBuilder +@inject NavRouter NavRouter @inject RequestProcessor RequestProcessor -@inject IJSRuntime JsRuntime -@inject NavigationManager NavigationManager - + @context.AssessmentDate.ToString("dd-MM-yyyy") @@ -42,7 +42,7 @@ }
- + @Resources[Messages.Dashboard_GoToCurrentSessionButtonText]
@@ -90,13 +90,15 @@ }); } - private string GetAssessmentSessionUrl() => LinkBuilder.Build($"assessment-session/{TeamId:N}"); - - private string MoveToItem(DateOnly date) => LinkBuilder.Build($"assessment-history/{TeamId:N}/{date:yyyy-MM-dd}"); + private string CreateAssessmentSessionLink() => NavRouter.CreateRoute($"assessment-session/{TeamId:N}"); + + private string CreateMoveToHistoryLink(DateOnly date) + => NavRouter.CreateRoute($"assessment-history/{TeamId:N}/{date:yyyy-MM-dd}"); private async Task Changed(DateOnly date) { _date = date; + await Load(); } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Appraiser/AppraiserHistoryWidget.razor.css b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Appraiser/AppraiserHistoryWidget.razor.css index 87d71f19..1280676e 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Appraiser/AppraiserHistoryWidget.razor.css +++ b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Appraiser/AppraiserHistoryWidget.razor.css @@ -1,11 +1,7 @@ -.component-container { - height: calc(100% - 136px); -} .component-actions { display: flex; justify-content: right; - margin-top: 20px; - padding: 0 10px; + margin: 10px; } ::deep .no-data { height: 100%; diff --git a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Appraiser/AppraiserIntegrationWidget.razor.css b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Appraiser/AppraiserIntegrationWidget.razor.css index 0469e3ea..e7efa018 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Appraiser/AppraiserIntegrationWidget.razor.css +++ b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Appraiser/AppraiserIntegrationWidget.razor.css @@ -1,16 +1,13 @@ .component-container { position: relative; - height: calc(100% - 30px); } .appraiser-integration__body { padding: 0 10px; - height: calc(100% - 70px); } .component-actions { display: flex; justify-content: right; - margin-top: 20px; - padding: 0 10px; + margin: 10px; } .appraiser-integration__button { margin-left: 10px; @@ -34,7 +31,4 @@ top: 50%; left: 50%; transform: translate(-50%, -50%); -} -::deep form { - height: 100%; } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/BotNotSelected.razor b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/BotNotSelected.razor index 05622160..c09c6f27 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/BotNotSelected.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/BotNotSelected.razor @@ -1,10 +1,10 @@ @inject ResourcesManager Resources -@inject LinkBuilder LinkBuilder +@inject NavRouter NavRouter

- @Resources[Messages.Dashboard_SelectTeam] + @Resources[Messages.Dashboard_SelectTeam] @Resources[Messages.Dashboard_CreateBot]

diff --git a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/CheckIn/MapWidget.razor b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/CheckIn/MapWidget.razor index 81164c0d..036243b2 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/CheckIn/MapWidget.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/CheckIn/MapWidget.razor @@ -1,6 +1,6 @@ @inject ICheckInService CheckInService @inject ResourcesManager Resources -@inject LinkBuilder LinkBuilder +@inject NavRouter NavRouter @inject RequestProcessor RequestProcessor @@ -20,7 +20,7 @@ @if (_formModel.MapId.HasValue) { - var mapUrl = LinkBuilder.Build($"map/{_formModel.MapId.Value:N}"); + var mapUrl = NavRouter.CreateRoute($"map/{_formModel.MapId.Value:N}");
diff --git a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/DashboardPage.razor b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/DashboardPage.razor index bfb1503e..93194ca8 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/DashboardPage.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/DashboardPage.razor @@ -15,7 +15,7 @@ @inject IBotService BotService @inject ResourcesManager Resources @inject RequestProcessor RequestProcessor -@inject IJSRuntime JsRuntime +@inject NavRouter NavRouter $"dashboard/{botContext.BotId:N}/{botContext.TeamId:N}", (true, false) => $"dashboard/{botContext.BotId:N}", _ => "dashboard" }; - + _botId = botContext.BotId; _teamId = botContext.TeamId; - - await JsRuntime.Execute(JsFunctions.ChangeUrl(url)); + + await NavRouter.MoveToRoute(routeSegment); } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/DashboardTeamSelector.razor b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/DashboardTeamSelector.razor index b767133e..40ac3b8d 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/DashboardTeamSelector.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/DashboardTeamSelector.razor @@ -1,10 +1,9 @@ @using Inc.TeamAssistant.Connector.Model.Queries.GetBotsByCurrentUser @inject IBotService BotService -@inject NavigationManager NavigationManager @inject ResourcesManager Resources @inject RequestProcessor RequestProcessor -@inject LinkBuilder LinkBuilder +@inject NavRouter NavRouter
- + @ConvertToString(context.FirstTouch)FT
@@ -62,7 +63,7 @@ @ConvertToString(context.Correction)C
- + @ConvertToString(context.Review)R @@ -149,17 +150,37 @@ return builder.ToString(); } - private string ConvertToString(TimeSpan value) - { - const string timeFormat = @"d\.hh\:mm"; + private string ConvertToString(TimeSpan value) => value.ToString(GlobalSettings.TimeFormat); + + private string FirstTouchTitle() + { + var builder = new StringBuilder(); - return value.ToString(timeFormat); + builder.AppendLine(Resources[Messages.Dashboard_FirstTouch]); + builder.Append(Resources[Messages.Dashboard_FirstTouchHelp]); + + return builder.ToString(); } private string CorrectionTitle(TaskForReviewDto task) { - return task.Iterations == 0 + var builder = new StringBuilder(); + + builder.AppendLine(task.Iterations == 0 ? Resources[Messages.Dashboard_Correction] - : $"{Resources[Messages.Dashboard_Correction]} ({task.Iterations})"; + : $"{Resources[Messages.Dashboard_Correction]} ({task.Iterations})"); + builder.Append(Resources[Messages.Dashboard_CorrectionHelp]); + + return builder.ToString(); + } + + private string ReviewTitle() + { + var builder = new StringBuilder(); + + builder.AppendLine(Resources[Messages.Dashboard_Review]); + builder.Append(Resources[Messages.Dashboard_ReviewHelp]); + + return builder.ToString(); } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettings.razor b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettings.razor index 00c0efca..f88f73ac 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettings.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettings.razor @@ -5,6 +5,7 @@ @inject ResourcesManager Resources @inject DragAndDropService DragAndDropService @inject IServiceProvider ServiceProvider +@inject FeaturesFactory FeaturesFactory @@ -27,6 +28,7 @@
Widgets { get; set; } = Array.Empty(); + public IReadOnlyCollection Widgets { get; set; } = default!; private ContentDialog? _contentDialog; @@ -152,6 +154,16 @@ } private string ToWidgetTitle(string type) => WidgetsLookup.GetValueOrDefault(type, type); + + private string FeatureHelp(DashboardSettingsItem item) + { + if (item.CanEnabled) + return string.Empty; + + var featureName = FeaturesFactory.CreateName(item.Feature); + + return string.Format(Resources[Messages.Dashboard_DisableWidgetHelpTemplate], featureName); + } private void HandleDrop(DashboardSettingsItem[] items, DashboardSettingsItem target) { diff --git a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettings.razor.css b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettings.razor.css index 60c16dad..ee719844 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettings.razor.css +++ b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettings.razor.css @@ -4,8 +4,7 @@ justify-content: right; } .widget-settings__body { - margin: 20px; - height: calc(100% - 90px); + margin: 10px; } .widget-settings__item { background-color: #555; @@ -19,15 +18,12 @@ border: 3px #555 solid; } .widget-settings_on-drag .widget-settings__item { - border: 3px #AAA dashed; + border: 3px #aaa dashed; } .widget-settings__actions { display: flex; justify-content: right; - padding: 0 10px; -} -.widget-settings { - height: calc(100% - 20px); + margin: 0 10px 10px 10px; } .widget-settings__drag { display: flex; @@ -35,9 +31,6 @@ .widget-settings__button, .widget-settings__label, .widget-settings__drag, ::deep .widget-settings__checkbox { margin-right: 10px; } -::deep form { - height: 100%; -} @media (max-width: 767.98px) { .dashboard-settings { display: none; diff --git a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettingsFormModel.cs b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettingsFormModel.cs index 9f4f53a3..8fe53181 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettingsFormModel.cs +++ b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettingsFormModel.cs @@ -16,6 +16,7 @@ public DashboardSettingsFormModel Apply(IReadOnlyCollection widgets) _items.AddRange(widgets.Select(w => new DashboardSettingsItem { Type = w.Type, + Feature = w.Feature, Position = w.Position, CanEnabled = w.CanEnabled, IsVisible = w.IsVisible diff --git a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettingsItem.cs b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettingsItem.cs index de0b8153..d50166d6 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettingsItem.cs +++ b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/Settings/DashboardSettingsItem.cs @@ -3,6 +3,7 @@ namespace Inc.TeamAssistant.WebUI.Features.Dashboard.Settings; public sealed class DashboardSettingsItem { public string Type { get; set; } = string.Empty; + public string Feature { get; set; } = string.Empty; public int Position { get; set; } public bool CanEnabled { get; set; } public bool IsVisible { get; set; } diff --git a/src/Inc.TeamAssistant.WebUI/Features/Layouts/CultureSelector.razor b/src/Inc.TeamAssistant.WebUI/Features/Layouts/CultureSelector.razor index 26cfc736..690bce2f 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Layouts/CultureSelector.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Layouts/CultureSelector.razor @@ -1,37 +1,41 @@ -@using Inc.TeamAssistant.Primitives.Languages +@implements IDisposable -@inject NavigationManager NavigationManager +@inject NavRouter NavRouter -@foreach (var culture in LanguageSettings.LanguageIds) +@foreach (var language in _languages) { - var path = $"/{culture.Value}/{_cleanUrl}"; - - - @culture.Value + + @language.Culture } @code { - private string _cleanUrl = string.Empty; + private IReadOnlyCollection<(string Culture, string Path)> _languages = Array.Empty<(string, string)>(); + private IDisposable? _routerScope; protected override void OnParametersSet() { - Load(); + SetLanguages(); - NavigationManager.LocationChanged += (s, e) => Load(); + _routerScope = NavRouter.OnRouteChanged(SetLanguages); } - private void Load() + private void SetLanguages() { - var cleanUrl = NavigationManager.ToBaseRelativePath(NavigationManager.Uri); - - foreach (var languageId in LanguageSettings.LanguageIds) - cleanUrl = cleanUrl.TrimStart($"/{languageId.Value}".ToArray()); + var routeWithoutLanguage = NavRouter.GetRouteSegment(); - _cleanUrl = cleanUrl; + _languages = LanguageSettings.LanguageIds + .Select(l => (l.Value, $"/{l.Value}/{routeWithoutLanguage}")) + .ToArray(); StateHasChanged(); } - private void MoveTo(string path) => NavigationManager.NavigateTo(path, forceLoad: true); + private Task MoveTo(string path) => NavRouter.MoveToRoute(path, RoutingType.Server); + + public void Dispose() => _routerScope?.Dispose(); } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainFooter.razor b/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainFooter.razor index 45d47c94..3ee1bc1c 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainFooter.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainFooter.razor @@ -1,6 +1,6 @@ @inject IRenderContext RenderContext @inject ResourcesManager Resources -@inject LinkBuilder LinkBuilder +@inject NavRouter NavRouter
@@ -33,19 +33,19 @@ { const bool external = true; - var links = new (string Key, FooterLink Value)[] + var links = new (MessageId Key, FooterLink Value)[] { (Messages.Footer_GroupNavigation, new FooterLink( Resources[Messages.Footer_LinkMain], - LinkBuilder.Build(null), + NavRouter.CreateRoute(null), !external)), (Messages.Footer_GroupNavigation, new FooterLink( Resources[Messages.Footer_LinkConstructor], - LinkBuilder.Build("constructor"), + NavRouter.CreateRoute("constructor"), !external)), (Messages.Footer_GroupNavigation, new FooterLink( Resources[Messages.Footer_LinkDashboard], - LinkBuilder.Build("dashboard"), + NavRouter.CreateRoute("dashboard"), !external)), (Messages.Footer_GroupTech, new FooterLink( "DotNet", diff --git a/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor b/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor index 9f7f5407..9927f489 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor @@ -1,9 +1,8 @@ @implements IDisposable @inject IRenderContext RenderContext -@inject NavigationManager NavigationManager @inject ResourcesManager Resources -@inject LinkBuilder LinkBuilder +@inject NavRouter NavRouter
@@ -27,9 +26,11 @@
- @if (!_currentUrl.Contains("/login")) + @if (!NavRouter.CurrentUrl.Contains("/login")) { - + @Resources[Messages.Navigation_Login] } @@ -39,32 +40,15 @@
@code { - private string _currentUrl = string.Empty; + private IDisposable? _routerScope; - private string MainUrl => LinkBuilder.Build(null); - private string LogoutUrl => $"accounts/logout?returnUrl={_currentUrl}"; + private string MainUrl => NavRouter.CreateRoute(null); + private string LogoutUrl => $"accounts/logout?returnUrl={NavRouter.CurrentUrl}"; protected override void OnInitialized() { - SetPath(); - - NavigationManager.LocationChanged += OnLocationChanged; + _routerScope = NavRouter.OnRouteChanged(StateHasChanged); } - private void SetPath() - { - _currentUrl = NavigationManager.Uri; - } - - private void OnLocationChanged(object? sender, LocationChangedEventArgs e) - { - SetPath(); - - StateHasChanged(); - } - - public void Dispose() - { - NavigationManager.LocationChanged -= OnLocationChanged; - } + public void Dispose() => _routerScope?.Dispose(); } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor.css b/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor.css index 21b3abd4..cc15d471 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor.css +++ b/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor.css @@ -2,6 +2,7 @@ background: rgba(0, 0, 0, .3); position: relative; height: 70px; + z-index: 999; } .navbar-container { display: flex; diff --git a/src/Inc.TeamAssistant.WebUI/Features/Main/MainPage.razor b/src/Inc.TeamAssistant.WebUI/Features/Main/MainPage.razor index 59f9ec0f..64f76ea6 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Main/MainPage.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Main/MainPage.razor @@ -2,9 +2,11 @@ @page "/en" @page "/ru" +@using Inc.TeamAssistant.Primitives + @inject IRenderContext RenderContext @inject ResourcesManager Resources -@inject LinkBuilder LinkBuilder +@inject NavRouter NavRouter @@ -19,18 +21,18 @@

- 👌 @Resources[Messages.GUI_ToolAppraiser] + @Icons.Ok @Resources[Messages.GUI_ToolAppraiser]
- 🤝 @Resources[Messages.GUI_ToolReviewer] + @Icons.Accept @Resources[Messages.GUI_ToolReviewer]
- 💬 @Resources[Messages.GUI_ToolRandomCoffee] + @Icons.Comment @Resources[Messages.GUI_ToolRandomCoffee]
- ⭐ @Resources[Messages.GUI_ToolCheckIn] + @Icons.Start @Resources[Messages.GUI_ToolCheckIn]

@Resources[Messages.GUI_CreateBotLink] diff --git a/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor b/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor index 2614cb3c..c388832c 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor @@ -34,7 +34,7 @@ private ElementReference _map; private IJSObjectReference? _mapModule; - private string CssClass => DisableLayout ? string.Empty : "map__navbar"; + private string CssClass => DisableLayout ? string.Empty : "map_navbar"; private IReadOnlyDictionary FeatureNamesLookup => new Dictionary { ["Review"] = Resources[Messages.Constructor_FeatureReviewerName], diff --git a/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor.css b/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor.css index 71d3d5b4..20319670 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor.css +++ b/src/Inc.TeamAssistant.WebUI/Features/Map/MapPage.razor.css @@ -4,6 +4,6 @@ padding: 0; margin: 0; } -.map__navbar { +.map_navbar { margin-top: -70px; } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Features/Meta/MetaData.razor b/src/Inc.TeamAssistant.WebUI/Features/Meta/MetaData.razor index 4b810ad3..aafa59d7 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Meta/MetaData.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Meta/MetaData.razor @@ -14,7 +14,7 @@ [Parameter, EditorRequired] public WebsiteSection WebsiteSection { get; set; } - private (string Description, string Keywords, bool Indexed) _data = default!; + private (MessageId Description, MessageId Keywords, bool Indexed) _data = default!; protected override void OnParametersSet() => Load(); diff --git a/src/Inc.TeamAssistant.WebUI/Features/Meta/MetaDataModule.razor b/src/Inc.TeamAssistant.WebUI/Features/Meta/MetaDataModule.razor index 8d204f12..717399ef 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Meta/MetaDataModule.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Meta/MetaDataModule.razor @@ -18,8 +18,10 @@ private string _title = GlobalSettings.CanonicalName; - protected override void OnParametersSet() + protected override async Task OnParametersSetAsync() { + await ResourcesManager.Initialize(); + _title = CreateTitle(); } diff --git a/src/Inc.TeamAssistant.WebUI/Features/Meta/OpenGraph.razor b/src/Inc.TeamAssistant.WebUI/Features/Meta/OpenGraph.razor index 2e19820b..029e00e0 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Meta/OpenGraph.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Meta/OpenGraph.razor @@ -26,7 +26,7 @@ public WebsiteSection WebsiteSection { get; set; } private string _languageId = string.Empty; - private (string Title, string Description, string Image, string ImageText) _data = default; + private (MessageId Title, MessageId Description, string Image, MessageId ImageText) _data = default; protected override void OnParametersSet() => Load(); diff --git a/src/Inc.TeamAssistant.WebUI/Features/Notifications/NotificationBar.razor b/src/Inc.TeamAssistant.WebUI/Features/Notifications/NotificationBar.razor index 82772317..3032f324 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Notifications/NotificationBar.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/Notifications/NotificationBar.razor @@ -5,7 +5,7 @@
@foreach (var notification in Notifications) { -
+
@@ -32,22 +32,21 @@ @code { private EventsProvider? _eventsProvider; + private IDisposable? _routerScope; protected override async Task OnInitializedAsync() { SetCurrentLanguage(); - NavigationManager.LocationChanged += OnLocationChanged; - - await ResourcesManager.Load(); + await ResourcesManager.Initialize(); + + _routerScope = NavRouter.OnRouteChanged(SetCurrentLanguage); _eventsProvider = ServiceProvider.GetService(); if (_eventsProvider is not null) await _eventsProvider.Start(); } - private void OnLocationChanged(object? sender, LocationChangedEventArgs e) => SetCurrentLanguage(); - private void SetCurrentLanguage() { var languageContext = RenderContext.GetLanguageContext(); @@ -57,9 +56,9 @@ public async ValueTask DisposeAsync() { - NavigationManager.LocationChanged -= OnLocationChanged; - if (_eventsProvider is not null) await _eventsProvider.DisposeAsync(); + + _routerScope?.Dispose(); } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Features/_Imports.razor b/src/Inc.TeamAssistant.WebUI/Features/_Imports.razor index da4a5b6b..8a2247d5 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/_Imports.razor +++ b/src/Inc.TeamAssistant.WebUI/Features/_Imports.razor @@ -9,11 +9,13 @@ @using Microsoft.AspNetCore.Components.QuickGrid @using ApexCharts +@using Inc.TeamAssistant.Primitives.Languages @using Inc.TeamAssistant.WebUI.Contracts @using Inc.TeamAssistant.WebUI.Features.Layouts @using Inc.TeamAssistant.WebUI.Features.Meta @using Inc.TeamAssistant.WebUI.Features.Dialogs @using Inc.TeamAssistant.WebUI.Services.ClientCore +@using Inc.TeamAssistant.WebUI.Routing @using Inc.TeamAssistant.WebUI.Extensions @using Inc.TeamAssistant.WebUI.Features.Icons @using Inc.TeamAssistant.WebUI.Features.Auth diff --git a/src/Inc.TeamAssistant.WebUI/Messages.cs b/src/Inc.TeamAssistant.WebUI/Messages.cs index 457108bc..5ca03958 100644 --- a/src/Inc.TeamAssistant.WebUI/Messages.cs +++ b/src/Inc.TeamAssistant.WebUI/Messages.cs @@ -1,231 +1,236 @@ +using Inc.TeamAssistant.Primitives.Languages; + namespace Inc.TeamAssistant.WebUI; internal static class Messages { - public static readonly string GUI_Authorizing = nameof(GUI_Authorizing); - public static readonly string GUI_Error404 = nameof(GUI_Error404); - public static readonly string GUI_PageNotFound = nameof(GUI_PageNotFound); + public static readonly MessageId GUI_Authorizing = new(nameof(GUI_Authorizing)); + public static readonly MessageId GUI_Error404 = new(nameof(GUI_Error404)); + public static readonly MessageId GUI_PageNotFound = new(nameof(GUI_PageNotFound)); - public static readonly string GUI_TaskAssess = nameof(GUI_TaskAssess); - public static readonly string GUI_MeanRating = nameof(GUI_MeanRating); - public static readonly string GUI_MedianRating = nameof(GUI_MedianRating); - public static readonly string GUI_AcceptedValue = nameof(GUI_AcceptedValue); - public static readonly string GUI_AssessmentSessionAbout = nameof(GUI_AssessmentSessionAbout); - public static readonly string GUI_AssessmentSessionConnect = nameof(GUI_AssessmentSessionConnect); - public static readonly string GUI_EstimationAcceptedTemplate = nameof(GUI_EstimationAcceptedTemplate); + public static readonly MessageId GUI_TaskAssess = new(nameof(GUI_TaskAssess)); + public static readonly MessageId GUI_MeanRating = new(nameof(GUI_MeanRating)); + public static readonly MessageId GUI_MedianRating = new(nameof(GUI_MedianRating)); + public static readonly MessageId GUI_AcceptedValue = new(nameof(GUI_AcceptedValue)); + public static readonly MessageId GUI_AssessmentSessionAbout = new(nameof(GUI_AssessmentSessionAbout)); + public static readonly MessageId GUI_AssessmentSessionConnect = new(nameof(GUI_AssessmentSessionConnect)); + public static readonly MessageId GUI_EstimationAcceptedTemplate = new(nameof(GUI_EstimationAcceptedTemplate)); - public static readonly string GUI_AcceptCookieButton = nameof(GUI_AcceptCookieButton); - public static readonly string GUI_AcceptCookieText = nameof(GUI_AcceptCookieText); + public static readonly MessageId GUI_AcceptCookieButton = new(nameof(GUI_AcceptCookieButton)); + public static readonly MessageId GUI_AcceptCookieText = new(nameof(GUI_AcceptCookieText)); - public static readonly string GUI_History = nameof(GUI_History); - public static readonly string GUI_Tasks = nameof(GUI_Tasks); - public static readonly string GUI_StoryList = nameof(GUI_StoryList); - public static readonly string GUI_AssessmentSession = nameof(GUI_AssessmentSession); + public static readonly MessageId GUI_History = new(nameof(GUI_History)); + public static readonly MessageId GUI_Tasks = new(nameof(GUI_Tasks)); + public static readonly MessageId GUI_StoryList = new(nameof(GUI_StoryList)); + public static readonly MessageId GUI_AssessmentSession = new(nameof(GUI_AssessmentSession)); - public static readonly string GUI_MainTitle = nameof(GUI_MainTitle); - public static readonly string GUI_MainHeader = nameof(GUI_MainHeader); - public static readonly string GUI_MainSubHeader = nameof(GUI_MainSubHeader); - public static readonly string GUI_ToolAppraiser = nameof(GUI_ToolAppraiser); - public static readonly string GUI_ToolReviewer = nameof(GUI_ToolReviewer); - public static readonly string GUI_ToolRandomCoffee = nameof(GUI_ToolRandomCoffee); - public static readonly string GUI_ToolCheckIn = nameof(GUI_ToolCheckIn); - public static readonly string GUI_CreateBotLink = nameof(GUI_CreateBotLink); - public static readonly string GUI_VideoNotSupported = nameof(GUI_VideoNotSupported); - public static readonly string GUI_DataRefreshed = nameof(GUI_DataRefreshed); + public static readonly MessageId GUI_MainTitle = new(nameof(GUI_MainTitle)); + public static readonly MessageId GUI_MainHeader = new(nameof(GUI_MainHeader)); + public static readonly MessageId GUI_MainSubHeader = new(nameof(GUI_MainSubHeader)); + public static readonly MessageId GUI_ToolAppraiser = new(nameof(GUI_ToolAppraiser)); + public static readonly MessageId GUI_ToolReviewer = new(nameof(GUI_ToolReviewer)); + public static readonly MessageId GUI_ToolRandomCoffee = new(nameof(GUI_ToolRandomCoffee)); + public static readonly MessageId GUI_ToolCheckIn = new(nameof(GUI_ToolCheckIn)); + public static readonly MessageId GUI_CreateBotLink = new(nameof(GUI_CreateBotLink)); + public static readonly MessageId GUI_VideoNotSupported = new(nameof(GUI_VideoNotSupported)); + public static readonly MessageId GUI_DataRefreshed = new(nameof(GUI_DataRefreshed)); - public static readonly string Navigation_Login = nameof(Navigation_Login); - public static readonly string Navigation_Logout = nameof(Navigation_Logout); + public static readonly MessageId Navigation_Login = new(nameof(Navigation_Login)); + public static readonly MessageId Navigation_Logout = new(nameof(Navigation_Logout)); - public static readonly string Constructor_NewBot = nameof(Constructor_NewBot); - public static readonly string Constructor_AddBot = nameof(Constructor_AddBot); - public static readonly string Constructor_Edit = nameof(Constructor_Edit); - public static readonly string Constructor_Remove = nameof(Constructor_Remove); - public static readonly string Constructor_Title = nameof(Constructor_Title); - public static readonly string Constructor_SelectBotText = nameof(Constructor_SelectBotText); - public static readonly string Constructor_RemoveConfirmationText = nameof(Constructor_RemoveConfirmationText); - public static readonly string Constructor_FormSectionTokenTitle = nameof(Constructor_FormSectionTokenTitle); - public static readonly string Constructor_FormSectionTokenHelpTemplate = nameof(Constructor_FormSectionTokenHelpTemplate); - public static readonly string Constructor_FormSectionTokenFieldTokenLabel = nameof(Constructor_FormSectionTokenFieldTokenLabel); - public static readonly string Constructor_FormSectionTokenFieldUserNameLabel = nameof(Constructor_FormSectionTokenFieldUserNameLabel); - public static readonly string Constructor_MoveNextTitle = nameof(Constructor_MoveNextTitle); - public static readonly string Constructor_FormSectionFeaturesTitle = nameof(Constructor_FormSectionFeaturesTitle); - public static readonly string Constructor_FormSectionFeaturesHelp = nameof(Constructor_FormSectionFeaturesHelp); - public static readonly string Constructor_FeatureAppraiserName = nameof(Constructor_FeatureAppraiserName); - public static readonly string Constructor_FeatureReviewerName = nameof(Constructor_FeatureReviewerName); - public static readonly string Constructor_FeatureRandomCoffeeName = nameof(Constructor_FeatureRandomCoffeeName); - public static readonly string Constructor_FeatureCheckInName = nameof(Constructor_FeatureCheckInName); - public static readonly string Constructor_FeatureAppraiserDescription = nameof(Constructor_FeatureAppraiserDescription); - public static readonly string Constructor_FeatureReviewerDescription = nameof(Constructor_FeatureReviewerDescription); - public static readonly string Constructor_FeatureRandomCoffeeDescription = nameof(Constructor_FeatureRandomCoffeeDescription); - public static readonly string Constructor_FeatureCheckInDescription = nameof(Constructor_FeatureCheckInDescription); - public static readonly string Constructor_FeatureAdd = nameof(Constructor_FeatureAdd); - public static readonly string Constructor_FeatureRemove = nameof(Constructor_FeatureRemove); - public static readonly string Constructor_FormSectionFeaturesAvailableEmptyText = nameof(Constructor_FormSectionFeaturesAvailableEmptyText); - public static readonly string Constructor_FormSectionFeaturesSelectedEmptyText = nameof(Constructor_FormSectionFeaturesSelectedEmptyText); - public static readonly string Constructor_FormSectionSetSettingsRoundRobinDescription = nameof(Constructor_FormSectionSetSettingsRoundRobinDescription); - public static readonly string Constructor_FormSectionSetSettingsRandomDescription = nameof(Constructor_FormSectionSetSettingsRandomDescription); - public static readonly string Constructor_FormSectionSetSettingsAppraiserHeader = nameof(Constructor_FormSectionSetSettingsAppraiserHeader); - public static readonly string Constructor_FormSectionSetSettingsAppraiserHelp = nameof(Constructor_FormSectionSetSettingsAppraiserHelp); - public static readonly string Constructor_FormSectionSetSettingsStoryTypeFieldLabel = nameof(Constructor_FormSectionSetSettingsStoryTypeFieldLabel); - public static readonly string Constructor_FormSectionSetSettingsReviewerHeader = nameof(Constructor_FormSectionSetSettingsReviewerHeader); - public static readonly string Constructor_FormSectionSetSettingsReviewerHelp = nameof(Constructor_FormSectionSetSettingsReviewerHelp); - public static readonly string Constructor_FormSectionSetSettingsNextReviewerStrategyFieldLabel = nameof(Constructor_FormSectionSetSettingsNextReviewerStrategyFieldLabel); - public static readonly string Constructor_FormSectionTokenCheckHelp = nameof(Constructor_FormSectionTokenCheckHelp); - public static readonly string Constructor_FormSectionFeaturesCheckHelp = nameof(Constructor_FormSectionFeaturesCheckHelp); - public static readonly string Constructor_ButtonCreateText = nameof(Constructor_ButtonCreateText); - public static readonly string Constructor_ButtonUpdateText = nameof(Constructor_ButtonUpdateText); - public static readonly string Constructor_BooleanTrueText = nameof(Constructor_BooleanTrueText); - public static readonly string Constructor_BooleanFalseText = nameof(Constructor_BooleanFalseText); - public static readonly string Constructor_SupportedLanguages = nameof(Constructor_SupportedLanguages); - public static readonly string Constructor_SupportedLanguagesHelp = nameof(Constructor_SupportedLanguagesHelp); - public static readonly string Constructor_SupportedLanguagesCheck = nameof(Constructor_SupportedLanguagesCheck); - public static readonly string Constructor_Languages = nameof(Constructor_Languages); - public static readonly string Constructor_BotName = nameof(Constructor_BotName); - public static readonly string Constructor_BotShortDescription = nameof(Constructor_BotShortDescription); - public static readonly string Constructor_BotDescription = nameof(Constructor_BotDescription); - public static readonly string Constructor_WorkTimeTitle = nameof(Constructor_WorkTimeTitle); - public static readonly string Constructor_WorkTimeHelp = nameof(Constructor_WorkTimeHelp); - public static readonly string Constructor_WorkAllDayLabel = nameof(Constructor_WorkAllDayLabel); - public static readonly string Constructor_WorkTimeStartLabel = nameof(Constructor_WorkTimeStartLabel); - public static readonly string Constructor_WorkTimeEndLabel = nameof(Constructor_WorkTimeEndLabel); - public static readonly string Constructor_WeekendsTitle = nameof(Constructor_WeekendsTitle); - public static readonly string Constructor_WeekendsHelp = nameof(Constructor_WeekendsHelp); - public static readonly string Constructor_WeekendsLabel = nameof(Constructor_WeekendsLabel); - public static readonly string Constructor_HolidaysTitle = nameof(Constructor_HolidaysTitle); - public static readonly string Constructor_HolidaysHelp = nameof(Constructor_HolidaysHelp); - public static readonly string Constructor_DateLabel = nameof(Constructor_DateLabel); - public static readonly string Constructor_WorkdayLabel = nameof(Constructor_WorkdayLabel); - public static readonly string Constructor_AddHolidayLabel = nameof(Constructor_AddHolidayLabel); - public static readonly string Constructor_ConnectingTelegram = nameof(Constructor_ConnectingTelegram); - public static readonly string Constructor_WorkCalendar = nameof(Constructor_WorkCalendar); - public static readonly string Constructor_BotDetailsTelegram = nameof(Constructor_BotDetailsTelegram); - public static readonly string Constructor_BotDetails = nameof(Constructor_BotDetails); - public static readonly string Constructor_BotDetailsHelp = nameof(Constructor_BotDetailsHelp); - public static readonly string Constructor_FeaturesStore = nameof(Constructor_FeaturesStore); - public static readonly string Constructor_Configuration = nameof(Constructor_Configuration); - public static readonly string Constructor_CheckConfigurationTemplate = nameof(Constructor_CheckConfigurationTemplate); - public static readonly string Constructor_RequiredCalendar = nameof(Constructor_RequiredCalendar); - public static readonly string Constructor_DuplicateHolidays = nameof(Constructor_DuplicateHolidays); + public static readonly MessageId Constructor_NewBot = new(nameof(Constructor_NewBot)); + public static readonly MessageId Constructor_AddBot = new(nameof(Constructor_AddBot)); + public static readonly MessageId Constructor_Edit = new(nameof(Constructor_Edit)); + public static readonly MessageId Constructor_Remove = new(nameof(Constructor_Remove)); + public static readonly MessageId Constructor_Title = new(nameof(Constructor_Title)); + public static readonly MessageId Constructor_SelectBotText = new(nameof(Constructor_SelectBotText)); + public static readonly MessageId Constructor_RemoveConfirmationText = new(nameof(Constructor_RemoveConfirmationText)); + public static readonly MessageId Constructor_FormSectionTokenTitle = new(nameof(Constructor_FormSectionTokenTitle)); + public static readonly MessageId Constructor_FormSectionTokenHelpTemplate = new(nameof(Constructor_FormSectionTokenHelpTemplate)); + public static readonly MessageId Constructor_FormSectionTokenFieldTokenLabel = new(nameof(Constructor_FormSectionTokenFieldTokenLabel)); + public static readonly MessageId Constructor_FormSectionTokenFieldUserNameLabel = new(nameof(Constructor_FormSectionTokenFieldUserNameLabel)); + public static readonly MessageId Constructor_MoveNextTitle = new(nameof(Constructor_MoveNextTitle)); + public static readonly MessageId Constructor_FormSectionFeaturesTitle = new(nameof(Constructor_FormSectionFeaturesTitle)); + public static readonly MessageId Constructor_FormSectionFeaturesHelp = new(nameof(Constructor_FormSectionFeaturesHelp)); + public static readonly MessageId Constructor_FeatureAppraiserName = new(nameof(Constructor_FeatureAppraiserName)); + public static readonly MessageId Constructor_FeatureReviewerName = new(nameof(Constructor_FeatureReviewerName)); + public static readonly MessageId Constructor_FeatureRandomCoffeeName = new(nameof(Constructor_FeatureRandomCoffeeName)); + public static readonly MessageId Constructor_FeatureCheckInName = new(nameof(Constructor_FeatureCheckInName)); + public static readonly MessageId Constructor_FeatureAppraiserDescription = new(nameof(Constructor_FeatureAppraiserDescription)); + public static readonly MessageId Constructor_FeatureReviewerDescription = new(nameof(Constructor_FeatureReviewerDescription)); + public static readonly MessageId Constructor_FeatureRandomCoffeeDescription = new(nameof(Constructor_FeatureRandomCoffeeDescription)); + public static readonly MessageId Constructor_FeatureCheckInDescription = new(nameof(Constructor_FeatureCheckInDescription)); + public static readonly MessageId Constructor_FeatureAdd = new(nameof(Constructor_FeatureAdd)); + public static readonly MessageId Constructor_FeatureRemove = new(nameof(Constructor_FeatureRemove)); + public static readonly MessageId Constructor_FormSectionFeaturesAvailableEmptyText = new(nameof(Constructor_FormSectionFeaturesAvailableEmptyText)); + public static readonly MessageId Constructor_FormSectionFeaturesSelectedEmptyText = new(nameof(Constructor_FormSectionFeaturesSelectedEmptyText)); + public static readonly MessageId Constructor_FormSectionSetSettingsRoundRobinDescription = new(nameof(Constructor_FormSectionSetSettingsRoundRobinDescription)); + public static readonly MessageId Constructor_FormSectionSetSettingsRandomDescription = new(nameof(Constructor_FormSectionSetSettingsRandomDescription)); + public static readonly MessageId Constructor_FormSectionSetSettingsAppraiserHeader = new(nameof(Constructor_FormSectionSetSettingsAppraiserHeader)); + public static readonly MessageId Constructor_FormSectionSetSettingsAppraiserHelp = new(nameof(Constructor_FormSectionSetSettingsAppraiserHelp)); + public static readonly MessageId Constructor_FormSectionSetSettingsStoryTypeFieldLabel = new(nameof(Constructor_FormSectionSetSettingsStoryTypeFieldLabel)); + public static readonly MessageId Constructor_FormSectionSetSettingsReviewerHeader = new(nameof(Constructor_FormSectionSetSettingsReviewerHeader)); + public static readonly MessageId Constructor_FormSectionSetSettingsReviewerHelp = new(nameof(Constructor_FormSectionSetSettingsReviewerHelp)); + public static readonly MessageId Constructor_FormSectionSetSettingsNextReviewerStrategyFieldLabel = new(nameof(Constructor_FormSectionSetSettingsNextReviewerStrategyFieldLabel)); + public static readonly MessageId Constructor_FormSectionTokenCheckHelp = new(nameof(Constructor_FormSectionTokenCheckHelp)); + public static readonly MessageId Constructor_FormSectionFeaturesCheckHelp = new(nameof(Constructor_FormSectionFeaturesCheckHelp)); + public static readonly MessageId Constructor_ButtonCreateText = new(nameof(Constructor_ButtonCreateText)); + public static readonly MessageId Constructor_ButtonUpdateText = new(nameof(Constructor_ButtonUpdateText)); + public static readonly MessageId Constructor_BooleanTrueText = new(nameof(Constructor_BooleanTrueText)); + public static readonly MessageId Constructor_BooleanFalseText = new(nameof(Constructor_BooleanFalseText)); + public static readonly MessageId Constructor_SupportedLanguages = new(nameof(Constructor_SupportedLanguages)); + public static readonly MessageId Constructor_SupportedLanguagesHelp = new(nameof(Constructor_SupportedLanguagesHelp)); + public static readonly MessageId Constructor_SupportedLanguagesCheck = new(nameof(Constructor_SupportedLanguagesCheck)); + public static readonly MessageId Constructor_Languages = new(nameof(Constructor_Languages)); + public static readonly MessageId Constructor_BotName = new(nameof(Constructor_BotName)); + public static readonly MessageId Constructor_BotShortDescription = new(nameof(Constructor_BotShortDescription)); + public static readonly MessageId Constructor_BotDescription = new(nameof(Constructor_BotDescription)); + public static readonly MessageId Constructor_WorkTimeTitle = new(nameof(Constructor_WorkTimeTitle)); + public static readonly MessageId Constructor_WorkTimeHelp = new(nameof(Constructor_WorkTimeHelp)); + public static readonly MessageId Constructor_WorkAllDayLabel = new(nameof(Constructor_WorkAllDayLabel)); + public static readonly MessageId Constructor_WorkTimeStartLabel = new(nameof(Constructor_WorkTimeStartLabel)); + public static readonly MessageId Constructor_WorkTimeEndLabel = new(nameof(Constructor_WorkTimeEndLabel)); + public static readonly MessageId Constructor_WeekendsTitle = new(nameof(Constructor_WeekendsTitle)); + public static readonly MessageId Constructor_WeekendsHelp = new(nameof(Constructor_WeekendsHelp)); + public static readonly MessageId Constructor_WeekendsLabel = new(nameof(Constructor_WeekendsLabel)); + public static readonly MessageId Constructor_HolidaysTitle = new(nameof(Constructor_HolidaysTitle)); + public static readonly MessageId Constructor_HolidaysHelp = new(nameof(Constructor_HolidaysHelp)); + public static readonly MessageId Constructor_DateLabel = new(nameof(Constructor_DateLabel)); + public static readonly MessageId Constructor_WorkdayLabel = new(nameof(Constructor_WorkdayLabel)); + public static readonly MessageId Constructor_AddHolidayLabel = new(nameof(Constructor_AddHolidayLabel)); + public static readonly MessageId Constructor_ConnectingTelegram = new(nameof(Constructor_ConnectingTelegram)); + public static readonly MessageId Constructor_WorkCalendar = new(nameof(Constructor_WorkCalendar)); + public static readonly MessageId Constructor_BotDetailsTelegram = new(nameof(Constructor_BotDetailsTelegram)); + public static readonly MessageId Constructor_BotDetails = new(nameof(Constructor_BotDetails)); + public static readonly MessageId Constructor_BotDetailsHelp = new(nameof(Constructor_BotDetailsHelp)); + public static readonly MessageId Constructor_FeaturesStore = new(nameof(Constructor_FeaturesStore)); + public static readonly MessageId Constructor_Configuration = new(nameof(Constructor_Configuration)); + public static readonly MessageId Constructor_CheckConfigurationTemplate = new(nameof(Constructor_CheckConfigurationTemplate)); + public static readonly MessageId Constructor_RequiredCalendar = new(nameof(Constructor_RequiredCalendar)); + public static readonly MessageId Constructor_DuplicateHolidays = new(nameof(Constructor_DuplicateHolidays)); - public static readonly string Dashboard_MoveToDashboard = nameof(Dashboard_MoveToDashboard); - public static readonly string Dashboard_Title = nameof(Dashboard_Title); - public static readonly string Dashboard_SelectTeam = nameof(Dashboard_SelectTeam); - public static readonly string Dashboard_CreateBot = nameof(Dashboard_CreateBot); - public static readonly string Dashboard_SelectTeamTitle = nameof(Dashboard_SelectTeamTitle); - public static readonly string Dashboard_TeamField = nameof(Dashboard_TeamField); - public static readonly string Dashboard_BotField = nameof(Dashboard_BotField); - public static readonly string Dashboard_ExcludeFromTeam = nameof(Dashboard_ExcludeFromTeam); - public static readonly string Dashboard_LeaveTeammate = nameof(Dashboard_LeaveTeammate); - public static readonly string Dashboard_Days = nameof(Dashboard_Days); - public static readonly string Dashboard_Forever = nameof(Dashboard_Forever); - public static readonly string Dashboard_PersonName = nameof(Dashboard_PersonName); - public static readonly string Dashboard_LeaveUntil = nameof(Dashboard_LeaveUntil); - public static readonly string Dashboard_RecoveryTeammate = nameof(Dashboard_RecoveryTeammate); - public static readonly string Dashboard_ReviewByReviewerTemplate = nameof(Dashboard_ReviewByReviewerTemplate); - public static readonly string Dashboard_ReviewByOwnerTemplate = nameof(Dashboard_ReviewByOwnerTemplate); - public static readonly string Dashboard_ReviewAverageStatsTitle = nameof(Dashboard_ReviewAverageStatsTitle); - public static readonly string Dashboard_ReviewAverageFirstTouch = nameof(Dashboard_ReviewAverageFirstTouch); - public static readonly string Dashboard_ReviewAverageReview = nameof(Dashboard_ReviewAverageReview); - public static readonly string Dashboard_ReviewAverageCorrection = nameof(Dashboard_ReviewAverageCorrection); - public static readonly string Dashboard_ReviewDescriptionTitle = nameof(Dashboard_ReviewDescriptionTitle); - public static readonly string Dashboard_ReviewReviewerNameTitle = nameof(Dashboard_ReviewReviewerNameTitle); - public static readonly string Dashboard_ReviewOwnerNameTitle = nameof(Dashboard_ReviewOwnerNameTitle); - public static readonly string Dashboard_ReviewStateTitle = nameof(Dashboard_ReviewStateTitle); - public static readonly string Dashboard_ReviewStateNone = nameof(Dashboard_ReviewStateNone); - public static readonly string Dashboard_ReviewStateNew = nameof(Dashboard_ReviewStateNew); - public static readonly string Dashboard_ReviewStateInProgress = nameof(Dashboard_ReviewStateInProgress); - public static readonly string Dashboard_ReviewStateOnCorrection = nameof(Dashboard_ReviewStateOnCorrection); - public static readonly string Dashboard_ReviewStateAccept = nameof(Dashboard_ReviewStateAccept); - public static readonly string Dashboard_ReviewStats = nameof(Dashboard_ReviewStats); - public static readonly string Dashboard_FirstTouch = nameof(Dashboard_FirstTouch); - public static readonly string Dashboard_Correction = nameof(Dashboard_Correction); - public static readonly string Dashboard_Review = nameof(Dashboard_Review); - public static readonly string Dashboard_NoData = nameof(Dashboard_NoData); - public static readonly string Dashboard_TeammatesWidgetTitle = nameof(Dashboard_TeammatesWidgetTitle); - public static readonly string Dashboard_BotWidgetTitle = nameof(Dashboard_BotWidgetTitle); - public static readonly string Dashboard_ReviewTotalStatsWidgetTitle = nameof(Dashboard_ReviewTotalStatsWidgetTitle); - public static readonly string Dashboard_LastTasksWidgetTitle = nameof(Dashboard_LastTasksWidgetTitle); - public static readonly string Dashboard_ReviewAverageStatsWidgetTitle = nameof(Dashboard_ReviewAverageStatsWidgetTitle); - public static readonly string Dashboard_CheckInMoveToMapTitle = nameof(Dashboard_CheckInMoveToMapTitle); - public static readonly string Dashboard_CheckInMapWidgetTitle = nameof(Dashboard_CheckInMapWidgetTitle); - public static readonly string Dashboard_RandomCoffeeHistoryWidgetTitle = nameof(Dashboard_RandomCoffeeHistoryWidgetTitle); - public static readonly string Dashboard_RandomCoffeeNoPair = nameof(Dashboard_RandomCoffeeNoPair); - public static readonly string Dashboard_RandomCoffeeFirstTitle = nameof(Dashboard_RandomCoffeeFirstTitle); - public static readonly string Dashboard_RandomCoffeeSecondTitle = nameof(Dashboard_RandomCoffeeSecondTitle); - public static readonly string Dashboard_TwoWeeks = nameof(Dashboard_TwoWeeks); - public static readonly string Dashboard_FourWeeks = nameof(Dashboard_FourWeeks); - public static readonly string Dashboard_TwelveWeeks = nameof(Dashboard_TwelveWeeks); - public static readonly string Dashboard_OneMonth = nameof(Dashboard_OneMonth); - public static readonly string Dashboard_ThreeMonths = nameof(Dashboard_ThreeMonths); - public static readonly string Dashboard_SixMonths = nameof(Dashboard_SixMonths); - public static readonly string Dashboard_GoToCurrentSessionButtonText = nameof(Dashboard_GoToCurrentSessionButtonText); - public static readonly string Dashboard_AssessmentDate = nameof(Dashboard_AssessmentDate); - public static readonly string Dashboard_AppraiserHistoryTitle = nameof(Dashboard_AppraiserHistoryTitle); - public static readonly string Dashboard_TotalStories = nameof(Dashboard_TotalStories); - public static readonly string Dashboard_AssessmentSum = nameof(Dashboard_AssessmentSum); - public static readonly string Dashboard_ConnectToTeamHelp = nameof(Dashboard_ConnectToTeamHelp); - public static readonly string Dashboard_ConnectToTeamButton = nameof(Dashboard_ConnectToTeamButton); - public static readonly string Dashboard_HasConcreteReviewer = nameof(Dashboard_HasConcreteReviewer); - public static readonly string Dashboard_IsOriginalReviewer = nameof(Dashboard_IsOriginalReviewer); - public static readonly string Dashboard_AppraiserIntegrationTitle = nameof(Dashboard_AppraiserIntegrationTitle); - public static readonly string Dashboard_AppraiserIntegrationAccessTokenLabel = nameof(Dashboard_AppraiserIntegrationAccessTokenLabel); - public static readonly string Dashboard_AppraiserIntegrationProjectKeyLabel = nameof(Dashboard_AppraiserIntegrationProjectKeyLabel); - public static readonly string Dashboard_AppraiserIntegrationScrumMasterLabel = nameof(Dashboard_AppraiserIntegrationScrumMasterLabel); - public static readonly string Dashboard_AppraiserIntegrationSaveButton = nameof(Dashboard_AppraiserIntegrationSaveButton); - public static readonly string Dashboard_AppraiserIntegrationDisableButton = nameof(Dashboard_AppraiserIntegrationDisableButton); - public static readonly string Dashboard_AppraiserIntegrationEnableButton = nameof(Dashboard_AppraiserIntegrationEnableButton); - public static readonly string Dashboard_AppraiserIntegrationConfirmText = nameof(Dashboard_AppraiserIntegrationConfirmText); - public static readonly string Dashboard_AppraiserIntegrationEnableSuccess = nameof(Dashboard_AppraiserIntegrationEnableSuccess); - public static readonly string Dashboard_Settings = nameof(Dashboard_Settings); - public static readonly string Dashboard_Apply = nameof(Dashboard_Apply); - public static readonly string Dashboard_SettingsApplied = nameof(Dashboard_SettingsApplied); - public static readonly string ContentDialog_Close = nameof(ContentDialog_Close); + public static readonly MessageId Dashboard_MoveToDashboard = new(nameof(Dashboard_MoveToDashboard)); + public static readonly MessageId Dashboard_Title = new(nameof(Dashboard_Title)); + public static readonly MessageId Dashboard_SelectTeam = new(nameof(Dashboard_SelectTeam)); + public static readonly MessageId Dashboard_CreateBot = new(nameof(Dashboard_CreateBot)); + public static readonly MessageId Dashboard_SelectTeamTitle = new(nameof(Dashboard_SelectTeamTitle)); + public static readonly MessageId Dashboard_TeamField = new(nameof(Dashboard_TeamField)); + public static readonly MessageId Dashboard_BotField = new(nameof(Dashboard_BotField)); + public static readonly MessageId Dashboard_ExcludeFromTeam = new(nameof(Dashboard_ExcludeFromTeam)); + public static readonly MessageId Dashboard_LeaveTeammate = new(nameof(Dashboard_LeaveTeammate)); + public static readonly MessageId Dashboard_Days = new(nameof(Dashboard_Days)); + public static readonly MessageId Dashboard_Forever = new(nameof(Dashboard_Forever)); + public static readonly MessageId Dashboard_PersonName = new(nameof(Dashboard_PersonName)); + public static readonly MessageId Dashboard_LeaveUntil = new(nameof(Dashboard_LeaveUntil)); + public static readonly MessageId Dashboard_RecoveryTeammate = new(nameof(Dashboard_RecoveryTeammate)); + public static readonly MessageId Dashboard_ReviewByReviewerTemplate = new(nameof(Dashboard_ReviewByReviewerTemplate)); + public static readonly MessageId Dashboard_ReviewByOwnerTemplate = new(nameof(Dashboard_ReviewByOwnerTemplate)); + public static readonly MessageId Dashboard_ReviewAverageStatsTitle = new(nameof(Dashboard_ReviewAverageStatsTitle)); + public static readonly MessageId Dashboard_ReviewAverageFirstTouch = new(nameof(Dashboard_ReviewAverageFirstTouch)); + public static readonly MessageId Dashboard_ReviewAverageReview = new(nameof(Dashboard_ReviewAverageReview)); + public static readonly MessageId Dashboard_ReviewAverageCorrection = new(nameof(Dashboard_ReviewAverageCorrection)); + public static readonly MessageId Dashboard_ReviewDescriptionTitle = new(nameof(Dashboard_ReviewDescriptionTitle)); + public static readonly MessageId Dashboard_ReviewReviewerNameTitle = new(nameof(Dashboard_ReviewReviewerNameTitle)); + public static readonly MessageId Dashboard_ReviewOwnerNameTitle = new(nameof(Dashboard_ReviewOwnerNameTitle)); + public static readonly MessageId Dashboard_ReviewStateTitle = new(nameof(Dashboard_ReviewStateTitle)); + public static readonly MessageId Dashboard_ReviewStateNone = new(nameof(Dashboard_ReviewStateNone)); + public static readonly MessageId Dashboard_ReviewStateNew = new(nameof(Dashboard_ReviewStateNew)); + public static readonly MessageId Dashboard_ReviewStateInProgress = new(nameof(Dashboard_ReviewStateInProgress)); + public static readonly MessageId Dashboard_ReviewStateOnCorrection = new(nameof(Dashboard_ReviewStateOnCorrection)); + public static readonly MessageId Dashboard_ReviewStateAccept = new(nameof(Dashboard_ReviewStateAccept)); + public static readonly MessageId Dashboard_ReviewStats = new(nameof(Dashboard_ReviewStats)); + public static readonly MessageId Dashboard_FirstTouch = new(nameof(Dashboard_FirstTouch)); + public static readonly MessageId Dashboard_FirstTouchHelp = new(nameof(Dashboard_FirstTouchHelp)); + public static readonly MessageId Dashboard_Correction = new(nameof(Dashboard_Correction)); + public static readonly MessageId Dashboard_CorrectionHelp = new(nameof(Dashboard_CorrectionHelp)); + public static readonly MessageId Dashboard_Review = new(nameof(Dashboard_Review)); + public static readonly MessageId Dashboard_ReviewHelp = new(nameof(Dashboard_ReviewHelp)); + public static readonly MessageId Dashboard_NoData = new(nameof(Dashboard_NoData)); + public static readonly MessageId Dashboard_TeammatesWidgetTitle = new(nameof(Dashboard_TeammatesWidgetTitle)); + public static readonly MessageId Dashboard_BotWidgetTitle = new(nameof(Dashboard_BotWidgetTitle)); + public static readonly MessageId Dashboard_ReviewTotalStatsWidgetTitle = new(nameof(Dashboard_ReviewTotalStatsWidgetTitle)); + public static readonly MessageId Dashboard_LastTasksWidgetTitle = new(nameof(Dashboard_LastTasksWidgetTitle)); + public static readonly MessageId Dashboard_ReviewAverageStatsWidgetTitle = new(nameof(Dashboard_ReviewAverageStatsWidgetTitle)); + public static readonly MessageId Dashboard_CheckInMoveToMapTitle = new(nameof(Dashboard_CheckInMoveToMapTitle)); + public static readonly MessageId Dashboard_CheckInMapWidgetTitle = new(nameof(Dashboard_CheckInMapWidgetTitle)); + public static readonly MessageId Dashboard_RandomCoffeeHistoryWidgetTitle = new(nameof(Dashboard_RandomCoffeeHistoryWidgetTitle)); + public static readonly MessageId Dashboard_RandomCoffeeNoPair = new(nameof(Dashboard_RandomCoffeeNoPair)); + public static readonly MessageId Dashboard_RandomCoffeeFirstTitle = new(nameof(Dashboard_RandomCoffeeFirstTitle)); + public static readonly MessageId Dashboard_RandomCoffeeSecondTitle = new(nameof(Dashboard_RandomCoffeeSecondTitle)); + public static readonly MessageId Dashboard_TwoWeeks = new(nameof(Dashboard_TwoWeeks)); + public static readonly MessageId Dashboard_FourWeeks = new(nameof(Dashboard_FourWeeks)); + public static readonly MessageId Dashboard_TwelveWeeks = new(nameof(Dashboard_TwelveWeeks)); + public static readonly MessageId Dashboard_OneMonth = new(nameof(Dashboard_OneMonth)); + public static readonly MessageId Dashboard_ThreeMonths = new(nameof(Dashboard_ThreeMonths)); + public static readonly MessageId Dashboard_SixMonths = new(nameof(Dashboard_SixMonths)); + public static readonly MessageId Dashboard_GoToCurrentSessionButtonText = new(nameof(Dashboard_GoToCurrentSessionButtonText)); + public static readonly MessageId Dashboard_AssessmentDate = new(nameof(Dashboard_AssessmentDate)); + public static readonly MessageId Dashboard_AppraiserHistoryTitle = new(nameof(Dashboard_AppraiserHistoryTitle)); + public static readonly MessageId Dashboard_TotalStories = new(nameof(Dashboard_TotalStories)); + public static readonly MessageId Dashboard_AssessmentSum = new(nameof(Dashboard_AssessmentSum)); + public static readonly MessageId Dashboard_ConnectToTeamHelp = new(nameof(Dashboard_ConnectToTeamHelp)); + public static readonly MessageId Dashboard_ConnectToTeamButton = new(nameof(Dashboard_ConnectToTeamButton)); + public static readonly MessageId Dashboard_HasConcreteReviewer = new(nameof(Dashboard_HasConcreteReviewer)); + public static readonly MessageId Dashboard_IsOriginalReviewer = new(nameof(Dashboard_IsOriginalReviewer)); + public static readonly MessageId Dashboard_AppraiserIntegrationTitle = new(nameof(Dashboard_AppraiserIntegrationTitle)); + public static readonly MessageId Dashboard_AppraiserIntegrationAccessTokenLabel = new(nameof(Dashboard_AppraiserIntegrationAccessTokenLabel)); + public static readonly MessageId Dashboard_AppraiserIntegrationProjectKeyLabel = new(nameof(Dashboard_AppraiserIntegrationProjectKeyLabel)); + public static readonly MessageId Dashboard_AppraiserIntegrationScrumMasterLabel = new(nameof(Dashboard_AppraiserIntegrationScrumMasterLabel)); + public static readonly MessageId Dashboard_AppraiserIntegrationSaveButton = new(nameof(Dashboard_AppraiserIntegrationSaveButton)); + public static readonly MessageId Dashboard_AppraiserIntegrationDisableButton = new(nameof(Dashboard_AppraiserIntegrationDisableButton)); + public static readonly MessageId Dashboard_AppraiserIntegrationEnableButton = new(nameof(Dashboard_AppraiserIntegrationEnableButton)); + public static readonly MessageId Dashboard_AppraiserIntegrationConfirmText = new(nameof(Dashboard_AppraiserIntegrationConfirmText)); + public static readonly MessageId Dashboard_AppraiserIntegrationEnableSuccess = new(nameof(Dashboard_AppraiserIntegrationEnableSuccess)); + public static readonly MessageId Dashboard_Settings = new(nameof(Dashboard_Settings)); + public static readonly MessageId Dashboard_Apply = new(nameof(Dashboard_Apply)); + public static readonly MessageId Dashboard_SettingsApplied = new(nameof(Dashboard_SettingsApplied)); + public static readonly MessageId Dashboard_DisableWidgetHelpTemplate = new(nameof(Dashboard_DisableWidgetHelpTemplate)); + public static readonly MessageId ContentDialog_Close = new(nameof(ContentDialog_Close)); - public static readonly string Footer_GroupNavigation = nameof(Footer_GroupNavigation); - public static readonly string Footer_GroupTech = nameof(Footer_GroupTech); - public static readonly string Footer_GroupStorage = nameof(Footer_GroupStorage); - public static readonly string Footer_GroupTools = nameof(Footer_GroupTools); - public static readonly string Footer_LinkMain = nameof(Footer_LinkMain); - public static readonly string Footer_LinkConstructor = nameof(Footer_LinkConstructor); - public static readonly string Footer_LinkDashboard = nameof(Footer_LinkDashboard); + public static readonly MessageId Footer_GroupNavigation = new(nameof(Footer_GroupNavigation)); + public static readonly MessageId Footer_GroupTech = new(nameof(Footer_GroupTech)); + public static readonly MessageId Footer_GroupStorage = new(nameof(Footer_GroupStorage)); + public static readonly MessageId Footer_GroupTools = new(nameof(Footer_GroupTools)); + public static readonly MessageId Footer_LinkMain = new(nameof(Footer_LinkMain)); + public static readonly MessageId Footer_LinkConstructor = new(nameof(Footer_LinkConstructor)); + public static readonly MessageId Footer_LinkDashboard = new(nameof(Footer_LinkDashboard)); - public static readonly string Login_AsSuperuserText = nameof(Login_AsSuperuserText); - public static readonly string Login_Title = nameof(Login_Title); - public static readonly string Login_CreateBot = nameof(Login_CreateBot); - public static readonly string Login_TelegramText = nameof(Login_TelegramText); + public static readonly MessageId Login_AsSuperuserText = new(nameof(Login_AsSuperuserText)); + public static readonly MessageId Login_Title = new(nameof(Login_Title)); + public static readonly MessageId Login_CreateBot = new(nameof(Login_CreateBot)); + public static readonly MessageId Login_TelegramText = new(nameof(Login_TelegramText)); - public static readonly string ConfirmDialog_Yes = nameof(ConfirmDialog_Yes); - public static readonly string ConfirmDialog_No = nameof(ConfirmDialog_No); + public static readonly MessageId ConfirmDialog_Yes = new(nameof(ConfirmDialog_Yes)); + public static readonly MessageId ConfirmDialog_No = new(nameof(ConfirmDialog_No)); - public static readonly string Validation_TokenInvalid = nameof(Validation_TokenInvalid); + public static readonly MessageId Validation_TokenInvalid = new(nameof(Validation_TokenInvalid)); - public static readonly string OgMainTitle = nameof(OgMainTitle); - public static readonly string OgMainDescription = nameof(OgMainDescription); - public static readonly string OgMainImageText = nameof(OgMainImageText); - public static readonly string OgAppraiserTitle = nameof(OgAppraiserTitle); - public static readonly string OgAppraiserDescription = nameof(OgAppraiserDescription); - public static readonly string OgAppraiserImageText = nameof(OgAppraiserImageText); - public static readonly string OgCheckInTitle = nameof(OgCheckInTitle); - public static readonly string OgCheckInDescription = nameof(OgCheckInDescription); - public static readonly string OgCheckInImageText = nameof(OgCheckInImageText); + public static readonly MessageId OgMainTitle = new(nameof(OgMainTitle)); + public static readonly MessageId OgMainDescription = new(nameof(OgMainDescription)); + public static readonly MessageId OgMainImageText = new(nameof(OgMainImageText)); + public static readonly MessageId OgAppraiserTitle = new(nameof(OgAppraiserTitle)); + public static readonly MessageId OgAppraiserDescription = new(nameof(OgAppraiserDescription)); + public static readonly MessageId OgAppraiserImageText = new(nameof(OgAppraiserImageText)); + public static readonly MessageId OgCheckInTitle = new(nameof(OgCheckInTitle)); + public static readonly MessageId OgCheckInDescription = new(nameof(OgCheckInDescription)); + public static readonly MessageId OgCheckInImageText = new(nameof(OgCheckInImageText)); - public static readonly string CheckIn_PageTitle = nameof(CheckIn_PageTitle); - public static readonly string CheckIn_DefaultLayerTitle = nameof(CheckIn_DefaultLayerTitle); - public static readonly string CheckIn_RouteShow = nameof(CheckIn_RouteShow); - public static readonly string CheckIn_RouteHide = nameof(CheckIn_RouteHide); + public static readonly MessageId CheckIn_DefaultLayerTitle = new(nameof(CheckIn_DefaultLayerTitle)); + public static readonly MessageId CheckIn_RouteShow = new(nameof(CheckIn_RouteShow)); + public static readonly MessageId CheckIn_RouteHide = new(nameof(CheckIn_RouteHide)); - public static readonly string MetaAuthor = nameof(MetaAuthor); - public static readonly string MetaMainTitle = nameof(MetaMainTitle); - public static readonly string MetaMainDescription = nameof(MetaMainDescription); - public static readonly string MetaMainKeywords = nameof(MetaMainKeywords); - public static readonly string MetaAppraiserTitle = nameof(MetaAppraiserTitle); - public static readonly string MetaAppraiserDescription = nameof(MetaAppraiserDescription); - public static readonly string MetaAppraiserKeywords = nameof(MetaAppraiserKeywords); - public static readonly string MetaCheckInTitle = nameof(MetaCheckInTitle); - public static readonly string MetaCheckInDescription = nameof(MetaCheckInDescription); - public static readonly string MetaCheckInKeywords = nameof(MetaCheckInKeywords); + public static readonly MessageId MetaAuthor = new(nameof(MetaAuthor)); + public static readonly MessageId MetaMainTitle = new(nameof(MetaMainTitle)); + public static readonly MessageId MetaMainDescription = new(nameof(MetaMainDescription)); + public static readonly MessageId MetaMainKeywords = new(nameof(MetaMainKeywords)); + public static readonly MessageId MetaAppraiserTitle = new(nameof(MetaAppraiserTitle)); + public static readonly MessageId MetaAppraiserDescription = new(nameof(MetaAppraiserDescription)); + public static readonly MessageId MetaAppraiserKeywords = new(nameof(MetaAppraiserKeywords)); + public static readonly MessageId MetaCheckInTitle = new(nameof(MetaCheckInTitle)); + public static readonly MessageId MetaCheckInDescription = new(nameof(MetaCheckInDescription)); + public static readonly MessageId MetaCheckInKeywords = new(nameof(MetaCheckInKeywords)); - public static readonly string PanelOpen = nameof(PanelOpen); - public static readonly string PanelSave = nameof(PanelSave); - public static readonly string LoadingReload = nameof(LoadingReload); + public static readonly MessageId PanelOpen = new(nameof(PanelOpen)); + public static readonly MessageId PanelSave = new(nameof(PanelSave)); + public static readonly MessageId LoadingReload = new(nameof(LoadingReload)); } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Routing/NavRoute.cs b/src/Inc.TeamAssistant.WebUI/Routing/NavRoute.cs new file mode 100644 index 00000000..9fdf64e7 --- /dev/null +++ b/src/Inc.TeamAssistant.WebUI/Routing/NavRoute.cs @@ -0,0 +1,21 @@ +using Inc.TeamAssistant.Primitives.Languages; + +namespace Inc.TeamAssistant.WebUI.Routing; + +public sealed record NavRoute( + LanguageId? LanguageId, + string RouteSegment) +{ + public override string ToString() + { + var languageSegment = LanguageId is null + ? string.Empty + : $"/{LanguageId.Value}"; + + return RouteSegment.StartsWith('/') + ? $"{languageSegment}{RouteSegment}" + : $"{languageSegment}/{RouteSegment}"; + } + + public static implicit operator string(NavRoute counter) => counter.ToString(); +} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Routing/NavRouter.cs b/src/Inc.TeamAssistant.WebUI/Routing/NavRouter.cs new file mode 100644 index 00000000..abdf6fcb --- /dev/null +++ b/src/Inc.TeamAssistant.WebUI/Routing/NavRouter.cs @@ -0,0 +1,100 @@ +using Inc.TeamAssistant.Primitives.Languages; +using Inc.TeamAssistant.WebUI.Contracts; +using Inc.TeamAssistant.WebUI.Extensions; +using Inc.TeamAssistant.WebUI.Services.ClientCore; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Routing; +using Microsoft.JSInterop; + +namespace Inc.TeamAssistant.WebUI.Routing; + +public sealed class NavRouter : IDisposable +{ + private readonly IRenderContext _renderContext; + private readonly NavigationManager _navigationManager; + private readonly IServiceProvider _serviceProvider; + private Action? _onRouteChanged; + + public string CurrentUrl { get; private set; } + + public NavRouter( + IRenderContext renderContext, + NavigationManager navigationManager, + IServiceProvider serviceProvider) + { + _renderContext = renderContext ?? throw new ArgumentNullException(nameof(renderContext)); + _navigationManager = navigationManager ?? throw new ArgumentNullException(nameof(navigationManager)); + _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider)); + _navigationManager.LocationChanged += OnLocationChanged; + CurrentUrl = _navigationManager.Uri; + } + + public string GetRouteSegment() + { + var routeWithoutLanguage = _navigationManager.ToBaseRelativePath(CurrentUrl); + + foreach (var languageId in LanguageSettings.LanguageIds) + routeWithoutLanguage = routeWithoutLanguage.Replace($"{languageId.Value}/", string.Empty); + + return routeWithoutLanguage; + } + + public NavRoute CreateRoute(string? routeSegment) + { + var link = string.IsNullOrWhiteSpace(routeSegment) ? "/" : routeSegment; + var languageContext = _renderContext.GetLanguageContext(); + var selectedLanguage = languageContext.Selected ? languageContext.CurrentLanguage : null; + + return new NavRoute(selectedLanguage, link); + } + + public IDisposable OnRouteChanged(Action onRouteChanged) + { + _onRouteChanged += onRouteChanged; + + return new RouterScope(() => _onRouteChanged -= onRouteChanged); + } + + public async Task MoveToRoute(string routeSegment, RoutingType type = RoutingType.Client) + { + var route = CreateRoute(routeSegment); + + switch (type) + { + case RoutingType.Browser: + await ChangeBrowserPath(route); + break; + case RoutingType.Server: + _navigationManager.NavigateTo(routeSegment, forceLoad: true); + break; + case RoutingType.Client: + default: + _navigationManager.NavigateTo(route); + break; + } + } + + private async Task ChangeBrowserPath(NavRoute route) + { + ArgumentNullException.ThrowIfNull(route); + + var jsRuntime = _serviceProvider.GetRequiredService(); + var jsFunction = JsFunctions.ChangeUrl( + route, + r => ChangeCurrentUrl(_navigationManager.ToAbsoluteUri(r).ToString())); + + await jsRuntime.Execute(jsFunction); + } + + private void ChangeCurrentUrl(string uri) + { + ArgumentNullException.ThrowIfNull(uri); + + CurrentUrl = uri; + _onRouteChanged?.Invoke(); + } + + private void OnLocationChanged(object? sender, LocationChangedEventArgs e) => ChangeCurrentUrl(e.Location); + + public void Dispose() => _navigationManager.LocationChanged -= OnLocationChanged; +} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Routing/RouterScope.cs b/src/Inc.TeamAssistant.WebUI/Routing/RouterScope.cs new file mode 100644 index 00000000..39cd13fd --- /dev/null +++ b/src/Inc.TeamAssistant.WebUI/Routing/RouterScope.cs @@ -0,0 +1,16 @@ +namespace Inc.TeamAssistant.WebUI.Routing; + +internal sealed class RouterScope : IDisposable +{ + private readonly Action _action; + + public RouterScope(Action action) + { + _action = action; + } + + public void Dispose() + { + _action(); + } +} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Routing/RoutingType.cs b/src/Inc.TeamAssistant.WebUI/Routing/RoutingType.cs new file mode 100644 index 00000000..920ec6c0 --- /dev/null +++ b/src/Inc.TeamAssistant.WebUI/Routing/RoutingType.cs @@ -0,0 +1,8 @@ +namespace Inc.TeamAssistant.WebUI.Routing; + +public enum RoutingType +{ + Client = 1, + Browser = 2, + Server = 3 +} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage2/FeaturesFactory.cs b/src/Inc.TeamAssistant.WebUI/Services/ClientCore/FeaturesFactory.cs similarity index 73% rename from src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage2/FeaturesFactory.cs rename to src/Inc.TeamAssistant.WebUI/Services/ClientCore/FeaturesFactory.cs index ef74392c..40b84a99 100644 --- a/src/Inc.TeamAssistant.WebUI/Features/Constructor/Stages/Stage2/FeaturesFactory.cs +++ b/src/Inc.TeamAssistant.WebUI/Services/ClientCore/FeaturesFactory.cs @@ -1,6 +1,6 @@ -using Inc.TeamAssistant.WebUI.Services.ClientCore; +using Inc.TeamAssistant.Primitives.Languages; -namespace Inc.TeamAssistant.WebUI.Features.Constructor.Stages.Stage2; +namespace Inc.TeamAssistant.WebUI.Services.ClientCore; public sealed class FeaturesFactory { @@ -17,7 +17,7 @@ public FeaturesFactory(ResourcesManager resources) private string Create(string featureName, string propertyName) { - var key = $"Constructor_Feature{featureName}{propertyName}"; + var key = new MessageId($"Constructor_Feature{featureName}{propertyName}"); return _resources[key]; } diff --git a/src/Inc.TeamAssistant.WebUI/Services/ClientCore/LinkBuilder.cs b/src/Inc.TeamAssistant.WebUI/Services/ClientCore/LinkBuilder.cs deleted file mode 100644 index 047ca4ce..00000000 --- a/src/Inc.TeamAssistant.WebUI/Services/ClientCore/LinkBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Inc.TeamAssistant.WebUI.Contracts; - -namespace Inc.TeamAssistant.WebUI.Services.ClientCore; - -public sealed class LinkBuilder -{ - private readonly IRenderContext _renderContext; - - public LinkBuilder(IRenderContext renderContext) - { - _renderContext = renderContext ?? throw new ArgumentNullException(nameof(renderContext)); - } - - public string Build(string? relativeUrl) - { - var link = string.IsNullOrWhiteSpace(relativeUrl) ? "/" : $"/{relativeUrl}"; - var languageContext = _renderContext.GetLanguageContext(); - - return languageContext.Selected - ? $"/{languageContext.CurrentLanguage.Value}{link}" - : link; - } -} \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/Services/ClientCore/ResourcesManager.cs b/src/Inc.TeamAssistant.WebUI/Services/ClientCore/ResourcesManager.cs index 438edef1..4013dbf5 100644 --- a/src/Inc.TeamAssistant.WebUI/Services/ClientCore/ResourcesManager.cs +++ b/src/Inc.TeamAssistant.WebUI/Services/ClientCore/ResourcesManager.cs @@ -1,3 +1,4 @@ +using Inc.TeamAssistant.Primitives.Languages; using Inc.TeamAssistant.WebUI.Contracts; using Microsoft.AspNetCore.Components; @@ -9,6 +10,7 @@ public sealed class ResourcesManager : IDisposable private readonly IMessageProvider _messageProvider; private readonly PersistentComponentState _applicationState; + private readonly SemaphoreSlim _sync = new(1, 1); private PersistingComponentStateSubscription? _persistingSubscription; private Dictionary> _resources = new(); @@ -21,10 +23,29 @@ public ResourcesManager( _renderContext = renderContext ?? throw new ArgumentNullException(nameof(renderContext)); _applicationState = applicationState ?? throw new ArgumentNullException(nameof(applicationState)); } + + public async Task Initialize(CancellationToken token = default) + { + if (_resources.Any()) + return; + + await _sync.WaitAsync(token); + + try + { + if (!_resources.Any()) + await Load(token); + } + finally + { + _sync.Release(); + } + } - public async Task Load(CancellationToken token = default) + private async Task Load(CancellationToken token) { const string key = nameof(ResourcesManager); + var resources = _applicationState.TryTakeFromJson>>(key, out var restored) && restored is not null ? restored : await _messageProvider.Get(token); @@ -38,18 +59,18 @@ public async Task Load(CancellationToken token = default) _resources = resources; } - public string this[string name] + public string this[MessageId messageId] { get { - ArgumentException.ThrowIfNullOrWhiteSpace(name); + ArgumentNullException.ThrowIfNull(messageId); var languageContext = _renderContext.GetLanguageContext(); var resources = _resources.TryGetValue(languageContext.CurrentLanguage.Value, out var result) ? result : new Dictionary(); - return resources.GetValueOrDefault(name, name); + return resources.GetValueOrDefault(messageId.Value, messageId.Value); } } diff --git a/src/Inc.TeamAssistant.WebUI/Services/ServiceCollectionExtensions.cs b/src/Inc.TeamAssistant.WebUI/Services/ServiceCollectionExtensions.cs index e8045c93..036ac5c5 100644 --- a/src/Inc.TeamAssistant.WebUI/Services/ServiceCollectionExtensions.cs +++ b/src/Inc.TeamAssistant.WebUI/Services/ServiceCollectionExtensions.cs @@ -5,6 +5,7 @@ using Inc.TeamAssistant.WebUI.Features.Constructor.Stages.Stage2; using Inc.TeamAssistant.WebUI.Features.Constructor.Stages.Stage3; using Inc.TeamAssistant.WebUI.Features.Notifications; +using Inc.TeamAssistant.WebUI.Routing; using Inc.TeamAssistant.WebUI.Services.ClientCore; using Inc.TeamAssistant.WebUI.Services.Clients; using Microsoft.AspNetCore.Components.Authorization; @@ -52,7 +53,7 @@ public static IServiceCollection AddIsomorphic(this IServiceCollection services) .AddScoped() .AddScoped() .AddScoped() - .AddSingleton() + .AddScoped() .AddScoped(typeof(DragAndDropService<>)); return services; diff --git a/src/Inc.TeamAssistant.WebUI/Services/ValidatorConfigurationExtensions.cs b/src/Inc.TeamAssistant.WebUI/Services/ValidatorConfigurationExtensions.cs index 748d0618..5273aa18 100644 --- a/src/Inc.TeamAssistant.WebUI/Services/ValidatorConfigurationExtensions.cs +++ b/src/Inc.TeamAssistant.WebUI/Services/ValidatorConfigurationExtensions.cs @@ -11,11 +11,11 @@ public static ValidatorConfiguration Configure( { ArgumentNullException.ThrowIfNull(validatorConfiguration); ArgumentNullException.ThrowIfNull(languageId); - + validatorConfiguration.LanguageManager.Culture = new(languageId.Value); validatorConfiguration.DefaultClassLevelCascadeMode = CascadeMode.Continue; validatorConfiguration.DefaultRuleLevelCascadeMode = CascadeMode.Stop; - + return validatorConfiguration; } } \ No newline at end of file diff --git a/src/Inc.TeamAssistant.WebUI/wwwroot/css/main.css b/src/Inc.TeamAssistant.WebUI/wwwroot/css/main.css index 39cb21c9..9adc8635 100644 --- a/src/Inc.TeamAssistant.WebUI/wwwroot/css/main.css +++ b/src/Inc.TeamAssistant.WebUI/wwwroot/css/main.css @@ -123,9 +123,9 @@ html { color: #dfdfdf; } .button_dark:disabled, .button_light:disabled, .button_dark:disabled:hover, .button_light:disabled:hover { - background-color: #AAA; + background-color: #aaa; color: #000; - border: .1875rem solid #AAA; + border: .1875rem solid #aaa; cursor: default; } .button_small { @@ -158,7 +158,7 @@ html { .marker-btn:hover { text-decoration: none; } -.map__navbar .leaflet-top { +.map_navbar .leaflet-top { top: 80px; } .map-popup { @@ -189,7 +189,7 @@ html { border: 3px solid #000; } .form-control_disabled { - background-color: #AAA; + background-color: #aaa; cursor: default; } .form-control_textarea { @@ -255,6 +255,13 @@ html { from { transform: translateX(-150%); } to { transform: translateY(0); } } +.animation__fade-in { + animation: fade-in .7s; +} +@keyframes fade-in { + 0% { opacity: 0; } + 100% { opacity: 1; } +} /* ICONS */ .icon { transition: stroke 0.3s ease 0s; diff --git a/tests/Inc.TeamAssistant.Reviewer.ApplicationTests/Services/ReviewMetricsProviderTests.cs b/tests/Inc.TeamAssistant.Reviewer.ApplicationTests/Services/ReviewMetricsProviderTests.cs index b85b09d7..cb3f1130 100644 --- a/tests/Inc.TeamAssistant.Reviewer.ApplicationTests/Services/ReviewMetricsProviderTests.cs +++ b/tests/Inc.TeamAssistant.Reviewer.ApplicationTests/Services/ReviewMetricsProviderTests.cs @@ -46,7 +46,7 @@ public async Task Add_IntervalsByTask_CorrectMetrics( start, moveToInProgressInterval, acceptDurationInterval, - new[] { (declineDurationInterval, moveToNextRoundDurationInterval) }); + [(declineDurationInterval, moveToNextRoundDurationInterval)]); await _target.Add(taskForReview, CancellationToken.None); var reviewTeamMetrics = _target.Get(teamId); @@ -79,11 +79,10 @@ public async Task Add_IntervalsByTaskWithManyRounds_CorrectMetrics( start, moveToInProgressInterval, acceptDurationInterval, - new[] - { + [ (declineDurationInterval * 2, moveToNextRoundDurationInterval * 2), (declineDurationInterval, moveToNextRoundDurationInterval) - }); + ]); await _target.Add(taskForReview, CancellationToken.None); var reviewTeamMetrics = _target.Get(teamId); @@ -116,19 +115,19 @@ public async Task Add_IntervalsByTasks_CorrectAverageMetrics( start, moveToInProgressInterval, acceptDurationInterval, - new[] { (declineDurationInterval, moveToNextRoundDurationInterval) }); + [(declineDurationInterval, moveToNextRoundDurationInterval)]); var taskForReviewSecond = CreateAndSetupTaskForReview( teamId, start, moveToInProgressInterval * 2, acceptDurationInterval * 2, - new[] { (declineDurationInterval * 2, moveToNextRoundDurationInterval * 2) }); + [(declineDurationInterval * 2, moveToNextRoundDurationInterval * 2)]); var taskForReviewFromOtherTeam = CreateAndSetupTaskForReview( _fixture.Create(), start, moveToInProgressInterval, acceptDurationInterval, - new[] { (declineDurationInterval, moveToNextRoundDurationInterval) }); + [(declineDurationInterval, moveToNextRoundDurationInterval)]); await _target.Add(taskForReviewFirst, CancellationToken.None); await _target.Add(taskForReviewSecond, CancellationToken.None); await _target.Add(taskForReviewFromOtherTeam, CancellationToken.None); @@ -177,7 +176,7 @@ private TaskForReview CreateAndSetupTaskForReview( foreach (var reviewDuration in reviewDurations) { operationStart = operationStart.Add(reviewDuration.DeclineDuration); - taskForReview.Decline(operationStart); + taskForReview.Decline(operationStart, _fixture.Create()); operationStart = operationStart.Add(reviewDuration.NextRoundDuration); taskForReview.MoveToNextRound(operationStart);