Merge branch 'main' into feature/added-linter

Signed-off-by: Robert Gogete <gogeterobert@yahoo.com>

src/Application/Channels/Commands/PatchChannelCommand.cs

@@ -60,7 +60,7 @@ public async Task<Unit> Handle(PatchChannelCommand request, CancellationToken ca
         return Unit.Value;
     }
 
-    private void UpdateEnvironmentVariables(PatchChannelCommand request, Channel? channel)
+    private void UpdateEnvironmentVariables(PatchChannelCommand request, Channel channel)
     {
         var existingVariables = GetExistingEnvironmentVariables(request.ChannelId);
 
@@ -75,13 +75,13 @@ private void UpdateEnvironmentVariables(PatchChannelCommand request, Channel? ch
 
         _context.EnvironmentVariables.AddRange(envVariablesToBeAdded);
 
-        if (existingVariables.Count > 0 && request.EnvironmentVariables.Value != null)
+        if (existingVariables.Count > 0 && request.EnvironmentVariables.Value is not null)
         {
             foreach (var environmentVariable in request.EnvironmentVariables.Value)
             {
                 var updatedEnvVar = existingVariables.FirstOrDefault(v => v.Id == environmentVariable.Id);
 
-                if (updatedEnvVar == null)
+                if (updatedEnvVar is null)
                 {
                     continue;
                 }
@@ -107,15 +107,15 @@ private List<EnvironmentVariable> GetExistingEnvironmentVariables(Guid channelId
             .ToList();
     }
 
-    private static List<EnvironmentVariable> EnvironmentVariablesToBeAdded(List<UpdateEnvironmentVariableDto> environmentVariables, Channel channel)
+    private static List<EnvironmentVariable> EnvironmentVariablesToBeAdded(List<UpdateEnvironmentVariableDto>? environmentVariables, Channel channel)
     {
-        if (environmentVariables == null)
+        if (environmentVariables is null)
         {
             return new List<EnvironmentVariable>();
         }
 
         var toBeAdded = new List<EnvironmentVariable>();
-        var newVariables = environmentVariables.Where(v => v.Id == null);
+        var newVariables = environmentVariables.Where(v => v.Id is null);
 
         foreach (var environmentVariable in newVariables)
         {
@@ -133,22 +133,22 @@ private static List<EnvironmentVariable> EnvironmentVariablesToBeAdded(List<Upda
     }
 
     private static List<EnvironmentVariable> EnvironmentVariablesToBeUpdated(List<EnvironmentVariable> existingVariables,
-        List<UpdateEnvironmentVariableDto> environmentVariables)
+        List<UpdateEnvironmentVariableDto>? environmentVariables)
     {
-        if (environmentVariables == null)
+        if (environmentVariables is null)
         {
             return new List<EnvironmentVariable>();
         }
 
-        var environmentVariablesIds = environmentVariables?.Select(v => v.Id);
+        var environmentVariablesIds = environmentVariables.Select(v => v.Id);
 
         return existingVariables.Where(v => environmentVariablesIds.Contains(v.Id)).ToList();
     }
 
     private static List<EnvironmentVariable> EnvironmentVariablesToBeRemoved(List<EnvironmentVariable> existingVariables,
-        List<UpdateEnvironmentVariableDto> environmentVariables)
+        List<UpdateEnvironmentVariableDto>? environmentVariables)
     {
-        if (environmentVariables == null)
+        if (environmentVariables is null)
         {
             environmentVariables = new List<UpdateEnvironmentVariableDto>();
         }

src/Application/Channels/EventHandlers/ChannelCreatedEventHandler.cs

@@ -25,7 +25,7 @@ public Task Handle(CreatedEvent<Channel> notification, CancellationToken cancell
 
         _logger.LogInformation($"Hippo Domain Event: {notification.GetType().Name}");
 
-        if (channel.ActiveRevision != null)
+        if (channel.ActiveRevision is not null)
         {
             _logger.LogInformation($"{channel.App.Name}: Starting channel {channel.Name} at revision {channel.ActiveRevision.RevisionNumber}");
             var envvars = channel.EnvironmentVariables.ToDictionary(

src/Application/Channels/Queries/GetChannelQuery.cs

@@ -45,6 +45,11 @@ public async Task<ChannelItem> Handle(GetChannelQuery request, CancellationToken
             .Select(a => a.ToAppSummaryDto())
             .FirstOrDefaultAsync(cancellationToken);
 
+        if (entity.ActiveRevision is not null)
+        {
+            entity.ActiveRevision.Type = entity.ActiveRevision.Components.FirstOrDefault()?.Type;
+        }
+
         return entity;
     }
 }

src/Application/Common/Extensions/IgnoreNoMapExtensions.cs

@@ -12,11 +12,11 @@ public static IMappingExpression IgnoreMarkedAttributes(
         foreach (var property in destinationType.GetProperties())
         {
             PropertyDescriptor? descriptor = TypeDescriptor.GetProperties(destinationType)?[property.Name];
-            if (descriptor == null || descriptor.Attributes == null)
+            if (descriptor is null || descriptor.Attributes is null)
                 continue;
 
             var attribute = descriptor.Attributes[typeof(NoMapAttribute)];
-            if (attribute != null && (NoMapAttribute)attribute != null)
+            if (attribute is not null && (NoMapAttribute)attribute is not null)
             {
                 expression.ForMember(property.Name, opt => opt.Ignore());
             }

src/Application/JobStatuses/Queries/GetJobStatusesQuery.cs

@@ -41,19 +41,19 @@ public async Task<Page<ChannelJobStatusItem>> Handle(GetJobStatusesQuery request
             Items = entities,
             PageIndex = request.PageIndex,
             PageSize = request.PageSize,
-            TotalItems = jobs == null ? 0 : jobs.Count
+            TotalItems = jobs is null ? 0 : jobs.Count
         };
     }
 
     private static JobStatus GetJobStatus(List<Job>? jobs, Guid jobId)
     {
-        if (jobs == null)
+        if (jobs is null)
         {
             return JobStatus.Unknown;
         }
 
         var job = jobs.Where(job => job.Id == jobId).FirstOrDefault();
 
-        return job != null ? job.Status : JobStatus.Dead;
+        return job is not null ? job.Status : JobStatus.Dead;
     }
 }

src/Application/Revisions/Commands/UpdateRevisionDetailsCommand.cs

@@ -32,7 +32,7 @@ public async Task<Unit> Handle(UpdateRevisionDetailsCommand request, Cancellatio
             .SingleOrDefaultAsync(cancellationToken);
         _ = revision ?? throw new NotFoundException(nameof(Core.Entities.Revision), request.RevisionId);
         var revisionDetails = request.RevisionDetails;
-        if (revisionDetails == null || revisionDetails.SpinToml == null)
+        if (revisionDetails is null || revisionDetails.SpinToml is null)
         {
             return Unit.Value;
         }

src/Application/Revisions/Queries/RevisionItem.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Hippo.Application.Common.Attributes;
 using Hippo.Application.Common.Mappings;
 using Hippo.Core.Entities;
 
@@ -18,6 +19,9 @@ public class RevisionItem : IMapFrom<Revision>
     [Required]
     public IList<RevisionComponentDto> Components { get; private set; } = new List<RevisionComponentDto>();
 
+    [NoMap]
+    public string? Type { get; set; }
+
     public string OrderKey()
     {
         if (SemVer.Version.TryParse(RevisionNumber, out var version))

src/Core/Models/Extensions/FieldExtensions.cs

@@ -4,7 +4,7 @@ public static class FieldExtensions
 {
     public static bool IsSet<T>(this Field<T> field)
     {
-        return field != null;
+        return field is not null;
     }
 
     public static void WhenSet<T>(this Field<T> field, Action<T> action)

src/Core/Models/Extensions/FilteringExtensions.cs

@@ -7,7 +7,7 @@ public static IEnumerable<T> SortBy<T>(this IEnumerable<T> items, string sortBy,
         IOrderedEnumerable<T> orderedItems;
         var sortPropInfo = typeof(T).GetProperty(sortBy);
 
-        if (sortPropInfo == null)
+        if (sortPropInfo is null)
         {
             throw new Exception("Sort field does it exist");
         }

src/Core/Models/Filter.cs

@@ -24,7 +24,7 @@ public class PageAndSortFilter : IPageFilter, ISortFilter
     public int PageIndex { get; set; }
     public int PageSize { get; set; }
     public int Offset { get { return PageIndex * PageSize; } }
-    public string SortBy { get; set; }
+    public string SortBy { get; set; } = string.Empty;
     public bool IsSortedAscending { get; set; }
 
     public PageAndSortFilter()

src/Core/Models/Page.cs

@@ -15,7 +15,7 @@ public Page(IReadOnlyCollection<TModel> items, int totalItems)
     /// <summary>
     /// the fetched items
     /// </summary>
-    public IReadOnlyCollection<TModel> Items { get; set; }
+    public IReadOnlyCollection<TModel> Items { get; set; } = new List<TModel>();
 
     /// <summary>
     /// the total number of items for the requested query
@@ -38,7 +38,7 @@ public bool? IsLastPage
         {
             if (!PageIndex.HasValue || !PageSize.HasValue)
                 return null;
-                
+
             return TotalItems == PageIndex * PageSize + Items.Count;
         }
     }

src/Core/Serialization/FieldConverter.cs

@@ -10,31 +10,36 @@ public override bool CanConvert(Type objectType)
         throw new NotImplementedException();
     }
 
-    public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+    public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
     {
         var fieldInnerPropertyType = objectType
-            .GetProperty(nameof(Field<string>.Value))
+            .GetProperty(nameof(Field<string>.Value))?
             .PropertyType;
         var jsonValue = ReadInnerFieldValue(reader, serializer, fieldInnerPropertyType);
 
         return Activator.CreateInstance(objectType, new[] { jsonValue });
     }
 
-    private static object ReadInnerFieldValue(JsonReader reader, JsonSerializer serializer, Type fieldInnerPropertyType)
+    private static object? ReadInnerFieldValue(JsonReader reader, JsonSerializer serializer, Type? fieldInnerPropertyType)
     {
-        if (reader.TokenType == JsonToken.Null)
+        if (reader.TokenType == JsonToken.Null || fieldInnerPropertyType is null)
             return null;
-            
+
         return serializer.Deserialize(reader, fieldInnerPropertyType);
     }
 
-    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
     {
-        var fieldInnerProperty = value
-            .GetType()
-            .GetProperty(nameof(Field<string>.Value));
+        object? val = null;
+        if (value is not null)
+        {
+            var fieldInnerProperty = value
+                .GetType()
+                .GetProperty(nameof(Field<string>.Value));
+
+            val = fieldInnerProperty is null ? null : fieldInnerProperty.GetValue(value);
+        }
 
-        var fieldInnerValue = fieldInnerProperty.GetValue(value);
-        serializer.Serialize(writer, fieldInnerValue);
+        serializer.Serialize(writer, val);
     }
 }

src/Infrastructure/Data/Interceptors/AuditableEntitySaveChangesInterceptor.cs

@@ -36,7 +36,7 @@ public override ValueTask<InterceptionResult<int>> SavingChangesAsync(DbContextE
 
     public void UpdateEntities(DbContext? context)
     {
-        if (context == null) return;
+        if (context is null) return;
 
         foreach (var entry in context.ChangeTracker.Entries<AuditableEntity>())
         {
@@ -59,7 +59,7 @@ public static class Extensions
 {
     public static bool HasChangedOwnedEntities(this EntityEntry entry) =>
         entry.References.Any(r =>
-            r.TargetEntry != null &&
+            r.TargetEntry is not null &&
             r.TargetEntry.Metadata.IsOwned() &&
             (r.TargetEntry.State == EntityState.Added || r.TargetEntry.State == EntityState.Modified));
 }

src/Infrastructure/Services/BindleService.cs

@@ -86,7 +86,7 @@ public async Task<IEnumerable<string>> QueryAvailableStorages(string query, ulon
         if (matches.Total == 0)
             return new List<string>();
         return matches.Invoices
-            .Where(i => i.Bindle != null && !string.IsNullOrEmpty(i.Bindle.Name))
+            .Where(i => i.Bindle is not null && !string.IsNullOrEmpty(i.Bindle.Name))
             .Select(i => new string(i.Bindle?.Name))
             .Distinct()
             .Take(limit ?? int.MaxValue);

src/Infrastructure/Services/NomadJobService.cs

@@ -57,7 +57,7 @@ public string[] GetJobLogs(string jobName)
             .Select(a => a.ID)
             .FirstOrDefault();
 
-        if (allocationId == null)
+        if (allocationId is null)
         {
             return new string[] { };
         }
@@ -149,12 +149,19 @@ private Service GenerateJobService(NomadJob nomadJob)
             tags.Add("traefik.http.routers." + nomadJob.Id + @".tls.domains[0].main=" + nomadJob.Domain);
         }
 
-        return new Service
+        var serviceProvider = _configuration.GetValue("Nomad:ServiceProvider", "consul");
+
+        var service = new Service
         {
             PortLabel = "http",
             Name = nomadJob.Id.ToString(),
             Tags = tags,
-            Checks = new List<ServiceCheck>
+            Provider = serviceProvider,
+        };
+
+        if (serviceProvider == "consul")
+        {
+            service.Checks = new List<ServiceCheck>
             {
                 new ServiceCheck
                 {
@@ -163,8 +170,10 @@ private Service GenerateJobService(NomadJob nomadJob)
                     Interval = 10000000000,
                     Timeout = 2000000000
                 }
-            }
-        };
+            };
+
+        }
+        return service;
     }
 
     private Fermyon.Nomad.Model.Task GenerateJobTask(NomadJob nomadJob)

src/Web/ClientApp/src/app/components/channel/channel.component.html

@@ -1,7 +1,12 @@
 <div *ngIf="channel && channel.appSummary" class="is-flex is-flex-direction-row is-align-items-center is-justify-content-space-between mb-6">
     <div>
         <h1 class="is-size-1">{{channel.appSummary.name}}</h1>
-        <a href="{{protocol}}//{{channel.domain}}" target="_blank">{{channel.domain}}</a>
+        <div *ngIf="channel.activeRevision?.type === types.HTTP">
+            <a href="{{protocol}}//{{channel.domain}}" target="_blank">{{channel.domain}}</a>
+        </div>
+        <div *ngIf="channel.activeRevision?.type !== types.HTTP">
+            <p>{{channel.domain}}</p>
+        </div>
     </div>
     <div *ngIf="channel.appSummary.channels.length > 1 && activeTab !== tabs.Settings">
         <div class="dropdown"

src/Web/ClientApp/src/app/components/channel/channel.component.ts

@@ -4,6 +4,7 @@ import {
     ChannelItem,
     ChannelService,
 } from 'src/app/core/api/v1';
+import { ApplicationTabs, ComponentTypes } from 'src/app/_helpers/constants';
 import { Component, OnInit } from '@angular/core';
 import {
     faAngleDown,
@@ -12,7 +13,6 @@ import {
     faFilter,
     faStream,
 } from '@fortawesome/free-solid-svg-icons';
-import { ApplicationTabs } from 'src/app/_helpers/constants';
 
 @Component({
     selector: 'app-channel',
@@ -26,6 +26,7 @@ export class ChannelComponent implements OnInit {
     selectedChannel!: AppChannelListItem;
     isSelectClicked = false;
     tabs = ApplicationTabs;
+    types = ComponentTypes;
     activeTab = ApplicationTabs.Overview;
     protocol = window.location.protocol;
 

src/Web/ClientApp/src/app/core/api/v1/.openapi-generator/VERSION

@@ -1 +1 @@
-5.4.0
+6.0.0

src/Web/ClientApp/src/app/core/api/v1/api/account.service.ts

@@ -96,12 +96,9 @@ export class AccountService {
                 );
             } else if (value instanceof Date) {
                 if (key != null) {
-                    httpParams = httpParams.append(
-                        key,
-                        (value as Date).toISOString().substr(0, 10)
-                    );
+                    httpParams = httpParams.append(key, (value as Date).toISOString().substr(0, 10));
                 } else {
-                    throw Error('key may not be null if value is Date');
+                   throw Error("key may not be null if value is Date");
                 }
             } else {
                 Object.keys(value).forEach(

src/Web/ClientApp/src/app/core/api/v1/api/app.service.ts

@@ -96,11 +96,9 @@ export class AppService {
                 );
             } else if (value instanceof Date) {
                 if (key != null) {
-                    httpParams = httpParams.append(
-                        key,
-                        (value as Date).toISOString().substr(0, 10)
-                    );
+                    httpParams = httpParams.append(key, (value as Date).toISOString().substr(0, 10));
                 } else {
+                   throw Error("key may not be null if value is Date");
                     throw Error('key may not be null if value is Date');
                 }
             } else {