fix(Solution): Transformed the CustomFunction into a cluster resource

Signed-off-by: Charles d'Avernas <[email protected]>

src/api/Synapse.Api.Application/Synapse.Api.Application.csproj

@@ -7,7 +7,7 @@
 	<NeutralLanguage>en</NeutralLanguage>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<Authors>The Synapse Authors</Authors>

src/api/Synapse.Api.Client.Core/Services/ISynapseApiClient.cs

@@ -34,7 +34,7 @@ public interface ISynapseApiClient
     /// <summary>
     /// Gets the Synapse API used to manage <see cref="CustomFunction"/>s
     /// </summary>
-    INamespacedResourceApiClient<CustomFunction> CustomFunctions { get; }
+    IClusterResourceApiClient<CustomFunction> CustomFunctions { get; }
 
     /// <summary>
     /// Gets the Synapse API used to manage <see cref="Document"/>s

src/api/Synapse.Api.Client.Core/Synapse.Api.Client.Core.csproj

@@ -7,7 +7,7 @@
 	<NeutralLanguage>en</NeutralLanguage>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<Authors>The Synapse Authors</Authors>

src/api/Synapse.Api.Client.Http/Services/SynapseHttpApiClient.cs

@@ -75,7 +75,7 @@ public SynapseHttpApiClient(IServiceProvider serviceProvider, ILoggerFactory log
     public INamespacedResourceApiClient<Correlator> Correlators { get; private set; } = null!;
 
     /// <inheritdoc/>
-    public INamespacedResourceApiClient<CustomFunction> CustomFunctions { get; private set; } = null!;
+    public IClusterResourceApiClient<CustomFunction> CustomFunctions { get; private set; } = null!;
 
     /// <inheritdoc/>
     public IDocumentApiClient Documents { get; }

src/api/Synapse.Api.Client.Http/Synapse.Api.Client.Http.csproj

@@ -7,7 +7,7 @@
 	<NeutralLanguage>en</NeutralLanguage>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<Authors>The Synapse Authors</Authors>

src/api/Synapse.Api.Http/Controllers/CustomFunctionsController.cs

@@ -14,13 +14,13 @@
 namespace Synapse.Api.Http.Controllers;
 
 /// <summary>
-/// Represents the <see cref="NamespacedResourceController{TResource}"/> used to manage <see cref="CustomFunction"/>s
+/// Represents the <see cref="ClusterResourceController{TResource}"/> used to manage <see cref="CustomFunction"/>s
 /// </summary>
 /// <param name="mediator">The service used to mediate calls</param>
 /// <param name="jsonSerializer">The service used to serialize/deserialize objects to/from JSON</param>
 [Route("api/v1/custom-functions")]
 public class CustomFunctionsController(IMediator mediator, IJsonSerializer jsonSerializer)
-    : NamespacedResourceController<CustomFunction>(mediator, jsonSerializer)
+    : ClusterResourceController<CustomFunction>(mediator, jsonSerializer)
 {
 
 

src/api/Synapse.Api.Http/Synapse.Api.Http.csproj

@@ -8,7 +8,7 @@
 	<OutputType>Library</OutputType>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<Authors>The Synapse Authors</Authors>

src/api/Synapse.Api.Server/Synapse.Api.Server.csproj

@@ -7,7 +7,7 @@
 	<NeutralLanguage>en</NeutralLanguage>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<Authors>The Synapse Authors</Authors>

src/cli/Synapse.Cli/Synapse.Cli.csproj

@@ -8,7 +8,7 @@
 	<NeutralLanguage>en</NeutralLanguage>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<Authors>The Synapse Authors</Authors>

src/core/Synapse.Core.Infrastructure.Containers.Docker/Synapse.Core.Infrastructure.Containers.Docker.csproj

@@ -7,7 +7,7 @@
 	<NeutralLanguage>en</NeutralLanguage>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<Authors>The Synapse Authors</Authors>

src/core/Synapse.Core.Infrastructure.Containers.Kubernetes/Synapse.Core.Infrastructure.Containers.Kubernetes.csproj

@@ -7,7 +7,7 @@
 	<NeutralLanguage>en</NeutralLanguage>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<Authors>The Synapse Authors</Authors>

src/core/Synapse.Core.Infrastructure/Synapse.Core.Infrastructure.csproj

@@ -7,7 +7,7 @@
 	<NeutralLanguage>en</NeutralLanguage>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<Authors>The Synapse Authors</Authors>

src/core/Synapse.Core/Resources/CustomFunction.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   name: custom-functions.synapse.io
 spec:
-  scope: Namespaced
+  scope: Cluster
   group: synapse.io
   names:
     plural: custom-functions

src/core/Synapse.Core/Synapse.Core.csproj

@@ -7,7 +7,7 @@
 	<NeutralLanguage>en</NeutralLanguage>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<Authors>The Synapse Authors</Authors>

src/correlator/Synapse.Correlator/Synapse.Correlator.csproj

@@ -8,7 +8,7 @@
 	<NeutralLanguage>en</NeutralLanguage>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<Authors>The Synapse Authors</Authors>

src/dashboard/Synapse.Dashboard/Components/ResourceManagement/NamespacedResourceManagementComponentStore.cs

@@ -25,8 +25,8 @@ namespace Synapse.Dashboard.Components.ResourceManagement;
 /// <param name="resourceEventHub">The <see cref="IResourceEventWatchHub"/> websocket service client</param>
 public class NamespacedResourceManagementComponentStore<TState, TResource>(ILogger<NamespacedResourceManagementComponentStore<TState, TResource>> logger, ISynapseApiClient apiClient, ResourceWatchEventHubClient resourceEventHub)
     : ResourceManagementComponentStoreBase<TState, TResource>(logger, apiClient, resourceEventHub)
-    where TResource : Resource, new()
     where TState : NamespacedResourceManagementComponentState<TResource>, new()
+    where TResource : Resource, new()
 {
 
     /// <summary>

src/dashboard/Synapse.Dashboard/Extensions/DateTimeExtensions.cs

@@ -15,7 +15,7 @@
 using moment.net.Models;
 using System.Globalization;
 
-namespace Synapse.Dashboard.Extensions;
+namespace Synapse.Dashboard;
 
 /// <summary>
 /// Provides extension methods for <see cref="DateTime"/>

src/dashboard/Synapse.Dashboard/Pages/Correlators/List/View.razor

@@ -98,10 +98,12 @@
 <ConfirmDialog @ref="Dialog" />
 
 @code {
+
     /// <inheritdoc/>
     protected override void OnInitialized()
     {
         base.OnInitialized();
         BreadcrumbManager.Use(Breadcrumbs.Correlators);
     }
+
 }

src/dashboard/Synapse.Dashboard/Pages/Functions/Create/State.cs

@@ -23,26 +23,12 @@ namespace Synapse.Dashboard.Pages.Functions.Create;
 [Feature]
 public record CreateFunctionViewState
 {
-    /// <summary>
-    /// Gets a <see cref="EquatableList{T}"/> that contains all <see cref="Neuroglia.Data.Infrastructure.ResourceOriented.Namespace"/>s
-    /// </summary>
-    public EquatableList<Namespace>? Namespaces { get; set; }
-
-    /// <summary>
-    /// Gets/sets the <see cref="CustomFunction"/>'s namespace
-    /// </summary>
-    public string? Namespace { get; set; }
 
     /// <summary>
     /// Gets/sets the <see cref="CustomFunction"/>'s name
     /// </summary>
     public string? Name { get; set; }
 
-    /// <summary>
-    /// Gets/sets the <see cref="CustomFunction"/>'s namespace, when the user is creating one
-    /// </summary>
-    public string? ChosenNamespace { get; set; }
-
     /// <summary>
     /// Gets/sets the <see cref="CustomFunction"/>'s name, when the user is creating one
     /// </summary>

src/dashboard/Synapse.Dashboard/Pages/Functions/Create/Store.cs

@@ -106,27 +106,13 @@ MonacoInterop monacoInterop
     /// </summary>
     public StandaloneCodeEditor? TextEditor { get; set; }
 
-    /// <summary>
-    /// Gets an <see cref="IObservable{T}"/> used to observe <see cref="Namespace"/>s
-    /// </summary>
-    public IObservable<EquatableList<Namespace>?> Namespaces => this.Select(s => s.Namespaces).DistinctUntilChanged();
-
     #region Selectors
-    /// <summary>
-    /// Gets an <see cref="IObservable{T}"/> used to observe <see cref="CreateFunctionViewState.Namespace"/> changes
-    /// </summary>
-    public IObservable<string?> Namespace => this.Select(state => state.Namespace).DistinctUntilChanged();
 
     /// <summary>
     /// Gets an <see cref="IObservable{T}"/> used to observe <see cref="CreateFunctionViewState.Name"/> changes
     /// </summary>
     public IObservable<string?> Name => this.Select(state => state.Name).DistinctUntilChanged();
 
-    /// <summary>
-    /// Gets an <see cref="IObservable{T}"/> used to observe <see cref="CreateFunctionViewState.ChosenNamespace"/> changes
-    /// </summary>
-    public IObservable<string?> ChosenNamespace => this.Select(state => state.ChosenNamespace).DistinctUntilChanged();
-
     /// <summary>
     /// Gets an <see cref="IObservable{T}"/> used to observe <see cref="CreateFunctionViewState.ChosenName"/> changes
     /// </summary>
@@ -203,18 +189,6 @@ MonacoInterop monacoInterop
     #endregion
 
     #region Setters
-    /// <summary>
-    /// Sets the state's <see cref="CreateFunctionViewState.Namespace"/>
-    /// </summary>
-    /// <param name="ns">The new <see cref="CreateFunctionViewState.Namespace"/> value</param>
-    public void SetNamespace(string? ns)
-    {
-        this.Reduce(state => state with
-        {
-            Namespace = ns,
-            Loading = true
-        });
-    }
 
     /// <summary>
     /// Sets the state's <see cref="CreateFunctionViewState.Name"/>
@@ -228,17 +202,6 @@ public void SetName(string? name)
             Loading = true
         });
     }
-    /// <summary>
-    /// Sets the state's <see cref="CreateFunctionViewState.ChosenNamespace"/>
-    /// </summary>
-    /// <param name="ns">The new <see cref="CreateFunctionViewState.ChosenNamespace"/> value</param>
-    public void SetChosenNamespace(string? ns)
-    {
-        this.Reduce(state => state with
-        {
-            ChosenNamespace = ns
-        });
-    }
 
     /// <summary>
     /// Sets the state's <see cref="CreateFunctionViewState.ChosenName"/>
@@ -273,14 +236,12 @@ public void SetProblemDetails(ProblemDetails? problem)
     /// <summary>
     /// Gets the <see cref="CustomFunction"/> for the specified namespace and name
     /// </summary>
-    /// <param name="namespace">The namespace the <see cref="CustomFunction"/> to create a new version of belongs to</param>
     /// <param name="name">The name of the <see cref="CustomFunction"/> to create a new version of</param>
     /// <returns>A new awaitable <see cref="Task"/></returns>
-    public async Task GetCustomFunctionAsync(string @namespace, string name)
+    public async Task GetCustomFunctionAsync(string name)
     {
-        ArgumentException.ThrowIfNullOrWhiteSpace(@namespace);
         ArgumentException.ThrowIfNullOrWhiteSpace(name);
-        var resources = await this.ApiClient.CustomFunctions.GetAsync(name, @namespace) ?? throw new NullReferenceException($"Failed to find the specified function '{name}.{@namespace}'");
+        var resources = await this.ApiClient.CustomFunctions.GetAsync(name) ?? throw new NullReferenceException($"Failed to find the specified function '{name}'");
         var version = resources.Spec.Versions.GetLatestVersion();
         var function = resources.Spec.Versions.GetLatest();
         var nextVersion = SemVersion.Parse(version, SemVersionStyles.Strict);
@@ -429,15 +390,14 @@ public async Task SaveCustomFunctionAsync()
             var function = this.MonacoEditorHelper.PreferredLanguage == PreferredLanguage.JSON ?
                 this.JsonSerializer.Deserialize<TaskDefinition>(functionText)! :
                 this.YamlSerializer.Deserialize<TaskDefinition>(functionText)!;
-            var @namespace = this.Get(state => state.Namespace) ?? this.Get(state => state.ChosenNamespace);
             var name = this.Get(state => state.Name) ?? this.Get(state => state.ChosenName);
             var version = this.Get(state => state.Version).ToString();
-            if (string.IsNullOrEmpty(name) || string.IsNullOrEmpty(@namespace))
+            if (string.IsNullOrEmpty(name))
             {
                 this.Reduce(state => state with
                 {
                     ProblemTitle = "Invalid function",
-                    ProblemDetail = "The name or namespace cannot be empty."
+                    ProblemDetail = "The name cannot be empty."
                 });
                 return;
             }
@@ -448,7 +408,7 @@ public async Task SaveCustomFunctionAsync()
             CustomFunction? resource = null;
             try
             {
-                resource = await this.ApiClient.CustomFunctions.GetAsync(name, @namespace);
+                resource = await this.ApiClient.CustomFunctions.GetAsync(name);
             }
             catch
             {
@@ -460,7 +420,6 @@ public async Task SaveCustomFunctionAsync()
                 {
                     Metadata = new()
                     {
-                        Namespace = @namespace,
                         Name = name
                     },
                     Spec = new()
@@ -478,10 +437,10 @@ public async Task SaveCustomFunctionAsync()
                 if (patch != null)
                 {
                     var resourcePatch = new Patch(PatchType.JsonPatch, jsonPatch);
-                    await this.ApiClient.ManageNamespaced<CustomFunction>().PatchAsync(name, @namespace, resourcePatch, null, this.CancellationTokenSource.Token);
+                    await this.ApiClient.ManageCluster<CustomFunction>().PatchAsync(name, resourcePatch, null, this.CancellationTokenSource.Token);
                 }
             }
-            this.NavigationManager.NavigateTo($"/functions/{@namespace}/{name}");
+            this.NavigationManager.NavigateTo($"/functions/{name}");
         }
         catch (ProblemDetailsException ex)
         {
@@ -531,9 +490,8 @@ public async Task SaveCustomFunctionAsync()
     /// <inheritdoc/>
     public override async Task InitializeAsync()
     {
-        await this.ListNamespacesAsync().ConfigureAwait(false);
         this.Function.SubscribeAsync(async definition => {
-            string document = "";
+            string document = string.Empty;
             if (definition != null)
             {
                 document = this.MonacoEditorHelper.PreferredLanguage == PreferredLanguage.JSON ?
@@ -546,14 +504,10 @@ public override async Task InitializeAsync()
             });
             await this.OnTextBasedEditorInitAsync();
         }, cancellationToken: this.CancellationTokenSource.Token);
-        Observable.CombineLatest(
-            this.Namespace.Where(ns => !string.IsNullOrWhiteSpace(ns)),
-            this.Name.Where(name => !string.IsNullOrWhiteSpace(name)),
-            (ns, name) => (ns!, name!)
-        ).SubscribeAsync(async ((string ns, string name) function) =>
-        {
-            await this.GetCustomFunctionAsync(function.ns, function.name);
-        }, cancellationToken: this.CancellationTokenSource.Token);
+        this.Name.Where(name => !string.IsNullOrWhiteSpace(name))
+            .SubscribeAsync(async name => 
+                await this.GetCustomFunctionAsync(name!), 
+                cancellationToken: this.CancellationTokenSource.Token);
         await this.SetValidationSchema();
         await base.InitializeAsync();
     }
@@ -587,19 +541,6 @@ protected async Task SetValidationSchema(string? version = null)
         this._processingVersion = false;
     }
 
-    /// <summary>
-    /// Lists all available <see cref="Namespace"/>s
-    /// </summary>
-    /// <returns>A new awaitable <see cref="Task"/></returns>
-    public virtual async Task ListNamespacesAsync()
-    {
-        var namespaceList = new EquatableList<Namespace>(await (await this.ApiClient.Namespaces.ListAsync().ConfigureAwait(false)).OrderBy(ns => ns.GetQualifiedName()).ToListAsync().ConfigureAwait(false));
-        this.Reduce(s => s with
-        {
-            Namespaces = namespaceList
-        });
-    }
-
     /// <summary>
     /// Disposes of the store
     /// </summary>