diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/CannedQueriesConfig.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/CannedQueriesConfig.cs new file mode 100644 index 000000000..90a20723e --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/CannedQueriesConfig.cs @@ -0,0 +1,5 @@ +namespace Bts.DataStreamWebApp.Server; + +public class CannedQueriesConfig { + public List? Items { get; set; } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/CannedQuery.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/CannedQuery.cs new file mode 100644 index 000000000..b24d6dab3 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/CannedQuery.cs @@ -0,0 +1,6 @@ +namespace Bts.DataStreamWebApp.Server; + +public class CannedQuery { + public string? Name { get; set; } + public List? Query { get; set; } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/CannedQueriesController.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/CannedQueriesController.cs new file mode 100644 index 000000000..dfbbc9fd5 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/CannedQueriesController.cs @@ -0,0 +1,18 @@ +namespace Bts.DataStreamWebApp.Server; + +using Microsoft.AspNetCore.Mvc; + +[ApiController] +[Route("api/[controller]")] +public class CannedQueriesController : ControllerBase { + readonly IConfiguration config; + + public CannedQueriesController(IConfiguration config) => + this.config = config; + + [HttpGet(Name = "GetCannedQueries")] + public IEnumerable? Get() { + var cannedQueries = config.GetSection("CannedQueries").Get>()?.ToArray() ?? Array.Empty(); + return cannedQueries; + } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/ConfigurationController.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/ConfigurationController.cs new file mode 100644 index 000000000..a95ab97d7 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/ConfigurationController.cs @@ -0,0 +1,22 @@ +// using Bts.DataStreamWebApp.Server; + +// using Microsoft.AspNetCore.Mvc; + +// [ApiController] +// [Route("api/[controller]")] +// public class ConfigController : ControllerBase { +// private readonly IConfiguration _configuration; + +// public ConfigController(IConfiguration configuration) { +// _configuration = configuration; +// } + +// [HttpGet("websocket")] +// public ActionResult GetWebSocketConfig() { +// var endpoint = $"{_configuration["Kestrel:Endpoints:Http:Url"]}/ws"; +// var webSocketConfig = new DataStreamWebSocketConfig { +// Endpoint = endpoint // or Https based on your setup +// }; +// return Ok(webSocketConfig); +// } +// } diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketConfig.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketConfig.cs new file mode 100644 index 000000000..89a0b0e3d --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketConfig.cs @@ -0,0 +1,5 @@ +namespace Bts.DataStreamWebApp.Server; + +public class DataStreamWebSocketConfig { + public string? Endpoint { get; set; } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/CannedQueriesResponse.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/CannedQueriesResponse.cs new file mode 100644 index 000000000..fcece04d5 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/CannedQueriesResponse.cs @@ -0,0 +1,5 @@ +namespace Bts.DataStreamWebApp.Server; + +public class CannedQueriesResponse { + public List? Items { get; set; } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Program.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Program.cs index 734ce3d4a..e3006c43d 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Program.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Program.cs @@ -48,11 +48,11 @@ static void ConfigureApp(ConfigurationManager configBuilder) { } static void ConfigureServices(IServiceCollection services, IConfiguration config) { - services.AddDirectoryBrowser(); - services.AddControllers(); - services.AddEndpointsApiExplorer(); - services.AddSwaggerGen(); - services.AddSpark(config.GetSection("Spark")) + services.AddDirectoryBrowser() + .AddControllers().Services + .AddEndpointsApiExplorer() + .AddSwaggerGen() + .AddSpark(config.GetSection("Spark")) .AddSparkApi(config.GetSection("SparkApi")) .AddMasterWorker(config.GetSection("MasterWorker")) .AddViewStreamDatabase(config.GetSection("ViewStreamDatabase"))