Run using docker fixes

Author: michielpost

.github/workflows/docker.yml

@@ -36,7 +36,8 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
-          context: ./HueEntertainmentPro/Server/
+          context: ./
+          file: ./HueEntertainmentPro/Server/Dockerfile
           push: true
           tags: michielpost/huelightdj:latest,${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

HueEntertainmentPro.Database/HueEntertainmentPro.Database.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <WarningsAsErrors>nullable</WarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>

HueEntertainmentPro.Database/HueEntertainmentProDbContext.cs

@@ -49,7 +49,7 @@ protected override void OnModelCreating(ModelBuilder builder)
               entityBuilder
                   .Property(propertyInfo.Name)
                   .HasConversion(
-                      new ValueConverter<Guid?, string>(
+                      new ValueConverter<Guid?, string?>(
                           v => v.HasValue ? v.Value.ToString() : null,
                           v => v != null ? Guid.Parse(v) : (Guid?)null))
                   .UseCollation("NOCASE");

HueEntertainmentPro.Database/Models/ProArea.cs

@@ -7,7 +7,7 @@ public class ProArea
     //public bool IsAlwaysVisible { get; set; }
     //public bool HideDisconnect { get; set; }
 
-    public IList<ProAreaBridgeGroup> ProAreaBridgeGroups { get; set; }
+    public IList<ProAreaBridgeGroup>? ProAreaBridgeGroups { get; set; }
 
     public DateTime CreatedDate { get; set; }
   }

HueEntertainmentPro/Client/HueEntertainmentPro.Client.csproj

@@ -3,7 +3,10 @@
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <WarningsAsErrors>nullable</WarningsAsErrors>
     <ImplicitUsings>enable</ImplicitUsings>
+    <InvariantTimezone>false</InvariantTimezone>
+    <InvariantGlobalization>true</InvariantGlobalization>
   </PropertyGroup>
 
   <ItemGroup>

HueEntertainmentPro/Client/Pages/BridgeDetail.razor

@@ -89,6 +89,9 @@ else
 
     private async Task ShowEditNameDialog()
     {
+        if (bridge == null)
+            return;
+
         var dialogParameters = new DialogParameters
         {
             Title = "Edit Bridge Name",
@@ -98,7 +101,7 @@ else
             Modal = true
         };
 
-        var dialog = await DialogService.ShowDialogAsync<EditNameDialog>(bridge.Name, dialogParameters);
+        var dialog = await DialogService.ShowDialogAsync<EditNameDialog>(bridge.Name ?? string.Empty, dialogParameters);
         var result = await dialog.Result;
 
         if (!result.Cancelled && result.Data is string newName && !string.IsNullOrWhiteSpace(newName))

HueEntertainmentPro/Client/Pages/EditNameDialog.razor

@@ -11,18 +11,20 @@
 
 @code {
     [CascadingParameter]
-    private FluentDialog Dialog { get; set; }
+    private FluentDialog? Dialog { get; set; }
 
     [Parameter]
     public string Content { get; set; } = string.Empty;
 
     private async Task Submit()
     {
-        await Dialog.CloseAsync(Content);
+        if (Dialog != null)
+            await Dialog.CloseAsync(Content);
     }
 
     private async Task Cancel()
     {
-        await Dialog.CancelAsync();
+        if (Dialog != null)
+            await Dialog.CancelAsync();
     }
 }

HueEntertainmentPro/Client/Pages/ProAreaDetail.razor

@@ -53,8 +53,8 @@
 
     <h4 style="margin-top: 20px;">Add Entertainment Groups</h4>
 
-    var disabled = bridgeOptions.Where(x => x.Disabled).Any();
-    var enabled = bridgeOptions.Where(x => !x.Disabled).Any();
+    var disabled = bridgeOptions?.Where(x => x.Disabled).Any() ?? false;
+    var enabled = bridgeOptions?.Where(x => !x.Disabled).Any() ?? false;
 
     @if (enabled && disabled)
     {
@@ -76,7 +76,7 @@
                        TOption="Option<Bridge>"
                        OptionText="@(i => i.Text)"
                        OptionDisabled="@(i => i.Disabled)"
-                       OptionValue="@(i => i.Value.Id.ToString())"
+                       OptionValue="@(i => i.Value?.Id.ToString())"
                        @bind-SelectedOption="@selectedBridge"
                        ValueChanged="@(async (string bridge) => await OnBridgeIdSelected(bridge))" />
 
@@ -91,7 +91,7 @@
             {
                 <FluentDataGrid Items="@entertainmentGroups"
                                 RowSize="@DataGridRowSize.Medium"
-                  TGridItem="SimpleEntertainmentGroup">
+                                TGridItem="SimpleEntertainmentGroup">
                     <TemplateColumn Title="Action" Align="Align.Start">
                         <FluentButton @onclick="() => AddToArea(selectedBridge.Value.Id, context.Id, context.Name)">Add</FluentButton>
                     </TemplateColumn>
@@ -159,6 +159,9 @@ else
 
     private async Task ShowEditNameDialog()
     {
+        if (proArea == null)
+            return;
+
         var dialogParameters = new DialogParameters
         {
             Title = "Edit Area Name",
@@ -168,7 +171,7 @@ else
             Modal = true
         };
 
-        var dialog = await DialogService.ShowDialogAsync<EditNameDialog>(proArea.Name, dialogParameters);
+        var dialog = await DialogService.ShowDialogAsync<EditNameDialog>(proArea.Name ?? string.Empty, dialogParameters);
         var result = await dialog.Result;
 
         if (!result.Cancelled && result.Data is string newName && !string.IsNullOrWhiteSpace(newName))
@@ -221,7 +224,10 @@ else
         StateHasChanged();
 
         var id = Guid.Parse(bridgeId);
-        var bridge = bridges.FirstOrDefault(b => b.Id == id);
+        var bridge = bridges?.FirstOrDefault(b => b.Id == id);
+
+        if(bridge == null)
+            return;
 
         // Load entertainment groups
         var result = await HueSetupService.GetEntertainmentGroupsAsync(new HueLightDJ.Services.Interfaces.Models.Requests.HueSetupRequest()
@@ -236,6 +242,9 @@ else
 
     private async Task AddToArea(Guid bridgeId, Guid groupId, string? name)
     {
+        if (proArea == null)
+            return;
+
         var result = await ProAreaDataService.AddBridgeGroup(new AddBridgeGroupRequest
         {
             ProAreaId = proArea.Id,

HueEntertainmentPro/Client/Pages/ProAreaPlay.razor

@@ -232,6 +232,12 @@ else
 
     public async Task Connect()
     {
+        if (config == null)
+        {
+            errorMessage = "No entertainment groups connected to this area. Please add some in the area details page.";
+            return;
+        }
+
         await LightDJService.Connect(config);
         statusModel = await LightDJService.GetStatus();
         this.InvokeAsync(() => this.StateHasChanged());

HueEntertainmentPro/Server/Dockerfile

@@ -13,13 +13,13 @@ FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["HueEntertainmentPro/Server/HueEntertainmentPro.Server.csproj", "HueEntertainmentPro/Server/"]
+COPY ["HueEntertainmentPro/Client/HueEntertainmentPro.Client.csproj", "HueEntertainmentPro/Client/"]
+COPY ["HueEntertainmentPro/Shared/HueEntertainmentPro.Shared.csproj", "HueEntertainmentPro/Shared/"]
 COPY ["HueEntertainmentPro.Services/HueEntertainmentPro.Services.csproj", "HueEntertainmentPro.Services/"]
 COPY ["HueEntertainmentPro.Database/HueEntertainmentPro.Database.csproj", "HueEntertainmentPro.Database/"]
-COPY ["HueEntertainmentPro/Shared/HueEntertainmentPro.Shared.csproj", "HueEntertainmentPro/Shared/"]
 COPY ["HueLightDJ.Services.Interfaces/HueLightDJ.Services.Interfaces.csproj", "HueLightDJ.Services.Interfaces/"]
 COPY ["HueLightDJ.Services/HueLightDJ.Services.csproj", "HueLightDJ.Services/"]
 COPY ["HueLightDJ.Effects/HueLightDJ.Effects.csproj", "HueLightDJ.Effects/"]
-COPY ["HueEntertainmentPro/Client/HueEntertainmentPro.Client.csproj", "HueEntertainmentPro/Client/"]
 RUN dotnet restore "./HueEntertainmentPro/Server/HueEntertainmentPro.Server.csproj"
 COPY . .
 WORKDIR "/src/HueEntertainmentPro/Server"
@@ -33,5 +33,7 @@ RUN dotnet publish "./HueEntertainmentPro.Server.csproj" -c $BUILD_CONFIGURATION
 # This stage is used in production or when running from VS in regular mode (Default when not using the Debug configuration)
 FROM base AS final
 WORKDIR /app
+RUN mkdir -p /App_Data
+RUN chmod -R 777 /App_Data # Grant full permissions
 COPY --from=publish /app/publish .
 ENTRYPOINT ["dotnet", "HueEntertainmentPro.Server.dll"]