Merge pull request #384 from nventive/dev/cama/MergeMain

Merge main in feature/uno5

.azure-pipelines-api-integration-tests.yml

@@ -6,6 +6,8 @@ schedules:
     include:
       - main
 
+trigger: none
+
 variables:
 - template: build/variables.yml
 

CHANGELOG.md

@@ -5,14 +5,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 Prefix your items with `(Template)` if the change is about the template and not the resulting application.
 
+## 2.2.X
+- Added hooks for default analytics (page views and command invocations).
+- Renamed the `AnalyticsDataLoaderStrategy` to `MonitoringDataLoaderStrategy`. (The same renaming was applied to related methods and classes).
+- Remove all triggers on the API Integration tests CI.
+
 ## 2.1.X
 - Install `GooseAnalyzers` to enable the `SA1600` rule with its scope limited to interfaces and improve xml documentation.
 - Replace local `DispatcherQueue` extension methods with the ones from the WinUI and Uno.WinUI Community Toolkit.
 - Add `Microsoft.VisualStudio.Threading.Analyzers` to check for async void usages and fix async void usages.
 - Enable `TreatWarningsAsErrors` for the Access, Business, and Presentation projects.
 - Update analyzers packages and severity of rules.
 - Fix crash from ARM base mac on net7.0-iOS. Add `ForceSimulatorX64ArchitectureInIDE` property to mobile head.
-- Consolidate build agents to Microsoft-hosted agents.
+- Consolidate Windows and macOS build agents to Microsoft-hosted agents.
 
 ## 2.0.X
 - Renamed the classes providing data to use the `Repository` suffix instead of `Endpoint` or `Service`.

build/stage-release-appcenter.yml

@@ -61,7 +61,7 @@ jobs:
 
 - deployment: AppCenter_iOS
   pool:
-    name: $(macOSPoolName)
+    vmImage: $(macOSHostedAgentImage)
     demands:
     - fastlane
   variables:

build/stage-release-appstore.yml

@@ -6,9 +6,7 @@ jobs:
 - deployment: AppStore_iOS_${{ parameters.deploymentEnvironment}}
 
   pool:
-    name: $(macOSPoolName)
-    demands:
-      - Xamarin.iOS_Version -equals $(XAMARIN_IOS_VERSION)
+    vmImage: $(macOSHostedAgentImage)
 
   environment: ${{ parameters.deploymentEnvironment }}
 

build/variables.yml

@@ -74,10 +74,6 @@
   # Virtual machine images
   windowsHostedAgentImage: 'windows-2022'
   macOSHostedAgentImage: 'macOS-12'
-  macOSPoolName: 'macOS-2023'
-
-  # Versions to use
-  XAMARIN_IOS_VERSION: 16.1.1
 
   # Name of the folder where the artefacts will be placed. Variable used in build and release phases.
   # We make seperate folders so that releases can each download only the folder they need.

doc/Architecture.md

@@ -176,6 +176,11 @@ This application uses [FluentValidation](https://www.nuget.org/packages/FluentVa
 
 See [Validation.md](Validation.md) for more details.
 
+### Analytics
+This application has a built-in analytics base that can be used to track events and errors with potentially any analytics service (e.g. AppCenter, Firebase, Segment, etc.). This base is built around the [IAnalyticsSink](../src/app/ApplicationTemplate.Presentation/Framework/Analytics/IAnalyticsSink.cs) interface.
+
+See [DefaultAnalytics.md](DefaultAnalytics.md) for more details.
+
 ## View
 
 ### UI Framework

doc/DefaultAnalytics.md

@@ -0,0 +1,21 @@
+# Default Analytics
+
+This application comes with a few default tracked events.
+They can be found in the [IAnalyticsSink](../src/app/ApplicationTemplate.Presentation/Framework/Analytics/IAnalyticsSink.cs) interface.
+The idea is that you would change the implementation of this interface to send the events to an analytics service (such as AppCenter, Firebase, Segment, etc.).
+
+> 💡 The default events are meant to be a starting point for your application's analytics. Because they are automatic, they are more generic than custom events. If you want to track more specific events, you can adjust this recipe by adding new members to the `IAnalyticsSink` interface (or changing the existing ones) to better suit your needs.
+
+Here is a list of the default events:
+
+## Page Views
+This is based on the changes of state from the `ISectionsNavigator`.
+
+The `ISectionsNavigator` controls the navigation of the application. It's state can be observed and this is leveraged to detect the page views.
+
+## Command Executions
+This is based on the default builder of the `IDynamicCommandBuilderFactory`.
+
+The `IDynamicCommandBuilder` allows to customize the default behavior or all DynamicCommands. This is leveraged to inject analytics on command invocations.
+
+Command executions are typically associated with button presses and gestures.

src/app/ApplicationTemplate.Presentation/Configuration/AnalyticsConfiguration.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ApplicationTemplate.Presentation;
+
+public static class AnalyticsConfiguration
+{
+	/// <summary>
+	/// Adds the analytics services to the <see cref="IServiceCollection"/>.
+	/// </summary>
+	/// <param name="services">The service collection.</param>
+	public static IServiceCollection AddAnalytics(this IServiceCollection services)
+	{
+		return services.AddSingleton<IAnalyticsSink, AnalyticsSink>();
+	}
+}

src/app/ApplicationTemplate.Presentation/Configuration/ViewModelConfiguration.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using ApplicationTemplate.Presentation;
 using Chinook.DataLoader;
 using Chinook.DynamicMvvm;
 using Chinook.DynamicMvvm.Implementations;
@@ -41,6 +42,7 @@ private static IServiceCollection AddDynamicCommands(this IServiceCollection ser
 				new DynamicCommandBuilderFactory(c => c
 					.CatchErrors(s.GetRequiredService<IDynamicCommandErrorHandler>())
 					.WithLogs(s.GetRequiredService<ILogger<IDynamicCommand>>())
+					.WithStrategy(new AnalyticsCommandStrategy(s.GetRequiredService<IAnalyticsSink>(), c.ViewModel))
 					.WithStrategy(new RaiseCanExecuteOnDispatcherCommandStrategy(c.ViewModel))
 					.DisableWhileExecuting()
 					.OnBackgroundThread()
@@ -61,9 +63,9 @@ private static IServiceCollection AddDataLoaders(this IServiceCollection service
 			return new DataLoaderBuilderFactory(b => b
 				.OnBackgroundThread()
 				.WithEmptySelector(GetIsEmpty)
-				.WithAnalytics(
-					onSuccess: async (ct, request, value) => { /* Some analytics */ },
-					onError: async (ct, request, error) => { /* Somme analytics */ }
+				.WithMonitoring(
+					onSuccess: async (ct, request, value) => { /* Some monitoring logic */ },
+					onError: async (ct, request, error) => { /* Some monitoring logic */ }
 				)
 				.WithLoggedErrors(s.GetRequiredService<ILogger<IDataLoader>>())
 			);

src/app/ApplicationTemplate.Presentation/CoreStartup.cs

@@ -49,6 +49,7 @@ protected override IHostBuilder InitializeServices(IHostBuilder hostBuilder, str
 				.AddLocalization()
 				.AddReviewServices()
 				.AddAppServices()
+				.AddAnalytics()
 			);
 	}
 
@@ -70,13 +71,10 @@ protected override async Task StartServices(IServiceProvider services, bool isFi
 		if (isFirstStart)
 		{
 			// TODO: Start your core services and customize the initial navigation logic here.
-
+			StartAutomaticAnalyticsCollection(services);
 			await services.GetRequiredService<IReviewService>().TrackApplicationLaunched(CancellationToken.None);
-
 			NotifyUserOnSessionExpired(services);
-
 			services.GetRequiredService<DiagnosticsCountersService>().Start();
-
 			await ExecuteInitialNavigation(CancellationToken.None, services);
 		}
 	}
@@ -119,6 +117,16 @@ public static async Task ExecuteInitialNavigation(CancellationToken ct, IService
 		services.GetRequiredService<IExtendedSplashscreenController>().Dismiss();
 	}
 
+	private void StartAutomaticAnalyticsCollection(IServiceProvider services)
+	{
+		var analyticsSink = services.GetRequiredService<IAnalyticsSink>();
+		var sectionsNavigator = services.GetRequiredService<ISectionsNavigator>();
+		sectionsNavigator
+			.ObserveCurrentState()
+			.Subscribe(analyticsSink.TrackNavigation)
+			.DisposeWith(Disposables);
+	}
+
 	private void NotifyUserOnSessionExpired(IServiceProvider services)
 	{
 		var authenticationService = services.GetRequiredService<IAuthenticationService>();

src/app/ApplicationTemplate.Presentation/Framework/Analytics/AnalytcsSink.cs

@@ -0,0 +1,90 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using Chinook.DataLoader;
+using Chinook.DynamicMvvm;
+using Chinook.SectionsNavigation;
+using Chinook.StackNavigation;
+using Microsoft.Extensions.Logging;
+
+namespace ApplicationTemplate.Presentation;
+
+public sealed class AnalyticsSink : IAnalyticsSink
+{
+	private readonly ILogger<AnalyticsSink> _logger;
+	private INavigableViewModel? _lastViewModel;
+
+	public AnalyticsSink(ILogger<AnalyticsSink> logger)
+	{
+		_logger = logger;
+	}
+
+	public void TrackNavigation(SectionsNavigatorState navigatorState)
+	{
+		if (navigatorState.LastRequestState != NavigatorRequestState.Processed)
+		{
+			// Skip the requests that are still processing of that failed to process.
+			return;
+		}
+
+		// Get the actual ViewModel instance.
+		// This allows to track based on instances and not types (because there are scenarios where you can open the same page multiple times with different parameters).
+		// Having the instance also allows casting into more specific types to get more information, such as navigation parameters, that could be relevant for analytics.
+		var viewModel = navigatorState.GetActiveStackNavigator().State.Stack.LastOrDefault()?.ViewModel;
+		if (viewModel is null || _lastViewModel == viewModel)
+		{
+			return;
+		}
+
+		// Gather analytics data.
+		var pageName = viewModel.GetType().Name.Replace("ViewModel", string.Empty, StringComparison.OrdinalIgnoreCase);
+		var isInModal = navigatorState.ActiveModal != null;
+		var sectionName = navigatorState.ActiveSection.Name;
+
+		// Send the analytics event.
+		SendPageView(pageName, isInModal, sectionName);
+
+		// Capture the last ViewModel instance to avoid duplicate events in the future.
+		_lastViewModel = viewModel;
+	}
+
+	private void SendPageView(string pageName, bool isInModal, string sectionName)
+	{
+		// TODO: Implement page views using a real analytics provider.
+		if (!_logger.IsEnabled(LogLevel.Information))
+		{
+			return;
+		}
+
+		if (isInModal)
+		{
+			_logger.LogInformation("Viewed page '{PageName}' in modal.", pageName);
+		}
+		else
+		{
+			_logger.LogInformation("Viewed page '{PageName}' in section '{SectionName}'.", pageName, sectionName);
+		}
+	}
+
+	public void TrackCommand(string commandName, object? commandParameter, WeakReference<IViewModel>? viewModel)
+	{
+		// TODO: Implement command execution events using a real analytics provider.
+		if (!_logger.IsEnabled(LogLevel.Information))
+		{
+			return;
+		}
+
+		if (viewModel?.TryGetTarget(out var vm) ?? false)
+		{
+			_logger.LogInformation("Invoked command '{CommandName}' from ViewModel '{ViewModelName}'.", commandName, vm.Name);
+		}
+		else
+		{
+			_logger.LogInformation("Invoked command '{CommandName}'.", commandName);
+		}
+	}
+}

src/app/ApplicationTemplate.Presentation/Framework/Analytics/AnalyticsCommandStrategy.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Chinook.DynamicMvvm;
+
+namespace ApplicationTemplate.Presentation;
+
+/// <summary>
+/// This <see cref="IDynamicCommandStrategy"/> tracks the success and failure of a command for analytics purposes.
+/// </summary>
+public sealed class AnalyticsCommandStrategy : DelegatingCommandStrategy
+{
+	private readonly IAnalyticsSink _analyticsSink;
+	private readonly WeakReference<IViewModel> _viewModel;
+
+	public AnalyticsCommandStrategy(IAnalyticsSink analyticsSink, IViewModel viewModel)
+	{
+		_analyticsSink = analyticsSink;
+		_viewModel = new WeakReference<IViewModel>(viewModel);
+	}
+
+	public override async Task Execute(CancellationToken ct, object parameter, IDynamicCommand command)
+	{
+		_analyticsSink.TrackCommand(command.Name, parameter, _viewModel);
+
+		await base.Execute(ct, parameter, command);
+	}
+}

src/app/ApplicationTemplate.Presentation/Framework/Analytics/IAnalyticsSink.cs

@@ -0,0 +1,31 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Chinook.DataLoader;
+using Chinook.DynamicMvvm;
+using Chinook.SectionsNavigation;
+
+namespace ApplicationTemplate.Presentation;
+
+/// <summary>
+/// This service collects raw analytics data from the application and processes it to send to an analytics provider (such as AppCenter, Firebase, Segment, etc.).
+/// </summary>
+public interface IAnalyticsSink
+{
+	/// <summary>
+	/// Tracks a navigation event from which to derive page views.
+	/// </summary>
+	/// <param name="navigatorState">The state of the navigator.</param>
+	void TrackNavigation(SectionsNavigatorState navigatorState);
+
+	/// <summary>
+	/// Tracks a command execution initiation.
+	/// </summary>
+	/// <param name="commandName">The name of the command.</param>
+	/// <param name="commandParameter">The optional command parameter.</param>
+	/// <param name="viewModel">An optional weak reference to the ViewModel owning the command.</param>
+	void TrackCommand(string commandName, object? commandParameter, WeakReference<IViewModel>? viewModel);
+}

src/app/ApplicationTemplate.Presentation/Framework/DataLoader/AnalyticsDataLoaderStrategy.cs → src/app/ApplicationTemplate.Presentation/Framework/DataLoader/MonitoringDataLoaderStrategy.cs

@@ -8,15 +8,15 @@
 namespace Chinook.DataLoader;
 
 /// <summary>
-/// This class is a <see cref="DelegatingDataLoaderStrategy"/> that offers callbacks on success and on error, ideal for analytics.
-/// This class demontrates how easy it is to extend the DataLoader recipe.
+/// This class is a <see cref="DelegatingDataLoaderStrategy"/> that offers callbacks on success and on error, ideal for monitoring.
+/// This class demonstrates how easy it is to extend the DataLoader recipe.
 /// </summary>
-public class AnalyticsDataLoaderStrategy : DelegatingDataLoaderStrategy
+public class MonitoringDataLoaderStrategy : DelegatingDataLoaderStrategy
 {
 	private readonly ActionAsync<IDataLoaderRequest, object> _onSuccess;
 	private readonly ActionAsync<IDataLoaderRequest, Exception> _onError;
 
-	public AnalyticsDataLoaderStrategy(ActionAsync<IDataLoaderRequest, object> onSuccess, ActionAsync<IDataLoaderRequest, Exception> onError)
+	public MonitoringDataLoaderStrategy(ActionAsync<IDataLoaderRequest, object> onSuccess, ActionAsync<IDataLoaderRequest, Exception> onError)
 	{
 		_onSuccess = onSuccess;
 		_onError = onError;
@@ -41,19 +41,19 @@ public override async Task<object> Load(CancellationToken ct, IDataLoaderRequest
 	}
 }
 
-public static class AnalyticsDataLoaderStrategyExtensions
+public static class MonitoringDataLoaderStrategyExtensions
 {
 	/// <summary>
-	/// Adds a <see cref="AnalyticsDataLoaderStrategy"/> to this builder.
+	/// Adds a <see cref="MonitoringDataLoaderStrategy"/> to this builder.
 	/// </summary>
 	/// <typeparam name="TBuilder">The type of the builder.</typeparam>
 	/// <param name="builder">The builder.</param>
 	/// <param name="onSuccess">The callback when the strategy loads successfully.</param>
 	/// <param name="onError">The callback when the strategy fails to load.</param>
 	/// <returns>The original builder.</returns>
-	public static TBuilder WithAnalytics<TBuilder>(this TBuilder builder, ActionAsync<IDataLoaderRequest, object> onSuccess, ActionAsync<IDataLoaderRequest, Exception> onError)
+	public static TBuilder WithMonitoring<TBuilder>(this TBuilder builder, ActionAsync<IDataLoaderRequest, object> onSuccess, ActionAsync<IDataLoaderRequest, Exception> onError)
 		where TBuilder : IDataLoaderBuilder
 	{
-		return builder.WithStrategy(new AnalyticsDataLoaderStrategy(onSuccess, onError));
+		return builder.WithStrategy(new MonitoringDataLoaderStrategy(onSuccess, onError));
 	}
 }

src/app/ApplicationTemplate.Presentation/ViewModels/Extensions/SectionsNavigatorState.Extensions.cs

@@ -5,7 +5,7 @@ namespace Chinook.SectionsNavigation;
 
 public static class SectionsNavigatorStateExtensions
 {
-	public static Type GetViewModelType(this SectionsNavigatorState sectionsNavigatorState)
+	public static Type GetCurrentOrNextViewModelType(this SectionsNavigatorState sectionsNavigatorState)
 	{
 		switch (sectionsNavigatorState.LastRequestState)
 		{