fix(resolver-ui) - Using ListBox in SimpleResolverUIPage, fixing nami…

…ng conventions, added more tests, removed RelayCommand implementation, bind to properties, removing duplicated license headers, using Application.Current.Dispatcher

examples/fdc3-appdirectory/apps-with-intents.json

@@ -17,6 +17,13 @@
       "interop": {
         "intents": {
           "listensFor": {
+            "ViewChart": {
+              "name": "ViewChart",
+              "displayName": "ViewChart",
+              "contexts": [
+                "fdc3.instrument"
+              ]
+            }
           }
         }
       }
@@ -44,6 +51,13 @@
               "contexts": [
                 "fdc3.nothing"
               ]
+            },
+            "ViewChart": {
+              "name": "ViewChart",
+              "displayName": "ViewChart",
+              "contexts": [
+                "fdc3.instrument"
+              ]
             }
           },
           "raises": {}
@@ -73,6 +87,13 @@
               "contexts": [
                 "fdc3.testContext"
               ]
+            },
+            "ViewChart": {
+              "name": "ViewChart",
+              "displayName": "ViewChart",
+              "contexts": [
+                "fdc3.instrument"
+              ]
             }
           },
           "raises": {}

src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/DependencyInjection/Fdc3DesktopAgentBuilderExtensions.cs

@@ -29,7 +29,7 @@ public static Fdc3DesktopAgentBuilder UseMessageRouter(
             builder.ServiceCollection.Configure<Fdc3DesktopAgentOptions>(configureOptions);
         }
 
-        builder.ServiceCollection.AddSingleton<IResolverUICommunicator, ResolverUiMessageRouterCommunicator>();
+        builder.ServiceCollection.AddSingleton<IResolverUICommunicator, ResolverUIMessageRouterCommunicator>();
         builder.ServiceCollection.AddHostedService<Fdc3DesktopAgentMessageRouterService>();
 
         return builder;

src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Fdc3DesktopAgent.cs

@@ -400,7 +400,7 @@ public async ValueTask<RaiseIntentResult<RaiseIntentResponse>> RaiseIntent(Raise
         }
 
         //Resolve to one app via ResolverUI.
-        var result = await WaitForResolverUiAsync(appIntent.Apps);
+        var result = await WaitForResolverUIAsync(appIntent.Apps);
 
         if (result != null && result.Error == null)
         {
@@ -426,7 +426,7 @@ public async ValueTask<RaiseIntentResult<RaiseIntentResponse>> RaiseIntent(Raise
         };
     }
 
-    private async Task<ResolverUIResponse?> WaitForResolverUiAsync(IEnumerable<AppMetadata> apps)
+    private async Task<ResolverUIResponse?> WaitForResolverUIAsync(IEnumerable<AppMetadata> apps)
     {
         using var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromMinutes(2));
 
@@ -438,7 +438,7 @@ public async ValueTask<RaiseIntentResult<RaiseIntentResponse>> RaiseIntent(Raise
         {
             if (_logger.IsEnabled(LogLevel.Debug))
             {
-                _logger.LogDebug(exception, "MessageRouter didn't receive response from the ResolverUi.");
+                _logger.LogDebug(exception, "MessageRouter didn't receive response from the ResolverUI.");
             }
 
             return new ResolverUIResponse()

src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Fdc3Topic.cs

@@ -24,7 +24,7 @@ internal static class Fdc3Topic
     internal static string GetIntentResult => TopicRoot + "getIntentResult";
     internal static string SendIntentResult => TopicRoot + "sendIntentResult";
     internal static string AddIntentListener => TopicRoot + "addIntentListener";
-    public static string ResolverUi => TopicRoot + "resolverUI";
+    public static string ResolverUI => TopicRoot + "resolverUI";
 
     //IntentListeners will be listening at this endpoint
     internal static string RaiseIntentResolution(string intent, string instanceId)

src/fdc3/dotnet/DesktopAgent/src/MorganStanley.ComposeUI.DesktopAgent/Infrastructure/Internal/ResolverUiMessageRouterCommunicator.cs

@@ -14,29 +14,24 @@
 
 using System.Text.Json;
 using Finos.Fdc3;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Contracts;
 using MorganStanley.ComposeUI.Fdc3.DesktopAgent.Converters;
 using MorganStanley.ComposeUI.Messaging;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Infrastructure.Internal;
 
-internal class ResolverUiMessageRouterCommunicator : IResolverUICommunicator
+internal class ResolverUIMessageRouterCommunicator : IResolverUICommunicator
 {
     private readonly IMessageRouter _messageRouter;
     private readonly JsonSerializerOptions _jsonMessageSerializerOptions = new()
     {
         Converters = { new AppMetadataJsonConverter() }
     };
-    private readonly ILogger<ResolverUiMessageRouterCommunicator> _logger;
 
-    public ResolverUiMessageRouterCommunicator(
-        IMessageRouter messageRouter,
-        ILogger<ResolverUiMessageRouterCommunicator>? logger = null)
+    public ResolverUIMessageRouterCommunicator(
+        IMessageRouter messageRouter)
     {
         _messageRouter = messageRouter;
-        _logger = logger ?? NullLogger<ResolverUiMessageRouterCommunicator>.Instance;
     }
 
     public async Task<ResolverUIResponse?> SendResolverUIRequest(IEnumerable<IAppMetadata> appMetadata, CancellationToken cancellationToken = default)
@@ -47,7 +42,7 @@ public ResolverUiMessageRouterCommunicator(
         };
 
         var responseBuffer = await _messageRouter.InvokeAsync(
-            Fdc3Topic.ResolverUi,
+            Fdc3Topic.ResolverUI,
             MessageBuffer.Factory.CreateJson(request, _jsonMessageSerializerOptions), 
             cancellationToken: cancellationToken);
 

src/fdc3/dotnet/DesktopAgent/test/MorganStanley.ComposeUI.DesktopAgent.Tests/Infrastructure/Internal/ResolverUiMessageRouterCommunicator.Tests.cs

@@ -21,7 +21,7 @@
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.Tests.Infrastructure.Internal;
 
-public class ResolverUiMessageRouterCommunicatorTests
+public class ResolverUIMessageRouterCommunicatorTests
 {
     private readonly JsonSerializerOptions _jsonSerializerOptions = new()
     {
@@ -40,7 +40,7 @@ public async Task SendResolverUIRequest_will_return_null()
                     It.IsAny<CancellationToken>()))
             .Returns(null);
 
-        var resolverUIMessageRouterCommunicator = new ResolverUiMessageRouterCommunicator(messageRouterMock.Object);
+        var resolverUIMessageRouterCommunicator = new ResolverUIMessageRouterCommunicator(messageRouterMock.Object);
 
         var response = await resolverUIMessageRouterCommunicator.SendResolverUIRequest(It.IsAny<IEnumerable<IAppMetadata>>());
 
@@ -63,7 +63,7 @@ public async Task SendResolverUIRequest_will_return_response()
                     AppMetadata = new AppMetadata(){ AppId = "testAppId" }
                 }, _jsonSerializerOptions)));
 
-        var resolverUIMessageRouterCommunicator = new ResolverUiMessageRouterCommunicator(messageRouterMock.Object);
+        var resolverUIMessageRouterCommunicator = new ResolverUIMessageRouterCommunicator(messageRouterMock.Object);
 
         var response = await resolverUIMessageRouterCommunicator.SendResolverUIRequest(It.IsAny<IEnumerable<IAppMetadata>>());
 

src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUIViewModel.cs

@@ -17,28 +17,12 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Threading;
-
-
-
-/*
- * Morgan Stanley makes this available to you under the Apache License,
- * Version 2.0 (the "License"). You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0.
- *
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership. Unless required by applicable law or agreed
- * to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
-
-using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using CommunityToolkit.Mvvm.Input;
 using Finos.Fdc3;
 using MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI.Pages;
+using Size = System.Drawing.Size;
 
 namespace MorganStanley.ComposeUI.Shell.Fdc3.ResolverUI;
 
@@ -51,7 +35,8 @@ internal class Fdc3ResolverUIViewModel : INotifyPropertyChanged, IDisposable
     private readonly Page _advancedResolverUIPage;
     private readonly Size _advancedResolverUISize = new(800, 600);
     private Page _currentPage;
-    private Size _currentSize;
+    private double _currentWidth;
+    private double _currentHeight;
 
     internal CancellationToken UserCancellationToken => _userCancellationTokenSource.Token;
 
@@ -63,25 +48,24 @@ public Fdc3ResolverUIViewModel(IEnumerable<IAppMetadata> apps)
         {
             _appData.Add(new()
             {
-                AppId = app.AppId,
                 AppMetadata = app,
-                Icon = app.Icons.FirstOrDefault() //First Icon from the array will be shown on the ResolverUi
+                Icon = app.Icons.FirstOrDefault() //First Icon from the array will be shown on the ResolverUI
             });
         }
 
         _simpleResolverUIPage = new SimpleResolverUIPage(_appData);
         _advancedResolverUIPage = new AdvancedResolverUIPage(_appData);
         _currentPage = _simpleResolverUIPage;
-        SetSize(_simpleResolverUISize);
-        
-        OpenSimpleViewCommand = new RelayCommand(_ => SetCurrentPageToSimpleView());
-        OpenAdvancedViewCommand = new RelayCommand(_ => SetCurrentPageToAdvancedView());
+        SetCurrentSize(_simpleResolverUISize);
+
+        OpenSimpleViewCommand = new RelayCommand(SetCurrentPageToSimpleView);
+        OpenAdvancedViewCommand = new RelayCommand(SetCurrentPageToAdvancedView);
     }
 
-    private void SetSize(Size size)
+    private void SetCurrentSize(Size size)
     {
-        _currentSize = size;
-        SizeChanged?.Invoke(this, new PageSizeChangedEventArgs(_currentSize));
+        CurrentWidth = size.Width;
+        CurrentHeight = size.Height;
     }
 
     public Page CurrentPage
@@ -97,21 +81,40 @@ public Page CurrentPage
     private void SetCurrentPageToSimpleView()
     {
         CurrentPage = _simpleResolverUIPage;
-        SetSize(_simpleResolverUISize);
+
+        SetCurrentSize(_simpleResolverUISize);
     }
 
     private void SetCurrentPageToAdvancedView()
     {
         CurrentPage = _advancedResolverUIPage;
-        SetSize(_advancedResolverUISize);
+        SetCurrentSize(_advancedResolverUISize);
     }
 
     public ICommand OpenSimpleViewCommand { get; }
     public ICommand OpenAdvancedViewCommand { get; }
 
+    public double CurrentWidth
+    {
+        get => _currentWidth;
+        set
+        {
+            _currentWidth = value;
+            OnPropertyChanged(nameof(CurrentWidth));
+        }
+    }
+
+    public double CurrentHeight
+    {
+        get => _currentHeight;
+        set
+        {
+            _currentHeight = value;
+            OnPropertyChanged(nameof(CurrentHeight));
+        }
+    }
 
     public event PropertyChangedEventHandler? PropertyChanged;
-    public event EventHandler<PageSizeChangedEventArgs>? SizeChanged;
 
     protected virtual void OnPropertyChanged(string propertyName)
     {
@@ -125,7 +128,7 @@ internal void CancelDialog()
 
     public void Dispose()
     {
-        _userCancellationTokenSource?.Cancel();
-        _userCancellationTokenSource?.Dispose();
+        _userCancellationTokenSource.Cancel();
+        _userCancellationTokenSource.Dispose();
     }
 }

src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUIWindow.cs

@@ -14,10 +14,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Threading;
 using Finos.Fdc3;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -33,16 +31,15 @@ public ValueTask<ResolverUIResponse> ShowResolverUI(IEnumerable<IAppMetadata> ap
     {
         try
         {
-            var dispatcher = GetDispatcher();
+            var dispatcher = Application.Current.Dispatcher;
 
             Fdc3ResolverUI? resolverUI = null;
             Task? timeoutTask = null;
 
             dispatcher.Invoke(() =>
             {
-                if (Application.Current.Dispatcher == null
-                    || Application.Current.Dispatcher.HasShutdownStarted
-                    || Application.Current.Dispatcher.HasShutdownFinished)
+                if (dispatcher.HasShutdownStarted
+                    || dispatcher.HasShutdownFinished)
                 {
                     return;
                 }
@@ -85,10 +82,10 @@ public ValueTask<ResolverUIResponse> ShowResolverUI(IEnumerable<IAppMetadata> ap
         catch (TimeoutException)
         {
             return ValueTask.FromResult(
-                    new ResolverUIResponse()
-                    {
-                        Error = ResolveError.ResolverTimeout,
-                    });
+                new ResolverUIResponse()
+                {
+                    Error = ResolveError.ResolverTimeout,
+                });
         }
         catch (Exception exception)
         {
@@ -104,21 +101,4 @@ public ValueTask<ResolverUIResponse> ShowResolverUI(IEnumerable<IAppMetadata> ap
                 });
         }
     }
-
-    private static Dispatcher GetDispatcher()
-    {
-        return Application.Current.Dispatcher.Invoke(() =>
-        {
-            return
-                //First window which is active
-                Application.Current.Windows
-                    .Cast<Window>()
-                    .FirstOrDefault(window => window.IsActive) ??
-                //Or the first window which is visible
-                Application.Current.Windows
-                    .Cast<Window>()
-                    .FirstOrDefault(window => window.Visibility == Visibility.Visible);
-        })?.Dispatcher ??
-        Application.Current.Dispatcher;
-    }
 }

src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUi.xaml

@@ -21,9 +21,9 @@ See the License for the specific language governing permissions and limitations
         MouseDown="Window_MouseDown"
         AllowDrop="True"
         AllowsTransparency="True"
-        Width="500"
-        Height="400"
-        DataContext="{Binding RelativeSource={RelativeSource Self}}">
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Height="{Binding CurrentHeight, Mode=TwoWay}"
+        Width="{Binding CurrentWidth, Mode=TwoWay}">
 
     <Border>
         <Grid 

src/shell/dotnet/Shell/Fdc3/ResolverUi/Fdc3ResolverUi.xaml.cs

@@ -36,16 +36,6 @@ public Fdc3ResolverUI(IEnumerable<IAppMetadata> apps)
 
         _viewModel = new Fdc3ResolverUIViewModel(apps);
         DataContext = _viewModel;
-        _viewModel.SizeChanged += OnSizeChanged;
-    }
-
-    private void OnSizeChanged(object? sender, PageSizeChangedEventArgs e)
-    {
-        if (e.NewSize != Size.Empty)
-        {
-            Width = e.NewSize.Width;
-            Height = e.NewSize.Height;
-        }
     }
 
     protected override void OnClosing(CancelEventArgs e)