diff --git a/Architecture.pptx b/Architecture.pptx index 53f60de5..36bb865e 100644 Binary files a/Architecture.pptx and b/Architecture.pptx differ diff --git a/CaseManagement.sln b/CaseManagement.sln index af91bc43..6c3a3b04 100644 --- a/CaseManagement.sln +++ b/CaseManagement.sln @@ -37,6 +37,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.CMMN.AspNetC EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.Performance", "src\CaseManagement.Performance\CaseManagement.Performance.csproj", "{8EC2090C-1BF1-4557-B62E-EB088699ED8A}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.Identity", "src\CaseManagement.Identity\CaseManagement.Identity.csproj", "{93F12F7C-8657-4725-B6A8-A7AEDCEEC8CE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -91,6 +93,10 @@ Global {8EC2090C-1BF1-4557-B62E-EB088699ED8A}.Debug|Any CPU.Build.0 = Debug|Any CPU {8EC2090C-1BF1-4557-B62E-EB088699ED8A}.Release|Any CPU.ActiveCfg = Release|Any CPU {8EC2090C-1BF1-4557-B62E-EB088699ED8A}.Release|Any CPU.Build.0 = Release|Any CPU + {93F12F7C-8657-4725-B6A8-A7AEDCEEC8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93F12F7C-8657-4725-B6A8-A7AEDCEEC8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93F12F7C-8657-4725-B6A8-A7AEDCEEC8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93F12F7C-8657-4725-B6A8-A7AEDCEEC8CE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -108,6 +114,7 @@ Global {11F22F1F-2F25-4F13-9F2F-195AFC99B584} = {CD2E7CFE-4E9C-4308-A0D3-41CD5AD90FD8} {A33A6BDF-FD00-4EFE-BA3F-A73BC63CB321} = {CD2E7CFE-4E9C-4308-A0D3-41CD5AD90FD8} {8EC2090C-1BF1-4557-B62E-EB088699ED8A} = {D16A3E6D-32B6-44CF-9941-A9BDB9DFC6A7} + {93F12F7C-8657-4725-B6A8-A7AEDCEEC8CE} = {4A5D2E88-20E8-4A3F-8527-A4934BC0E11F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D2CFBF2E-D493-42F7-B339-01A3070C2B5E} diff --git a/src/CaseManagement.CMMN.AspNetCore/Apis/CaseDefinitionsController.cs b/src/CaseManagement.CMMN.AspNetCore/Apis/CaseDefinitionsController.cs index 0f2723cb..184741bb 100644 --- a/src/CaseManagement.CMMN.AspNetCore/Apis/CaseDefinitionsController.cs +++ b/src/CaseManagement.CMMN.AspNetCore/Apis/CaseDefinitionsController.cs @@ -4,6 +4,7 @@ using CaseManagement.CMMN.Persistence; using CaseManagement.CMMN.Persistence.Parameters; using CaseManagement.CMMN.Persistence.Responses; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; @@ -24,6 +25,7 @@ public CaseDefinitionsController(ICaseDefinitionQueryRepository queryRepository) } [HttpGet("count")] + [Authorize("get_statistic")] public async Task Count() { var result = await _queryRepository.Count(); @@ -34,6 +36,7 @@ public async Task Count() } [HttpGet("{id}")] + [Authorize("get_casedefinition")] public async Task Get(string id) { var result = await _queryRepository.FindById(id); @@ -46,6 +49,7 @@ public async Task Get(string id) } [HttpGet("{id}/history")] + [Authorize("get_casedefinition")] public async Task GetHistory(string id) { var result = await _queryRepository.FindHistoryById(id); @@ -62,6 +66,7 @@ public async Task GetHistory(string id) } [HttpGet("search")] + [Authorize("get_casedefinition")] public async Task Search() { var query = HttpContext.Request.Query.ToEnumerable(); diff --git a/src/CaseManagement.CMMN.AspNetCore/Apis/CaseFilesController.cs b/src/CaseManagement.CMMN.AspNetCore/Apis/CaseFilesController.cs index f9fa2107..7a873271 100644 --- a/src/CaseManagement.CMMN.AspNetCore/Apis/CaseFilesController.cs +++ b/src/CaseManagement.CMMN.AspNetCore/Apis/CaseFilesController.cs @@ -1,14 +1,19 @@ using CaseManagement.CMMN.AspNetCore.Extensions; +using CaseManagement.CMMN.CaseFile.CommandHandlers; +using CaseManagement.CMMN.CaseFile.Commands; using CaseManagement.CMMN.Domains.CaseFile; using CaseManagement.CMMN.Extensions; +using CaseManagement.CMMN.Infrastructures; using CaseManagement.CMMN.Persistence; using CaseManagement.CMMN.Persistence.Parameters; using CaseManagement.CMMN.Persistence.Responses; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using System.Collections.Generic; using System.Linq; +using System.Net; using System.Threading.Tasks; namespace CaseManagement.CMMN.AspNetCore.Apis @@ -17,13 +22,18 @@ namespace CaseManagement.CMMN.AspNetCore.Apis public class CaseFilesController : Controller { private readonly ICaseFileQueryRepository _queryRepository; + private readonly IUploadCaseFilesCommandHandler _uploadCaseFilesCommandHandler; + private readonly IAddCaseFileCommandHandler _addCaseFileCommandHandler; - public CaseFilesController(ICaseFileQueryRepository queryRepository) + public CaseFilesController(ICaseFileQueryRepository queryRepository, IUploadCaseFilesCommandHandler uploadCaseFilesCommandHandler, IAddCaseFileCommandHandler addCaseFileCommandHandler) { _queryRepository = queryRepository; + _uploadCaseFilesCommandHandler = uploadCaseFilesCommandHandler; + _addCaseFileCommandHandler = addCaseFileCommandHandler; } [HttpGet("count")] + [Authorize("get_statistic")] public async Task Count() { var result = await _queryRepository.Count(); @@ -34,6 +44,54 @@ public async Task Count() }); } + [HttpPost] + [Authorize("add_casefile")] + public async Task Create([FromBody] AddCaseFileCommand parameter) + { + try + { + parameter.NameIdentifier = this.GetNameIdentifier(); + var result = await _addCaseFileCommandHandler.Handle(parameter); + var jObj = new JObject + { + { "id", result } + }; + return new ContentResult + { + StatusCode = (int)HttpStatusCode.Created, + Content = jObj.ToString() + }; + } + catch (AggregateValidationException ex) + { + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + } + } + + [HttpPost("upload")] + [Authorize("add_casefile")] + public async Task Upload([FromBody] UploadCaseFilesCommand parameter) + { + try + { + parameter.NameIdentifier = this.GetNameIdentifier(); + var result = await _uploadCaseFilesCommandHandler.Handle(parameter); + var jObj = new JObject + { + { "ids", new JArray(result) } + }; + return new ContentResult + { + StatusCode = (int)HttpStatusCode.Created, + Content = jObj.ToString() + }; + } + catch (AggregateValidationException ex) + { + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + } + } + [HttpGet("search")] public async Task Search() { @@ -86,29 +144,18 @@ private static JObject ToDto(CaseFileDefinitionAggregate resp) private static FindCaseDefinitionFilesParameter ExtractFindParameter(IEnumerable> query) { - int startIndex; - int count; - string orderBy; - FindOrders findOrder; + string owner; + string text; var parameter = new FindCaseDefinitionFilesParameter(); - if (query.TryGet("start_index", out startIndex)) - { - parameter.StartIndex = startIndex; - } - - if (query.TryGet("count", out count)) - { - parameter.Count = count; - } - - if (query.TryGet("order_by", out orderBy)) + parameter.ExtractFindParameter(query); + if (query.TryGet("owner", out owner)) { - parameter.OrderBy = orderBy; + parameter.Owner = owner; } - if (query.TryGet("order", out findOrder)) + if (query.TryGet("text", out text)) { - parameter.Order = findOrder; + parameter.Text = text; } return parameter; diff --git a/src/CaseManagement.CMMN.AspNetCore/Apis/CaseInstancesController.cs b/src/CaseManagement.CMMN.AspNetCore/Apis/CaseInstancesController.cs index 01ee27f7..b9ed2c9c 100644 --- a/src/CaseManagement.CMMN.AspNetCore/Apis/CaseInstancesController.cs +++ b/src/CaseManagement.CMMN.AspNetCore/Apis/CaseInstancesController.cs @@ -94,7 +94,7 @@ public async Task Create([FromBody] CreateCaseInstanceCommand cre } catch (UnknownCaseDefinitionException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case definition doesn't exist" } }, HttpStatusCode.NotFound, Request); @@ -111,7 +111,7 @@ public async Task Launch(string id) } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); @@ -128,18 +128,18 @@ public async Task Suspend(string id) } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (AggregateValidationException ex) { - return ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); } catch (Exception ex) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "invalid_request", ex.Message } }, HttpStatusCode.BadRequest, Request); @@ -156,25 +156,25 @@ public async Task Suspend(string id, string elt) } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (UnknownCaseInstanceElementException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance element doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (AggregateValidationException ex) { - return ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); } catch (Exception ex) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "invalid_request", ex.Message } }, HttpStatusCode.BadRequest, Request); @@ -191,18 +191,18 @@ public async Task Reactivate(string id) } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (AggregateValidationException ex) { - return ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); } catch (Exception ex) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "invalid_request", ex.Message } }, HttpStatusCode.BadRequest, Request); @@ -220,25 +220,25 @@ public async Task Reactivate(string id, string elt) } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (UnknownCaseInstanceElementException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance element doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (AggregateValidationException ex) { - return ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); } catch (Exception ex) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "invalid_request", ex.Message } }, HttpStatusCode.BadRequest, Request); @@ -255,18 +255,18 @@ public async Task Resume(string id) } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (AggregateValidationException ex) { - return ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); } catch (Exception ex) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "invalid_request", ex.Message } }, HttpStatusCode.BadRequest, Request); @@ -283,25 +283,25 @@ public async Task Resume(string id, string elt) } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (UnknownCaseInstanceElementException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance element doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (AggregateValidationException ex) { - return ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); } catch (Exception ex) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "invalid_request", ex.Message } }, HttpStatusCode.BadRequest, Request); @@ -318,25 +318,25 @@ public async Task Terminate(string id) } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (UnknownCaseInstanceElementException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance element doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (AggregateValidationException ex) { - return ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); } catch (Exception ex) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "invalid_request", ex.Message } }, HttpStatusCode.BadRequest, Request); @@ -353,25 +353,25 @@ public async Task Terminate(string id, string elt) } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (UnknownCaseInstanceElementException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance element doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (AggregateValidationException ex) { - return ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); } catch (Exception ex) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "invalid_request", ex.Message } }, HttpStatusCode.BadRequest, Request); @@ -388,18 +388,18 @@ public async Task Close(string id) } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (AggregateValidationException ex) { - return ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); } catch (Exception ex) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "invalid_request", ex.Message } }, HttpStatusCode.BadRequest, Request); @@ -417,32 +417,32 @@ public async Task ConfirmForm(string id, string elt, [FromBody] J } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (UnknownCaseInstanceElementException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance element doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (AggregateValidationException ex) { - return ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); } catch (UnauthorizedCaseWorkerException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "unauthorized_request", "you're not authorized to confirm the human task" } }, HttpStatusCode.Unauthorized, Request); } catch (Exception ex) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "invalid_request", ex.Message } }, HttpStatusCode.BadRequest, Request); @@ -459,25 +459,25 @@ public async Task Activate(string id, string elt) } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (UnknownCaseInstanceElementException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance element doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (AggregateValidationException ex) { - return ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); } catch (Exception ex) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "invalid_request", ex.Message } }, HttpStatusCode.BadRequest, Request); @@ -495,32 +495,32 @@ public async Task ConfirmPlanItem(string id, string elt) } catch (UnknownCaseInstanceException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case instance doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (UnknownCaseElementDefinitionException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "bad_request", "case element doesn't exist" } }, HttpStatusCode.NotFound, Request); } catch (UnauthorizedCaseWorkerException) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "unauthorized_request", "you're not authorized to confirm the human task" } }, HttpStatusCode.Unauthorized, Request); } catch (AggregateValidationException ex) { - return ToError(ex.Errors, HttpStatusCode.BadRequest, Request); + return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request); } catch (Exception ex) { - return ToError(new Dictionary + return this.ToError(new Dictionary { { "invalid_request", ex.Message } }, HttpStatusCode.BadRequest, Request); @@ -670,25 +670,6 @@ private static JObject ToDto(CaseInstanceExecutionContext context) return jObj; } - private static ActionResult ToError(ICollection> errors, HttpStatusCode statusCode, HttpRequest request) - { - var problemDetails = new ValidationProblemDetails - { - Instance = request.Path, - Status = (int)statusCode, - Detail = "Please refer to the errors property for additional details." - }; - foreach (var kvp in errors.GroupBy(e => e.Key)) - { - problemDetails.Errors.Add(kvp.Key, kvp.Select(s => s.Value).ToArray()); - } - - return new BadRequestObjectResult(problemDetails) - { - StatusCode = (int)statusCode - }; - } - private static FindWorkflowInstanceParameter ExtractFindParameter(IEnumerable> query) { diff --git a/src/CaseManagement.CMMN.AspNetCore/Apis/StatisticsController.cs b/src/CaseManagement.CMMN.AspNetCore/Apis/StatisticsController.cs index bc9881f1..d24d6429 100644 --- a/src/CaseManagement.CMMN.AspNetCore/Apis/StatisticsController.cs +++ b/src/CaseManagement.CMMN.AspNetCore/Apis/StatisticsController.cs @@ -4,6 +4,7 @@ using CaseManagement.CMMN.Persistence; using CaseManagement.CMMN.Persistence.Parameters; using CaseManagement.CMMN.Persistence.Responses; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; @@ -25,6 +26,7 @@ public StatisticsController(IStatisticQueryRepository statisticQueryRepository) } [HttpGet] + [Authorize("get_statistic")] public async Task Get() { var currentDateTime = DateTime.UtcNow.Date; @@ -50,6 +52,7 @@ public async Task Get() } [HttpGet("search")] + [Authorize("get_statistic")] public async Task Search() { var query = HttpContext.Request.Query.ToEnumerable(); @@ -58,6 +61,7 @@ public async Task Search() } [HttpGet("performances")] + [Authorize("get_performance")] public async Task GetPerformances() { var result = await _statisticQueryRepository.GetMachineNames(); @@ -65,6 +69,7 @@ public async Task GetPerformances() } [HttpGet("performances/search")] + [Authorize("get_performance")] public async Task SearchPerformances() { var query = HttpContext.Request.Query.ToEnumerable(); @@ -82,6 +87,7 @@ private static JObject ToDto(FindResponse resp) { "content", new JArray(resp.Content.Select(r => ToDto(r))) } }; } + private static JObject ToDto(FindResponse resp) { return new JObject diff --git a/src/CaseManagement.CMMN.AspNetCore/Extensions/ControllerExtensions.cs b/src/CaseManagement.CMMN.AspNetCore/Extensions/ControllerExtensions.cs index 7521caec..1ae782c1 100644 --- a/src/CaseManagement.CMMN.AspNetCore/Extensions/ControllerExtensions.cs +++ b/src/CaseManagement.CMMN.AspNetCore/Extensions/ControllerExtensions.cs @@ -1,5 +1,8 @@ -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using System.Collections.Generic; using System.Linq; +using System.Net; using System.Security.Claims; namespace CaseManagement.CMMN.AspNetCore.Extensions @@ -10,5 +13,24 @@ public static string GetNameIdentifier(this Controller controller) { return (controller.User.Identity as ClaimsIdentity).Claims.First(c => c.Type == ClaimTypes.NameIdentifier).Value; } + + public static ActionResult ToError(this Controller controller, ICollection> errors, HttpStatusCode statusCode, HttpRequest request) + { + var problemDetails = new ValidationProblemDetails + { + Instance = request.Path, + Status = (int)statusCode, + Detail = "Please refer to the errors property for additional details." + }; + foreach (var kvp in errors.GroupBy(e => e.Key)) + { + problemDetails.Errors.Add(kvp.Key, kvp.Select(s => s.Value).ToArray()); + } + + return new BadRequestObjectResult(problemDetails) + { + StatusCode = (int)statusCode + }; + } } } \ No newline at end of file diff --git a/src/CaseManagement.CMMN.Host/CaseManagement.CMMN.Host.csproj b/src/CaseManagement.CMMN.Host/CaseManagement.CMMN.Host.csproj index 1433f0e9..7d14a8e5 100644 --- a/src/CaseManagement.CMMN.Host/CaseManagement.CMMN.Host.csproj +++ b/src/CaseManagement.CMMN.Host/CaseManagement.CMMN.Host.csproj @@ -43,5 +43,8 @@ PreserveNewest + + Always + diff --git a/src/CaseManagement.CMMN.Host/Startup.cs b/src/CaseManagement.CMMN.Host/Startup.cs index 0cf7e889..a313c774 100644 --- a/src/CaseManagement.CMMN.Host/Startup.cs +++ b/src/CaseManagement.CMMN.Host/Startup.cs @@ -3,18 +3,21 @@ using CaseManagement.CMMN.AspNetCore; using CaseManagement.CMMN.Domains; using CaseManagement.CMMN.Host.Delegates; -using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using Microsoft.IdentityModel.Tokens; +using Newtonsoft.Json; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Security.Cryptography; namespace CaseManagement.CMMN.Host { @@ -32,10 +35,33 @@ public Startup(IHostingEnvironment env, IConfiguration configuration) public void ConfigureServices(IServiceCollection services) { services.AddMvc(); - services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(); + services.AddAuthentication(options => + { + options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; + options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; + }) + .AddJwtBearer(options => + { + options.TokenValidationParameters = new TokenValidationParameters + { + IssuerSigningKey = ExtractKey("openid_puk.txt"), + ValidAudiences = new List + { + "http://localhost:60000" + }, + ValidIssuers = new List + { + "http://localhost:60000" + } + }; + }); services.AddAuthorization(policy => { policy.AddPolicy("IsConnected", p => p.RequireAuthenticatedUser()); + policy.AddPolicy("get_statistic", p => p.RequireRole("admin")); + policy.AddPolicy("get_performance", p => p.RequireRole("admin")); + policy.AddPolicy("get_casedefinition", p => p.RequireRole("businessanalyst")); + policy.AddPolicy("add_casefile", p => p.RequireRole("businessanalyst")); }); services.AddCors(options => options.AddPolicy("AllowAll", p => p.AllowAnyOrigin() .AllowAnyMethod() @@ -136,5 +162,21 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseCors("AllowAll"); app.UseMvc(); } + + private RsaSecurityKey ExtractKey(string fileName) + { + var json = File.ReadAllText(Path.Combine(_env.ContentRootPath, fileName)); + var dic = JsonConvert.DeserializeObject>(json); + using (var rsa = RSA.Create()) + { + var rsaParameters = new RSAParameters + { + Modulus = Convert.FromBase64String(dic["n"].ToString()), + Exponent = Convert.FromBase64String(dic["e"].ToString()) + }; + rsa.ImportParameters(rsaParameters); + return new RsaSecurityKey(rsa); + } + } } } \ No newline at end of file diff --git a/src/CaseManagement.CMMN.Host/openid_puk.txt b/src/CaseManagement.CMMN.Host/openid_puk.txt new file mode 100644 index 00000000..f15a5f51 --- /dev/null +++ b/src/CaseManagement.CMMN.Host/openid_puk.txt @@ -0,0 +1,4 @@ +{ + "n":"3JsFC7E93xAShgnNp9dDWJPOHjJYLGPX464AfKW9gOB5CGD2uIYiP9m6yuZd73Z334RhQw616IMYijAvtpK25Nkk91KoAvrRoUGv2bl6pmX2JwUjwqe+lbmop4Rj9tzC2UBrGPcWSbIMNLaHkUrqR15DwVdFkG19QBwo9X6gOjCgSDvV0OY7vmwq1M3j2YmDwWnyTXh92wnUn2Hg57mVNZCX8RgdhdaWR6tiFP3QtgEYzZEulOGP6PKilqSr7E6Smg7mUNy6JTRkMGm1KZHTAY6HuNG5PPq0DUmsg8YMmsGEQPHMjw7IdaPxO0qy0aC1fiLj8NgWBOJ6bgrck55vfQ==", + "e":"AQAB" +} \ No newline at end of file diff --git a/src/CaseManagement.CMMN/CMMNServerOptions.cs b/src/CaseManagement.CMMN/CMMNServerOptions.cs index dfa640f3..724f1942 100644 --- a/src/CaseManagement.CMMN/CMMNServerOptions.cs +++ b/src/CaseManagement.CMMN/CMMNServerOptions.cs @@ -9,6 +9,28 @@ public CMMNServerOptions() BlockThreadMS = 20; MaxNbPerformanceRecords = 10; SnapshotFrequency = 100; + DefaultCMMNSchema = "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + ""; } /// @@ -31,5 +53,9 @@ public CMMNServerOptions() /// Set the snapshot frequency. /// public int SnapshotFrequency { get; set; } + /// + /// Default CMMN schema used when adding a default case file. + /// + public string DefaultCMMNSchema { get; set; } } } diff --git a/src/CaseManagement.CMMN/CaseFile/CommandHandlers/AddCaseFileCommandHandler.cs b/src/CaseManagement.CMMN/CaseFile/CommandHandlers/AddCaseFileCommandHandler.cs new file mode 100644 index 00000000..65c7570a --- /dev/null +++ b/src/CaseManagement.CMMN/CaseFile/CommandHandlers/AddCaseFileCommandHandler.cs @@ -0,0 +1,72 @@ +using CaseManagement.CMMN.CaseFile.Commands; +using CaseManagement.CMMN.Domains.CaseFile; +using CaseManagement.CMMN.Infrastructures; +using CaseManagement.CMMN.Parser; +using CaseManagement.CMMN.Persistence; +using Microsoft.Extensions.Options; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace CaseManagement.CMMN.CaseFile.CommandHandlers +{ + public class AddCaseFileCommandHandler : IAddCaseFileCommandHandler + { + private readonly CMMNServerOptions _options; + private readonly ICaseDefinitionCommandRepository _caseDefinitionCommandRepository; + private readonly ICaseFileCommandRepository _caseFileCommandRepository; + + public AddCaseFileCommandHandler(IOptions options, ICaseDefinitionCommandRepository caseDefinitionCommandRepository, ICaseFileCommandRepository caseFileCommandRepository) + { + _options = options.Value; + _caseDefinitionCommandRepository = caseDefinitionCommandRepository; + _caseFileCommandRepository = caseFileCommandRepository; + } + + public async Task Handle(AddCaseFileCommand uploadCaseFileCommand) + { + Validate(uploadCaseFileCommand); + var caseFileId = Guid.NewGuid().ToString(); + var tDefinitions = CMMNParser.ParseWSDL(_options.DefaultCMMNSchema); + foreach (var record in CMMNParser.ExtractWorkflowDefinition(tDefinitions, caseFileId)) + { + record.CaseOwner = uploadCaseFileCommand.NameIdentifier; + _caseDefinitionCommandRepository.Add(record); + } + + _caseFileCommandRepository.Add(new CaseFileDefinitionAggregate + { + Id = caseFileId, + CreateDateTime = DateTime.UtcNow, + Description = uploadCaseFileCommand.Description, + Name = uploadCaseFileCommand.Name, + Payload = _options.DefaultCMMNSchema, + Owner = uploadCaseFileCommand.NameIdentifier + }); + + await _caseDefinitionCommandRepository.SaveChanges(); + await _caseFileCommandRepository.SaveChanges(); + return caseFileId; + } + + private void Validate(AddCaseFileCommand addCaseFileCommand) + { + var errors = new Dictionary(); + if (string.IsNullOrWhiteSpace(addCaseFileCommand.Name)) + { + throw new AggregateValidationException(new Dictionary + { + { "validation", "name must be specified" } + }); + } + + if (string.IsNullOrWhiteSpace(addCaseFileCommand.Description)) + { + throw new AggregateValidationException(new Dictionary + { + { "validation", "description must be specified" } + }); + } + } + } +} diff --git a/src/CaseManagement.CMMN/CaseFile/CommandHandlers/IAddCaseFileCommandHandler.cs b/src/CaseManagement.CMMN/CaseFile/CommandHandlers/IAddCaseFileCommandHandler.cs new file mode 100644 index 00000000..a7815f8b --- /dev/null +++ b/src/CaseManagement.CMMN/CaseFile/CommandHandlers/IAddCaseFileCommandHandler.cs @@ -0,0 +1,10 @@ +using CaseManagement.CMMN.CaseFile.Commands; +using System.Threading.Tasks; + +namespace CaseManagement.CMMN.CaseFile.CommandHandlers +{ + public interface IAddCaseFileCommandHandler + { + Task Handle(AddCaseFileCommand uploadCaseFileCommand); + } +} diff --git a/src/CaseManagement.CMMN/CaseFile/CommandHandlers/IUploadCaseFilesCommandHandler.cs b/src/CaseManagement.CMMN/CaseFile/CommandHandlers/IUploadCaseFilesCommandHandler.cs new file mode 100644 index 00000000..f7c4e97e --- /dev/null +++ b/src/CaseManagement.CMMN/CaseFile/CommandHandlers/IUploadCaseFilesCommandHandler.cs @@ -0,0 +1,11 @@ +using CaseManagement.CMMN.CaseFile.Commands; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace CaseManagement.CMMN.CaseFile.CommandHandlers +{ + public interface IUploadCaseFilesCommandHandler + { + Task> Handle(UploadCaseFilesCommand uploadCaseFilesCommand); + } +} diff --git a/src/CaseManagement.CMMN/CaseFile/CommandHandlers/UploadCaseFilesCommandHandler.cs b/src/CaseManagement.CMMN/CaseFile/CommandHandlers/UploadCaseFilesCommandHandler.cs new file mode 100644 index 00000000..5e5234d2 --- /dev/null +++ b/src/CaseManagement.CMMN/CaseFile/CommandHandlers/UploadCaseFilesCommandHandler.cs @@ -0,0 +1,84 @@ +using CaseManagement.CMMN.CaseFile.Commands; +using CaseManagement.CMMN.Domains.CaseFile; +using CaseManagement.CMMN.Infrastructures; +using CaseManagement.CMMN.Parser; +using CaseManagement.CMMN.Persistence; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CaseManagement.CMMN.CaseFile.CommandHandlers +{ + public class UploadCaseFilesCommandHandler : IUploadCaseFilesCommandHandler + { + private readonly ICaseDefinitionCommandRepository _caseDefinitionCommandRepository; + private readonly ICaseFileCommandRepository _caseFileCommandRepository; + + public UploadCaseFilesCommandHandler(ICaseDefinitionCommandRepository caseDefinitionCommandRepository, ICaseFileCommandRepository caseFileCommandRepository) + { + _caseDefinitionCommandRepository = caseDefinitionCommandRepository; + _caseFileCommandRepository = caseFileCommandRepository; + } + + public async Task> Handle(UploadCaseFilesCommand uploadCaseFilesCommand) + { + var result = new List(); + var tDefinitionsLst = Validate(uploadCaseFilesCommand); + foreach(var kvp in tDefinitionsLst) + { + var caseFileId = Guid.NewGuid().ToString(); + var caseDefinitionLst = CMMNParser.ExtractWorkflowDefinition(kvp.Value, caseFileId); + foreach(var cd in caseDefinitionLst) + { + cd.CaseOwner = uploadCaseFilesCommand.NameIdentifier; + _caseDefinitionCommandRepository.Add(cd); + } + + _caseFileCommandRepository.Add(new CaseFileDefinitionAggregate + { + Id = caseFileId, + CreateDateTime = DateTime.UtcNow, + Description = kvp.Key.Name, + Name = kvp.Key.Name, + Payload = kvp.Key.Content, + Owner = uploadCaseFilesCommand.NameIdentifier + }); + result.Add(caseFileId); + } + + await _caseFileCommandRepository.SaveChanges(); + await _caseDefinitionCommandRepository.SaveChanges(); + return result; + } + + private Dictionary Validate(UploadCaseFilesCommand uploadCaseFilesCommand) + { + if (uploadCaseFilesCommand.Files == null || !uploadCaseFilesCommand.Files.Any()) + { + throw new AggregateValidationException(new Dictionary + { + { "validation", "at least one file must be passed" } + }); + } + + var result = new Dictionary(); + try + { + foreach (var file in uploadCaseFilesCommand.Files) + { + result.Add(file, CMMNParser.ParseWSDL(file.Content)); + } + } + catch + { + throw new AggregateValidationException(new Dictionary + { + { "validation", "at least one file is not correct" } + }); + } + + return result; + } + } +} diff --git a/src/CaseManagement.CMMN/CaseFile/Commands/AddCaseFileCommand.cs b/src/CaseManagement.CMMN/CaseFile/Commands/AddCaseFileCommand.cs new file mode 100644 index 00000000..925bfe50 --- /dev/null +++ b/src/CaseManagement.CMMN/CaseFile/Commands/AddCaseFileCommand.cs @@ -0,0 +1,14 @@ +using System.Runtime.Serialization; + +namespace CaseManagement.CMMN.CaseFile.Commands +{ + [DataContract] + public class AddCaseFileCommand + { + [DataMember(Name = "name")] + public string Name { get; set; } + [DataMember(Name = "description")] + public string Description { get; set; } + public string NameIdentifier { get; set; } + } +} diff --git a/src/CaseManagement.CMMN/CaseFile/Commands/UploadCaseFilesCommand.cs b/src/CaseManagement.CMMN/CaseFile/Commands/UploadCaseFilesCommand.cs new file mode 100644 index 00000000..f10251f4 --- /dev/null +++ b/src/CaseManagement.CMMN/CaseFile/Commands/UploadCaseFilesCommand.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; +using System.Runtime.Serialization; + +namespace CaseManagement.CMMN.CaseFile.Commands +{ + [DataContract] + public class UploadCaseFile + { + [DataMember(Name = "name")] + public string Name { get; set; } + [DataMember(Name = "content")] + public string Content { get; set; } + } + + [DataContract] + public class UploadCaseFilesCommand + { + public UploadCaseFilesCommand() + { + Files = new List(); + } + + public string NameIdentifier { get; set; } + [DataMember(Name = "files")] + public IEnumerable Files { get; set; } + } +} diff --git a/src/CaseManagement.CMMN/Domains/CaseDefinition/ApplicabilityRule.cs b/src/CaseManagement.CMMN/Domains/CaseDefinition/ApplicabilityRule.cs index 5926361a..2f5e151c 100644 --- a/src/CaseManagement.CMMN/Domains/CaseDefinition/ApplicabilityRule.cs +++ b/src/CaseManagement.CMMN/Domains/CaseDefinition/ApplicabilityRule.cs @@ -1,6 +1,8 @@ -namespace CaseManagement.CMMN.Domains +using System; + +namespace CaseManagement.CMMN.Domains { - public class ApplicabilityRule + public class ApplicabilityRule : ICloneable { /// /// The name of the ApplicabilityRule. @@ -17,5 +19,15 @@ public class ApplicabilityRule /// for planning based on the TableItem). /// public string Expression { get; set; } + + public object Clone() + { + return new ApplicabilityRule + { + Name = Name, + ContextRef = ContextRef, + Expression = Expression + }; + } } } diff --git a/src/CaseManagement.CMMN/Domains/CaseDefinition/CaseDefinition.cs b/src/CaseManagement.CMMN/Domains/CaseDefinition/CaseDefinition.cs index 87f902b8..7bb931c7 100644 --- a/src/CaseManagement.CMMN/Domains/CaseDefinition/CaseDefinition.cs +++ b/src/CaseManagement.CMMN/Domains/CaseDefinition/CaseDefinition.cs @@ -4,7 +4,7 @@ namespace CaseManagement.CMMN.Domains { - public class CaseDefinition + public class CaseDefinition : ICloneable { public CaseDefinition(string id, string name, string description, ICollection elements) { @@ -13,7 +13,6 @@ public CaseDefinition(string id, string name, string description, ICollection(); - CaseInstanceIds = new List(); } public string Id { get; set; } @@ -21,7 +20,6 @@ public CaseDefinition(string id, string name, string description, ICollection CaseInstanceIds { get; set; } public DateTime CreateDateTime { get; set; } public ICollection ExitCriterias { get; set; } public ICollection Elements { get; set; } @@ -62,5 +60,32 @@ private CaseElementDefinition GetElement(ICollection elem return null; } + + public object Clone() + { + return new CaseDefinition(Id, Name, Description, Elements.Select(e => (CaseElementDefinition)e.Clone()).ToList()) + { + CaseFileId = CaseFileId, + CaseOwner = CaseOwner, + ExitCriterias = ExitCriterias.Select(e => (Criteria)e.Clone()).ToList(), + CreateDateTime = CreateDateTime + }; + } + + public override bool Equals(object obj) + { + var target = obj as CaseDefinition; + if (target == null) + { + return false; + } + + return target.GetHashCode() == GetHashCode(); + } + + public override int GetHashCode() + { + return Id.GetHashCode(); + } } } diff --git a/src/CaseManagement.CMMN/Domains/CaseDefinition/CaseElementDefinition.cs b/src/CaseManagement.CMMN/Domains/CaseDefinition/CaseElementDefinition.cs index 08ee7beb..0837a8cc 100644 --- a/src/CaseManagement.CMMN/Domains/CaseDefinition/CaseElementDefinition.cs +++ b/src/CaseManagement.CMMN/Domains/CaseDefinition/CaseElementDefinition.cs @@ -1,8 +1,10 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.Linq; namespace CaseManagement.CMMN.Domains { - public class CaseElementDefinition + public class CaseElementDefinition : ICloneable { public CaseElementDefinition(string id, string name) { @@ -34,6 +36,21 @@ public CaseElementDefinition(string id, string name) /// Get or set the table item. /// public TableItem TableItem { get; set; } + + public object Clone() + { + return new CaseElementDefinition(Id, Name) + { + Type = Type, + ActivationRule = ActivationRule, + ManualActivationRule = ManualActivationRule == null ? null : (ManualActivationRule)ManualActivationRule.Clone(), + RepetitionRule = RepetitionRule == null ? null : (RepetitionRule)RepetitionRule.Clone(), + EntryCriterions = EntryCriterions.Select(e => (Criteria)e.Clone()).ToList(), + ExitCriterions = ExitCriterions.Select(e => (Criteria)e.Clone()).ToList(), + TableItem = TableItem == null ? null : (TableItem)TableItem.Clone() + }; + } + public bool IsDiscrete() { return TableItem != null; diff --git a/src/CaseManagement.CMMN/Domains/CaseDefinition/TableItem.cs b/src/CaseManagement.CMMN/Domains/CaseDefinition/TableItem.cs index 12482787..a69ceb35 100644 --- a/src/CaseManagement.CMMN/Domains/CaseDefinition/TableItem.cs +++ b/src/CaseManagement.CMMN/Domains/CaseDefinition/TableItem.cs @@ -1,6 +1,8 @@ -namespace CaseManagement.CMMN.Domains +using System; + +namespace CaseManagement.CMMN.Domains { - public class TableItem + public class TableItem : ICloneable { public TableItem() { @@ -16,5 +18,14 @@ public TableItem() /// If the condition of the ApplicabilityRule object evaluates to "true" then the TableItem is applicable for planning, otherwise it is not. /// public ApplicabilityRule ApplicabilityRuleRef { get; set; } + + public object Clone() + { + return new TableItem + { + AuthorizedRoleRef = AuthorizedRoleRef, + ApplicabilityRuleRef = ApplicabilityRuleRef == null ? null : (ApplicabilityRule)ApplicabilityRuleRef.Clone() + }; + } } } \ No newline at end of file diff --git a/src/CaseManagement.CMMN/Domains/CaseFileDefinition/CaseFileDefinitionAggregate.cs b/src/CaseManagement.CMMN/Domains/CaseFileDefinition/CaseFileDefinitionAggregate.cs index 66828605..e310b406 100644 --- a/src/CaseManagement.CMMN/Domains/CaseFileDefinition/CaseFileDefinitionAggregate.cs +++ b/src/CaseManagement.CMMN/Domains/CaseFileDefinition/CaseFileDefinitionAggregate.cs @@ -2,12 +2,31 @@ namespace CaseManagement.CMMN.Domains.CaseFile { - public class CaseFileDefinitionAggregate + public class CaseFileDefinitionAggregate : ICloneable { public string Id { get; set; } public string Name { get; set; } public string Description { get; set; } public DateTime CreateDateTime { get; set; } public string Payload { get; set; } + public string Owner { get; set; } + + public object Clone() + { + return new CaseFileDefinitionAggregate + { + Id = Id, + Name = Name, + Description = Description, + CreateDateTime = CreateDateTime, + Payload = Payload, + Owner = Owner + }; + } + + public override int GetHashCode() + { + return Id.GetHashCode(); + } } } \ No newline at end of file diff --git a/src/CaseManagement.CMMN/Parser/CMMNParser.cs b/src/CaseManagement.CMMN/Parser/CMMNParser.cs index 3beeab0b..da4dd440 100644 --- a/src/CaseManagement.CMMN/Parser/CMMNParser.cs +++ b/src/CaseManagement.CMMN/Parser/CMMNParser.cs @@ -17,11 +17,17 @@ public static ICollection ExtractWorkflowDefinition(string path) var fileName = Path.GetFileName(path); var result = new List(); var definitions = ParseWSDL(cmmnTxt); - foreach(var cmmnCase in definitions.@case) + return ExtractWorkflowDefinition(definitions, fileName); + } + + public static ICollection ExtractWorkflowDefinition(tDefinitions definitions, string caseFileId) + { + var result = new List(); + foreach (var cmmnCase in definitions.@case) { - result.Add(BuildWorkflowDefinition(cmmnCase, definitions, fileName)); + result.Add(BuildWorkflowDefinition(cmmnCase, definitions, caseFileId)); } - + return result; } diff --git a/src/CaseManagement.CMMN/Persistence/ICaseDefinitionCommandRepository.cs b/src/CaseManagement.CMMN/Persistence/ICaseDefinitionCommandRepository.cs index 974f5b68..f3558bac 100644 --- a/src/CaseManagement.CMMN/Persistence/ICaseDefinitionCommandRepository.cs +++ b/src/CaseManagement.CMMN/Persistence/ICaseDefinitionCommandRepository.cs @@ -8,6 +8,7 @@ public interface ICaseDefinitionCommandRepository void Update(CaseDefinition workflowDefinition); void Update(CaseDefinitionHistoryAggregate cmmnWorkflowDefinitionStatisticAggregate); void Add(CaseDefinitionHistoryAggregate cmmnWorkflowDefinitionStatisticAggregate); + void Add(CaseDefinition workflowDefinition); Task SaveChanges(); } } diff --git a/src/CaseManagement.CMMN/Persistence/ICaseFileCommandRepository.cs b/src/CaseManagement.CMMN/Persistence/ICaseFileCommandRepository.cs new file mode 100644 index 00000000..2cbf62a3 --- /dev/null +++ b/src/CaseManagement.CMMN/Persistence/ICaseFileCommandRepository.cs @@ -0,0 +1,13 @@ +using CaseManagement.CMMN.Domains.CaseFile; +using System.Threading.Tasks; + +namespace CaseManagement.CMMN.Persistence +{ + public interface ICaseFileCommandRepository + { + void Delete(CaseFileDefinitionAggregate caseFile); + void Add(CaseFileDefinitionAggregate caseFile); + void Update(CaseFileDefinitionAggregate caseFile); + Task SaveChanges(); + } +} diff --git a/src/CaseManagement.CMMN/Persistence/InMemory/InMemoryCaseDefinitionCommandRepository.cs b/src/CaseManagement.CMMN/Persistence/InMemory/InMemoryCaseDefinitionCommandRepository.cs index 14163d8b..a7ac56e5 100644 --- a/src/CaseManagement.CMMN/Persistence/InMemory/InMemoryCaseDefinitionCommandRepository.cs +++ b/src/CaseManagement.CMMN/Persistence/InMemory/InMemoryCaseDefinitionCommandRepository.cs @@ -19,7 +19,14 @@ public InMemoryCaseDefinitionCommandRepository(ConcurrentBag cas public void Update(CaseDefinition workflowDefinition) { - throw new System.NotImplementedException(); + var wf = _caseDefinitions.First(w => w.Id == workflowDefinition.Id); + _caseDefinitions.Remove(wf); + _caseDefinitions.Add((CaseDefinition)wf.Clone()); + } + + public void Add(CaseDefinition workflowDefinition) + { + _caseDefinitions.Add((CaseDefinition)workflowDefinition.Clone()); } public void Add(CaseDefinitionHistoryAggregate caseDefinitionHistory) diff --git a/src/CaseManagement.CMMN/Persistence/InMemory/InMemoryCaseFileCommandRepository.cs b/src/CaseManagement.CMMN/Persistence/InMemory/InMemoryCaseFileCommandRepository.cs new file mode 100644 index 00000000..7e21fa81 --- /dev/null +++ b/src/CaseManagement.CMMN/Persistence/InMemory/InMemoryCaseFileCommandRepository.cs @@ -0,0 +1,39 @@ +using CaseManagement.CMMN.Domains.CaseFile; +using CaseManagement.CMMN.Extensions; +using System.Collections.Concurrent; +using System.Linq; +using System.Threading.Tasks; + +namespace CaseManagement.CMMN.Persistence.InMemory +{ + public class InMemoryCaseFileCommandRepository : ICaseFileCommandRepository + { + private readonly ConcurrentBag _caseFiles; + + public InMemoryCaseFileCommandRepository(ConcurrentBag caseFiles) + { + _caseFiles = caseFiles; + } + + public void Delete(CaseFileDefinitionAggregate caseFile) + { + _caseFiles.Remove(_caseFiles.First(a => a.Id == caseFile.Id)); + } + + public void Add(CaseFileDefinitionAggregate caseFile) + { + _caseFiles.Add((CaseFileDefinitionAggregate)caseFile.Clone()); + } + + public void Update(CaseFileDefinitionAggregate caseFile) + { + _caseFiles.Remove(_caseFiles.First(a => a.Id == caseFile.Id)); + _caseFiles.Add((CaseFileDefinitionAggregate)caseFile.Clone()); + } + + public Task SaveChanges() + { + return Task.FromResult(1); + } + } +} diff --git a/src/CaseManagement.CMMN/Persistence/InMemory/InMemoryCaseFileQueryRepository.cs b/src/CaseManagement.CMMN/Persistence/InMemory/InMemoryCaseFileQueryRepository.cs index c2600dc7..042f4903 100644 --- a/src/CaseManagement.CMMN/Persistence/InMemory/InMemoryCaseFileQueryRepository.cs +++ b/src/CaseManagement.CMMN/Persistence/InMemory/InMemoryCaseFileQueryRepository.cs @@ -2,6 +2,8 @@ using CaseManagement.CMMN.Extensions; using CaseManagement.CMMN.Persistence.Parameters; using CaseManagement.CMMN.Persistence.Responses; +using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -16,9 +18,9 @@ public class InMemoryCaseFileQueryRepository : ICaseFileQueryRepository { "name", "Name" }, { "description", "Description" } }; - private ICollection _caseFileDefinitions; + private ConcurrentBag _caseFileDefinitions; - public InMemoryCaseFileQueryRepository(ICollection caseFileDefinitions) + public InMemoryCaseFileQueryRepository(ConcurrentBag caseFileDefinitions) { _caseFileDefinitions = caseFileDefinitions; } @@ -36,6 +38,16 @@ public Task> Find(FindCaseDefinitionFi result = result.InvokeOrderBy(MAPPING_WORKFLOWDEFINITIONFILE_TO_PROPERTYNAME[parameter.OrderBy], parameter.Order); } + if (!string.IsNullOrWhiteSpace(parameter.Owner)) + { + result = result.Where(r => r.Owner == parameter.Owner); + } + + if (!string.IsNullOrWhiteSpace(parameter.Text)) + { + result = result.Where(r => r.Name.IndexOf(parameter.Text, StringComparison.InvariantCultureIgnoreCase) >= 0); + } + int totalLength = result.Count(); result = result.Skip(parameter.StartIndex).Take(parameter.Count); return Task.FromResult(new FindResponse diff --git a/src/CaseManagement.CMMN/Persistence/Parameters/BaseFindParameter.cs b/src/CaseManagement.CMMN/Persistence/Parameters/BaseFindParameter.cs index b761acb8..2cf5b073 100644 --- a/src/CaseManagement.CMMN/Persistence/Parameters/BaseFindParameter.cs +++ b/src/CaseManagement.CMMN/Persistence/Parameters/BaseFindParameter.cs @@ -14,5 +14,7 @@ public BaseFindParameter() public int Count { get; set; } public FindOrders Order { get; set; } public string OrderBy { get; set; } + public string Owner { get; set; } + public string Text { get; set; } } } diff --git a/src/CaseManagement.CMMN/ServerBuilder.cs b/src/CaseManagement.CMMN/ServerBuilder.cs index 4788c93b..9848a9a6 100644 --- a/src/CaseManagement.CMMN/ServerBuilder.cs +++ b/src/CaseManagement.CMMN/ServerBuilder.cs @@ -23,7 +23,7 @@ public ServerBuilder(IServiceCollection services) public ServerBuilder AddDefinitions(List pathLst) { - var caseFiles = new List(); + var caseFiles = new ConcurrentBag(); var caseDefinitions = new ConcurrentBag(); var caseDefinitionHistories = new ConcurrentBag(); foreach(var path in pathLst) @@ -46,6 +46,7 @@ public ServerBuilder AddDefinitions(List pathLst) } _services.TryUpdateSingleton(new InMemoryCaseFileQueryRepository(caseFiles)); + _services.TryUpdateSingleton(new InMemoryCaseFileCommandRepository(caseFiles)); _services.TryUpdateSingleton(new InMemoryCaseDefinitionCommandRepository(caseDefinitions, caseDefinitionHistories)); _services.TryUpdateSingleton(new InMemoryCaseDefinitionQueryRepository(caseDefinitions, caseDefinitionHistories)); return this; diff --git a/src/CaseManagement.CMMN/ServiceCollectionExtensions.cs b/src/CaseManagement.CMMN/ServiceCollectionExtensions.cs index 1215419a..bca9f06c 100644 --- a/src/CaseManagement.CMMN/ServiceCollectionExtensions.cs +++ b/src/CaseManagement.CMMN/ServiceCollectionExtensions.cs @@ -1,4 +1,5 @@ using CaseManagement.CMMN; +using CaseManagement.CMMN.CaseFile.CommandHandlers; using CaseManagement.CMMN.CaseInstance.CommandHandlers; using CaseManagement.CMMN.CaseInstance.EventHandlers; using CaseManagement.CMMN.CaseInstance.Processors; @@ -69,6 +70,8 @@ public static ServerBuilder AddCMMNApi(this IServiceCollection services, Action< private static IServiceCollection AddCommandHandlers(this IServiceCollection services) { + services.TryAddTransient(); + services.TryAddTransient(); services.TryAddTransient(); services.TryAddTransient(); services.TryAddTransient(); @@ -115,7 +118,7 @@ private static IServiceCollection AddInMemoryPersistence(this IServiceCollection var instances = new ConcurrentBag(); var roles = new List(); var formInstances = new ConcurrentBag(); - var files = new List(); + var files = new ConcurrentBag(); var forms = new List(); var caseDefinitionHistories = new ConcurrentBag(); var caseDailyStatistics = new ConcurrentBag(); @@ -139,6 +142,7 @@ private static IServiceCollection AddInMemoryPersistence(this IServiceCollection services.TryAddSingleton(new InMemoryStatisticQueryRepository(caseDailyStatistics, performances)); services.TryAddSingleton(new InMemoryCasePlanificationCommandRepository(casePlanifications)); services.TryAddSingleton(new InMemoryCasePlanificationQueryRepository(casePlanifications)); + services.TryAddSingleton(new InMemoryCaseFileCommandRepository(files)); services.TryAddSingleton(); services.TryAddTransient(); services.TryAddSingleton(); diff --git a/src/CaseManagement.Identity/Areas/pwd/Views/Authenticate/Index.cshtml b/src/CaseManagement.Identity/Areas/pwd/Views/Authenticate/Index.cshtml new file mode 100644 index 00000000..5794beb5 --- /dev/null +++ b/src/CaseManagement.Identity/Areas/pwd/Views/Authenticate/Index.cshtml @@ -0,0 +1,59 @@ +@model SimpleIdServer.UI.Authenticate.LoginPassword.ViewModels.AuthenticateViewModel +@using CaseManagement.Identity.Resources + +@{ + ViewBag.Title = Global.authenticate_pwd; + Layout = "~/Views/Shared/_Layout.cshtml"; +} + +
+
+
@Global.authenticate_pwd
+ @using (Html.BeginForm("Index", "Authenticate", new { area = "pwd", returnUrl = Model.ReturnUrl }, FormMethod.Post)) + { + @Html.AntiForgeryToken() +
+ @if (!ViewData.ModelState.IsValid) + { +
+
    + @foreach (var modelState in ViewData.ModelState.Values) + { + foreach (var error in modelState.Errors) + { +
  • @Global.ResourceManager.GetString(error.ErrorMessage)
    • + } + } +
+
+ } + +
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ } +
+
+ +@section Scripts { + +} \ No newline at end of file diff --git a/src/CaseManagement.Identity/Areas/pwd/Views/Authenticate/Index.cshtml.pp b/src/CaseManagement.Identity/Areas/pwd/Views/Authenticate/Index.cshtml.pp new file mode 100644 index 00000000..300b16ac --- /dev/null +++ b/src/CaseManagement.Identity/Areas/pwd/Views/Authenticate/Index.cshtml.pp @@ -0,0 +1,59 @@ +@model SimpleIdServer.UI.Authenticate.LoginPassword.ViewModels.AuthenticateViewModel +@using $rootnamespace$.Resources + +@{ + ViewBag.Title = Global.authenticate_pwd; + Layout = "~/Views/Shared/_Layout.cshtml"; +} + +
+
+
@Global.authenticate_pwd
+ @using (Html.BeginForm("Index", "Authenticate", new { area = "pwd", returnUrl = Model.ReturnUrl }, FormMethod.Post)) + { + @Html.AntiForgeryToken() +
+ @if (!ViewData.ModelState.IsValid) + { +
+
    + @foreach (var modelState in ViewData.ModelState.Values) + { + foreach (var error in modelState.Errors) + { +
  • @Global.ResourceManager.GetString(error.ErrorMessage)
    • + } + } +
+
+ } + +
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ } +
+
+ +@section Scripts { + +} \ No newline at end of file diff --git a/src/CaseManagement.Identity/CaseManagement.Identity.csproj b/src/CaseManagement.Identity/CaseManagement.Identity.csproj new file mode 100644 index 00000000..d3b2c473 --- /dev/null +++ b/src/CaseManagement.Identity/CaseManagement.Identity.csproj @@ -0,0 +1,24 @@ + + + netcoreapp2.2 + Exe + + + + + + + + + True + True + Global.resx + + + + + PublicResXFileCodeGenerator + Global.Designer.cs + + + diff --git a/src/CaseManagement.Identity/DefaultConfiguration.cs b/src/CaseManagement.Identity/DefaultConfiguration.cs new file mode 100644 index 00000000..ebca5e70 --- /dev/null +++ b/src/CaseManagement.Identity/DefaultConfiguration.cs @@ -0,0 +1,159 @@ +// Copyright (c) SimpleIdServer. All rights reserved. +// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. +using SimpleIdServer.OAuth.Domains; +using SimpleIdServer.OAuth.Helpers; +using SimpleIdServer.OpenID; +using SimpleIdServer.OpenID.Domains; +using System; +using System.Collections.Generic; + +namespace CaseManagement.Identity +{ + public class DefaultConfiguration + { + private static OpenIdScope SCOPE_ROLE = new OpenIdScope + { + Name = "role", + Claims = new List + { + "role" + } + }; + + public static List Scopes = new List + { + SCOPE_ROLE + }; + + public static List AcrLst => new List + { + new AuthenticationContextClassReference + { + DisplayName = "First level of assurance", + Name = "sid-load-01", + AuthenticationMethodReferences = new List + { + "pwd" + } + } + }; + + public static List Users => new List + { + new OAuthUser + { + Id = "administrator", + Credentials = new List + { + new OAuthUserCredential + { + CredentialType = "pwd", + Value = PasswordHelper.ComputeHash("password") + } + }, + Claims = new Dictionary + { + { SimpleIdServer.Jwt.Constants.UserClaims.Subject, "administrator" }, + { SimpleIdServer.Jwt.Constants.UserClaims.GivenName, "administrator" }, + { SimpleIdServer.Jwt.Constants.UserClaims.Role, "admin" } + } + }, + new OAuthUser + { + Id = "businessanalyst", + Credentials = new List + { + new OAuthUserCredential + { + CredentialType = "pwd", + Value = PasswordHelper.ComputeHash("password") + } + }, + Claims = new Dictionary + { + { SimpleIdServer.Jwt.Constants.UserClaims.Subject, "businessanalyst" }, + { SimpleIdServer.Jwt.Constants.UserClaims.GivenName, "businessanalyst" }, + { SimpleIdServer.Jwt.Constants.UserClaims.Role, "businessanalyst" } + } + } + }; + + public static List Clients => new List + { + new OpenIdClient + { + ClientId = "caseManagementWebsite", + Secrets = new List + { + new ClientSecret(ClientSecretTypes.SharedSecret, PasswordHelper.ComputeHash("b98113b5-f45f-4a4a-9db5-610b7183e148")) + }, + TokenEndPointAuthMethod = "client_secret_post", + ApplicationType = "web", + UpdateDateTime = DateTime.UtcNow, + CreateDateTime = DateTime.UtcNow, + TokenExpirationTimeInSeconds = 60 * 30, + RefreshTokenExpirationTimeInSeconds = 60 * 30, + TokenSignedResponseAlg = "RS256", + IdTokenSignedResponseAlg = "RS256", + AllowedScopes = new List + { + SIDOpenIdConstants.StandardScopes.Profile, + SIDOpenIdConstants.StandardScopes.Email, + SCOPE_ROLE + }, + GrantTypes = new List + { + "implicit" + }, + RedirectionUrls = new List + { + "http://localhost:51724", + "http://localhost:8080" + }, + PreferredTokenProfile = "Bearer", + ResponseTypes = new List + { + "token", + "id_token" + } + }, + new OpenIdClient + { + ClientId = "caseManagementPerformanceWebsite", + Secrets = new List + { + new ClientSecret(ClientSecretTypes.SharedSecret, PasswordHelper.ComputeHash("91894b86-c57e-489a-838d-fb82621a67ee")) + }, + TokenEndPointAuthMethod = "client_secret_post", + ApplicationType = "web", + UpdateDateTime = DateTime.UtcNow, + CreateDateTime = DateTime.UtcNow, + TokenExpirationTimeInSeconds = 60 * 30, + RefreshTokenExpirationTimeInSeconds = 60 * 30, + TokenSignedResponseAlg = "RS256", + IdTokenSignedResponseAlg = "RS256", + AllowedScopes = new List + { + SIDOpenIdConstants.StandardScopes.Profile, + SIDOpenIdConstants.StandardScopes.Email, + SCOPE_ROLE + }, + GrantTypes = new List + { + "implicit" + }, + RedirectionUrls = new List + { + "http://localhost:51724", + "http://localhost:8080" + }, + PreferredTokenProfile = "Bearer", + ResponseTypes = new List + { + "token", + "id_token" + } + } + }; + } +} \ No newline at end of file diff --git a/src/CaseManagement.Identity/DefaultConfiguration.cs.pp b/src/CaseManagement.Identity/DefaultConfiguration.cs.pp new file mode 100644 index 00000000..b65e519b --- /dev/null +++ b/src/CaseManagement.Identity/DefaultConfiguration.cs.pp @@ -0,0 +1,171 @@ +// Copyright (c) SimpleIdServer. All rights reserved. +// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. +using SimpleIdServer.OAuth.Domains; +using SimpleIdServer.OAuth.Helpers; +using SimpleIdServer.OpenID; +using SimpleIdServer.OpenID.Domains; +using System; +using System.Collections.Generic; + +namespace $rootnamespace$ +{ + public class DefaultConfiguration + { + public static List Scopes = new List + { + new OpenIdScope + { + Name = "scim", + Claims = new List + { + "scim_id" + } + } + }; + + public static List AcrLst => new List + { + new AuthenticationContextClassReference + { + DisplayName = "First level of assurance", + Name = "sid-load-01", + AuthenticationMethodReferences = new List + { + "pwd" + } + }, + new AuthenticationContextClassReference + { + DisplayName = "Second level of assurance", + Name = "sid-load-02", + AuthenticationMethodReferences = new List + { + "pwd", + "sms" + } + } + }; + + public static List Users => new List + { + new OAuthUser + { + Id = "scimUser", + Credentials = new List + { + new OAuthUserCredential + { + CredentialType = "pwd", + Value = PasswordHelper.ComputeHash("password") + } + }, + Claims = new Dictionary + { + { SimpleIdServer.Jwt.Constants.UserClaims.Subject, "scimUser" }, + { "scim_id", "1" } + } + }, + new OAuthUser + { + Id = "umaUser", + Credentials = new List + { + new OAuthUserCredential + { + CredentialType = "pwd", + Value = PasswordHelper.ComputeHash("password") + } + }, + Claims = new Dictionary + { + { SimpleIdServer.Jwt.Constants.UserClaims.Subject, "umaUser" }, + { SimpleIdServer.Jwt.Constants.UserClaims.Name, "User" }, + { SimpleIdServer.Jwt.Constants.UserClaims.UniqueName, "User" } + } + } + }; + + public static List Clients => new List + { + new OpenIdClient + { + ClientId = "scimClient", + Secrets = new List + { + new ClientSecret(ClientSecretTypes.SharedSecret, PasswordHelper.ComputeHash("scimClientSecret")) + }, + TokenEndPointAuthMethod = "client_secret_post", + ApplicationType = "web", + UpdateDateTime = DateTime.UtcNow, + CreateDateTime = DateTime.UtcNow, + TokenExpirationTimeInSeconds = 60 * 30, + RefreshTokenExpirationTimeInSeconds = 60 * 30, + TokenSignedResponseAlg = "RS256", + IdTokenSignedResponseAlg = "RS256", + AllowedScopes = new List + { + new OpenIdScope + { + Name = "scim", + Claims = new List + { + "scim_id" + } + } + }, + GrantTypes = new List + { + "implicit", + }, + RedirectionUrls = new List + { + "http://localhost:8080", + "http://localhost:1700" + }, + PreferredTokenProfile = "Bearer", + ResponseTypes = new List + { + "token", + "id_token" + } + }, + new OpenIdClient + { + ClientId = "umaClient", + Secrets = new List + { + new ClientSecret(ClientSecretTypes.SharedSecret, PasswordHelper.ComputeHash("umaClientSecret")) + }, + TokenEndPointAuthMethod = "client_secret_post", + ApplicationType = "web", + UpdateDateTime = DateTime.UtcNow, + CreateDateTime = DateTime.UtcNow, + TokenExpirationTimeInSeconds = 60 * 30, + RefreshTokenExpirationTimeInSeconds = 60 * 30, + TokenSignedResponseAlg = "RS256", + IdTokenSignedResponseAlg = "RS256", + AllowedScopes = new List + { + SIDOpenIdConstants.StandardScopes.Profile, + SIDOpenIdConstants.StandardScopes.Email + }, + GrantTypes = new List + { + "implicit", + "authorization_code" + }, + RedirectionUrls = new List + { + "https://localhost:60001/signin-oidc" + }, + PreferredTokenProfile = "Bearer", + ResponseTypes = new List + { + "token", + "id_token", + "code" + } + } + }; + } +} \ No newline at end of file diff --git a/src/CaseManagement.Identity/Nuget.Transform.MSBuild.Task.lock b/src/CaseManagement.Identity/Nuget.Transform.MSBuild.Task.lock new file mode 100644 index 00000000..754fe0a2 --- /dev/null +++ b/src/CaseManagement.Identity/Nuget.Transform.MSBuild.Task.lock @@ -0,0 +1 @@ +C:\GitProject\CaseManagement\src\CaseManagement.Identity\DefaultConfiguration.cs.pp$vGq83+1GvtlO4+XypkPMoWjLKz2Def/ReE7t26c3+TI=;C:\GitProject\CaseManagement\src\CaseManagement.Identity\Startup.cs.pp$uZWeA7F/QVAE+bjoX2RTXItJsUeddojLnsrlJeg5et0=;C:\GitProject\CaseManagement\src\CaseManagement.Identity\Views\Accounts\Index.cshtml.pp$MvUXIr1o4H0joT+cgFajH73n+qynFzpjCkMdTMmWSoI=;C:\GitProject\CaseManagement\src\CaseManagement.Identity\Views\CheckSession\EndSession.cshtml.pp$7Z3WrlJG5kmaeyK3mwTcF5/Dyq5smW11ErnEXKSdeDE=;C:\GitProject\CaseManagement\src\CaseManagement.Identity\Views\Consents\Index.cshtml.pp$QlNjZVl3KRDhw9LGOQ+5ilqwLOhYOQvy+LEHQQ4P4+o=;C:\GitProject\CaseManagement\src\CaseManagement.Identity\Views\Errors\Index.cshtml.pp$O8DOTOuAVVu4XVGy8D6IXeOXOyPcmLAeG/HRFkEp1zo=;C:\GitProject\CaseManagement\src\CaseManagement.Identity\Views\Home\Index.cshtml.pp$tRj4RCI4g/LUO1+Tuip/fgzukeY+uyfXqSahtbII7jg=;C:\GitProject\CaseManagement\src\CaseManagement.Identity\Views\Shared\_Layout.cshtml.pp$/MZe8053jVtmZzZaVw0IZeceePjTNm/tnaDwh2oL2I0=;C:\GitProject\CaseManagement\src\CaseManagement.Identity\Areas\pwd\Views\Authenticate\Index.cshtml.pp$GaofAFMdM+Ny/lOPmtn1eoE/tQalHZAphusUAylcZkQ=;C:\Projects\CaseManagement\src\CaseManagement.Identity\DefaultConfiguration.cs.pp$KPYf0vxjxMgwkJbTkiZqRPyHw7S6ei5/tmMn+jyxJ7E=;C:\Projects\CaseManagement\src\CaseManagement.Identity\Startup.cs.pp$UBj5DiSNcCwimuAjE4KfKblkxv2iPU8n9lDKLXxK18Q=;C:\Projects\CaseManagement\src\CaseManagement.Identity\Areas\pwd\Views\Authenticate\Index.cshtml.pp$TDUgYWyE/uuTZqbV8wUfKqZJgajSdcAjHukivAPObYQ=;C:\Projects\CaseManagement\src\CaseManagement.Identity\Views\Accounts\Index.cshtml.pp$UXiQy4bDC6hXHu5EZIgemEqShd9Vrs6s1WyCPrH0Zqk=;C:\Projects\CaseManagement\src\CaseManagement.Identity\Views\CheckSession\EndSession.cshtml.pp$4bbughUPZkig1BRV3+rFIvM7Xtn4yJ4pDEdvdv7XN/k=;C:\Projects\CaseManagement\src\CaseManagement.Identity\Views\Consents\Index.cshtml.pp$wWncdDc7Ac0eIaeRFpZzE+G9LGP4gKUtTlU71kVJ63w=;C:\Projects\CaseManagement\src\CaseManagement.Identity\Views\Errors\Index.cshtml.pp$GX+r1N/UxBhSeEnOp40lOE/rq6FDAZN/A0bx2Pk3S8c=;C:\Projects\CaseManagement\src\CaseManagement.Identity\Views\Home\Index.cshtml.pp$hxKzYjtHESzMV17MZmXsukgvKOGoY0EfX/YlbodTKAM=;C:\Projects\CaseManagement\src\CaseManagement.Identity\Views\Shared\_Layout.cshtml.pp$SsWABfW0caHhCjnICDk/IQp8M5Dv6StT4bsXuCVOXx8= \ No newline at end of file diff --git a/src/CaseManagement.Identity/Program.cs b/src/CaseManagement.Identity/Program.cs new file mode 100644 index 00000000..73bf1b66 --- /dev/null +++ b/src/CaseManagement.Identity/Program.cs @@ -0,0 +1,19 @@ +// Copyright (c) SimpleIdServer. All rights reserved. +// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; + +namespace CaseManagement.Identity +{ + public class Program + { + public static void Main(string[] args) + { + CreateWebHostBuilder(args).Build().Run(); + } + + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup(); + } +} \ No newline at end of file diff --git a/src/CaseManagement.Identity/Properties/launchSettings.json b/src/CaseManagement.Identity/Properties/launchSettings.json new file mode 100644 index 00000000..afb9d168 --- /dev/null +++ b/src/CaseManagement.Identity/Properties/launchSettings.json @@ -0,0 +1,11 @@ +{ + "profiles": { + "CaseManagement.Identity": { + "commandName": "Project", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:60000/" + } + } +} \ No newline at end of file diff --git a/src/CaseManagement.Identity/Resources/Global.Designer.cs b/src/CaseManagement.Identity/Resources/Global.Designer.cs new file mode 100644 index 00000000..8120c892 --- /dev/null +++ b/src/CaseManagement.Identity/Resources/Global.Designer.cs @@ -0,0 +1,450 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CaseManagement.Identity.Resources { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class Global { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Global() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CaseManagement.Identity.Resources.Global", typeof(Global).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Active sessions. + /// + public static string active_sessions { + get { + return ResourceManager.GetString("active_sessions", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Authenticate. + /// + public static string authenticate { + get { + return ResourceManager.GetString("authenticate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Login password authentication. + /// + public static string authenticate_pwd { + get { + return ResourceManager.GetString("authenticate_pwd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SMS authentication. + /// + public static string authenticate_sms { + get { + return ResourceManager.GetString("authenticate_sms", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Authentication time {0}. + /// + public static string authentication_time { + get { + return ResourceManager.GetString("authentication_time", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Choose session. + /// + public static string choose_session { + get { + return ResourceManager.GetString("choose_session", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Claims. + /// + public static string claims { + get { + return ResourceManager.GetString("claims", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Confirm. + /// + public static string confirm { + get { + return ResourceManager.GetString("confirm", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Confirmation code. + /// + public static string confirmationcode { + get { + return ResourceManager.GetString("confirmationcode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Confirmation code has been sent. + /// + public static string confirmationcode_sent { + get { + return ResourceManager.GetString("confirmationcode_sent", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The client {0} would like to access to. + /// + public static string consent_client_access { + get { + return ResourceManager.GetString("consent_client_access", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Consents. + /// + public static string consents { + get { + return ResourceManager.GetString("consents", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Disconnect. + /// + public static string disconnect { + get { + return ResourceManager.GetString("disconnect", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Expiration time {0}. + /// + public static string expiration_time { + get { + return ResourceManager.GetString("expiration_time", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Home. + /// + public static string home { + get { + return ResourceManager.GetString("home", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid confirmation code. + /// + public static string invalid_confirmationcode { + get { + return ResourceManager.GetString("invalid_confirmationcode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bad credentials. + /// + public static string invalid_credentials { + get { + return ResourceManager.GetString("invalid_credentials", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid phone number. + /// + public static string invalid_phonenumber { + get { + return ResourceManager.GetString("invalid_phonenumber", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid request. + /// + public static string invalid_request { + get { + return ResourceManager.GetString("invalid_request", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Login. + /// + public static string login { + get { + return ResourceManager.GetString("login", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Confirmation code is required. + /// + public static string missing_confirmationcode { + get { + return ResourceManager.GetString("missing_confirmationcode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Login is required. + /// + public static string missing_login { + get { + return ResourceManager.GetString("missing_login", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Password is required. + /// + public static string missing_password { + get { + return ResourceManager.GetString("missing_password", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Phone number is required. + /// + public static string missing_phonenumber { + get { + return ResourceManager.GetString("missing_phonenumber", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Return url is required. + /// + public static string missing_return_url { + get { + return ResourceManager.GetString("missing_return_url", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Password. + /// + public static string password { + get { + return ResourceManager.GetString("password", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Phone number. + /// + public static string phonenumber { + get { + return ResourceManager.GetString("phonenumber", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Reject. + /// + public static string reject { + get { + return ResourceManager.GetString("reject", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Remember my login. + /// + public static string remember_login { + get { + return ResourceManager.GetString("remember_login", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Revoke session. + /// + public static string revoke_session_title { + get { + return ResourceManager.GetString("revoke_session_title", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Access to the address. + /// + public static string scope_address { + get { + return ResourceManager.GetString("scope_address", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Access to the email. + /// + public static string scope_email { + get { + return ResourceManager.GetString("scope_email", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Offline access. + /// + public static string scope_offline_access { + get { + return ResourceManager.GetString("scope_offline_access", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Access to user identifier. + /// + public static string scope_openid { + get { + return ResourceManager.GetString("scope_openid", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Access to the phone. + /// + public static string scope_phone { + get { + return ResourceManager.GetString("scope_phone", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Access to the profile. + /// + public static string scope_profile { + get { + return ResourceManager.GetString("scope_profile", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Access to the role. + /// + public static string scope_role { + get { + return ResourceManager.GetString("scope_role", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Scopes. + /// + public static string scopes { + get { + return ResourceManager.GetString("scopes", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Select active session. + /// + public static string select_session { + get { + return ResourceManager.GetString("select_session", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Send confirmation code. + /// + public static string sendconfirmationcode { + get { + return ResourceManager.GetString("sendconfirmationcode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Submit. + /// + public static string submit { + get { + return ResourceManager.GetString("submit", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unknown phone number. + /// + public static string unknown_phonenumber { + get { + return ResourceManager.GetString("unknown_phonenumber", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User is unknown. + /// + public static string unknown_user { + get { + return ResourceManager.GetString("unknown_user", resourceCulture); + } + } + } +} diff --git a/src/CaseManagement.Identity/Resources/Global.fr.resx b/src/CaseManagement.Identity/Resources/Global.fr.resx new file mode 100644 index 00000000..6888b75c --- /dev/null +++ b/src/CaseManagement.Identity/Resources/Global.fr.resx @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Sessions actives + + + Authentifier + + + Authentification login & mot de passe + + + Date d'authentification {0} + + + Choisir la session + + + Attributs + + + Confirmer + + + Code de confirmation + + + Le code de confirmation a été envoyé + + + Consentements + + + Le client {0} souhaite accéder à + + + Se déconnecter + + + Date d'expiration {0} + + + Accueil + + + Code de confirmation est invalide + + + Mot de passe est invalide + + + Numéro de téléphone est invalide + + + Requête invalide + + + Login + + + Code de confirmation est obligatoire + + + Login est requis + + + Mot de passe est requis + + + Numéro de téléphone est obligatoire + + + URL de redirection est obligatoire + + + Mot de passe + + + Numéro de téléphone + + + Refuser + + + Se souvenir de moi + + + Périmètres + + + Sélectionner une session + + + Envoyer le code de confirmation + + + Soumettre + + + Numéro de téléphone est inconnu + + + L'utilisateur est inconnu + + + Accéder à l'adresse + + + Accéder à l'email + + + Accéder en hors ligne + + + Accéder à l'identifiant de l'utilisateur + + + Accéder au téléphone + + + Accéder au profil + + + Révoquer la session + + + Accéder au rôle + + \ No newline at end of file diff --git a/src/CaseManagement.Identity/Resources/Global.resx b/src/CaseManagement.Identity/Resources/Global.resx new file mode 100644 index 00000000..397624b3 --- /dev/null +++ b/src/CaseManagement.Identity/Resources/Global.resx @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Active sessions + + + Authenticate + + + Login password authentication + + + SMS authentication + + + Authentication time {0} + + + Choose session + + + Claims + + + Confirm + + + Confirmation code + + + Confirmation code has been sent + + + Consents + + + The client {0} would like to access to + + + Disconnect + + + Expiration time {0} + + + Home + + + Invalid confirmation code + + + Bad credentials + + + Invalid phone number + + + Invalid request + + + Login + + + Confirmation code is required + + + Login is required + + + Password is required + + + Phone number is required + + + Return url is required + + + Password + + + Phone number + + + Reject + + + Remember my login + + + Scopes + + + Select active session + + + Send confirmation code + + + Submit + + + Unknown phone number + + + User is unknown + + + Access to the address + + + Access to the email + + + Offline access + + + Access to user identifier + + + Access to the phone + + + Access to the profile + + + Revoke session + + + Access to the role + + \ No newline at end of file diff --git a/src/CaseManagement.Identity/Startup.cs b/src/CaseManagement.Identity/Startup.cs new file mode 100644 index 00000000..e4534d35 --- /dev/null +++ b/src/CaseManagement.Identity/Startup.cs @@ -0,0 +1,73 @@ +// Copyright (c) SimpleIdServer. All rights reserved. +// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. +using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using SimpleIdServer.Jwt; +using SimpleIdServer.Jwt.Extensions; +using SimpleIdServer.OpenID; +using System.Collections.Generic; +using System.IO; +using System.Security.Cryptography; + +namespace CaseManagement.Identity +{ + public class Startup + { + private readonly IHostingEnvironment _env; + + public Startup(IHostingEnvironment env) + { + _env = env; + } + + public void ConfigureServices(IServiceCollection services) + { + JsonWebKey sigJsonWebKey; + using (var rsa = RSA.Create()) + { + var json = File.ReadAllText("openid_key.txt"); + var dic = JsonConvert.DeserializeObject>(json); + rsa.Import(dic); + sigJsonWebKey = new JsonWebKeyBuilder().NewSign("1", new[] + { + KeyOperations.Sign, + KeyOperations.Verify + }).SetAlg(rsa, "RS256").Build(); + } + + services.AddCors(options => options.AddPolicy("AllowAll", p => p.AllowAnyOrigin() + .AllowAnyMethod() + .AllowAnyHeader())); + services.AddMvc(); + services.AddAuthorization(opts => opts.AddDefaultOAUTHAuthorizationPolicy()); + services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(); + services.AddSIDOpenID() + .AddClients(DefaultConfiguration.Clients) + .AddAcrs(DefaultConfiguration.AcrLst) + .AddUsers(DefaultConfiguration.Users) + .AddScopes(DefaultConfiguration.Scopes) + .AddJsonWebKeys(new List { sigJsonWebKey }) + .AddLoginPasswordAuthentication(); + } + + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + { + app.UseCors("AllowAll"); + app.UseAuthentication(); + app.UseStaticFiles(); + app.UseMvc(routes => + { + routes.MapRoute( + name: "AreaRoute", + template: "{area}/{controller}/{action=Index}/{id?}"); + routes.MapRoute( + name: "DefaultRoute", + template: "{controller=Home}/{action=Index}/{id?}"); + }); + } + } +} \ No newline at end of file diff --git a/src/CaseManagement.Identity/Startup.cs.pp b/src/CaseManagement.Identity/Startup.cs.pp new file mode 100644 index 00000000..c53e3b5a --- /dev/null +++ b/src/CaseManagement.Identity/Startup.cs.pp @@ -0,0 +1,71 @@ +// Copyright (c) SimpleIdServer. All rights reserved. +// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. +using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using SimpleIdServer.Jwt; +using SimpleIdServer.Jwt.Extensions; +using System.Collections.Generic; +using System.IO; +using System.Security.Cryptography; + +namespace $rootnamespace$ +{ + public class Startup + { + private readonly IHostingEnvironment _env; + + public Startup(IHostingEnvironment env) + { + _env = env; + } + + public void ConfigureServices(IServiceCollection services) + { + JsonWebKey sigJsonWebKey; + using (var rsa = RSA.Create()) + { + var json = File.ReadAllText("openid_key.txt"); + var dic = JsonConvert.DeserializeObject>(json); + rsa.Import(dic); + sigJsonWebKey = new JsonWebKeyBuilder().NewSign("1", new[] + { + KeyOperations.Sign, + KeyOperations.Verify + }).SetAlg(rsa, "RS256").Build(); + } + + services.AddCors(options => options.AddPolicy("AllowAll", p => p.AllowAnyOrigin() + .AllowAnyMethod() + .AllowAnyHeader())); + services.AddMvc(); + services.AddAuthorization(opts => opts.AddDefaultOAUTHAuthorizationPolicy()); + services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(); + services.AddSIDOpenID() + .AddClients(DefaultConfiguration.Clients) + .AddAcrs(DefaultConfiguration.AcrLst) + .AddUsers(DefaultConfiguration.Users) + .AddScopes(DefaultConfiguration.Scopes) + .AddJsonWebKeys(new List { sigJsonWebKey }); + } + + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + { + app.UseCors("AllowAll"); + app.UseAuthentication(); + app.UseStaticFiles(); + app.UseMvc(routes => + { + routes.MapRoute( + name: "AreaRoute", + template: "{area}/{controller}/{action=Index}/{id?}"); + routes.MapRoute( + name: "DefaultRoute", + template: "{controller=Home}/{action=Index}/{id?}"); + }); + } + } +} \ No newline at end of file diff --git a/src/CaseManagement.Identity/Views/Accounts/Index.cshtml b/src/CaseManagement.Identity/Views/Accounts/Index.cshtml new file mode 100644 index 00000000..b9c4181f --- /dev/null +++ b/src/CaseManagement.Identity/Views/Accounts/Index.cshtml @@ -0,0 +1,42 @@ +@using CaseManagement.Identity.Resources +@model SimpleIdServer.OpenID.UI.ViewModels.AccountsIndexViewModel +@{ + Layout = "~/Views/Shared/_Layout.cshtml"; + ViewBag.Title = Global.select_session; +} + +

@Global.active_sessions

+ +
+ @foreach (var account in Model.Accounts) + { +
+ @using (Html.BeginForm("Index", "Accounts", FormMethod.Post)) + { + @Html.AntiForgeryToken() +
+ + +
@account.Name
+
+ @if (account.IssuedUtc != null) + { +

+ @string.Format(Global.authentication_time, account.IssuedUtc.Value.ToString("s")) +

+ } + @if (account.ExpiresUct != null) + { +

+ @string.Format(Global.expiration_time, account.ExpiresUct.Value.ToString("s")) +

+ } +
+
+ +
+
+ } +
+ } +
\ No newline at end of file diff --git a/src/CaseManagement.Identity/Views/Accounts/Index.cshtml.pp b/src/CaseManagement.Identity/Views/Accounts/Index.cshtml.pp new file mode 100644 index 00000000..b7aafdc7 --- /dev/null +++ b/src/CaseManagement.Identity/Views/Accounts/Index.cshtml.pp @@ -0,0 +1,42 @@ +@using $rootnamespace$.Resources +@model SimpleIdServer.OpenID.UI.ViewModels.AccountsIndexViewModel +@{ + Layout = "~/Views/Shared/_Layout.cshtml"; + ViewBag.Title = Global.select_session; +} + +

@Global.active_sessions

+ +
+ @foreach (var account in Model.Accounts) + { +
+ @using (Html.BeginForm("Index", "Accounts", FormMethod.Post)) + { + @Html.AntiForgeryToken() +
+ + +
@account.Name
+
+ @if (account.IssuedUtc != null) + { +

+ @string.Format(Global.authentication_time, account.IssuedUtc.Value.ToString("s")) +

+ } + @if (account.ExpiresUct != null) + { +

+ @string.Format(Global.expiration_time, account.ExpiresUct.Value.ToString("s")) +

+ } +
+
+ +
+
+ } +
+ } +
\ No newline at end of file diff --git a/src/CaseManagement.Identity/Views/CheckSession/EndSession.cshtml b/src/CaseManagement.Identity/Views/CheckSession/EndSession.cshtml new file mode 100644 index 00000000..148fa775 --- /dev/null +++ b/src/CaseManagement.Identity/Views/CheckSession/EndSession.cshtml @@ -0,0 +1,9 @@ +@model SimpleIdServer.OpenID.UI.ViewModels.RevokeSessionViewModel +@using CaseManagement.Identity.Resources + +@{ + Layout = "~/Views/Shared/_Layout.cshtml"; + ViewBag.Title = Global.revoke_session_title; +} + +@Global.revoke_session_title \ No newline at end of file diff --git a/src/CaseManagement.Identity/Views/CheckSession/EndSession.cshtml.pp b/src/CaseManagement.Identity/Views/CheckSession/EndSession.cshtml.pp new file mode 100644 index 00000000..7229105e --- /dev/null +++ b/src/CaseManagement.Identity/Views/CheckSession/EndSession.cshtml.pp @@ -0,0 +1,9 @@ +@model SimpleIdServer.OpenID.UI.ViewModels.RevokeSessionViewModel +@using $rootnamespace$.Resources + +@{ + Layout = "~/Views/Shared/_Layout.cshtml"; + ViewBag.Title = Global.revoke_session_title; +} + +@Global.revoke_session_title \ No newline at end of file diff --git a/src/CaseManagement.Identity/Views/Consents/Index.cshtml b/src/CaseManagement.Identity/Views/Consents/Index.cshtml new file mode 100644 index 00000000..44b68f89 --- /dev/null +++ b/src/CaseManagement.Identity/Views/Consents/Index.cshtml @@ -0,0 +1,52 @@ +@using CaseManagement.Identity.Resources +@model SimpleIdServer.OpenID.UI.ViewModels.ConsentsIndexViewModel + +@{ + Layout = "~/Views/Shared/_Layout.cshtml"; + ViewBag.Title = Global.consents; +} + +@using (Html.BeginForm("Index", "Consents", FormMethod.Post)) +{ + @Html.AntiForgeryToken() + @if (!ViewData.ModelState.IsValid) + { +
+
    + @foreach (var modelState in ViewData.ModelState.Values) + { + foreach (var error in modelState.Errors) + { +
  • @Global.ResourceManager.GetString(error.ErrorMessage)
    • + } + } +
+
+ } + +
+
+ @string.Format(Global.consent_client_access, Model.ClientName) +
+
+
@Global.scopes
+
    + @foreach (var scopeName in Model.ScopeNames) + { +
  • @Global.ResourceManager.GetString($"scope_{scopeName}")
    • + } +
+
@Global.claims
+
    + @foreach (var claim in Model.ClaimNames) + { +
  • @claim
    • + } +
+
+
+ + @Global.reject +
+
+} \ No newline at end of file diff --git a/src/CaseManagement.Identity/Views/Consents/Index.cshtml.pp b/src/CaseManagement.Identity/Views/Consents/Index.cshtml.pp new file mode 100644 index 00000000..cb8c8b7d --- /dev/null +++ b/src/CaseManagement.Identity/Views/Consents/Index.cshtml.pp @@ -0,0 +1,52 @@ +@using $rootnamespace$.Resources +@model SimpleIdServer.OpenID.UI.ViewModels.ConsentsIndexViewModel + +@{ + Layout = "~/Views/Shared/_Layout.cshtml"; + ViewBag.Title = Global.consents; +} + +@using (Html.BeginForm("Index", "Consents", FormMethod.Post)) +{ + @Html.AntiForgeryToken() + @if (!ViewData.ModelState.IsValid) + { +
+
    + @foreach (var modelState in ViewData.ModelState.Values) + { + foreach (var error in modelState.Errors) + { +
  • @Global.ResourceManager.GetString(error.ErrorMessage)
    • + } + } +
+
+ } + +
+
+ @string.Format(Global.consent_client_access, Model.ClientName) +
+
+
@Global.scopes
+
    + @foreach (var scopeName in Model.ScopeNames) + { +
  • @Global.ResourceManager.GetString($"scope_{scopeName}")
    • + } +
+
@Global.claims
+
    + @foreach (var claim in Model.ClaimNames) + { +
  • @claim
    • + } +
+
+
+ + @Global.reject +
+
+} \ No newline at end of file diff --git a/src/CaseManagement.Identity/Views/Errors/Index.cshtml b/src/CaseManagement.Identity/Views/Errors/Index.cshtml new file mode 100644 index 00000000..0b3d95fc --- /dev/null +++ b/src/CaseManagement.Identity/Views/Errors/Index.cshtml @@ -0,0 +1,12 @@ +@using CaseManagement.Identity.Resources + +@{ + Layout = "~/Views/Shared/_Layout.cshtml"; + ViewBag.Title = "Error"; +} + +@model SimpleIdServer.OpenID.UI.ViewModels.ErrorViewModel + + \ No newline at end of file diff --git a/src/CaseManagement.Identity/Views/Errors/Index.cshtml.pp b/src/CaseManagement.Identity/Views/Errors/Index.cshtml.pp new file mode 100644 index 00000000..58ae34a0 --- /dev/null +++ b/src/CaseManagement.Identity/Views/Errors/Index.cshtml.pp @@ -0,0 +1,12 @@ +@using $rootnamespace$.Resources + +@{ + Layout = "~/Views/Shared/_Layout.cshtml"; + ViewBag.Title = "Error"; +} + +@model SimpleIdServer.OpenID.UI.ViewModels.ErrorViewModel + + \ No newline at end of file diff --git a/src/CaseManagement.Identity/Views/Home/Index.cshtml b/src/CaseManagement.Identity/Views/Home/Index.cshtml new file mode 100644 index 00000000..a7cb26a1 --- /dev/null +++ b/src/CaseManagement.Identity/Views/Home/Index.cshtml @@ -0,0 +1,8 @@ +@using CaseManagement.Identity.Resources + +@{ + Layout = "~/Views/Shared/_Layout.cshtml"; + ViewBag.Title = Global.home; +} + +

Welcome to SimpleIdServer

\ No newline at end of file diff --git a/src/CaseManagement.Identity/Views/Home/Index.cshtml.pp b/src/CaseManagement.Identity/Views/Home/Index.cshtml.pp new file mode 100644 index 00000000..b4a1fe78 --- /dev/null +++ b/src/CaseManagement.Identity/Views/Home/Index.cshtml.pp @@ -0,0 +1,8 @@ +@using $rootnamespace$.Resources + +@{ + Layout = "~/Views/Shared/_Layout.cshtml"; + ViewBag.Title = Global.home; +} + +

Welcome to SimpleIdServer

\ No newline at end of file diff --git a/src/CaseManagement.Identity/Views/Shared/_Layout.cshtml b/src/CaseManagement.Identity/Views/Shared/_Layout.cshtml new file mode 100644 index 00000000..5a1d0550 --- /dev/null +++ b/src/CaseManagement.Identity/Views/Shared/_Layout.cshtml @@ -0,0 +1,46 @@ +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@using CaseManagement.Identity.Resources + + + + + + + SimpleIdServer - @ViewBag.Title + + + + +
+
+ @RenderSection("PageTitle", false) +
+
+ @RenderBody() +
+
+ + + @RenderSection("Scripts", required: false) + + \ No newline at end of file diff --git a/src/CaseManagement.Identity/Views/Shared/_Layout.cshtml.pp b/src/CaseManagement.Identity/Views/Shared/_Layout.cshtml.pp new file mode 100644 index 00000000..68a9464b --- /dev/null +++ b/src/CaseManagement.Identity/Views/Shared/_Layout.cshtml.pp @@ -0,0 +1,46 @@ +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@using $rootnamespace$.Resources + + + + + + + SimpleIdServer - @ViewBag.Title + + + + +
+
+ @RenderSection("PageTitle", false) +
+
+ @RenderBody() +
+
+ + + @RenderSection("Scripts", required: false) + + \ No newline at end of file diff --git a/src/CaseManagement.Identity/libman.json b/src/CaseManagement.Identity/libman.json new file mode 100644 index 00000000..73fe97a7 --- /dev/null +++ b/src/CaseManagement.Identity/libman.json @@ -0,0 +1,14 @@ +{ + "version": "1.0", + "defaultProvider": "cdnjs", + "libraries": [ + { + "library": "twitter-bootstrap@4.3.1", + "destination": "wwwroot/lib/twitter-bootstrap/" + }, + { + "library": "jquery@3.4.1", + "destination": "wwwroot/lib/jquery/" + } + ] +} \ No newline at end of file diff --git a/src/CaseManagement.Identity/openid_key.txt b/src/CaseManagement.Identity/openid_key.txt new file mode 100644 index 00000000..2cb94bad --- /dev/null +++ b/src/CaseManagement.Identity/openid_key.txt @@ -0,0 +1,10 @@ +{ + "d":"IIO1/KvaTf7qcVhkjVu25glIPz8gVnqTc/qja7u/ReLP3qJGpZpvgIWwzahNKWGGotUPbiNu6vQs28E6ZxMSDdd2EVXcxC5U/grWcPqwzxxcFBLihcAqNkXaS8ZsOBMATPunoqhYX/L0Gu4u5lqU/oEwRKt+P0lD7/0L3xMTaT/sx1XM764AUvemtMaZWOiezRZIZINZe2mnivh0jB5aXb6134o/A3f217pC+CU8QCGCbDlilKt0ApGu1EWa9Kicn60ydy12+itmzkHsiiw/DT6EXtF+clI0gw2MHuXONEh2UCUaOCquWydDLIew5HWe5nZjK1RO4F6BD7UHt/nN6Q==", + "p":"7v/lDyon4rYe6XdSaSQ/UzbSpOeOGMn4HnMAELqg3MRU/dmB/159Qc3d3HfuOBOvMThJP+MYSpOzJ1+GmbJeIhqd/v2nq4mA5VOS0NV5NdCKDjFPWJU0YEEhdU3bA+hTSKg8f1gTHdo23C6XlQg2ci3MP8AZbOOepcMRsEJMXK8=", + "q":"7Ews5O5veaP/eCBeE1elr2jVPpaie9tKj7pHSarxkl0rCfaB9gAm3DtMJt0jsUxr83ssAyvAYhjLU4zwnN1ZhAyeIaOZ4zTKEVyicreMpX3VjqSqgTSumBIkCE5xrLZISFZOudNBY/RzVAaiVC8wrivRls4dbfCfQ1aV9iwR+ZM=", + "dp":"7SHnIwm/s1jiCOFEWmAFmMofbFD3ky7pyURvPyn9K659abVjH36gJydcx0ATk34saFihjQsE8hHkQt+sDFmGvq3ML9F7iF6RDnjChgQZFMUKBZT1Vj4MTqiwytPpx9G+uKt8AxnfNdJqdkKgUdVpOBaqvmIamAisQ2nt5gWSAK8=", + "dq":"boZa4WHdZmodDlUla6qtZtSEGdhfe8tgnsWknoKEp89IWEqjEyuTAaQCxJLfJQj33VUZiwol3Dx4rkXYLacjPa6hMF7TlgCVG3XWzg2ojafEAgpnbjP0DlE95Vy7sus3+A3WmPiFN3mZkA3iU7oW7QC18fHKtie8dsTDM/f9GF0=", + "qi":"FnNus9KzS10+de1p6ni6TYdrldMzTWnKWst8CCogG4U/eb0yEfgG0kdG+O2Ce+RTGC3dHu976457Z8wVNt+nTvFHtyrOhjXM8f0To/N37mYs/SwCwNBtqZZFC6T725JMEr+pnonjPhXOQlcMgUB2LhN8x1SScOnsHhptMPECwZQ=", + "n":"3JsFC7E93xAShgnNp9dDWJPOHjJYLGPX464AfKW9gOB5CGD2uIYiP9m6yuZd73Z334RhQw616IMYijAvtpK25Nkk91KoAvrRoUGv2bl6pmX2JwUjwqe+lbmop4Rj9tzC2UBrGPcWSbIMNLaHkUrqR15DwVdFkG19QBwo9X6gOjCgSDvV0OY7vmwq1M3j2YmDwWnyTXh92wnUn2Hg57mVNZCX8RgdhdaWR6tiFP3QtgEYzZEulOGP6PKilqSr7E6Smg7mUNy6JTRkMGm1KZHTAY6HuNG5PPq0DUmsg8YMmsGEQPHMjw7IdaPxO0qy0aC1fiLj8NgWBOJ6bgrck55vfQ==", + "e":"AQAB" +} \ No newline at end of file diff --git a/src/CaseManagement.Performance/Properties/launchSettings.json b/src/CaseManagement.Performance/Properties/launchSettings.json index 06cc2f98..f4ed86bf 100644 --- a/src/CaseManagement.Performance/Properties/launchSettings.json +++ b/src/CaseManagement.Performance/Properties/launchSettings.json @@ -1,23 +1,7 @@ { - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:51723/", - "sslPort": 0 - } - }, "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "CaseManagement.Website": { + "CaseManagement.Performance": { "commandName": "Project", - "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, diff --git a/src/CaseManagement.Performance/Startup.cs b/src/CaseManagement.Performance/Startup.cs index 598d1211..379d8643 100644 --- a/src/CaseManagement.Performance/Startup.cs +++ b/src/CaseManagement.Performance/Startup.cs @@ -1,22 +1,22 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using System; -using System.Linq; +using System.IO; namespace CaseManagement.Website { public class Startup { - public Startup() { } + private readonly IConfiguration _configuration; - public IConfigurationRoot Configuration { get; } + public Startup(IConfiguration configuration) + { + _configuration = configuration; + } - // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { services.AddCors(options => @@ -31,44 +31,41 @@ public void ConfigureServices(IServiceCollection services) }); }); - // Add framework services. services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2); - services.Configure(options => - { - options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto; - }); } - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IHostingEnvironment env) { - app.UseForwardedHeaders(); - var angularRoutes = new[] { - "/home", - "/about", - "/casedefinitions", - "/caseinstances", - "/performances" - }; - - app.Use(async (context, next) => + string baseUrl = _configuration["pathBase"]; + if (string.IsNullOrWhiteSpace(baseUrl)) { - if (context.Request.Path.HasValue && null != angularRoutes.FirstOrDefault((ar) => context.Request.Path.Value.StartsWith(ar, StringComparison.OrdinalIgnoreCase))) - { - context.Request.Path = new PathString("/"); - } - - await next(); - }); + baseUrl = "/"; + } app.UseCors("AllowAllOrigins"); + if (baseUrl != "/") + { + app.Map(new PathString(baseUrl), appm => + { + appm.UseDefaultFiles(); + appm.UseStaticFiles(); + appm.Use(async (context, next) => + { + var root = env.WebRootPath; + var path = Path.Combine(root, "index.html"); + await context.Response.WriteAsync(File.ReadAllText(path)); + }); + }); + return; + } + app.UseDefaultFiles(); app.UseStaticFiles(); - app.UseMvc(routes => + app.Use(async (context, next) => { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); + var root = env.WebRootPath; + var path = Path.Combine(root, "index.html"); + await context.Response.WriteAsync(File.ReadAllText(path)); }); } } diff --git a/src/CaseManagement.Performance/angularApp/app/app.component.ts b/src/CaseManagement.Performance/angularApp/app/app.component.ts index c4f07b45..89ce8bc6 100644 --- a/src/CaseManagement.Performance/angularApp/app/app.component.ts +++ b/src/CaseManagement.Performance/angularApp/app/app.component.ts @@ -1,6 +1,9 @@ -import { Component, ViewEncapsulation, OnInit } from '@angular/core'; +import { Component, ViewEncapsulation, OnInit, Inject, NgZone } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { Router } from '@angular/router'; +import { authConfig } from './auth.config'; +import { OAuthService, NullValidationHandler, OAuthStorage } from 'angular-oauth2-oidc'; +import { DOCUMENT } from '@angular/common'; interface BreadCrumbItem { name: string, index: number, @@ -25,15 +28,109 @@ export class AppComponent implements OnInit { sessionCheckTimer: any; iFrameName: string; - constructor(translate: TranslateService, private router: Router) { + constructor(translate: TranslateService, private router: Router, private oauthService: OAuthService, @Inject(DOCUMENT) private document: any, private ngZone: NgZone, private storage: OAuthStorage) { translate.setDefaultLang('fr'); translate.use('fr'); + this.iFrameName = "casemanagement-performance-idserver"; + this.configureWithNewConfigApi(); } ngOnInit(): void { this.listenRouting(); } + private configureWithNewConfigApi() { + authConfig.redirectUri = this.document.location.origin; + this.oauthService.configure(authConfig); + this.oauthService.tokenValidationHandler = new NullValidationHandler(); + this.oauthService.loadDiscoveryDocument().then((d: any) => { + let issuer = d.info.discoveryDocument.issuer; + let checkSessionIframe = d.info.discoveryDocument.check_session_iframe; + this.initSessionCheck(issuer.toLowerCase(), checkSessionIframe.toLowerCase()); + return this.oauthService.tryLogin(); + }); + } + + private initSessionCheck(issuer: string, checkSessionIFrame: string): void { + const existingIframe = document.getElementById(this.iFrameName); + if (existingIframe) { + document.body.removeChild(existingIframe); + } + + const iframe = document.createElement('iframe'); + iframe.id = this.iFrameName; + + this.setupSessionCheckEventListener(issuer); + + const url = checkSessionIFrame; + iframe.setAttribute('src', url); + iframe.style.display = 'none'; + document.body.appendChild(iframe); + this.startSessionCheckTimer(issuer); + } + + private startSessionCheckTimer(issuer: string): void { + this.stopSessionCheckTimer(); + this.ngZone.runOutsideAngular(() => { + this.sessionCheckTimer = setInterval( + this.checkSession.bind(this, issuer), + 3000 + ); + }); + } + + private checkSession(issuer: string): void { + const iframe: any = document.getElementById(this.iFrameName); + if (!iframe) { + console.log('checkSession did not find iframe'); + return; + } + + const sessionState = this.storage.getItem('session_state'); + if (!sessionState) { + this.stopSessionCheckTimer(); + } + + const message = this.oauthService.clientId + ' ' + sessionState; + iframe.contentWindow.postMessage(message, issuer); + } + + private setupSessionCheckEventListener(issuer: string): void { + this.removeSessionCheckEventListener(); + this.sessionCheckEventListener = (e: MessageEvent) => { + const origin = e.origin.toLowerCase(); + if (!issuer.startsWith(origin)) { + console.log('sessionCheckEventListener', 'wrong origin', origin, 'expected', issuer); + } + + switch (e.data) { + case 'changed': + case 'error': + this.stopSessionCheckTimer(); + this.oauthService.logOut(true); + break; + } + }; + + this.ngZone.runOutsideAngular(() => { + window.addEventListener('message', this.sessionCheckEventListener); + }); + } + + private stopSessionCheckTimer(): void { + if (this.sessionCheckTimer) { + clearInterval(this.sessionCheckTimer); + this.sessionCheckTimer = null; + } + } + + private removeSessionCheckEventListener(): void { + if (this.sessionCheckEventListener) { + window.removeEventListener('message', this.sessionCheckEventListener); + this.sessionCheckEventListener = null; + } + } + private listenRouting() { var self = this; let routerUrl: string; diff --git a/src/CaseManagement.Performance/angularApp/app/app.module.js b/src/CaseManagement.Performance/angularApp/app/app.module.js index 605529d1..31977b66 100644 --- a/src/CaseManagement.Performance/angularApp/app/app.module.js +++ b/src/CaseManagement.Performance/angularApp/app/app.module.js @@ -21,7 +21,8 @@ import { AuthGuard } from './infrastructure/auth-guard.service'; import { MaterialModule } from './shared/material.module'; import { SharedModule } from './shared/shared.module'; export function createTranslateLoader(http) { - return new TranslateHttpLoader(http, './assets/i18n/', '.json'); + var url = process.env.BASE_URL + 'assets/i18n/'; + return new TranslateHttpLoader(http, url, '.json'); } var AppModule = (function () { function AppModule() { diff --git a/src/CaseManagement.Performance/angularApp/app/app.module.js.map b/src/CaseManagement.Performance/angularApp/app/app.module.js.map index 2c8beb84..84547fe9 100644 --- a/src/CaseManagement.Performance/angularApp/app/app.module.js.map +++ b/src/CaseManagement.Performance/angularApp/app/app.module.js.map @@ -1 +1 @@ -{"version":3,"file":"app.module.js","sourceRoot":"","sources":["app.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,UAAU,qBAAqB,CAAC,IAAgB;IAClD,OAAO,IAAI,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;AACpE,CAAC;AAkCD;IAAA;IAAyB,CAAC;IAAb,SAAS;QAhCrB,QAAQ,CAAC;YACN,OAAO,EAAE;gBACL,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC;gBAC5B,YAAY;gBACZ,cAAc;gBACd,gBAAgB;gBAChB,UAAU;gBACV,kBAAkB;gBAClB,gBAAgB;gBAChB,uBAAuB;gBACvB,gBAAgB;gBAChB,WAAW,CAAC,OAAO,EAAE;gBACrB,eAAe,CAAC,OAAO,CAAC;oBACpB,MAAM,EAAE;wBACJ,OAAO,EAAE,eAAe;wBACxB,UAAU,EAAE,CAAC,qBAAqB,CAAC;wBACnC,IAAI,EAAE,CAAC,UAAU,CAAC;qBACrB;iBACJ,CAAC;aACL;YAED,YAAY,EAAE;gBACV,YAAY;aACf;YAED,SAAS,EAAE,CAAC,YAAY,CAAC;YAEzB,SAAS,EAAE;gBACP,SAAS;aACZ;SACJ,CAAC;OAEW,SAAS,CAAI;IAAD,gBAAC;CAAA,AAA1B,IAA0B;SAAb,SAAS"} \ No newline at end of file +{"version":3,"file":"app.module.js","sourceRoot":"","sources":["app.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,UAAU,qBAAqB,CAAC,IAAgB;IAClD,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,cAAc,CAAC;IAChD,OAAO,IAAI,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC;AAkCD;IAAA;IAAyB,CAAC;IAAb,SAAS;QAhCrB,QAAQ,CAAC;YACN,OAAO,EAAE;gBACL,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC;gBAC5B,YAAY;gBACZ,cAAc;gBACd,gBAAgB;gBAChB,UAAU;gBACV,kBAAkB;gBAClB,gBAAgB;gBAChB,uBAAuB;gBACvB,gBAAgB;gBAChB,WAAW,CAAC,OAAO,EAAE;gBACrB,eAAe,CAAC,OAAO,CAAC;oBACpB,MAAM,EAAE;wBACJ,OAAO,EAAE,eAAe;wBACxB,UAAU,EAAE,CAAC,qBAAqB,CAAC;wBACnC,IAAI,EAAE,CAAC,UAAU,CAAC;qBACrB;iBACJ,CAAC;aACL;YAED,YAAY,EAAE;gBACV,YAAY;aACf;YAED,SAAS,EAAE,CAAC,YAAY,CAAC;YAEzB,SAAS,EAAE;gBACP,SAAS;aACZ;SACJ,CAAC;OAEW,SAAS,CAAI;IAAD,gBAAC;CAAA,AAA1B,IAA0B;SAAb,SAAS"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/app.module.ts b/src/CaseManagement.Performance/angularApp/app/app.module.ts index 818349ce..19b1e84c 100644 --- a/src/CaseManagement.Performance/angularApp/app/app.module.ts +++ b/src/CaseManagement.Performance/angularApp/app/app.module.ts @@ -16,7 +16,8 @@ import { MaterialModule } from './shared/material.module'; import { SharedModule } from './shared/shared.module'; export function createTranslateLoader(http: HttpClient) { - return new TranslateHttpLoader(http, './assets/i18n/', '.json'); + let url = process.env.BASE_URL + 'assets/i18n/'; + return new TranslateHttpLoader(http, url, '.json'); } @NgModule({ @@ -46,9 +47,7 @@ export function createTranslateLoader(http: HttpClient) { bootstrap: [AppComponent], - providers: [ - AuthGuard - ] + providers: [ AuthGuard ] }) export class AppModule { } \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/app.routes.js b/src/CaseManagement.Performance/angularApp/app/app.routes.js index 9332e8af..0503e3c2 100644 --- a/src/CaseManagement.Performance/angularApp/app/app.routes.js +++ b/src/CaseManagement.Performance/angularApp/app/app.routes.js @@ -1,6 +1,6 @@ export var routes = [ { path: '', redirectTo: 'home', pathMatch: 'full' }, - { path: 'casedefinitions', loadChildren: './casedefinitions/casedefinitions.module#CaseDefinitionsModule' }, + { path: 'performances', loadChildren: './performances/performances.module#PerformancesModule' }, { path: '**', redirectTo: '/status/404' } ]; //# sourceMappingURL=app.routes.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/app.routes.js.map b/src/CaseManagement.Performance/angularApp/app/app.routes.js.map index ac810768..4ce25e19 100644 --- a/src/CaseManagement.Performance/angularApp/app/app.routes.js.map +++ b/src/CaseManagement.Performance/angularApp/app/app.routes.js.map @@ -1 +1 @@ -{"version":3,"file":"app.routes.js","sourceRoot":"","sources":["app.routes.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAM,MAAM,GAAW;IAC1B,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE;IACnD,EAAE,IAAI,EAAE,iBAAiB,EAAE,YAAY,EAAE,gEAAgE,EAAE;IAC3G,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE;CAC5C,CAAC"} \ No newline at end of file +{"version":3,"file":"app.routes.js","sourceRoot":"","sources":["app.routes.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAM,MAAM,GAAW;IAC1B,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE;IACnD,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,uDAAuD,EAAE;IAC/F,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE;CAC5C,CAAC"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/app.routes.ts b/src/CaseManagement.Performance/angularApp/app/app.routes.ts index d6492fa9..da0b2c0c 100644 --- a/src/CaseManagement.Performance/angularApp/app/app.routes.ts +++ b/src/CaseManagement.Performance/angularApp/app/app.routes.ts @@ -1,7 +1,11 @@ import { Routes } from '@angular/router'; +import { AuthGuard } from './infrastructure/auth-guard.service'; export const routes: Routes = [ { path: '', redirectTo: 'home', pathMatch: 'full' }, - { path: 'performances', loadChildren: './performances/performances.module#PerformancesModule' }, + { path: 'home', loadChildren: './home/home.module#HomeModule' }, + { path: 'statistics', loadChildren: './statistics/statistics.module#StatisticsModule', canActivate: [AuthGuard], data: { role: 'admin' } }, + { path: 'performances', loadChildren: './performances/performances.module#PerformancesModule', canActivate: [AuthGuard], data: { role: 'admin' } }, + { path: 'status', loadChildren: './status/status.module#StatusModule' }, { path: '**', redirectTo: '/status/404' } ]; \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/auth.config.js b/src/CaseManagement.Performance/angularApp/app/auth.config.js new file mode 100644 index 00000000..14f21f5c --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/auth.config.js @@ -0,0 +1,69 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +import { Component, ViewEncapsulation } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; +import { Router } from '@angular/router'; +var AppComponent = (function () { + function AppComponent(translate, router) { + this.router = router; + this.breadCrumbList = []; + translate.setDefaultLang('fr'); + translate.use('fr'); + } + AppComponent.prototype.ngOnInit = function () { + this.listenRouting(); + }; + AppComponent.prototype.listenRouting = function () { + var self = this; + var routerUrl; + var path; + var routerList; + this.router.events.subscribe(function (router) { + routerUrl = router.urlAfterRedirects; + if (!routerUrl || typeof routerUrl !== 'string') { + return; + } + path = ''; + self.breadCrumbList.length = 0; + if (routerUrl.includes('filter')) { + return; + } + routerList = routerUrl.slice(1).split('/'); + routerList.forEach(function (router, index) { + path += '/' + decodeURIComponent(router); + self.breadCrumbList.push({ + name: self.cleanUri(decodeURIComponent(router)), + index: index, + path: path, + isLast: index === routerList.length - 1 + }); + }); + }); + }; + AppComponent.prototype.cleanUri = function (uri) { + return uri.replace(/(\?.*)|(#.*)/g, ""); + }; + AppComponent = __decorate([ + Component({ + selector: 'app-component', + templateUrl: './app.component.html', + styleUrls: [ + './app.component.scss', + '../../node_modules/leaflet/dist/leaflet.css', + '../../node_modules/leaflet-search/dist/leaflet-search.src.css' + ], + encapsulation: ViewEncapsulation.None + }), + __metadata("design:paramtypes", [TranslateService, Router]) + ], AppComponent); + return AppComponent; +}()); +export { AppComponent }; +//# sourceMappingURL=app.component.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/auth.config.js.map b/src/CaseManagement.Performance/angularApp/app/auth.config.js.map new file mode 100644 index 00000000..ed9dded2 --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/auth.config.js.map @@ -0,0 +1 @@ +{"version":3,"file":"app.component.js","sourceRoot":"","sources":["app.component.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAU,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAmBzC;IAMI,sBAAY,SAA2B,EAAU,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAL/D,mBAAc,GAA0B,EAAE,CAAC;QAMvC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC/B,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,+BAAQ,GAAR;QACI,IAAI,CAAC,aAAa,EAAE,CAAC;IACzB,CAAC;IAEO,oCAAa,GAArB;QACI,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI,SAAiB,CAAC;QACtB,IAAI,IAAY,CAAC;QACjB,IAAI,UAAsB,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,UAAC,MAAW;YACrC,SAAS,GAAG,MAAM,CAAC,iBAAiB,CAAC;YACrC,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;gBAC7C,OAAO;aACV;YAED,IAAI,GAAG,EAAE,CAAC;YACV,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;YAC/B,IAAI,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAC9B,OAAO;aACV;YAED,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3C,UAAU,CAAC,OAAO,CAAC,UAAU,MAAM,EAAE,KAAK;gBACtC,IAAI,IAAI,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBACzC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;oBACrB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;oBAC/C,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,IAAI;oBACV,MAAM,EAAE,KAAK,KAAK,UAAU,CAAC,MAAM,GAAG,CAAC;iBAC1C,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,+BAAQ,GAAhB,UAAiB,GAAW;QACxB,OAAO,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC;IA/CQ,YAAY;QAXxB,SAAS,CAAC;YACP,QAAQ,EAAE,eAAe;YACzB,WAAW,EAAE,sBAAsB;YACnC,SAAS,EAAE;gBACP,sBAAsB;gBACtB,6CAA6C;gBAC7C,+DAA+D;aAClE;YACD,aAAa,EAAE,iBAAiB,CAAC,IAAI;SACxC,CAAC;yCAQyB,gBAAgB,EAAkB,MAAM;OANtD,YAAY,CAgDxB;IAAD,mBAAC;CAAA,AAhDD,IAgDC;SAhDY,YAAY"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/auth.config.ts b/src/CaseManagement.Performance/angularApp/app/auth.config.ts new file mode 100644 index 00000000..8d139796 --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/auth.config.ts @@ -0,0 +1,10 @@ + +import { AuthConfig } from 'angular-oauth2-oidc'; + +export const authConfig: AuthConfig = { + issuer: 'http://localhost:60000', + clientId: 'caseManagementPerformanceWebsite', + scope: 'openid profile email role', + redirectUri: window.location.origin, + disableAtHashCheck: true +} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.html b/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.html index ae25cf07..4b08bbfc 100644 --- a/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.html +++ b/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.html @@ -1,9 +1,21 @@ - + - +
+ + + + + + +
+
+ +
diff --git a/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.js b/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.js index c42a5a24..742c2698 100644 --- a/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.js +++ b/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.js @@ -12,6 +12,7 @@ import { TranslateService } from '@ngx-translate/core'; var NavigationComponent = (function () { function NavigationComponent(translateService) { this.translateService = translateService; + this.url = process.env.BASE_URL + "/assets/images/logo.svg"; } NavigationComponent.prototype.chooseLanguage = function (lng) { this.translateService.use(lng); diff --git a/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.js.map b/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.js.map index a0b2c10c..cc85145c 100644 --- a/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.js.map +++ b/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.js.map @@ -1 +1 @@ -{"version":3,"file":"navigation.component.js","sourceRoot":"","sources":["navigation.component.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAQvD;IACI,6BAAoB,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAI,CAAC;IAE3D,4CAAc,GAAd,UAAe,GAAW;QACtB,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,sCAAQ,GAAR;IAEA,CAAC;IATQ,mBAAmB;QAN/B,SAAS,CAAC;YACP,QAAQ,EAAE,gBAAgB;YAC1B,WAAW,EAAE,2BAA2B;YACxC,SAAS,EAAE,CAAC,6BAA6B,CAAC;SAC7C,CAAC;yCAGwC,gBAAgB;OAD7C,mBAAmB,CAU/B;IAAD,0BAAC;CAAA,AAVD,IAUC;SAVY,mBAAmB"} \ No newline at end of file +{"version":3,"file":"navigation.component.js","sourceRoot":"","sources":["navigation.component.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAQvD;IAGI,6BAAoB,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAFtD,QAAG,GAAW,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,yBAAyB,CAAC;IAEL,CAAC;IAE3D,4CAAc,GAAd,UAAe,GAAW;QACtB,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,sCAAQ,GAAR;IAEA,CAAC;IAXQ,mBAAmB;QAN/B,SAAS,CAAC;YACP,QAAQ,EAAE,gBAAgB;YAC1B,WAAW,EAAE,2BAA2B;YACxC,SAAS,EAAE,CAAC,6BAA6B,CAAC;SAC7C,CAAC;yCAKwC,gBAAgB;OAH7C,mBAAmB,CAY/B;IAAD,0BAAC;CAAA,AAZD,IAYC;SAZY,mBAAmB"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.scss b/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.scss index e69de29b..03c0e428 100644 --- a/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.scss +++ b/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.scss @@ -0,0 +1,3 @@ +.navigation-spacer { + flex: 1 1 auto; +} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.ts b/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.ts index b14879c0..8b47e4d6 100644 --- a/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.ts +++ b/src/CaseManagement.Performance/angularApp/app/common/components/navigation/navigation.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { OAuthService } from 'angular-oauth2-oidc'; +import { Router } from '@angular/router'; @Component({ selector: 'app-navigation', @@ -8,13 +10,48 @@ import { TranslateService } from '@ngx-translate/core'; }) export class NavigationComponent implements OnInit { - constructor(private translateService: TranslateService) { } + url: string = process.env.BASE_URL + "assets/images/logo.svg"; + isConnected: boolean = false; + name: string; + roles: any; + + constructor(private translateService: TranslateService, private oauthService: OAuthService, private router: Router) { } chooseLanguage(lng: string) { this.translateService.use(lng); } - ngOnInit() { + login() { + this.oauthService.initImplicitFlow(); + return false; + } + + disconnect() { + this.oauthService.logOut(); + this.router.navigate(['/home']); + return false; + } + init() { + var claims: any = this.oauthService.getIdentityClaims(); + if (!claims) { + this.isConnected = false; + return; + } + + this.name = claims.given_name; + this.roles = claims.role; + this.isConnected = true; + } + + ngOnInit() { + this.init(); + this.oauthService.events.subscribe((e: any) => { + if (e.type === "logout") { + this.isConnected = false; + } else if (e.type === "token_received") { + this.init(); + } + }); } } diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home-actions.js.map b/src/CaseManagement.Performance/angularApp/app/home/components/home-actions.js.map deleted file mode 100644 index 6903e170..00000000 --- a/src/CaseManagement.Performance/angularApp/app/home/components/home-actions.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"home-actions.js","sourceRoot":"","sources":["home-actions.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,WAUX;AAVD,WAAY,WAAW;IACnB,iDAAkC,CAAA;IAClC,qDAAsC,CAAA;IACtC,4DAA6C,CAAA;IAC7C,kEAAmD,CAAA;IACnD,oEAAqD,CAAA;IACrD,uEAAwD,CAAA;IACxD,oEAAqD,CAAA;IACrD,sEAAuD,CAAA;IACvD,yEAA0D,CAAA;AAC9D,CAAC,EAVW,WAAW,KAAX,WAAW,QAUtB;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,aAAa,CAAA;IAChB,CAAC;IACrB,0BAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,+BAAmB,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;QADzC,SAAI,GAAG,WAAW,CAAC,eAAe,CAAA;IACW,CAAC;IAClD,4BAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,oBAAoB,CAAA;IACvB,CAAC;IACrB,+BAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,oCAAmB,MAAmC;QAAnC,WAAM,GAAN,MAAM,CAA6B;QADtD,SAAI,GAAG,WAAW,CAAC,oBAAoB,CAAA;IACmB,CAAC;IAC/D,iCAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,qBAAqB,CAAA;IACxB,CAAC;IACrB,gCAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,qCAAmB,MAAmC;QAAnC,WAAM,GAAN,MAAM,CAA6B;QADtD,SAAI,GAAG,WAAW,CAAC,qBAAqB,CAAA;IACkB,CAAC;IAC/D,kCAAC;AAAD,CAAC,AAHD,IAGC"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home-effects.js b/src/CaseManagement.Performance/angularApp/app/home/components/home-effects.js deleted file mode 100644 index b37719cd..00000000 --- a/src/CaseManagement.Performance/angularApp/app/home/components/home-effects.js +++ /dev/null @@ -1,71 +0,0 @@ -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); -}; -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { of } from 'rxjs'; -import { catchError, map, mergeMap } from 'rxjs/operators'; -import { StatisticService } from '../services/statistic.service'; -import { ActionTypes } from './home-actions'; -function getFirstDayOfMonth() { - var date = new Date(), y = date.getFullYear(), m = date.getMonth(); - return getDate(new Date(y, m, 1)); -} -function getCurrentMonday() { - var d = new Date(); - var day = d.getDay(), diff = d.getDate() - day + (day == 0 ? -6 : 1); - return getDate(new Date(d.setDate(diff))); -} -function getDate(d) { - return d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate(); -} -var HomeEffects = (function () { - function HomeEffects(actions$, statisticService) { - var _this = this; - this.actions$ = actions$; - this.statisticService = statisticService; - this.loadStatistic = this.actions$ - .pipe(ofType(ActionTypes.STATISTICLOAD), mergeMap(function () { - return _this.statisticService.get() - .pipe(map(function (statistic) { return { type: ActionTypes.STATISTICLOADED, result: statistic }; }), catchError(function () { return of({ type: ActionTypes.ERRORLOADSTATISTIC }); })); - })); - this.searchWeekStatistics = this.actions$ - .pipe(ofType(ActionTypes.SEARCHWEEKSTATISTICS), mergeMap(function (evt) { - var date = getCurrentMonday(); - return _this.statisticService.search(evt.startIndex, evt.count, evt.order, evt.direction, date, null) - .pipe(map(function (statistic) { return { type: ActionTypes.WEEKSTATISTICSLOADED, result: statistic }; }), catchError(function () { return of({ type: ActionTypes.ERRORWEEKSTATISTICS }); })); - })); - this.searchMonthStatistics = this.actions$ - .pipe(ofType(ActionTypes.SEARCHMONTHSTATISTICS), mergeMap(function (evt) { - var date = getFirstDayOfMonth(); - return _this.statisticService.search(evt.startIndex, evt.count, evt.order, evt.direction, date, null) - .pipe(map(function (statistic) { return { type: ActionTypes.MONTHSTATISTICSLOADED, result: statistic }; }), catchError(function () { return of({ type: ActionTypes.ERRORMONTHSTATISTICS }); })); - })); - } - __decorate([ - Effect(), - __metadata("design:type", Object) - ], HomeEffects.prototype, "loadStatistic", void 0); - __decorate([ - Effect(), - __metadata("design:type", Object) - ], HomeEffects.prototype, "searchWeekStatistics", void 0); - __decorate([ - Effect(), - __metadata("design:type", Object) - ], HomeEffects.prototype, "searchMonthStatistics", void 0); - HomeEffects = __decorate([ - Injectable(), - __metadata("design:paramtypes", [Actions, - StatisticService]) - ], HomeEffects); - return HomeEffects; -}()); -export { HomeEffects }; -//# sourceMappingURL=home-effects.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home-effects.js.map b/src/CaseManagement.Performance/angularApp/app/home/components/home-effects.js.map deleted file mode 100644 index 91a62d6a..00000000 --- a/src/CaseManagement.Performance/angularApp/app/home/components/home-effects.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"home-effects.js","sourceRoot":"","sources":["home-effects.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home-reducer.js b/src/CaseManagement.Performance/angularApp/app/home/components/home-reducer.js deleted file mode 100644 index 3dc3e191..00000000 --- a/src/CaseManagement.Performance/angularApp/app/home/components/home-reducer.js +++ /dev/null @@ -1,79 +0,0 @@ -var __assign = (this && this.__assign) || function () { - __assign = Object.assign || function(t) { - for (var s, i = 1, n = arguments.length; i < n; i++) { - s = arguments[i]; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) - t[p] = s[p]; - } - return t; - }; - return __assign.apply(this, arguments); -}; -import { ActionTypes } from './home-actions'; -var initialStatisticAction = { - content: null, - isLoading: true, - isErrorLoadOccured: false -}; -var initialWeekStatisticAction = { - content: null, - isLoading: true, - isErrorLoadOccured: false -}; -var initialMonthStatisticAction = { - content: null, - isLoading: true, - isErrorLoadOccured: false -}; -export function statisticReducer(state, action) { - if (state === void 0) { state = initialStatisticAction; } - switch (action.type) { - case ActionTypes.STATISTICLOADED: - var statisticLoadedAction = action; - state.content = statisticLoadedAction.result; - state.isLoading = false; - state.isErrorLoadOccured = false; - return __assign({}, state); - case ActionTypes.ERRORLOADSTATISTIC: - state.isErrorLoadOccured = true; - state.isLoading = false; - return __assign({}, state); - default: - return state; - } -} -export function weekStatisticsReducer(state, action) { - if (state === void 0) { state = initialWeekStatisticAction; } - switch (action.type) { - case ActionTypes.WEEKSTATISTICSLOADED: - var statisticLoadedAction = action; - state.content = statisticLoadedAction.result; - state.isLoading = false; - state.isErrorLoadOccured = false; - return __assign({}, state); - case ActionTypes.ERRORWEEKSTATISTICS: - state.isErrorLoadOccured = true; - state.isLoading = false; - return __assign({}, state); - default: - return state; - } -} -export function monthStatisticsReducer(state, action) { - if (state === void 0) { state = initialMonthStatisticAction; } - switch (action.type) { - case ActionTypes.MONTHSTATISTICSLOADED: - var statisticLoadedAction = action; - state.content = statisticLoadedAction.result; - state.isLoading = false; - state.isErrorLoadOccured = false; - return __assign({}, state); - case ActionTypes.ERRORMONTHSTATISTICS: - state.isErrorLoadOccured = true; - state.isLoading = false; - return __assign({}, state); - default: - return state; - } -} -//# sourceMappingURL=home-reducer.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home-reducer.js.map b/src/CaseManagement.Performance/angularApp/app/home/components/home-reducer.js.map deleted file mode 100644 index 0cb550e7..00000000 --- a/src/CaseManagement.Performance/angularApp/app/home/components/home-reducer.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"home-reducer.js","sourceRoot":"","sources":["home-reducer.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAgB,WAAW,EAAkF,MAAM,gBAAgB,CAAC;AAG3I,IAAM,sBAAsB,GAAmB;IAC3C,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,KAAK;CAC5B,CAAC;AAEF,IAAM,0BAA0B,GAAwB;IACpD,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,KAAK;CAC5B,CAAC;AAEF,IAAM,2BAA2B,GAAyB;IACtD,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,KAAK;CAC5B,CAAC;AAEF,MAAM,UAAU,gBAAgB,CAAC,KAA8B,EAAE,MAAoB;IAApD,sBAAA,EAAA,8BAA8B;IAC3D,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,WAAW,CAAC,eAAe;YAC5B,IAAI,qBAAqB,GAA0B,MAAM,CAAC;YAC1D,KAAK,CAAC,OAAO,GAAG,qBAAqB,CAAC,MAAM,CAAC;YAC7C,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,oBAAY,KAAK,EAAG;QACxB,KAAK,WAAW,CAAC,kBAAkB;YAC/B,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAChC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,oBAAY,KAAK,EAAG;QACxB;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAkC,EAAE,MAAoB;IAAxD,sBAAA,EAAA,kCAAkC;IACpE,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,WAAW,CAAC,oBAAoB;YACjC,IAAI,qBAAqB,GAA+B,MAAM,CAAC;YAC/D,KAAK,CAAC,OAAO,GAAG,qBAAqB,CAAC,MAAM,CAAC;YAC7C,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,oBAAY,KAAK,EAAG;QACxB,KAAK,WAAW,CAAC,mBAAmB;YAChC,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAChC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,oBAAY,KAAK,EAAG;QACxB;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAAmC,EAAE,MAAoB;IAAzD,sBAAA,EAAA,mCAAmC;IACtE,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,WAAW,CAAC,qBAAqB;YAClC,IAAI,qBAAqB,GAAgC,MAAM,CAAC;YAChE,KAAK,CAAC,OAAO,GAAG,qBAAqB,CAAC,MAAM,CAAC;YAC7C,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,oBAAY,KAAK,EAAG;QACxB,KAAK,WAAW,CAAC,oBAAoB;YACjC,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAChC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,oBAAY,KAAK,EAAG;QACxB;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home.component.html b/src/CaseManagement.Performance/angularApp/app/home/components/home.component.html index 7a371f79..c40b897e 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/components/home.component.html +++ b/src/CaseManagement.Performance/angularApp/app/home/components/home.component.html @@ -1,185 +1,5 @@ -
-
-
-
-
- - - {{ "RIGHT_NOW" | translate }} - - -
-
-

{{ "CASE_STATUS" | translate }}

- - -
-
-

{{ "FORM_STATUS" | translate }}

- - -
-
-

{{ "ACTIVATION_STATUS" | translate }}

- - -
-
- - - - - {{ "METRICS" | translate }} - - - - -
-
-
-

{{ "CASE_STATUS" | translate }}

- - - -
-
-

{{ "FORM_STATUS" | translate }}

- - - -
-
-
-

{{ "ACTIVATION_STATUS" | translate }}

- - - -
-
- - -
-
-
-

{{ "CASE_STATUS" | translate }}

- - - -
-
-

{{ "FORM_STATUS" | translate }}

- - - -
-
-
-

{{ "ACTIVATION_STATUS" | translate }}

- - - -
-
- - - - -
-
-
- - - {{ "DEPLOYED" | translate }} - - - - -

{{ "CASE_FILES" | translate }}

-

{{ nbCaseFiles }}

- - -

{{ "CASE_DEFINITIONS" | translate}}

-

{{ nbCaseDefinitions }}

- - - - -
-
+
+
+
{{ "HOME" | translate }}
\ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home.component.js b/src/CaseManagement.Performance/angularApp/app/home/components/home.component.js index a3d2d7eb..445b3a13 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/components/home.component.js +++ b/src/CaseManagement.Performance/angularApp/app/home/components/home.component.js @@ -10,11 +10,16 @@ var __metadata = (this && this.__metadata) || function (k, v) { import { Component } from '@angular/core'; import { select, Store } from '@ngrx/store'; import { ActionTypes } from './home-actions'; +import { DatePipe } from '@angular/common'; var HomeComponent = (function () { - function HomeComponent(statisticStore, weekStatisticStore, monthStatisticStore) { + function HomeComponent(statisticStore, weekStatisticStore, monthStatisticStore, deployedStore, datePipe) { this.statisticStore = statisticStore; this.weekStatisticStore = weekStatisticStore; this.monthStatisticStore = monthStatisticStore; + this.deployedStore = deployedStore; + this.datePipe = datePipe; + this.nbCaseDefinitions = 0; + this.nbCaseFiles = 0; this.viewPie = [300, 300]; this.viewChart = [500, 300]; this.caseStatistic = [ @@ -167,6 +172,7 @@ var HomeComponent = (function () { } HomeComponent.prototype.ngOnInit = function () { var _this = this; + var self = this; this.statisticSubscription = this.statisticStore.pipe(select('statistic')).subscribe(function (st) { if (!st) { return; @@ -273,43 +279,43 @@ var HomeComponent = (function () { ]; st.content.Content.forEach(function (elt) { caseWeekResult_1[0].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbActiveCases }); caseWeekResult_1[1].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbCompletedCases }); caseWeekResult_1[2].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbTerminatedCases }); caseWeekResult_1[3].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbFailedCases }); caseWeekResult_1[4].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbSuspendedCases }); caseWeekResult_1[5].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbClosedCases }); formWeekResult_1[0].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbCreatedForms }); formWeekResult_1[1].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbConfirmedForms }); activationWeekResult_1[0].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbCreatedForms }); activationWeekResult_1[1].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbConfirmedForms }); }); @@ -371,43 +377,43 @@ var HomeComponent = (function () { ]; st.content.Content.forEach(function (elt) { caseMonthResult_1[0].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbActiveCases }); caseMonthResult_1[1].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbCompletedCases }); caseMonthResult_1[2].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbTerminatedCases }); caseMonthResult_1[3].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbFailedCases }); caseMonthResult_1[4].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbSuspendedCases }); caseMonthResult_1[5].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbClosedCases }); formMonthResult_1[0].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbCreatedForms }); formMonthResult_1[1].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbConfirmedForms }); activationMonthResult_1[0].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbCreatedForms }); activationMonthResult_1[1].series.push({ - "name": elt.DateTime, + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), "value": elt.NbConfirmedForms }); }); @@ -416,6 +422,12 @@ var HomeComponent = (function () { _this.activationMonthStatistic = activationMonthResult_1; } }); + this.deployedSubscription = this.deployedStore.pipe(select('deployed')).subscribe(function (st) { + if (st.nbCaseDefinitions) { + _this.nbCaseDefinitions = st.nbCaseDefinitions.Count; + _this.nbCaseFiles = st.nbCaseFiles.Count; + } + }); this.refresh(); }; HomeComponent.prototype.refresh = function () { @@ -430,9 +442,13 @@ var HomeComponent = (function () { type: ActionTypes.SEARCHMONTHSTATISTICS, count: 100 }; + var loadDeployedRequest = { + type: ActionTypes.DEPLOYEDLOAD + }; this.statisticStore.dispatch(loadStatisticRequest); this.weekStatisticStore.dispatch(loadWeekStatisticsRequest); this.monthStatisticStore.dispatch(loadMonthStatisticsRequest); + this.deployedStore.dispatch(loadDeployedRequest); }; HomeComponent.prototype.ngOnDestroy = function () { this.statisticSubscription.unsubscribe(); @@ -445,7 +461,7 @@ var HomeComponent = (function () { templateUrl: './home.component.html', styleUrls: ['./home.component.scss'] }), - __metadata("design:paramtypes", [Store, Store, Store]) + __metadata("design:paramtypes", [Store, Store, Store, Store, DatePipe]) ], HomeComponent); return HomeComponent; }()); diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home.component.js.map b/src/CaseManagement.Performance/angularApp/app/home/components/home.component.js.map index 06fe6d87..4b3c4c26 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/components/home.component.js.map +++ b/src/CaseManagement.Performance/angularApp/app/home/components/home.component.js.map @@ -1 +1 @@ -{"version":3,"file":"home.component.js","sourceRoot":"","sources":["home.component.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"home.component.js","sourceRoot":"","sources":["home.component.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home.component.ts b/src/CaseManagement.Performance/angularApp/app/home/components/home.component.ts index cacc2132..03055eec 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/components/home.component.ts +++ b/src/CaseManagement.Performance/angularApp/app/home/components/home.component.ts @@ -1,462 +1,8 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { select, Store } from '@ngrx/store'; -import { DailyStatistic } from '../models/dailystatistic.model'; -import { ActionTypes } from './home-actions'; -import * as fromHomeSates from './home-states'; -import { DatePipe } from '@angular/common'; +import { Component } from '@angular/core'; @Component({ selector: 'app-home-component', templateUrl: './home.component.html', styleUrls: ['./home.component.scss'] }) -export class HomeComponent implements OnInit, OnDestroy { - statisticSubscription: any; - weekSubscription: any; - monthSubscription: any; - deployedSubscription: any; - nbCaseDefinitions: number = 0; - nbCaseFiles: number = 0; - viewPie: any[] = [300, 300]; - viewChart: any[] = [500, 300]; - caseStatistic: any[] = [ - { - "name": "Active", - "value": 0 - }, - { - "name": "Completed", - "value": 0 - }, - { - "name": "Terminated", - "value": 0 - }, - { - "name": "Failed", - "value": 0 - }, - { - "name": "Suspended", - "value": 0 - }, - { - "name": "Closed", - "value": 0 - } - ]; - caseStatisticColorScheme = { - domain: ['#d3d3d3', '#008000', '#ffff00', '#FF0000', '#FFA500', '#808080'] - }; - caseWeekStatistic: any[] = [ - { - "name": "Active", - "series": [] - }, - { - "name": "Completed", - "series": [] - }, - { - "name": "Terminated", - "series": [] - }, - { - "name": "Failed", - "series": [] - }, - { - "name": "Suspended", - "series": [] - }, - { - "name": "Closed", - "series": [] - } - ]; - caseMonthStatistic: any[] = [ - { - "name": "Active", - "series": [] - }, - { - "name": "Completed", - "series": [] - }, - { - "name": "Terminated", - "series": [] - }, - { - "name": "Failed", - "series": [] - }, - { - "name": "Suspended", - "series": [] - }, - { - "name": "Closed", - "series": [] - } - ]; - formStatistic: any[] = [ - { - "name": "Created", - "value": 0 - }, - { - "name": "Confirmed", - "value": 0 - } - ]; - formStatisticColorScheme = { - domain: ['#808080', '#008000'] - }; - formWeekStatistic: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - formMonthStatistic: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - activationStatisticColorScheme = { - domain: ['#808080', '#008000'] - }; - activationStatistic: any[] = [ - { - "name": "Created", - "value": 0 - }, - { - "name": "Confirmed", - "value": 0 - } - ]; - activationWeekStatistic: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - activationMonthStatistic: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - constructor(private statisticStore: Store, private weekStatisticStore: Store, private monthStatisticStore: Store, private deployedStore : Store, private datePipe: DatePipe) { } - - ngOnInit() { - let self = this; - this.statisticSubscription = this.statisticStore.pipe(select('statistic')).subscribe((st: fromHomeSates.StatisticState) => { - if (!st) { - return; - } - - if (st.content) { - this.caseStatistic = [ - { - "name": "Active", - "value": st.content.NbActiveCases - }, - { - "name": "Completed", - "value": st.content.NbCompletedCases - }, - { - "name": "Terminated", - "value": st.content.NbTerminatedCases - }, - { - "name": "Failed", - "value": st.content.NbFailedCases - }, - { - "name": "Suspended", - "value": st.content.NbSuspendedCases - }, - { - "name": "Closed", - "value": st.content.NbClosedCases - } - ]; - this.formStatistic = [ - { - "name": "Created", - "value": st.content.NbCreatedForms - }, - { - "name": "Confirmed", - "value": st.content.NbConfirmedForms - } - ]; - this.activationStatistic = [ - { - "name": "Created", - "value": st.content.NbCreatedActivation - }, - { - "name": "Confirmed", - "value": st.content.NbConfirmedActivation - } - ]; - } - }); - this.weekSubscription = this.weekStatisticStore.pipe(select('weekStatistics')).subscribe((st: fromHomeSates.WeekStatisticsState) => { - if (!st) { - return; - } - - if (st.content) { - let caseWeekResult: any[] = [ - { - "name": "Active", - "series": [] - }, - { - "name": "Completed", - "series": [] - }, - { - "name": "Terminated", - "series": [] - }, - { - "name": "Failed", - "series": [] - }, - { - "name": "Suspended", - "series": [] - }, - { - "name": "Closed", - "series": [] - } - ]; - let formWeekResult: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - let activationWeekResult: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - st.content.Content.forEach(function (elt: DailyStatistic) { - caseWeekResult[0].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbActiveCases - }); - caseWeekResult[1].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbCompletedCases - }); - caseWeekResult[2].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbTerminatedCases - }); - caseWeekResult[3].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbFailedCases - }); - caseWeekResult[4].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbSuspendedCases - }); - caseWeekResult[5].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbClosedCases - }); - formWeekResult[0].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbCreatedForms - }); - formWeekResult[1].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbConfirmedForms - }); - activationWeekResult[0].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbCreatedForms - }); - activationWeekResult[1].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbConfirmedForms - }); - }); - - this.caseWeekStatistic = caseWeekResult; - this.formWeekStatistic = formWeekResult; - this.activationWeekStatistic = activationWeekResult; - } - }); - this.monthSubscription = this.monthStatisticStore.pipe(select('monthStatistics')).subscribe((st: fromHomeSates.WeekStatisticsState) => { - if (!st) { - return; - } - - if (st.content) { - let caseMonthResult: any[] = [ - { - "name": "Active", - "series": [] - }, - { - "name": "Completed", - "series": [] - }, - { - "name": "Terminated", - "series": [] - }, - { - "name": "Failed", - "series": [] - }, - { - "name": "Suspended", - "series": [] - }, - { - "name": "Closed", - "series": [] - } - ]; - let formMonthResult: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - let activationMonthResult: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - st.content.Content.forEach(function (elt: DailyStatistic) { - caseMonthResult[0].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbActiveCases - }); - caseMonthResult[1].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbCompletedCases - }); - caseMonthResult[2].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbTerminatedCases - }); - caseMonthResult[3].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbFailedCases - }); - caseMonthResult[4].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbSuspendedCases - }); - caseMonthResult[5].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbClosedCases - }); - formMonthResult[0].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbCreatedForms - }); - formMonthResult[1].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbConfirmedForms - }); - activationMonthResult[0].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbCreatedForms - }); - activationMonthResult[1].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbConfirmedForms - }); - }); - - this.caseMonthStatistic = caseMonthResult; - this.formMonthStatistic = formMonthResult; - this.activationMonthStatistic = activationMonthResult; - } - }); - this.deployedSubscription = this.deployedStore.pipe(select('deployed')).subscribe((st: fromHomeSates.DeployedState) => { - if (st.nbCaseDefinitions) { - this.nbCaseDefinitions = st.nbCaseDefinitions.Count; - this.nbCaseFiles = st.nbCaseFiles.Count; - } - }); - this.refresh(); - } - - refresh() { - let loadStatisticRequest: any = { - type: ActionTypes.STATISTICLOAD - }; - let loadWeekStatisticsRequest: any = { - type: ActionTypes.SEARCHWEEKSTATISTICS, - count: 100 - }; - let loadMonthStatisticsRequest: any = { - type: ActionTypes.SEARCHMONTHSTATISTICS, - count: 100 - }; - let loadDeployedRequest: any = { - type: ActionTypes.DEPLOYEDLOAD - }; - this.statisticStore.dispatch(loadStatisticRequest); - this.weekStatisticStore.dispatch(loadWeekStatisticsRequest); - this.monthStatisticStore.dispatch(loadMonthStatisticsRequest); - this.deployedStore.dispatch(loadDeployedRequest); - } - - ngOnDestroy() { - this.statisticSubscription.unsubscribe(); - this.weekSubscription.unsubscribe(); - this.monthSubscription.unsubscribe(); - } -} +export class HomeComponent { } \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/home.module.js b/src/CaseManagement.Performance/angularApp/app/home/home.module.js index b016a2dc..ac23b0bf 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/home.module.js +++ b/src/CaseManagement.Performance/angularApp/app/home/home.module.js @@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; -import { CommonModule } from '@angular/common'; +import { CommonModule, DatePipe } from '@angular/common'; import { HttpClientModule } from '@angular/common/http'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -18,6 +18,8 @@ import { HomeEffects } from './components/home-effects'; import * as fromHomeReducer from './components/home-reducer'; import { HomeComponent } from './components/home.component'; import { HomeRoutes } from './home.routes'; +import { CaseDefinitionsService } from './services/casedefinitions.service'; +import { CaseFilesService } from './services/casefiles.service'; import { StatisticService } from './services/statistic.service'; var HomeModule = (function () { function HomeModule() { @@ -36,7 +38,8 @@ var HomeModule = (function () { StoreModule.forRoot({ statistic: fromHomeReducer.statisticReducer, weekStatistics: fromHomeReducer.weekStatisticsReducer, - monthStatistics: fromHomeReducer.monthStatisticsReducer + monthStatistics: fromHomeReducer.monthStatisticsReducer, + deployed: fromHomeReducer.deployedReducer }), StoreDevtoolsModule.instrument({ maxAge: 10 @@ -49,7 +52,10 @@ var HomeModule = (function () { HomeComponent ], providers: [ - StatisticService + StatisticService, + CaseFilesService, + CaseDefinitionsService, + DatePipe ] }) ], HomeModule); diff --git a/src/CaseManagement.Performance/angularApp/app/home/home.module.js.map b/src/CaseManagement.Performance/angularApp/app/home/home.module.js.map index b8811497..2cc57806 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/home.module.js.map +++ b/src/CaseManagement.Performance/angularApp/app/home/home.module.js.map @@ -1 +1 @@ -{"version":3,"file":"home.module.js","sourceRoot":"","sources":["home.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,eAAe,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAmChE;IAAA;IAA0B,CAAC;IAAd,UAAU;QAjCtB,QAAQ,CAAC;YACN,OAAO,EAAE;gBACL,YAAY;gBACZ,eAAe;gBACf,WAAW;gBACX,gBAAgB;gBAChB,UAAU;gBACV,cAAc;gBACd,YAAY;gBACZ,aAAa,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC;gBACpC,WAAW,CAAC,OAAO,CAAC;oBAChB,SAAS,EAAE,eAAe,CAAC,gBAAgB;oBAC3C,cAAc,EAAE,eAAe,CAAC,qBAAqB;oBACrD,eAAe,EAAE,eAAe,CAAC,sBAAsB;iBAC1D,CAAC;gBACF,mBAAmB,CAAC,UAAU,CAAC;oBAC3B,MAAM,EAAE,EAAE;iBACb,CAAC;aACL;YAED,YAAY,EAAE;gBACV,aAAa;aAChB;YAED,OAAO,EAAE;gBACL,aAAa;aAChB;YAED,SAAS,EAAE;gBACP,gBAAgB;aACnB;SACJ,CAAC;OAEW,UAAU,CAAI;IAAD,iBAAC;CAAA,AAA3B,IAA2B;SAAd,UAAU"} \ No newline at end of file +{"version":3,"file":"home.module.js","sourceRoot":"","sources":["home.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,eAAe,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAuChE;IAAA;IAA0B,CAAC;IAAd,UAAU;QArCtB,QAAQ,CAAC;YACN,OAAO,EAAE;gBACL,YAAY;gBACZ,eAAe;gBACf,WAAW;gBACX,gBAAgB;gBAChB,UAAU;gBACV,cAAc;gBACd,YAAY;gBACZ,aAAa,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC;gBACpC,WAAW,CAAC,OAAO,CAAC;oBAChB,SAAS,EAAE,eAAe,CAAC,gBAAgB;oBAC3C,cAAc,EAAE,eAAe,CAAC,qBAAqB;oBACrD,eAAe,EAAE,eAAe,CAAC,sBAAsB;oBACvD,QAAQ,EAAE,eAAe,CAAC,eAAe;iBAC5C,CAAC;gBACF,mBAAmB,CAAC,UAAU,CAAC;oBAC3B,MAAM,EAAE,EAAE;iBACb,CAAC;aACL;YAED,YAAY,EAAE;gBACV,aAAa;aAChB;YAED,OAAO,EAAE;gBACL,aAAa;aAChB;YAED,SAAS,EAAE;gBACP,gBAAgB;gBAChB,gBAAgB;gBAChB,sBAAsB;gBACtB,QAAQ;aACX;SACJ,CAAC;OAEW,UAAU,CAAI;IAAD,iBAAC;CAAA,AAA3B,IAA2B;SAAd,UAAU"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/home.module.ts b/src/CaseManagement.Performance/angularApp/app/home/home.module.ts index fccf4505..7bf9045e 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/home.module.ts +++ b/src/CaseManagement.Performance/angularApp/app/home/home.module.ts @@ -1,20 +1,12 @@ -import { CommonModule, DatePipe } from '@angular/common'; +import { CommonModule } from '@angular/common'; import { HttpClientModule } from '@angular/common/http'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { EffectsModule } from '@ngrx/effects'; -import { StoreModule } from '@ngrx/store'; -import { StoreDevtoolsModule } from '@ngrx/store-devtools'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { MaterialModule } from '../shared/material.module'; import { SharedModule } from '../shared/shared.module'; -import { HomeEffects } from './components/home-effects'; -import * as fromHomeReducer from './components/home-reducer'; import { HomeComponent } from './components/home.component'; import { HomeRoutes } from './home.routes'; -import { CaseDefinitionsService } from './services/casedefinitions.service'; -import { CaseFilesService } from './services/casefiles.service'; -import { StatisticService } from './services/statistic.service'; @NgModule({ imports: [ @@ -24,17 +16,7 @@ import { StatisticService } from './services/statistic.service'; HttpClientModule, HomeRoutes, MaterialModule, - SharedModule, - EffectsModule.forRoot([HomeEffects]), - StoreModule.forRoot({ - statistic: fromHomeReducer.statisticReducer, - weekStatistics: fromHomeReducer.weekStatisticsReducer, - monthStatistics: fromHomeReducer.monthStatisticsReducer, - deployed: fromHomeReducer.deployedReducer - }), - StoreDevtoolsModule.instrument({ - maxAge: 10 - }) + SharedModule ], declarations: [ @@ -46,10 +28,6 @@ import { StatisticService } from './services/statistic.service'; ], providers: [ - StatisticService, - CaseFilesService, - CaseDefinitionsService, - DatePipe ] }) diff --git a/src/CaseManagement.Performance/angularApp/app/home/home.routes.ts b/src/CaseManagement.Performance/angularApp/app/home/home.routes.ts index 32decc26..08ad2171 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/home.routes.ts +++ b/src/CaseManagement.Performance/angularApp/app/home/home.routes.ts @@ -3,7 +3,7 @@ import { RouterModule, Routes } from '@angular/router'; import { HomeComponent } from './components/home.component'; const routes: Routes = [ - { path: 'home', component: HomeComponent } + { path: '', component: HomeComponent } ]; export const HomeRoutes = RouterModule.forChild(routes); \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/models/count-result.model.js b/src/CaseManagement.Performance/angularApp/app/home/models/count-result.model.js deleted file mode 100644 index 90995ae6..00000000 --- a/src/CaseManagement.Performance/angularApp/app/home/models/count-result.model.js +++ /dev/null @@ -1,19 +0,0 @@ -var CaseActivation = (function () { - function CaseActivation() { - } - CaseActivation.fromJson = function (json) { - var result = new CaseActivation(); - result.CaseDefinitionId = json["case_definition_id"]; - result.CaseInstanceId = json["case_instance_id"]; - result.CaseInstanceName = json["case_instance_name"]; - result.CaseElementId = json["case_element_id"]; - result.CaseElementInstanceId = json["case_element_instance_id"]; - result.CaseElementName = json["case_element_name"]; - result.CreateDateTime = json["create_datetime"]; - result.Performer = json["performer"]; - return result; - }; - return CaseActivation; -}()); -export { CaseActivation }; -//# sourceMappingURL=case-activation.model.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/models/count-result.model.js.map b/src/CaseManagement.Performance/angularApp/app/home/models/count-result.model.js.map deleted file mode 100644 index e667582f..00000000 --- a/src/CaseManagement.Performance/angularApp/app/home/models/count-result.model.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"case-activation.model.js","sourceRoot":"","sources":["case-activation.model.ts"],"names":[],"mappings":"AAAA;IAAA;IAsBA,CAAC;IAZiB,uBAAQ,GAAtB,UAAuB,IAAS;QAC5B,IAAI,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACjD,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC/C,MAAM,CAAC,qBAAqB,GAAG,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAChE,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACnD,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAChD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;QACrC,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,qBAAC;AAAD,CAAC,AAtBD,IAsBC"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/services/casedefinitions.service.js.map b/src/CaseManagement.Performance/angularApp/app/home/services/casedefinitions.service.js.map deleted file mode 100644 index a061bdd8..00000000 --- a/src/CaseManagement.Performance/angularApp/app/home/services/casedefinitions.service.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"casedefinitions.service.js","sourceRoot":"","sources":["casedefinitions.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gDAAgD,CAAC;AAG7F;IACI,gCAAoB,IAAgB;QAAhB,SAAI,GAAJ,IAAI,CAAY;IAAI,CAAC;IAEzC,uCAAM,GAAN,UAAO,UAAkB,EAAE,KAAa,EAAE,KAAa,EAAE,SAAiB,EAAE,IAAY;QACpF,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,wCAAwC,GAAG,UAAU,GAAG,SAAS,GAAG,KAAK,CAAC;QAChH,IAAI,KAAK,EAAE;YACP,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,CAAC;SAChD;QAED,IAAI,SAAS,EAAE;YACX,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;SACjD;QAED,IAAI,IAAI,EAAE;YACN,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,IAAI,CAAC;SAC3C;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,2BAA2B,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,oCAAG,GAAH,UAAI,EAAU;QACV,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,oBAAoB,GAAG,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,2CAAU,GAAV,UAAW,EAAU;QACjB,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,oBAAoB,GAAG,EAAE,GAAG,UAAU,CAAC;QAC7E,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAxCQ,sBAAsB;QADlC,UAAU,EAAE;yCAEiB,UAAU;OAD3B,sBAAsB,CAyClC;IAAD,6BAAC;CAAA,AAzCD,IAyCC;SAzCY,sBAAsB"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/services/statistic.service.js b/src/CaseManagement.Performance/angularApp/app/home/services/statistic.service.js deleted file mode 100644 index dda701d0..00000000 --- a/src/CaseManagement.Performance/angularApp/app/home/services/statistic.service.js +++ /dev/null @@ -1,54 +0,0 @@ -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); -}; -import { HttpClient, HttpHeaders } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { map } from 'rxjs/operators'; -import { DailyStatistic } from '../models/dailystatistic.model'; -import { SearchDailyStatisticsResult } from '../models/search-dailystatistics-result.model'; -var StatisticService = (function () { - function StatisticService(http) { - this.http = http; - } - StatisticService.prototype.get = function () { - var headers = new HttpHeaders(); - headers = headers.set('Accept', 'application/json'); - var targetUrl = process.env.API_URL + "/statistics"; - return this.http.get(targetUrl, { headers: headers }).pipe(map(function (res) { - return DailyStatistic.fromJson(res); - })); - }; - StatisticService.prototype.search = function (startIndex, count, order, direction, startDate, endDate) { - var headers = new HttpHeaders(); - headers = headers.set('Accept', 'application/json'); - var targetUrl = process.env.API_URL + "/statistics/.search?start_index=" + startIndex + "&count=" + count; - if (order) { - targetUrl = targetUrl + "&order_by=" + order; - } - if (direction) { - targetUrl = targetUrl + "&order=" + direction; - } - if (startDate) { - targetUrl = targetUrl + "&start_datetime=" + startDate; - } - if (endDate) { - targetUrl = targetUrl + "&end_datetime=" + endDate; - } - return this.http.get(targetUrl, { headers: headers }).pipe(map(function (res) { - return SearchDailyStatisticsResult.fromJson(res); - })); - }; - StatisticService = __decorate([ - Injectable(), - __metadata("design:paramtypes", [HttpClient]) - ], StatisticService); - return StatisticService; -}()); -export { StatisticService }; -//# sourceMappingURL=statistic.service.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/services/statistic.service.ts b/src/CaseManagement.Performance/angularApp/app/home/services/statistic.service.ts deleted file mode 100644 index 958c6775..00000000 --- a/src/CaseManagement.Performance/angularApp/app/home/services/statistic.service.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { HttpClient, HttpHeaders } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { DailyStatistic } from '../models/dailystatistic.model'; -import { SearchDailyStatisticsResult } from '../models/search-dailystatistics-result.model'; - -@Injectable() -export class StatisticService { - constructor(private http: HttpClient) { } - - get(): Observable{ - let headers = new HttpHeaders(); - headers = headers.set('Accept', 'application/json'); - let targetUrl = process.env.API_URL + "/statistics"; - return this.http.get(targetUrl, { headers: headers }).pipe(map((res: any) => { - return DailyStatistic.fromJson(res); - })); - } - - search(startIndex: number, count: number, order: string, direction: string, startDate: string, endDate: string): Observable { - let headers = new HttpHeaders(); - headers = headers.set('Accept', 'application/json'); - let targetUrl = process.env.API_URL + "/statistics/search?start_index=" + startIndex + "&count=" + count; - if (order) { - targetUrl = targetUrl + "&order_by=" + order; - } - - if (direction) { - targetUrl = targetUrl + "&order=" + direction; - } - - if (startDate) { - targetUrl = targetUrl + "&start_datetime=" + startDate; - } - - if (endDate) { - targetUrl = targetUrl + "&end_datetime=" + endDate; - } - - return this.http.get(targetUrl, { headers: headers }).pipe(map((res: any) => { - return SearchDailyStatisticsResult.fromJson(res); - })); - } -} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/infrastructure/auth-guard.service.ts b/src/CaseManagement.Performance/angularApp/app/infrastructure/auth-guard.service.ts index b8451968..8d066a10 100644 --- a/src/CaseManagement.Performance/angularApp/app/infrastructure/auth-guard.service.ts +++ b/src/CaseManagement.Performance/angularApp/app/infrastructure/auth-guard.service.ts @@ -5,12 +5,10 @@ import { Observable } from "rxjs"; @Injectable() export class AuthGuard implements CanActivate { - constructor(private authService: OAuthService, private router: Router) { - - } + constructor(private authService: OAuthService, private router: Router) { } canActivate(next: ActivatedRouteSnapshot): Observable | Promise | boolean { - let claims : any = this.authService.getIdentityClaims(); + let claims: any = this.authService.getIdentityClaims(); if (!claims) { this.router.navigate(['/status/404']); return false; diff --git a/src/CaseManagement.Performance/angularApp/app/performances/list/list-actions.js b/src/CaseManagement.Performance/angularApp/app/performances/list/list-actions.js index 8a7835a1..2144df1f 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/list/list-actions.js +++ b/src/CaseManagement.Performance/angularApp/app/performances/list/list-actions.js @@ -1,22 +1,22 @@ export var ActionTypes; (function (ActionTypes) { - ActionTypes["CASEDEFINITIONSLOAD"] = "[CaseDefinitions] Load"; - ActionTypes["CASEDEFINITIONSLOADED"] = "[CaseDefinitions] Loaded"; - ActionTypes["ERRORLOADCASEDEFINITIONS"] = "[CaseDefinitions] Error Load"; + ActionTypes["PERFORMANCESLOAD"] = "[Performances] Load"; + ActionTypes["PERFORMANCESLOADED"] = "[Performances] Loaded"; + ActionTypes["ERRORLOADPERFORMANCES"] = "[CaseDefinitions] Error Load"; })(ActionTypes || (ActionTypes = {})); -var LoadCaseDefinitionsAction = (function () { - function LoadCaseDefinitionsAction() { - this.type = ActionTypes.CASEDEFINITIONSLOAD; +var LoadPerformancesAction = (function () { + function LoadPerformancesAction() { + this.type = ActionTypes.PERFORMANCESLOAD; } - return LoadCaseDefinitionsAction; + return LoadPerformancesAction; }()); -export { LoadCaseDefinitionsAction }; -var CaseDefinitionsLoadedAction = (function () { - function CaseDefinitionsLoadedAction(result) { +export { LoadPerformancesAction }; +var PerformancesLoadedAction = (function () { + function PerformancesLoadedAction(result) { this.result = result; - this.type = ActionTypes.CASEDEFINITIONSLOADED; + this.type = ActionTypes.PERFORMANCESLOADED; } - return CaseDefinitionsLoadedAction; + return PerformancesLoadedAction; }()); -export { CaseDefinitionsLoadedAction }; +export { PerformancesLoadedAction }; //# sourceMappingURL=list-actions.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/list/list-actions.js.map b/src/CaseManagement.Performance/angularApp/app/performances/list/list-actions.js.map index 59065703..8db69634 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/list/list-actions.js.map +++ b/src/CaseManagement.Performance/angularApp/app/performances/list/list-actions.js.map @@ -1 +1 @@ -{"version":3,"file":"list-actions.js","sourceRoot":"","sources":["list-actions.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,6DAA8C,CAAA;IAC9C,iEAAkD,CAAA;IAClD,wEAAyD,CAAA;AAC7D,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,mBAAmB,CAAA;IACtB,CAAC;IACrB,gCAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,qCAAmB,MAAmC;QAAnC,WAAM,GAAN,MAAM,CAA6B;QADtD,SAAI,GAAG,WAAW,CAAC,qBAAqB,CAAA;IACkB,CAAC;IAC/D,kCAAC;AAAD,CAAC,AAHD,IAGC"} \ No newline at end of file +{"version":3,"file":"list-actions.js","sourceRoot":"","sources":["list-actions.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,uDAAwC,CAAA;IACxC,2DAA4C,CAAA;IAC5C,qEAAsD,CAAA;AAC1D,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,gBAAgB,CAAA;IACnB,CAAC;IACrB,6BAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,kCAAmB,MAAgC;QAAhC,WAAM,GAAN,MAAM,CAA0B;QADnD,SAAI,GAAG,WAAW,CAAC,kBAAkB,CAAA;IACkB,CAAC;IAC5D,+BAAC;AAAD,CAAC,AAHD,IAGC"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/list/list-effects.js b/src/CaseManagement.Performance/angularApp/app/performances/list/list-effects.js index b646d34e..600fc7cb 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/list/list-effects.js +++ b/src/CaseManagement.Performance/angularApp/app/performances/list/list-effects.js @@ -11,29 +11,29 @@ import { Injectable } from '@angular/core'; import { Actions, Effect, ofType } from '@ngrx/effects'; import { of } from 'rxjs'; import { catchError, map, mergeMap } from 'rxjs/operators'; -import { CaseDefinitionsService } from '../services/casedefinitions.service'; +import { StatisticService } from '../services/statistic.service'; import { ActionTypes } from './list-actions'; -var ListCaseDefinitionsEffects = (function () { - function ListCaseDefinitionsEffects(actions$, caseDefinitionsService) { +var ListPerformancesEffects = (function () { + function ListPerformancesEffects(actions$, statisticService) { var _this = this; this.actions$ = actions$; - this.caseDefinitionsService = caseDefinitionsService; - this.loadCaseFiles$ = this.actions$ - .pipe(ofType(ActionTypes.CASEDEFINITIONSLOAD), mergeMap(function (evt) { - return _this.caseDefinitionsService.search(evt.startIndex, evt.count, evt.order, evt.direction, evt.text) - .pipe(map(function (casefiles) { return { type: ActionTypes.CASEDEFINITIONSLOADED, result: casefiles }; }), catchError(function () { return of({ type: ActionTypes.ERRORLOADCASEDEFINITIONS }); })); + this.statisticService = statisticService; + this.loadPerformances$ = this.actions$ + .pipe(ofType(ActionTypes.PERFORMANCESLOAD), mergeMap(function (evt) { + return _this.statisticService.searchPerformances(evt.startIndex, evt.count, evt.order, evt.direction, evt.startDateTime) + .pipe(map(function (casefiles) { return { type: ActionTypes.PERFORMANCESLOADED, result: casefiles }; }), catchError(function () { return of({ type: ActionTypes.ERRORLOADPERFORMANCES }); })); })); } __decorate([ Effect(), __metadata("design:type", Object) - ], ListCaseDefinitionsEffects.prototype, "loadCaseFiles$", void 0); - ListCaseDefinitionsEffects = __decorate([ + ], ListPerformancesEffects.prototype, "loadPerformances$", void 0); + ListPerformancesEffects = __decorate([ Injectable(), __metadata("design:paramtypes", [Actions, - CaseDefinitionsService]) - ], ListCaseDefinitionsEffects); - return ListCaseDefinitionsEffects; + StatisticService]) + ], ListPerformancesEffects); + return ListPerformancesEffects; }()); -export { ListCaseDefinitionsEffects }; +export { ListPerformancesEffects }; //# sourceMappingURL=list-effects.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/list/list-effects.js.map b/src/CaseManagement.Performance/angularApp/app/performances/list/list-effects.js.map index 255c966d..7cb3b9e0 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/list/list-effects.js.map +++ b/src/CaseManagement.Performance/angularApp/app/performances/list/list-effects.js.map @@ -1 +1 @@ -{"version":3,"file":"list-effects.js","sourceRoot":"","sources":["list-effects.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C;IACI,oCACY,QAAiB,EACjB,sBAA8C;QAF1D,iBAGK;QAFO,aAAQ,GAAR,QAAQ,CAAS;QACjB,2BAAsB,GAAtB,sBAAsB,CAAwB;QAI1D,mBAAc,GAAG,IAAI,CAAC,QAAQ;aACzB,IAAI,CACD,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,EACvC,QAAQ,CAAC,UAAC,GAAO;YACb,OAAO,KAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC;iBACnG,IAAI,CACD,GAAG,CAAC,UAAA,SAAS,IAAM,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,qBAAqB,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,EAC5F,UAAU,CAAC,cAAM,OAAA,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,wBAAwB,EAAE,CAAC,EAAlD,CAAkD,CAAC,CACvE,CAAC;QACN,CAAC,CACJ,CACJ,CAAC;IAdF,CAAC;IAGL;QADC,MAAM,EAAE;;sEAYH;IAlBG,0BAA0B;QADtC,UAAU,EAAE;yCAGa,OAAO;YACO,sBAAsB;OAHjD,0BAA0B,CAmBtC;IAAD,iCAAC;CAAA,AAnBD,IAmBC;SAnBY,0BAA0B"} \ No newline at end of file +{"version":3,"file":"list-effects.js","sourceRoot":"","sources":["list-effects.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C;IACI,iCACY,QAAiB,EACjB,gBAAkC;QAF9C,iBAGK;QAFO,aAAQ,GAAR,QAAQ,CAAS;QACjB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAI9C,sBAAiB,GAAG,IAAI,CAAC,QAAQ;aAC5B,IAAI,CACD,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,EACpC,QAAQ,CAAC,UAAC,GAAQ;YACd,OAAO,KAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,aAAa,CAAC;iBAClH,IAAI,CACD,GAAG,CAAC,UAAA,SAAS,IAAM,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,kBAAkB,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,EACzF,UAAU,CAAC,cAAM,OAAA,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,qBAAqB,EAAE,CAAC,EAA/C,CAA+C,CAAC,CACpE,CAAC;QACN,CAAC,CACJ,CACJ,CAAC;IAdF,CAAC;IAGL;QADC,MAAM,EAAE;;sEAYH;IAlBG,uBAAuB;QADnC,UAAU,EAAE;yCAGa,OAAO;YACC,gBAAgB;OAHrC,uBAAuB,CAmBnC;IAAD,8BAAC;CAAA,AAnBD,IAmBC;SAnBY,uBAAuB"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/list/list-reducer.js b/src/CaseManagement.Performance/angularApp/app/performances/list/list-reducer.js index ecff28be..9bac7182 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/list/list-reducer.js +++ b/src/CaseManagement.Performance/angularApp/app/performances/list/list-reducer.js @@ -15,16 +15,16 @@ var initialCaseDefsAction = { isLoading: true, isErrorLoadOccured: false }; -export function reducer(state, action) { +export function performancesReducer(state, action) { if (state === void 0) { state = initialCaseDefsAction; } switch (action.type) { - case ActionTypes.CASEDEFINITIONSLOADED: + case ActionTypes.PERFORMANCESLOADED: var caseDefsLoadedAction = action; state.content = caseDefsLoadedAction.result; state.isLoading = false; state.isErrorLoadOccured = false; return __assign({}, state); - case ActionTypes.ERRORLOADCASEDEFINITIONS: + case ActionTypes.ERRORLOADPERFORMANCES: state.isErrorLoadOccured = true; state.isLoading = false; return __assign({}, state); diff --git a/src/CaseManagement.Performance/angularApp/app/performances/list/list-reducer.js.map b/src/CaseManagement.Performance/angularApp/app/performances/list/list-reducer.js.map index ee4fab1d..6a9d46e1 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/list/list-reducer.js.map +++ b/src/CaseManagement.Performance/angularApp/app/performances/list/list-reducer.js.map @@ -1 +1 @@ -{"version":3,"file":"list-reducer.js","sourceRoot":"","sources":["list-reducer.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAgB,WAAW,EAA+B,MAAM,gBAAgB,CAAC;AAGxF,IAAM,qBAAqB,GAA6B;IACpD,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,KAAK;CAC5B,CAAC;AAEF,MAAM,UAAU,OAAO,CAAC,KAA6B,EAAE,MAAoB;IAAnD,sBAAA,EAAA,6BAA6B;IACjD,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,WAAW,CAAC,qBAAqB;YAClC,IAAI,oBAAoB,GAAgC,MAAM,CAAC;YAC/D,KAAK,CAAC,OAAO,GAAG,oBAAoB,CAAC,MAAM,CAAC;YAC5C,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,oBAAY,KAAK,EAAG;QACxB,KAAK,WAAW,CAAC,wBAAwB;YACrC,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAChC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,oBAAY,KAAK,EAAG;QACxB;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC"} \ No newline at end of file +{"version":3,"file":"list-reducer.js","sourceRoot":"","sources":["list-reducer.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAgB,WAAW,EAA4B,MAAM,gBAAgB,CAAC;AAGrF,IAAM,qBAAqB,GAA0B;IACjD,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,KAAK;CAC5B,CAAC;AAEF,MAAM,UAAU,mBAAmB,CAAC,KAA6B,EAAE,MAAoB;IAAnD,sBAAA,EAAA,6BAA6B;IAC7D,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,WAAW,CAAC,kBAAkB;YAC/B,IAAI,oBAAoB,GAA6B,MAAM,CAAC;YAC5D,KAAK,CAAC,OAAO,GAAG,oBAAoB,CAAC,MAAM,CAAC;YAC5C,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,oBAAY,KAAK,EAAG;QACxB,KAAK,WAAW,CAAC,qBAAqB;YAClC,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAChC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,oBAAY,KAAK,EAAG;QACxB;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/list/list.component.js b/src/CaseManagement.Performance/angularApp/app/performances/list/list.component.js index 64948fc6..e0d07214 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/list/list.component.js +++ b/src/CaseManagement.Performance/angularApp/app/performances/list/list.component.js @@ -7,92 +7,113 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; -import { Component, ViewChild } from '@angular/core'; -import { MatPaginator, MatSort } from '@angular/material'; +var __spreadArrays = (this && this.__spreadArrays) || function () { + for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length; + for (var r = Array(s), k = 0, i = 0; i < il; i++) + for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++) + r[k] = a[j]; + return r; +}; +import { DatePipe } from '@angular/common'; +import { Component } from '@angular/core'; import { select, Store } from '@ngrx/store'; -import { merge } from 'rxjs'; import { ActionTypes } from './list-actions'; -import { FormBuilder } from '@angular/forms'; -var ListCaseDefinitionsComponent = (function () { - function ListCaseDefinitionsComponent(store, formBuilder) { - this.store = store; - this.formBuilder = formBuilder; - this.caseDefinitions = []; - this.displayedColumns = ['name', 'create_datetime']; - this.searchForm = this.formBuilder.group({ - text: '' - }); +var ListPerformanceComponent = (function () { + function ListPerformanceComponent(performancesStore, datePipe) { + this.performancesStore = performancesStore; + this.datePipe = datePipe; + this.viewChart = [500, 300]; + this.threadsPerformance = []; + this.memoryConsumedMBPerformance = []; } - ListCaseDefinitionsComponent.prototype.ngOnInit = function () { + ListPerformanceComponent.prototype.ngOnInit = function () { var _this = this; - this.isLoading = true; - this.isErrorLoadOccured = false; - this.subscription = this.store.pipe(select('caseDefinitions')).subscribe(function (st) { + var self = this; + this.subscription = this.performancesStore.pipe(select('performances')).subscribe(function (st) { if (!st) { return; } - _this.isLoading = st.isLoading; - _this.isErrorLoadOccured = st.isErrorLoadOccured; if (st.content) { - _this.caseDefinitions = st.content.Content; - _this.length = st.content.TotalLength; + self.threadsPerformance.forEach(function (r) { + r.series = []; + }); + self.memoryConsumedMBPerformance.forEach(function (r) { + r.series = []; + }); + st.content.Content.sort(function (a, b) { + return new Date(a.CaptureDateTime).getTime() - new Date(b.CaptureDateTime).getTime(); + }); + st.content.Content.forEach(function (performance) { + var threadDimension = null; + var memoryConsumedDimension = null; + self.threadsPerformance.forEach(function (th) { + if (th.name == performance.MachineName) { + threadDimension = th; + return; + } + }); + self.memoryConsumedMBPerformance.forEach(function (mc) { + if (mc.name == performance.MachineName) { + memoryConsumedDimension = mc; + return; + } + }); + if (threadDimension == null) { + threadDimension = { + name: performance.MachineName, + series: [] + }; + self.threadsPerformance.push(threadDimension); + } + if (memoryConsumedDimension == null) { + memoryConsumedDimension = { + name: performance.MachineName, + series: [] + }; + self.memoryConsumedMBPerformance.push(memoryConsumedDimension); + } + threadDimension.series.push({ "name": self.datePipe.transform(performance.CaptureDateTime, 'medium'), "value": performance.NbWorkingThreads }); + memoryConsumedDimension.series.push({ "name": self.datePipe.transform(performance.CaptureDateTime, 'medium'), "value": performance.MemoryConsumedMB }); + }); + self.threadsPerformance = __spreadArrays(self.threadsPerformance); + self.memoryConsumedMBPerformance = __spreadArrays(self.memoryConsumedMBPerformance); } }); this.refresh(); + this.interval = setInterval(function () { + _this.refresh(); + }, 4000); }; - ListCaseDefinitionsComponent.prototype.ngAfterViewInit = function () { - var _this = this; - merge(this.sort.sortChange, this.paginator.page).subscribe(function () { return _this.refresh(); }); - }; - ListCaseDefinitionsComponent.prototype.onSubmit = function (evt) { - if (!evt) { - return; - } - this.refresh(); - }; - ListCaseDefinitionsComponent.prototype.refresh = function () { + ListPerformanceComponent.prototype.refresh = function () { var request = { - type: ActionTypes.CASEDEFINITIONSLOAD, - order: this.sort.active, - direction: this.sort.direction, - count: this.paginator.pageSize, - text: this.searchForm.get('text').value + type: ActionTypes.PERFORMANCESLOAD, + order: "datetime", + direction: "desc", + count: 30, + startIndex: 0, + startDateTime: this.getCurrentDate() }; - if (this.paginator.pageIndex && this.paginator.pageSize) { - request['startIndex'] = this.paginator.pageIndex * this.paginator.pageSize; - } - else { - request['startIndex'] = 0; - } - if (this.paginator.pageSize) { - request['count'] = this.paginator.pageSize; - } - else { - request['count'] = 5; - } - this.isLoading = true; - this.store.dispatch(request); + this.performancesStore.dispatch(request); + }; + ListPerformanceComponent.prototype.getCurrentDate = function () { + return this.getDate(new Date()); + }; + ListPerformanceComponent.prototype.getDate = function (d) { + return d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate(); }; - ListCaseDefinitionsComponent.prototype.ngOnDestroy = function () { + ListPerformanceComponent.prototype.ngOnDestroy = function () { + clearInterval(this.interval); this.subscription.unsubscribe(); }; - __decorate([ - ViewChild(MatPaginator), - __metadata("design:type", MatPaginator) - ], ListCaseDefinitionsComponent.prototype, "paginator", void 0); - __decorate([ - ViewChild(MatSort), - __metadata("design:type", MatSort) - ], ListCaseDefinitionsComponent.prototype, "sort", void 0); - ListCaseDefinitionsComponent = __decorate([ + ListPerformanceComponent = __decorate([ Component({ - selector: 'list-case-files', + selector: 'list-performance', templateUrl: './list.component.html', styleUrls: ['./list.component.scss'] }), - __metadata("design:paramtypes", [Store, FormBuilder]) - ], ListCaseDefinitionsComponent); - return ListCaseDefinitionsComponent; + __metadata("design:paramtypes", [Store, DatePipe]) + ], ListPerformanceComponent); + return ListPerformanceComponent; }()); -export { ListCaseDefinitionsComponent }; +export { ListPerformanceComponent }; //# sourceMappingURL=list.component.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/list/list.component.js.map b/src/CaseManagement.Performance/angularApp/app/performances/list/list.component.js.map index de65935a..59dddd8a 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/list/list.component.js.map +++ b/src/CaseManagement.Performance/angularApp/app/performances/list/list.component.js.map @@ -1 +1 @@ -{"version":3,"file":"list.component.js","sourceRoot":"","sources":["list.component.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"list.component.js","sourceRoot":"","sources":["list.component.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/models/performance.model.js b/src/CaseManagement.Performance/angularApp/app/performances/models/performance.model.js index 90995ae6..7d2fabbe 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/models/performance.model.js +++ b/src/CaseManagement.Performance/angularApp/app/performances/models/performance.model.js @@ -1,19 +1,15 @@ -var CaseActivation = (function () { - function CaseActivation() { +var Performance = (function () { + function Performance() { } - CaseActivation.fromJson = function (json) { - var result = new CaseActivation(); - result.CaseDefinitionId = json["case_definition_id"]; - result.CaseInstanceId = json["case_instance_id"]; - result.CaseInstanceName = json["case_instance_name"]; - result.CaseElementId = json["case_element_id"]; - result.CaseElementInstanceId = json["case_element_instance_id"]; - result.CaseElementName = json["case_element_name"]; - result.CreateDateTime = json["create_datetime"]; - result.Performer = json["performer"]; + Performance.fromJson = function (json) { + var result = new Performance(); + result.CaptureDateTime = json["datetime"]; + result.MachineName = json["machine_name"]; + result.NbWorkingThreads = json["nb_working_threads"]; + result.MemoryConsumedMB = json["memory_consumed_mb"]; return result; }; - return CaseActivation; + return Performance; }()); -export { CaseActivation }; -//# sourceMappingURL=case-activation.model.js.map \ No newline at end of file +export { Performance }; +//# sourceMappingURL=performance.model.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/models/performance.model.js.map b/src/CaseManagement.Performance/angularApp/app/performances/models/performance.model.js.map index e667582f..a95fd30d 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/models/performance.model.js.map +++ b/src/CaseManagement.Performance/angularApp/app/performances/models/performance.model.js.map @@ -1 +1 @@ -{"version":3,"file":"case-activation.model.js","sourceRoot":"","sources":["case-activation.model.ts"],"names":[],"mappings":"AAAA;IAAA;IAsBA,CAAC;IAZiB,uBAAQ,GAAtB,UAAuB,IAAS;QAC5B,IAAI,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACjD,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC/C,MAAM,CAAC,qBAAqB,GAAG,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAChE,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACnD,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAChD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;QACrC,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,qBAAC;AAAD,CAAC,AAtBD,IAsBC"} \ No newline at end of file +{"version":3,"file":"performance.model.js","sourceRoot":"","sources":["performance.model.ts"],"names":[],"mappings":"AAAA;IAAA;IAcA,CAAC;IARiB,oBAAQ,GAAtB,UAAuB,IAAS;QAC5B,IAAI,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC/B,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1C,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,kBAAC;AAAD,CAAC,AAdD,IAcC"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/models/search-performances-result.model.js b/src/CaseManagement.Performance/angularApp/app/performances/models/search-performances-result.model.js index 68892f8e..cc0accc6 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/models/search-performances-result.model.js +++ b/src/CaseManagement.Performance/angularApp/app/performances/models/search-performances-result.model.js @@ -1,22 +1,22 @@ -import { CaseActivation } from './case-activation.model'; -var SearchCaseActivationsResult = (function () { - function SearchCaseActivationsResult() { +import { Performance } from './performance.model'; +var SearchPerformancesResult = (function () { + function SearchPerformancesResult() { } - SearchCaseActivationsResult.fromJson = function (json) { - var result = new SearchCaseActivationsResult(); + SearchPerformancesResult.fromJson = function (json) { + var result = new SearchPerformancesResult(); result.StartIndex = json["start_index"]; result.Count = json["count"]; result.TotalLength = json["total_length"]; var content = []; if (json["content"]) { json["content"].forEach(function (c) { - content.push(CaseActivation.fromJson(c)); + content.push(Performance.fromJson(c)); }); } result.Content = content; return result; }; - return SearchCaseActivationsResult; + return SearchPerformancesResult; }()); -export { SearchCaseActivationsResult }; -//# sourceMappingURL=search-case-activations-result.model.js.map \ No newline at end of file +export { SearchPerformancesResult }; +//# sourceMappingURL=search-performances-result.model.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/models/search-performances-result.model.js.map b/src/CaseManagement.Performance/angularApp/app/performances/models/search-performances-result.model.js.map index 60f1a871..86ce2a9a 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/models/search-performances-result.model.js.map +++ b/src/CaseManagement.Performance/angularApp/app/performances/models/search-performances-result.model.js.map @@ -1 +1 @@ -{"version":3,"file":"search-case-activations-result.model.js","sourceRoot":"","sources":["search-case-activations-result.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD;IAAA;IAsBA,CAAC;IAhBiB,oCAAQ,GAAtB,UAAuB,IAAS;QAE5B,IAAI,MAAM,GAAG,IAAI,2BAA2B,EAAE,CAAC;QAC/C,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAqB,EAAE,CAAC;QACnC,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE;YACjB,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAM;gBACpC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;SACN;QAED,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,kCAAC;AAAD,CAAC,AAtBD,IAsBC"} \ No newline at end of file +{"version":3,"file":"search-performances-result.model.js","sourceRoot":"","sources":["search-performances-result.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD;IAAA;IAsBA,CAAC;IAhBiB,iCAAQ,GAAtB,UAAuB,IAAS;QAE5B,IAAI,MAAM,GAAG,IAAI,wBAAwB,EAAE,CAAC;QAC5C,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAkB,EAAE,CAAC;QAChC,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE;YACjB,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAM;gBACpC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;SACN;QAED,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,+BAAC;AAAD,CAAC,AAtBD,IAsBC"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/performances.module.js b/src/CaseManagement.Performance/angularApp/app/performances/performances.module.js index b016a2dc..511e4c0f 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/performances.module.js +++ b/src/CaseManagement.Performance/angularApp/app/performances/performances.module.js @@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; -import { CommonModule } from '@angular/common'; +import { CommonModule, DatePipe } from '@angular/common'; import { HttpClientModule } from '@angular/common/http'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; @@ -14,46 +14,45 @@ import { StoreDevtoolsModule } from '@ngrx/store-devtools'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { MaterialModule } from '../shared/material.module'; import { SharedModule } from '../shared/shared.module'; -import { HomeEffects } from './components/home-effects'; -import * as fromHomeReducer from './components/home-reducer'; -import { HomeComponent } from './components/home.component'; -import { HomeRoutes } from './home.routes'; +import { ListPerformancesEffects } from './list/list-effects'; +import * as fromListReducer from './list/list-reducer'; +import { ListPerformanceComponent } from './list/list.component'; +import { PerformancesRoutes } from './performances.routes'; import { StatisticService } from './services/statistic.service'; -var HomeModule = (function () { - function HomeModule() { +var PerformancesModule = (function () { + function PerformancesModule() { } - HomeModule = __decorate([ + PerformancesModule = __decorate([ NgModule({ imports: [ CommonModule, NgxChartsModule, FormsModule, HttpClientModule, - HomeRoutes, + PerformancesRoutes, MaterialModule, SharedModule, - EffectsModule.forRoot([HomeEffects]), + EffectsModule.forRoot([ListPerformancesEffects]), StoreModule.forRoot({ - statistic: fromHomeReducer.statisticReducer, - weekStatistics: fromHomeReducer.weekStatisticsReducer, - monthStatistics: fromHomeReducer.monthStatisticsReducer + performances: fromListReducer.performancesReducer }), StoreDevtoolsModule.instrument({ maxAge: 10 }) ], declarations: [ - HomeComponent + ListPerformanceComponent ], exports: [ - HomeComponent + ListPerformanceComponent ], providers: [ - StatisticService + StatisticService, + DatePipe ] }) - ], HomeModule); - return HomeModule; + ], PerformancesModule); + return PerformancesModule; }()); -export { HomeModule }; -//# sourceMappingURL=home.module.js.map \ No newline at end of file +export { PerformancesModule }; +//# sourceMappingURL=performances.module.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/performances.module.js.map b/src/CaseManagement.Performance/angularApp/app/performances/performances.module.js.map index b8811497..1b5e6c51 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/performances.module.js.map +++ b/src/CaseManagement.Performance/angularApp/app/performances/performances.module.js.map @@ -1 +1 @@ -{"version":3,"file":"home.module.js","sourceRoot":"","sources":["home.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,eAAe,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAmChE;IAAA;IAA0B,CAAC;IAAd,UAAU;QAjCtB,QAAQ,CAAC;YACN,OAAO,EAAE;gBACL,YAAY;gBACZ,eAAe;gBACf,WAAW;gBACX,gBAAgB;gBAChB,UAAU;gBACV,cAAc;gBACd,YAAY;gBACZ,aAAa,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC;gBACpC,WAAW,CAAC,OAAO,CAAC;oBAChB,SAAS,EAAE,eAAe,CAAC,gBAAgB;oBAC3C,cAAc,EAAE,eAAe,CAAC,qBAAqB;oBACrD,eAAe,EAAE,eAAe,CAAC,sBAAsB;iBAC1D,CAAC;gBACF,mBAAmB,CAAC,UAAU,CAAC;oBAC3B,MAAM,EAAE,EAAE;iBACb,CAAC;aACL;YAED,YAAY,EAAE;gBACV,aAAa;aAChB;YAED,OAAO,EAAE;gBACL,aAAa;aAChB;YAED,SAAS,EAAE;gBACP,gBAAgB;aACnB;SACJ,CAAC;OAEW,UAAU,CAAI;IAAD,iBAAC;CAAA,AAA3B,IAA2B;SAAd,UAAU"} \ No newline at end of file +{"version":3,"file":"performances.module.js","sourceRoot":"","sources":["performances.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,eAAe,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAkChE;IAAA;IAAkC,CAAC;IAAtB,kBAAkB;QAhC9B,QAAQ,CAAC;YACN,OAAO,EAAE;gBACL,YAAY;gBACZ,eAAe;gBACf,WAAW;gBACX,gBAAgB;gBAChB,kBAAkB;gBAClB,cAAc;gBACd,YAAY;gBACZ,aAAa,CAAC,OAAO,CAAC,CAAC,uBAAuB,CAAC,CAAC;gBAChD,WAAW,CAAC,OAAO,CAAC;oBAChB,YAAY,EAAE,eAAe,CAAC,mBAAmB;iBACpD,CAAC;gBACF,mBAAmB,CAAC,UAAU,CAAC;oBAC3B,MAAM,EAAE,EAAE;iBACb,CAAC;aACL;YAED,YAAY,EAAE;gBACV,wBAAwB;aAC3B;YAED,OAAO,EAAE;gBACL,wBAAwB;aAC3B;YAED,SAAS,EAAE;gBACP,gBAAgB;gBAChB,QAAQ;aACX;SACJ,CAAC;OAEW,kBAAkB,CAAI;IAAD,yBAAC;CAAA,AAAnC,IAAmC;SAAtB,kBAAkB"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/performances.routes.js b/src/CaseManagement.Performance/angularApp/app/performances/performances.routes.js index affe173e..f2b250f5 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/performances.routes.js +++ b/src/CaseManagement.Performance/angularApp/app/performances/performances.routes.js @@ -1,7 +1,7 @@ import { RouterModule } from '@angular/router'; -import { HomeComponent } from './components/home.component'; +import { ListPerformanceComponent } from './list/list.component'; var routes = [ - { path: 'home', component: HomeComponent } + { path: '', component: ListPerformanceComponent } ]; -export var HomeRoutes = RouterModule.forChild(routes); -//# sourceMappingURL=home.routes.js.map \ No newline at end of file +export var PerformancesRoutes = RouterModule.forChild(routes); +//# sourceMappingURL=performances.routes.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/performances.routes.js.map b/src/CaseManagement.Performance/angularApp/app/performances/performances.routes.js.map index 5f37b6f9..24ef2210 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/performances.routes.js.map +++ b/src/CaseManagement.Performance/angularApp/app/performances/performances.routes.js.map @@ -1 +1 @@ -{"version":3,"file":"home.routes.js","sourceRoot":"","sources":["home.routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAU,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,IAAM,MAAM,GAAW;IACnB,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE;CAC7C,CAAC;AAEF,MAAM,CAAC,IAAM,UAAU,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"performances.routes.js","sourceRoot":"","sources":["performances.routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAU,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,IAAM,MAAM,GAAW;IACnB,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,wBAAwB,EAAE;CACpD,CAAC;AAEF,MAAM,CAAC,IAAM,kBAAkB,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/services/statistic.service.js b/src/CaseManagement.Performance/angularApp/app/performances/services/statistic.service.js index dda701d0..71f6c902 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/services/statistic.service.js +++ b/src/CaseManagement.Performance/angularApp/app/performances/services/statistic.service.js @@ -10,38 +10,32 @@ var __metadata = (this && this.__metadata) || function (k, v) { import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { map } from 'rxjs/operators'; -import { DailyStatistic } from '../models/dailystatistic.model'; -import { SearchDailyStatisticsResult } from '../models/search-dailystatistics-result.model'; +import { SearchPerformancesResult } from '../models/search-performances-result.model'; var StatisticService = (function () { function StatisticService(http) { this.http = http; } - StatisticService.prototype.get = function () { + StatisticService.prototype.getPerformances = function () { var headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); - var targetUrl = process.env.API_URL + "/statistics"; - return this.http.get(targetUrl, { headers: headers }).pipe(map(function (res) { - return DailyStatistic.fromJson(res); - })); + var targetUrl = process.env.API_URL + "/statistics/performances"; + return this.http.get(targetUrl, { headers: headers }); }; - StatisticService.prototype.search = function (startIndex, count, order, direction, startDate, endDate) { + StatisticService.prototype.searchPerformances = function (startIndex, count, order, direction, startDateTime) { var headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); - var targetUrl = process.env.API_URL + "/statistics/.search?start_index=" + startIndex + "&count=" + count; + var targetUrl = process.env.API_URL + "/statistics/performances/search?start_index=" + startIndex + "&count=" + count + "&group_by=machine_name"; if (order) { targetUrl = targetUrl + "&order_by=" + order; } if (direction) { targetUrl = targetUrl + "&order=" + direction; } - if (startDate) { - targetUrl = targetUrl + "&start_datetime=" + startDate; - } - if (endDate) { - targetUrl = targetUrl + "&end_datetime=" + endDate; + if (startDateTime) { + targetUrl = targetUrl + "&start_datetime=" + startDateTime; } return this.http.get(targetUrl, { headers: headers }).pipe(map(function (res) { - return SearchDailyStatisticsResult.fromJson(res); + return SearchPerformancesResult.fromJson(res); })); }; StatisticService = __decorate([ diff --git a/src/CaseManagement.Performance/angularApp/app/performances/services/statistic.service.js.map b/src/CaseManagement.Performance/angularApp/app/performances/services/statistic.service.js.map index 8903e426..4a9675b9 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/services/statistic.service.js.map +++ b/src/CaseManagement.Performance/angularApp/app/performances/services/statistic.service.js.map @@ -1 +1 @@ -{"version":3,"file":"statistic.service.js","sourceRoot":"","sources":["statistic.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAG5F;IACI,0BAAoB,IAAgB;QAAhB,SAAI,GAAJ,IAAI,CAAY;IAAI,CAAC;IAEzC,8BAAG,GAAH;QACI,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,aAAa,CAAC;QACpD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,iCAAM,GAAN,UAAO,UAAkB,EAAE,KAAa,EAAE,KAAa,EAAE,SAAiB,EAAE,SAAiB,EAAE,OAAe;QAC1G,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,kCAAkC,GAAG,UAAU,GAAG,SAAS,GAAG,KAAK,CAAC;QAC1G,IAAI,KAAK,EAAE;YACP,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,CAAC;SAChD;QAED,IAAI,SAAS,EAAE;YACX,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;SACjD;QAED,IAAI,SAAS,EAAE;YACX,SAAS,GAAG,SAAS,GAAG,kBAAkB,GAAG,SAAS,CAAC;SAC1D;QAED,IAAI,OAAO,EAAE;YACT,SAAS,GAAG,SAAS,GAAG,gBAAgB,GAAG,OAAO,CAAC;SACtD;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,2BAA2B,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAnCQ,gBAAgB;QAD5B,UAAU,EAAE;yCAEiB,UAAU;OAD3B,gBAAgB,CAoC5B;IAAD,uBAAC;CAAA,AApCD,IAoCC;SApCY,gBAAgB"} \ No newline at end of file +{"version":3,"file":"statistic.service.js","sourceRoot":"","sources":["statistic.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AAGtF;IACI,0BAAoB,IAAgB;QAAhB,SAAI,GAAJ,IAAI,CAAY;IAAI,CAAC;IAEzC,0CAAe,GAAf;QACI,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,0BAA0B,CAAC;QACjE,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAW,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,6CAAkB,GAAlB,UAAmB,UAAkB,EAAE,KAAa,EAAE,KAAa,EAAE,SAAiB,EAAE,aAAqB;QACzG,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,8CAA8C,GAAG,UAAU,GAAG,SAAS,GAAG,KAAK,GAAG,wBAAwB,CAAC;QACjJ,IAAI,KAAK,EAAE;YACP,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,CAAC;SAChD;QAED,IAAI,SAAS,EAAE;YACX,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;SACjD;QAED,IAAI,aAAa,EAAE;YACf,SAAS,GAAG,SAAS,GAAG,kBAAkB,GAAG,aAAa,CAAC;SAC9D;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,wBAAwB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IA7BQ,gBAAgB;QAD5B,UAAU,EAAE;yCAEiB,UAAU;OAD3B,gBAAgB,CA8B5B;IAAD,uBAAC;CAAA,AA9BD,IA8BC;SA9BY,gBAAgB"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/performances/services/statistic.service.ts b/src/CaseManagement.Performance/angularApp/app/performances/services/statistic.service.ts index 1a6679a5..73c10d85 100644 --- a/src/CaseManagement.Performance/angularApp/app/performances/services/statistic.service.ts +++ b/src/CaseManagement.Performance/angularApp/app/performances/services/statistic.service.ts @@ -3,14 +3,16 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { SearchPerformancesResult } from '../models/search-performances-result.model'; +import { OAuthService } from 'angular-oauth2-oidc'; @Injectable() export class StatisticService { - constructor(private http: HttpClient) { } + constructor(private http: HttpClient, private oauthService: OAuthService) { } getPerformances(): Observable { let headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); + headers = headers.set('Authorization', 'Bearer ' + this.oauthService.getIdToken()); let targetUrl = process.env.API_URL + "/statistics/performances"; return this.http.get(targetUrl, { headers: headers }); } @@ -18,6 +20,7 @@ export class StatisticService { searchPerformances(startIndex: number, count: number, order: string, direction: string, startDateTime: string): Observable { let headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); + headers = headers.set('Authorization', 'Bearer ' + this.oauthService.getIdToken()); let targetUrl = process.env.API_URL + "/statistics/performances/search?start_index=" + startIndex + "&count=" + count + "&group_by=machine_name"; if (order) { targetUrl = targetUrl + "&order_by=" + order; diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home-actions.js b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-actions.js similarity index 76% rename from src/CaseManagement.Performance/angularApp/app/home/components/home-actions.js rename to src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-actions.js index f02cef50..231482fc 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/components/home-actions.js +++ b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-actions.js @@ -9,6 +9,9 @@ export var ActionTypes; ActionTypes["SEARCHMONTHSTATISTICS"] = "[SearchMonthStatistic] Load"; ActionTypes["MONTHSTATISTICSLOADED"] = "[SearchMonthStatistic] Loaded"; ActionTypes["ERRORMONTHSTATISTICS"] = "[SearchMonthStatistic] Error Load"; + ActionTypes["DEPLOYEDLOAD"] = "[Deployed] Load"; + ActionTypes["DEPLOYEDLOADED"] = "[Deployed] Loaded"; + ActionTypes["ERRORLOADDEPLOYED"] = "[Deployed] Error Load"; })(ActionTypes || (ActionTypes = {})); var LoadStatisticAction = (function () { function LoadStatisticAction() { @@ -55,4 +58,20 @@ var MonthStatisticsLoadedAction = (function () { return MonthStatisticsLoadedAction; }()); export { MonthStatisticsLoadedAction }; +var LoadDeployedAction = (function () { + function LoadDeployedAction() { + this.type = ActionTypes.DEPLOYEDLOAD; + } + return LoadDeployedAction; +}()); +export { LoadDeployedAction }; +var DeployedLoadedAction = (function () { + function DeployedLoadedAction(nbCaseDefinitions, nbCaseFiles) { + this.nbCaseDefinitions = nbCaseDefinitions; + this.nbCaseFiles = nbCaseFiles; + this.type = ActionTypes.DEPLOYEDLOADED; + } + return DeployedLoadedAction; +}()); +export { DeployedLoadedAction }; //# sourceMappingURL=home-actions.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-actions.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-actions.js.map new file mode 100644 index 00000000..ecdd9035 --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-actions.js.map @@ -0,0 +1 @@ +{"version":3,"file":"home-actions.js","sourceRoot":"","sources":["home-actions.ts"],"names":[],"mappings":"AAKA,MAAM,CAAN,IAAY,WAaX;AAbD,WAAY,WAAW;IACnB,iDAAkC,CAAA;IAClC,qDAAsC,CAAA;IACtC,4DAA6C,CAAA;IAC7C,kEAAmD,CAAA;IACnD,oEAAqD,CAAA;IACrD,uEAAwD,CAAA;IACxD,oEAAqD,CAAA;IACrD,sEAAuD,CAAA;IACvD,yEAA0D,CAAA;IAC1D,+CAAgC,CAAA;IAChC,mDAAoC,CAAA;IACpC,0DAA2C,CAAA;AAC/C,CAAC,EAbW,WAAW,KAAX,WAAW,QAatB;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,aAAa,CAAA;IAChB,CAAC;IACrB,0BAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,+BAAmB,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;QADzC,SAAI,GAAG,WAAW,CAAC,eAAe,CAAA;IACW,CAAC;IAClD,4BAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,oBAAoB,CAAA;IACvB,CAAC;IACrB,+BAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,oCAAmB,MAAmC;QAAnC,WAAM,GAAN,MAAM,CAA6B;QADtD,SAAI,GAAG,WAAW,CAAC,oBAAoB,CAAA;IACmB,CAAC;IAC/D,iCAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,qBAAqB,CAAA;IACxB,CAAC;IACrB,gCAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,qCAAmB,MAAmC;QAAnC,WAAM,GAAN,MAAM,CAA6B;QADtD,SAAI,GAAG,WAAW,CAAC,qBAAqB,CAAA;IACkB,CAAC;IAC/D,kCAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,YAAY,CAAA;IACf,CAAC;IACrB,yBAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,8BAAmB,iBAA8B,EAAS,WAAwB;QAA/D,sBAAiB,GAAjB,iBAAiB,CAAa;QAAS,gBAAW,GAAX,WAAW,CAAa;QADlF,SAAI,GAAG,WAAW,CAAC,cAAc,CAAA;IACqD,CAAC;IAC3F,2BAAC;AAAD,CAAC,AAHD,IAGC"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home-actions.ts b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-actions.ts similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/components/home-actions.ts rename to src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-actions.ts diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home-effects.js b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-effects.js similarity index 77% rename from src/CaseManagement.Website/angularApp/app/home/components/home-effects.js rename to src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-effects.js index b37719cd..1dce84bc 100644 --- a/src/CaseManagement.Website/angularApp/app/home/components/home-effects.js +++ b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-effects.js @@ -11,6 +11,9 @@ import { Injectable } from '@angular/core'; import { Actions, Effect, ofType } from '@ngrx/effects'; import { of } from 'rxjs'; import { catchError, map, mergeMap } from 'rxjs/operators'; +import { Observable } from 'rxjs/Rx'; +import { CaseDefinitionsService } from '../services/casedefinitions.service'; +import { CaseFilesService } from '../services/casefiles.service'; import { StatisticService } from '../services/statistic.service'; import { ActionTypes } from './home-actions'; function getFirstDayOfMonth() { @@ -26,10 +29,12 @@ function getDate(d) { return d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate(); } var HomeEffects = (function () { - function HomeEffects(actions$, statisticService) { + function HomeEffects(actions$, statisticService, caseDefinitionsService, caseFilesService) { var _this = this; this.actions$ = actions$; this.statisticService = statisticService; + this.caseDefinitionsService = caseDefinitionsService; + this.caseFilesService = caseFilesService; this.loadStatistic = this.actions$ .pipe(ofType(ActionTypes.STATISTICLOAD), mergeMap(function () { return _this.statisticService.get() @@ -47,6 +52,10 @@ var HomeEffects = (function () { return _this.statisticService.search(evt.startIndex, evt.count, evt.order, evt.direction, date, null) .pipe(map(function (statistic) { return { type: ActionTypes.MONTHSTATISTICSLOADED, result: statistic }; }), catchError(function () { return of({ type: ActionTypes.ERRORMONTHSTATISTICS }); })); })); + this.loadDeployed = this.actions$ + .pipe(ofType(ActionTypes.DEPLOYEDLOAD), mergeMap(function () { + return Observable.forkJoin([_this.caseDefinitionsService.count(), _this.caseFilesService.count()]).pipe(map(function (responses) { return { type: ActionTypes.DEPLOYEDLOADED, nbCaseDefinitions: responses[0], nbCaseFiles: responses[1] }; }), catchError(function () { return of({ type: ActionTypes.ERRORLOADDEPLOYED }); })); + })); } __decorate([ Effect(), @@ -60,10 +69,16 @@ var HomeEffects = (function () { Effect(), __metadata("design:type", Object) ], HomeEffects.prototype, "searchMonthStatistics", void 0); + __decorate([ + Effect(), + __metadata("design:type", Object) + ], HomeEffects.prototype, "loadDeployed", void 0); HomeEffects = __decorate([ Injectable(), __metadata("design:paramtypes", [Actions, - StatisticService]) + StatisticService, + CaseDefinitionsService, + CaseFilesService]) ], HomeEffects); return HomeEffects; }()); diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-effects.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-effects.js.map new file mode 100644 index 00000000..df288506 --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-effects.js.map @@ -0,0 +1 @@ +{"version":3,"file":"home-effects.js","sourceRoot":"","sources":["home-effects.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home-effects.ts b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-effects.ts similarity index 97% rename from src/CaseManagement.Performance/angularApp/app/home/components/home-effects.ts rename to src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-effects.ts index 898004a7..308d8b07 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/components/home-effects.ts +++ b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-effects.ts @@ -6,7 +6,7 @@ import { Observable } from 'rxjs/Rx'; import { CaseDefinitionsService } from '../services/casedefinitions.service'; import { CaseFilesService } from '../services/casefiles.service'; import { StatisticService } from '../services/statistic.service'; -import { ActionTypes } from './home-actions'; +import { ActionTypes } from './statistics-actions'; function getFirstDayOfMonth() { var date = new Date(), y = date.getFullYear(), m = date.getMonth(); @@ -25,7 +25,7 @@ function getDate(d : Date) { } @Injectable() -export class HomeEffects { +export class StatisticsEffects { constructor( private actions$: Actions, private statisticService: StatisticService, diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home-reducer.js b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-reducer.js similarity index 76% rename from src/CaseManagement.Website/angularApp/app/home/components/home-reducer.js rename to src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-reducer.js index 3dc3e191..2de09f94 100644 --- a/src/CaseManagement.Website/angularApp/app/home/components/home-reducer.js +++ b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-reducer.js @@ -25,6 +25,12 @@ var initialMonthStatisticAction = { isLoading: true, isErrorLoadOccured: false }; +var initalDeployedState = { + isErrorLoadOccured: false, + isLoading: true, + nbCaseDefinitions: null, + nbCaseFiles: null +}; export function statisticReducer(state, action) { if (state === void 0) { state = initialStatisticAction; } switch (action.type) { @@ -76,4 +82,22 @@ export function monthStatisticsReducer(state, action) { return state; } } +export function deployedReducer(state, action) { + if (state === void 0) { state = initalDeployedState; } + switch (action.type) { + case ActionTypes.DEPLOYEDLOADED: + var deployedLoadedAction = action; + state.nbCaseDefinitions = deployedLoadedAction.nbCaseDefinitions; + state.nbCaseFiles = deployedLoadedAction.nbCaseFiles; + state.isLoading = false; + state.isErrorLoadOccured = false; + return __assign({}, state); + case ActionTypes.ERRORLOADDEPLOYED: + state.isErrorLoadOccured = true; + state.isLoading = false; + return __assign({}, state); + default: + return state; + } +} //# sourceMappingURL=home-reducer.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-reducer.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-reducer.js.map new file mode 100644 index 00000000..b9b32a57 --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-reducer.js.map @@ -0,0 +1 @@ +{"version":3,"file":"home-reducer.js","sourceRoot":"","sources":["home-reducer.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home-reducer.ts b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-reducer.ts similarity index 97% rename from src/CaseManagement.Performance/angularApp/app/home/components/home-reducer.ts rename to src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-reducer.ts index ea1f916f..26ac5411 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/components/home-reducer.ts +++ b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-reducer.ts @@ -1,5 +1,5 @@ -import { ActionsUnion, ActionTypes, MonthStatisticsLoadedAction, StatisticLoadedAction, WeekStatisticsLoadedAction, DeployedLoadedAction } from './home-actions'; -import { MonthStatisticsState, StatisticState, WeekStatisticsState, DeployedState } from './home-states'; +import { ActionsUnion, ActionTypes, MonthStatisticsLoadedAction, StatisticLoadedAction, WeekStatisticsLoadedAction, DeployedLoadedAction } from './statistics-actions'; +import { MonthStatisticsState, StatisticState, WeekStatisticsState, DeployedState } from './statistics-states'; const initialStatisticAction: StatisticState = { content: null, diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home-states.js b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-states.js similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/components/home-states.js rename to src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-states.js diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home-states.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-states.js.map similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/components/home-states.js.map rename to src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-states.js.map diff --git a/src/CaseManagement.Performance/angularApp/app/home/components/home-states.ts b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-states.ts similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/components/home-states.ts rename to src/CaseManagement.Performance/angularApp/app/statistics/components/statistics-states.ts diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.html b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.html new file mode 100644 index 00000000..7a371f79 --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.html @@ -0,0 +1,185 @@ +
+
+
+
+
+ + + {{ "RIGHT_NOW" | translate }} + + +
+
+

{{ "CASE_STATUS" | translate }}

+ + +
+
+

{{ "FORM_STATUS" | translate }}

+ + +
+
+

{{ "ACTIVATION_STATUS" | translate }}

+ + +
+
+ + + + + {{ "METRICS" | translate }} + + + + +
+
+
+

{{ "CASE_STATUS" | translate }}

+ + + +
+
+

{{ "FORM_STATUS" | translate }}

+ + + +
+
+
+

{{ "ACTIVATION_STATUS" | translate }}

+ + + +
+
+ + +
+
+
+

{{ "CASE_STATUS" | translate }}

+ + + +
+
+

{{ "FORM_STATUS" | translate }}

+ + + +
+
+
+

{{ "ACTIVATION_STATUS" | translate }}

+ + + +
+
+ + + + +
+
+
+ + + {{ "DEPLOYED" | translate }} + + + + +

{{ "CASE_FILES" | translate }}

+

{{ nbCaseFiles }}

+ + +

{{ "CASE_DEFINITIONS" | translate}}

+

{{ nbCaseDefinitions }}

+ + + + +
+
+
+
\ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.js b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.js new file mode 100644 index 00000000..445b3a13 --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.js @@ -0,0 +1,469 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +import { Component } from '@angular/core'; +import { select, Store } from '@ngrx/store'; +import { ActionTypes } from './home-actions'; +import { DatePipe } from '@angular/common'; +var HomeComponent = (function () { + function HomeComponent(statisticStore, weekStatisticStore, monthStatisticStore, deployedStore, datePipe) { + this.statisticStore = statisticStore; + this.weekStatisticStore = weekStatisticStore; + this.monthStatisticStore = monthStatisticStore; + this.deployedStore = deployedStore; + this.datePipe = datePipe; + this.nbCaseDefinitions = 0; + this.nbCaseFiles = 0; + this.viewPie = [300, 300]; + this.viewChart = [500, 300]; + this.caseStatistic = [ + { + "name": "Active", + "value": 0 + }, + { + "name": "Completed", + "value": 0 + }, + { + "name": "Terminated", + "value": 0 + }, + { + "name": "Failed", + "value": 0 + }, + { + "name": "Suspended", + "value": 0 + }, + { + "name": "Closed", + "value": 0 + } + ]; + this.caseStatisticColorScheme = { + domain: ['#d3d3d3', '#008000', '#ffff00', '#FF0000', '#FFA500', '#808080'] + }; + this.caseWeekStatistic = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + this.caseMonthStatistic = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + this.formStatistic = [ + { + "name": "Created", + "value": 0 + }, + { + "name": "Confirmed", + "value": 0 + } + ]; + this.formStatisticColorScheme = { + domain: ['#808080', '#008000'] + }; + this.formWeekStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + this.formMonthStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + this.activationStatisticColorScheme = { + domain: ['#808080', '#008000'] + }; + this.activationStatistic = [ + { + "name": "Created", + "value": 0 + }, + { + "name": "Confirmed", + "value": 0 + } + ]; + this.activationWeekStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + this.activationMonthStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + } + HomeComponent.prototype.ngOnInit = function () { + var _this = this; + var self = this; + this.statisticSubscription = this.statisticStore.pipe(select('statistic')).subscribe(function (st) { + if (!st) { + return; + } + if (st.content) { + _this.caseStatistic = [ + { + "name": "Active", + "value": st.content.NbActiveCases + }, + { + "name": "Completed", + "value": st.content.NbCompletedCases + }, + { + "name": "Terminated", + "value": st.content.NbTerminatedCases + }, + { + "name": "Failed", + "value": st.content.NbFailedCases + }, + { + "name": "Suspended", + "value": st.content.NbSuspendedCases + }, + { + "name": "Closed", + "value": st.content.NbClosedCases + } + ]; + _this.formStatistic = [ + { + "name": "Created", + "value": st.content.NbCreatedForms + }, + { + "name": "Confirmed", + "value": st.content.NbConfirmedForms + } + ]; + _this.activationStatistic = [ + { + "name": "Created", + "value": st.content.NbCreatedActivation + }, + { + "name": "Confirmed", + "value": st.content.NbConfirmedActivation + } + ]; + } + }); + this.weekSubscription = this.weekStatisticStore.pipe(select('weekStatistics')).subscribe(function (st) { + if (!st) { + return; + } + if (st.content) { + var caseWeekResult_1 = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + var formWeekResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + var activationWeekResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + st.content.Content.forEach(function (elt) { + caseWeekResult_1[0].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbActiveCases + }); + caseWeekResult_1[1].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbCompletedCases + }); + caseWeekResult_1[2].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbTerminatedCases + }); + caseWeekResult_1[3].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbFailedCases + }); + caseWeekResult_1[4].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbSuspendedCases + }); + caseWeekResult_1[5].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbClosedCases + }); + formWeekResult_1[0].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbCreatedForms + }); + formWeekResult_1[1].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbConfirmedForms + }); + activationWeekResult_1[0].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbCreatedForms + }); + activationWeekResult_1[1].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbConfirmedForms + }); + }); + _this.caseWeekStatistic = caseWeekResult_1; + _this.formWeekStatistic = formWeekResult_1; + _this.activationWeekStatistic = activationWeekResult_1; + } + }); + this.monthSubscription = this.monthStatisticStore.pipe(select('monthStatistics')).subscribe(function (st) { + if (!st) { + return; + } + if (st.content) { + var caseMonthResult_1 = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + var formMonthResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + var activationMonthResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + st.content.Content.forEach(function (elt) { + caseMonthResult_1[0].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbActiveCases + }); + caseMonthResult_1[1].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbCompletedCases + }); + caseMonthResult_1[2].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbTerminatedCases + }); + caseMonthResult_1[3].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbFailedCases + }); + caseMonthResult_1[4].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbSuspendedCases + }); + caseMonthResult_1[5].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbClosedCases + }); + formMonthResult_1[0].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbCreatedForms + }); + formMonthResult_1[1].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbConfirmedForms + }); + activationMonthResult_1[0].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbCreatedForms + }); + activationMonthResult_1[1].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbConfirmedForms + }); + }); + _this.caseMonthStatistic = caseMonthResult_1; + _this.formMonthStatistic = formMonthResult_1; + _this.activationMonthStatistic = activationMonthResult_1; + } + }); + this.deployedSubscription = this.deployedStore.pipe(select('deployed')).subscribe(function (st) { + if (st.nbCaseDefinitions) { + _this.nbCaseDefinitions = st.nbCaseDefinitions.Count; + _this.nbCaseFiles = st.nbCaseFiles.Count; + } + }); + this.refresh(); + }; + HomeComponent.prototype.refresh = function () { + var loadStatisticRequest = { + type: ActionTypes.STATISTICLOAD + }; + var loadWeekStatisticsRequest = { + type: ActionTypes.SEARCHWEEKSTATISTICS, + count: 100 + }; + var loadMonthStatisticsRequest = { + type: ActionTypes.SEARCHMONTHSTATISTICS, + count: 100 + }; + var loadDeployedRequest = { + type: ActionTypes.DEPLOYEDLOAD + }; + this.statisticStore.dispatch(loadStatisticRequest); + this.weekStatisticStore.dispatch(loadWeekStatisticsRequest); + this.monthStatisticStore.dispatch(loadMonthStatisticsRequest); + this.deployedStore.dispatch(loadDeployedRequest); + }; + HomeComponent.prototype.ngOnDestroy = function () { + this.statisticSubscription.unsubscribe(); + this.weekSubscription.unsubscribe(); + this.monthSubscription.unsubscribe(); + }; + HomeComponent = __decorate([ + Component({ + selector: 'app-home-component', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'] + }), + __metadata("design:paramtypes", [Store, Store, Store, Store, DatePipe]) + ], HomeComponent); + return HomeComponent; +}()); +export { HomeComponent }; +//# sourceMappingURL=home.component.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.js.map new file mode 100644 index 00000000..4b3c4c26 --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.js.map @@ -0,0 +1 @@ +{"version":3,"file":"home.component.js","sourceRoot":"","sources":["home.component.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list.component.scss b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.scss similarity index 100% rename from src/CaseManagement.Website/angularApp/app/performances/list/list.component.scss rename to src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.scss diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.ts b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.ts new file mode 100644 index 00000000..11657f8e --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/components/statistics.component.ts @@ -0,0 +1,462 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { select, Store } from '@ngrx/store'; +import { DailyStatistic } from '../models/dailystatistic.model'; +import { ActionTypes } from './statistics-actions'; +import * as fromStatisticsStates from './statistics-states'; +import { DatePipe } from '@angular/common'; + +@Component({ + selector: 'statistics-home-component', + templateUrl: './statistics.component.html', + styleUrls: ['./statistics.component.scss'] +}) +export class StatisticsComponent implements OnInit, OnDestroy { + statisticSubscription: any; + weekSubscription: any; + monthSubscription: any; + deployedSubscription: any; + nbCaseDefinitions: number = 0; + nbCaseFiles: number = 0; + viewPie: any[] = [300, 300]; + viewChart: any[] = [500, 300]; + caseStatistic: any[] = [ + { + "name": "Active", + "value": 0 + }, + { + "name": "Completed", + "value": 0 + }, + { + "name": "Terminated", + "value": 0 + }, + { + "name": "Failed", + "value": 0 + }, + { + "name": "Suspended", + "value": 0 + }, + { + "name": "Closed", + "value": 0 + } + ]; + caseStatisticColorScheme = { + domain: ['#d3d3d3', '#008000', '#ffff00', '#FF0000', '#FFA500', '#808080'] + }; + caseWeekStatistic: any[] = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + caseMonthStatistic: any[] = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + formStatistic: any[] = [ + { + "name": "Created", + "value": 0 + }, + { + "name": "Confirmed", + "value": 0 + } + ]; + formStatisticColorScheme = { + domain: ['#808080', '#008000'] + }; + formWeekStatistic: any[] = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + formMonthStatistic: any[] = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + activationStatisticColorScheme = { + domain: ['#808080', '#008000'] + }; + activationStatistic: any[] = [ + { + "name": "Created", + "value": 0 + }, + { + "name": "Confirmed", + "value": 0 + } + ]; + activationWeekStatistic: any[] = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + activationMonthStatistic: any[] = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + constructor(private statisticStore: Store, private weekStatisticStore: Store, private monthStatisticStore: Store, private deployedStore: Store, private datePipe: DatePipe) { } + + ngOnInit() { + let self = this; + this.statisticSubscription = this.statisticStore.pipe(select('statistic')).subscribe((st: fromStatisticsStates.StatisticState) => { + if (!st) { + return; + } + + if (st.content) { + this.caseStatistic = [ + { + "name": "Active", + "value": st.content.NbActiveCases + }, + { + "name": "Completed", + "value": st.content.NbCompletedCases + }, + { + "name": "Terminated", + "value": st.content.NbTerminatedCases + }, + { + "name": "Failed", + "value": st.content.NbFailedCases + }, + { + "name": "Suspended", + "value": st.content.NbSuspendedCases + }, + { + "name": "Closed", + "value": st.content.NbClosedCases + } + ]; + this.formStatistic = [ + { + "name": "Created", + "value": st.content.NbCreatedForms + }, + { + "name": "Confirmed", + "value": st.content.NbConfirmedForms + } + ]; + this.activationStatistic = [ + { + "name": "Created", + "value": st.content.NbCreatedActivation + }, + { + "name": "Confirmed", + "value": st.content.NbConfirmedActivation + } + ]; + } + }); + this.weekSubscription = this.weekStatisticStore.pipe(select('weekStatistics')).subscribe((st: fromStatisticsStates.WeekStatisticsState) => { + if (!st) { + return; + } + + if (st.content) { + let caseWeekResult: any[] = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + let formWeekResult: any[] = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + let activationWeekResult: any[] = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + st.content.Content.forEach(function (elt: DailyStatistic) { + caseWeekResult[0].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbActiveCases + }); + caseWeekResult[1].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbCompletedCases + }); + caseWeekResult[2].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbTerminatedCases + }); + caseWeekResult[3].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbFailedCases + }); + caseWeekResult[4].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbSuspendedCases + }); + caseWeekResult[5].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbClosedCases + }); + formWeekResult[0].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbCreatedForms + }); + formWeekResult[1].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbConfirmedForms + }); + activationWeekResult[0].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbCreatedForms + }); + activationWeekResult[1].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbConfirmedForms + }); + }); + + this.caseWeekStatistic = caseWeekResult; + this.formWeekStatistic = formWeekResult; + this.activationWeekStatistic = activationWeekResult; + } + }); + this.monthSubscription = this.monthStatisticStore.pipe(select('monthStatistics')).subscribe((st: fromStatisticsStates.WeekStatisticsState) => { + if (!st) { + return; + } + + if (st.content) { + let caseMonthResult: any[] = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + let formMonthResult: any[] = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + let activationMonthResult: any[] = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + st.content.Content.forEach(function (elt: DailyStatistic) { + caseMonthResult[0].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbActiveCases + }); + caseMonthResult[1].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbCompletedCases + }); + caseMonthResult[2].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbTerminatedCases + }); + caseMonthResult[3].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbFailedCases + }); + caseMonthResult[4].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbSuspendedCases + }); + caseMonthResult[5].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbClosedCases + }); + formMonthResult[0].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbCreatedForms + }); + formMonthResult[1].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbConfirmedForms + }); + activationMonthResult[0].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbCreatedForms + }); + activationMonthResult[1].series.push({ + "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), + "value": elt.NbConfirmedForms + }); + }); + + this.caseMonthStatistic = caseMonthResult; + this.formMonthStatistic = formMonthResult; + this.activationMonthStatistic = activationMonthResult; + } + }); + this.deployedSubscription = this.deployedStore.pipe(select('deployed')).subscribe((st: fromStatisticsStates.DeployedState) => { + if (st.nbCaseDefinitions) { + this.nbCaseDefinitions = st.nbCaseDefinitions.Count; + this.nbCaseFiles = st.nbCaseFiles.Count; + } + }); + this.refresh(); + } + + refresh() { + let loadStatisticRequest: any = { + type: ActionTypes.STATISTICLOAD + }; + let loadWeekStatisticsRequest: any = { + type: ActionTypes.SEARCHWEEKSTATISTICS, + count: 100 + }; + let loadMonthStatisticsRequest: any = { + type: ActionTypes.SEARCHMONTHSTATISTICS, + count: 100 + }; + let loadDeployedRequest: any = { + type: ActionTypes.DEPLOYEDLOAD + }; + this.statisticStore.dispatch(loadStatisticRequest); + this.weekStatisticStore.dispatch(loadWeekStatisticsRequest); + this.monthStatisticStore.dispatch(loadMonthStatisticsRequest); + this.deployedStore.dispatch(loadDeployedRequest); + } + + ngOnDestroy() { + this.statisticSubscription.unsubscribe(); + this.weekSubscription.unsubscribe(); + this.monthSubscription.unsubscribe(); + } +} diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/models/count-result.model.js b/src/CaseManagement.Performance/angularApp/app/statistics/models/count-result.model.js new file mode 100644 index 00000000..545a0800 --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/models/count-result.model.js @@ -0,0 +1,12 @@ +var CountResult = (function () { + function CountResult() { + } + CountResult.fromJson = function (json) { + var result = new CountResult(); + result.Count = json["count"]; + return result; + }; + return CountResult; +}()); +export { CountResult }; +//# sourceMappingURL=count-result.model.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/models/count-result.model.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/models/count-result.model.js.map new file mode 100644 index 00000000..149ad431 --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/models/count-result.model.js.map @@ -0,0 +1 @@ +{"version":3,"file":"count-result.model.js","sourceRoot":"","sources":["count-result.model.ts"],"names":[],"mappings":"AAAA;IAAA;IAQA,CAAC;IALiB,oBAAQ,GAAtB,UAAuB,IAAS;QAC5B,IAAI,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC/B,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,kBAAC;AAAD,CAAC,AARD,IAQC"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/models/count-result.model.ts b/src/CaseManagement.Performance/angularApp/app/statistics/models/count-result.model.ts similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/models/count-result.model.ts rename to src/CaseManagement.Performance/angularApp/app/statistics/models/count-result.model.ts diff --git a/src/CaseManagement.Performance/angularApp/app/home/models/dailystatistic.model.js b/src/CaseManagement.Performance/angularApp/app/statistics/models/dailystatistic.model.js similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/models/dailystatistic.model.js rename to src/CaseManagement.Performance/angularApp/app/statistics/models/dailystatistic.model.js diff --git a/src/CaseManagement.Performance/angularApp/app/home/models/dailystatistic.model.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/models/dailystatistic.model.js.map similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/models/dailystatistic.model.js.map rename to src/CaseManagement.Performance/angularApp/app/statistics/models/dailystatistic.model.js.map diff --git a/src/CaseManagement.Performance/angularApp/app/home/models/dailystatistic.model.ts b/src/CaseManagement.Performance/angularApp/app/statistics/models/dailystatistic.model.ts similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/models/dailystatistic.model.ts rename to src/CaseManagement.Performance/angularApp/app/statistics/models/dailystatistic.model.ts diff --git a/src/CaseManagement.Performance/angularApp/app/home/models/search-dailystatistics-result.model.js b/src/CaseManagement.Performance/angularApp/app/statistics/models/search-dailystatistics-result.model.js similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/models/search-dailystatistics-result.model.js rename to src/CaseManagement.Performance/angularApp/app/statistics/models/search-dailystatistics-result.model.js diff --git a/src/CaseManagement.Performance/angularApp/app/home/models/search-dailystatistics-result.model.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/models/search-dailystatistics-result.model.js.map similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/models/search-dailystatistics-result.model.js.map rename to src/CaseManagement.Performance/angularApp/app/statistics/models/search-dailystatistics-result.model.js.map diff --git a/src/CaseManagement.Performance/angularApp/app/home/models/search-dailystatistics-result.model.ts b/src/CaseManagement.Performance/angularApp/app/statistics/models/search-dailystatistics-result.model.ts similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/models/search-dailystatistics-result.model.ts rename to src/CaseManagement.Performance/angularApp/app/statistics/models/search-dailystatistics-result.model.ts diff --git a/src/CaseManagement.Performance/angularApp/app/home/services/casedefinitions.service.js b/src/CaseManagement.Performance/angularApp/app/statistics/services/casedefinitions.service.js similarity index 50% rename from src/CaseManagement.Performance/angularApp/app/home/services/casedefinitions.service.js rename to src/CaseManagement.Performance/angularApp/app/statistics/services/casedefinitions.service.js index f6acbfa2..8c838379 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/services/casedefinitions.service.js +++ b/src/CaseManagement.Performance/angularApp/app/statistics/services/casedefinitions.service.js @@ -10,44 +10,17 @@ var __metadata = (this && this.__metadata) || function (k, v) { import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { map } from 'rxjs/operators'; -import { CaseDefinitionHistory } from '../models/case-definition-history.model'; -import { CaseDefinition } from '../models/case-definition.model'; -import { SearchCaseDefinitionsResult } from '../models/search-case-definitions-result.model'; +import { CountResult } from '../models/count-result.model'; var CaseDefinitionsService = (function () { function CaseDefinitionsService(http) { this.http = http; } - CaseDefinitionsService.prototype.search = function (startIndex, count, order, direction, text) { + CaseDefinitionsService.prototype.count = function () { var headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); - var targetUrl = process.env.API_URL + "/case-definitions/.search?start_index=" + startIndex + "&count=" + count; - if (order) { - targetUrl = targetUrl + "&order_by=" + order; - } - if (direction) { - targetUrl = targetUrl + "&order=" + direction; - } - if (text) { - targetUrl = targetUrl + "&text=" + text; - } + var targetUrl = process.env.API_URL + "/case-definitions/count"; return this.http.get(targetUrl, { headers: headers }).pipe(map(function (res) { - return SearchCaseDefinitionsResult.fromJson(res); - })); - }; - CaseDefinitionsService.prototype.get = function (id) { - var headers = new HttpHeaders(); - headers = headers.set('Accept', 'application/json'); - var targetUrl = process.env.API_URL + "/case-definitions/" + id; - return this.http.get(targetUrl, { headers: headers }).pipe(map(function (res) { - return CaseDefinition.fromJson(res); - })); - }; - CaseDefinitionsService.prototype.getHistory = function (id) { - var headers = new HttpHeaders(); - headers = headers.set('Accept', 'application/json'); - var targetUrl = process.env.API_URL + "/case-definitions/" + id + "/history"; - return this.http.get(targetUrl, { headers: headers }).pipe(map(function (res) { - return CaseDefinitionHistory.fromJson(res); + return CountResult.fromJson(res); })); }; CaseDefinitionsService = __decorate([ diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/services/casedefinitions.service.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/services/casedefinitions.service.js.map new file mode 100644 index 00000000..7d606ddb --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/services/casedefinitions.service.js.map @@ -0,0 +1 @@ +{"version":3,"file":"casedefinitions.service.js","sourceRoot":"","sources":["casedefinitions.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAG3D;IACI,gCAAoB,IAAgB;QAAhB,SAAI,GAAJ,IAAI,CAAY;IAAI,CAAC;IAEzC,sCAAK,GAAL;QACI,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,yBAAyB,CAAC;QAChE,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAVQ,sBAAsB;QADlC,UAAU,EAAE;yCAEiB,UAAU;OAD3B,sBAAsB,CAWlC;IAAD,6BAAC;CAAA,AAXD,IAWC;SAXY,sBAAsB"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/services/casedefinitions.service.ts b/src/CaseManagement.Performance/angularApp/app/statistics/services/casedefinitions.service.ts similarity index 74% rename from src/CaseManagement.Performance/angularApp/app/home/services/casedefinitions.service.ts rename to src/CaseManagement.Performance/angularApp/app/statistics/services/casedefinitions.service.ts index 6a7a4bd2..5dc2ec96 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/services/casedefinitions.service.ts +++ b/src/CaseManagement.Performance/angularApp/app/statistics/services/casedefinitions.service.ts @@ -3,14 +3,16 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { CountResult } from '../models/count-result.model'; +import { OAuthService } from 'angular-oauth2-oidc'; @Injectable() export class CaseDefinitionsService { - constructor(private http: HttpClient) { } + constructor(private http: HttpClient, private oauthService: OAuthService) { } count(): Observable { let headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); + headers = headers.set('Authorization', 'Bearer ' + this.oauthService.getIdToken()); let targetUrl = process.env.API_URL + "/case-definitions/count"; return this.http.get(targetUrl, { headers: headers }).pipe(map((res: any) => { return CountResult.fromJson(res); diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/services/casefiles.service.js b/src/CaseManagement.Performance/angularApp/app/statistics/services/casefiles.service.js new file mode 100644 index 00000000..c5e4bf3e --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/services/casefiles.service.js @@ -0,0 +1,33 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { map } from 'rxjs/operators'; +import { CountResult } from '../models/count-result.model'; +var CaseFilesService = (function () { + function CaseFilesService(http) { + this.http = http; + } + CaseFilesService.prototype.count = function () { + var headers = new HttpHeaders(); + headers = headers.set('Accept', 'application/json'); + var targetUrl = process.env.API_URL + "/case-files/count"; + return this.http.get(targetUrl, { headers: headers }).pipe(map(function (res) { + return CountResult.fromJson(res); + })); + }; + CaseFilesService = __decorate([ + Injectable(), + __metadata("design:paramtypes", [HttpClient]) + ], CaseFilesService); + return CaseFilesService; +}()); +export { CaseFilesService }; +//# sourceMappingURL=casefiles.service.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/services/casefiles.service.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/services/casefiles.service.js.map new file mode 100644 index 00000000..d8ffae2d --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/services/casefiles.service.js.map @@ -0,0 +1 @@ +{"version":3,"file":"casefiles.service.js","sourceRoot":"","sources":["casefiles.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAG3D;IACI,0BAAoB,IAAgB;QAAhB,SAAI,GAAJ,IAAI,CAAY;IAAI,CAAC;IACzC,gCAAK,GAAL;QACI,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,mBAAmB,CAAC;QAC1D,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IATQ,gBAAgB;QAD5B,UAAU,EAAE;yCAEiB,UAAU;OAD3B,gBAAgB,CAU5B;IAAD,uBAAC;CAAA,AAVD,IAUC;SAVY,gBAAgB"} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/services/casefiles.service.ts b/src/CaseManagement.Performance/angularApp/app/statistics/services/casefiles.service.ts similarity index 74% rename from src/CaseManagement.Performance/angularApp/app/home/services/casefiles.service.ts rename to src/CaseManagement.Performance/angularApp/app/statistics/services/casefiles.service.ts index 48044697..a84c3229 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/services/casefiles.service.ts +++ b/src/CaseManagement.Performance/angularApp/app/statistics/services/casefiles.service.ts @@ -3,13 +3,16 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { CountResult } from '../models/count-result.model'; +import { OAuthService } from 'angular-oauth2-oidc'; @Injectable() export class CaseFilesService { - constructor(private http: HttpClient) { } + constructor(private http: HttpClient, private oauthService: OAuthService) { } + count(): Observable { let headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); + headers = headers.set('Authorization', 'Bearer ' + this.oauthService.getIdToken()); let targetUrl = process.env.API_URL + "/case-files/count"; return this.http.get(targetUrl, { headers: headers }).pipe(map((res: any) => { return CountResult.fromJson(res); diff --git a/src/CaseManagement.Website/angularApp/app/performances/services/statistic.service.js b/src/CaseManagement.Performance/angularApp/app/statistics/services/statistic.service.js similarity index 95% rename from src/CaseManagement.Website/angularApp/app/performances/services/statistic.service.js rename to src/CaseManagement.Performance/angularApp/app/statistics/services/statistic.service.js index dda701d0..27373351 100644 --- a/src/CaseManagement.Website/angularApp/app/performances/services/statistic.service.js +++ b/src/CaseManagement.Performance/angularApp/app/statistics/services/statistic.service.js @@ -27,7 +27,7 @@ var StatisticService = (function () { StatisticService.prototype.search = function (startIndex, count, order, direction, startDate, endDate) { var headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); - var targetUrl = process.env.API_URL + "/statistics/.search?start_index=" + startIndex + "&count=" + count; + var targetUrl = process.env.API_URL + "/statistics/search?start_index=" + startIndex + "&count=" + count; if (order) { targetUrl = targetUrl + "&order_by=" + order; } diff --git a/src/CaseManagement.Performance/angularApp/app/home/services/statistic.service.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/services/statistic.service.js.map similarity index 92% rename from src/CaseManagement.Performance/angularApp/app/home/services/statistic.service.js.map rename to src/CaseManagement.Performance/angularApp/app/statistics/services/statistic.service.js.map index 8903e426..107c4e9e 100644 --- a/src/CaseManagement.Performance/angularApp/app/home/services/statistic.service.js.map +++ b/src/CaseManagement.Performance/angularApp/app/statistics/services/statistic.service.js.map @@ -1 +1 @@ -{"version":3,"file":"statistic.service.js","sourceRoot":"","sources":["statistic.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAG5F;IACI,0BAAoB,IAAgB;QAAhB,SAAI,GAAJ,IAAI,CAAY;IAAI,CAAC;IAEzC,8BAAG,GAAH;QACI,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,aAAa,CAAC;QACpD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,iCAAM,GAAN,UAAO,UAAkB,EAAE,KAAa,EAAE,KAAa,EAAE,SAAiB,EAAE,SAAiB,EAAE,OAAe;QAC1G,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,kCAAkC,GAAG,UAAU,GAAG,SAAS,GAAG,KAAK,CAAC;QAC1G,IAAI,KAAK,EAAE;YACP,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,CAAC;SAChD;QAED,IAAI,SAAS,EAAE;YACX,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;SACjD;QAED,IAAI,SAAS,EAAE;YACX,SAAS,GAAG,SAAS,GAAG,kBAAkB,GAAG,SAAS,CAAC;SAC1D;QAED,IAAI,OAAO,EAAE;YACT,SAAS,GAAG,SAAS,GAAG,gBAAgB,GAAG,OAAO,CAAC;SACtD;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,2BAA2B,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAnCQ,gBAAgB;QAD5B,UAAU,EAAE;yCAEiB,UAAU;OAD3B,gBAAgB,CAoC5B;IAAD,uBAAC;CAAA,AApCD,IAoCC;SApCY,gBAAgB"} \ No newline at end of file +{"version":3,"file":"statistic.service.js","sourceRoot":"","sources":["statistic.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAG5F;IACI,0BAAoB,IAAgB;QAAhB,SAAI,GAAJ,IAAI,CAAY;IAAI,CAAC;IAEzC,8BAAG,GAAH;QACI,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,aAAa,CAAC;QACpD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,iCAAM,GAAN,UAAO,UAAkB,EAAE,KAAa,EAAE,KAAa,EAAE,SAAiB,EAAE,SAAiB,EAAE,OAAe;QAC1G,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,iCAAiC,GAAG,UAAU,GAAG,SAAS,GAAG,KAAK,CAAC;QACzG,IAAI,KAAK,EAAE;YACP,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,CAAC;SAChD;QAED,IAAI,SAAS,EAAE;YACX,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;SACjD;QAED,IAAI,SAAS,EAAE;YACX,SAAS,GAAG,SAAS,GAAG,kBAAkB,GAAG,SAAS,CAAC;SAC1D;QAED,IAAI,OAAO,EAAE;YACT,SAAS,GAAG,SAAS,GAAG,gBAAgB,GAAG,OAAO,CAAC;SACtD;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,2BAA2B,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAnCQ,gBAAgB;QAD5B,UAAU,EAAE;yCAEiB,UAAU;OAD3B,gBAAgB,CAoC5B;IAAD,uBAAC;CAAA,AApCD,IAoCC;SApCY,gBAAgB"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/services/statistic.service.ts b/src/CaseManagement.Performance/angularApp/app/statistics/services/statistic.service.ts similarity index 84% rename from src/CaseManagement.Website/angularApp/app/home/services/statistic.service.ts rename to src/CaseManagement.Performance/angularApp/app/statistics/services/statistic.service.ts index 958c6775..114bab9a 100644 --- a/src/CaseManagement.Website/angularApp/app/home/services/statistic.service.ts +++ b/src/CaseManagement.Performance/angularApp/app/statistics/services/statistic.service.ts @@ -4,14 +4,16 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { DailyStatistic } from '../models/dailystatistic.model'; import { SearchDailyStatisticsResult } from '../models/search-dailystatistics-result.model'; +import { OAuthService } from 'angular-oauth2-oidc'; @Injectable() export class StatisticService { - constructor(private http: HttpClient) { } + constructor(private http: HttpClient, private oauthService: OAuthService) { } get(): Observable{ let headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); + headers = headers.set('Authorization', 'Bearer ' + this.oauthService.getIdToken()); let targetUrl = process.env.API_URL + "/statistics"; return this.http.get(targetUrl, { headers: headers }).pipe(map((res: any) => { return DailyStatistic.fromJson(res); @@ -21,6 +23,7 @@ export class StatisticService { search(startIndex: number, count: number, order: string, direction: string, startDate: string, endDate: string): Observable { let headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); + headers = headers.set('Authorization', 'Bearer ' + this.oauthService.getIdToken()); let targetUrl = process.env.API_URL + "/statistics/search?start_index=" + startIndex + "&count=" + count; if (order) { targetUrl = targetUrl + "&order_by=" + order; diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/statistics.module.js b/src/CaseManagement.Performance/angularApp/app/statistics/statistics.module.js new file mode 100644 index 00000000..ac23b0bf --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/statistics.module.js @@ -0,0 +1,65 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +import { CommonModule, DatePipe } from '@angular/common'; +import { HttpClientModule } from '@angular/common/http'; +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { EffectsModule } from '@ngrx/effects'; +import { StoreModule } from '@ngrx/store'; +import { StoreDevtoolsModule } from '@ngrx/store-devtools'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; +import { MaterialModule } from '../shared/material.module'; +import { SharedModule } from '../shared/shared.module'; +import { HomeEffects } from './components/home-effects'; +import * as fromHomeReducer from './components/home-reducer'; +import { HomeComponent } from './components/home.component'; +import { HomeRoutes } from './home.routes'; +import { CaseDefinitionsService } from './services/casedefinitions.service'; +import { CaseFilesService } from './services/casefiles.service'; +import { StatisticService } from './services/statistic.service'; +var HomeModule = (function () { + function HomeModule() { + } + HomeModule = __decorate([ + NgModule({ + imports: [ + CommonModule, + NgxChartsModule, + FormsModule, + HttpClientModule, + HomeRoutes, + MaterialModule, + SharedModule, + EffectsModule.forRoot([HomeEffects]), + StoreModule.forRoot({ + statistic: fromHomeReducer.statisticReducer, + weekStatistics: fromHomeReducer.weekStatisticsReducer, + monthStatistics: fromHomeReducer.monthStatisticsReducer, + deployed: fromHomeReducer.deployedReducer + }), + StoreDevtoolsModule.instrument({ + maxAge: 10 + }) + ], + declarations: [ + HomeComponent + ], + exports: [ + HomeComponent + ], + providers: [ + StatisticService, + CaseFilesService, + CaseDefinitionsService, + DatePipe + ] + }) + ], HomeModule); + return HomeModule; +}()); +export { HomeModule }; +//# sourceMappingURL=home.module.js.map \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/statistics.module.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/statistics.module.js.map new file mode 100644 index 00000000..2cc57806 --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/statistics.module.js.map @@ -0,0 +1 @@ +{"version":3,"file":"home.module.js","sourceRoot":"","sources":["home.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,eAAe,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAuChE;IAAA;IAA0B,CAAC;IAAd,UAAU;QArCtB,QAAQ,CAAC;YACN,OAAO,EAAE;gBACL,YAAY;gBACZ,eAAe;gBACf,WAAW;gBACX,gBAAgB;gBAChB,UAAU;gBACV,cAAc;gBACd,YAAY;gBACZ,aAAa,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC;gBACpC,WAAW,CAAC,OAAO,CAAC;oBAChB,SAAS,EAAE,eAAe,CAAC,gBAAgB;oBAC3C,cAAc,EAAE,eAAe,CAAC,qBAAqB;oBACrD,eAAe,EAAE,eAAe,CAAC,sBAAsB;oBACvD,QAAQ,EAAE,eAAe,CAAC,eAAe;iBAC5C,CAAC;gBACF,mBAAmB,CAAC,UAAU,CAAC;oBAC3B,MAAM,EAAE,EAAE;iBACb,CAAC;aACL;YAED,YAAY,EAAE;gBACV,aAAa;aAChB;YAED,OAAO,EAAE;gBACL,aAAa;aAChB;YAED,SAAS,EAAE;gBACP,gBAAgB;gBAChB,gBAAgB;gBAChB,sBAAsB;gBACtB,QAAQ;aACX;SACJ,CAAC;OAEW,UAAU,CAAI;IAAD,iBAAC;CAAA,AAA3B,IAA2B;SAAd,UAAU"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/performances.module.ts b/src/CaseManagement.Performance/angularApp/app/statistics/statistics.module.ts similarity index 52% rename from src/CaseManagement.Website/angularApp/app/performances/performances.module.ts rename to src/CaseManagement.Performance/angularApp/app/statistics/statistics.module.ts index 3757ab89..7bbacb92 100644 --- a/src/CaseManagement.Website/angularApp/app/performances/performances.module.ts +++ b/src/CaseManagement.Performance/angularApp/app/statistics/statistics.module.ts @@ -8,10 +8,12 @@ import { StoreDevtoolsModule } from '@ngrx/store-devtools'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { MaterialModule } from '../shared/material.module'; import { SharedModule } from '../shared/shared.module'; -import { ListPerformancesEffects } from './list/list-effects'; -import * as fromListReducer from './list/list-reducer'; -import { ListPerformanceComponent } from './list/list.component'; -import { PerformancesRoutes } from './performances.routes'; +import { StatisticsEffects } from './components/statistics-effects'; +import * as fromStatisticsReducer from './components/statistics-reducer'; +import { StatisticsComponent } from './components/statistics.component'; +import { StatisticsRoutes } from './statistics.routes'; +import { CaseDefinitionsService } from './services/casedefinitions.service'; +import { CaseFilesService } from './services/casefiles.service'; import { StatisticService } from './services/statistic.service'; @NgModule({ @@ -20,12 +22,15 @@ import { StatisticService } from './services/statistic.service'; NgxChartsModule, FormsModule, HttpClientModule, - PerformancesRoutes, + StatisticsRoutes, MaterialModule, SharedModule, - EffectsModule.forRoot([ListPerformancesEffects]), + EffectsModule.forRoot([StatisticsEffects]), StoreModule.forRoot({ - performances: fromListReducer.performancesReducer + statistic: fromStatisticsReducer.statisticReducer, + weekStatistics: fromStatisticsReducer.weekStatisticsReducer, + monthStatistics: fromStatisticsReducer.monthStatisticsReducer, + deployed: fromStatisticsReducer.deployedReducer }), StoreDevtoolsModule.instrument({ maxAge: 10 @@ -33,17 +38,19 @@ import { StatisticService } from './services/statistic.service'; ], declarations: [ - ListPerformanceComponent + StatisticsComponent ], exports: [ - ListPerformanceComponent + StatisticsComponent ], providers: [ StatisticService, + CaseFilesService, + CaseDefinitionsService, DatePipe ] }) -export class PerformancesModule { } +export class StatisticsModule { } diff --git a/src/CaseManagement.Website/angularApp/app/performances/performances.routes.js b/src/CaseManagement.Performance/angularApp/app/statistics/statistics.routes.js similarity index 100% rename from src/CaseManagement.Website/angularApp/app/performances/performances.routes.js rename to src/CaseManagement.Performance/angularApp/app/statistics/statistics.routes.js diff --git a/src/CaseManagement.Website/angularApp/app/performances/performances.routes.js.map b/src/CaseManagement.Performance/angularApp/app/statistics/statistics.routes.js.map similarity index 100% rename from src/CaseManagement.Website/angularApp/app/performances/performances.routes.js.map rename to src/CaseManagement.Performance/angularApp/app/statistics/statistics.routes.js.map diff --git a/src/CaseManagement.Performance/angularApp/app/statistics/statistics.routes.ts b/src/CaseManagement.Performance/angularApp/app/statistics/statistics.routes.ts new file mode 100644 index 00000000..a4e6a187 --- /dev/null +++ b/src/CaseManagement.Performance/angularApp/app/statistics/statistics.routes.ts @@ -0,0 +1,9 @@ +import { RouterModule, Routes } from '@angular/router'; + +import { StatisticsComponent } from './components/statistics.component'; + +const routes: Routes = [ + { path: '', component: StatisticsComponent } +]; + +export const StatisticsRoutes = RouterModule.forChild(routes); \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/status/components/401/401.component.html b/src/CaseManagement.Performance/angularApp/app/status/components/401/401.component.html index e12f35f3..830fc37b 100644 --- a/src/CaseManagement.Performance/angularApp/app/status/components/401/401.component.html +++ b/src/CaseManagement.Performance/angularApp/app/status/components/401/401.component.html @@ -1,3 +1,5 @@ -
- 401 +
+
+
{{ "NOT_AUTHORIZED" | translate }}
+
\ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/status/components/404/404.component.html b/src/CaseManagement.Performance/angularApp/app/status/components/404/404.component.html index dc074cfa..4a6ef418 100644 --- a/src/CaseManagement.Performance/angularApp/app/status/components/404/404.component.html +++ b/src/CaseManagement.Performance/angularApp/app/status/components/404/404.component.html @@ -1,3 +1,5 @@ -
- 404 +
+
+
{{ "NOT_FOUND" | translate }}
+
\ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/status/status.module.ts b/src/CaseManagement.Performance/angularApp/app/status/status.module.ts index 2b4737ce..2280727b 100644 --- a/src/CaseManagement.Performance/angularApp/app/status/status.module.ts +++ b/src/CaseManagement.Performance/angularApp/app/status/status.module.ts @@ -2,9 +2,15 @@ import { NgModule } from '@angular/core'; import { UnauthorizedComponent } from './components/401/401.component'; import { NotFoundComponent } from './components/404/404.component'; import { StatusRoute } from './status.routes'; +import { CommonModule } from '@angular/common'; +import { MaterialModule } from '../shared/material.module'; +import { SharedModule } from '../shared/shared.module'; @NgModule({ imports: [ + CommonModule, + MaterialModule, + SharedModule, StatusRoute ], declarations: [ diff --git a/src/CaseManagement.Performance/angularApp/i18n/en.json b/src/CaseManagement.Performance/angularApp/i18n/en.json index eba2daf8..7a0ae60c 100644 --- a/src/CaseManagement.Performance/angularApp/i18n/en.json +++ b/src/CaseManagement.Performance/angularApp/i18n/en.json @@ -51,5 +51,12 @@ "CLOSE": "Close", "EXECUTION_CONTEXT": "Execution context", "CASE_FILE_ITEMS": "Case file items", - "VALUE": "Value" + "VALUE": "Value", + "HOME": "Home", + "AUTHENTICATE": "Authenticate", + "WELCOME": "Welcome {{name}}", + "DISCONNECT": "Disconnect", + "STATISTICS": "Statistics", + "NOT_FOUND": "404 : Page not found", + "NOT_AUTHORIZED": "401 : You're not authorized" } \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/i18n/fr.json b/src/CaseManagement.Performance/angularApp/i18n/fr.json index 387072db..065e1efe 100644 --- a/src/CaseManagement.Performance/angularApp/i18n/fr.json +++ b/src/CaseManagement.Performance/angularApp/i18n/fr.json @@ -51,5 +51,12 @@ "CLOSE": "Fermer", "EXECUTION_CONTEXT": "Contexte d'exécution", "CASE_FILE_ITEMS": "Fichiers liés à l'instance du case", - "VALUE": "Valeur" + "VALUE": "Valeur", + "HOME": "Accueil", + "AUTHENTICATE": "Authentifier", + "WELCOME": "Bienvenue {{name}}", + "DISCONNECT": "Se déconnecter", + "STATISTICS": "Statistiques", + "NOT_FOUND": "404 : Page n'existe pas", + "NOT_AUTHORIZED": "401 : Vous n'êtes pas autorisé" } \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/index.html b/src/CaseManagement.Performance/angularApp/index.ejs similarity index 95% rename from src/CaseManagement.Website/angularApp/index.html rename to src/CaseManagement.Performance/angularApp/index.ejs index a10f3c5d..f5e7fbbd 100644 --- a/src/CaseManagement.Website/angularApp/index.html +++ b/src/CaseManagement.Performance/angularApp/index.ejs @@ -1,7 +1,7 @@  - + @@ -92,7 +92,7 @@
- + diff --git a/src/CaseManagement.Performance/angularApp/manifest.webmanifest b/src/CaseManagement.Performance/angularApp/manifest.webmanifest deleted file mode 100644 index 77c14d5f..00000000 --- a/src/CaseManagement.Performance/angularApp/manifest.webmanifest +++ /dev/null @@ -1,27 +0,0 @@ -{ - "short_name": "BCV", - "name": "Bank CV", - "theme_color": "#eb5252", - "background_color": "#000000", - "display": "standalone", - "Scope": "/", - "orientation": "landscape", - "icons": [ - { - "src": "images/icon-48-48.png", - "type": "image/png", - "sizes": "48x48" - }, - { - "src": "images/icon-64-64.png", - "type": "image/png", - "sizes": "96x96" - }, - { - "src": "images/icon-192-192.png", - "type": "image/png", - "sizes": "192x192" - } - ], - "start_url": "index.html" -} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/styles/app.scss b/src/CaseManagement.Performance/angularApp/styles/app.scss index a2bc46d7..604acab9 100644 --- a/src/CaseManagement.Performance/angularApp/styles/app.scss +++ b/src/CaseManagement.Performance/angularApp/styles/app.scss @@ -110,4 +110,4 @@ ul.list li:hover .actions { margin-left: auto; margin-right: auto; display: block; -} \ No newline at end of file +} diff --git a/src/CaseManagement.Performance/config/webpack.azure.js b/src/CaseManagement.Performance/config/webpack.azure.js index 5681dd20..56533fc5 100644 --- a/src/CaseManagement.Performance/config/webpack.azure.js +++ b/src/CaseManagement.Performance/config/webpack.azure.js @@ -7,11 +7,10 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const CleanWebpackPlugin = require('clean-webpack-plugin'); const FilterWarningsPlugin = require('webpack-filter-warnings-plugin'); -const WorkboxPlugin = require('workbox-webpack-plugin'); -const helpers = require('./webpack.helpers'); const ENV = process.env.ENV = process.env.NODE_ENV = 'azure'; const API_URL = process.env.API_URL = "http://simpleidserver.northeurope.cloudapp.azure.com/casemanagementapi"; +const BASE_URL = process.env.BASE_URL || '/performance/'; const ROOT = path.resolve(__dirname, '..'); @@ -33,7 +32,7 @@ module.exports = { path: ROOT + '/wwwroot/', filename: 'dist/[name].bundle.js', chunkFilename: 'dist/[id].chunk.js', - publicPath: '/' + publicPath: BASE_URL }, resolve: { @@ -120,11 +119,13 @@ module.exports = { new HtmlWebpackPlugin({ filename: 'index.html', inject: 'body', - template: 'angularApp/index.html' + template: 'angularApp/index.ejs', + templateParameters: { + baseUrl: BASE_URL + } }), new CopyWebpackPlugin([ - { from: './angularApp/*.webmanifest', to: 'assets', flatten: true }, { from: './angularApp/images/*.*', to: 'assets/images', flatten: true }, { from: './angularApp/i18n/*.*', to: 'assets/i18n', flatten: true }, { from: './angularApp/fonts/*.*', to: 'assets/fonts', flatten: true } @@ -139,30 +140,9 @@ module.exports = { 'API_URL': JSON.stringify(API_URL), 'process.env': { 'ENV': JSON.stringify(ENV), - 'API_URL': JSON.stringify(API_URL) + 'API_URL': JSON.stringify(API_URL), + 'BASE_URL': JSON.stringify(BASE_URL) } - }), - /*, - new WorkboxPlugin.GenerateSW({ - // include: [/\.html$/, /\.js$/], - // importWorkboxFrom: 'local', - navigateFallback: '/index.html', - clientsClaim: true, - skipWaiting: true, - runtimeCaching: [{ - urlPattern: /^http:\/\/localhost:3001/, - handler: 'networkFirst', - options: { - cacheName: 'bankcv-api' - } - }, { - urlPattern: /^http:\/\/localhost:3000/, - handler: 'networkFirst', - options: { - cacheName: 'identity-api' - } - }] }) - */ ] }; diff --git a/src/CaseManagement.Performance/config/webpack.dev.js b/src/CaseManagement.Performance/config/webpack.dev.js index 49fdab1e..6118162a 100644 --- a/src/CaseManagement.Performance/config/webpack.dev.js +++ b/src/CaseManagement.Performance/config/webpack.dev.js @@ -7,11 +7,10 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const CleanWebpackPlugin = require('clean-webpack-plugin'); const FilterWarningsPlugin = require('webpack-filter-warnings-plugin'); -const WorkboxPlugin = require('workbox-webpack-plugin'); -const helpers = require('./webpack.helpers'); const ENV = process.env.ENV = process.env.NODE_ENV = 'development'; const API_URL = process.env.API_URL = "http://localhost:54942"; +const BASE_URL = process.env.BASE_URL || '/'; const ROOT = path.resolve(__dirname, '..'); @@ -33,7 +32,7 @@ module.exports = { path: ROOT + '/wwwroot/', filename: 'dist/[name].bundle.js', chunkFilename: 'dist/[id].chunk.js', - publicPath: '/' + publicPath: BASE_URL }, resolve: { @@ -120,11 +119,13 @@ module.exports = { new HtmlWebpackPlugin({ filename: 'index.html', inject: 'body', - template: 'angularApp/index.html' + template: 'angularApp/index.ejs', + templateParameters: { + baseUrl: BASE_URL + } }), new CopyWebpackPlugin([ - { from: './angularApp/*.webmanifest', to: 'assets', flatten: true }, { from: './angularApp/images/*.*', to: 'assets/images', flatten: true }, { from: './angularApp/i18n/*.*', to: 'assets/i18n', flatten: true }, { from: './angularApp/fonts/*.*', to: 'assets/fonts', flatten: true } @@ -139,30 +140,9 @@ module.exports = { 'API_URL': JSON.stringify(API_URL), 'process.env': { 'ENV': JSON.stringify(ENV), - 'API_URL': JSON.stringify(API_URL) + 'API_URL': JSON.stringify(API_URL), + 'BASE_URL': JSON.stringify(BASE_URL) } - }), - /*, - new WorkboxPlugin.GenerateSW({ - // include: [/\.html$/, /\.js$/], - // importWorkboxFrom: 'local', - navigateFallback: '/index.html', - clientsClaim: true, - skipWaiting: true, - runtimeCaching: [{ - urlPattern: /^http:\/\/localhost:3001/, - handler: 'networkFirst', - options: { - cacheName: 'bankcv-api' - } - }, { - urlPattern: /^http:\/\/localhost:3000/, - handler: 'networkFirst', - options: { - cacheName: 'identity-api' - } - }] }) - */ ] }; diff --git a/src/CaseManagement.Performance/package-lock.json b/src/CaseManagement.Performance/package-lock.json index 5ee743d4..94136e3d 100644 --- a/src/CaseManagement.Performance/package-lock.json +++ b/src/CaseManagement.Performance/package-lock.json @@ -20,7 +20,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } } } @@ -117,11 +117,11 @@ "dev": true, "optional": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "cliui": { @@ -130,9 +130,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" }, "dependencies": { "strip-ansi": { @@ -141,7 +141,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -152,14 +152,14 @@ "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==", "dev": true, "requires": { - "cacache": "10.0.4", - "find-cache-dir": "1.0.0", - "globby": "7.1.1", - "is-glob": "4.0.1", - "loader-utils": "1.2.3", - "minimatch": "3.0.4", - "p-limit": "1.3.0", - "serialize-javascript": "1.9.1" + "cacache": "^10.0.4", + "find-cache-dir": "^1.0.0", + "globby": "^7.1.1", + "is-glob": "^4.0.0", + "loader-utils": "^1.1.0", + "minimatch": "^3.0.4", + "p-limit": "^1.0.0", + "serialize-javascript": "^1.4.0" } }, "debug": { @@ -168,7 +168,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "decamelize": { @@ -186,13 +186,13 @@ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "6.0.5", - "get-stream": "4.1.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "dependencies": { "cross-spawn": { @@ -201,11 +201,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.6.0", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } } } @@ -216,7 +216,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "get-stream": { @@ -225,7 +225,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "3.0.0" + "pump": "^3.0.0" } }, "invert-kv": { @@ -246,7 +246,7 @@ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { - "invert-kv": "2.0.0" + "invert-kv": "^2.0.0" } }, "locate-path": { @@ -255,8 +255,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "mime": { @@ -278,23 +278,23 @@ "dev": true, "optional": true, "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.3", - "get-stdin": "4.0.1", - "glob": "7.1.3", - "in-publish": "2.0.0", - "lodash": "4.17.15", - "meow": "3.7.0", - "mkdirp": "0.5.1", - "nan": "2.14.0", - "node-gyp": "3.8.0", - "npmlog": "4.1.2", - "request": "2.88.0", - "sass-graph": "2.2.4", - "stdout-stream": "1.4.1", - "true-case-path": "1.0.3" + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^3.0.0", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "in-publish": "^2.0.0", + "lodash": "^4.17.11", + "meow": "^3.7.0", + "mkdirp": "^0.5.1", + "nan": "^2.13.2", + "node-gyp": "^3.8.0", + "npmlog": "^4.0.0", + "request": "^2.88.0", + "sass-graph": "^2.2.4", + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" } }, "os-locale": { @@ -303,9 +303,9 @@ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { - "execa": "1.0.0", - "lcid": "2.0.0", - "mem": "4.3.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, "p-locate": { @@ -314,7 +314,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.2.1" + "p-limit": "^2.0.0" }, "dependencies": { "p-limit": { @@ -323,7 +323,7 @@ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } } } @@ -346,8 +346,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "rxjs": { @@ -356,7 +356,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "sass-loader": { @@ -365,12 +365,12 @@ "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==", "dev": true, "requires": { - "clone-deep": "2.0.2", - "loader-utils": "1.2.3", - "lodash.tail": "4.1.1", - "neo-async": "2.6.1", - "pify": "3.0.0", - "semver": "5.6.0" + "clone-deep": "^2.0.1", + "loader-utils": "^1.0.1", + "lodash.tail": "^4.1.1", + "neo-async": "^2.5.0", + "pify": "^3.0.0", + "semver": "^5.5.0" } }, "schema-utils": { @@ -379,8 +379,8 @@ "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", "dev": true, "requires": { - "ajv": "6.9.1", - "ajv-keywords": "3.4.1" + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0" } }, "string-width": { @@ -389,8 +389,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "strip-ansi": { @@ -399,7 +399,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -421,26 +421,26 @@ "@webassemblyjs/helper-module-context": "1.7.11", "@webassemblyjs/wasm-edit": "1.7.11", "@webassemblyjs/wasm-parser": "1.7.11", - "acorn": "6.4.0", - "acorn-dynamic-import": "4.0.0", - "ajv": "6.9.1", - "ajv-keywords": "3.4.1", - "chrome-trace-event": "1.0.2", - "enhanced-resolve": "4.1.0", - "eslint-scope": "4.0.3", - "json-parse-better-errors": "1.0.2", - "loader-runner": "2.4.0", - "loader-utils": "1.2.3", - "memory-fs": "0.4.1", - "micromatch": "3.1.10", - "mkdirp": "0.5.1", - "neo-async": "2.6.1", - "node-libs-browser": "2.2.1", - "schema-utils": "0.4.7", - "tapable": "1.1.3", - "terser-webpack-plugin": "1.2.2", - "watchpack": "1.6.0", - "webpack-sources": "1.3.0" + "acorn": "^6.0.5", + "acorn-dynamic-import": "^4.0.0", + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0", + "chrome-trace-event": "^1.0.0", + "enhanced-resolve": "^4.1.0", + "eslint-scope": "^4.0.0", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^2.3.0", + "loader-utils": "^1.1.0", + "memory-fs": "~0.4.1", + "micromatch": "^3.1.8", + "mkdirp": "~0.5.0", + "neo-async": "^2.5.0", + "node-libs-browser": "^2.0.0", + "schema-utils": "^0.4.4", + "tapable": "^1.1.0", + "terser-webpack-plugin": "^1.1.0", + "watchpack": "^1.5.0", + "webpack-sources": "^1.3.0" } }, "webpack-dev-server": { @@ -450,34 +450,34 @@ "dev": true, "requires": { "ansi-html": "0.0.7", - "bonjour": "3.5.0", - "chokidar": "2.0.4", - "compression": "1.7.4", - "connect-history-api-fallback": "1.6.0", - "debug": "3.2.6", - "del": "3.0.0", - "express": "4.17.1", - "html-entities": "1.2.1", - "http-proxy-middleware": "0.18.0", - "import-local": "2.0.0", - "internal-ip": "3.0.1", - "ip": "1.1.5", - "killable": "1.0.1", - "loglevel": "1.6.6", - "opn": "5.5.0", - "portfinder": "1.0.25", - "schema-utils": "1.0.0", - "selfsigned": "1.10.7", - "semver": "5.6.0", - "serve-index": "1.9.1", + "bonjour": "^3.5.0", + "chokidar": "^2.0.0", + "compression": "^1.5.2", + "connect-history-api-fallback": "^1.3.0", + "debug": "^3.1.0", + "del": "^3.0.0", + "express": "^4.16.2", + "html-entities": "^1.2.0", + "http-proxy-middleware": "~0.18.0", + "import-local": "^2.0.0", + "internal-ip": "^3.0.1", + "ip": "^1.1.5", + "killable": "^1.0.0", + "loglevel": "^1.4.1", + "opn": "^5.1.0", + "portfinder": "^1.0.9", + "schema-utils": "^1.0.0", + "selfsigned": "^1.9.1", + "semver": "^5.6.0", + "serve-index": "^1.7.2", "sockjs": "0.3.19", "sockjs-client": "1.3.0", - "spdy": "4.0.1", - "strip-ansi": "3.0.1", - "supports-color": "5.5.0", - "url": "0.11.0", + "spdy": "^4.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^5.1.0", + "url": "^0.11.0", "webpack-dev-middleware": "3.4.0", - "webpack-log": "2.0.0", + "webpack-log": "^2.0.0", "yargs": "12.0.2" }, "dependencies": { @@ -487,9 +487,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "6.9.1", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.4.1" + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" } }, "supports-color": { @@ -498,7 +498,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "webpack-dev-middleware": { @@ -507,10 +507,10 @@ "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==", "dev": true, "requires": { - "memory-fs": "0.4.1", - "mime": "2.4.4", - "range-parser": "1.2.1", - "webpack-log": "2.0.0" + "memory-fs": "~0.4.1", + "mime": "^2.3.1", + "range-parser": "^1.0.3", + "webpack-log": "^2.0.0" } } } @@ -527,18 +527,18 @@ "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "2.0.0", - "find-up": "3.0.0", - "get-caller-file": "1.0.3", - "os-locale": "3.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "10.1.0" + "cliui": "^4.0.0", + "decamelize": "^2.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^10.1.0" } }, "yargs-parser": { @@ -547,7 +547,7 @@ "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } @@ -595,7 +595,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } } } @@ -619,7 +619,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } } } @@ -640,7 +640,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } } } @@ -650,7 +650,7 @@ "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.15.tgz", "integrity": "sha512-8oBt3HLgd2+kyJHUgsd7OzKCCss67t2sch15XNoIWlOLfxclqU+EfFE6t/vCzpT8/+lpZS6LU9ZrTnb+UBj5jg==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "@angular/cdk": { @@ -658,8 +658,8 @@ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.3.7.tgz", "integrity": "sha512-xbXxhHHKGkVuW6K7pzPmvpJXIwpl0ykBnvA2g+/7Sgy5Pd35wCC+UtHD9RYczDM/mkygNxMQtagyCErwFnDtQA==", "requires": { - "parse5": "5.1.1", - "tslib": "1.10.0" + "parse5": "^5.0.0", + "tslib": "^1.7.1" } }, "@angular/cli": { @@ -688,7 +688,7 @@ "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.15.tgz", "integrity": "sha512-2b5JY2HWVHCf3D1GZjmde7jdAXSTXkYtmjLtA9tQkjOOTr80eHpNSujQqnzb97dk9VT9OjfjqTQd7K3pxZz8jw==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "@angular/compiler": { @@ -696,7 +696,7 @@ "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.15.tgz", "integrity": "sha512-5yb4NcLk8GuXkYf7Dcor4XkGueYp4dgihzDmMjYDUrV0NPhubKlr+SwGtLOtzgRBWJ1I2bO0S3zwa0q0OgIPOw==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "@angular/compiler-cli": { @@ -706,15 +706,15 @@ "dev": true, "requires": { "canonical-path": "1.0.0", - "chokidar": "2.1.8", - "convert-source-map": "1.7.0", - "dependency-graph": "0.7.2", - "magic-string": "0.25.4", - "minimist": "1.2.0", - "reflect-metadata": "0.1.13", - "shelljs": "0.8.3", - "source-map": "0.6.1", - "tslib": "1.10.0", + "chokidar": "^2.1.1", + "convert-source-map": "^1.5.1", + "dependency-graph": "^0.7.2", + "magic-string": "^0.25.0", + "minimist": "^1.2.0", + "reflect-metadata": "^0.1.2", + "shelljs": "^0.8.1", + "source-map": "^0.6.1", + "tslib": "^1.9.0", "yargs": "9.0.1" }, "dependencies": { @@ -736,18 +736,18 @@ "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", "dev": true, "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.3", - "braces": "2.3.2", - "fsevents": "1.2.9", - "glob-parent": "3.1.0", - "inherits": "2.0.4", - "is-binary-path": "1.0.1", - "is-glob": "4.0.1", - "normalize-path": "3.0.0", - "path-is-absolute": "1.0.1", - "readdirp": "2.2.1", - "upath": "1.2.0" + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" } }, "cross-spawn": { @@ -756,9 +756,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.5", - "shebang-command": "1.2.0", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "execa": { @@ -767,13 +767,13 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -788,10 +788,10 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "graceful-fs": "4.2.3", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" } }, "mem": { @@ -800,7 +800,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "mimic-fn": { @@ -821,9 +821,9 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "path-type": { @@ -832,7 +832,7 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { - "pify": "2.3.0" + "pify": "^2.0.0" } }, "pify": { @@ -847,9 +847,9 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.5.0", - "path-type": "2.0.0" + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" } }, "read-pkg-up": { @@ -858,8 +858,8 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" } }, "source-map": { @@ -874,8 +874,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -884,7 +884,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "strip-bom": { @@ -911,19 +911,19 @@ "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=", "dev": true, "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.3", - "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "7.0.0" + "camelcase": "^4.1.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "read-pkg-up": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^7.0.0" } }, "yargs-parser": { @@ -932,7 +932,7 @@ "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } @@ -942,7 +942,7 @@ "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.15.tgz", "integrity": "sha512-XsuYm0jEU/mOqwDOk2utThv8J9kESkAerfuCHClE9rB2TtHUOGCfekF7lJWqjjypu6/J9ygoPFo7hdAE058ZGg==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "@angular/flex-layout": { @@ -950,7 +950,7 @@ "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-7.0.0-beta.24.tgz", "integrity": "sha512-ll6sK0nLGxqI/f5+z4jbd+pve1QITzgehv2AuGvfSDgIjPMeqUDB5YZqQmIGM/dQRk/vIio5KCW5LQPJWzMMYQ==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.7.1" } }, "@angular/forms": { @@ -958,7 +958,7 @@ "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.15.tgz", "integrity": "sha512-p0kcIQLtBBC1qeTA6M3nOuXf/k91E80FKquVM9zEsO2kDjI0oZJVfFYL2UMov5samlJOPN+t6lRHEIUa7ApPsw==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "@angular/http": { @@ -966,7 +966,7 @@ "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.15.tgz", "integrity": "sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "@angular/language-service": { @@ -980,7 +980,7 @@ "resolved": "https://registry.npmjs.org/@angular/material/-/material-7.3.7.tgz", "integrity": "sha512-Eq+7frkeNGkLOfEtmkmJgR+AgoWajOipXZWWfCSamNfpCcPof82DwvGOpAmgGni9FuN2XFQdqP5MoaffQzIvUA==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.7.1" } }, "@angular/platform-browser": { @@ -988,7 +988,7 @@ "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.15.tgz", "integrity": "sha512-aYgmPsbC9Tvp9vmKWD8voeAp4crwCay7/D6lM3ClEe2EeK934LuEXq3/uczMrFVbnIX7BBIo8fh03Tl7wbiGPw==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { @@ -996,7 +996,7 @@ "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.15.tgz", "integrity": "sha512-UL2PqhzXMD769NQ6Lh6pxlBDKvN9Qol3XLRFil80lwJ1GRW16ITeYbCamcafIH2GOyd88IhmYcbMfUQ/6q4MMQ==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "@angular/router": { @@ -1004,7 +1004,7 @@ "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.15.tgz", "integrity": "sha512-qAubRJRQanguUqJQ76J9GSZ4JFtoyhJKRmX5P23ANZJXpB6YLzF2fJmOGi+E6cV8F0tKBMEq1pjxFTisx0MXwQ==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "@angular/service-worker": { @@ -1012,7 +1012,7 @@ "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-8.2.14.tgz", "integrity": "sha512-Xv1ES5bXDRxPJ5uyRqeKw6mGKaJVzKK0oFcR0mr4OSdyLXGZ+x6fC2S/QcLy4ugpb64fyEksrnHhHjeMVzGh2Q==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "@babel/code-frame": { @@ -1021,7 +1021,7 @@ "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", "dev": true, "requires": { - "@babel/highlight": "7.5.0" + "@babel/highlight": "^7.0.0" } }, "@babel/generator": { @@ -1030,10 +1030,10 @@ "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", "dev": true, "requires": { - "@babel/types": "7.7.4", - "jsesc": "2.5.2", - "lodash": "4.17.15", - "source-map": "0.5.7" + "@babel/types": "^7.7.4", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" }, "dependencies": { "jsesc": { @@ -1056,9 +1056,9 @@ "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "7.7.4", - "@babel/template": "7.7.4", - "@babel/types": "7.7.4" + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-get-function-arity": { @@ -1067,7 +1067,7 @@ "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", "dev": true, "requires": { - "@babel/types": "7.7.4" + "@babel/types": "^7.7.4" } }, "@babel/helper-split-export-declaration": { @@ -1076,7 +1076,7 @@ "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", "dev": true, "requires": { - "@babel/types": "7.7.4" + "@babel/types": "^7.7.4" } }, "@babel/highlight": { @@ -1085,9 +1085,9 @@ "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", "dev": true, "requires": { - "chalk": "2.4.2", - "esutils": "2.0.3", - "js-tokens": "4.0.0" + "chalk": "^2.0.0", + "esutils": "^2.0.2", + "js-tokens": "^4.0.0" } }, "@babel/parser": { @@ -1102,7 +1102,7 @@ "integrity": "sha512-r24eVUUr0QqNZa+qrImUk8fn5SPhHq+IfYvIoIMg0do3GdK9sMdiLKP3GYVVaxpPKORgm8KRKaNTEhAjgIpLMw==", "dev": true, "requires": { - "regenerator-runtime": "0.13.3" + "regenerator-runtime": "^0.13.2" }, "dependencies": { "regenerator-runtime": { @@ -1119,9 +1119,9 @@ "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "dev": true, "requires": { - "@babel/code-frame": "7.5.5", - "@babel/parser": "7.7.4", - "@babel/types": "7.7.4" + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/traverse": { @@ -1130,15 +1130,15 @@ "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", "dev": true, "requires": { - "@babel/code-frame": "7.5.5", - "@babel/generator": "7.7.4", - "@babel/helper-function-name": "7.7.4", - "@babel/helper-split-export-declaration": "7.7.4", - "@babel/parser": "7.7.4", - "@babel/types": "7.7.4", - "debug": "4.1.1", - "globals": "11.12.0", - "lodash": "4.17.15" + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" }, "dependencies": { "debug": { @@ -1147,7 +1147,7 @@ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "globals": { @@ -1170,9 +1170,9 @@ "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "dev": true, "requires": { - "esutils": "2.0.3", - "lodash": "4.17.15", - "to-fast-properties": "2.0.0" + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" }, "dependencies": { "to-fast-properties": { @@ -1207,10 +1207,10 @@ "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==", "dev": true, "requires": { - "@hapi/address": "2.1.4", - "@hapi/bourne": "1.3.2", - "@hapi/hoek": "8.5.0", - "@hapi/topo": "3.1.6" + "@hapi/address": "2.x.x", + "@hapi/bourne": "1.x.x", + "@hapi/hoek": "8.x.x", + "@hapi/topo": "3.x.x" } }, "@hapi/topo": { @@ -1219,7 +1219,7 @@ "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", "dev": true, "requires": { - "@hapi/hoek": "8.5.0" + "@hapi/hoek": "^8.3.0" } }, "@ngrx/core": { @@ -1272,10 +1272,10 @@ "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=", "dev": true, "requires": { - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1", - "uri-js": "3.0.2" + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0", + "uri-js": "^3.0.2" } }, "fast-deep-equal": { @@ -1296,7 +1296,7 @@ "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", "dev": true, "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "source-map": { @@ -1311,7 +1311,7 @@ "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=", "dev": true, "requires": { - "punycode": "2.1.1" + "punycode": "^2.1.0" } } } @@ -1321,7 +1321,7 @@ "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz", "integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "@ngx-translate/http-loader": { @@ -1329,7 +1329,7 @@ "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz", "integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "@schematics/angular": { @@ -1373,7 +1373,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } } } @@ -1383,17 +1383,17 @@ "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-13.0.1.tgz", "integrity": "sha512-uAL2ifGu47QCiOKL0b7d978QNrPRmavHF9rKWipZGmZCgh4SClL9TYR9fxT/0NUB7pvhrJENwTHiGzIMPjZj+Q==", "requires": { - "d3-array": "2.4.0", - "d3-brush": "1.1.5", - "d3-color": "1.4.0", - "d3-format": "1.4.3", - "d3-hierarchy": "1.1.9", - "d3-interpolate": "1.4.0", - "d3-scale": "3.2.1", - "d3-selection": "1.4.1", - "d3-shape": "1.3.7", - "d3-time-format": "2.2.3", - "d3-transition": "1.3.2" + "d3-array": "^2.4.0", + "d3-brush": "^1.1.5", + "d3-color": "^1.4.0", + "d3-format": "^1.4.2", + "d3-hierarchy": "^1.1.9", + "d3-interpolate": "^1.4.0", + "d3-scale": "^3.2.1", + "d3-selection": "^1.4.1", + "d3-shape": "^1.3.7", + "d3-time-format": "^2.2.2", + "d3-transition": "^1.3.2" } }, "@types/events": { @@ -1413,9 +1413,9 @@ "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", "dev": true, "requires": { - "@types/events": "3.0.0", - "@types/minimatch": "3.0.3", - "@types/node": "11.13.23" + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" } }, "@types/jasmine": { @@ -1430,7 +1430,7 @@ "integrity": "sha512-d9p31r7Nxk0ZH0U39PTH0hiDlJ+qNVGjlt1ucOoTUptxb2v+Y5VMnsxfwN+i3hK4yQnqBi3FMmoMFcd1JHDxdg==", "dev": true, "requires": { - "@types/jasmine": "3.3.16" + "@types/jasmine": "*" } }, "@types/leaflet": { @@ -1438,7 +1438,7 @@ "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.5.5.tgz", "integrity": "sha512-Eyh1LMmW4OFgafL6rjLyGkMqFS5IzgwWHMSgTKbrsvwLjLaWH8Ae8CV5liRe8HSM731oOVDwAMIZgg9P0SO9tg==", "requires": { - "@types/geojson": "7946.0.7" + "@types/geojson": "*" } }, "@types/minimatch": { @@ -1465,9 +1465,9 @@ "integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==", "dev": true, "requires": { - "@types/node": "11.13.23", - "@types/source-list-map": "0.1.2", - "source-map": "0.6.1" + "@types/node": "*", + "@types/source-list-map": "*", + "source-map": "^0.6.1" }, "dependencies": { "source-map": { @@ -1552,7 +1552,7 @@ "integrity": "sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==", "dev": true, "requires": { - "@xtuc/ieee754": "1.2.0" + "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { @@ -1674,8 +1674,8 @@ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", "dev": true, "requires": { - "jsonparse": "1.3.1", - "through": "2.3.8" + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" } }, "abbrev": { @@ -1690,7 +1690,7 @@ "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", "dev": true, "requires": { - "mime-types": "2.1.25", + "mime-types": "~2.1.24", "negotiator": "0.6.2" } }, @@ -1730,7 +1730,7 @@ "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", "dev": true, "requires": { - "es6-promisify": "5.0.0" + "es6-promisify": "^5.0.0" } }, "agentkeepalive": { @@ -1739,7 +1739,7 @@ "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==", "dev": true, "requires": { - "humanize-ms": "1.2.1" + "humanize-ms": "^1.2.1" } }, "ajv": { @@ -1748,10 +1748,10 @@ "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==", "dev": true, "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" } }, "ajv-errors": { @@ -1777,8 +1777,8 @@ "resolved": "https://registry.npmjs.org/angular-oauth2-oidc/-/angular-oauth2-oidc-5.0.2.tgz", "integrity": "sha512-jtOv4IWEjSFfBHVE4seWGWT/ZfWJ95QJ1JaFhVVGJEF64ibGuPwV3ztwTOUl98QHi/Yg4PXXDAisb31JnIbxBw==", "requires": { - "jsrsasign": "8.0.12", - "tslib": "1.10.0" + "jsrsasign": "^8.0.12", + "tslib": "^1.9.0" } }, "angular-router-loader": { @@ -1787,7 +1787,7 @@ "integrity": "sha512-8wggCTKGgzB1o8co3Wvj+p9pKN7T7q3C477lEz3NLjvPVzUti8rv9i45Di+4aO/k+HvzGh3s8QdNlXU2Bl4avQ==", "dev": true, "requires": { - "loader-utils": "1.2.3" + "loader-utils": "^1.0.2" } }, "angular2-template-loader": { @@ -1796,7 +1796,7 @@ "integrity": "sha1-wNROkP/w+sleiyPwQ6zaf9HFHXw=", "dev": true, "requires": { - "loader-utils": "0.2.17" + "loader-utils": "^0.2.15" }, "dependencies": { "big.js": { @@ -1817,10 +1817,10 @@ "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", "dev": true, "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" + "big.js": "^3.1.3", + "emojis-list": "^2.0.0", + "json5": "^0.5.0", + "object-assign": "^4.0.1" } } } @@ -1855,7 +1855,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "anymatch": { @@ -1864,8 +1864,8 @@ "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" } }, "app-root-path": { @@ -1880,7 +1880,7 @@ "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", "dev": true, "requires": { - "default-require-extensions": "2.0.0" + "default-require-extensions": "^2.0.0" } }, "aproba": { @@ -1895,8 +1895,8 @@ "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "arg": { @@ -1911,7 +1911,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" } }, "aria-query": { @@ -1921,7 +1921,7 @@ "dev": true, "requires": { "ast-types-flow": "0.0.7", - "commander": "2.20.3" + "commander": "^2.11.0" } }, "arr-diff": { @@ -1960,7 +1960,7 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { - "array-uniq": "1.0.3" + "array-uniq": "^1.0.1" } }, "array-uniq": { @@ -1994,7 +1994,7 @@ "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "~2.1.0" } }, "asn1.js": { @@ -2003,9 +2003,9 @@ "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", "dev": true, "requires": { - "bn.js": "4.11.8", - "inherits": "2.0.4", - "minimalistic-assert": "1.0.1" + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" } }, "assert": { @@ -2014,7 +2014,7 @@ "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", "dev": true, "requires": { - "object-assign": "4.1.1", + "object-assign": "^4.1.1", "util": "0.10.3" }, "dependencies": { @@ -2059,7 +2059,7 @@ "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", "dev": true, "requires": { - "lodash": "4.17.15" + "lodash": "^4.17.14" } }, "async-each": { @@ -2098,12 +2098,12 @@ "integrity": "sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==", "dev": true, "requires": { - "browserslist": "4.7.3", - "caniuse-lite": "1.0.30001012", - "normalize-range": "0.1.2", - "num2fraction": "1.2.2", - "postcss": "7.0.14", - "postcss-value-parser": "3.3.1" + "browserslist": "^4.4.1", + "caniuse-lite": "^1.0.30000929", + "normalize-range": "^0.1.2", + "num2fraction": "^1.2.2", + "postcss": "^7.0.13", + "postcss-value-parser": "^3.3.1" } }, "awesome-typescript-loader": { @@ -2112,14 +2112,14 @@ "integrity": "sha512-slv66OAJB8orL+UUaTI3pKlLorwIvS4ARZzYR9iJJyGsEgOqueMfOMdKySWzZ73vIkEe3fcwFgsKMg4d8zyb1g==", "dev": true, "requires": { - "chalk": "2.4.2", - "enhanced-resolve": "4.1.0", - "loader-utils": "1.2.3", - "lodash": "4.17.15", - "micromatch": "3.1.10", - "mkdirp": "0.5.1", - "source-map-support": "0.5.10", - "webpack-log": "1.2.0" + "chalk": "^2.4.1", + "enhanced-resolve": "^4.0.0", + "loader-utils": "^1.1.0", + "lodash": "^4.17.5", + "micromatch": "^3.1.9", + "mkdirp": "^0.5.1", + "source-map-support": "^0.5.3", + "webpack-log": "^1.2.0" }, "dependencies": { "webpack-log": { @@ -2128,10 +2128,10 @@ "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==", "dev": true, "requires": { - "chalk": "2.4.2", - "log-symbols": "2.2.0", - "loglevelnext": "1.0.5", - "uuid": "3.3.3" + "chalk": "^2.1.0", + "log-symbols": "^2.1.0", + "loglevelnext": "^1.0.1", + "uuid": "^3.1.0" } } } @@ -2163,9 +2163,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.3", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" }, "dependencies": { "ansi-styles": { @@ -2180,11 +2180,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "js-tokens": { @@ -2207,7 +2207,7 @@ "integrity": "sha512-qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ==", "dev": true, "requires": { - "babylon": "6.18.0" + "babylon": "^6.18.0" } }, "babel-generator": { @@ -2216,14 +2216,14 @@ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.15", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" }, "dependencies": { "source-map": { @@ -2240,7 +2240,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-syntax-object-rest-spread": { @@ -2255,8 +2255,8 @@ "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", "dev": true, "requires": { - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "babel-runtime": "6.26.0" + "babel-plugin-syntax-object-rest-spread": "^6.8.0", + "babel-runtime": "^6.26.0" } }, "babel-runtime": { @@ -2265,8 +2265,8 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.6.10", - "regenerator-runtime": "0.11.1" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { @@ -2275,11 +2275,11 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.15" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { @@ -2288,15 +2288,15 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.4", - "lodash": "4.17.15" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" } }, "babel-types": { @@ -2305,10 +2305,10 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.3", - "lodash": "4.17.15", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { @@ -2335,13 +2335,13 @@ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.3.0", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.2", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { @@ -2350,7 +2350,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -2359,7 +2359,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -2368,7 +2368,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -2377,9 +2377,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -2414,7 +2414,7 @@ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "better-assert": { @@ -2432,10 +2432,10 @@ "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==", "dev": true, "requires": { - "bluebird": "3.7.1", - "check-types": "8.0.3", - "hoopy": "0.1.4", - "tryer": "1.0.1" + "bluebird": "^3.5.5", + "check-types": "^8.0.3", + "hoopy": "^0.1.4", + "tryer": "^1.0.1" } }, "big.js": { @@ -2462,7 +2462,7 @@ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "dev": true, "requires": { - "inherits": "2.0.4" + "inherits": "~2.0.0" } }, "blocking-proxy": { @@ -2471,7 +2471,7 @@ "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==", "dev": true, "requires": { - "minimist": "1.2.0" + "minimist": "^1.2.0" } }, "bluebird": { @@ -2493,15 +2493,15 @@ "dev": true, "requires": { "bytes": "3.1.0", - "content-type": "1.0.4", + "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "1.1.2", + "depd": "~1.1.2", "http-errors": "1.7.2", "iconv-lite": "0.4.24", - "on-finished": "2.3.0", + "on-finished": "~2.3.0", "qs": "6.7.0", "raw-body": "2.4.0", - "type-is": "1.6.18" + "type-is": "~1.6.17" }, "dependencies": { "bytes": { @@ -2524,12 +2524,12 @@ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { - "array-flatten": "2.1.2", - "deep-equal": "1.1.1", - "dns-equal": "1.0.0", - "dns-txt": "2.0.2", - "multicast-dns": "6.2.3", - "multicast-dns-service-types": "1.1.0" + "array-flatten": "^2.1.0", + "deep-equal": "^1.0.1", + "dns-equal": "^1.0.0", + "dns-txt": "^2.0.2", + "multicast-dns": "^6.0.1", + "multicast-dns-service-types": "^1.1.0" } }, "boolbase": { @@ -2549,7 +2549,7 @@ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -2559,16 +2559,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -2577,7 +2577,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -2594,12 +2594,12 @@ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { - "buffer-xor": "1.0.3", - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "browserify-cipher": { @@ -2608,9 +2608,9 @@ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", "dev": true, "requires": { - "browserify-aes": "1.2.0", - "browserify-des": "1.0.2", - "evp_bytestokey": "1.0.3" + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" } }, "browserify-des": { @@ -2619,10 +2619,10 @@ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", "dev": true, "requires": { - "cipher-base": "1.0.4", - "des.js": "1.0.1", - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "browserify-rsa": { @@ -2631,8 +2631,8 @@ "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { - "bn.js": "4.11.8", - "randombytes": "2.1.0" + "bn.js": "^4.1.0", + "randombytes": "^2.0.1" } }, "browserify-sign": { @@ -2641,13 +2641,13 @@ "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "dev": true, "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "elliptic": "6.5.2", - "inherits": "2.0.4", - "parse-asn1": "5.1.5" + "bn.js": "^4.1.1", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.2", + "elliptic": "^6.0.0", + "inherits": "^2.0.1", + "parse-asn1": "^5.0.0" } }, "browserify-zlib": { @@ -2656,7 +2656,7 @@ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, "requires": { - "pako": "1.0.10" + "pako": "~1.0.5" } }, "browserslist": { @@ -2665,9 +2665,9 @@ "integrity": "sha512-jWvmhqYpx+9EZm/FxcZSbUZyDEvDTLDi3nSAKbzEkyWvtI0mNSmUosey+5awDW1RUlrgXbQb5A6qY1xQH9U6MQ==", "dev": true, "requires": { - "caniuse-lite": "1.0.30001012", - "electron-to-chromium": "1.3.314", - "node-releases": "1.1.41" + "caniuse-lite": "^1.0.30001010", + "electron-to-chromium": "^1.3.306", + "node-releases": "^1.1.40" } }, "browserstack": { @@ -2676,7 +2676,7 @@ "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==", "dev": true, "requires": { - "https-proxy-agent": "2.2.4" + "https-proxy-agent": "^2.2.1" } }, "buffer": { @@ -2685,9 +2685,9 @@ "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", "dev": true, "requires": { - "base64-js": "1.3.1", - "ieee754": "1.1.13", - "isarray": "1.0.0" + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" } }, "buffer-alloc": { @@ -2696,8 +2696,8 @@ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "dev": true, "requires": { - "buffer-alloc-unsafe": "1.1.0", - "buffer-fill": "1.0.0" + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" } }, "buffer-alloc-unsafe": { @@ -2760,19 +2760,19 @@ "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { - "bluebird": "3.7.1", - "chownr": "1.1.3", - "glob": "7.1.3", - "graceful-fs": "4.2.3", - "lru-cache": "4.1.5", - "mississippi": "2.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.7.1", - "ssri": "5.3.0", - "unique-filename": "1.1.1", - "y18n": "4.0.0" + "bluebird": "^3.5.1", + "chownr": "^1.0.1", + "glob": "^7.1.2", + "graceful-fs": "^4.1.11", + "lru-cache": "^4.1.1", + "mississippi": "^2.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.2", + "ssri": "^5.2.4", + "unique-filename": "^1.1.0", + "y18n": "^4.0.0" } }, "cache-base": { @@ -2781,15 +2781,15 @@ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.3.0", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.1", - "to-object-path": "0.3.0", - "union-value": "1.0.1", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, "caller-callsite": { @@ -2798,7 +2798,7 @@ "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", "dev": true, "requires": { - "callsites": "2.0.0" + "callsites": "^2.0.0" } }, "caller-path": { @@ -2807,7 +2807,7 @@ "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", "dev": true, "requires": { - "caller-callsite": "2.0.0" + "caller-callsite": "^2.0.0" } }, "callsite": { @@ -2828,8 +2828,8 @@ "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", "dev": true, "requires": { - "no-case": "2.3.2", - "upper-case": "1.1.3" + "no-case": "^2.2.0", + "upper-case": "^1.1.1" } }, "camelcase": { @@ -2844,8 +2844,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" } }, "caniuse-lite": { @@ -2872,9 +2872,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" }, "dependencies": { "supports-color": { @@ -2883,7 +2883,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -2906,19 +2906,19 @@ "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", "dev": true, "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.3", - "braces": "2.3.2", - "fsevents": "1.2.9", - "glob-parent": "3.1.0", - "inherits": "2.0.4", - "is-binary-path": "1.0.1", - "is-glob": "4.0.1", - "lodash.debounce": "4.0.8", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.2.1", - "upath": "1.2.0" + "anymatch": "^2.0.0", + "async-each": "^1.0.0", + "braces": "^2.3.0", + "fsevents": "^1.2.2", + "glob-parent": "^3.1.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "lodash.debounce": "^4.0.8", + "normalize-path": "^2.1.1", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0", + "upath": "^1.0.5" } }, "chownr": { @@ -2933,7 +2933,7 @@ "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", "dev": true, "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "cipher-base": { @@ -2942,8 +2942,8 @@ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "dev": true, "requires": { - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "circular-dependency-plugin": { @@ -2958,10 +2958,10 @@ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { @@ -2970,7 +2970,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -2981,7 +2981,7 @@ "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "~0.6.0" }, "dependencies": { "source-map": { @@ -2998,7 +2998,7 @@ "integrity": "sha512-pi1111o4OBd9qvacbgs+NRqClfVPKVIc66B4d8kx6Ho/L+i9entQ/NpK600CsTYTPu3kWvKwwyKarsYMvC2xeA==", "dev": true, "requires": { - "del": "4.1.1" + "del": "^4.0.0" }, "dependencies": { "del": { @@ -3007,13 +3007,13 @@ "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", "dev": true, "requires": { - "@types/glob": "7.1.1", - "globby": "6.1.0", - "is-path-cwd": "2.2.0", - "is-path-in-cwd": "2.1.0", - "p-map": "2.1.0", - "pify": "4.0.1", - "rimraf": "2.7.1" + "@types/glob": "^7.1.1", + "globby": "^6.1.0", + "is-path-cwd": "^2.0.0", + "is-path-in-cwd": "^2.0.0", + "p-map": "^2.0.0", + "pify": "^4.0.1", + "rimraf": "^2.6.3" } }, "globby": { @@ -3022,11 +3022,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.3", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" }, "dependencies": { "pify": { @@ -3049,7 +3049,7 @@ "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", "dev": true, "requires": { - "is-path-inside": "2.1.0" + "is-path-inside": "^2.1.0" } }, "is-path-inside": { @@ -3058,7 +3058,7 @@ "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.2" } }, "p-map": { @@ -3081,7 +3081,7 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "restore-cursor": "2.0.0" + "restore-cursor": "^2.0.0" } }, "cli-width": { @@ -3096,9 +3096,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" } }, "clone": { @@ -3113,10 +3113,10 @@ "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", "dev": true, "requires": { - "for-own": "1.0.0", - "is-plain-object": "2.0.4", - "kind-of": "6.0.2", - "shallow-clone": "1.0.0" + "for-own": "^1.0.0", + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.0", + "shallow-clone": "^1.0.0" } }, "closest": { @@ -3144,17 +3144,17 @@ "resolved": "https://registry.npmjs.org/cmmn-js/-/cmmn-js-0.19.2.tgz", "integrity": "sha512-UCBWWPeMxnxzix8pI1VEL7fqfBaIaS2YFrJQonWjKDMV8yYoO7cIwmb/cd5TOc8P/yeedG9PtGUux1sKbKO8Og==", "requires": { - "cmmn-font": "0.5.0", - "cmmn-moddle": "5.0.0", - "css.escape": "1.5.1", - "diagram-js": "4.0.3", - "diagram-js-direct-editing": "1.6.1", - "ids": "0.2.2", - "inherits": "2.0.4", - "min-dash": "3.5.2", - "min-dom": "3.1.1", - "object-refs": "0.3.0", - "tiny-svg": "2.2.2" + "cmmn-font": "^0.5.0", + "cmmn-moddle": "^5.0.0", + "css.escape": "^1.5.1", + "diagram-js": "^4.0.1", + "diagram-js-direct-editing": "^1.5.0", + "ids": "^0.2.0", + "inherits": "^2.0.1", + "min-dash": "^3.5.0", + "min-dom": "^3.0.0", + "object-refs": "^0.3.0", + "tiny-svg": "^2.2.1" } }, "cmmn-moddle": { @@ -3162,9 +3162,9 @@ "resolved": "https://registry.npmjs.org/cmmn-moddle/-/cmmn-moddle-5.0.0.tgz", "integrity": "sha512-mmHG+Ey/Zc+ZgTAlGF4aTGdEYZuloZ0L+eRlVYeGCpMEgIrIwJWsRlshaTB4yNts9p929Emmd+Gcl5xGHGhMmA==", "requires": { - "min-dash": "3.5.2", - "moddle": "4.1.0", - "moddle-xml": "7.5.0" + "min-dash": "^3.0.0", + "moddle": "^4.1.0", + "moddle-xml": "^7.1.0" } }, "co": { @@ -3185,15 +3185,15 @@ "integrity": "sha512-UVV76+/y1RwaxzCeGPFE3G4GFtfV42r3x8EmRd7XMNFLlLC0ewdtCqWTbvhwPQMxFZZ+OTLEOJNWfyPPn3QFWg==", "dev": true, "requires": { - "app-root-path": "2.2.1", - "aria-query": "3.0.0", - "axobject-query": "2.0.2", - "css-selector-tokenizer": "0.7.1", - "cssauron": "1.4.0", - "damerau-levenshtein": "1.0.5", - "semver-dsl": "1.0.1", - "source-map": "0.5.7", - "sprintf-js": "1.1.2" + "app-root-path": "^2.1.0", + "aria-query": "^3.0.0", + "axobject-query": "^2.0.2", + "css-selector-tokenizer": "^0.7.1", + "cssauron": "^1.4.0", + "damerau-levenshtein": "^1.0.4", + "semver-dsl": "^1.0.1", + "source-map": "^0.5.7", + "sprintf-js": "^1.1.2" }, "dependencies": { "source-map": { @@ -3216,8 +3216,8 @@ "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "color-convert": { @@ -3247,7 +3247,7 @@ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { @@ -3303,7 +3303,7 @@ "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==", "dev": true, "requires": { - "mime-db": "1.42.0" + "mime-db": ">= 1.40.0 < 2" } }, "compression": { @@ -3312,13 +3312,13 @@ "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.5", "bytes": "3.0.0", - "compressible": "2.0.17", + "compressible": "~2.0.16", "debug": "2.6.9", - "on-headers": "1.0.2", + "on-headers": "~1.0.2", "safe-buffer": "5.1.2", - "vary": "1.1.2" + "vary": "~1.1.2" } }, "concat-map": { @@ -3333,10 +3333,10 @@ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "dev": true, "requires": { - "buffer-from": "1.1.1", - "inherits": "2.0.4", - "readable-stream": "2.3.6", - "typedarray": "0.0.6" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" } }, "concurrently": { @@ -3345,15 +3345,15 @@ "integrity": "sha512-Kim9SFrNr2jd8/0yNYqDTFALzUX1tvimmwFWxmp/D4mRI+kbqIIwE2RkBDrxS2ic25O1UgQMI5AtBqdtX3ynYg==", "dev": true, "requires": { - "chalk": "2.4.2", - "date-fns": "1.30.1", - "lodash": "4.17.15", - "read-pkg": "4.0.1", - "rxjs": "6.5.3", - "spawn-command": "0.0.2-1", - "supports-color": "4.5.0", - "tree-kill": "1.2.1", - "yargs": "12.0.5" + "chalk": "^2.4.2", + "date-fns": "^1.30.1", + "lodash": "^4.17.15", + "read-pkg": "^4.0.1", + "rxjs": "^6.5.2", + "spawn-command": "^0.0.2-1", + "supports-color": "^4.5.0", + "tree-kill": "^1.2.1", + "yargs": "^12.0.5" }, "dependencies": { "ansi-regex": { @@ -3374,9 +3374,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "cross-spawn": { @@ -3385,11 +3385,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.6.0", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "execa": { @@ -3398,13 +3398,13 @@ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "6.0.5", - "get-stream": "4.1.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "find-up": { @@ -3413,7 +3413,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "get-stream": { @@ -3422,7 +3422,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "3.0.0" + "pump": "^3.0.0" } }, "has-flag": { @@ -3449,7 +3449,7 @@ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { - "invert-kv": "2.0.0" + "invert-kv": "^2.0.0" } }, "locate-path": { @@ -3458,8 +3458,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "os-locale": { @@ -3468,9 +3468,9 @@ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { - "execa": "1.0.0", - "lcid": "2.0.0", - "mem": "4.3.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, "p-limit": { @@ -3479,7 +3479,7 @@ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -3488,7 +3488,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.2.1" + "p-limit": "^2.0.0" } }, "p-try": { @@ -3503,8 +3503,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "1.3.2", - "json-parse-better-errors": "1.0.2" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" } }, "pump": { @@ -3513,8 +3513,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "read-pkg": { @@ -3523,9 +3523,9 @@ "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=", "dev": true, "requires": { - "normalize-package-data": "2.5.0", - "parse-json": "4.0.0", - "pify": "3.0.0" + "normalize-package-data": "^2.3.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0" } }, "string-width": { @@ -3534,8 +3534,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -3544,7 +3544,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "supports-color": { @@ -3553,7 +3553,7 @@ "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "^2.0.0" } }, "which-module": { @@ -3568,18 +3568,18 @@ "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "3.0.0", - "get-caller-file": "1.0.3", - "os-locale": "3.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "11.1.1" + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" } }, "yargs-parser": { @@ -3588,8 +3588,8 @@ "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", "dev": true, "requires": { - "camelcase": "5.3.1", - "decamelize": "1.2.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } @@ -3602,7 +3602,7 @@ "requires": { "debug": "2.6.9", "finalhandler": "1.1.2", - "parseurl": "1.3.3", + "parseurl": "~1.3.3", "utils-merge": "1.0.1" } }, @@ -3651,7 +3651,7 @@ "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.1" } }, "cookie": { @@ -3672,12 +3672,12 @@ "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", "dev": true, "requires": { - "aproba": "1.2.0", - "fs-write-stream-atomic": "1.0.10", - "iferr": "0.1.5", - "mkdirp": "0.5.1", - "rimraf": "2.7.1", - "run-queue": "1.0.3" + "aproba": "^1.1.1", + "fs-write-stream-atomic": "^1.0.8", + "iferr": "^0.1.5", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.0" } }, "copy-descriptor": { @@ -3692,18 +3692,18 @@ "integrity": "sha512-7N68eIoQTyudAuxkfPT7HzGoQ+TsmArN/I3HFwG+lVE3FNzqvZKIiaxtYh4o3BIznioxUvx9j26+Rtsc9htQUQ==", "dev": true, "requires": { - "cacache": "12.0.3", - "find-cache-dir": "2.1.0", - "glob-parent": "3.1.0", - "globby": "7.1.1", - "is-glob": "4.0.1", - "loader-utils": "1.2.3", - "minimatch": "3.0.4", - "normalize-path": "3.0.0", - "p-limit": "2.2.1", - "schema-utils": "1.0.0", - "serialize-javascript": "2.1.0", - "webpack-log": "2.0.0" + "cacache": "^12.0.3", + "find-cache-dir": "^2.1.0", + "glob-parent": "^3.1.0", + "globby": "^7.1.1", + "is-glob": "^4.0.1", + "loader-utils": "^1.2.3", + "minimatch": "^3.0.4", + "normalize-path": "^3.0.0", + "p-limit": "^2.2.1", + "schema-utils": "^1.0.0", + "serialize-javascript": "^2.1.0", + "webpack-log": "^2.0.0" }, "dependencies": { "cacache": { @@ -3712,21 +3712,21 @@ "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", "dev": true, "requires": { - "bluebird": "3.7.1", - "chownr": "1.1.3", - "figgy-pudding": "3.5.1", - "glob": "7.1.6", - "graceful-fs": "4.2.3", - "infer-owner": "1.0.4", - "lru-cache": "5.1.1", - "mississippi": "3.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.7.1", - "ssri": "6.0.1", - "unique-filename": "1.1.1", - "y18n": "4.0.0" + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" } }, "find-cache-dir": { @@ -3735,9 +3735,9 @@ "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "2.1.0", - "pkg-dir": "3.0.0" + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" } }, "find-up": { @@ -3746,7 +3746,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "glob": { @@ -3755,12 +3755,12 @@ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.4", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "locate-path": { @@ -3769,8 +3769,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "lru-cache": { @@ -3779,7 +3779,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "3.1.1" + "yallist": "^3.0.2" } }, "make-dir": { @@ -3788,8 +3788,8 @@ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, "requires": { - "pify": "4.0.1", - "semver": "5.6.0" + "pify": "^4.0.1", + "semver": "^5.6.0" } }, "mississippi": { @@ -3798,16 +3798,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.7.1", - "end-of-stream": "1.4.4", - "flush-write-stream": "1.1.1", - "from2": "2.3.0", - "parallel-transform": "1.2.0", - "pump": "3.0.0", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.5" + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" } }, "normalize-path": { @@ -3822,7 +3822,7 @@ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -3831,7 +3831,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.2.1" + "p-limit": "^2.0.0" } }, "p-try": { @@ -3852,7 +3852,7 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "3.0.0" + "find-up": "^3.0.0" } }, "pump": { @@ -3861,8 +3861,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "serialize-javascript": { @@ -3877,7 +3877,7 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "3.5.1" + "figgy-pudding": "^3.5.1" } }, "yallist": { @@ -3905,10 +3905,10 @@ "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", "dev": true, "requires": { - "import-fresh": "2.0.0", - "is-directory": "0.3.1", - "js-yaml": "3.13.1", - "parse-json": "4.0.0" + "import-fresh": "^2.0.0", + "is-directory": "^0.3.1", + "js-yaml": "^3.13.1", + "parse-json": "^4.0.0" }, "dependencies": { "parse-json": { @@ -3917,8 +3917,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "1.3.2", - "json-parse-better-errors": "1.0.2" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" } } } @@ -3929,8 +3929,8 @@ "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", "dev": true, "requires": { - "bn.js": "4.11.8", - "elliptic": "6.5.2" + "bn.js": "^4.1.0", + "elliptic": "^6.0.0" } }, "create-hash": { @@ -3939,11 +3939,11 @@ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { - "cipher-base": "1.0.4", - "inherits": "2.0.4", - "md5.js": "1.3.5", - "ripemd160": "2.0.2", - "sha.js": "2.4.11" + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" } }, "create-hmac": { @@ -3952,12 +3952,12 @@ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "inherits": "2.0.4", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "cross-spawn": { @@ -3966,8 +3966,8 @@ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { - "lru-cache": "4.1.5", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, "crypto-browserify": { @@ -3976,17 +3976,17 @@ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "dev": true, "requires": { - "browserify-cipher": "1.0.1", - "browserify-sign": "4.0.4", - "create-ecdh": "4.0.3", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "diffie-hellman": "5.0.3", - "inherits": "2.0.4", - "pbkdf2": "3.0.17", - "public-encrypt": "4.0.3", - "randombytes": "2.1.0", - "randomfill": "1.0.4" + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" } }, "css-loader": { @@ -3995,17 +3995,17 @@ "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==", "dev": true, "requires": { - "camelcase": "5.3.1", - "icss-utils": "4.1.1", - "loader-utils": "1.2.3", - "normalize-path": "3.0.0", - "postcss": "7.0.14", - "postcss-modules-extract-imports": "2.0.0", - "postcss-modules-local-by-default": "2.0.6", - "postcss-modules-scope": "2.1.0", - "postcss-modules-values": "2.0.0", - "postcss-value-parser": "3.3.1", - "schema-utils": "1.0.0" + "camelcase": "^5.2.0", + "icss-utils": "^4.1.0", + "loader-utils": "^1.2.3", + "normalize-path": "^3.0.0", + "postcss": "^7.0.14", + "postcss-modules-extract-imports": "^2.0.0", + "postcss-modules-local-by-default": "^2.0.6", + "postcss-modules-scope": "^2.1.0", + "postcss-modules-values": "^2.0.0", + "postcss-value-parser": "^3.3.0", + "schema-utils": "^1.0.0" }, "dependencies": { "camelcase": { @@ -4034,10 +4034,10 @@ "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "dev": true, "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.3", + "boolbase": "~1.0.0", + "css-what": "2.1", "domutils": "1.5.1", - "nth-check": "1.0.2" + "nth-check": "~1.0.1" } }, "css-selector-tokenizer": { @@ -4046,9 +4046,9 @@ "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", "dev": true, "requires": { - "cssesc": "0.1.0", - "fastparse": "1.1.2", - "regexpu-core": "1.0.0" + "cssesc": "^0.1.0", + "fastparse": "^1.1.1", + "regexpu-core": "^1.0.0" } }, "css-what": { @@ -4068,7 +4068,7 @@ "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", "dev": true, "requires": { - "through": "2.3.8" + "through": "X.X.X" } }, "cssesc": { @@ -4083,7 +4083,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "custom-event": { @@ -4104,8 +4104,8 @@ "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", "dev": true, "requires": { - "es5-ext": "0.10.53", - "type": "1.2.0" + "es5-ext": "^0.10.50", + "type": "^1.0.1" } }, "d3-array": { @@ -4118,11 +4118,11 @@ "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.5.tgz", "integrity": "sha512-rEaJ5gHlgLxXugWjIkolTA0OyMvw8UWU1imYXy1v642XyyswmI1ybKOv05Ft+ewq+TFmdliD3VuK0pRp1VT/5A==", "requires": { - "d3-dispatch": "1.0.6", - "d3-drag": "1.2.5", - "d3-interpolate": "1.4.0", - "d3-selection": "1.4.1", - "d3-transition": "1.3.2" + "d3-dispatch": "1", + "d3-drag": "1", + "d3-interpolate": "1", + "d3-selection": "1", + "d3-transition": "1" } }, "d3-color": { @@ -4140,8 +4140,8 @@ "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz", "integrity": "sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==", "requires": { - "d3-dispatch": "1.0.6", - "d3-selection": "1.4.1" + "d3-dispatch": "1", + "d3-selection": "1" } }, "d3-ease": { @@ -4164,7 +4164,7 @@ "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz", "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==", "requires": { - "d3-color": "1.4.0" + "d3-color": "1" } }, "d3-path": { @@ -4177,11 +4177,11 @@ "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.1.tgz", "integrity": "sha512-huz5byJO/6MPpz6Q8d4lg7GgSpTjIZW/l+1MQkzKfu2u8P6hjaXaStOpmyrD6ymKoW87d2QVFCKvSjLwjzx/rA==", "requires": { - "d3-array": "2.4.0", - "d3-format": "1.4.3", - "d3-interpolate": "1.4.0", - "d3-time": "1.1.0", - "d3-time-format": "2.2.3" + "d3-array": "1.2.0 - 2", + "d3-format": "1", + "d3-interpolate": "^1.2.0", + "d3-time": "1", + "d3-time-format": "2" } }, "d3-selection": { @@ -4194,7 +4194,7 @@ "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz", "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==", "requires": { - "d3-path": "1.0.9" + "d3-path": "1" } }, "d3-time": { @@ -4207,7 +4207,7 @@ "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.2.3.tgz", "integrity": "sha512-RAHNnD8+XvC4Zc4d2A56Uw0yJoM7bsvOlJR33bclxq399Rak/b9bhvu/InjxdWhPtkgU53JJcleJTGkNRnN6IA==", "requires": { - "d3-time": "1.1.0" + "d3-time": "1" } }, "d3-timer": { @@ -4220,12 +4220,12 @@ "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz", "integrity": "sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==", "requires": { - "d3-color": "1.4.0", - "d3-dispatch": "1.0.6", - "d3-ease": "1.0.6", - "d3-interpolate": "1.4.0", - "d3-selection": "1.4.1", - "d3-timer": "1.0.10" + "d3-color": "1", + "d3-dispatch": "1", + "d3-ease": "1", + "d3-interpolate": "1", + "d3-selection": "^1.1.0", + "d3-timer": "1" } }, "damerau-levenshtein": { @@ -4240,7 +4240,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "date-fns": { @@ -4282,12 +4282,12 @@ "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", "dev": true, "requires": { - "is-arguments": "1.0.4", - "is-date-object": "1.0.1", - "is-regex": "1.0.4", - "object-is": "1.0.1", - "object-keys": "1.1.1", - "regexp.prototype.flags": "1.2.0" + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" } }, "default-gateway": { @@ -4296,8 +4296,8 @@ "integrity": "sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==", "dev": true, "requires": { - "execa": "0.10.0", - "ip-regex": "2.1.0" + "execa": "^0.10.0", + "ip-regex": "^2.1.0" } }, "default-require-extensions": { @@ -4306,7 +4306,7 @@ "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", "dev": true, "requires": { - "strip-bom": "3.0.0" + "strip-bom": "^3.0.0" }, "dependencies": { "strip-bom": { @@ -4323,7 +4323,7 @@ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "dev": true, "requires": { - "object-keys": "1.1.1" + "object-keys": "^1.0.12" } }, "define-property": { @@ -4332,8 +4332,8 @@ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -4342,7 +4342,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -4351,7 +4351,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -4360,9 +4360,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -4373,12 +4373,12 @@ "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", "dev": true, "requires": { - "globby": "6.1.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.1", - "p-map": "1.2.0", - "pify": "3.0.0", - "rimraf": "2.7.1" + "globby": "^6.1.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "p-map": "^1.1.1", + "pify": "^3.0.0", + "rimraf": "^2.2.8" }, "dependencies": { "globby": { @@ -4387,11 +4387,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.3", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" }, "dependencies": { "pify": { @@ -4415,8 +4415,8 @@ "resolved": "https://registry.npmjs.org/delegate-events/-/delegate-events-1.1.1.tgz", "integrity": "sha1-2rSQqcHx1AykDrzSHtr3F7Zx1NQ=", "requires": { - "closest": "0.0.1", - "component-event": "0.1.4" + "closest": "*", + "component-event": "*" } }, "delegates": { @@ -4443,8 +4443,8 @@ "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", "dev": true, "requires": { - "inherits": "2.0.4", - "minimalistic-assert": "1.0.1" + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" } }, "destroy": { @@ -4465,7 +4465,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "detect-node": { @@ -4485,15 +4485,15 @@ "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-4.0.3.tgz", "integrity": "sha512-BzcWUEnRfO2tpdc8XHvG/wsX+GrE/7qGRDf1khn5b0UrzrqqLhj1yiguvpgb0rQSTPeBtkot6PUA4wB2QAQutA==", "requires": { - "css.escape": "1.5.1", - "didi": "4.0.0", - "hammerjs": "2.0.8", - "inherits": "2.0.4", - "min-dash": "3.5.2", - "min-dom": "3.1.1", - "object-refs": "0.3.0", - "path-intersection": "1.1.1", - "tiny-svg": "2.2.2" + "css.escape": "^1.5.1", + "didi": "^4.0.0", + "hammerjs": "^2.0.1", + "inherits": "^2.0.1", + "min-dash": "^3.5.0", + "min-dom": "^3.0.0", + "object-refs": "^0.3.0", + "path-intersection": "^1.0.2", + "tiny-svg": "^2.2.1" } }, "diagram-js-direct-editing": { @@ -4501,8 +4501,8 @@ "resolved": "https://registry.npmjs.org/diagram-js-direct-editing/-/diagram-js-direct-editing-1.6.1.tgz", "integrity": "sha512-FOW2qp7yT/L3Go/YfBOfnWrV2pc2PPoTSSRIg2nnld8pQDTnMaqKPva9GZEoCtcTJzPV4ctZX52ZdkJ3C7aWaA==", "requires": { - "min-dash": "3.5.2", - "min-dom": "3.1.1" + "min-dash": "^3.0.0", + "min-dom": "^3.0.0" } }, "didi": { @@ -4522,9 +4522,9 @@ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { - "bn.js": "4.11.8", - "miller-rabin": "4.0.1", - "randombytes": "2.1.0" + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" } }, "dir-glob": { @@ -4533,7 +4533,7 @@ "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==", "dev": true, "requires": { - "path-type": "3.0.0" + "path-type": "^3.0.0" } }, "dns-equal": { @@ -4548,8 +4548,8 @@ "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", "dev": true, "requires": { - "ip": "1.1.5", - "safe-buffer": "5.1.2" + "ip": "^1.1.0", + "safe-buffer": "^5.0.1" } }, "dns-txt": { @@ -4558,7 +4558,7 @@ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { - "buffer-indexof": "1.1.1" + "buffer-indexof": "^1.0.0" } }, "dom-converter": { @@ -4567,7 +4567,7 @@ "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", "dev": true, "requires": { - "utila": "0.4.0" + "utila": "~0.4" } }, "dom-serialize": { @@ -4576,10 +4576,10 @@ "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", "dev": true, "requires": { - "custom-event": "1.0.1", - "ent": "2.2.0", - "extend": "3.0.2", - "void-elements": "2.0.1" + "custom-event": "~1.0.0", + "ent": "~2.2.0", + "extend": "^3.0.0", + "void-elements": "^2.0.0" } }, "dom-serializer": { @@ -4588,8 +4588,8 @@ "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", "dev": true, "requires": { - "domelementtype": "2.0.1", - "entities": "2.0.0" + "domelementtype": "^2.0.1", + "entities": "^2.0.0" }, "dependencies": { "domelementtype": { @@ -4618,7 +4618,7 @@ "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, "requires": { - "domelementtype": "1.3.1" + "domelementtype": "1" } }, "domify": { @@ -4632,8 +4632,8 @@ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "dev": true, "requires": { - "dom-serializer": "0.2.2", - "domelementtype": "1.3.1" + "dom-serializer": "0", + "domelementtype": "1" } }, "duplexer": { @@ -4648,10 +4648,10 @@ "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "inherits": "2.0.4", - "readable-stream": "2.3.6", - "stream-shift": "1.0.0" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" } }, "ecc-jsbn": { @@ -4660,8 +4660,8 @@ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "dev": true, "requires": { - "jsbn": "0.1.1", - "safer-buffer": "2.1.2" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, "ee-first": { @@ -4688,13 +4688,13 @@ "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==", "dev": true, "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0", - "hash.js": "1.1.7", - "hmac-drbg": "1.0.1", - "inherits": "2.0.4", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" } }, "emojis-list": { @@ -4715,7 +4715,7 @@ "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "dev": true, "requires": { - "iconv-lite": "0.4.24" + "iconv-lite": "~0.4.13" } }, "end-of-stream": { @@ -4724,7 +4724,7 @@ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "dev": true, "requires": { - "once": "1.4.0" + "once": "^1.4.0" } }, "engine.io": { @@ -4733,12 +4733,12 @@ "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.4", "base64id": "1.0.0", "cookie": "0.3.1", - "debug": "3.1.0", - "engine.io-parser": "2.1.3", - "ws": "3.3.3" + "debug": "~3.1.0", + "engine.io-parser": "~2.1.0", + "ws": "~3.3.1" }, "dependencies": { "cookie": { @@ -4766,14 +4766,14 @@ "requires": { "component-emitter": "1.2.1", "component-inherit": "0.0.3", - "debug": "3.1.0", - "engine.io-parser": "2.1.3", + "debug": "~3.1.0", + "engine.io-parser": "~2.1.1", "has-cors": "1.1.0", "indexof": "0.0.1", "parseqs": "0.0.5", "parseuri": "0.0.5", - "ws": "3.3.3", - "xmlhttprequest-ssl": "1.5.5", + "ws": "~3.3.1", + "xmlhttprequest-ssl": "~1.5.4", "yeast": "0.1.2" }, "dependencies": { @@ -4801,10 +4801,10 @@ "dev": true, "requires": { "after": "0.8.2", - "arraybuffer.slice": "0.0.7", + "arraybuffer.slice": "~0.0.7", "base64-arraybuffer": "0.1.5", "blob": "0.0.5", - "has-binary2": "1.0.3" + "has-binary2": "~1.0.2" } }, "enhanced-resolve": { @@ -4813,9 +4813,9 @@ "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", "dev": true, "requires": { - "graceful-fs": "4.2.3", - "memory-fs": "0.4.1", - "tapable": "1.1.3" + "graceful-fs": "^4.1.2", + "memory-fs": "^0.4.0", + "tapable": "^1.0.0" } }, "ent": { @@ -4842,7 +4842,7 @@ "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", "dev": true, "requires": { - "prr": "1.0.1" + "prr": "~1.0.1" } }, "error-ex": { @@ -4851,7 +4851,7 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "es-abstract": { @@ -4860,16 +4860,16 @@ "integrity": "sha512-jYo/J8XU2emLXl3OLwfwtuFfuF2w6DYPs+xy9ZfVyPkDcrauu6LYrw/q2TyCtrbc/KUdCiC5e9UajRhgNkVopA==", "dev": true, "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.1.4", - "is-regex": "1.0.4", - "object-inspect": "1.7.0", - "object-keys": "1.1.1", - "string.prototype.trimleft": "2.1.0", - "string.prototype.trimright": "2.1.0" + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.4", + "is-regex": "^1.0.4", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "string.prototype.trimleft": "^2.1.0", + "string.prototype.trimright": "^2.1.0" } }, "es-to-primitive": { @@ -4878,9 +4878,9 @@ "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "requires": { - "is-callable": "1.1.4", - "is-date-object": "1.0.1", - "is-symbol": "1.0.3" + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" } }, "es5-ext": { @@ -4889,9 +4889,9 @@ "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==", "dev": true, "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.3", - "next-tick": "1.0.0" + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.3", + "next-tick": "~1.0.0" } }, "es6-iterator": { @@ -4900,9 +4900,9 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "d": "1.0.1", - "es5-ext": "0.10.53", - "es6-symbol": "3.1.3" + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" } }, "es6-promise": { @@ -4917,7 +4917,7 @@ "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", "dev": true, "requires": { - "es6-promise": "4.2.8" + "es6-promise": "^4.0.3" } }, "es6-symbol": { @@ -4926,8 +4926,8 @@ "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", "dev": true, "requires": { - "d": "1.0.1", - "ext": "1.2.1" + "d": "^1.0.1", + "ext": "^1.1.2" } }, "escape-html": { @@ -4948,8 +4948,8 @@ "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", "dev": true, "requires": { - "esrecurse": "4.2.1", - "estraverse": "4.3.0" + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "esprima": { @@ -4964,7 +4964,7 @@ "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { - "estraverse": "4.3.0" + "estraverse": "^4.1.0" } }, "estraverse": { @@ -5003,7 +5003,7 @@ "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", "dev": true, "requires": { - "original": "1.0.2" + "original": "^1.0.0" } }, "evp_bytestokey": { @@ -5012,8 +5012,8 @@ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", "dev": true, "requires": { - "md5.js": "1.3.5", - "safe-buffer": "5.1.2" + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" } }, "execa": { @@ -5022,13 +5022,13 @@ "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", "dev": true, "requires": { - "cross-spawn": "6.0.5", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "dependencies": { "cross-spawn": { @@ -5037,11 +5037,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.6.0", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } } } @@ -5052,13 +5052,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -5067,7 +5067,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -5076,7 +5076,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -5087,7 +5087,7 @@ "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, "requires": { - "homedir-polyfill": "1.0.3" + "homedir-polyfill": "^1.0.1" } }, "express": { @@ -5096,36 +5096,36 @@ "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.7", "array-flatten": "1.1.1", "body-parser": "1.19.0", "content-disposition": "0.5.3", - "content-type": "1.0.4", + "content-type": "~1.0.4", "cookie": "0.4.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "1.1.2", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", - "finalhandler": "1.1.2", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", "fresh": "0.5.2", "merge-descriptors": "1.0.1", - "methods": "1.1.2", - "on-finished": "2.3.0", - "parseurl": "1.3.3", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "2.0.5", + "proxy-addr": "~2.0.5", "qs": "6.7.0", - "range-parser": "1.2.1", + "range-parser": "~1.2.1", "safe-buffer": "5.1.2", "send": "0.17.1", "serve-static": "1.14.1", "setprototypeof": "1.1.1", - "statuses": "1.5.0", - "type-is": "1.6.18", + "statuses": "~1.5.0", + "type-is": "~1.6.18", "utils-merge": "1.0.1", - "vary": "1.1.2" + "vary": "~1.1.2" }, "dependencies": { "array-flatten": { @@ -5148,7 +5148,7 @@ "integrity": "sha512-x+OKKC57tNiLhDW26UmWtvQBpvO+2wxdC/A0jP7RkmjAc4gze9/U98hQyIYJUzo9A+o9ntMHpC+LH3pWMSbrVQ==", "dev": true, "requires": { - "type": "2.0.0" + "type": "^2.0.0" }, "dependencies": { "type": { @@ -5171,8 +5171,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -5181,7 +5181,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -5192,9 +5192,9 @@ "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, "requires": { - "chardet": "0.7.0", - "iconv-lite": "0.4.24", - "tmp": "0.0.33" + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" } }, "extglob": { @@ -5203,14 +5203,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -5219,7 +5219,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -5228,7 +5228,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -5237,7 +5237,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -5246,7 +5246,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -5255,9 +5255,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -5292,7 +5292,7 @@ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { - "websocket-driver": "0.7.3" + "websocket-driver": ">=0.5.1" } }, "figgy-pudding": { @@ -5307,7 +5307,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.5" } }, "file-loader": { @@ -5316,8 +5316,8 @@ "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==", "dev": true, "requires": { - "loader-utils": "1.2.3", - "schema-utils": "1.0.0" + "loader-utils": "^1.0.2", + "schema-utils": "^1.0.0" } }, "fileset": { @@ -5326,8 +5326,8 @@ "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", "dev": true, "requires": { - "glob": "7.1.3", - "minimatch": "3.0.4" + "glob": "^7.0.3", + "minimatch": "^3.0.3" } }, "filesize": { @@ -5342,10 +5342,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -5354,7 +5354,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -5366,12 +5366,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.3", - "statuses": "1.5.0", - "unpipe": "1.0.0" + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" } }, "find-cache-dir": { @@ -5380,9 +5380,9 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "1.3.0", - "pkg-dir": "2.0.0" + "commondir": "^1.0.1", + "make-dir": "^1.0.0", + "pkg-dir": "^2.0.0" } }, "find-up": { @@ -5391,7 +5391,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "findup-sync": { @@ -5400,10 +5400,10 @@ "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", "dev": true, "requires": { - "detect-file": "1.0.0", - "is-glob": "3.1.0", - "micromatch": "3.1.10", - "resolve-dir": "1.0.1" + "detect-file": "^1.0.0", + "is-glob": "^3.1.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" }, "dependencies": { "is-glob": { @@ -5412,7 +5412,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -5429,8 +5429,8 @@ "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "dev": true, "requires": { - "inherits": "2.0.4", - "readable-stream": "2.3.6" + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" } }, "follow-redirects": { @@ -5439,7 +5439,7 @@ "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==", "dev": true, "requires": { - "debug": "3.2.6" + "debug": "^3.0.0" }, "dependencies": { "debug": { @@ -5448,7 +5448,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "ms": { @@ -5471,7 +5471,7 @@ "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "forever-agent": { @@ -5486,9 +5486,9 @@ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "dev": true, "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.8", - "mime-types": "2.1.25" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" } }, "forwarded": { @@ -5503,7 +5503,7 @@ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "fresh": { @@ -5518,8 +5518,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "2.0.4", - "readable-stream": "2.3.6" + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" } }, "fs-access": { @@ -5528,7 +5528,7 @@ "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", "dev": true, "requires": { - "null-check": "1.0.0" + "null-check": "^1.0.0" } }, "fs-extra": { @@ -5537,9 +5537,9 @@ "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "dev": true, "requires": { - "graceful-fs": "4.2.3", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "fs-minipass": { @@ -5548,7 +5548,7 @@ "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", "dev": true, "requires": { - "minipass": "2.9.0" + "minipass": "^2.6.0" } }, "fs-write-stream-atomic": { @@ -5557,10 +5557,10 @@ "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "dev": true, "requires": { - "graceful-fs": "4.2.3", - "iferr": "0.1.5", - "imurmurhash": "0.1.4", - "readable-stream": "2.3.6" + "graceful-fs": "^4.1.2", + "iferr": "^0.1.5", + "imurmurhash": "^0.1.4", + "readable-stream": "1 || 2" } }, "fs.realpath": { @@ -5576,8 +5576,8 @@ "dev": true, "optional": true, "requires": { - "nan": "2.14.0", - "node-pre-gyp": "0.12.0" + "nan": "^2.12.1", + "node-pre-gyp": "^0.12.0" }, "dependencies": { "abbrev": { @@ -5610,12 +5610,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -5630,17 +5632,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5757,7 +5762,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5769,6 +5775,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "1.0.1" } @@ -5783,6 +5790,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "1.1.11" } @@ -5790,12 +5798,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "5.1.2", "yallist": "3.0.3" @@ -5814,6 +5824,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5894,7 +5905,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5906,6 +5918,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1.0.2" } @@ -6027,6 +6040,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "1.1.0", "is-fullwidth-code-point": "1.0.0", @@ -6104,10 +6118,10 @@ "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", "dev": true, "requires": { - "graceful-fs": "4.2.3", - "inherits": "2.0.4", - "mkdirp": "0.5.1", - "rimraf": "2.7.1" + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" } }, "function-bind": { @@ -6122,14 +6136,14 @@ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.3" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "gaze": { @@ -6138,7 +6152,7 @@ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { - "globule": "1.2.1" + "globule": "^1.0.0" } }, "genfun": { @@ -6183,7 +6197,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "glob": { @@ -6192,12 +6206,12 @@ "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.4", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-parent": { @@ -6206,8 +6220,8 @@ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { "is-glob": { @@ -6216,7 +6230,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -6227,9 +6241,9 @@ "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "dev": true, "requires": { - "global-prefix": "1.0.2", - "is-windows": "1.0.2", - "resolve-dir": "1.0.1" + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" } }, "global-prefix": { @@ -6238,11 +6252,11 @@ "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", "dev": true, "requires": { - "expand-tilde": "2.0.2", - "homedir-polyfill": "1.0.3", - "ini": "1.3.5", - "is-windows": "1.0.2", - "which": "1.3.1" + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" } }, "globals": { @@ -6257,12 +6271,12 @@ "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", "dev": true, "requires": { - "array-union": "1.0.2", - "dir-glob": "2.2.2", - "glob": "7.1.3", - "ignore": "3.3.10", - "pify": "3.0.0", - "slash": "1.0.0" + "array-union": "^1.0.1", + "dir-glob": "^2.0.0", + "glob": "^7.1.2", + "ignore": "^3.3.5", + "pify": "^3.0.0", + "slash": "^1.0.0" } }, "globule": { @@ -6271,9 +6285,9 @@ "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", "dev": true, "requires": { - "glob": "7.1.3", - "lodash": "4.17.15", - "minimatch": "3.0.4" + "glob": "~7.1.1", + "lodash": "~4.17.10", + "minimatch": "~3.0.2" } }, "graceful-fs": { @@ -6288,8 +6302,8 @@ "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==", "dev": true, "requires": { - "duplexer": "0.1.1", - "pify": "4.0.1" + "duplexer": "^0.1.1", + "pify": "^4.0.1" }, "dependencies": { "pify": { @@ -6317,10 +6331,10 @@ "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==", "dev": true, "requires": { - "neo-async": "2.6.1", - "optimist": "0.6.1", - "source-map": "0.6.1", - "uglify-js": "3.4.10" + "neo-async": "^2.6.0", + "optimist": "^0.6.1", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4" }, "dependencies": { "source-map": { @@ -6343,8 +6357,8 @@ "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", "dev": true, "requires": { - "ajv": "6.9.1", - "har-schema": "2.0.0" + "ajv": "^6.5.5", + "har-schema": "^2.0.0" } }, "has": { @@ -6353,7 +6367,7 @@ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dev": true, "requires": { - "function-bind": "1.1.1" + "function-bind": "^1.1.1" } }, "has-ansi": { @@ -6362,7 +6376,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-binary2": { @@ -6412,9 +6426,9 @@ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { @@ -6423,8 +6437,8 @@ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "kind-of": { @@ -6433,7 +6447,7 @@ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6444,8 +6458,8 @@ "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", "dev": true, "requires": { - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "hash.js": { @@ -6454,8 +6468,8 @@ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", "dev": true, "requires": { - "inherits": "2.0.4", - "minimalistic-assert": "1.0.1" + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" } }, "hat": { @@ -6475,9 +6489,9 @@ "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "1.1.7", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" } }, "homedir-polyfill": { @@ -6486,7 +6500,7 @@ "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", "dev": true, "requires": { - "parse-passwd": "1.0.0" + "parse-passwd": "^1.0.0" } }, "hoopy": { @@ -6507,10 +6521,10 @@ "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, "requires": { - "inherits": "2.0.4", - "obuf": "1.1.2", - "readable-stream": "2.3.6", - "wbuf": "1.7.3" + "inherits": "^2.0.1", + "obuf": "^1.0.0", + "readable-stream": "^2.0.1", + "wbuf": "^1.1.0" } }, "html-entities": { @@ -6525,13 +6539,13 @@ "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==", "dev": true, "requires": { - "camel-case": "3.0.0", - "clean-css": "4.2.1", - "commander": "2.17.1", - "he": "1.2.0", - "param-case": "2.1.1", - "relateurl": "0.2.7", - "uglify-js": "3.4.10" + "camel-case": "3.0.x", + "clean-css": "4.2.x", + "commander": "2.17.x", + "he": "1.2.x", + "param-case": "2.1.x", + "relateurl": "0.2.x", + "uglify-js": "3.4.x" }, "dependencies": { "commander": { @@ -6548,12 +6562,12 @@ "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", "dev": true, "requires": { - "html-minifier": "3.5.21", - "loader-utils": "0.2.17", - "lodash": "4.17.15", - "pretty-error": "2.1.1", - "tapable": "1.1.3", - "toposort": "1.0.7", + "html-minifier": "^3.2.3", + "loader-utils": "^0.2.16", + "lodash": "^4.17.3", + "pretty-error": "^2.0.2", + "tapable": "^1.0.0", + "toposort": "^1.0.0", "util.promisify": "1.0.0" }, "dependencies": { @@ -6575,10 +6589,10 @@ "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", "dev": true, "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" + "big.js": "^3.1.3", + "emojis-list": "^2.0.0", + "json5": "^0.5.0", + "object-assign": "^4.0.1" } }, "toposort": { @@ -6595,12 +6609,12 @@ "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", "dev": true, "requires": { - "domelementtype": "1.3.1", - "domhandler": "2.4.2", - "domutils": "1.5.1", - "entities": "1.1.2", - "inherits": "2.0.4", - "readable-stream": "3.4.0" + "domelementtype": "^1.3.1", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^3.1.1" }, "dependencies": { "entities": { @@ -6615,9 +6629,9 @@ "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", "dev": true, "requires": { - "inherits": "2.0.4", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } } } @@ -6640,10 +6654,10 @@ "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", "dev": true, "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.1", - "statuses": "1.5.0", + "statuses": ">= 1.5.0 < 2", "toidentifier": "1.0.0" }, "dependencies": { @@ -6667,9 +6681,9 @@ "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==", "dev": true, "requires": { - "eventemitter3": "4.0.0", - "follow-redirects": "1.9.0", - "requires-port": "1.0.0" + "eventemitter3": "^4.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" } }, "http-proxy-agent": { @@ -6678,7 +6692,7 @@ "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", "dev": true, "requires": { - "agent-base": "4.3.0", + "agent-base": "4", "debug": "3.1.0" }, "dependencies": { @@ -6699,10 +6713,10 @@ "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==", "dev": true, "requires": { - "http-proxy": "1.18.0", - "is-glob": "4.0.1", - "lodash": "4.17.15", - "micromatch": "3.1.10" + "http-proxy": "^1.16.2", + "is-glob": "^4.0.0", + "lodash": "^4.17.5", + "micromatch": "^3.1.9" } }, "http-signature": { @@ -6711,9 +6725,9 @@ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.16.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "https-browserify": { @@ -6728,8 +6742,8 @@ "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==", "dev": true, "requires": { - "agent-base": "4.3.0", - "debug": "3.2.6" + "agent-base": "^4.3.0", + "debug": "^3.1.0" }, "dependencies": { "debug": { @@ -6738,7 +6752,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "ms": { @@ -6755,7 +6769,7 @@ "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "^2.0.0" } }, "iconv-lite": { @@ -6764,7 +6778,7 @@ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "icss-replace-symbols": { @@ -6779,7 +6793,7 @@ "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==", "dev": true, "requires": { - "postcss": "7.0.14" + "postcss": "^7.0.14" } }, "ids": { @@ -6787,7 +6801,7 @@ "resolved": "https://registry.npmjs.org/ids/-/ids-0.2.2.tgz", "integrity": "sha512-icIO8S7A7Hat9x/59VYjS5uwfBU1xRTDxeFC4t9wNceLxZFm2JbPhO4lC/xhFqFNVaxw2idwpLgUfkVQrjsxIw==", "requires": { - "hat": "0.0.3" + "hat": "^0.0.3" } }, "ie-shim": { @@ -6819,7 +6833,7 @@ "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", "dev": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "image-size": { @@ -6841,7 +6855,7 @@ "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", "dev": true, "requires": { - "import-from": "2.1.0" + "import-from": "^2.1.0" } }, "import-fresh": { @@ -6850,8 +6864,8 @@ "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", "dev": true, "requires": { - "caller-path": "2.0.0", - "resolve-from": "3.0.0" + "caller-path": "^2.0.0", + "resolve-from": "^3.0.0" } }, "import-from": { @@ -6860,7 +6874,7 @@ "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "import-local": { @@ -6869,8 +6883,8 @@ "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", "dev": true, "requires": { - "pkg-dir": "3.0.0", - "resolve-cwd": "2.0.0" + "pkg-dir": "^3.0.0", + "resolve-cwd": "^2.0.0" }, "dependencies": { "find-up": { @@ -6879,7 +6893,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "locate-path": { @@ -6888,8 +6902,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "p-limit": { @@ -6898,7 +6912,7 @@ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -6907,7 +6921,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.2.1" + "p-limit": "^2.0.0" } }, "p-try": { @@ -6922,7 +6936,7 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "3.0.0" + "find-up": "^3.0.0" } } } @@ -6945,7 +6959,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "indexes-of": { @@ -6971,8 +6985,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -6992,19 +7006,19 @@ "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==", "dev": true, "requires": { - "ansi-escapes": "3.2.0", - "chalk": "2.4.2", - "cli-cursor": "2.1.0", - "cli-width": "2.2.0", - "external-editor": "3.1.0", - "figures": "2.0.0", - "lodash": "4.17.15", + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.0", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.0", + "figures": "^2.0.0", + "lodash": "^4.17.10", "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rxjs": "6.5.3", - "string-width": "2.1.1", - "strip-ansi": "5.2.0", - "through": "2.3.8" + "run-async": "^2.2.0", + "rxjs": "^6.1.0", + "string-width": "^2.1.0", + "strip-ansi": "^5.0.0", + "through": "^2.3.6" }, "dependencies": { "ansi-regex": { @@ -7025,8 +7039,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "strip-ansi": { @@ -7035,7 +7049,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -7046,7 +7060,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.1.0" + "ansi-regex": "^4.1.0" }, "dependencies": { "ansi-regex": { @@ -7065,8 +7079,8 @@ "integrity": "sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==", "dev": true, "requires": { - "default-gateway": "2.7.2", - "ipaddr.js": "1.9.0" + "default-gateway": "^2.6.0", + "ipaddr.js": "^1.5.2" } }, "interpret": { @@ -7081,7 +7095,7 @@ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { - "loose-envify": "1.4.0" + "loose-envify": "^1.0.0" } }, "invert-kv": { @@ -7120,7 +7134,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -7129,7 +7143,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7152,7 +7166,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.13.1" + "binary-extensions": "^1.0.0" } }, "is-buffer": { @@ -7173,7 +7187,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -7182,7 +7196,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7199,9 +7213,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { @@ -7236,7 +7250,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -7245,7 +7259,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-glob": { @@ -7254,7 +7268,7 @@ "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.1" } }, "is-number": { @@ -7263,7 +7277,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -7272,7 +7286,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7295,7 +7309,7 @@ "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { - "is-path-inside": "1.0.1" + "is-path-inside": "^1.0.0" } }, "is-path-inside": { @@ -7304,7 +7318,7 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.1" } }, "is-plain-object": { @@ -7313,7 +7327,7 @@ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "is-promise": { @@ -7328,7 +7342,7 @@ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "dev": true, "requires": { - "has": "1.0.3" + "has": "^1.0.1" } }, "is-regexp": { @@ -7349,7 +7363,7 @@ "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", "dev": true, "requires": { - "has-symbols": "1.0.1" + "has-symbols": "^1.0.1" } }, "is-typedarray": { @@ -7388,7 +7402,7 @@ "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", "dev": true, "requires": { - "buffer-alloc": "1.2.0" + "buffer-alloc": "^1.2.0" } }, "isexe": { @@ -7415,19 +7429,19 @@ "integrity": "sha512-x0Eicp6KsShG1k1rMgBAi/1GgY7kFGEBwQpw3PXGEmu+rBcBNhqU8g2DgY9mlepAsLPzrzrbqSgCGANnki4POA==", "dev": true, "requires": { - "async": "2.6.3", - "compare-versions": "3.5.1", - "fileset": "2.0.3", - "istanbul-lib-coverage": "2.0.5", - "istanbul-lib-hook": "2.0.7", - "istanbul-lib-instrument": "3.3.0", - "istanbul-lib-report": "2.0.8", - "istanbul-lib-source-maps": "3.0.6", - "istanbul-reports": "2.2.6", - "js-yaml": "3.13.1", - "make-dir": "2.1.0", - "minimatch": "3.0.4", - "once": "1.4.0" + "async": "^2.6.2", + "compare-versions": "^3.4.0", + "fileset": "^2.0.3", + "istanbul-lib-coverage": "^2.0.5", + "istanbul-lib-hook": "^2.0.7", + "istanbul-lib-instrument": "^3.3.0", + "istanbul-lib-report": "^2.0.8", + "istanbul-lib-source-maps": "^3.0.6", + "istanbul-reports": "^2.2.4", + "js-yaml": "^3.13.1", + "make-dir": "^2.1.0", + "minimatch": "^3.0.4", + "once": "^1.4.0" }, "dependencies": { "istanbul-lib-coverage": { @@ -7442,13 +7456,13 @@ "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==", "dev": true, "requires": { - "@babel/generator": "7.7.4", - "@babel/parser": "7.7.4", - "@babel/template": "7.7.4", - "@babel/traverse": "7.7.4", - "@babel/types": "7.7.4", - "istanbul-lib-coverage": "2.0.5", - "semver": "6.3.0" + "@babel/generator": "^7.4.0", + "@babel/parser": "^7.4.3", + "@babel/template": "^7.4.0", + "@babel/traverse": "^7.4.3", + "@babel/types": "^7.4.0", + "istanbul-lib-coverage": "^2.0.5", + "semver": "^6.0.0" } }, "make-dir": { @@ -7457,8 +7471,8 @@ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, "requires": { - "pify": "4.0.1", - "semver": "5.7.1" + "pify": "^4.0.1", + "semver": "^5.6.0" }, "dependencies": { "semver": { @@ -7489,10 +7503,10 @@ "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==", "dev": true, "requires": { - "convert-source-map": "1.7.0", - "istanbul-lib-instrument": "1.10.2", - "loader-utils": "1.2.3", - "schema-utils": "0.3.0" + "convert-source-map": "^1.5.0", + "istanbul-lib-instrument": "^1.7.3", + "loader-utils": "^1.1.0", + "schema-utils": "^0.3.0" }, "dependencies": { "ajv": { @@ -7501,10 +7515,10 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "fast-deep-equal": { @@ -7525,7 +7539,7 @@ "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "dev": true, "requires": { - "ajv": "5.5.2" + "ajv": "^5.0.0" } } } @@ -7542,7 +7556,7 @@ "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==", "dev": true, "requires": { - "append-transform": "1.0.0" + "append-transform": "^1.0.0" } }, "istanbul-lib-instrument": { @@ -7551,13 +7565,13 @@ "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==", "dev": true, "requires": { - "babel-generator": "6.26.1", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.2.1", - "semver": "5.6.0" + "babel-generator": "^6.18.0", + "babel-template": "^6.16.0", + "babel-traverse": "^6.18.0", + "babel-types": "^6.18.0", + "babylon": "^6.18.0", + "istanbul-lib-coverage": "^1.2.1", + "semver": "^5.3.0" } }, "istanbul-lib-report": { @@ -7566,9 +7580,9 @@ "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==", "dev": true, "requires": { - "istanbul-lib-coverage": "2.0.5", - "make-dir": "2.1.0", - "supports-color": "6.1.0" + "istanbul-lib-coverage": "^2.0.5", + "make-dir": "^2.1.0", + "supports-color": "^6.1.0" }, "dependencies": { "istanbul-lib-coverage": { @@ -7583,8 +7597,8 @@ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, "requires": { - "pify": "4.0.1", - "semver": "5.6.0" + "pify": "^4.0.1", + "semver": "^5.6.0" } }, "pify": { @@ -7601,11 +7615,11 @@ "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==", "dev": true, "requires": { - "debug": "4.1.1", - "istanbul-lib-coverage": "2.0.5", - "make-dir": "2.1.0", - "rimraf": "2.7.1", - "source-map": "0.6.1" + "debug": "^4.1.1", + "istanbul-lib-coverage": "^2.0.5", + "make-dir": "^2.1.0", + "rimraf": "^2.6.3", + "source-map": "^0.6.1" }, "dependencies": { "debug": { @@ -7614,7 +7628,7 @@ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "istanbul-lib-coverage": { @@ -7629,8 +7643,8 @@ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, "requires": { - "pify": "4.0.1", - "semver": "5.6.0" + "pify": "^4.0.1", + "semver": "^5.6.0" } }, "ms": { @@ -7659,7 +7673,7 @@ "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==", "dev": true, "requires": { - "handlebars": "4.5.3" + "handlebars": "^4.1.2" } }, "jasmine": { @@ -7668,8 +7682,8 @@ "integrity": "sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==", "dev": true, "requires": { - "glob": "7.1.6", - "jasmine-core": "3.5.0" + "glob": "^7.1.4", + "jasmine-core": "~3.5.0" }, "dependencies": { "glob": { @@ -7678,12 +7692,12 @@ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.4", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "jasmine-core": { @@ -7732,8 +7746,8 @@ "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "requires": { - "argparse": "1.0.10", - "esprima": "4.0.1" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "jsbn": { @@ -7778,7 +7792,7 @@ "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", "dev": true, "requires": { - "jsonify": "0.0.0" + "jsonify": "~0.0.0" } }, "json-stringify-safe": { @@ -7799,7 +7813,7 @@ "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "requires": { - "minimist": "1.2.0" + "minimist": "^1.2.0" } }, "jsonfile": { @@ -7808,7 +7822,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "4.2.3" + "graceful-fs": "^4.1.6" } }, "jsonify": { @@ -7846,10 +7860,10 @@ "integrity": "sha512-NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA==", "dev": true, "requires": { - "lie": "3.3.0", - "pako": "1.0.10", - "readable-stream": "2.3.6", - "set-immediate-shim": "1.0.1" + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "set-immediate-shim": "~1.0.1" } }, "karma": { @@ -7858,31 +7872,31 @@ "integrity": "sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==", "dev": true, "requires": { - "bluebird": "3.7.1", - "body-parser": "1.19.0", - "braces": "2.3.2", - "chokidar": "2.0.4", - "colors": "1.1.2", - "connect": "3.7.0", - "core-js": "2.6.10", - "di": "0.0.1", - "dom-serialize": "2.2.1", - "flatted": "2.0.1", - "glob": "7.1.3", - "graceful-fs": "4.2.3", - "http-proxy": "1.18.0", - "isbinaryfile": "3.0.3", - "lodash": "4.17.15", - "log4js": "4.5.1", - "mime": "2.4.4", - "minimatch": "3.0.4", - "optimist": "0.6.1", - "qjobs": "1.2.0", - "range-parser": "1.2.1", - "rimraf": "2.7.1", - "safe-buffer": "5.1.2", + "bluebird": "^3.3.0", + "body-parser": "^1.16.1", + "braces": "^2.3.2", + "chokidar": "^2.0.3", + "colors": "^1.1.0", + "connect": "^3.6.0", + "core-js": "^2.2.0", + "di": "^0.0.1", + "dom-serialize": "^2.2.0", + "flatted": "^2.0.0", + "glob": "^7.1.1", + "graceful-fs": "^4.1.2", + "http-proxy": "^1.13.0", + "isbinaryfile": "^3.0.0", + "lodash": "^4.17.11", + "log4js": "^4.0.0", + "mime": "^2.3.1", + "minimatch": "^3.0.2", + "optimist": "^0.6.1", + "qjobs": "^1.1.4", + "range-parser": "^1.2.0", + "rimraf": "^2.6.0", + "safe-buffer": "^5.0.1", "socket.io": "2.1.1", - "source-map": "0.6.1", + "source-map": "^0.6.1", "tmp": "0.0.33", "useragent": "2.3.0" }, @@ -7907,8 +7921,8 @@ "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", "dev": true, "requires": { - "fs-access": "1.0.1", - "which": "1.3.1" + "fs-access": "^1.0.0", + "which": "^1.2.1" } }, "karma-coverage-istanbul-reporter": { @@ -7917,8 +7931,8 @@ "integrity": "sha512-WFh77RI8bMIKdOvI/1/IBmgnM+Q7NOLhnwG91QJrM8lW+CIXCjTzhhUsT/svLvAkLmR10uWY4RyYbHMLkTglvg==", "dev": true, "requires": { - "istanbul-api": "2.1.6", - "minimatch": "3.0.4" + "istanbul-api": "^2.1.6", + "minimatch": "^3.0.4" } }, "karma-jasmine": { @@ -7927,7 +7941,7 @@ "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==", "dev": true, "requires": { - "jasmine-core": "3.4.0" + "jasmine-core": "^3.3" } }, "karma-jasmine-html-reporter": { @@ -7942,7 +7956,7 @@ "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==", "dev": true, "requires": { - "source-map-support": "0.5.10" + "source-map-support": "^0.5.5" } }, "karma-sourcemap-loader": { @@ -7951,7 +7965,7 @@ "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=", "dev": true, "requires": { - "graceful-fs": "4.2.3" + "graceful-fs": "^4.1.2" } }, "karma-spec-reporter": { @@ -7960,7 +7974,7 @@ "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=", "dev": true, "requires": { - "colors": "1.1.2" + "colors": "^1.1.2" } }, "karma-webpack": { @@ -7969,12 +7983,12 @@ "integrity": "sha512-nRudGJWstvVuA6Tbju9tyGUfXTtI1UXMXoRHVmM2/78D0q6s/Ye2IC157PKNDC15PWFGR0mVIRtWLAdcfsRJoA==", "dev": true, "requires": { - "async": "2.6.3", - "babel-runtime": "6.26.0", - "loader-utils": "1.2.3", - "lodash": "4.17.15", - "source-map": "0.5.7", - "webpack-dev-middleware": "2.0.6" + "async": "^2.0.0", + "babel-runtime": "^6.0.0", + "loader-utils": "^1.0.0", + "lodash": "^4.0.0", + "source-map": "^0.5.6", + "webpack-dev-middleware": "^2.0.6" }, "dependencies": { "mime": { @@ -7995,13 +8009,13 @@ "integrity": "sha512-tj5LLD9r4tDuRIDa5Mu9lnY2qBBehAITv6A9irqXhw/HQquZgTx3BCd57zYbU2gMDnncA49ufK2qVQSbaKJwOw==", "dev": true, "requires": { - "loud-rejection": "1.6.0", - "memory-fs": "0.4.1", - "mime": "2.4.4", - "path-is-absolute": "1.0.1", - "range-parser": "1.2.1", - "url-join": "2.0.5", - "webpack-log": "1.2.0" + "loud-rejection": "^1.6.0", + "memory-fs": "~0.4.1", + "mime": "^2.1.0", + "path-is-absolute": "^1.0.0", + "range-parser": "^1.0.3", + "url-join": "^2.0.2", + "webpack-log": "^1.0.1" } }, "webpack-log": { @@ -8010,10 +8024,10 @@ "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==", "dev": true, "requires": { - "chalk": "2.4.2", - "log-symbols": "2.2.0", - "loglevelnext": "1.0.5", - "uuid": "3.3.3" + "chalk": "^2.1.0", + "log-symbols": "^2.1.0", + "loglevelnext": "^1.0.1", + "uuid": "^3.1.0" } } } @@ -8036,7 +8050,7 @@ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "leaflet": { @@ -8050,7 +8064,7 @@ "integrity": "sha512-w/0qcllcNVzlfhup7apLc7hamOaZrtGfxMDqX6ItlUjNBz08CMk7bxcwITIVbL8wFYqTnVsBI8zUBKzypQo2uw==", "dev": true, "requires": { - "leaflet": "1.6.0" + "leaflet": "*" } }, "less": { @@ -8059,15 +8073,15 @@ "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==", "dev": true, "requires": { - "clone": "2.1.2", - "errno": "0.1.7", - "graceful-fs": "4.2.3", - "image-size": "0.5.5", - "mime": "1.6.0", - "mkdirp": "0.5.1", - "promise": "7.3.1", - "request": "2.88.0", - "source-map": "0.6.1" + "clone": "^2.1.2", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "mime": "^1.4.1", + "mkdirp": "^0.5.0", + "promise": "^7.1.1", + "request": "^2.83.0", + "source-map": "~0.6.0" }, "dependencies": { "source-map": { @@ -8085,9 +8099,9 @@ "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==", "dev": true, "requires": { - "clone": "2.1.2", - "loader-utils": "1.2.3", - "pify": "3.0.0" + "clone": "^2.1.1", + "loader-utils": "^1.1.0", + "pify": "^3.0.0" } }, "license-webpack-plugin": { @@ -8096,8 +8110,8 @@ "integrity": "sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==", "dev": true, "requires": { - "@types/webpack-sources": "0.1.5", - "webpack-sources": "1.3.0" + "@types/webpack-sources": "^0.1.5", + "webpack-sources": "^1.2.0" } }, "lie": { @@ -8106,7 +8120,7 @@ "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", "dev": true, "requires": { - "immediate": "3.0.6" + "immediate": "~3.0.5" } }, "load-json-file": { @@ -8115,11 +8129,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.2.3", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" }, "dependencies": { "pify": { @@ -8142,9 +8156,9 @@ "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", "dev": true, "requires": { - "big.js": "5.2.2", - "emojis-list": "2.1.0", - "json5": "1.0.1" + "big.js": "^5.2.2", + "emojis-list": "^2.0.0", + "json5": "^1.0.1" } }, "locate-path": { @@ -8153,8 +8167,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" } }, "lodash": { @@ -8193,8 +8207,8 @@ "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.templatesettings": "4.2.0" + "lodash._reinterpolate": "^3.0.0", + "lodash.templatesettings": "^4.0.0" } }, "lodash.templatesettings": { @@ -8203,7 +8217,7 @@ "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0" + "lodash._reinterpolate": "^3.0.0" } }, "log-symbols": { @@ -8212,7 +8226,7 @@ "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", "dev": true, "requires": { - "chalk": "2.4.2" + "chalk": "^2.0.1" } }, "log4js": { @@ -8221,11 +8235,11 @@ "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==", "dev": true, "requires": { - "date-format": "2.1.0", - "debug": "4.1.1", - "flatted": "2.0.1", - "rfdc": "1.1.4", - "streamroller": "1.0.6" + "date-format": "^2.0.0", + "debug": "^4.1.1", + "flatted": "^2.0.0", + "rfdc": "^1.1.4", + "streamroller": "^1.0.6" }, "dependencies": { "debug": { @@ -8234,7 +8248,7 @@ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "ms": { @@ -8257,8 +8271,8 @@ "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==", "dev": true, "requires": { - "es6-symbol": "3.1.3", - "object.assign": "4.1.0" + "es6-symbol": "^3.1.1", + "object.assign": "^4.1.0" } }, "loose-envify": { @@ -8266,7 +8280,7 @@ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "requires": { - "js-tokens": "4.0.0" + "js-tokens": "^3.0.0 || ^4.0.0" } }, "loud-rejection": { @@ -8275,8 +8289,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "lower-case": { @@ -8291,8 +8305,8 @@ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "magic-string": { @@ -8301,7 +8315,7 @@ "integrity": "sha512-oycWO9nEVAP2RVPbIoDoA4Y7LFIJ3xRYov93gAyJhZkET1tNuB0u7uWkZS2LpBWTJUWnmau/To8ECWRC+jKNfw==", "dev": true, "requires": { - "sourcemap-codec": "1.4.6" + "sourcemap-codec": "^1.4.4" } }, "make-dir": { @@ -8310,7 +8324,7 @@ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "make-error": { @@ -8325,17 +8339,17 @@ "integrity": "sha512-YMJrAjHSb/BordlsDEcVcPyTbiJKkzqMf48N8dAJZT9Zjctrkb6Yg4TY9Sq2AwSIQJFn5qBBKVTYt3vP5FMIHA==", "dev": true, "requires": { - "agentkeepalive": "3.5.2", - "cacache": "11.3.3", - "http-cache-semantics": "3.8.1", - "http-proxy-agent": "2.1.0", - "https-proxy-agent": "2.2.4", - "lru-cache": "5.1.1", - "mississippi": "3.0.0", - "node-fetch-npm": "2.0.2", - "promise-retry": "1.1.1", - "socks-proxy-agent": "4.0.2", - "ssri": "6.0.1" + "agentkeepalive": "^3.4.1", + "cacache": "^11.3.3", + "http-cache-semantics": "^3.8.1", + "http-proxy-agent": "^2.1.0", + "https-proxy-agent": "^2.2.1", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "node-fetch-npm": "^2.0.2", + "promise-retry": "^1.1.1", + "socks-proxy-agent": "^4.0.0", + "ssri": "^6.0.0" }, "dependencies": { "cacache": { @@ -8344,20 +8358,20 @@ "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", "dev": true, "requires": { - "bluebird": "3.7.1", - "chownr": "1.1.3", - "figgy-pudding": "3.5.1", - "glob": "7.1.6", - "graceful-fs": "4.2.3", - "lru-cache": "5.1.1", - "mississippi": "3.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.7.1", - "ssri": "6.0.1", - "unique-filename": "1.1.1", - "y18n": "4.0.0" + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" } }, "glob": { @@ -8366,12 +8380,12 @@ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.4", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "lru-cache": { @@ -8380,7 +8394,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "3.1.1" + "yallist": "^3.0.2" } }, "mississippi": { @@ -8389,16 +8403,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.7.1", - "end-of-stream": "1.4.4", - "flush-write-stream": "1.1.1", - "from2": "2.3.0", - "parallel-transform": "1.2.0", - "pump": "3.0.0", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.5" + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" } }, "pump": { @@ -8407,8 +8421,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "ssri": { @@ -8417,7 +8431,7 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "3.5.1" + "figgy-pudding": "^3.5.1" } }, "yallist": { @@ -8440,7 +8454,7 @@ "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", "dev": true, "requires": { - "p-defer": "1.0.0" + "p-defer": "^1.0.0" } }, "map-cache": { @@ -8461,7 +8475,7 @@ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "matches-selector": { @@ -8475,9 +8489,9 @@ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", "dev": true, "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "media-typer": { @@ -8492,9 +8506,9 @@ "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", "dev": true, "requires": { - "map-age-cleaner": "0.1.3", - "mimic-fn": "2.1.0", - "p-is-promise": "2.1.0" + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" } }, "memory-fs": { @@ -8503,8 +8517,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "0.1.7", - "readable-stream": "2.3.6" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" } }, "meow": { @@ -8513,16 +8527,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.5.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" } }, "merge-descriptors": { @@ -8543,19 +8557,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "miller-rabin": { @@ -8564,8 +8578,8 @@ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", "dev": true, "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0" + "bn.js": "^4.0.0", + "brorand": "^1.0.1" } }, "mime": { @@ -8606,11 +8620,11 @@ "integrity": "sha512-qvURYMN2jHw9kPg1oFKdOd/VNJOsUNGV5H5j+zpJLkFVyP49tqmTQN8xWMYCDpIKetyQAC6jV5JjskNZr+JHpg==", "requires": { "closest": "0.0.1", - "component-event": "0.1.4", - "delegate-events": "1.1.1", - "domify": "1.4.0", + "component-event": "^0.1.4", + "delegate-events": "^1.1.1", + "domify": "^1.3.1", "indexof": "0.0.1", - "matches-selector": "1.2.0" + "matches-selector": "^1.2.0" } }, "mini-css-extract-plugin": { @@ -8619,9 +8633,9 @@ "integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==", "dev": true, "requires": { - "loader-utils": "1.2.3", - "schema-utils": "1.0.0", - "webpack-sources": "1.3.0" + "loader-utils": "^1.1.0", + "schema-utils": "^1.0.0", + "webpack-sources": "^1.1.0" } }, "minimalistic-assert": { @@ -8642,7 +8656,7 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -8657,8 +8671,8 @@ "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", "dev": true, "requires": { - "safe-buffer": "5.1.2", - "yallist": "3.1.1" + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" }, "dependencies": { "yallist": { @@ -8675,7 +8689,7 @@ "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", "dev": true, "requires": { - "minipass": "2.9.0" + "minipass": "^2.9.0" } }, "mississippi": { @@ -8684,16 +8698,16 @@ "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.7.1", - "end-of-stream": "1.4.4", - "flush-write-stream": "1.1.1", - "from2": "2.3.0", - "parallel-transform": "1.2.0", - "pump": "2.0.1", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.5" + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^2.0.1", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" } }, "mixin-deep": { @@ -8702,8 +8716,8 @@ "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -8712,7 +8726,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -8723,8 +8737,8 @@ "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", "dev": true, "requires": { - "for-in": "0.1.8", - "is-extendable": "0.1.1" + "for-in": "^0.1.3", + "is-extendable": "^0.1.1" }, "dependencies": { "for-in": { @@ -8757,7 +8771,7 @@ "resolved": "https://registry.npmjs.org/moddle/-/moddle-4.1.0.tgz", "integrity": "sha512-asBaDLTTNpv4oC8iFdwonfMf/noPVvaBDXoSL7AsXZUDqwokgy8Lsf5eXwdnjXiDqm0olYi/S3Do544uVJSQDg==", "requires": { - "min-dash": "3.5.2" + "min-dash": "^3.0.0" } }, "moddle-xml": { @@ -8765,9 +8779,9 @@ "resolved": "https://registry.npmjs.org/moddle-xml/-/moddle-xml-7.5.0.tgz", "integrity": "sha512-wPm3TD9910Iblp4lg1okHDRilY9gTvNBdo7ZHBmBzH4OioF5R2hvG3SMyn7cAUjOUg0kYUfChHgcUEO+qUc77Q==", "requires": { - "min-dash": "3.5.2", - "moddle": "4.1.0", - "saxen": "8.1.0" + "min-dash": "^3.0.0", + "moddle": "^4.1.0", + "saxen": "^8.1.0" } }, "move-concurrently": { @@ -8776,12 +8790,12 @@ "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "dev": true, "requires": { - "aproba": "1.2.0", - "copy-concurrently": "1.0.5", - "fs-write-stream-atomic": "1.0.10", - "mkdirp": "0.5.1", - "rimraf": "2.7.1", - "run-queue": "1.0.3" + "aproba": "^1.1.1", + "copy-concurrently": "^1.0.0", + "fs-write-stream-atomic": "^1.0.8", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.3" } }, "ms": { @@ -8796,8 +8810,8 @@ "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", "dev": true, "requires": { - "dns-packet": "1.3.1", - "thunky": "1.1.0" + "dns-packet": "^1.3.1", + "thunky": "^1.0.2" } }, "multicast-dns-service-types": { @@ -8824,17 +8838,17 @@ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" } }, "negotiator": { @@ -8867,7 +8881,7 @@ "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", "dev": true, "requires": { - "lower-case": "1.1.4" + "lower-case": "^1.1.1" } }, "node-fetch-npm": { @@ -8876,9 +8890,9 @@ "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==", "dev": true, "requires": { - "encoding": "0.1.12", - "json-parse-better-errors": "1.0.2", - "safe-buffer": "5.1.2" + "encoding": "^0.1.11", + "json-parse-better-errors": "^1.0.0", + "safe-buffer": "^5.1.1" } }, "node-forge": { @@ -8893,18 +8907,18 @@ "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", "dev": true, "requires": { - "fstream": "1.0.12", - "glob": "7.1.3", - "graceful-fs": "4.2.3", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.5", - "request": "2.88.0", - "rimraf": "2.7.1", - "semver": "5.3.0", - "tar": "2.2.2", - "which": "1.3.1" + "fstream": "^1.0.0", + "glob": "^7.0.3", + "graceful-fs": "^4.1.2", + "mkdirp": "^0.5.0", + "nopt": "2 || 3", + "npmlog": "0 || 1 || 2 || 3 || 4", + "osenv": "0", + "request": "^2.87.0", + "rimraf": "2", + "semver": "~5.3.0", + "tar": "^2.0.0", + "which": "1" }, "dependencies": { "semver": { @@ -8921,29 +8935,29 @@ "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", "dev": true, "requires": { - "assert": "1.5.0", - "browserify-zlib": "0.2.0", - "buffer": "4.9.2", - "console-browserify": "1.2.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "domain-browser": "1.2.0", - "events": "3.0.0", - "https-browserify": "1.0.0", - "os-browserify": "0.3.0", + "assert": "^1.1.1", + "browserify-zlib": "^0.2.0", + "buffer": "^4.3.0", + "console-browserify": "^1.1.0", + "constants-browserify": "^1.0.0", + "crypto-browserify": "^3.11.0", + "domain-browser": "^1.1.1", + "events": "^3.0.0", + "https-browserify": "^1.0.0", + "os-browserify": "^0.3.0", "path-browserify": "0.0.1", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.6", - "stream-browserify": "2.0.2", - "stream-http": "2.8.3", - "string_decoder": "1.1.1", - "timers-browserify": "2.0.11", + "process": "^0.11.10", + "punycode": "^1.2.4", + "querystring-es3": "^0.2.0", + "readable-stream": "^2.3.3", + "stream-browserify": "^2.0.1", + "stream-http": "^2.7.2", + "string_decoder": "^1.0.0", + "timers-browserify": "^2.0.4", "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.11.1", - "vm-browserify": "1.1.2" + "url": "^0.11.0", + "util": "^0.11.0", + "vm-browserify": "^1.0.1" }, "dependencies": { "punycode": { @@ -8960,7 +8974,7 @@ "integrity": "sha512-+IctMa7wIs8Cfsa8iYzeaLTFwv5Y4r5jZud+4AnfymzeEXKBCavFX0KBgzVaPVqf0ywa6PrO8/b+bPqdwjGBSg==", "dev": true, "requires": { - "semver": "6.3.0" + "semver": "^6.3.0" }, "dependencies": { "semver": { @@ -8977,23 +8991,23 @@ "integrity": "sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==", "dev": true, "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.3", - "get-stdin": "4.0.1", - "glob": "7.1.3", - "in-publish": "2.0.0", - "lodash": "4.17.15", - "meow": "3.7.0", - "mkdirp": "0.5.1", - "nan": "2.14.0", - "node-gyp": "3.8.0", - "npmlog": "4.1.2", - "request": "2.88.0", - "sass-graph": "2.2.4", - "stdout-stream": "1.4.1", - "true-case-path": "1.0.3" + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^3.0.0", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "in-publish": "^2.0.0", + "lodash": "^4.17.15", + "meow": "^3.7.0", + "mkdirp": "^0.5.1", + "nan": "^2.13.2", + "node-gyp": "^3.8.0", + "npmlog": "^4.0.0", + "request": "^2.88.0", + "sass-graph": "^2.2.4", + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" }, "dependencies": { "ansi-styles": { @@ -9008,11 +9022,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "supports-color": { @@ -9029,7 +9043,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1.1.1" + "abbrev": "1" } }, "normalize-package-data": { @@ -9038,10 +9052,10 @@ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, "requires": { - "hosted-git-info": "2.8.5", - "resolve": "1.13.1", - "semver": "5.6.0", - "validate-npm-package-license": "3.0.4" + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -9050,7 +9064,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "normalize-range": { @@ -9071,10 +9085,10 @@ "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==", "dev": true, "requires": { - "hosted-git-info": "2.8.5", - "osenv": "0.1.5", - "semver": "5.6.0", - "validate-npm-package-name": "3.0.0" + "hosted-git-info": "^2.6.0", + "osenv": "^0.1.5", + "semver": "^5.5.0", + "validate-npm-package-name": "^3.0.0" } }, "npm-packlist": { @@ -9083,8 +9097,8 @@ "integrity": "sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==", "dev": true, "requires": { - "ignore-walk": "3.0.3", - "npm-bundled": "1.0.6" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npm-pick-manifest": { @@ -9093,9 +9107,9 @@ "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==", "dev": true, "requires": { - "figgy-pudding": "3.5.1", - "npm-package-arg": "6.1.0", - "semver": "5.6.0" + "figgy-pudding": "^3.5.1", + "npm-package-arg": "^6.0.0", + "semver": "^5.4.1" } }, "npm-registry-fetch": { @@ -9104,12 +9118,12 @@ "integrity": "sha512-VQCEZlydXw4AwLROAXWUR7QDfe2Y8Id/vpAgp6TI1/H78a4SiQ1kQrKZALm5/zxM5n4HIi+aYb+idUAV/RuY0Q==", "dev": true, "requires": { - "JSONStream": "1.3.5", - "bluebird": "3.7.1", - "figgy-pudding": "3.5.1", - "lru-cache": "5.1.1", - "make-fetch-happen": "4.0.2", - "npm-package-arg": "6.1.0" + "JSONStream": "^1.3.4", + "bluebird": "^3.5.1", + "figgy-pudding": "^3.4.1", + "lru-cache": "^5.1.1", + "make-fetch-happen": "^4.0.2", + "npm-package-arg": "^6.1.0" }, "dependencies": { "lru-cache": { @@ -9118,7 +9132,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "3.1.1" + "yallist": "^3.0.2" } }, "yallist": { @@ -9135,7 +9149,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "npmlog": { @@ -9144,10 +9158,10 @@ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "requires": { - "are-we-there-yet": "1.1.5", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "nth-check": { @@ -9156,7 +9170,7 @@ "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", "dev": true, "requires": { - "boolbase": "1.0.0" + "boolbase": "~1.0.0" } }, "null-check": { @@ -9201,9 +9215,9 @@ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { @@ -9212,7 +9226,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "kind-of": { @@ -9221,7 +9235,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -9255,7 +9269,7 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" } }, "object.assign": { @@ -9264,10 +9278,10 @@ "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", "dev": true, "requires": { - "define-properties": "1.1.3", - "function-bind": "1.1.1", - "has-symbols": "1.0.1", - "object-keys": "1.1.1" + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" } }, "object.getownpropertydescriptors": { @@ -9276,8 +9290,8 @@ "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.16.2" + "define-properties": "^1.1.2", + "es-abstract": "^1.5.1" } }, "object.pick": { @@ -9286,7 +9300,7 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "obuf": { @@ -9316,7 +9330,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "onetime": { @@ -9325,7 +9339,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" }, "dependencies": { "mimic-fn": { @@ -9342,7 +9356,7 @@ "integrity": "sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==", "dev": true, "requires": { - "is-wsl": "1.1.0" + "is-wsl": "^1.1.0" } }, "opener": { @@ -9357,7 +9371,7 @@ "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", "dev": true, "requires": { - "is-wsl": "1.1.0" + "is-wsl": "^1.1.0" } }, "optimist": { @@ -9366,8 +9380,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" }, "dependencies": { "minimist": { @@ -9384,7 +9398,7 @@ "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", "dev": true, "requires": { - "url-parse": "1.4.7" + "url-parse": "^1.4.3" } }, "os-browserify": { @@ -9405,7 +9419,7 @@ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { - "lcid": "1.0.0" + "lcid": "^1.0.0" } }, "os-tmpdir": { @@ -9420,8 +9434,8 @@ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "p-defer": { @@ -9448,7 +9462,7 @@ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { - "p-try": "1.0.0" + "p-try": "^1.0.0" } }, "p-locate": { @@ -9457,7 +9471,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "1.3.0" + "p-limit": "^1.1.0" } }, "p-map": { @@ -9472,7 +9486,7 @@ "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", "dev": true, "requires": { - "retry": "0.12.0" + "retry": "^0.12.0" }, "dependencies": { "retry": { @@ -9495,33 +9509,33 @@ "integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==", "dev": true, "requires": { - "bluebird": "3.7.1", - "cacache": "11.3.3", - "figgy-pudding": "3.5.1", - "get-stream": "4.1.0", - "glob": "7.1.3", - "lru-cache": "5.1.1", - "make-fetch-happen": "4.0.2", - "minimatch": "3.0.4", - "minipass": "2.9.0", - "mississippi": "3.0.0", - "mkdirp": "0.5.1", - "normalize-package-data": "2.5.0", - "npm-package-arg": "6.1.0", - "npm-packlist": "1.4.6", - "npm-pick-manifest": "2.2.3", - "npm-registry-fetch": "3.9.1", - "osenv": "0.1.5", - "promise-inflight": "1.0.1", - "promise-retry": "1.1.1", - "protoduck": "5.0.1", - "rimraf": "2.7.1", - "safe-buffer": "5.1.2", - "semver": "5.6.0", - "ssri": "6.0.1", - "tar": "4.4.13", - "unique-filename": "1.1.1", - "which": "1.3.1" + "bluebird": "^3.5.3", + "cacache": "^11.3.2", + "figgy-pudding": "^3.5.1", + "get-stream": "^4.1.0", + "glob": "^7.1.3", + "lru-cache": "^5.1.1", + "make-fetch-happen": "^4.0.1", + "minimatch": "^3.0.4", + "minipass": "^2.3.5", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "normalize-package-data": "^2.4.0", + "npm-package-arg": "^6.1.0", + "npm-packlist": "^1.1.12", + "npm-pick-manifest": "^2.2.3", + "npm-registry-fetch": "^3.8.0", + "osenv": "^0.1.5", + "promise-inflight": "^1.0.1", + "promise-retry": "^1.1.1", + "protoduck": "^5.0.1", + "rimraf": "^2.6.2", + "safe-buffer": "^5.1.2", + "semver": "^5.6.0", + "ssri": "^6.0.1", + "tar": "^4.4.8", + "unique-filename": "^1.1.1", + "which": "^1.3.1" }, "dependencies": { "cacache": { @@ -9530,20 +9544,20 @@ "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", "dev": true, "requires": { - "bluebird": "3.7.1", - "chownr": "1.1.3", - "figgy-pudding": "3.5.1", - "glob": "7.1.6", - "graceful-fs": "4.2.3", - "lru-cache": "5.1.1", - "mississippi": "3.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.7.1", - "ssri": "6.0.1", - "unique-filename": "1.1.1", - "y18n": "4.0.0" + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" }, "dependencies": { "glob": { @@ -9552,12 +9566,12 @@ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.4", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -9568,7 +9582,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "3.0.0" + "pump": "^3.0.0" } }, "lru-cache": { @@ -9577,7 +9591,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "3.1.1" + "yallist": "^3.0.2" } }, "mississippi": { @@ -9586,16 +9600,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.7.1", - "end-of-stream": "1.4.4", - "flush-write-stream": "1.1.1", - "from2": "2.3.0", - "parallel-transform": "1.2.0", - "pump": "3.0.0", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.5" + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" } }, "pump": { @@ -9604,8 +9618,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "ssri": { @@ -9614,7 +9628,7 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "3.5.1" + "figgy-pudding": "^3.5.1" } }, "tar": { @@ -9623,13 +9637,13 @@ "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", "dev": true, "requires": { - "chownr": "1.1.3", - "fs-minipass": "1.2.7", - "minipass": "2.9.0", - "minizlib": "1.3.3", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.2", - "yallist": "3.1.1" + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" } }, "yallist": { @@ -9652,9 +9666,9 @@ "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", "dev": true, "requires": { - "cyclist": "1.0.1", - "inherits": "2.0.4", - "readable-stream": "2.3.6" + "cyclist": "^1.0.1", + "inherits": "^2.0.3", + "readable-stream": "^2.1.5" } }, "param-case": { @@ -9663,7 +9677,7 @@ "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", "dev": true, "requires": { - "no-case": "2.3.2" + "no-case": "^2.2.0" } }, "parse-asn1": { @@ -9672,12 +9686,12 @@ "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==", "dev": true, "requires": { - "asn1.js": "4.10.1", - "browserify-aes": "1.2.0", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "pbkdf2": "3.0.17", - "safe-buffer": "5.1.2" + "asn1.js": "^4.0.0", + "browserify-aes": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" } }, "parse-json": { @@ -9686,7 +9700,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.2" + "error-ex": "^1.2.0" } }, "parse-passwd": { @@ -9707,7 +9721,7 @@ "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseuri": { @@ -9716,7 +9730,7 @@ "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseurl": { @@ -9790,7 +9804,7 @@ "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "pbkdf2": { @@ -9799,11 +9813,11 @@ "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", "dev": true, "requires": { - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "performance-now": { @@ -9830,7 +9844,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { @@ -9839,7 +9853,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "2.1.0" + "find-up": "^2.1.0" } }, "portfinder": { @@ -9848,9 +9862,9 @@ "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==", "dev": true, "requires": { - "async": "2.6.3", - "debug": "3.2.6", - "mkdirp": "0.5.1" + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.1" }, "dependencies": { "debug": { @@ -9859,7 +9873,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "ms": { @@ -9882,9 +9896,9 @@ "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==", "dev": true, "requires": { - "chalk": "2.4.2", - "source-map": "0.6.1", - "supports-color": "6.1.0" + "chalk": "^2.4.2", + "source-map": "^0.6.1", + "supports-color": "^6.1.0" }, "dependencies": { "source-map": { @@ -9901,10 +9915,10 @@ "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==", "dev": true, "requires": { - "postcss": "7.0.14", - "postcss-value-parser": "3.3.1", - "read-cache": "1.0.0", - "resolve": "1.13.1" + "postcss": "^7.0.1", + "postcss-value-parser": "^3.2.3", + "read-cache": "^1.0.0", + "resolve": "^1.1.7" } }, "postcss-load-config": { @@ -9913,8 +9927,8 @@ "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==", "dev": true, "requires": { - "cosmiconfig": "5.2.1", - "import-cwd": "2.1.0" + "cosmiconfig": "^5.0.0", + "import-cwd": "^2.0.0" } }, "postcss-loader": { @@ -9923,10 +9937,10 @@ "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", "dev": true, "requires": { - "loader-utils": "1.2.3", - "postcss": "7.0.14", - "postcss-load-config": "2.1.0", - "schema-utils": "1.0.0" + "loader-utils": "^1.1.0", + "postcss": "^7.0.0", + "postcss-load-config": "^2.0.0", + "schema-utils": "^1.0.0" } }, "postcss-modules-extract-imports": { @@ -9935,7 +9949,7 @@ "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==", "dev": true, "requires": { - "postcss": "7.0.14" + "postcss": "^7.0.5" } }, "postcss-modules-local-by-default": { @@ -9944,9 +9958,9 @@ "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==", "dev": true, "requires": { - "postcss": "7.0.14", - "postcss-selector-parser": "6.0.2", - "postcss-value-parser": "3.3.1" + "postcss": "^7.0.6", + "postcss-selector-parser": "^6.0.0", + "postcss-value-parser": "^3.3.1" } }, "postcss-modules-scope": { @@ -9955,8 +9969,8 @@ "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==", "dev": true, "requires": { - "postcss": "7.0.14", - "postcss-selector-parser": "6.0.2" + "postcss": "^7.0.6", + "postcss-selector-parser": "^6.0.0" } }, "postcss-modules-values": { @@ -9965,8 +9979,8 @@ "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==", "dev": true, "requires": { - "icss-replace-symbols": "1.1.0", - "postcss": "7.0.14" + "icss-replace-symbols": "^1.1.0", + "postcss": "^7.0.6" } }, "postcss-selector-parser": { @@ -9975,9 +9989,9 @@ "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==", "dev": true, "requires": { - "cssesc": "3.0.0", - "indexes-of": "1.0.1", - "uniq": "1.0.1" + "cssesc": "^3.0.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1" }, "dependencies": { "cssesc": { @@ -10006,8 +10020,8 @@ "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", "dev": true, "requires": { - "renderkid": "2.0.3", - "utila": "0.4.0" + "renderkid": "^2.0.1", + "utila": "~0.4" } }, "process": { @@ -10029,7 +10043,7 @@ "dev": true, "optional": true, "requires": { - "asap": "2.0.6" + "asap": "~2.0.3" } }, "promise-inflight": { @@ -10044,8 +10058,8 @@ "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=", "dev": true, "requires": { - "err-code": "1.1.2", - "retry": "0.10.1" + "err-code": "^1.0.0", + "retry": "^0.10.0" } }, "protoduck": { @@ -10054,7 +10068,7 @@ "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==", "dev": true, "requires": { - "genfun": "5.0.0" + "genfun": "^5.0.0" } }, "protractor": { @@ -10063,15 +10077,15 @@ "integrity": "sha512-kCV1hK9gAh+N9to04oXLXtqnnG/UX/aDL2YvLS0SYqzzpeLt8Are3y3JPjWC/OSsYBkOW8T1cXmcMn0QaGUudw==", "dev": true, "requires": { - "blocking-proxy": "1.0.1", - "browserstack": "1.5.3", - "chalk": "1.1.3", - "glob": "7.1.3", - "jasmine": "3.5.0", - "optimist": "0.6.1", - "saucelabs": "1.5.0", - "selenium-webdriver": "4.0.0-alpha.5", - "source-map-support": "0.4.18", + "blocking-proxy": "^1.0.0", + "browserstack": "^1.5.1", + "chalk": "^1.1.3", + "glob": "^7.0.3", + "jasmine": "^3.3.1", + "optimist": "~0.6.0", + "saucelabs": "^1.5.0", + "selenium-webdriver": "^4.0.0-alpha.1", + "source-map-support": "~0.4.0", "webdriver-manager": "13.0.0" }, "dependencies": { @@ -10099,11 +10113,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "cliui": { @@ -10112,9 +10126,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" }, "dependencies": { "strip-ansi": { @@ -10123,7 +10137,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -10134,11 +10148,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.6.0", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "execa": { @@ -10147,13 +10161,13 @@ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "6.0.5", - "get-stream": "4.1.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "find-up": { @@ -10162,7 +10176,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "get-stream": { @@ -10171,7 +10185,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "3.0.0" + "pump": "^3.0.0" } }, "invert-kv": { @@ -10192,7 +10206,7 @@ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { - "invert-kv": "2.0.0" + "invert-kv": "^2.0.0" } }, "locate-path": { @@ -10201,8 +10215,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "os-locale": { @@ -10211,9 +10225,9 @@ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { - "execa": "1.0.0", - "lcid": "2.0.0", - "mem": "4.3.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, "p-limit": { @@ -10222,7 +10236,7 @@ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -10231,7 +10245,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.2.1" + "p-limit": "^2.0.0" } }, "p-try": { @@ -10246,8 +10260,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "source-map": { @@ -10262,7 +10276,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } }, "string-width": { @@ -10271,8 +10285,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "strip-ansi": { @@ -10281,7 +10295,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -10298,13 +10312,13 @@ "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", "dev": true, "requires": { - "chownr": "1.1.3", - "fs-minipass": "1.2.7", - "minipass": "2.9.0", - "minizlib": "1.3.3", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.2", - "yallist": "3.1.1" + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" } }, "webdriver-manager": { @@ -10313,13 +10327,13 @@ "integrity": "sha512-nwcbUWZwwqw4Nn+Xs8rgyX5JWDJ3oOAEc+OMI9sp8QlM7yg1CDaqqk/2DRZI/ig3DxQwZ1Xna3Eq0unNUaSQvA==", "dev": true, "requires": { - "adm-zip": "0.4.13", - "loglevel": "1.6.6", - "request": "2.88.0", - "semver": "5.6.0", - "tar": "4.4.13", - "xml2js": "0.4.22", - "yargs": "12.0.5" + "adm-zip": "^0.4.13", + "loglevel": "^1.6.1", + "request": "^2.88.0", + "semver": "^5.6.0", + "tar": "^4.4.8", + "xml2js": "^0.4.19", + "yargs": "^12.0.5" } }, "which-module": { @@ -10340,18 +10354,18 @@ "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "3.0.0", - "get-caller-file": "1.0.3", - "os-locale": "3.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "11.1.1" + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" } }, "yargs-parser": { @@ -10360,8 +10374,8 @@ "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", "dev": true, "requires": { - "camelcase": "5.3.1", - "decamelize": "1.2.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } @@ -10372,7 +10386,7 @@ "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", "dev": true, "requires": { - "forwarded": "0.1.2", + "forwarded": "~0.1.2", "ipaddr.js": "1.9.0" } }, @@ -10400,12 +10414,12 @@ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", "dev": true, "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "parse-asn1": "5.1.5", - "randombytes": "2.1.0", - "safe-buffer": "5.1.2" + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "pump": { @@ -10414,8 +10428,8 @@ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "pumpify": { @@ -10424,9 +10438,9 @@ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "dev": true, "requires": { - "duplexify": "3.7.1", - "inherits": "2.0.4", - "pump": "2.0.1" + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" } }, "punycode": { @@ -10471,7 +10485,7 @@ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.1.0" } }, "randomfill": { @@ -10480,8 +10494,8 @@ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "dev": true, "requires": { - "randombytes": "2.1.0", - "safe-buffer": "5.1.2" + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" } }, "range-parser": { @@ -10516,8 +10530,8 @@ "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==", "dev": true, "requires": { - "loader-utils": "1.2.3", - "schema-utils": "1.0.0" + "loader-utils": "^1.1.0", + "schema-utils": "^1.0.0" } }, "read-cache": { @@ -10526,7 +10540,7 @@ "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", "dev": true, "requires": { - "pify": "2.3.0" + "pify": "^2.3.0" }, "dependencies": { "pify": { @@ -10543,9 +10557,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.5.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" }, "dependencies": { "path-type": { @@ -10554,9 +10568,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.2.3", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -10573,8 +10587,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" }, "dependencies": { "find-up": { @@ -10583,8 +10597,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "path-exists": { @@ -10593,7 +10607,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } } } @@ -10604,13 +10618,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -10619,9 +10633,9 @@ "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", "dev": true, "requires": { - "graceful-fs": "4.2.3", - "micromatch": "3.1.10", - "readable-stream": "2.3.6" + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" } }, "rechoir": { @@ -10630,7 +10644,7 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "resolve": "1.13.1" + "resolve": "^1.1.6" } }, "redent": { @@ -10639,8 +10653,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" } }, "redux": { @@ -10648,8 +10662,8 @@ "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.4.tgz", "integrity": "sha512-vKv4WdiJxOWKxK0yRoaK3Y4pxxB0ilzVx6dszU2W8wLxlb2yikRph4iV/ymtdJ6ZxpBLFbyrxklnT5yBbQSl3Q==", "requires": { - "loose-envify": "1.4.0", - "symbol-observable": "1.2.0" + "loose-envify": "^1.4.0", + "symbol-observable": "^1.2.0" } }, "reflect-metadata": { @@ -10676,8 +10690,8 @@ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "dev": true, "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, "regexp.prototype.flags": { @@ -10686,7 +10700,7 @@ "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==", "dev": true, "requires": { - "define-properties": "1.1.3" + "define-properties": "^1.1.2" } }, "regexpu-core": { @@ -10695,9 +10709,9 @@ "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "dev": true, "requires": { - "regenerate": "1.4.0", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" } }, "regjsgen": { @@ -10712,7 +10726,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "0.5.0" + "jsesc": "~0.5.0" }, "dependencies": { "jsesc": { @@ -10741,11 +10755,11 @@ "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==", "dev": true, "requires": { - "css-select": "1.2.0", - "dom-converter": "0.2.0", - "htmlparser2": "3.10.1", - "strip-ansi": "3.0.1", - "utila": "0.4.0" + "css-select": "^1.1.0", + "dom-converter": "^0.2", + "htmlparser2": "^3.3.0", + "strip-ansi": "^3.0.0", + "utila": "^0.4.0" } }, "repeat-element": { @@ -10766,7 +10780,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "request": { @@ -10775,26 +10789,26 @@ "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", "dev": true, "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.9.0", - "caseless": "0.12.0", - "combined-stream": "1.0.8", - "extend": "3.0.2", - "forever-agent": "0.6.1", - "form-data": "2.3.3", - "har-validator": "5.1.3", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.25", - "oauth-sign": "0.9.0", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.4.3", - "tunnel-agent": "0.6.0", - "uuid": "3.3.3" + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" } }, "require-directory": { @@ -10821,7 +10835,7 @@ "integrity": "sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==", "dev": true, "requires": { - "path-parse": "1.0.6" + "path-parse": "^1.0.6" } }, "resolve-cwd": { @@ -10830,7 +10844,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "resolve-dir": { @@ -10839,8 +10853,8 @@ "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "dev": true, "requires": { - "expand-tilde": "2.0.2", - "global-modules": "1.0.0" + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" } }, "resolve-from": { @@ -10861,8 +10875,8 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "2.0.1", - "signal-exit": "3.0.2" + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" } }, "ret": { @@ -10889,7 +10903,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.3" + "glob": "^7.1.3" } }, "ripemd160": { @@ -10898,8 +10912,8 @@ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.4" + "hash-base": "^3.0.0", + "inherits": "^2.0.1" } }, "run-async": { @@ -10908,7 +10922,7 @@ "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { - "is-promise": "2.1.0" + "is-promise": "^2.1.0" } }, "run-queue": { @@ -10917,7 +10931,7 @@ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { - "aproba": "1.2.0" + "aproba": "^1.1.1" } }, "rxjs": { @@ -10925,7 +10939,7 @@ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz", "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==", "requires": { - "tslib": "1.10.0" + "tslib": "^1.9.0" } }, "rxjs-compat": { @@ -10945,7 +10959,7 @@ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "safer-buffer": { @@ -10960,10 +10974,10 @@ "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", "dev": true, "requires": { - "glob": "7.1.3", - "lodash": "4.17.15", - "scss-tokenizer": "0.2.3", - "yargs": "7.1.0" + "glob": "^7.0.0", + "lodash": "^4.0.0", + "scss-tokenizer": "^0.2.3", + "yargs": "^7.0.0" } }, "sass-loader": { @@ -10972,11 +10986,11 @@ "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==", "dev": true, "requires": { - "clone-deep": "4.0.1", - "loader-utils": "1.2.3", - "neo-async": "2.6.1", - "pify": "4.0.1", - "semver": "6.3.0" + "clone-deep": "^4.0.1", + "loader-utils": "^1.0.1", + "neo-async": "^2.5.0", + "pify": "^4.0.1", + "semver": "^6.3.0" }, "dependencies": { "clone-deep": { @@ -10985,9 +10999,9 @@ "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, "requires": { - "is-plain-object": "2.0.4", - "kind-of": "6.0.2", - "shallow-clone": "3.0.1" + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" } }, "pify": { @@ -11008,7 +11022,7 @@ "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.2" } } } @@ -11019,7 +11033,7 @@ "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==", "dev": true, "requires": { - "https-proxy-agent": "2.2.4" + "https-proxy-agent": "^2.2.1" } }, "sax": { @@ -11039,9 +11053,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "6.9.1", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.4.1" + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" } }, "scss-tokenizer": { @@ -11050,8 +11064,8 @@ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "requires": { - "js-base64": "2.5.1", - "source-map": "0.4.4" + "js-base64": "^2.1.8", + "source-map": "^0.4.2" }, "dependencies": { "source-map": { @@ -11060,7 +11074,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -11077,10 +11091,10 @@ "integrity": "sha512-hktl3DSrhzM59yLhWzDGHIX9o56DvA+cVK7Dw6FcJR6qQ4CGzkaHeXQPcdrslkWMTeq0Ci9AmCxq0EMOvm2Rkg==", "dev": true, "requires": { - "jszip": "3.2.2", - "rimraf": "2.7.1", + "jszip": "^3.1.5", + "rimraf": "^2.6.3", "tmp": "0.0.30", - "xml2js": "0.4.22" + "xml2js": "^0.4.19" }, "dependencies": { "tmp": { @@ -11089,7 +11103,7 @@ "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.1" } } } @@ -11115,7 +11129,7 @@ "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", "dev": true, "requires": { - "semver": "5.6.0" + "semver": "^5.3.0" } }, "semver-intersect": { @@ -11124,7 +11138,7 @@ "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==", "dev": true, "requires": { - "semver": "5.6.0" + "semver": "^5.0.0" } }, "send": { @@ -11134,18 +11148,18 @@ "dev": true, "requires": { "debug": "2.6.9", - "depd": "1.1.2", - "destroy": "1.0.4", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.7.2", + "http-errors": "~1.7.2", "mime": "1.6.0", "ms": "2.1.1", - "on-finished": "2.3.0", - "range-parser": "1.2.1", - "statuses": "1.5.0" + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" }, "dependencies": { "ms": { @@ -11168,13 +11182,13 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.4", "batch": "0.6.1", "debug": "2.6.9", - "escape-html": "1.0.3", - "http-errors": "1.6.3", - "mime-types": "2.1.25", - "parseurl": "1.3.3" + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" }, "dependencies": { "http-errors": { @@ -11183,10 +11197,10 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": "1.5.0" + "statuses": ">= 1.4.0 < 2" } }, "inherits": { @@ -11209,9 +11223,9 @@ "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", "dev": true, "requires": { - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "parseurl": "1.3.3", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", "send": "0.17.1" } }, @@ -11233,10 +11247,10 @@ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -11245,7 +11259,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11268,8 +11282,8 @@ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "shallow-clone": { @@ -11278,9 +11292,9 @@ "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", "dev": true, "requires": { - "is-extendable": "0.1.1", - "kind-of": "5.1.0", - "mixin-object": "2.0.1" + "is-extendable": "^0.1.1", + "kind-of": "^5.0.0", + "mixin-object": "^2.0.1" }, "dependencies": { "kind-of": { @@ -11297,7 +11311,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -11312,9 +11326,9 @@ "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==", "dev": true, "requires": { - "glob": "7.1.3", - "interpret": "1.2.0", - "rechoir": "0.6.2" + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" } }, "signal-exit": { @@ -11341,14 +11355,14 @@ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "dev": true, "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.2", - "use": "3.1.1" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { "define-property": { @@ -11357,7 +11371,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -11366,7 +11380,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "source-map": { @@ -11383,9 +11397,9 @@ "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { @@ -11394,7 +11408,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -11403,7 +11417,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -11412,7 +11426,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -11421,9 +11435,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -11434,7 +11448,7 @@ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" }, "dependencies": { "kind-of": { @@ -11443,7 +11457,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -11454,12 +11468,12 @@ "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", "dev": true, "requires": { - "debug": "3.1.0", - "engine.io": "3.2.1", - "has-binary2": "1.0.3", - "socket.io-adapter": "1.1.2", + "debug": "~3.1.0", + "engine.io": "~3.2.0", + "has-binary2": "~1.0.2", + "socket.io-adapter": "~1.1.0", "socket.io-client": "2.1.1", - "socket.io-parser": "3.2.0" + "socket.io-parser": "~3.2.0" }, "dependencies": { "debug": { @@ -11489,15 +11503,15 @@ "base64-arraybuffer": "0.1.5", "component-bind": "1.0.0", "component-emitter": "1.2.1", - "debug": "3.1.0", - "engine.io-client": "3.2.1", - "has-binary2": "1.0.3", + "debug": "~3.1.0", + "engine.io-client": "~3.2.0", + "has-binary2": "~1.0.2", "has-cors": "1.1.0", "indexof": "0.0.1", "object-component": "0.0.3", "parseqs": "0.0.5", "parseuri": "0.0.5", - "socket.io-parser": "3.2.0", + "socket.io-parser": "~3.2.0", "to-array": "0.1.4" }, "dependencies": { @@ -11525,7 +11539,7 @@ "dev": true, "requires": { "component-emitter": "1.2.1", - "debug": "3.1.0", + "debug": "~3.1.0", "isarray": "2.0.1" }, "dependencies": { @@ -11558,8 +11572,8 @@ "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", "dev": true, "requires": { - "faye-websocket": "0.10.0", - "uuid": "3.3.3" + "faye-websocket": "^0.10.0", + "uuid": "^3.0.1" } }, "sockjs-client": { @@ -11568,12 +11582,12 @@ "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==", "dev": true, "requires": { - "debug": "3.2.6", - "eventsource": "1.0.7", - "faye-websocket": "0.11.3", - "inherits": "2.0.4", - "json3": "3.3.3", - "url-parse": "1.4.7" + "debug": "^3.2.5", + "eventsource": "^1.0.7", + "faye-websocket": "~0.11.1", + "inherits": "^2.0.3", + "json3": "^3.3.2", + "url-parse": "^1.4.3" }, "dependencies": { "debug": { @@ -11582,7 +11596,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "faye-websocket": { @@ -11591,7 +11605,7 @@ "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", "dev": true, "requires": { - "websocket-driver": "0.7.3" + "websocket-driver": ">=0.5.1" } }, "ms": { @@ -11609,7 +11623,7 @@ "dev": true, "requires": { "ip": "1.1.5", - "smart-buffer": "4.1.0" + "smart-buffer": "^4.1.0" } }, "socks-proxy-agent": { @@ -11618,8 +11632,8 @@ "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==", "dev": true, "requires": { - "agent-base": "4.2.1", - "socks": "2.3.3" + "agent-base": "~4.2.1", + "socks": "~2.3.2" }, "dependencies": { "agent-base": { @@ -11628,7 +11642,7 @@ "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", "dev": true, "requires": { - "es6-promisify": "5.0.0" + "es6-promisify": "^5.0.0" } } } @@ -11651,8 +11665,8 @@ "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==", "dev": true, "requires": { - "async": "2.6.3", - "loader-utils": "1.2.3" + "async": "^2.5.0", + "loader-utils": "^1.1.0" } }, "source-map-resolve": { @@ -11661,11 +11675,11 @@ "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "dev": true, "requires": { - "atob": "2.1.2", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-support": { @@ -11674,8 +11688,8 @@ "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", "dev": true, "requires": { - "buffer-from": "1.1.1", - "source-map": "0.6.1" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" }, "dependencies": { "source-map": { @@ -11710,8 +11724,8 @@ "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.5" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -11726,8 +11740,8 @@ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "dev": true, "requires": { - "spdx-exceptions": "2.2.0", - "spdx-license-ids": "3.0.5" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -11742,11 +11756,11 @@ "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==", "dev": true, "requires": { - "debug": "4.1.1", - "handle-thing": "2.0.0", - "http-deceiver": "1.2.7", - "select-hose": "2.0.0", - "spdy-transport": "3.0.0" + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" }, "dependencies": { "debug": { @@ -11755,7 +11769,7 @@ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "ms": { @@ -11772,12 +11786,12 @@ "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, "requires": { - "debug": "4.1.1", - "detect-node": "2.0.4", - "hpack.js": "2.1.6", - "obuf": "1.1.2", - "readable-stream": "3.4.0", - "wbuf": "1.7.3" + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.3" }, "dependencies": { "debug": { @@ -11786,7 +11800,7 @@ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "ms": { @@ -11801,9 +11815,9 @@ "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", "dev": true, "requires": { - "inherits": "2.0.4", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } } } @@ -11814,7 +11828,7 @@ "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==", "dev": true, "requires": { - "chalk": "2.4.2" + "chalk": "^2.0.1" } }, "split-string": { @@ -11823,7 +11837,7 @@ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dev": true, "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" } }, "sprintf-js": { @@ -11838,15 +11852,15 @@ "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", "dev": true, "requires": { - "asn1": "0.2.4", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.2", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.2", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "safer-buffer": "2.1.2", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" } }, "ssri": { @@ -11855,7 +11869,7 @@ "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.1.1" } }, "static-extend": { @@ -11864,8 +11878,8 @@ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { @@ -11874,7 +11888,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -11885,7 +11899,7 @@ "integrity": "sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==", "dev": true, "requires": { - "lodash": "4.17.15" + "lodash": "^4.17.4" } }, "statuses": { @@ -11900,7 +11914,7 @@ "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", "dev": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.1" } }, "stream-browserify": { @@ -11909,8 +11923,8 @@ "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "dev": true, "requires": { - "inherits": "2.0.4", - "readable-stream": "2.3.6" + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" } }, "stream-each": { @@ -11919,8 +11933,8 @@ "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "stream-shift": "1.0.0" + "end-of-stream": "^1.1.0", + "stream-shift": "^1.0.0" } }, "stream-http": { @@ -11929,11 +11943,11 @@ "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", "dev": true, "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.4", - "readable-stream": "2.3.6", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.2" + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.3.6", + "to-arraybuffer": "^1.0.0", + "xtend": "^4.0.0" } }, "stream-shift": { @@ -11948,11 +11962,11 @@ "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==", "dev": true, "requires": { - "async": "2.6.3", - "date-format": "2.1.0", - "debug": "3.2.6", - "fs-extra": "7.0.1", - "lodash": "4.17.15" + "async": "^2.6.2", + "date-format": "^2.0.0", + "debug": "^3.2.6", + "fs-extra": "^7.0.1", + "lodash": "^4.17.14" }, "dependencies": { "debug": { @@ -11961,7 +11975,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "ms": { @@ -11978,9 +11992,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string.prototype.trimleft": { @@ -11989,8 +12003,8 @@ "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==", "dev": true, "requires": { - "define-properties": "1.1.3", - "function-bind": "1.1.1" + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" } }, "string.prototype.trimright": { @@ -11999,8 +12013,8 @@ "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==", "dev": true, "requires": { - "define-properties": "1.1.3", - "function-bind": "1.1.1" + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" } }, "string_decoder": { @@ -12009,7 +12023,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "stringify-object": { @@ -12018,9 +12032,9 @@ "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", "dev": true, "requires": { - "get-own-enumerable-property-symbols": "3.0.1", - "is-obj": "1.0.1", - "is-regexp": "1.0.0" + "get-own-enumerable-property-symbols": "^3.0.0", + "is-obj": "^1.0.1", + "is-regexp": "^1.0.0" } }, "strip-ansi": { @@ -12029,7 +12043,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -12038,7 +12052,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-comments": { @@ -12047,8 +12061,8 @@ "integrity": "sha512-kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw==", "dev": true, "requires": { - "babel-extract-comments": "1.0.0", - "babel-plugin-transform-object-rest-spread": "6.26.0" + "babel-extract-comments": "^1.0.0", + "babel-plugin-transform-object-rest-spread": "^6.26.0" } }, "strip-eof": { @@ -12063,7 +12077,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "style-loader": { @@ -12072,8 +12086,8 @@ "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==", "dev": true, "requires": { - "loader-utils": "1.2.3", - "schema-utils": "1.0.0" + "loader-utils": "^1.1.0", + "schema-utils": "^1.0.0" } }, "stylus": { @@ -12082,12 +12096,12 @@ "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", "dev": true, "requires": { - "css-parse": "1.7.0", - "debug": "2.6.9", - "glob": "7.0.6", - "mkdirp": "0.5.1", - "sax": "0.5.8", - "source-map": "0.1.43" + "css-parse": "1.7.x", + "debug": "*", + "glob": "7.0.x", + "mkdirp": "0.5.x", + "sax": "0.5.x", + "source-map": "0.1.x" }, "dependencies": { "glob": { @@ -12096,12 +12110,12 @@ "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.4", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "source-map": { @@ -12110,7 +12124,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -12121,9 +12135,9 @@ "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", "dev": true, "requires": { - "loader-utils": "1.2.3", - "lodash.clonedeep": "4.5.0", - "when": "3.6.4" + "loader-utils": "^1.0.2", + "lodash.clonedeep": "^4.5.0", + "when": "~3.6.x" } }, "supports-color": { @@ -12132,7 +12146,7 @@ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "symbol-observable": { @@ -12152,9 +12166,9 @@ "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", "dev": true, "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.12", - "inherits": "2.0.4" + "block-stream": "*", + "fstream": "^1.0.12", + "inherits": "2" } }, "terser": { @@ -12163,9 +12177,9 @@ "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", "dev": true, "requires": { - "commander": "2.20.3", - "source-map": "0.6.1", - "source-map-support": "0.5.10" + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" }, "dependencies": { "source-map": { @@ -12182,14 +12196,14 @@ "integrity": "sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==", "dev": true, "requires": { - "cacache": "11.3.3", - "find-cache-dir": "2.1.0", - "schema-utils": "1.0.0", - "serialize-javascript": "1.9.1", - "source-map": "0.6.1", - "terser": "3.17.0", - "webpack-sources": "1.3.0", - "worker-farm": "1.7.0" + "cacache": "^11.0.2", + "find-cache-dir": "^2.0.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^1.4.0", + "source-map": "^0.6.1", + "terser": "^3.16.1", + "webpack-sources": "^1.1.0", + "worker-farm": "^1.5.2" }, "dependencies": { "cacache": { @@ -12198,20 +12212,20 @@ "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", "dev": true, "requires": { - "bluebird": "3.7.1", - "chownr": "1.1.3", - "figgy-pudding": "3.5.1", - "glob": "7.1.6", - "graceful-fs": "4.2.3", - "lru-cache": "5.1.1", - "mississippi": "3.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.7.1", - "ssri": "6.0.1", - "unique-filename": "1.1.1", - "y18n": "4.0.0" + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" } }, "find-cache-dir": { @@ -12220,9 +12234,9 @@ "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "2.1.0", - "pkg-dir": "3.0.0" + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" } }, "find-up": { @@ -12231,7 +12245,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "glob": { @@ -12240,12 +12254,12 @@ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.4", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "locate-path": { @@ -12254,8 +12268,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "lru-cache": { @@ -12264,7 +12278,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "3.1.1" + "yallist": "^3.0.2" } }, "make-dir": { @@ -12273,8 +12287,8 @@ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, "requires": { - "pify": "4.0.1", - "semver": "5.6.0" + "pify": "^4.0.1", + "semver": "^5.6.0" } }, "mississippi": { @@ -12283,16 +12297,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.7.1", - "end-of-stream": "1.4.4", - "flush-write-stream": "1.1.1", - "from2": "2.3.0", - "parallel-transform": "1.2.0", - "pump": "3.0.0", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.5" + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" } }, "p-limit": { @@ -12301,7 +12315,7 @@ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -12310,7 +12324,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.2.1" + "p-limit": "^2.0.0" } }, "p-try": { @@ -12331,7 +12345,7 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "3.0.0" + "find-up": "^3.0.0" } }, "pump": { @@ -12340,8 +12354,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "source-map": { @@ -12356,7 +12370,7 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "3.5.1" + "figgy-pudding": "^3.5.1" } }, "yallist": { @@ -12379,8 +12393,8 @@ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.2" + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" } }, "thunky": { @@ -12395,7 +12409,7 @@ "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", "dev": true, "requires": { - "setimmediate": "1.0.5" + "setimmediate": "^1.0.4" } }, "tiny-svg": { @@ -12409,7 +12423,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.2" } }, "to-array": { @@ -12436,7 +12450,7 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -12445,7 +12459,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -12456,10 +12470,10 @@ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "dev": true, "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { @@ -12468,8 +12482,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "to-string-loader": { @@ -12478,7 +12492,7 @@ "integrity": "sha512-VNg62//PS1WfNwrK3n7t6wtK5Vdtx/qeYLLEioW46VMlYUwAYT6wnfB+OwS2FMTCalIHu0tk79D3RXX8ttmZTQ==", "dev": true, "requires": { - "loader-utils": "1.2.3" + "loader-utils": "^1.0.0" } }, "toidentifier": { @@ -12499,8 +12513,8 @@ "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", "dev": true, "requires": { - "psl": "1.4.0", - "punycode": "1.4.1" + "psl": "^1.1.24", + "punycode": "^1.4.1" }, "dependencies": { "punycode": { @@ -12535,7 +12549,7 @@ "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", "dev": true, "requires": { - "glob": "7.1.3" + "glob": "^7.1.2" } }, "tryer": { @@ -12550,11 +12564,11 @@ "integrity": "sha512-nd+mdxDP2BjQlyumBCMSU3IQLEjSla1X3uSzDfQ4M5OEZ3iDC01gjhs0FX29jyolATwLKB7YoRJ1Asbxd9EEoA==", "dev": true, "requires": { - "arg": "4.1.2", - "diff": "4.0.1", - "make-error": "1.3.5", - "source-map-support": "0.5.10", - "yn": "3.1.1" + "arg": "^4.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "source-map-support": "^0.5.6", + "yn": "^3.0.0" } }, "tslib": { @@ -12568,19 +12582,19 @@ "integrity": "sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==", "dev": true, "requires": { - "@babel/code-frame": "7.5.5", - "builtin-modules": "1.1.1", - "chalk": "2.4.2", - "commander": "2.20.3", - "diff": "3.5.0", - "glob": "7.1.3", - "js-yaml": "3.13.1", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "resolve": "1.13.1", - "semver": "5.6.0", - "tslib": "1.10.0", - "tsutils": "2.29.0" + "@babel/code-frame": "^7.0.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^3.2.0", + "glob": "^7.1.1", + "js-yaml": "^3.13.0", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.29.0" }, "dependencies": { "diff": { @@ -12597,11 +12611,11 @@ "integrity": "sha512-jBHNNppXut6SgZ7CsTBh+6oMwVum9n8azbmcYSeMlsABhWWoHwjq631vIFXef3VSd75cCdX3rc6kstsB7rSVVw==", "dev": true, "requires": { - "loader-utils": "1.2.3", - "mkdirp": "0.5.1", - "object-assign": "4.1.1", - "rimraf": "2.7.1", - "semver": "5.6.0" + "loader-utils": "^1.0.2", + "mkdirp": "^0.5.1", + "object-assign": "^4.1.1", + "rimraf": "^2.4.4", + "semver": "^5.3.0" } }, "tsutils": { @@ -12610,7 +12624,7 @@ "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", "dev": true, "requires": { - "tslib": "1.10.0" + "tslib": "^1.8.1" } }, "tty-browserify": { @@ -12625,7 +12639,7 @@ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -12647,7 +12661,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.25" + "mime-types": "~2.1.24" } }, "typedarray": { @@ -12668,8 +12682,8 @@ "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==", "dev": true, "requires": { - "commander": "2.19.0", - "source-map": "0.6.1" + "commander": "~2.19.0", + "source-map": "~0.6.1" }, "dependencies": { "commander": { @@ -12692,15 +12706,15 @@ "integrity": "sha512-mHSkufBmBuJ+KHQhv5H0MXijtsoA1lynJt1lXOaotja8/I0pR4L9oGaPIZw+bQBOFittXZg9OC1sXSGO9D9ZYg==", "dev": true, "requires": { - "cacache": "12.0.3", - "find-cache-dir": "2.1.0", - "is-wsl": "1.1.0", - "schema-utils": "1.0.0", - "serialize-javascript": "1.9.1", - "source-map": "0.6.1", - "uglify-js": "3.7.0", - "webpack-sources": "1.4.3", - "worker-farm": "1.7.0" + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", + "is-wsl": "^1.1.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^1.7.0", + "source-map": "^0.6.1", + "uglify-js": "^3.6.0", + "webpack-sources": "^1.4.0", + "worker-farm": "^1.7.0" }, "dependencies": { "cacache": { @@ -12709,21 +12723,21 @@ "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", "dev": true, "requires": { - "bluebird": "3.7.1", - "chownr": "1.1.3", - "figgy-pudding": "3.5.1", - "glob": "7.1.6", - "graceful-fs": "4.2.3", - "infer-owner": "1.0.4", - "lru-cache": "5.1.1", - "mississippi": "3.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.7.1", - "ssri": "6.0.1", - "unique-filename": "1.1.1", - "y18n": "4.0.0" + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" } }, "find-cache-dir": { @@ -12732,9 +12746,9 @@ "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "2.1.0", - "pkg-dir": "3.0.0" + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" } }, "find-up": { @@ -12743,7 +12757,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "glob": { @@ -12752,12 +12766,12 @@ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.4", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "locate-path": { @@ -12766,8 +12780,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "lru-cache": { @@ -12776,7 +12790,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "3.1.1" + "yallist": "^3.0.2" } }, "make-dir": { @@ -12785,8 +12799,8 @@ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, "requires": { - "pify": "4.0.1", - "semver": "5.6.0" + "pify": "^4.0.1", + "semver": "^5.6.0" } }, "mississippi": { @@ -12795,16 +12809,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.7.1", - "end-of-stream": "1.4.4", - "flush-write-stream": "1.1.1", - "from2": "2.3.0", - "parallel-transform": "1.2.0", - "pump": "3.0.0", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.5" + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" } }, "p-limit": { @@ -12813,7 +12827,7 @@ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -12822,7 +12836,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.2.1" + "p-limit": "^2.0.0" } }, "p-try": { @@ -12843,7 +12857,7 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "3.0.0" + "find-up": "^3.0.0" } }, "pump": { @@ -12852,8 +12866,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "source-map": { @@ -12868,7 +12882,7 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "3.5.1" + "figgy-pudding": "^3.5.1" } }, "uglify-js": { @@ -12877,8 +12891,8 @@ "integrity": "sha512-PC/ee458NEMITe1OufAjal65i6lB58R1HWMRcxwvdz1UopW0DYqlRL3xdu3IcTvTXsB02CRHykidkTRL+A3hQA==", "dev": true, "requires": { - "commander": "2.20.3", - "source-map": "0.6.1" + "commander": "~2.20.3", + "source-map": "~0.6.1" } }, "webpack-sources": { @@ -12887,8 +12901,8 @@ "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", "dev": true, "requires": { - "source-list-map": "2.0.1", - "source-map": "0.6.1" + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" } }, "yallist": { @@ -12911,10 +12925,10 @@ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "2.0.1" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^2.0.1" } }, "uniq": { @@ -12929,7 +12943,7 @@ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "dev": true, "requires": { - "unique-slug": "2.0.2" + "unique-slug": "^2.0.0" } }, "unique-slug": { @@ -12938,7 +12952,7 @@ "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", "dev": true, "requires": { - "imurmurhash": "0.1.4" + "imurmurhash": "^0.1.4" } }, "universalify": { @@ -12959,8 +12973,8 @@ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { @@ -12969,9 +12983,9 @@ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { @@ -13011,7 +13025,7 @@ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "dev": true, "requires": { - "punycode": "2.1.1" + "punycode": "^2.1.0" } }, "urix": { @@ -13050,9 +13064,9 @@ "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==", "dev": true, "requires": { - "loader-utils": "1.2.3", - "mime": "2.4.4", - "schema-utils": "1.0.0" + "loader-utils": "^1.1.0", + "mime": "^2.0.3", + "schema-utils": "^1.0.0" }, "dependencies": { "mime": { @@ -13069,8 +13083,8 @@ "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", "dev": true, "requires": { - "querystringify": "2.1.1", - "requires-port": "1.0.0" + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" } }, "use": { @@ -13085,8 +13099,8 @@ "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", "dev": true, "requires": { - "lru-cache": "4.1.5", - "tmp": "0.0.33" + "lru-cache": "4.1.x", + "tmp": "0.0.x" } }, "util": { @@ -13118,8 +13132,8 @@ "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", "dev": true, "requires": { - "define-properties": "1.1.3", - "object.getownpropertydescriptors": "2.0.3" + "define-properties": "^1.1.2", + "object.getownpropertydescriptors": "^2.0.3" } }, "utila": { @@ -13152,8 +13166,8 @@ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, "requires": { - "spdx-correct": "3.1.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "validate-npm-package-name": { @@ -13162,7 +13176,7 @@ "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", "dev": true, "requires": { - "builtins": "1.0.3" + "builtins": "^1.0.3" } }, "vary": { @@ -13177,9 +13191,9 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "vm-browserify": { @@ -13200,9 +13214,9 @@ "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", "dev": true, "requires": { - "chokidar": "2.0.4", - "graceful-fs": "4.2.3", - "neo-async": "2.6.1" + "chokidar": "^2.0.2", + "graceful-fs": "^4.1.2", + "neo-async": "^2.5.0" } }, "wbuf": { @@ -13211,7 +13225,7 @@ "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, "requires": { - "minimalistic-assert": "1.0.1" + "minimalistic-assert": "^1.0.0" } }, "webpack": { @@ -13224,25 +13238,25 @@ "@webassemblyjs/helper-module-context": "1.8.5", "@webassemblyjs/wasm-edit": "1.8.5", "@webassemblyjs/wasm-parser": "1.8.5", - "acorn": "6.4.0", - "ajv": "6.10.2", - "ajv-keywords": "3.4.1", - "chrome-trace-event": "1.0.2", - "enhanced-resolve": "4.1.0", - "eslint-scope": "4.0.3", - "json-parse-better-errors": "1.0.2", - "loader-runner": "2.4.0", - "loader-utils": "1.2.3", - "memory-fs": "0.4.1", - "micromatch": "3.1.10", - "mkdirp": "0.5.1", - "neo-async": "2.6.1", - "node-libs-browser": "2.2.1", - "schema-utils": "1.0.0", - "tapable": "1.1.3", - "terser-webpack-plugin": "1.4.1", - "watchpack": "1.6.0", - "webpack-sources": "1.4.3" + "acorn": "^6.2.1", + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^4.1.0", + "eslint-scope": "^4.0.3", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^2.4.0", + "loader-utils": "^1.2.3", + "memory-fs": "^0.4.1", + "micromatch": "^3.1.10", + "mkdirp": "^0.5.1", + "neo-async": "^2.6.1", + "node-libs-browser": "^2.2.1", + "schema-utils": "^1.0.0", + "tapable": "^1.1.3", + "terser-webpack-plugin": "^1.4.1", + "watchpack": "^1.6.0", + "webpack-sources": "^1.4.1" }, "dependencies": { "@webassemblyjs/ast": { @@ -13296,7 +13310,7 @@ "dev": true, "requires": { "@webassemblyjs/ast": "1.8.5", - "mamacro": "0.0.3" + "mamacro": "^0.0.3" } }, "@webassemblyjs/helper-wasm-bytecode": { @@ -13323,7 +13337,7 @@ "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", "dev": true, "requires": { - "@xtuc/ieee754": "1.2.0" + "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { @@ -13433,10 +13447,10 @@ "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", "dev": true, "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" } }, "cacache": { @@ -13445,21 +13459,21 @@ "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", "dev": true, "requires": { - "bluebird": "3.7.1", - "chownr": "1.1.3", - "figgy-pudding": "3.5.1", - "glob": "7.1.6", - "graceful-fs": "4.2.3", - "infer-owner": "1.0.4", - "lru-cache": "5.1.1", - "mississippi": "3.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.7.1", - "ssri": "6.0.1", - "unique-filename": "1.1.1", - "y18n": "4.0.0" + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" } }, "find-cache-dir": { @@ -13468,9 +13482,9 @@ "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "2.1.0", - "pkg-dir": "3.0.0" + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" } }, "find-up": { @@ -13479,7 +13493,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "glob": { @@ -13488,12 +13502,12 @@ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.4", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "locate-path": { @@ -13502,8 +13516,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "lru-cache": { @@ -13512,7 +13526,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "3.1.1" + "yallist": "^3.0.2" } }, "make-dir": { @@ -13521,8 +13535,8 @@ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, "requires": { - "pify": "4.0.1", - "semver": "5.6.0" + "pify": "^4.0.1", + "semver": "^5.6.0" } }, "mississippi": { @@ -13531,16 +13545,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.7.1", - "end-of-stream": "1.4.4", - "flush-write-stream": "1.1.1", - "from2": "2.3.0", - "parallel-transform": "1.2.0", - "pump": "3.0.0", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.5" + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" } }, "p-limit": { @@ -13549,7 +13563,7 @@ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -13558,7 +13572,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.2.1" + "p-limit": "^2.0.0" } }, "p-try": { @@ -13579,7 +13593,7 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "3.0.0" + "find-up": "^3.0.0" } }, "pump": { @@ -13588,8 +13602,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "source-map": { @@ -13604,8 +13618,8 @@ "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==", "dev": true, "requires": { - "buffer-from": "1.1.1", - "source-map": "0.6.1" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" } }, "ssri": { @@ -13614,7 +13628,7 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "3.5.1" + "figgy-pudding": "^3.5.1" } }, "terser": { @@ -13623,9 +13637,9 @@ "integrity": "sha512-oDG16n2WKm27JO8h4y/w3iqBGAOSCtq7k8dRmrn4Wf9NouL0b2WpMHGChFGZq4nFAQy1FsNJrVQHfurXOSTmOA==", "dev": true, "requires": { - "commander": "2.20.3", - "source-map": "0.6.1", - "source-map-support": "0.5.16" + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" } }, "terser-webpack-plugin": { @@ -13634,15 +13648,15 @@ "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==", "dev": true, "requires": { - "cacache": "12.0.3", - "find-cache-dir": "2.1.0", - "is-wsl": "1.1.0", - "schema-utils": "1.0.0", - "serialize-javascript": "1.9.1", - "source-map": "0.6.1", - "terser": "4.4.0", - "webpack-sources": "1.4.3", - "worker-farm": "1.7.0" + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", + "is-wsl": "^1.1.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^1.7.0", + "source-map": "^0.6.1", + "terser": "^4.1.2", + "webpack-sources": "^1.4.0", + "worker-farm": "^1.7.0" } }, "webpack-sources": { @@ -13651,8 +13665,8 @@ "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", "dev": true, "requires": { - "source-list-map": "2.0.1", - "source-map": "0.6.1" + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" } }, "yallist": { @@ -13669,19 +13683,19 @@ "integrity": "sha512-orUfvVYEfBMDXgEKAKVvab5iQ2wXneIEorGNsyuOyVYpjYrI7CUOhhXNDd3huMwQ3vNNWWlGP+hzflMFYNzi2g==", "dev": true, "requires": { - "acorn": "6.4.0", - "acorn-walk": "6.2.0", - "bfj": "6.1.2", - "chalk": "2.4.2", - "commander": "2.20.3", - "ejs": "2.7.4", - "express": "4.17.1", - "filesize": "3.6.1", - "gzip-size": "5.1.1", - "lodash": "4.17.15", - "mkdirp": "0.5.1", - "opener": "1.5.1", - "ws": "6.2.1" + "acorn": "^6.0.7", + "acorn-walk": "^6.1.1", + "bfj": "^6.1.1", + "chalk": "^2.4.1", + "commander": "^2.18.0", + "ejs": "^2.6.1", + "express": "^4.16.3", + "filesize": "^3.6.1", + "gzip-size": "^5.0.0", + "lodash": "^4.17.15", + "mkdirp": "^0.5.1", + "opener": "^1.5.1", + "ws": "^6.0.0" }, "dependencies": { "ws": { @@ -13690,7 +13704,7 @@ "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", "dev": true, "requires": { - "async-limiter": "1.0.1" + "async-limiter": "~1.0.0" } } } @@ -13701,17 +13715,17 @@ "integrity": "sha512-c2inFU7SM0IttEgF7fK6AaUsbBnORRzminvbyRKS+NlbQHVZdCtzKBlavRL5359bFsywXGRAItA5di/IruC8mg==", "dev": true, "requires": { - "chalk": "2.4.2", - "cross-spawn": "6.0.5", - "enhanced-resolve": "4.1.0", - "findup-sync": "2.0.0", - "global-modules": "1.0.0", - "import-local": "2.0.0", - "interpret": "1.2.0", - "loader-utils": "1.2.3", - "supports-color": "5.5.0", - "v8-compile-cache": "2.1.0", - "yargs": "12.0.5" + "chalk": "^2.4.1", + "cross-spawn": "^6.0.5", + "enhanced-resolve": "^4.1.0", + "findup-sync": "^2.0.0", + "global-modules": "^1.0.0", + "import-local": "^2.0.0", + "interpret": "^1.1.0", + "loader-utils": "^1.1.0", + "supports-color": "^5.5.0", + "v8-compile-cache": "^2.0.2", + "yargs": "^12.0.5" }, "dependencies": { "ansi-regex": { @@ -13732,9 +13746,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "cross-spawn": { @@ -13743,11 +13757,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.6.0", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "execa": { @@ -13756,13 +13770,13 @@ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "6.0.5", - "get-stream": "4.1.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "find-up": { @@ -13771,7 +13785,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "get-stream": { @@ -13780,7 +13794,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "3.0.0" + "pump": "^3.0.0" } }, "invert-kv": { @@ -13801,7 +13815,7 @@ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { - "invert-kv": "2.0.0" + "invert-kv": "^2.0.0" } }, "locate-path": { @@ -13810,8 +13824,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "os-locale": { @@ -13820,9 +13834,9 @@ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { - "execa": "1.0.0", - "lcid": "2.0.0", - "mem": "4.3.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, "p-limit": { @@ -13831,7 +13845,7 @@ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -13840,7 +13854,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.2.1" + "p-limit": "^2.0.0" } }, "p-try": { @@ -13855,8 +13869,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "string-width": { @@ -13865,8 +13879,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -13875,7 +13889,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "supports-color": { @@ -13884,7 +13898,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "which-module": { @@ -13899,18 +13913,18 @@ "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "3.0.0", - "get-caller-file": "1.0.3", - "os-locale": "3.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "11.1.1" + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" } }, "yargs-parser": { @@ -13919,8 +13933,8 @@ "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", "dev": true, "requires": { - "camelcase": "5.3.1", - "decamelize": "1.2.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } @@ -13931,8 +13945,8 @@ "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", "dev": true, "requires": { - "source-list-map": "0.1.8", - "source-map": "0.4.4" + "source-list-map": "~0.1.7", + "source-map": "~0.4.1" }, "dependencies": { "source-list-map": { @@ -13947,7 +13961,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -13958,10 +13972,10 @@ "integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==", "dev": true, "requires": { - "memory-fs": "0.4.1", - "mime": "2.4.4", - "range-parser": "1.2.1", - "webpack-log": "2.0.0" + "memory-fs": "~0.4.1", + "mime": "^2.3.1", + "range-parser": "^1.0.3", + "webpack-log": "^2.0.0" }, "dependencies": { "mime": { @@ -13979,37 +13993,37 @@ "dev": true, "requires": { "ansi-html": "0.0.7", - "bonjour": "3.5.0", - "chokidar": "2.1.8", - "compression": "1.7.4", - "connect-history-api-fallback": "1.6.0", - "debug": "4.1.1", - "del": "4.1.1", - "express": "4.17.1", - "html-entities": "1.2.1", + "bonjour": "^3.5.0", + "chokidar": "^2.1.8", + "compression": "^1.7.4", + "connect-history-api-fallback": "^1.6.0", + "debug": "^4.1.1", + "del": "^4.1.1", + "express": "^4.17.1", + "html-entities": "^1.2.1", "http-proxy-middleware": "0.19.1", - "import-local": "2.0.0", - "internal-ip": "4.3.0", - "ip": "1.1.5", - "is-absolute-url": "3.0.3", - "killable": "1.0.1", - "loglevel": "1.6.6", - "opn": "5.5.0", - "p-retry": "3.0.1", - "portfinder": "1.0.25", - "schema-utils": "1.0.0", - "selfsigned": "1.10.7", - "semver": "6.3.0", - "serve-index": "1.9.1", + "import-local": "^2.0.0", + "internal-ip": "^4.3.0", + "ip": "^1.1.5", + "is-absolute-url": "^3.0.3", + "killable": "^1.0.1", + "loglevel": "^1.6.4", + "opn": "^5.5.0", + "p-retry": "^3.0.1", + "portfinder": "^1.0.25", + "schema-utils": "^1.0.0", + "selfsigned": "^1.10.7", + "semver": "^6.3.0", + "serve-index": "^1.9.1", "sockjs": "0.3.19", "sockjs-client": "1.4.0", - "spdy": "4.0.1", - "strip-ansi": "3.0.1", - "supports-color": "6.1.0", - "url": "0.11.0", - "webpack-dev-middleware": "3.7.2", - "webpack-log": "2.0.0", - "ws": "6.2.1", + "spdy": "^4.0.1", + "strip-ansi": "^3.0.1", + "supports-color": "^6.1.0", + "url": "^0.11.0", + "webpack-dev-middleware": "^3.7.2", + "webpack-log": "^2.0.0", + "ws": "^6.2.1", "yargs": "12.0.5" }, "dependencies": { @@ -14031,18 +14045,18 @@ "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", "dev": true, "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.3", - "braces": "2.3.2", - "fsevents": "1.2.9", - "glob-parent": "3.1.0", - "inherits": "2.0.4", - "is-binary-path": "1.0.1", - "is-glob": "4.0.1", - "normalize-path": "3.0.0", - "path-is-absolute": "1.0.1", - "readdirp": "2.2.1", - "upath": "1.2.0" + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" } }, "cliui": { @@ -14051,9 +14065,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" }, "dependencies": { "strip-ansi": { @@ -14062,7 +14076,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -14073,11 +14087,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.7.1", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" }, "dependencies": { "semver": { @@ -14094,7 +14108,7 @@ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "default-gateway": { @@ -14103,8 +14117,8 @@ "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", "dev": true, "requires": { - "execa": "1.0.0", - "ip-regex": "2.1.0" + "execa": "^1.0.0", + "ip-regex": "^2.1.0" } }, "del": { @@ -14113,13 +14127,13 @@ "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", "dev": true, "requires": { - "@types/glob": "7.1.1", - "globby": "6.1.0", - "is-path-cwd": "2.2.0", - "is-path-in-cwd": "2.1.0", - "p-map": "2.1.0", - "pify": "4.0.1", - "rimraf": "2.7.1" + "@types/glob": "^7.1.1", + "globby": "^6.1.0", + "is-path-cwd": "^2.0.0", + "is-path-in-cwd": "^2.0.0", + "p-map": "^2.0.0", + "pify": "^4.0.1", + "rimraf": "^2.6.3" } }, "execa": { @@ -14128,13 +14142,13 @@ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "6.0.5", - "get-stream": "4.1.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "faye-websocket": { @@ -14143,7 +14157,7 @@ "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", "dev": true, "requires": { - "websocket-driver": "0.7.3" + "websocket-driver": ">=0.5.1" } }, "find-up": { @@ -14152,7 +14166,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "get-stream": { @@ -14161,7 +14175,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "3.0.0" + "pump": "^3.0.0" } }, "globby": { @@ -14170,11 +14184,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.3", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" }, "dependencies": { "pify": { @@ -14191,10 +14205,10 @@ "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", "dev": true, "requires": { - "http-proxy": "1.18.0", - "is-glob": "4.0.1", - "lodash": "4.17.15", - "micromatch": "3.1.10" + "http-proxy": "^1.17.0", + "is-glob": "^4.0.0", + "lodash": "^4.17.11", + "micromatch": "^3.1.10" } }, "internal-ip": { @@ -14203,8 +14217,8 @@ "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==", "dev": true, "requires": { - "default-gateway": "4.2.0", - "ipaddr.js": "1.9.0" + "default-gateway": "^4.2.0", + "ipaddr.js": "^1.9.0" } }, "invert-kv": { @@ -14231,7 +14245,7 @@ "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", "dev": true, "requires": { - "is-path-inside": "2.1.0" + "is-path-inside": "^2.1.0" } }, "is-path-inside": { @@ -14240,7 +14254,7 @@ "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.2" } }, "lcid": { @@ -14249,7 +14263,7 @@ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { - "invert-kv": "2.0.0" + "invert-kv": "^2.0.0" } }, "locate-path": { @@ -14258,8 +14272,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "mime": { @@ -14286,9 +14300,9 @@ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { - "execa": "1.0.0", - "lcid": "2.0.0", - "mem": "4.3.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, "p-limit": { @@ -14297,7 +14311,7 @@ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -14306,7 +14320,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.2.1" + "p-limit": "^2.0.0" } }, "p-map": { @@ -14333,8 +14347,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "semver": { @@ -14349,12 +14363,12 @@ "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", "dev": true, "requires": { - "debug": "3.2.6", - "eventsource": "1.0.7", - "faye-websocket": "0.11.3", - "inherits": "2.0.4", - "json3": "3.3.3", - "url-parse": "1.4.7" + "debug": "^3.2.5", + "eventsource": "^1.0.7", + "faye-websocket": "~0.11.1", + "inherits": "^2.0.3", + "json3": "^3.3.2", + "url-parse": "^1.4.3" }, "dependencies": { "debug": { @@ -14363,7 +14377,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } } } @@ -14374,8 +14388,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "strip-ansi": { @@ -14384,7 +14398,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -14395,11 +14409,11 @@ "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==", "dev": true, "requires": { - "memory-fs": "0.4.1", - "mime": "2.4.4", - "mkdirp": "0.5.1", - "range-parser": "1.2.1", - "webpack-log": "2.0.0" + "memory-fs": "^0.4.1", + "mime": "^2.4.4", + "mkdirp": "^0.5.1", + "range-parser": "^1.2.1", + "webpack-log": "^2.0.0" } }, "which-module": { @@ -14414,7 +14428,7 @@ "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", "dev": true, "requires": { - "async-limiter": "1.0.1" + "async-limiter": "~1.0.0" } }, "yargs": { @@ -14423,18 +14437,18 @@ "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "3.0.0", - "get-caller-file": "1.0.3", - "os-locale": "3.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "11.1.1" + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" } }, "yargs-parser": { @@ -14443,8 +14457,8 @@ "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", "dev": true, "requires": { - "camelcase": "5.3.1", - "decamelize": "1.2.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } @@ -14461,8 +14475,8 @@ "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", "dev": true, "requires": { - "ansi-colors": "3.2.4", - "uuid": "3.3.3" + "ansi-colors": "^3.0.0", + "uuid": "^3.3.2" } }, "webpack-merge": { @@ -14471,7 +14485,7 @@ "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", "dev": true, "requires": { - "lodash": "4.17.15" + "lodash": "^4.17.5" } }, "webpack-sources": { @@ -14480,8 +14494,8 @@ "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==", "dev": true, "requires": { - "source-list-map": "2.0.1", - "source-map": "0.6.1" + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" }, "dependencies": { "source-map": { @@ -14498,7 +14512,7 @@ "integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==", "dev": true, "requires": { - "webpack-core": "0.6.9" + "webpack-core": "^0.6.8" } }, "websocket-driver": { @@ -14507,9 +14521,9 @@ "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==", "dev": true, "requires": { - "http-parser-js": "0.4.10", - "safe-buffer": "5.1.2", - "websocket-extensions": "0.1.3" + "http-parser-js": ">=0.4.0 <0.4.11", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" } }, "websocket-extensions": { @@ -14530,7 +14544,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -14545,7 +14559,7 @@ "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2 || 2" } }, "wordwrap": { @@ -14560,7 +14574,7 @@ "integrity": "sha512-1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg==", "dev": true, "requires": { - "workbox-core": "4.3.1" + "workbox-core": "^4.3.1" } }, "workbox-broadcast-update": { @@ -14569,7 +14583,7 @@ "integrity": "sha512-MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA==", "dev": true, "requires": { - "workbox-core": "4.3.1" + "workbox-core": "^4.3.1" } }, "workbox-build": { @@ -14578,29 +14592,29 @@ "integrity": "sha512-UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw==", "dev": true, "requires": { - "@babel/runtime": "7.7.4", - "@hapi/joi": "15.1.1", - "common-tags": "1.8.0", - "fs-extra": "4.0.3", - "glob": "7.1.3", - "lodash.template": "4.5.0", - "pretty-bytes": "5.3.0", - "stringify-object": "3.3.0", - "strip-comments": "1.0.2", - "workbox-background-sync": "4.3.1", - "workbox-broadcast-update": "4.3.1", - "workbox-cacheable-response": "4.3.1", - "workbox-core": "4.3.1", - "workbox-expiration": "4.3.1", - "workbox-google-analytics": "4.3.1", - "workbox-navigation-preload": "4.3.1", - "workbox-precaching": "4.3.1", - "workbox-range-requests": "4.3.1", - "workbox-routing": "4.3.1", - "workbox-strategies": "4.3.1", - "workbox-streams": "4.3.1", - "workbox-sw": "4.3.1", - "workbox-window": "4.3.1" + "@babel/runtime": "^7.3.4", + "@hapi/joi": "^15.0.0", + "common-tags": "^1.8.0", + "fs-extra": "^4.0.2", + "glob": "^7.1.3", + "lodash.template": "^4.4.0", + "pretty-bytes": "^5.1.0", + "stringify-object": "^3.3.0", + "strip-comments": "^1.0.2", + "workbox-background-sync": "^4.3.1", + "workbox-broadcast-update": "^4.3.1", + "workbox-cacheable-response": "^4.3.1", + "workbox-core": "^4.3.1", + "workbox-expiration": "^4.3.1", + "workbox-google-analytics": "^4.3.1", + "workbox-navigation-preload": "^4.3.1", + "workbox-precaching": "^4.3.1", + "workbox-range-requests": "^4.3.1", + "workbox-routing": "^4.3.1", + "workbox-strategies": "^4.3.1", + "workbox-streams": "^4.3.1", + "workbox-sw": "^4.3.1", + "workbox-window": "^4.3.1" }, "dependencies": { "fs-extra": { @@ -14609,9 +14623,9 @@ "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", "dev": true, "requires": { - "graceful-fs": "4.2.3", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } } } @@ -14622,7 +14636,7 @@ "integrity": "sha512-Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw==", "dev": true, "requires": { - "workbox-core": "4.3.1" + "workbox-core": "^4.3.1" } }, "workbox-core": { @@ -14637,7 +14651,7 @@ "integrity": "sha512-vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw==", "dev": true, "requires": { - "workbox-core": "4.3.1" + "workbox-core": "^4.3.1" } }, "workbox-google-analytics": { @@ -14646,10 +14660,10 @@ "integrity": "sha512-xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg==", "dev": true, "requires": { - "workbox-background-sync": "4.3.1", - "workbox-core": "4.3.1", - "workbox-routing": "4.3.1", - "workbox-strategies": "4.3.1" + "workbox-background-sync": "^4.3.1", + "workbox-core": "^4.3.1", + "workbox-routing": "^4.3.1", + "workbox-strategies": "^4.3.1" } }, "workbox-navigation-preload": { @@ -14658,7 +14672,7 @@ "integrity": "sha512-K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw==", "dev": true, "requires": { - "workbox-core": "4.3.1" + "workbox-core": "^4.3.1" } }, "workbox-precaching": { @@ -14667,7 +14681,7 @@ "integrity": "sha512-piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ==", "dev": true, "requires": { - "workbox-core": "4.3.1" + "workbox-core": "^4.3.1" } }, "workbox-range-requests": { @@ -14676,7 +14690,7 @@ "integrity": "sha512-S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA==", "dev": true, "requires": { - "workbox-core": "4.3.1" + "workbox-core": "^4.3.1" } }, "workbox-routing": { @@ -14685,7 +14699,7 @@ "integrity": "sha512-FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g==", "dev": true, "requires": { - "workbox-core": "4.3.1" + "workbox-core": "^4.3.1" } }, "workbox-strategies": { @@ -14694,7 +14708,7 @@ "integrity": "sha512-F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw==", "dev": true, "requires": { - "workbox-core": "4.3.1" + "workbox-core": "^4.3.1" } }, "workbox-streams": { @@ -14703,7 +14717,7 @@ "integrity": "sha512-4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA==", "dev": true, "requires": { - "workbox-core": "4.3.1" + "workbox-core": "^4.3.1" } }, "workbox-sw": { @@ -14718,9 +14732,9 @@ "integrity": "sha512-gJ9jd8Mb8wHLbRz9ZvGN57IAmknOipD3W4XNE/Lk/4lqs5Htw4WOQgakQy/o/4CoXQlMCYldaqUg+EJ35l9MEQ==", "dev": true, "requires": { - "@babel/runtime": "7.7.4", - "json-stable-stringify": "1.0.1", - "workbox-build": "4.3.1" + "@babel/runtime": "^7.0.0", + "json-stable-stringify": "^1.0.1", + "workbox-build": "^4.3.1" } }, "workbox-window": { @@ -14729,7 +14743,7 @@ "integrity": "sha512-C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg==", "dev": true, "requires": { - "workbox-core": "4.3.1" + "workbox-core": "^4.3.1" } }, "worker-farm": { @@ -14738,7 +14752,7 @@ "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", "dev": true, "requires": { - "errno": "0.1.7" + "errno": "~0.1.7" } }, "wrap-ansi": { @@ -14747,8 +14761,8 @@ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" } }, "wrappy": { @@ -14763,9 +14777,9 @@ "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", "dev": true, "requires": { - "async-limiter": "1.0.1", - "safe-buffer": "5.1.2", - "ultron": "1.1.1" + "async-limiter": "~1.0.0", + "safe-buffer": "~5.1.0", + "ultron": "~1.1.0" } }, "xml2js": { @@ -14774,9 +14788,9 @@ "integrity": "sha512-MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw==", "dev": true, "requires": { - "sax": "1.2.4", - "util.promisify": "1.0.0", - "xmlbuilder": "11.0.1" + "sax": ">=0.6.0", + "util.promisify": "~1.0.0", + "xmlbuilder": "~11.0.0" }, "dependencies": { "sax": { @@ -14829,19 +14843,19 @@ "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "dev": true, "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.3", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "5.0.0" + "camelcase": "^3.0.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.2", + "which-module": "^1.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^5.0.0" }, "dependencies": { "camelcase": { @@ -14864,7 +14878,7 @@ "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", "dev": true, "requires": { - "camelcase": "3.0.0" + "camelcase": "^3.0.0" }, "dependencies": { "camelcase": { diff --git a/src/CaseManagement.Performance/package.json b/src/CaseManagement.Performance/package.json index 9d1d3485..225f345b 100644 --- a/src/CaseManagement.Performance/package.json +++ b/src/CaseManagement.Performance/package.json @@ -7,6 +7,7 @@ "license": "ISC", "scripts": { "start": "concurrently \"webpack-dev-server --env=dev --open --hot --inline --port 8080\" \"dotnet run\" ", + "start-azure": "dotnet run --pathBase=/performance", "webpack-dev": "webpack --env=dev", "webpack-azure": "webpack --env=azure", "webpack-production": "webpack --env=prod", diff --git a/src/CaseManagement.Website/Startup.cs b/src/CaseManagement.Website/Startup.cs index 598d1211..69af552f 100644 --- a/src/CaseManagement.Website/Startup.cs +++ b/src/CaseManagement.Website/Startup.cs @@ -1,22 +1,22 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using System; -using System.Linq; +using System.IO; namespace CaseManagement.Website { public class Startup { - public Startup() { } + private readonly IConfiguration _configuration; - public IConfigurationRoot Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. + public Startup(IConfiguration configuration) + { + _configuration = configuration; + } + public void ConfigureServices(IServiceCollection services) { services.AddCors(options => @@ -31,44 +31,41 @@ public void ConfigureServices(IServiceCollection services) }); }); - // Add framework services. services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2); - services.Configure(options => - { - options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto; - }); } - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IHostingEnvironment env) { - app.UseForwardedHeaders(); - var angularRoutes = new[] { - "/home", - "/about", - "/casedefinitions", - "/caseinstances", - "/performances" - }; + string baseUrl = _configuration["pathBase"]; + if (string.IsNullOrWhiteSpace(baseUrl)) + { + baseUrl = "/"; + } - app.Use(async (context, next) => + app.UseCors("AllowAllOrigins"); + if (baseUrl != "/") { - if (context.Request.Path.HasValue && null != angularRoutes.FirstOrDefault((ar) => context.Request.Path.Value.StartsWith(ar, StringComparison.OrdinalIgnoreCase))) + app.Map(new PathString(baseUrl), appm => { - context.Request.Path = new PathString("/"); - } - - await next(); - }); + appm.UseDefaultFiles(); + appm.UseStaticFiles(); + appm.Use(async (context, next) => + { + var root = env.WebRootPath; + var path = Path.Combine(root, "index.html"); + await context.Response.WriteAsync(File.ReadAllText(path)); + }); + }); + return; + } - app.UseCors("AllowAllOrigins"); app.UseDefaultFiles(); app.UseStaticFiles(); - app.UseMvc(routes => + app.Use(async (context, next) => { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); + var root = env.WebRootPath; + var path = Path.Combine(root, "index.html"); + await context.Response.WriteAsync(File.ReadAllText(path)); }); } } diff --git a/src/CaseManagement.Website/angularApp/app/app.component.ts b/src/CaseManagement.Website/angularApp/app/app.component.ts index c4f07b45..ff29abc4 100644 --- a/src/CaseManagement.Website/angularApp/app/app.component.ts +++ b/src/CaseManagement.Website/angularApp/app/app.component.ts @@ -1,6 +1,9 @@ -import { Component, ViewEncapsulation, OnInit } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; +import { DOCUMENT } from '@angular/common'; +import { Component, Inject, NgZone, OnInit, ViewEncapsulation } from '@angular/core'; import { Router } from '@angular/router'; +import { TranslateService } from '@ngx-translate/core'; +import { NullValidationHandler, OAuthService, OAuthStorage } from 'angular-oauth2-oidc'; +import { authConfig } from './auth.config'; interface BreadCrumbItem { name: string, index: number, @@ -25,15 +28,109 @@ export class AppComponent implements OnInit { sessionCheckTimer: any; iFrameName: string; - constructor(translate: TranslateService, private router: Router) { + constructor(translate: TranslateService, private router: Router, private oauthService: OAuthService, @Inject(DOCUMENT) private document : any, private ngZone : NgZone, private storage : OAuthStorage) { translate.setDefaultLang('fr'); translate.use('fr'); + this.iFrameName = "casemanagement-idserver"; + this.configureWithNewConfigApi(); } ngOnInit(): void { this.listenRouting(); } + private configureWithNewConfigApi() { + authConfig.redirectUri = this.document.location.origin; + this.oauthService.configure(authConfig); + this.oauthService.tokenValidationHandler = new NullValidationHandler(); + this.oauthService.loadDiscoveryDocument().then((d: any) => { + let issuer = d.info.discoveryDocument.issuer; + let checkSessionIframe = d.info.discoveryDocument.check_session_iframe; + this.initSessionCheck(issuer.toLowerCase(), checkSessionIframe.toLowerCase()); + return this.oauthService.tryLogin(); + }); + } + + private initSessionCheck(issuer: string, checkSessionIFrame: string): void { + const existingIframe = document.getElementById(this.iFrameName); + if (existingIframe) { + document.body.removeChild(existingIframe); + } + + const iframe = document.createElement('iframe'); + iframe.id = this.iFrameName; + + this.setupSessionCheckEventListener(issuer); + + const url = checkSessionIFrame; + iframe.setAttribute('src', url); + iframe.style.display = 'none'; + document.body.appendChild(iframe); + this.startSessionCheckTimer(issuer); + } + + private startSessionCheckTimer(issuer: string): void { + this.stopSessionCheckTimer(); + this.ngZone.runOutsideAngular(() => { + this.sessionCheckTimer = setInterval( + this.checkSession.bind(this, issuer), + 3000 + ); + }); + } + + private checkSession(issuer: string): void { + const iframe: any = document.getElementById(this.iFrameName); + if (!iframe) { + console.log('checkSession did not find iframe'); + return; + } + + const sessionState = this.storage.getItem('session_state'); + if (!sessionState) { + this.stopSessionCheckTimer(); + } + + const message = this.oauthService.clientId + ' ' + sessionState; + iframe.contentWindow.postMessage(message, issuer); + } + + private setupSessionCheckEventListener(issuer: string): void { + this.removeSessionCheckEventListener(); + this.sessionCheckEventListener = (e: MessageEvent) => { + const origin = e.origin.toLowerCase(); + if (!issuer.startsWith(origin)) { + console.log('sessionCheckEventListener', 'wrong origin', origin, 'expected', issuer); + } + + switch (e.data) { + case 'changed': + case 'error': + this.stopSessionCheckTimer(); + this.oauthService.logOut(true); + break; + } + }; + + this.ngZone.runOutsideAngular(() => { + window.addEventListener('message', this.sessionCheckEventListener); + }); + } + + private stopSessionCheckTimer(): void { + if (this.sessionCheckTimer) { + clearInterval(this.sessionCheckTimer); + this.sessionCheckTimer = null; + } + } + + private removeSessionCheckEventListener(): void { + if (this.sessionCheckEventListener) { + window.removeEventListener('message', this.sessionCheckEventListener); + this.sessionCheckEventListener = null; + } + } + private listenRouting() { var self = this; let routerUrl: string; diff --git a/src/CaseManagement.Website/angularApp/app/app.module.ts b/src/CaseManagement.Website/angularApp/app/app.module.ts index 818349ce..67c56bb8 100644 --- a/src/CaseManagement.Website/angularApp/app/app.module.ts +++ b/src/CaseManagement.Website/angularApp/app/app.module.ts @@ -16,7 +16,8 @@ import { MaterialModule } from './shared/material.module'; import { SharedModule } from './shared/shared.module'; export function createTranslateLoader(http: HttpClient) { - return new TranslateHttpLoader(http, './assets/i18n/', '.json'); + let url = process.env.BASE_URL + 'assets/i18n/'; + return new TranslateHttpLoader(http, url, '.json'); } @NgModule({ @@ -39,16 +40,10 @@ export function createTranslateLoader(http: HttpClient) { } }) ], - declarations: [ AppComponent ], - bootstrap: [AppComponent], - - providers: [ - AuthGuard - ] + providers: [ AuthGuard ] }) - export class AppModule { } \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/app.routes.ts b/src/CaseManagement.Website/angularApp/app/app.routes.ts index bc21f424..4de13f0f 100644 --- a/src/CaseManagement.Website/angularApp/app/app.routes.ts +++ b/src/CaseManagement.Website/angularApp/app/app.routes.ts @@ -1,9 +1,10 @@ import { Routes } from '@angular/router'; +import { AuthGuard } from './infrastructure/auth-guard.service'; export const routes: Routes = [ { path: '', redirectTo: 'home', pathMatch: 'full' }, - { path: 'casedefinitions', loadChildren: './casedefinitions/casedefinitions.module#CaseDefinitionsModule' }, - { path: 'caseinstances', loadChildren: './caseinstances/caseinstances.module#CaseInstancesModule' }, - { path: 'performances', loadChildren: './performances/performances.module#PerformancesModule' }, + { path: 'home', loadChildren: './home/home.module#HomeModule' }, + { path: 'cases', loadChildren: './cases/cases.module#CasesModule', canActivate: [AuthGuard], data: { role: 'businessanalyst' } }, + { path: 'status', loadChildren: './status/status.module#StatusModule' }, { path: '**', redirectTo: '/status/404' } ]; \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/auth.config.js b/src/CaseManagement.Website/angularApp/app/auth.config.js new file mode 100644 index 00000000..14f21f5c --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/auth.config.js @@ -0,0 +1,69 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +import { Component, ViewEncapsulation } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; +import { Router } from '@angular/router'; +var AppComponent = (function () { + function AppComponent(translate, router) { + this.router = router; + this.breadCrumbList = []; + translate.setDefaultLang('fr'); + translate.use('fr'); + } + AppComponent.prototype.ngOnInit = function () { + this.listenRouting(); + }; + AppComponent.prototype.listenRouting = function () { + var self = this; + var routerUrl; + var path; + var routerList; + this.router.events.subscribe(function (router) { + routerUrl = router.urlAfterRedirects; + if (!routerUrl || typeof routerUrl !== 'string') { + return; + } + path = ''; + self.breadCrumbList.length = 0; + if (routerUrl.includes('filter')) { + return; + } + routerList = routerUrl.slice(1).split('/'); + routerList.forEach(function (router, index) { + path += '/' + decodeURIComponent(router); + self.breadCrumbList.push({ + name: self.cleanUri(decodeURIComponent(router)), + index: index, + path: path, + isLast: index === routerList.length - 1 + }); + }); + }); + }; + AppComponent.prototype.cleanUri = function (uri) { + return uri.replace(/(\?.*)|(#.*)/g, ""); + }; + AppComponent = __decorate([ + Component({ + selector: 'app-component', + templateUrl: './app.component.html', + styleUrls: [ + './app.component.scss', + '../../node_modules/leaflet/dist/leaflet.css', + '../../node_modules/leaflet-search/dist/leaflet-search.src.css' + ], + encapsulation: ViewEncapsulation.None + }), + __metadata("design:paramtypes", [TranslateService, Router]) + ], AppComponent); + return AppComponent; +}()); +export { AppComponent }; +//# sourceMappingURL=app.component.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/auth.config.js.map b/src/CaseManagement.Website/angularApp/app/auth.config.js.map new file mode 100644 index 00000000..ed9dded2 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/auth.config.js.map @@ -0,0 +1 @@ +{"version":3,"file":"app.component.js","sourceRoot":"","sources":["app.component.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAU,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAmBzC;IAMI,sBAAY,SAA2B,EAAU,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAL/D,mBAAc,GAA0B,EAAE,CAAC;QAMvC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC/B,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,+BAAQ,GAAR;QACI,IAAI,CAAC,aAAa,EAAE,CAAC;IACzB,CAAC;IAEO,oCAAa,GAArB;QACI,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI,SAAiB,CAAC;QACtB,IAAI,IAAY,CAAC;QACjB,IAAI,UAAsB,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,UAAC,MAAW;YACrC,SAAS,GAAG,MAAM,CAAC,iBAAiB,CAAC;YACrC,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;gBAC7C,OAAO;aACV;YAED,IAAI,GAAG,EAAE,CAAC;YACV,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;YAC/B,IAAI,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAC9B,OAAO;aACV;YAED,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3C,UAAU,CAAC,OAAO,CAAC,UAAU,MAAM,EAAE,KAAK;gBACtC,IAAI,IAAI,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBACzC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;oBACrB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;oBAC/C,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,IAAI;oBACV,MAAM,EAAE,KAAK,KAAK,UAAU,CAAC,MAAM,GAAG,CAAC;iBAC1C,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,+BAAQ,GAAhB,UAAiB,GAAW;QACxB,OAAO,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC;IA/CQ,YAAY;QAXxB,SAAS,CAAC;YACP,QAAQ,EAAE,eAAe;YACzB,WAAW,EAAE,sBAAsB;YACnC,SAAS,EAAE;gBACP,sBAAsB;gBACtB,6CAA6C;gBAC7C,+DAA+D;aAClE;YACD,aAAa,EAAE,iBAAiB,CAAC,IAAI;SACxC,CAAC;yCAQyB,gBAAgB,EAAkB,MAAM;OANtD,YAAY,CAgDxB;IAAD,mBAAC;CAAA,AAhDD,IAgDC;SAhDY,YAAY"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/auth.config.ts b/src/CaseManagement.Website/angularApp/app/auth.config.ts new file mode 100644 index 00000000..9dfccd4a --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/auth.config.ts @@ -0,0 +1,10 @@ + +import { AuthConfig } from 'angular-oauth2-oidc'; + +export const authConfig: AuthConfig = { + issuer: 'http://localhost:60000', + clientId: 'caseManagementWebsite', + scope: 'openid profile email role', + redirectUri: window.location.origin, + disableAtHashCheck: true +} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/casedefinitions/casedefinitions.routes.ts b/src/CaseManagement.Website/angularApp/app/casedefinitions/casedefinitions.routes.ts index f92e32f3..40f42ea7 100644 --- a/src/CaseManagement.Website/angularApp/app/casedefinitions/casedefinitions.routes.ts +++ b/src/CaseManagement.Website/angularApp/app/casedefinitions/casedefinitions.routes.ts @@ -1,11 +1,10 @@ import { RouterModule, Routes } from '@angular/router'; - import { ListCaseDefinitionsComponent } from './list/list.component'; -import { ViewCaseDefinitionComponent } from './view/view.component'; +// import { ViewCaseDefinitionComponent } from './view/view.component'; const routes: Routes = [ { path: '', component: ListCaseDefinitionsComponent }, - { path: ':id', component: ViewCaseDefinitionComponent } + // { path: ':id', component: ViewCaseDefinitionComponent } ]; export const CaseDefinitionsRoutes = RouterModule.forChild(routes); \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/casedefinitions/list/list.component.html b/src/CaseManagement.Website/angularApp/app/casedefinitions/list/list.component.html index 7154b9ae..c1b99fbe 100644 --- a/src/CaseManagement.Website/angularApp/app/casedefinitions/list/list.component.html +++ b/src/CaseManagement.Website/angularApp/app/casedefinitions/list/list.component.html @@ -8,6 +8,7 @@
+
diff --git a/src/CaseManagement.Website/angularApp/app/casedefinitions/list/list.component.ts b/src/CaseManagement.Website/angularApp/app/casedefinitions/list/list.component.ts index 5098259c..15e86a79 100644 --- a/src/CaseManagement.Website/angularApp/app/casedefinitions/list/list.component.ts +++ b/src/CaseManagement.Website/angularApp/app/casedefinitions/list/list.component.ts @@ -12,7 +12,6 @@ import { FormBuilder, FormGroup } from '@angular/forms'; templateUrl: './list.component.html', styleUrls: ['./list.component.scss'] }) - export class ListCaseDefinitionsComponent implements OnInit, OnDestroy { isLoading: boolean; caseDefinitions: CaseDefinition[] = []; diff --git a/src/CaseManagement.Website/angularApp/app/casedefinitions/services/casedefinitions.service.ts b/src/CaseManagement.Website/angularApp/app/casedefinitions/services/casedefinitions.service.ts index b127ea5c..76ea9558 100644 --- a/src/CaseManagement.Website/angularApp/app/casedefinitions/services/casedefinitions.service.ts +++ b/src/CaseManagement.Website/angularApp/app/casedefinitions/services/casedefinitions.service.ts @@ -4,16 +4,17 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { CaseDefinitionHistory } from '../models/case-definition-history.model'; import { CaseDefinition } from '../models/case-definition.model'; -import { CountResult } from '../models/count-result.model'; import { SearchCaseDefinitionsResult } from '../models/search-case-definitions-result.model'; +import { OAuthService } from 'angular-oauth2-oidc'; @Injectable() export class CaseDefinitionsService { - constructor(private http: HttpClient) { } + constructor(private http: HttpClient, private oauthService: OAuthService) { } search(startIndex: number, count: number, order: string, direction: string, text: string): Observable{ let headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); + headers = headers.set('Authorization', 'Bearer ' + this.oauthService.getIdToken()); let targetUrl = process.env.API_URL + "/case-definitions/search?start_index=" + startIndex + "&count=" + count; if (order) { targetUrl = targetUrl + "&order_by=" + order; @@ -35,6 +36,7 @@ export class CaseDefinitionsService { get(id: string): Observable { let headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); + headers = headers.set('Authorization', 'Bearer ' + this.oauthService.getIdToken()); let targetUrl = process.env.API_URL + "/case-definitions/" + id; return this.http.get(targetUrl, { headers: headers }).pipe(map((res: any) => { return CaseDefinition.fromJson(res); @@ -44,18 +46,10 @@ export class CaseDefinitionsService { getHistory(id: string): Observable { let headers = new HttpHeaders(); headers = headers.set('Accept', 'application/json'); + headers = headers.set('Authorization', 'Bearer ' + this.oauthService.getIdToken()); let targetUrl = process.env.API_URL + "/case-definitions/" + id + "/history"; return this.http.get(targetUrl, { headers: headers }).pipe(map((res: any) => { return CaseDefinitionHistory.fromJson(res); })); } - - count(): Observable { - let headers = new HttpHeaders(); - headers = headers.set('Accept', 'application/json'); - let targetUrl = process.env.API_URL + "/case-definitions/count"; - return this.http.get(targetUrl, { headers: headers }).pipe(map((res: any) => { - return CountResult.fromJson(res); - })); - } } \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list-actions.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/actions/case-files.js similarity index 100% rename from src/CaseManagement.Website/angularApp/app/performances/list/list-actions.js rename to src/CaseManagement.Website/angularApp/app/cases/casefiles/actions/case-files.js diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list-actions.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/actions/case-files.js.map similarity index 100% rename from src/CaseManagement.Website/angularApp/app/performances/list/list-actions.js.map rename to src/CaseManagement.Website/angularApp/app/cases/casefiles/actions/case-files.js.map diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/actions/case-files.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/actions/case-files.ts new file mode 100644 index 00000000..abba20bb --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/actions/case-files.ts @@ -0,0 +1,32 @@ +import { Action } from '@ngrx/store'; +import { CaseFile } from '../models/case-file.model'; +import { SearchCaseFilesResult } from '../models/search-case-files-result.model'; + +export enum ActionTypes { + START_SEARCH = "[CaseFiles] START_SEARCH", + COMPLETE_SEARCH = "[CaseFiles] COMPLETE_SEARCH", + START_GET = "[CaseFiles] START_GET", + COMPLETE_GET = "[CaseFiles] COMPLETE_GET" +} + +export class StartFetch implements Action { + readonly type = ActionTypes.START_SEARCH + constructor(public order: string, public direction: string, public count: number, public startIndex: number, public text: string, public user : string) { } +} + +export class CompleteFetch implements Action { + readonly type = ActionTypes.COMPLETE_SEARCH; + constructor(public content: SearchCaseFilesResult) { } +} + +export class StartGet implements Action { + readonly type = ActionTypes.START_GET + constructor(public id: string) { } +} + +export class CompleteGet implements Action { + readonly type = ActionTypes.COMPLETE_GET; + constructor(public content: CaseFile) { } +} + +export type ActionsUnion = StartFetch | CompleteFetch | StartGet | CompleteGet; \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/performances.module.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.module.js similarity index 100% rename from src/CaseManagement.Website/angularApp/app/performances/performances.module.js rename to src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.module.js diff --git a/src/CaseManagement.Website/angularApp/app/performances/performances.module.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.module.js.map similarity index 100% rename from src/CaseManagement.Website/angularApp/app/performances/performances.module.js.map rename to src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.module.js.map diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.module.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.module.ts new file mode 100644 index 00000000..acec6668 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.module.ts @@ -0,0 +1,40 @@ +import { CommonModule } from '@angular/common'; +import { HttpClientModule } from '@angular/common/http'; +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { EffectsModule } from '@ngrx/effects'; +import { StoreModule } from '@ngrx/store'; +import { StoreDevtoolsModule } from '@ngrx/store-devtools'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; +import { MaterialModule } from '../../shared/material.module'; +import { SharedModule } from '../../shared/shared.module'; +import { CaseFilesRoutes } from './casefiles.routes'; +import { CaseFilesEffects } from './effects/case-files'; +import { AddCaseFileDialog } from './list/add-case-file-dialog'; +import { ListCaseFilesComponent } from './list/list.component'; +import * as reducers from './reducers'; +import { CaseFilesService } from './services/casefiles.service'; +import { ViewCaseFilesComponent } from './view/view.component'; + +@NgModule({ + imports: [ + CommonModule, + NgxChartsModule, + FormsModule, + HttpClientModule, + CaseFilesRoutes, + MaterialModule, + SharedModule, + EffectsModule.forRoot([CaseFilesEffects]), + StoreModule.forRoot(reducers.appReducer), + StoreDevtoolsModule.instrument({ + maxAge: 10 + }) + ], + entryComponents: [ AddCaseFileDialog ], + declarations: [ListCaseFilesComponent, AddCaseFileDialog, ViewCaseFilesComponent ], + exports: [ListCaseFilesComponent, ViewCaseFilesComponent ], + providers: [ CaseFilesService ] +}) + +export class CaseFilesModule { } diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.routes.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.routes.js new file mode 100644 index 00000000..affe173e --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.routes.js @@ -0,0 +1,7 @@ +import { RouterModule } from '@angular/router'; +import { HomeComponent } from './components/home.component'; +var routes = [ + { path: 'home', component: HomeComponent } +]; +export var HomeRoutes = RouterModule.forChild(routes); +//# sourceMappingURL=home.routes.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.routes.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.routes.js.map new file mode 100644 index 00000000..5f37b6f9 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.routes.js.map @@ -0,0 +1 @@ +{"version":3,"file":"home.routes.js","sourceRoot":"","sources":["home.routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAU,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,IAAM,MAAM,GAAW;IACnB,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE;CAC7C,CAAC;AAEF,MAAM,CAAC,IAAM,UAAU,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.routes.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.routes.ts new file mode 100644 index 00000000..453156a5 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/casefiles.routes.ts @@ -0,0 +1,11 @@ +import { RouterModule, Routes } from '@angular/router'; +import { ListCaseFilesComponent } from './list/list.component'; +import { ViewCaseFilesComponent } from './view/view.component'; + + +const routes: Routes = [ + { path: '', component: ListCaseFilesComponent }, + { path: ':id', component: ViewCaseFilesComponent } +]; + +export const CaseFilesRoutes = RouterModule.forChild(routes); \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list-reducer.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/effects/case-files.js similarity index 100% rename from src/CaseManagement.Website/angularApp/app/performances/list/list-reducer.js rename to src/CaseManagement.Website/angularApp/app/cases/casefiles/effects/case-files.js diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list-reducer.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/effects/case-files.js.map similarity index 100% rename from src/CaseManagement.Website/angularApp/app/performances/list/list-reducer.js.map rename to src/CaseManagement.Website/angularApp/app/cases/casefiles/effects/case-files.js.map diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/effects/case-files.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/effects/case-files.ts new file mode 100644 index 00000000..90a04aad --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/effects/case-files.ts @@ -0,0 +1,43 @@ +import { Injectable } from '@angular/core'; +import { Actions, Effect, ofType } from '@ngrx/effects'; +import { of } from 'rxjs'; +import { catchError, map, mergeMap } from 'rxjs/operators'; +import { ActionTypes, StartFetch, StartGet } from '../actions/case-files'; +import { CaseFilesService } from '../services/casefiles.service'; + +@Injectable() +export class CaseFilesEffects { + constructor( + private actions$: Actions, + private caseFilesService: CaseFilesService + ) { } + + @Effect() + loadCaseFiles$ = this.actions$ + .pipe( + ofType(ActionTypes.START_SEARCH), + mergeMap((evt: StartFetch) => { + return this.caseFilesService.search(evt.startIndex, evt.count, evt.order, evt.direction, evt.text, evt.user) + .pipe( + map(casefiles => { return { type: ActionTypes.COMPLETE_SEARCH, content: casefiles }; }), + catchError(() => of({ type: ActionTypes.COMPLETE_SEARCH })) + ); + } + ) + ); + + @Effect() + loadCaseFile$ = this.actions$ + .pipe( + ofType(ActionTypes.START_GET), + mergeMap((evt: StartGet) => { + return this.caseFilesService.get(evt.id) + .pipe( + map(casefiles => { return { type: ActionTypes.COMPLETE_GET, content: casefiles }; }), + catchError(() => of({ type: ActionTypes.COMPLETE_GET })) + ); + } + ) + ); + +} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/add-case-file-dialog.html b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/add-case-file-dialog.html new file mode 100644 index 00000000..5cf77cb0 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/add-case-file-dialog.html @@ -0,0 +1,14 @@ +

{{ "ADD_CASE_FILE" | translate }}

+
+ +
+ + + + + + +
+ + +
\ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/add-case-file-dialog.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/add-case-file-dialog.js new file mode 100644 index 00000000..a3d2d7eb --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/add-case-file-dialog.js @@ -0,0 +1,453 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +import { Component } from '@angular/core'; +import { select, Store } from '@ngrx/store'; +import { ActionTypes } from './home-actions'; +var HomeComponent = (function () { + function HomeComponent(statisticStore, weekStatisticStore, monthStatisticStore) { + this.statisticStore = statisticStore; + this.weekStatisticStore = weekStatisticStore; + this.monthStatisticStore = monthStatisticStore; + this.viewPie = [300, 300]; + this.viewChart = [500, 300]; + this.caseStatistic = [ + { + "name": "Active", + "value": 0 + }, + { + "name": "Completed", + "value": 0 + }, + { + "name": "Terminated", + "value": 0 + }, + { + "name": "Failed", + "value": 0 + }, + { + "name": "Suspended", + "value": 0 + }, + { + "name": "Closed", + "value": 0 + } + ]; + this.caseStatisticColorScheme = { + domain: ['#d3d3d3', '#008000', '#ffff00', '#FF0000', '#FFA500', '#808080'] + }; + this.caseWeekStatistic = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + this.caseMonthStatistic = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + this.formStatistic = [ + { + "name": "Created", + "value": 0 + }, + { + "name": "Confirmed", + "value": 0 + } + ]; + this.formStatisticColorScheme = { + domain: ['#808080', '#008000'] + }; + this.formWeekStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + this.formMonthStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + this.activationStatisticColorScheme = { + domain: ['#808080', '#008000'] + }; + this.activationStatistic = [ + { + "name": "Created", + "value": 0 + }, + { + "name": "Confirmed", + "value": 0 + } + ]; + this.activationWeekStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + this.activationMonthStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + } + HomeComponent.prototype.ngOnInit = function () { + var _this = this; + this.statisticSubscription = this.statisticStore.pipe(select('statistic')).subscribe(function (st) { + if (!st) { + return; + } + if (st.content) { + _this.caseStatistic = [ + { + "name": "Active", + "value": st.content.NbActiveCases + }, + { + "name": "Completed", + "value": st.content.NbCompletedCases + }, + { + "name": "Terminated", + "value": st.content.NbTerminatedCases + }, + { + "name": "Failed", + "value": st.content.NbFailedCases + }, + { + "name": "Suspended", + "value": st.content.NbSuspendedCases + }, + { + "name": "Closed", + "value": st.content.NbClosedCases + } + ]; + _this.formStatistic = [ + { + "name": "Created", + "value": st.content.NbCreatedForms + }, + { + "name": "Confirmed", + "value": st.content.NbConfirmedForms + } + ]; + _this.activationStatistic = [ + { + "name": "Created", + "value": st.content.NbCreatedActivation + }, + { + "name": "Confirmed", + "value": st.content.NbConfirmedActivation + } + ]; + } + }); + this.weekSubscription = this.weekStatisticStore.pipe(select('weekStatistics')).subscribe(function (st) { + if (!st) { + return; + } + if (st.content) { + var caseWeekResult_1 = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + var formWeekResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + var activationWeekResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + st.content.Content.forEach(function (elt) { + caseWeekResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbActiveCases + }); + caseWeekResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbCompletedCases + }); + caseWeekResult_1[2].series.push({ + "name": elt.DateTime, + "value": elt.NbTerminatedCases + }); + caseWeekResult_1[3].series.push({ + "name": elt.DateTime, + "value": elt.NbFailedCases + }); + caseWeekResult_1[4].series.push({ + "name": elt.DateTime, + "value": elt.NbSuspendedCases + }); + caseWeekResult_1[5].series.push({ + "name": elt.DateTime, + "value": elt.NbClosedCases + }); + formWeekResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbCreatedForms + }); + formWeekResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbConfirmedForms + }); + activationWeekResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbCreatedForms + }); + activationWeekResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbConfirmedForms + }); + }); + _this.caseWeekStatistic = caseWeekResult_1; + _this.formWeekStatistic = formWeekResult_1; + _this.activationWeekStatistic = activationWeekResult_1; + } + }); + this.monthSubscription = this.monthStatisticStore.pipe(select('monthStatistics')).subscribe(function (st) { + if (!st) { + return; + } + if (st.content) { + var caseMonthResult_1 = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + var formMonthResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + var activationMonthResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + st.content.Content.forEach(function (elt) { + caseMonthResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbActiveCases + }); + caseMonthResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbCompletedCases + }); + caseMonthResult_1[2].series.push({ + "name": elt.DateTime, + "value": elt.NbTerminatedCases + }); + caseMonthResult_1[3].series.push({ + "name": elt.DateTime, + "value": elt.NbFailedCases + }); + caseMonthResult_1[4].series.push({ + "name": elt.DateTime, + "value": elt.NbSuspendedCases + }); + caseMonthResult_1[5].series.push({ + "name": elt.DateTime, + "value": elt.NbClosedCases + }); + formMonthResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbCreatedForms + }); + formMonthResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbConfirmedForms + }); + activationMonthResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbCreatedForms + }); + activationMonthResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbConfirmedForms + }); + }); + _this.caseMonthStatistic = caseMonthResult_1; + _this.formMonthStatistic = formMonthResult_1; + _this.activationMonthStatistic = activationMonthResult_1; + } + }); + this.refresh(); + }; + HomeComponent.prototype.refresh = function () { + var loadStatisticRequest = { + type: ActionTypes.STATISTICLOAD + }; + var loadWeekStatisticsRequest = { + type: ActionTypes.SEARCHWEEKSTATISTICS, + count: 100 + }; + var loadMonthStatisticsRequest = { + type: ActionTypes.SEARCHMONTHSTATISTICS, + count: 100 + }; + this.statisticStore.dispatch(loadStatisticRequest); + this.weekStatisticStore.dispatch(loadWeekStatisticsRequest); + this.monthStatisticStore.dispatch(loadMonthStatisticsRequest); + }; + HomeComponent.prototype.ngOnDestroy = function () { + this.statisticSubscription.unsubscribe(); + this.weekSubscription.unsubscribe(); + this.monthSubscription.unsubscribe(); + }; + HomeComponent = __decorate([ + Component({ + selector: 'app-home-component', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'] + }), + __metadata("design:paramtypes", [Store, Store, Store]) + ], HomeComponent); + return HomeComponent; +}()); +export { HomeComponent }; +//# sourceMappingURL=home.component.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/add-case-file-dialog.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/add-case-file-dialog.js.map new file mode 100644 index 00000000..06fe6d87 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/add-case-file-dialog.js.map @@ -0,0 +1 @@ +{"version":3,"file":"home.component.js","sourceRoot":"","sources":["home.component.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/add-case-file-dialog.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/add-case-file-dialog.ts new file mode 100644 index 00000000..a6c02971 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/add-case-file-dialog.ts @@ -0,0 +1,25 @@ +import { Component } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { MatDialogRef } from '@angular/material'; +import { CaseFilesService } from '../services/casefiles.service'; + +@Component({ + selector: 'add-case-file-dialog', + templateUrl: 'add-case-file-dialog.html', +}) +export class AddCaseFileDialog { + addCaseFileForm: FormGroup; + + constructor(private dialogRef: MatDialogRef, private caseFilesService: CaseFilesService, private formBuilder: FormBuilder) { + this.addCaseFileForm = this.formBuilder.group({ + name: '', + description: '' + }); + } + + onSubmit() { + this.caseFilesService.add(this.addCaseFileForm.get('name').value, this.addCaseFileForm.get('description').value).subscribe(() => { + this.dialogRef.close(); + }); + } +} diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.html b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.html new file mode 100644 index 00000000..bc3cda9c --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.html @@ -0,0 +1,62 @@ +
+
+
{{ "CASE_FILES" | translate }}
+
+
+
+
+
+
+
+ + +
+ + + + +
+ + +
+
+ + +
+ + +
+ + +
+
+ + +
+ + + + + + + + + + + +
{{ "FILE_NAME" | translate }} + {{case.Name}} + {{ "CREATE_DATETIME" | translate }}{{case.CreateDateTime | date:'medium'}}
+ +
+

{{ "ERROR_LOAD_CASE_FILES" | translate }}

+
+ +
+ + +
+
+
\ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.js new file mode 100644 index 00000000..a3d2d7eb --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.js @@ -0,0 +1,453 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +import { Component } from '@angular/core'; +import { select, Store } from '@ngrx/store'; +import { ActionTypes } from './home-actions'; +var HomeComponent = (function () { + function HomeComponent(statisticStore, weekStatisticStore, monthStatisticStore) { + this.statisticStore = statisticStore; + this.weekStatisticStore = weekStatisticStore; + this.monthStatisticStore = monthStatisticStore; + this.viewPie = [300, 300]; + this.viewChart = [500, 300]; + this.caseStatistic = [ + { + "name": "Active", + "value": 0 + }, + { + "name": "Completed", + "value": 0 + }, + { + "name": "Terminated", + "value": 0 + }, + { + "name": "Failed", + "value": 0 + }, + { + "name": "Suspended", + "value": 0 + }, + { + "name": "Closed", + "value": 0 + } + ]; + this.caseStatisticColorScheme = { + domain: ['#d3d3d3', '#008000', '#ffff00', '#FF0000', '#FFA500', '#808080'] + }; + this.caseWeekStatistic = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + this.caseMonthStatistic = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + this.formStatistic = [ + { + "name": "Created", + "value": 0 + }, + { + "name": "Confirmed", + "value": 0 + } + ]; + this.formStatisticColorScheme = { + domain: ['#808080', '#008000'] + }; + this.formWeekStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + this.formMonthStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + this.activationStatisticColorScheme = { + domain: ['#808080', '#008000'] + }; + this.activationStatistic = [ + { + "name": "Created", + "value": 0 + }, + { + "name": "Confirmed", + "value": 0 + } + ]; + this.activationWeekStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + this.activationMonthStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + } + HomeComponent.prototype.ngOnInit = function () { + var _this = this; + this.statisticSubscription = this.statisticStore.pipe(select('statistic')).subscribe(function (st) { + if (!st) { + return; + } + if (st.content) { + _this.caseStatistic = [ + { + "name": "Active", + "value": st.content.NbActiveCases + }, + { + "name": "Completed", + "value": st.content.NbCompletedCases + }, + { + "name": "Terminated", + "value": st.content.NbTerminatedCases + }, + { + "name": "Failed", + "value": st.content.NbFailedCases + }, + { + "name": "Suspended", + "value": st.content.NbSuspendedCases + }, + { + "name": "Closed", + "value": st.content.NbClosedCases + } + ]; + _this.formStatistic = [ + { + "name": "Created", + "value": st.content.NbCreatedForms + }, + { + "name": "Confirmed", + "value": st.content.NbConfirmedForms + } + ]; + _this.activationStatistic = [ + { + "name": "Created", + "value": st.content.NbCreatedActivation + }, + { + "name": "Confirmed", + "value": st.content.NbConfirmedActivation + } + ]; + } + }); + this.weekSubscription = this.weekStatisticStore.pipe(select('weekStatistics')).subscribe(function (st) { + if (!st) { + return; + } + if (st.content) { + var caseWeekResult_1 = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + var formWeekResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + var activationWeekResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + st.content.Content.forEach(function (elt) { + caseWeekResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbActiveCases + }); + caseWeekResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbCompletedCases + }); + caseWeekResult_1[2].series.push({ + "name": elt.DateTime, + "value": elt.NbTerminatedCases + }); + caseWeekResult_1[3].series.push({ + "name": elt.DateTime, + "value": elt.NbFailedCases + }); + caseWeekResult_1[4].series.push({ + "name": elt.DateTime, + "value": elt.NbSuspendedCases + }); + caseWeekResult_1[5].series.push({ + "name": elt.DateTime, + "value": elt.NbClosedCases + }); + formWeekResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbCreatedForms + }); + formWeekResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbConfirmedForms + }); + activationWeekResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbCreatedForms + }); + activationWeekResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbConfirmedForms + }); + }); + _this.caseWeekStatistic = caseWeekResult_1; + _this.formWeekStatistic = formWeekResult_1; + _this.activationWeekStatistic = activationWeekResult_1; + } + }); + this.monthSubscription = this.monthStatisticStore.pipe(select('monthStatistics')).subscribe(function (st) { + if (!st) { + return; + } + if (st.content) { + var caseMonthResult_1 = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + var formMonthResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + var activationMonthResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + st.content.Content.forEach(function (elt) { + caseMonthResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbActiveCases + }); + caseMonthResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbCompletedCases + }); + caseMonthResult_1[2].series.push({ + "name": elt.DateTime, + "value": elt.NbTerminatedCases + }); + caseMonthResult_1[3].series.push({ + "name": elt.DateTime, + "value": elt.NbFailedCases + }); + caseMonthResult_1[4].series.push({ + "name": elt.DateTime, + "value": elt.NbSuspendedCases + }); + caseMonthResult_1[5].series.push({ + "name": elt.DateTime, + "value": elt.NbClosedCases + }); + formMonthResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbCreatedForms + }); + formMonthResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbConfirmedForms + }); + activationMonthResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbCreatedForms + }); + activationMonthResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbConfirmedForms + }); + }); + _this.caseMonthStatistic = caseMonthResult_1; + _this.formMonthStatistic = formMonthResult_1; + _this.activationMonthStatistic = activationMonthResult_1; + } + }); + this.refresh(); + }; + HomeComponent.prototype.refresh = function () { + var loadStatisticRequest = { + type: ActionTypes.STATISTICLOAD + }; + var loadWeekStatisticsRequest = { + type: ActionTypes.SEARCHWEEKSTATISTICS, + count: 100 + }; + var loadMonthStatisticsRequest = { + type: ActionTypes.SEARCHMONTHSTATISTICS, + count: 100 + }; + this.statisticStore.dispatch(loadStatisticRequest); + this.weekStatisticStore.dispatch(loadWeekStatisticsRequest); + this.monthStatisticStore.dispatch(loadMonthStatisticsRequest); + }; + HomeComponent.prototype.ngOnDestroy = function () { + this.statisticSubscription.unsubscribe(); + this.weekSubscription.unsubscribe(); + this.monthSubscription.unsubscribe(); + }; + HomeComponent = __decorate([ + Component({ + selector: 'app-home-component', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'] + }), + __metadata("design:paramtypes", [Store, Store, Store]) + ], HomeComponent); + return HomeComponent; +}()); +export { HomeComponent }; +//# sourceMappingURL=home.component.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.js.map new file mode 100644 index 00000000..06fe6d87 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.js.map @@ -0,0 +1 @@ +{"version":3,"file":"home.component.js","sourceRoot":"","sources":["home.component.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.scss b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.ts new file mode 100644 index 00000000..1a9da428 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/list/list.component.ts @@ -0,0 +1,70 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { MatDialog, MatPaginator, MatSort } from '@angular/material'; +import { select, Store } from '@ngrx/store'; +import { OAuthService } from 'angular-oauth2-oidc'; +import { merge, Observable } from 'rxjs'; +import { StartFetch } from '../actions/case-files'; +import { CaseFile } from '../models/case-file.model'; +import * as fromCaseFiles from '../reducers'; +import { AddCaseFileDialog } from './add-case-file-dialog'; + +@Component({ + selector: 'list-case-files', + templateUrl: './list.component.html', + styleUrls: ['./list.component.scss'] +}) +export class ListCaseFilesComponent implements OnInit { + displayedColumns: string[] = ['name', 'create_datetime']; + @ViewChild(MatPaginator) paginator: MatPaginator; + @ViewChild(MatSort) sort: MatSort; + searchForm: FormGroup; + isLoading: boolean; + length: number; + isErrorLoadOccured: boolean; + caseFiles$: Observable; + + constructor(private store: Store, private formBuilder: FormBuilder, private oauthService: OAuthService, private dialog: MatDialog) { + this.searchForm = this.formBuilder.group({ + text: '' + }); + } + + ngOnInit() { + this.caseFiles$ = this.store.pipe(select(fromCaseFiles.selectSearchResults)); + this.refresh(); + } + + onSubmit() { + this.refresh(); + } + + ngAfterViewInit() { + merge(this.sort.sortChange, this.paginator.page).subscribe(() => this.refresh()); + } + + addCaseFile() { + let dialogRef = this.dialog.open(AddCaseFileDialog, { + width: '800px' + }); + dialogRef.afterClosed().subscribe(() => { + this.refresh(); + }); + } + + refresh() { + let startIndex: number = 0; + let count: number = 5; + if (this.paginator.pageIndex && this.paginator.pageSize) { + startIndex = this.paginator.pageIndex * this.paginator.pageSize; + } + + if (this.paginator.pageSize) { + count = this.paginator.pageSize; + } + + let claims : any = this.oauthService.getIdentityClaims(); + let request = new StartFetch(this.sort.active, this.sort.direction, count, startIndex, this.searchForm.get('text').value, claims.sub); + this.store.dispatch(request); + } +} diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/case-file.model.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/case-file.model.js new file mode 100644 index 00000000..5ca9a80b --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/case-file.model.js @@ -0,0 +1,16 @@ +var CaseFile = (function () { + function CaseFile() { + } + CaseFile.fromJson = function (json) { + var result = new CaseFile(); + result.Id = json["id"]; + result.Name = json["name"]; + result.Description = json["description"]; + result.Payload = json["payload"]; + result.CreateDateTime = json["create_datetime"]; + return result; + }; + return CaseFile; +}()); +export { CaseFile }; +//# sourceMappingURL=case-file.model.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/case-file.model.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/case-file.model.js.map new file mode 100644 index 00000000..a96dc323 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/case-file.model.js.map @@ -0,0 +1 @@ +{"version":3,"file":"case-file.model.js","sourceRoot":"","sources":["case-file.model.ts"],"names":[],"mappings":"AAAA;IAAA;IAgBA,CAAC;IATiB,iBAAQ,GAAtB,UAAuB,IAAS;QAC5B,IAAI,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;QACzC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QACjC,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAChD,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,eAAC;AAAD,CAAC,AAhBD,IAgBC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/case-file.model.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/case-file.model.ts new file mode 100644 index 00000000..a20e2ca8 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/case-file.model.ts @@ -0,0 +1,17 @@ +export class CaseFile { + Id: string; + Name: string; + Description: string; + CreateDateTime: Date; + Payload: string; + + public static fromJson(json: any): CaseFile { + var result = new CaseFile(); + result.Id = json["id"]; + result.Name = json["name"]; + result.Description = json["description"]; + result.Payload = json["payload"]; + result.CreateDateTime = json["create_datetime"]; + return result; + } +} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/search-case-files-result.model.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/search-case-files-result.model.js new file mode 100644 index 00000000..3cb1ba26 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/search-case-files-result.model.js @@ -0,0 +1,22 @@ +import { CaseFile } from './case-file.model'; +var SearchCaseFilesResult = (function () { + function SearchCaseFilesResult() { + } + SearchCaseFilesResult.fromJson = function (json) { + var result = new SearchCaseFilesResult(); + result.StartIndex = json["start_index"]; + result.Count = json["count"]; + result.TotalLength = json["total_length"]; + var content = []; + if (json["content"]) { + json["content"].forEach(function (c) { + content.push(CaseFile.fromJson(c)); + }); + } + result.Content = content; + return result; + }; + return SearchCaseFilesResult; +}()); +export { SearchCaseFilesResult }; +//# sourceMappingURL=search-case-files-result.model.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/search-case-files-result.model.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/search-case-files-result.model.js.map new file mode 100644 index 00000000..b049c88d --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/search-case-files-result.model.js.map @@ -0,0 +1 @@ +{"version":3,"file":"search-case-files-result.model.js","sourceRoot":"","sources":["search-case-files-result.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C;IAAA;IAsBA,CAAC;IAhBiB,8BAAQ,GAAtB,UAAuB,IAAS;QAE5B,IAAI,MAAM,GAAG,IAAI,qBAAqB,EAAE,CAAC;QACzC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAe,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE;YACjB,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAM;gBACpC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;SACN;QAED,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,4BAAC;AAAD,CAAC,AAtBD,IAsBC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/models/search-performances-result.model.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/search-case-files-result.model.ts similarity index 54% rename from src/CaseManagement.Website/angularApp/app/performances/models/search-performances-result.model.ts rename to src/CaseManagement.Website/angularApp/app/cases/casefiles/models/search-case-files-result.model.ts index 19fcc88a..bd4bcd03 100644 --- a/src/CaseManagement.Website/angularApp/app/performances/models/search-performances-result.model.ts +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/models/search-case-files-result.model.ts @@ -1,21 +1,21 @@ -import { Performance } from './performance.model'; +import { CaseFile } from './case-file.model'; -export class SearchPerformancesResult { +export class SearchCaseFilesResult { StartIndex: number; Count: number; TotalLength: number; - Content: Performance[]; + Content: CaseFile[]; - public static fromJson(json: any): SearchPerformancesResult + public static fromJson(json: any): SearchCaseFilesResult { - let result = new SearchPerformancesResult(); + let result = new SearchCaseFilesResult(); result.StartIndex = json["start_index"]; result.Count = json["count"]; result.TotalLength = json["total_length"]; - let content: Performance[] = []; + let content: CaseFile[] = []; if (json["content"]) { json["content"].forEach(function (c: any) { - content.push(Performance.fromJson(c)); + content.push(CaseFile.fromJson(c)); }); } diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/get.reducer.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/get.reducer.js new file mode 100644 index 00000000..8a7835a1 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/get.reducer.js @@ -0,0 +1,22 @@ +export var ActionTypes; +(function (ActionTypes) { + ActionTypes["CASEDEFINITIONSLOAD"] = "[CaseDefinitions] Load"; + ActionTypes["CASEDEFINITIONSLOADED"] = "[CaseDefinitions] Loaded"; + ActionTypes["ERRORLOADCASEDEFINITIONS"] = "[CaseDefinitions] Error Load"; +})(ActionTypes || (ActionTypes = {})); +var LoadCaseDefinitionsAction = (function () { + function LoadCaseDefinitionsAction() { + this.type = ActionTypes.CASEDEFINITIONSLOAD; + } + return LoadCaseDefinitionsAction; +}()); +export { LoadCaseDefinitionsAction }; +var CaseDefinitionsLoadedAction = (function () { + function CaseDefinitionsLoadedAction(result) { + this.result = result; + this.type = ActionTypes.CASEDEFINITIONSLOADED; + } + return CaseDefinitionsLoadedAction; +}()); +export { CaseDefinitionsLoadedAction }; +//# sourceMappingURL=list-actions.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/get.reducer.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/get.reducer.js.map new file mode 100644 index 00000000..59065703 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/get.reducer.js.map @@ -0,0 +1 @@ +{"version":3,"file":"list-actions.js","sourceRoot":"","sources":["list-actions.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,6DAA8C,CAAA;IAC9C,iEAAkD,CAAA;IAClD,wEAAyD,CAAA;AAC7D,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,mBAAmB,CAAA;IACtB,CAAC;IACrB,gCAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,qCAAmB,MAAmC;QAAnC,WAAM,GAAN,MAAM,CAA6B;QADtD,SAAI,GAAG,WAAW,CAAC,qBAAqB,CAAA;IACkB,CAAC;IAC/D,kCAAC;AAAD,CAAC,AAHD,IAGC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/get.reducer.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/get.reducer.ts new file mode 100644 index 00000000..86b09d84 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/get.reducer.ts @@ -0,0 +1,24 @@ +import * as fromActions from '../actions/case-files'; +import { CaseFile } from '../models/case-file.model'; + +export interface State { + isLoading: boolean; + isErrorLoadOccured: boolean; + content: CaseFile; +} + +export const initialState: State = { + content: null, + isLoading: true, + isErrorLoadOccured: false +}; + +export function getReducer(state = initialState, action: fromActions.ActionsUnion) { + switch (action.type) { + case fromActions.ActionTypes.COMPLETE_GET: + state.content = action.content; + return { ...state }; + default: + return state; + } +} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/index.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/index.js new file mode 100644 index 00000000..8a7835a1 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/index.js @@ -0,0 +1,22 @@ +export var ActionTypes; +(function (ActionTypes) { + ActionTypes["CASEDEFINITIONSLOAD"] = "[CaseDefinitions] Load"; + ActionTypes["CASEDEFINITIONSLOADED"] = "[CaseDefinitions] Loaded"; + ActionTypes["ERRORLOADCASEDEFINITIONS"] = "[CaseDefinitions] Error Load"; +})(ActionTypes || (ActionTypes = {})); +var LoadCaseDefinitionsAction = (function () { + function LoadCaseDefinitionsAction() { + this.type = ActionTypes.CASEDEFINITIONSLOAD; + } + return LoadCaseDefinitionsAction; +}()); +export { LoadCaseDefinitionsAction }; +var CaseDefinitionsLoadedAction = (function () { + function CaseDefinitionsLoadedAction(result) { + this.result = result; + this.type = ActionTypes.CASEDEFINITIONSLOADED; + } + return CaseDefinitionsLoadedAction; +}()); +export { CaseDefinitionsLoadedAction }; +//# sourceMappingURL=list-actions.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/index.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/index.js.map new file mode 100644 index 00000000..59065703 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"list-actions.js","sourceRoot":"","sources":["list-actions.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,6DAA8C,CAAA;IAC9C,iEAAkD,CAAA;IAClD,wEAAyD,CAAA;AAC7D,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,mBAAmB,CAAA;IACtB,CAAC;IACrB,gCAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,qCAAmB,MAAmC;QAAnC,WAAM,GAAN,MAAM,CAA6B;QADtD,SAAI,GAAG,WAAW,CAAC,qBAAqB,CAAA;IACkB,CAAC;IAC/D,kCAAC;AAAD,CAAC,AAHD,IAGC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/index.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/index.ts new file mode 100644 index 00000000..2e8fdf25 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/index.ts @@ -0,0 +1,38 @@ +import { createSelector } from '@ngrx/store'; +import * as fromGet from './get.reducer'; +import * as fromSearch from './search.reducer'; + +export interface CaseFilesState { + search: fromSearch.State; + get: fromGet.State +} + +export const selectSearch = (state: CaseFilesState) => state.search; +export const selectGet = (state: CaseFilesState) => state.get; + +export const selectSearchResults = createSelector( + selectSearch, + (state: fromSearch.State) => { + if (!state || state.content == null) { + return []; + } + + return state.content.Content; + } +); + +export const selectGetResult = createSelector( + selectGet, + (state: fromGet.State) => { + if (!state) { + return null; + } + + return state.content; + } +); + +export const appReducer = { + search: fromSearch.searchReducer, + get: fromGet.getReducer +}; \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/search.reducer.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/search.reducer.js new file mode 100644 index 00000000..8a7835a1 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/search.reducer.js @@ -0,0 +1,22 @@ +export var ActionTypes; +(function (ActionTypes) { + ActionTypes["CASEDEFINITIONSLOAD"] = "[CaseDefinitions] Load"; + ActionTypes["CASEDEFINITIONSLOADED"] = "[CaseDefinitions] Loaded"; + ActionTypes["ERRORLOADCASEDEFINITIONS"] = "[CaseDefinitions] Error Load"; +})(ActionTypes || (ActionTypes = {})); +var LoadCaseDefinitionsAction = (function () { + function LoadCaseDefinitionsAction() { + this.type = ActionTypes.CASEDEFINITIONSLOAD; + } + return LoadCaseDefinitionsAction; +}()); +export { LoadCaseDefinitionsAction }; +var CaseDefinitionsLoadedAction = (function () { + function CaseDefinitionsLoadedAction(result) { + this.result = result; + this.type = ActionTypes.CASEDEFINITIONSLOADED; + } + return CaseDefinitionsLoadedAction; +}()); +export { CaseDefinitionsLoadedAction }; +//# sourceMappingURL=list-actions.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/search.reducer.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/search.reducer.js.map new file mode 100644 index 00000000..59065703 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/search.reducer.js.map @@ -0,0 +1 @@ +{"version":3,"file":"list-actions.js","sourceRoot":"","sources":["list-actions.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,6DAA8C,CAAA;IAC9C,iEAAkD,CAAA;IAClD,wEAAyD,CAAA;AAC7D,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,mBAAmB,CAAA;IACtB,CAAC;IACrB,gCAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,qCAAmB,MAAmC;QAAnC,WAAM,GAAN,MAAM,CAA6B;QADtD,SAAI,GAAG,WAAW,CAAC,qBAAqB,CAAA;IACkB,CAAC;IAC/D,kCAAC;AAAD,CAAC,AAHD,IAGC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/search.reducer.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/search.reducer.ts new file mode 100644 index 00000000..cd7b2a46 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/reducers/search.reducer.ts @@ -0,0 +1,24 @@ +import * as fromActions from '../actions/case-files'; +import { SearchCaseFilesResult } from "../models/search-case-files-result.model"; + +export interface State { + isLoading: boolean; + isErrorLoadOccured: boolean; + content: SearchCaseFilesResult; +} + +export const initialState: State = { + content: null, + isLoading: true, + isErrorLoadOccured: false +}; + +export function searchReducer(state = initialState, action: fromActions.ActionsUnion) { + switch (action.type) { + case fromActions.ActionTypes.COMPLETE_SEARCH: + state.content = action.content; + return { ...state }; + default: + return state; + } +} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/app/home/services/casefiles.service.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/services/casefiles.service.js similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/services/casefiles.service.js rename to src/CaseManagement.Website/angularApp/app/cases/casefiles/services/casefiles.service.js diff --git a/src/CaseManagement.Performance/angularApp/app/home/services/casefiles.service.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/services/casefiles.service.js.map similarity index 100% rename from src/CaseManagement.Performance/angularApp/app/home/services/casefiles.service.js.map rename to src/CaseManagement.Website/angularApp/app/cases/casefiles/services/casefiles.service.js.map diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/services/casefiles.service.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/services/casefiles.service.ts new file mode 100644 index 00000000..9db9e437 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/services/casefiles.service.ts @@ -0,0 +1,59 @@ +import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { OAuthService } from 'angular-oauth2-oidc'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { CaseFile } from '../models/case-file.model'; +import { SearchCaseFilesResult } from '../models/search-case-files-result.model'; + +@Injectable() +export class CaseFilesService { + constructor(private http: HttpClient, private oauthService: OAuthService) { } + + search(startIndex: number, count: number, order: string, direction: string, text: string, owner : string): Observable{ + let headers = new HttpHeaders(); + headers = headers.set('Accept', 'application/json'); + headers = headers.set('Authorization', 'Bearer ' + this.oauthService.getIdToken()); + let targetUrl = process.env.API_URL + "/case-files/search?start_index=" + startIndex + "&count=" + count; + if (order) { + targetUrl = targetUrl + "&order_by=" + order; + } + + if (direction) { + targetUrl = targetUrl + "&order=" + direction; + } + + if (text) { + targetUrl = targetUrl + "&text=" + text; + } + + if (owner) { + targetUrl = targetUrl + "&owner=" + owner; + } + + return this.http.get(targetUrl, { headers: headers }).pipe(map((res: any) => { + return SearchCaseFilesResult.fromJson(res); + })); + } + + get(id: string): Observable { + let headers = new HttpHeaders(); + headers = headers.set('Accept', 'application/json'); + headers = headers.set('Authorization', 'Bearer ' + this.oauthService.getIdToken()); + let targetUrl = process.env.API_URL + "/case-files/" + id; + return this.http.get(targetUrl, { headers: headers }).pipe(map((res: any) => { + return CaseFile.fromJson(res); + })); + } + + add(name: string, description: string) : Observable { + const request = JSON.stringify({ name: name, description: description}); + let headers = new HttpHeaders(); + headers = headers.set('Accept', 'application/json'); + headers = headers.set('Content-Type', 'application/json'); + headers = headers.set('Authorization', 'Bearer ' + this.oauthService.getIdToken()); + let targetUrl = process.env.API_URL + "/case-files"; + return this.http.post(targetUrl, request, { headers: headers }); + + } +} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.html b/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.html new file mode 100644 index 00000000..927ae749 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.html @@ -0,0 +1,15 @@ +
+
+ +
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.js b/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.js new file mode 100644 index 00000000..a3d2d7eb --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.js @@ -0,0 +1,453 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +import { Component } from '@angular/core'; +import { select, Store } from '@ngrx/store'; +import { ActionTypes } from './home-actions'; +var HomeComponent = (function () { + function HomeComponent(statisticStore, weekStatisticStore, monthStatisticStore) { + this.statisticStore = statisticStore; + this.weekStatisticStore = weekStatisticStore; + this.monthStatisticStore = monthStatisticStore; + this.viewPie = [300, 300]; + this.viewChart = [500, 300]; + this.caseStatistic = [ + { + "name": "Active", + "value": 0 + }, + { + "name": "Completed", + "value": 0 + }, + { + "name": "Terminated", + "value": 0 + }, + { + "name": "Failed", + "value": 0 + }, + { + "name": "Suspended", + "value": 0 + }, + { + "name": "Closed", + "value": 0 + } + ]; + this.caseStatisticColorScheme = { + domain: ['#d3d3d3', '#008000', '#ffff00', '#FF0000', '#FFA500', '#808080'] + }; + this.caseWeekStatistic = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + this.caseMonthStatistic = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + this.formStatistic = [ + { + "name": "Created", + "value": 0 + }, + { + "name": "Confirmed", + "value": 0 + } + ]; + this.formStatisticColorScheme = { + domain: ['#808080', '#008000'] + }; + this.formWeekStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + this.formMonthStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + this.activationStatisticColorScheme = { + domain: ['#808080', '#008000'] + }; + this.activationStatistic = [ + { + "name": "Created", + "value": 0 + }, + { + "name": "Confirmed", + "value": 0 + } + ]; + this.activationWeekStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + this.activationMonthStatistic = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + } + HomeComponent.prototype.ngOnInit = function () { + var _this = this; + this.statisticSubscription = this.statisticStore.pipe(select('statistic')).subscribe(function (st) { + if (!st) { + return; + } + if (st.content) { + _this.caseStatistic = [ + { + "name": "Active", + "value": st.content.NbActiveCases + }, + { + "name": "Completed", + "value": st.content.NbCompletedCases + }, + { + "name": "Terminated", + "value": st.content.NbTerminatedCases + }, + { + "name": "Failed", + "value": st.content.NbFailedCases + }, + { + "name": "Suspended", + "value": st.content.NbSuspendedCases + }, + { + "name": "Closed", + "value": st.content.NbClosedCases + } + ]; + _this.formStatistic = [ + { + "name": "Created", + "value": st.content.NbCreatedForms + }, + { + "name": "Confirmed", + "value": st.content.NbConfirmedForms + } + ]; + _this.activationStatistic = [ + { + "name": "Created", + "value": st.content.NbCreatedActivation + }, + { + "name": "Confirmed", + "value": st.content.NbConfirmedActivation + } + ]; + } + }); + this.weekSubscription = this.weekStatisticStore.pipe(select('weekStatistics')).subscribe(function (st) { + if (!st) { + return; + } + if (st.content) { + var caseWeekResult_1 = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + var formWeekResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + var activationWeekResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + st.content.Content.forEach(function (elt) { + caseWeekResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbActiveCases + }); + caseWeekResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbCompletedCases + }); + caseWeekResult_1[2].series.push({ + "name": elt.DateTime, + "value": elt.NbTerminatedCases + }); + caseWeekResult_1[3].series.push({ + "name": elt.DateTime, + "value": elt.NbFailedCases + }); + caseWeekResult_1[4].series.push({ + "name": elt.DateTime, + "value": elt.NbSuspendedCases + }); + caseWeekResult_1[5].series.push({ + "name": elt.DateTime, + "value": elt.NbClosedCases + }); + formWeekResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbCreatedForms + }); + formWeekResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbConfirmedForms + }); + activationWeekResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbCreatedForms + }); + activationWeekResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbConfirmedForms + }); + }); + _this.caseWeekStatistic = caseWeekResult_1; + _this.formWeekStatistic = formWeekResult_1; + _this.activationWeekStatistic = activationWeekResult_1; + } + }); + this.monthSubscription = this.monthStatisticStore.pipe(select('monthStatistics')).subscribe(function (st) { + if (!st) { + return; + } + if (st.content) { + var caseMonthResult_1 = [ + { + "name": "Active", + "series": [] + }, + { + "name": "Completed", + "series": [] + }, + { + "name": "Terminated", + "series": [] + }, + { + "name": "Failed", + "series": [] + }, + { + "name": "Suspended", + "series": [] + }, + { + "name": "Closed", + "series": [] + } + ]; + var formMonthResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + var activationMonthResult_1 = [ + { + "name": "Created", + "series": [] + }, + { + "name": "Confirmed", + "series": [] + } + ]; + st.content.Content.forEach(function (elt) { + caseMonthResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbActiveCases + }); + caseMonthResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbCompletedCases + }); + caseMonthResult_1[2].series.push({ + "name": elt.DateTime, + "value": elt.NbTerminatedCases + }); + caseMonthResult_1[3].series.push({ + "name": elt.DateTime, + "value": elt.NbFailedCases + }); + caseMonthResult_1[4].series.push({ + "name": elt.DateTime, + "value": elt.NbSuspendedCases + }); + caseMonthResult_1[5].series.push({ + "name": elt.DateTime, + "value": elt.NbClosedCases + }); + formMonthResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbCreatedForms + }); + formMonthResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbConfirmedForms + }); + activationMonthResult_1[0].series.push({ + "name": elt.DateTime, + "value": elt.NbCreatedForms + }); + activationMonthResult_1[1].series.push({ + "name": elt.DateTime, + "value": elt.NbConfirmedForms + }); + }); + _this.caseMonthStatistic = caseMonthResult_1; + _this.formMonthStatistic = formMonthResult_1; + _this.activationMonthStatistic = activationMonthResult_1; + } + }); + this.refresh(); + }; + HomeComponent.prototype.refresh = function () { + var loadStatisticRequest = { + type: ActionTypes.STATISTICLOAD + }; + var loadWeekStatisticsRequest = { + type: ActionTypes.SEARCHWEEKSTATISTICS, + count: 100 + }; + var loadMonthStatisticsRequest = { + type: ActionTypes.SEARCHMONTHSTATISTICS, + count: 100 + }; + this.statisticStore.dispatch(loadStatisticRequest); + this.weekStatisticStore.dispatch(loadWeekStatisticsRequest); + this.monthStatisticStore.dispatch(loadMonthStatisticsRequest); + }; + HomeComponent.prototype.ngOnDestroy = function () { + this.statisticSubscription.unsubscribe(); + this.weekSubscription.unsubscribe(); + this.monthSubscription.unsubscribe(); + }; + HomeComponent = __decorate([ + Component({ + selector: 'app-home-component', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'] + }), + __metadata("design:paramtypes", [Store, Store, Store]) + ], HomeComponent); + return HomeComponent; +}()); +export { HomeComponent }; +//# sourceMappingURL=home.component.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.js.map b/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.js.map new file mode 100644 index 00000000..06fe6d87 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.js.map @@ -0,0 +1 @@ +{"version":3,"file":"home.component.js","sourceRoot":"","sources":["home.component.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.scss b/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.ts b/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.ts new file mode 100644 index 00000000..903b1a58 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/casefiles/view/view.component.ts @@ -0,0 +1,54 @@ +import { Component, OnInit } from '@angular/core'; +import { select, Store } from '@ngrx/store'; +import * as fromCaseFiles from '../reducers'; +import { StartGet } from '../actions/case-files'; +import { ActivatedRoute } from '@angular/router'; +import { CaseFile } from '../models/case-file.model'; +let CmmnViewer = require('cmmn-js/lib/Modeler'), + propertiesPanelModule = require('cmmn-js-properties-panel'), + propertiesProviderModule = require('cmmn-js-properties-panel/lib/provider/cmmn'); + +@Component({ + selector: 'view-case-file', + templateUrl: './view.component.html', + styleUrls: ['./view.component.scss'] +}) +export class ViewCaseFilesComponent implements OnInit { + constructor(private store: Store, private route: ActivatedRoute) { + + } + + ngOnInit() { + let viewer = new CmmnViewer({ + additionalModules: [ + propertiesPanelModule, + propertiesProviderModule + ], + container: "#canvas", + keyboard: { + bindTo: window + }, + propertiesPanel: { + parent: '#properties' + } + }); + this.store.pipe(select(fromCaseFiles.selectGetResult)).subscribe((e: CaseFile) => { + if (!e) { + return; + } + + viewer.importXML(e.Payload, function (err: any) { + if (err) { + return; + } + }); + }); + this.refresh(); + } + + refresh() { + var id = this.route.snapshot.params['id']; + let request = new StartGet(id); + this.store.dispatch(request); + } +} diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.component.html b/src/CaseManagement.Website/angularApp/app/cases/cases.component.html new file mode 100644 index 00000000..c830bb80 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/cases.component.html @@ -0,0 +1,12 @@ + + + + {{ 'CASE_FILES' | translate }} + + {{ 'CASE_DEFINITIONS' | translate }} + + + + + + \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.component.js b/src/CaseManagement.Website/angularApp/app/cases/cases.component.js new file mode 100644 index 00000000..14f21f5c --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/cases.component.js @@ -0,0 +1,69 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +import { Component, ViewEncapsulation } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; +import { Router } from '@angular/router'; +var AppComponent = (function () { + function AppComponent(translate, router) { + this.router = router; + this.breadCrumbList = []; + translate.setDefaultLang('fr'); + translate.use('fr'); + } + AppComponent.prototype.ngOnInit = function () { + this.listenRouting(); + }; + AppComponent.prototype.listenRouting = function () { + var self = this; + var routerUrl; + var path; + var routerList; + this.router.events.subscribe(function (router) { + routerUrl = router.urlAfterRedirects; + if (!routerUrl || typeof routerUrl !== 'string') { + return; + } + path = ''; + self.breadCrumbList.length = 0; + if (routerUrl.includes('filter')) { + return; + } + routerList = routerUrl.slice(1).split('/'); + routerList.forEach(function (router, index) { + path += '/' + decodeURIComponent(router); + self.breadCrumbList.push({ + name: self.cleanUri(decodeURIComponent(router)), + index: index, + path: path, + isLast: index === routerList.length - 1 + }); + }); + }); + }; + AppComponent.prototype.cleanUri = function (uri) { + return uri.replace(/(\?.*)|(#.*)/g, ""); + }; + AppComponent = __decorate([ + Component({ + selector: 'app-component', + templateUrl: './app.component.html', + styleUrls: [ + './app.component.scss', + '../../node_modules/leaflet/dist/leaflet.css', + '../../node_modules/leaflet-search/dist/leaflet-search.src.css' + ], + encapsulation: ViewEncapsulation.None + }), + __metadata("design:paramtypes", [TranslateService, Router]) + ], AppComponent); + return AppComponent; +}()); +export { AppComponent }; +//# sourceMappingURL=app.component.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.component.js.map b/src/CaseManagement.Website/angularApp/app/cases/cases.component.js.map new file mode 100644 index 00000000..ed9dded2 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/cases.component.js.map @@ -0,0 +1 @@ +{"version":3,"file":"app.component.js","sourceRoot":"","sources":["app.component.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAU,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAmBzC;IAMI,sBAAY,SAA2B,EAAU,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAL/D,mBAAc,GAA0B,EAAE,CAAC;QAMvC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC/B,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,+BAAQ,GAAR;QACI,IAAI,CAAC,aAAa,EAAE,CAAC;IACzB,CAAC;IAEO,oCAAa,GAArB;QACI,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI,SAAiB,CAAC;QACtB,IAAI,IAAY,CAAC;QACjB,IAAI,UAAsB,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,UAAC,MAAW;YACrC,SAAS,GAAG,MAAM,CAAC,iBAAiB,CAAC;YACrC,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;gBAC7C,OAAO;aACV;YAED,IAAI,GAAG,EAAE,CAAC;YACV,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;YAC/B,IAAI,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAC9B,OAAO;aACV;YAED,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3C,UAAU,CAAC,OAAO,CAAC,UAAU,MAAM,EAAE,KAAK;gBACtC,IAAI,IAAI,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBACzC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;oBACrB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;oBAC/C,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,IAAI;oBACV,MAAM,EAAE,KAAK,KAAK,UAAU,CAAC,MAAM,GAAG,CAAC;iBAC1C,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,+BAAQ,GAAhB,UAAiB,GAAW;QACxB,OAAO,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC;IA/CQ,YAAY;QAXxB,SAAS,CAAC;YACP,QAAQ,EAAE,eAAe;YACzB,WAAW,EAAE,sBAAsB;YACnC,SAAS,EAAE;gBACP,sBAAsB;gBACtB,6CAA6C;gBAC7C,+DAA+D;aAClE;YACD,aAAa,EAAE,iBAAiB,CAAC,IAAI;SACxC,CAAC;yCAQyB,gBAAgB,EAAkB,MAAM;OANtD,YAAY,CAgDxB;IAAD,mBAAC;CAAA,AAhDD,IAgDC;SAhDY,YAAY"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.component.scss b/src/CaseManagement.Website/angularApp/app/cases/cases.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.component.ts b/src/CaseManagement.Website/angularApp/app/cases/cases.component.ts new file mode 100644 index 00000000..b395ae80 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/cases.component.ts @@ -0,0 +1,10 @@ +import { Component, ViewEncapsulation } from '@angular/core'; + +@Component({ + selector: 'cases-component', + templateUrl: './cases.component.html', + styleUrls: ['./cases.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class CasesComponent { +} diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.module.js b/src/CaseManagement.Website/angularApp/app/cases/cases.module.js new file mode 100644 index 00000000..d686d1b4 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/cases.module.js @@ -0,0 +1,65 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { EffectsModule } from '@ngrx/effects'; +import { StoreModule } from '@ngrx/store'; +import { StoreDevtoolsModule } from '@ngrx/store-devtools'; +import { MaterialModule } from '../shared/material.module'; +import { SharedModule } from '../shared/shared.module'; +import { CaseDefinitionsRoutes } from './casedefinitions.routes'; +import { ListCaseDefinitionsEffects } from './list/list-effects'; +import * as fromListCaseDefinitionsReducer from './list/list-reducer'; +import { ListCaseDefinitionsComponent } from './list/list.component'; +import { CaseDefinitionsService } from './services/casedefinitions.service'; +import { CaseFilesService } from './services/casefiles.service'; +import { CaseFormInstancesService } from './services/caseforminstances.service'; +import { CaseInstancesService } from './services/caseinstances.service'; +import { CaseActivationsService } from './services/caseactivations.service'; +import { ViewCaseDefinitionEffects } from './view/view-effects'; +import * as fromCaseDefinitionReducer from './view/view-reducer'; +import { ViewCaseDefinitionComponent } from './view/view.component'; +var CaseDefinitionsModule = (function () { + function CaseDefinitionsModule() { + } + CaseDefinitionsModule = __decorate([ + NgModule({ + imports: [ + CommonModule, + CaseDefinitionsRoutes, + SharedModule, + MaterialModule, + EffectsModule.forRoot([ListCaseDefinitionsEffects, ViewCaseDefinitionEffects]), + StoreModule.forRoot({ + caseDefinitions: fromListCaseDefinitionsReducer.reducer, + caseDefinition: fromCaseDefinitionReducer.caseDefinitionReducer, + caseInstances: fromCaseDefinitionReducer.caseInstancesReducer, + formInstances: fromCaseDefinitionReducer.formInstancesReducer, + caseActivations: fromCaseDefinitionReducer.caseActivationsReducer + }), + StoreDevtoolsModule.instrument({ + maxAge: 10 + }) + ], + entryComponents: [], + declarations: [ + ListCaseDefinitionsComponent, + ViewCaseDefinitionComponent + ], + providers: [ + CaseFilesService, + CaseDefinitionsService, + CaseInstancesService, + CaseFormInstancesService, + CaseActivationsService + ] + }) + ], CaseDefinitionsModule); + return CaseDefinitionsModule; +}()); +export { CaseDefinitionsModule }; +//# sourceMappingURL=casedefinitions.module.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.module.js.map b/src/CaseManagement.Website/angularApp/app/cases/cases.module.js.map new file mode 100644 index 00000000..0456819e --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/cases.module.js.map @@ -0,0 +1 @@ +{"version":3,"file":"casedefinitions.module.js","sourceRoot":"","sources":["casedefinitions.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,8BAA8B,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,yBAAyB,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAkCpE;IAAA;IAAqC,CAAC;IAAzB,qBAAqB;QAhCjC,QAAQ,CAAC;YACN,OAAO,EAAE;gBACL,YAAY;gBACZ,qBAAqB;gBACrB,YAAY;gBACZ,cAAc;gBACd,aAAa,CAAC,OAAO,CAAC,CAAC,0BAA0B,EAAE,yBAAyB,CAAC,CAAC;gBAC9E,WAAW,CAAC,OAAO,CAAC;oBAChB,eAAe,EAAE,8BAA8B,CAAC,OAAO;oBACvD,cAAc,EAAE,yBAAyB,CAAC,qBAAqB;oBAC/D,aAAa,EAAE,yBAAyB,CAAC,oBAAoB;oBAC7D,aAAa,EAAE,yBAAyB,CAAC,oBAAoB;oBAC7D,eAAe,EAAE,yBAAyB,CAAC,sBAAsB;iBACpE,CAAC;gBACF,mBAAmB,CAAC,UAAU,CAAC;oBAC3B,MAAM,EAAE,EAAE;iBACb,CAAC;aACL;YACD,eAAe,EAAE,EAAG;YACpB,YAAY,EAAE;gBACV,4BAA4B;gBAC5B,2BAA2B;aAC9B;YACD,SAAS,EAAE;gBACP,gBAAgB;gBAChB,sBAAsB;gBACtB,oBAAoB;gBACpB,wBAAwB;gBACxB,sBAAsB;aACzB;SACJ,CAAC;OAEW,qBAAqB,CAAI;IAAD,4BAAC;CAAA,AAAtC,IAAsC;SAAzB,qBAAqB"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.module.ts b/src/CaseManagement.Website/angularApp/app/cases/cases.module.ts new file mode 100644 index 00000000..2ca4118b --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/cases.module.ts @@ -0,0 +1,20 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { MaterialModule } from '../shared/material.module'; +import { SharedModule } from '../shared/shared.module'; +import { CasesRoutes } from './cases.routes'; +import { CasesComponent } from './cases.component'; + +@NgModule({ + imports: [ + CommonModule, + SharedModule, + MaterialModule, + CasesRoutes + ], + entryComponents: [], + declarations: [ CasesComponent ], + providers: [ ] +}) + +export class CasesModule { } \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.routes.js b/src/CaseManagement.Website/angularApp/app/cases/cases.routes.js new file mode 100644 index 00000000..964d0d81 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/cases.routes.js @@ -0,0 +1,9 @@ +import { RouterModule } from '@angular/router'; +import { ListCaseDefinitionsComponent } from './list/list.component'; +import { ViewCaseDefinitionComponent } from './view/view.component'; +var routes = [ + { path: '', component: ListCaseDefinitionsComponent }, + { path: ':id', component: ViewCaseDefinitionComponent } +]; +export var CaseDefinitionsRoutes = RouterModule.forChild(routes); +//# sourceMappingURL=casedefinitions.routes.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.routes.js.map b/src/CaseManagement.Website/angularApp/app/cases/cases.routes.js.map new file mode 100644 index 00000000..65cd586d --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/cases.routes.js.map @@ -0,0 +1 @@ +{"version":3,"file":"casedefinitions.routes.js","sourceRoot":"","sources":["casedefinitions.routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAU,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAEpE,IAAM,MAAM,GAAW;IACnB,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,4BAA4B,EAAE;IACrD,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,2BAA2B,EAAE;CAC1D,CAAC;AAEF,MAAM,CAAC,IAAM,qBAAqB,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.routes.module.js b/src/CaseManagement.Website/angularApp/app/cases/cases.routes.module.js new file mode 100644 index 00000000..d0f1a2a7 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/cases.routes.module.js @@ -0,0 +1,56 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { EffectsModule } from '@ngrx/effects'; +import { StoreModule } from '@ngrx/store'; +import { StoreDevtoolsModule } from '@ngrx/store-devtools'; +import { MaterialModule } from '../shared/material.module'; +import { SharedModule } from '../shared/shared.module'; +import { CaseDefEffects } from './case-def/case-def-effects'; +import * as fromCaseDefReducer from './case-def/case-def-reducer'; +import { CaseDefComponent } from './case-def/case-def.component'; +import { CaseDefinitionsRoutes } from './casedefinitions.routes'; +import { ListCaseDefsEffects } from './list-case-defs/list-case-defs-effects'; +import * as fromListCaseDefsReducer from './list-case-defs/list-case-defs-reducer'; +import { ListCaseDefsComponent } from './list-case-defs/list-case-defs.component'; +import { CaseDefinitionsService } from './services/casedefinitions.service'; +import { CaseInstancesService } from './services/caseinstances.service'; +var CaseDefinitionsModule = (function () { + function CaseDefinitionsModule() { + } + CaseDefinitionsModule = __decorate([ + NgModule({ + imports: [ + CommonModule, + CaseDefinitionsRoutes, + SharedModule, + MaterialModule, + EffectsModule.forRoot([ListCaseDefsEffects, CaseDefEffects]), + StoreModule.forRoot({ + caseDefs: fromListCaseDefsReducer.reducer, + caseDef: fromCaseDefReducer.reducer + }), + StoreDevtoolsModule.instrument({ + maxAge: 10 + }) + ], + entryComponents: [], + declarations: [ + ListCaseDefsComponent, + CaseDefComponent + ], + providers: [ + CaseDefinitionsService, + CaseInstancesService + ] + }) + ], CaseDefinitionsModule); + return CaseDefinitionsModule; +}()); +export { CaseDefinitionsModule }; +//# sourceMappingURL=casedefinitions.module.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.routes.module.js.map b/src/CaseManagement.Website/angularApp/app/cases/cases.routes.module.js.map new file mode 100644 index 00000000..7c670d5e --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/cases.routes.module.js.map @@ -0,0 +1 @@ +{"version":3,"file":"casedefinitions.module.js","sourceRoot":"","sources":["casedefinitions.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,kBAAkB,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,KAAK,uBAAuB,MAAM,yCAAyC,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AA4BxE;IAAA;IAAqC,CAAC;IAAzB,qBAAqB;QA1BjC,QAAQ,CAAC;YACN,OAAO,EAAE;gBACL,YAAY;gBACZ,qBAAqB;gBACrB,YAAY;gBACZ,cAAc;gBACd,aAAa,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;gBAC5D,WAAW,CAAC,OAAO,CAAC;oBAChB,QAAQ,EAAE,uBAAuB,CAAC,OAAO;oBACzC,OAAO,EAAE,kBAAkB,CAAC,OAAO;iBACtC,CAAC;gBACF,mBAAmB,CAAC,UAAU,CAAC;oBAC3B,MAAM,EAAE,EAAE;iBACb,CAAC;aACL;YACD,eAAe,EAAE,EAAG;YACpB,YAAY,EAAE;gBACV,qBAAqB;gBACrB,gBAAgB;aACnB;YACD,SAAS,EAAE;gBACP,sBAAsB;gBACtB,oBAAoB;aACvB;SACJ,CAAC;OAEW,qBAAqB,CAAI;IAAD,4BAAC;CAAA,AAAtC,IAAsC;SAAzB,qBAAqB"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/cases/cases.routes.ts b/src/CaseManagement.Website/angularApp/app/cases/cases.routes.ts new file mode 100644 index 00000000..a918b4d7 --- /dev/null +++ b/src/CaseManagement.Website/angularApp/app/cases/cases.routes.ts @@ -0,0 +1,9 @@ +import { RouterModule, Routes } from '@angular/router'; +import { CasesComponent } from './cases.component'; + +const routes: Routes = [ + { path: '', redirectTo: 'casefiles', pathMatch: 'full' }, + { path: 'casefiles', component: CasesComponent, loadChildren: './casefiles/casefiles.module#CaseFilesModule' }, +]; + +export const CasesRoutes = RouterModule.forChild(routes); \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/common/components/navigation/navigation.component.html b/src/CaseManagement.Website/angularApp/app/common/components/navigation/navigation.component.html index 64266f67..29888095 100644 --- a/src/CaseManagement.Website/angularApp/app/common/components/navigation/navigation.component.html +++ b/src/CaseManagement.Website/angularApp/app/common/components/navigation/navigation.component.html @@ -1,10 +1,20 @@ - + - - +
+ + + + + +
+
+ +
diff --git a/src/CaseManagement.Website/angularApp/app/common/components/navigation/navigation.component.scss b/src/CaseManagement.Website/angularApp/app/common/components/navigation/navigation.component.scss index e69de29b..03c0e428 100644 --- a/src/CaseManagement.Website/angularApp/app/common/components/navigation/navigation.component.scss +++ b/src/CaseManagement.Website/angularApp/app/common/components/navigation/navigation.component.scss @@ -0,0 +1,3 @@ +.navigation-spacer { + flex: 1 1 auto; +} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/common/components/navigation/navigation.component.ts b/src/CaseManagement.Website/angularApp/app/common/components/navigation/navigation.component.ts index b14879c0..33f9a1d8 100644 --- a/src/CaseManagement.Website/angularApp/app/common/components/navigation/navigation.component.ts +++ b/src/CaseManagement.Website/angularApp/app/common/components/navigation/navigation.component.ts @@ -1,20 +1,56 @@ import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; +import { OAuthService } from 'angular-oauth2-oidc'; @Component({ selector: 'app-navigation', templateUrl: 'navigation.component.html', styleUrls: ['./navigation.component.scss'] }) - export class NavigationComponent implements OnInit { - constructor(private translateService: TranslateService) { } + url: string = process.env.BASE_URL + "assets/images/logo.svg"; + isConnected: boolean = false; + name: string; + roles: any; + + constructor(private translateService: TranslateService, private oauthService: OAuthService, private router : Router) { } chooseLanguage(lng: string) { this.translateService.use(lng); } - ngOnInit() { + login() { + this.oauthService.initImplicitFlow(); + return false; + } + + disconnect() { + this.oauthService.logOut(); + this.router.navigate(['/home']); + return false; + } + + init() { + var claims: any = this.oauthService.getIdentityClaims(); + if (!claims) { + this.isConnected = false;; + return; + } + this.name = claims.given_name; + this.roles = claims.role; + this.isConnected = true; + } + + ngOnInit() { + this.init(); + this.oauthService.events.subscribe((e: any) => { + if (e.type === "logout") { + this.isConnected = false; + } else if (e.type === "token_received") { + this.init(); + } + }); } } diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home-actions.js b/src/CaseManagement.Website/angularApp/app/home/components/home-actions.js deleted file mode 100644 index f02cef50..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/components/home-actions.js +++ /dev/null @@ -1,58 +0,0 @@ -export var ActionTypes; -(function (ActionTypes) { - ActionTypes["STATISTICLOAD"] = "[Statistic] Load"; - ActionTypes["STATISTICLOADED"] = "[Statistic] Loaded"; - ActionTypes["ERRORLOADSTATISTIC"] = "[Statistic] Error Load"; - ActionTypes["SEARCHWEEKSTATISTICS"] = "[SearchWeekStatistic] Load"; - ActionTypes["WEEKSTATISTICSLOADED"] = "[SearchWeekStatistic] Loaded"; - ActionTypes["ERRORWEEKSTATISTICS"] = "[SearchWeekStatistic] Error Load"; - ActionTypes["SEARCHMONTHSTATISTICS"] = "[SearchMonthStatistic] Load"; - ActionTypes["MONTHSTATISTICSLOADED"] = "[SearchMonthStatistic] Loaded"; - ActionTypes["ERRORMONTHSTATISTICS"] = "[SearchMonthStatistic] Error Load"; -})(ActionTypes || (ActionTypes = {})); -var LoadStatisticAction = (function () { - function LoadStatisticAction() { - this.type = ActionTypes.STATISTICLOAD; - } - return LoadStatisticAction; -}()); -export { LoadStatisticAction }; -var StatisticLoadedAction = (function () { - function StatisticLoadedAction(result) { - this.result = result; - this.type = ActionTypes.STATISTICLOADED; - } - return StatisticLoadedAction; -}()); -export { StatisticLoadedAction }; -var LoadWeekStatisticsAction = (function () { - function LoadWeekStatisticsAction() { - this.type = ActionTypes.SEARCHWEEKSTATISTICS; - } - return LoadWeekStatisticsAction; -}()); -export { LoadWeekStatisticsAction }; -var WeekStatisticsLoadedAction = (function () { - function WeekStatisticsLoadedAction(result) { - this.result = result; - this.type = ActionTypes.WEEKSTATISTICSLOADED; - } - return WeekStatisticsLoadedAction; -}()); -export { WeekStatisticsLoadedAction }; -var LoadMonthStatisticsAction = (function () { - function LoadMonthStatisticsAction() { - this.type = ActionTypes.SEARCHMONTHSTATISTICS; - } - return LoadMonthStatisticsAction; -}()); -export { LoadMonthStatisticsAction }; -var MonthStatisticsLoadedAction = (function () { - function MonthStatisticsLoadedAction(result) { - this.result = result; - this.type = ActionTypes.MONTHSTATISTICSLOADED; - } - return MonthStatisticsLoadedAction; -}()); -export { MonthStatisticsLoadedAction }; -//# sourceMappingURL=home-actions.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home-actions.js.map b/src/CaseManagement.Website/angularApp/app/home/components/home-actions.js.map deleted file mode 100644 index 6903e170..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/components/home-actions.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"home-actions.js","sourceRoot":"","sources":["home-actions.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,WAUX;AAVD,WAAY,WAAW;IACnB,iDAAkC,CAAA;IAClC,qDAAsC,CAAA;IACtC,4DAA6C,CAAA;IAC7C,kEAAmD,CAAA;IACnD,oEAAqD,CAAA;IACrD,uEAAwD,CAAA;IACxD,oEAAqD,CAAA;IACrD,sEAAuD,CAAA;IACvD,yEAA0D,CAAA;AAC9D,CAAC,EAVW,WAAW,KAAX,WAAW,QAUtB;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,aAAa,CAAA;IAChB,CAAC;IACrB,0BAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,+BAAmB,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;QADzC,SAAI,GAAG,WAAW,CAAC,eAAe,CAAA;IACW,CAAC;IAClD,4BAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,oBAAoB,CAAA;IACvB,CAAC;IACrB,+BAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,oCAAmB,MAAmC;QAAnC,WAAM,GAAN,MAAM,CAA6B;QADtD,SAAI,GAAG,WAAW,CAAC,oBAAoB,CAAA;IACmB,CAAC;IAC/D,iCAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI;QADA,SAAI,GAAG,WAAW,CAAC,qBAAqB,CAAA;IACxB,CAAC;IACrB,gCAAC;AAAD,CAAC,AAHD,IAGC;;AAED;IAEI,qCAAmB,MAAmC;QAAnC,WAAM,GAAN,MAAM,CAA6B;QADtD,SAAI,GAAG,WAAW,CAAC,qBAAqB,CAAA;IACkB,CAAC;IAC/D,kCAAC;AAAD,CAAC,AAHD,IAGC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home-actions.ts b/src/CaseManagement.Website/angularApp/app/home/components/home-actions.ts deleted file mode 100644 index 2b6c8f0b..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/components/home-actions.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { Action } from '@ngrx/store'; -import { DailyStatistic } from '../models/dailystatistic.model'; -import { SearchDailyStatisticsResult } from '../models/search-dailystatistics-result.model'; -import { CountResult } from '../../casedefinitions/models/count-result.model'; - -export enum ActionTypes { - STATISTICLOAD = "[Statistic] Load", - STATISTICLOADED = "[Statistic] Loaded", - ERRORLOADSTATISTIC = "[Statistic] Error Load", - SEARCHWEEKSTATISTICS = "[SearchWeekStatistic] Load", - WEEKSTATISTICSLOADED = "[SearchWeekStatistic] Loaded", - ERRORWEEKSTATISTICS = "[SearchWeekStatistic] Error Load", - SEARCHMONTHSTATISTICS = "[SearchMonthStatistic] Load", - MONTHSTATISTICSLOADED = "[SearchMonthStatistic] Loaded", - ERRORMONTHSTATISTICS = "[SearchMonthStatistic] Error Load", - DEPLOYEDLOAD = "[Deployed] Load", - DEPLOYEDLOADED = "[Deployed] Loaded", - ERRORLOADDEPLOYED = "[Deployed] Error Load" -} - -export class LoadStatisticAction implements Action { - type = ActionTypes.STATISTICLOAD - constructor() { } -} - -export class StatisticLoadedAction implements Action { - type = ActionTypes.STATISTICLOADED - constructor(public result: DailyStatistic) { } -} - -export class LoadWeekStatisticsAction implements Action { - type = ActionTypes.SEARCHWEEKSTATISTICS - constructor() { } -} - -export class WeekStatisticsLoadedAction implements Action { - type = ActionTypes.WEEKSTATISTICSLOADED - constructor(public result: SearchDailyStatisticsResult) { } -} - -export class LoadMonthStatisticsAction implements Action { - type = ActionTypes.SEARCHMONTHSTATISTICS - constructor() { } -} - -export class MonthStatisticsLoadedAction implements Action { - type = ActionTypes.MONTHSTATISTICSLOADED - constructor(public result: SearchDailyStatisticsResult) { } -} - -export class LoadDeployedAction implements Action { - type = ActionTypes.DEPLOYEDLOAD - constructor() { } -} - -export class DeployedLoadedAction implements Action { - type = ActionTypes.DEPLOYEDLOADED - constructor(public nbCaseDefinitions: CountResult, public nbCaseFiles: CountResult) { } -} - -export type ActionsUnion = LoadStatisticAction | StatisticLoadedAction | LoadWeekStatisticsAction | WeekStatisticsLoadedAction | LoadMonthStatisticsAction | MonthStatisticsLoadedAction | LoadDeployedAction | DeployedLoadedAction; \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home-effects.js.map b/src/CaseManagement.Website/angularApp/app/home/components/home-effects.js.map deleted file mode 100644 index 91a62d6a..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/components/home-effects.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"home-effects.js","sourceRoot":"","sources":["home-effects.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,SAAS,kBAAkB;IACvB,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACnE,OAAO,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,gBAAgB;IACrB,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;IACnB,IAAI,GAAG,GAAG,CAAC,CAAC,MAAM,EAAE,EAChB,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,OAAO,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,OAAO,CAAC,CAAQ;IACrB,OAAO,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;AAC1E,CAAC;AAGD;IACI,qBACY,QAAiB,EACjB,gBAAkC;QAF9C,iBAGK;QAFO,aAAQ,GAAR,QAAQ,CAAS;QACjB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAI9C,kBAAa,GAAG,IAAI,CAAC,QAAQ;aACxB,IAAI,CACD,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,EACjC,QAAQ,CAAC;YACL,OAAO,KAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE;iBAC7B,IAAI,CACD,GAAG,CAAC,UAAA,SAAS,IAAM,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,EACtF,UAAU,CAAC,cAAM,OAAA,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,kBAAkB,EAAE,CAAC,EAA5C,CAA4C,CAAC,CACjE,CAAC;QACN,CAAC,CACJ,CACR,CAAC;QAGF,yBAAoB,GAAG,IAAI,CAAC,QAAQ;aAC/B,IAAI,CACD,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC,EACxC,QAAQ,CAAC,UAAC,GAAQ;YACd,IAAI,IAAI,GAAG,gBAAgB,EAAE,CAAC;YAC9B,OAAO,KAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;iBAC/F,IAAI,CACD,GAAG,CAAC,UAAA,SAAS,IAAM,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,oBAAoB,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,EAC3F,UAAU,CAAC,cAAM,OAAA,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,mBAAmB,EAAE,CAAC,EAA7C,CAA6C,CAAC,CAClE,CAAC;QACV,CAAC,CACA,CACR,CAAC;QAGF,0BAAqB,GAAG,IAAI,CAAC,QAAQ;aAChC,IAAI,CACD,MAAM,CAAC,WAAW,CAAC,qBAAqB,CAAC,EACzC,QAAQ,CAAC,UAAC,GAAQ;YACd,IAAI,IAAI,GAAG,kBAAkB,EAAE,CAAC;YAChC,OAAO,KAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;iBAC/F,IAAI,CACD,GAAG,CAAC,UAAA,SAAS,IAAM,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,qBAAqB,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,EAC5F,UAAU,CAAC,cAAM,OAAA,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,oBAAoB,EAAE,CAAC,EAA9C,CAA8C,CAAC,CACnE,CAAC;QACV,CAAC,CACA,CACJ,CAAC;IA5CF,CAAC;IAGL;QADC,MAAM,EAAE;;sDAYP;IAGF;QADC,MAAM,EAAE;;6DAaP;IAGF;QADC,MAAM,EAAE;;8DAaH;IAhDG,WAAW;QADvB,UAAU,EAAE;yCAGa,OAAO;YACC,gBAAgB;OAHrC,WAAW,CAiDvB;IAAD,kBAAC;CAAA,AAjDD,IAiDC;SAjDY,WAAW"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home-effects.ts b/src/CaseManagement.Website/angularApp/app/home/components/home-effects.ts deleted file mode 100644 index 34c8dd4c..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/components/home-effects.ts +++ /dev/null @@ -1,91 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { of } from 'rxjs'; -import { Observable } from 'rxjs/Rx'; -import { catchError, map, mergeMap } from 'rxjs/operators'; -import { StatisticService } from '../services/statistic.service'; -import { ActionTypes } from './home-actions'; -import { CaseDefinitionsService } from '../../casedefinitions/services/casedefinitions.service'; -import { CaseFilesService } from '../../casedefinitions/services/casefiles.service'; - -function getFirstDayOfMonth() { - var date = new Date(), y = date.getFullYear(), m = date.getMonth(); - return getDate(new Date(y, m, 1)); -} - -function getCurrentMonday() { - let d = new Date(); - var day = d.getDay(), - diff = d.getDate() - day + (day == 0 ? -6 : 1); - return getDate(new Date(d.setDate(diff))); -} - -function getDate(d : Date) { - return d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate(); -} - -@Injectable() -export class HomeEffects { - constructor( - private actions$: Actions, - private statisticService: StatisticService, - private caseDefinitionsService: CaseDefinitionsService, - private caseFilesService: CaseFilesService - ) { } - - @Effect() - loadStatistic = this.actions$ - .pipe( - ofType(ActionTypes.STATISTICLOAD), - mergeMap(() => { - return this.statisticService.get() - .pipe( - map(statistic => { return { type: ActionTypes.STATISTICLOADED, result: statistic }; }), - catchError(() => of({ type: ActionTypes.ERRORLOADSTATISTIC })) - ); - } - ) - ); - - @Effect() - searchWeekStatistics = this.actions$ - .pipe( - ofType(ActionTypes.SEARCHWEEKSTATISTICS), - mergeMap((evt: any) => { - var date = getCurrentMonday(); - return this.statisticService.search(evt.startIndex, evt.count, evt.order, evt.direction, date, null) - .pipe( - map(statistic => { return { type: ActionTypes.WEEKSTATISTICSLOADED, result: statistic }; }), - catchError(() => of({ type: ActionTypes.ERRORWEEKSTATISTICS })) - ); - } - ) - ); - - @Effect() - searchMonthStatistics = this.actions$ - .pipe( - ofType(ActionTypes.SEARCHMONTHSTATISTICS), - mergeMap((evt: any) => { - var date = getFirstDayOfMonth(); - return this.statisticService.search(evt.startIndex, evt.count, evt.order, evt.direction, date, null) - .pipe( - map(statistic => { return { type: ActionTypes.MONTHSTATISTICSLOADED, result: statistic }; }), - catchError(() => of({ type: ActionTypes.ERRORMONTHSTATISTICS })) - ); - } - ) - ); - - @Effect() - loadDeployed = this.actions$ - .pipe( - ofType(ActionTypes.DEPLOYEDLOAD), - mergeMap(() => { - return Observable.forkJoin([this.caseDefinitionsService.count(), this.caseFilesService.count()]).pipe( - map(responses => { return { type: ActionTypes.DEPLOYEDLOADED, nbCaseDefinitions: responses[0], nbCaseFiles: responses[1] }; }), - catchError(() => of({ type: ActionTypes.ERRORLOADDEPLOYED })) - ); - }) - ); -} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home-reducer.js.map b/src/CaseManagement.Website/angularApp/app/home/components/home-reducer.js.map deleted file mode 100644 index 0cb550e7..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/components/home-reducer.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"home-reducer.js","sourceRoot":"","sources":["home-reducer.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAgB,WAAW,EAAkF,MAAM,gBAAgB,CAAC;AAG3I,IAAM,sBAAsB,GAAmB;IAC3C,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,KAAK;CAC5B,CAAC;AAEF,IAAM,0BAA0B,GAAwB;IACpD,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,KAAK;CAC5B,CAAC;AAEF,IAAM,2BAA2B,GAAyB;IACtD,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,KAAK;CAC5B,CAAC;AAEF,MAAM,UAAU,gBAAgB,CAAC,KAA8B,EAAE,MAAoB;IAApD,sBAAA,EAAA,8BAA8B;IAC3D,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,WAAW,CAAC,eAAe;YAC5B,IAAI,qBAAqB,GAA0B,MAAM,CAAC;YAC1D,KAAK,CAAC,OAAO,GAAG,qBAAqB,CAAC,MAAM,CAAC;YAC7C,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,oBAAY,KAAK,EAAG;QACxB,KAAK,WAAW,CAAC,kBAAkB;YAC/B,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAChC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,oBAAY,KAAK,EAAG;QACxB;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAkC,EAAE,MAAoB;IAAxD,sBAAA,EAAA,kCAAkC;IACpE,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,WAAW,CAAC,oBAAoB;YACjC,IAAI,qBAAqB,GAA+B,MAAM,CAAC;YAC/D,KAAK,CAAC,OAAO,GAAG,qBAAqB,CAAC,MAAM,CAAC;YAC7C,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,oBAAY,KAAK,EAAG;QACxB,KAAK,WAAW,CAAC,mBAAmB;YAChC,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAChC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,oBAAY,KAAK,EAAG;QACxB;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAAmC,EAAE,MAAoB;IAAzD,sBAAA,EAAA,mCAAmC;IACtE,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,WAAW,CAAC,qBAAqB;YAClC,IAAI,qBAAqB,GAAgC,MAAM,CAAC;YAChE,KAAK,CAAC,OAAO,GAAG,qBAAqB,CAAC,MAAM,CAAC;YAC7C,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,oBAAY,KAAK,EAAG;QACxB,KAAK,WAAW,CAAC,oBAAoB;YACjC,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAChC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,oBAAY,KAAK,EAAG;QACxB;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home-reducer.ts b/src/CaseManagement.Website/angularApp/app/home/components/home-reducer.ts deleted file mode 100644 index ea1f916f..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/components/home-reducer.ts +++ /dev/null @@ -1,96 +0,0 @@ -import { ActionsUnion, ActionTypes, MonthStatisticsLoadedAction, StatisticLoadedAction, WeekStatisticsLoadedAction, DeployedLoadedAction } from './home-actions'; -import { MonthStatisticsState, StatisticState, WeekStatisticsState, DeployedState } from './home-states'; - -const initialStatisticAction: StatisticState = { - content: null, - isLoading: true, - isErrorLoadOccured: false -}; - -const initialWeekStatisticAction: WeekStatisticsState = { - content: null, - isLoading: true, - isErrorLoadOccured: false -}; - -const initialMonthStatisticAction: MonthStatisticsState = { - content: null, - isLoading: true, - isErrorLoadOccured: false -}; - -const initalDeployedState: DeployedState = { - isErrorLoadOccured: false, - isLoading: true, - nbCaseDefinitions: null, - nbCaseFiles : null -}; - -export function statisticReducer(state = initialStatisticAction, action: ActionsUnion) { - switch (action.type) { - case ActionTypes.STATISTICLOADED: - let statisticLoadedAction = action; - state.content = statisticLoadedAction.result; - state.isLoading = false; - state.isErrorLoadOccured = false; - return { ...state }; - case ActionTypes.ERRORLOADSTATISTIC: - state.isErrorLoadOccured = true; - state.isLoading = false; - return { ...state }; - default: - return state; - } -} - -export function weekStatisticsReducer(state = initialWeekStatisticAction, action: ActionsUnion) { - switch (action.type) { - case ActionTypes.WEEKSTATISTICSLOADED: - let statisticLoadedAction = action; - state.content = statisticLoadedAction.result; - state.isLoading = false; - state.isErrorLoadOccured = false; - return { ...state }; - case ActionTypes.ERRORWEEKSTATISTICS: - state.isErrorLoadOccured = true; - state.isLoading = false; - return { ...state }; - default: - return state; - } -} - -export function monthStatisticsReducer(state = initialMonthStatisticAction, action: ActionsUnion) { - switch (action.type) { - case ActionTypes.MONTHSTATISTICSLOADED: - let statisticLoadedAction = action; - state.content = statisticLoadedAction.result; - state.isLoading = false; - state.isErrorLoadOccured = false; - return { ...state }; - case ActionTypes.ERRORMONTHSTATISTICS: - state.isErrorLoadOccured = true; - state.isLoading = false; - return { ...state }; - default: - return state; - } -} - -export function deployedReducer(state = initalDeployedState, action: ActionsUnion) { - switch (action.type) { - case ActionTypes.DEPLOYEDLOADED: - let deployedLoadedAction = action; - state.nbCaseDefinitions = deployedLoadedAction.nbCaseDefinitions; - state.nbCaseFiles = deployedLoadedAction.nbCaseFiles; - state.isLoading = false; - state.isErrorLoadOccured = false; - return { ...state }; - case ActionTypes.ERRORLOADDEPLOYED: - state.isErrorLoadOccured = true; - state.isLoading = false; - return { ...state }; - default: - return state; - } -} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home-states.js b/src/CaseManagement.Website/angularApp/app/home/components/home-states.js deleted file mode 100644 index 4f1cd144..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/components/home-states.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=home-states.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home-states.js.map b/src/CaseManagement.Website/angularApp/app/home/components/home-states.js.map deleted file mode 100644 index 4f6849e9..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/components/home-states.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"home-states.js","sourceRoot":"","sources":["home-states.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home-states.ts b/src/CaseManagement.Website/angularApp/app/home/components/home-states.ts deleted file mode 100644 index c53aebef..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/components/home-states.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { DailyStatistic } from "../models/dailystatistic.model"; -import { SearchDailyStatisticsResult } from "../models/search-dailystatistics-result.model"; -import { CountResult } from "../../casedefinitions/models/count-result.model"; - -export interface StatisticState { - isLoading: boolean; - isErrorLoadOccured: boolean; - content: DailyStatistic; -} - -export interface WeekStatisticsState { - isLoading: boolean; - isErrorLoadOccured: boolean; - content: SearchDailyStatisticsResult; -} - -export interface MonthStatisticsState { - isLoading: boolean; - isErrorLoadOccured: boolean; - content: SearchDailyStatisticsResult; -} - -export interface DeployedState { - nbCaseFiles: CountResult; - nbCaseDefinitions: CountResult; - isLoading: boolean; - isErrorLoadOccured: boolean; -} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home.component.html b/src/CaseManagement.Website/angularApp/app/home/components/home.component.html index 7a371f79..c40b897e 100644 --- a/src/CaseManagement.Website/angularApp/app/home/components/home.component.html +++ b/src/CaseManagement.Website/angularApp/app/home/components/home.component.html @@ -1,185 +1,5 @@ -
-
-
-
-
- - - {{ "RIGHT_NOW" | translate }} - - -
-
-

{{ "CASE_STATUS" | translate }}

- - -
-
-

{{ "FORM_STATUS" | translate }}

- - -
-
-

{{ "ACTIVATION_STATUS" | translate }}

- - -
-
- - - - - {{ "METRICS" | translate }} - - - - -
-
-
-

{{ "CASE_STATUS" | translate }}

- - - -
-
-

{{ "FORM_STATUS" | translate }}

- - - -
-
-
-

{{ "ACTIVATION_STATUS" | translate }}

- - - -
-
- - -
-
-
-

{{ "CASE_STATUS" | translate }}

- - - -
-
-

{{ "FORM_STATUS" | translate }}

- - - -
-
-
-

{{ "ACTIVATION_STATUS" | translate }}

- - - -
-
- - - - -
-
-
- - - {{ "DEPLOYED" | translate }} - - - - -

{{ "CASE_FILES" | translate }}

-

{{ nbCaseFiles }}

- - -

{{ "CASE_DEFINITIONS" | translate}}

-

{{ nbCaseDefinitions }}

- - - - -
-
+
+
+
{{ "HOME" | translate }}
\ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/components/home.component.ts b/src/CaseManagement.Website/angularApp/app/home/components/home.component.ts index cacc2132..f05577b0 100644 --- a/src/CaseManagement.Website/angularApp/app/home/components/home.component.ts +++ b/src/CaseManagement.Website/angularApp/app/home/components/home.component.ts @@ -1,462 +1,9 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { select, Store } from '@ngrx/store'; -import { DailyStatistic } from '../models/dailystatistic.model'; -import { ActionTypes } from './home-actions'; -import * as fromHomeSates from './home-states'; -import { DatePipe } from '@angular/common'; +import { Component } from '@angular/core'; @Component({ - selector: 'app-home-component', - templateUrl: './home.component.html', - styleUrls: ['./home.component.scss'] + selector: 'app-home-component', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'] }) -export class HomeComponent implements OnInit, OnDestroy { - statisticSubscription: any; - weekSubscription: any; - monthSubscription: any; - deployedSubscription: any; - nbCaseDefinitions: number = 0; - nbCaseFiles: number = 0; - viewPie: any[] = [300, 300]; - viewChart: any[] = [500, 300]; - caseStatistic: any[] = [ - { - "name": "Active", - "value": 0 - }, - { - "name": "Completed", - "value": 0 - }, - { - "name": "Terminated", - "value": 0 - }, - { - "name": "Failed", - "value": 0 - }, - { - "name": "Suspended", - "value": 0 - }, - { - "name": "Closed", - "value": 0 - } - ]; - caseStatisticColorScheme = { - domain: ['#d3d3d3', '#008000', '#ffff00', '#FF0000', '#FFA500', '#808080'] - }; - caseWeekStatistic: any[] = [ - { - "name": "Active", - "series": [] - }, - { - "name": "Completed", - "series": [] - }, - { - "name": "Terminated", - "series": [] - }, - { - "name": "Failed", - "series": [] - }, - { - "name": "Suspended", - "series": [] - }, - { - "name": "Closed", - "series": [] - } - ]; - caseMonthStatistic: any[] = [ - { - "name": "Active", - "series": [] - }, - { - "name": "Completed", - "series": [] - }, - { - "name": "Terminated", - "series": [] - }, - { - "name": "Failed", - "series": [] - }, - { - "name": "Suspended", - "series": [] - }, - { - "name": "Closed", - "series": [] - } - ]; - formStatistic: any[] = [ - { - "name": "Created", - "value": 0 - }, - { - "name": "Confirmed", - "value": 0 - } - ]; - formStatisticColorScheme = { - domain: ['#808080', '#008000'] - }; - formWeekStatistic: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - formMonthStatistic: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - activationStatisticColorScheme = { - domain: ['#808080', '#008000'] - }; - activationStatistic: any[] = [ - { - "name": "Created", - "value": 0 - }, - { - "name": "Confirmed", - "value": 0 - } - ]; - activationWeekStatistic: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - activationMonthStatistic: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - constructor(private statisticStore: Store, private weekStatisticStore: Store, private monthStatisticStore: Store, private deployedStore : Store, private datePipe: DatePipe) { } - - ngOnInit() { - let self = this; - this.statisticSubscription = this.statisticStore.pipe(select('statistic')).subscribe((st: fromHomeSates.StatisticState) => { - if (!st) { - return; - } - - if (st.content) { - this.caseStatistic = [ - { - "name": "Active", - "value": st.content.NbActiveCases - }, - { - "name": "Completed", - "value": st.content.NbCompletedCases - }, - { - "name": "Terminated", - "value": st.content.NbTerminatedCases - }, - { - "name": "Failed", - "value": st.content.NbFailedCases - }, - { - "name": "Suspended", - "value": st.content.NbSuspendedCases - }, - { - "name": "Closed", - "value": st.content.NbClosedCases - } - ]; - this.formStatistic = [ - { - "name": "Created", - "value": st.content.NbCreatedForms - }, - { - "name": "Confirmed", - "value": st.content.NbConfirmedForms - } - ]; - this.activationStatistic = [ - { - "name": "Created", - "value": st.content.NbCreatedActivation - }, - { - "name": "Confirmed", - "value": st.content.NbConfirmedActivation - } - ]; - } - }); - this.weekSubscription = this.weekStatisticStore.pipe(select('weekStatistics')).subscribe((st: fromHomeSates.WeekStatisticsState) => { - if (!st) { - return; - } - - if (st.content) { - let caseWeekResult: any[] = [ - { - "name": "Active", - "series": [] - }, - { - "name": "Completed", - "series": [] - }, - { - "name": "Terminated", - "series": [] - }, - { - "name": "Failed", - "series": [] - }, - { - "name": "Suspended", - "series": [] - }, - { - "name": "Closed", - "series": [] - } - ]; - let formWeekResult: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - let activationWeekResult: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - st.content.Content.forEach(function (elt: DailyStatistic) { - caseWeekResult[0].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbActiveCases - }); - caseWeekResult[1].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbCompletedCases - }); - caseWeekResult[2].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbTerminatedCases - }); - caseWeekResult[3].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbFailedCases - }); - caseWeekResult[4].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbSuspendedCases - }); - caseWeekResult[5].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbClosedCases - }); - formWeekResult[0].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbCreatedForms - }); - formWeekResult[1].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbConfirmedForms - }); - activationWeekResult[0].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbCreatedForms - }); - activationWeekResult[1].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbConfirmedForms - }); - }); - - this.caseWeekStatistic = caseWeekResult; - this.formWeekStatistic = formWeekResult; - this.activationWeekStatistic = activationWeekResult; - } - }); - this.monthSubscription = this.monthStatisticStore.pipe(select('monthStatistics')).subscribe((st: fromHomeSates.WeekStatisticsState) => { - if (!st) { - return; - } - - if (st.content) { - let caseMonthResult: any[] = [ - { - "name": "Active", - "series": [] - }, - { - "name": "Completed", - "series": [] - }, - { - "name": "Terminated", - "series": [] - }, - { - "name": "Failed", - "series": [] - }, - { - "name": "Suspended", - "series": [] - }, - { - "name": "Closed", - "series": [] - } - ]; - let formMonthResult: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - let activationMonthResult: any[] = [ - { - "name": "Created", - "series": [] - }, - { - "name": "Confirmed", - "series": [] - } - ]; - st.content.Content.forEach(function (elt: DailyStatistic) { - caseMonthResult[0].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbActiveCases - }); - caseMonthResult[1].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbCompletedCases - }); - caseMonthResult[2].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbTerminatedCases - }); - caseMonthResult[3].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbFailedCases - }); - caseMonthResult[4].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbSuspendedCases - }); - caseMonthResult[5].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbClosedCases - }); - formMonthResult[0].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbCreatedForms - }); - formMonthResult[1].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbConfirmedForms - }); - activationMonthResult[0].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbCreatedForms - }); - activationMonthResult[1].series.push({ - "name": self.datePipe.transform(elt.DateTime, 'mediumDate'), - "value": elt.NbConfirmedForms - }); - }); - - this.caseMonthStatistic = caseMonthResult; - this.formMonthStatistic = formMonthResult; - this.activationMonthStatistic = activationMonthResult; - } - }); - this.deployedSubscription = this.deployedStore.pipe(select('deployed')).subscribe((st: fromHomeSates.DeployedState) => { - if (st.nbCaseDefinitions) { - this.nbCaseDefinitions = st.nbCaseDefinitions.Count; - this.nbCaseFiles = st.nbCaseFiles.Count; - } - }); - this.refresh(); - } - - refresh() { - let loadStatisticRequest: any = { - type: ActionTypes.STATISTICLOAD - }; - let loadWeekStatisticsRequest: any = { - type: ActionTypes.SEARCHWEEKSTATISTICS, - count: 100 - }; - let loadMonthStatisticsRequest: any = { - type: ActionTypes.SEARCHMONTHSTATISTICS, - count: 100 - }; - let loadDeployedRequest: any = { - type: ActionTypes.DEPLOYEDLOAD - }; - this.statisticStore.dispatch(loadStatisticRequest); - this.weekStatisticStore.dispatch(loadWeekStatisticsRequest); - this.monthStatisticStore.dispatch(loadMonthStatisticsRequest); - this.deployedStore.dispatch(loadDeployedRequest); - } - - ngOnDestroy() { - this.statisticSubscription.unsubscribe(); - this.weekSubscription.unsubscribe(); - this.monthSubscription.unsubscribe(); - } +export class HomeComponent { } diff --git a/src/CaseManagement.Website/angularApp/app/home/home.module.ts b/src/CaseManagement.Website/angularApp/app/home/home.module.ts index 9aee35fa..c85bc4d3 100644 --- a/src/CaseManagement.Website/angularApp/app/home/home.module.ts +++ b/src/CaseManagement.Website/angularApp/app/home/home.module.ts @@ -1,20 +1,12 @@ -import { CommonModule, DatePipe } from '@angular/common'; +import { CommonModule } from '@angular/common'; import { HttpClientModule } from '@angular/common/http'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { EffectsModule } from '@ngrx/effects'; -import { StoreModule } from '@ngrx/store'; -import { StoreDevtoolsModule } from '@ngrx/store-devtools'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { MaterialModule } from '../shared/material.module'; import { SharedModule } from '../shared/shared.module'; -import { HomeEffects } from './components/home-effects'; -import * as fromHomeReducer from './components/home-reducer'; import { HomeComponent } from './components/home.component'; import { HomeRoutes } from './home.routes'; -import { StatisticService } from './services/statistic.service'; -import { CaseFilesService } from '../casedefinitions/services/casefiles.service'; -import { CaseDefinitionsService } from '../casedefinitions/services/casedefinitions.service'; @NgModule({ imports: [ @@ -24,17 +16,7 @@ import { CaseDefinitionsService } from '../casedefinitions/services/casedefiniti HttpClientModule, HomeRoutes, MaterialModule, - SharedModule, - EffectsModule.forRoot([HomeEffects]), - StoreModule.forRoot({ - statistic: fromHomeReducer.statisticReducer, - weekStatistics: fromHomeReducer.weekStatisticsReducer, - monthStatistics: fromHomeReducer.monthStatisticsReducer, - deployed: fromHomeReducer.deployedReducer - }), - StoreDevtoolsModule.instrument({ - maxAge: 10 - }) + SharedModule ], declarations: [ @@ -45,12 +27,7 @@ import { CaseDefinitionsService } from '../casedefinitions/services/casedefiniti HomeComponent ], - providers: [ - StatisticService, - CaseFilesService, - CaseDefinitionsService, - DatePipe - ] + providers: [ ] }) export class HomeModule { } diff --git a/src/CaseManagement.Website/angularApp/app/home/home.routes.ts b/src/CaseManagement.Website/angularApp/app/home/home.routes.ts index 32decc26..9dfdecdc 100644 --- a/src/CaseManagement.Website/angularApp/app/home/home.routes.ts +++ b/src/CaseManagement.Website/angularApp/app/home/home.routes.ts @@ -1,9 +1,9 @@ import { RouterModule, Routes } from '@angular/router'; - import { HomeComponent } from './components/home.component'; + const routes: Routes = [ - { path: 'home', component: HomeComponent } + { path: '', component: HomeComponent } ]; export const HomeRoutes = RouterModule.forChild(routes); \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/models/dailystatistic.model.js b/src/CaseManagement.Website/angularApp/app/home/models/dailystatistic.model.js deleted file mode 100644 index f5803b51..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/models/dailystatistic.model.js +++ /dev/null @@ -1,22 +0,0 @@ -var DailyStatistic = (function () { - function DailyStatistic() { - } - DailyStatistic.fromJson = function (json) { - var result = new DailyStatistic(); - result.DateTime = json["datetime"]; - result.NbActiveCases = json["nb_active_cases"]; - result.NbCompletedCases = json["nb_completed_cases"]; - result.NbTerminatedCases = json["nb_terminated_cases"]; - result.NbFailedCases = json["nb_failed_cases"]; - result.NbSuspendedCases = json["nb_suspended_cases"]; - result.NbClosedCases = json["nb_closed_cases"]; - result.NbConfirmedForms = json["nb_confirmed_forms"]; - result.NbCreatedForms = json["nb_created_forms"]; - result.NbCreatedActivation = json["nb_created_activations"]; - result.NbConfirmedActivation = json["nb_confirmed_activations"]; - return result; - }; - return DailyStatistic; -}()); -export { DailyStatistic }; -//# sourceMappingURL=dailystatistic.model.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/models/dailystatistic.model.js.map b/src/CaseManagement.Website/angularApp/app/home/models/dailystatistic.model.js.map deleted file mode 100644 index cd0e843a..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/models/dailystatistic.model.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"dailystatistic.model.js","sourceRoot":"","sources":["dailystatistic.model.ts"],"names":[],"mappings":"AAAA;IAAA;IA4BA,CAAC;IAfiB,uBAAQ,GAAtB,UAAuB,IAAS;QAC5B,IAAI,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;QACnC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC/C,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACvD,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC/C,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC/C,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACjD,MAAM,CAAC,mBAAmB,GAAG,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC5D,MAAM,CAAC,qBAAqB,GAAG,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAChE,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,qBAAC;AAAD,CAAC,AA5BD,IA4BC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/models/dailystatistic.model.ts b/src/CaseManagement.Website/angularApp/app/home/models/dailystatistic.model.ts deleted file mode 100644 index fac5354e..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/models/dailystatistic.model.ts +++ /dev/null @@ -1,29 +0,0 @@ -export class DailyStatistic { - DateTime: Date; - NbActiveCases: number; - NbCompletedCases: number; - NbTerminatedCases: number; - NbFailedCases: number; - NbSuspendedCases: number; - NbClosedCases: number; - NbConfirmedForms: number; - NbCreatedForms: number; - NbCreatedActivation: number; - NbConfirmedActivation: number; - - public static fromJson(json: any): DailyStatistic { - var result = new DailyStatistic(); - result.DateTime = json["datetime"]; - result.NbActiveCases = json["nb_active_cases"]; - result.NbCompletedCases = json["nb_completed_cases"]; - result.NbTerminatedCases = json["nb_terminated_cases"]; - result.NbFailedCases = json["nb_failed_cases"]; - result.NbSuspendedCases = json["nb_suspended_cases"]; - result.NbClosedCases = json["nb_closed_cases"]; - result.NbConfirmedForms = json["nb_confirmed_forms"]; - result.NbCreatedForms = json["nb_created_forms"]; - result.NbCreatedActivation = json["nb_created_activations"]; - result.NbConfirmedActivation = json["nb_confirmed_activations"]; - return result; - } -} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/models/search-dailystatistics-result.model.js b/src/CaseManagement.Website/angularApp/app/home/models/search-dailystatistics-result.model.js deleted file mode 100644 index 26383898..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/models/search-dailystatistics-result.model.js +++ /dev/null @@ -1,22 +0,0 @@ -import { DailyStatistic } from './dailystatistic.model'; -var SearchDailyStatisticsResult = (function () { - function SearchDailyStatisticsResult() { - } - SearchDailyStatisticsResult.fromJson = function (json) { - var result = new SearchDailyStatisticsResult(); - result.StartIndex = json["start_index"]; - result.Count = json["count"]; - result.TotalLength = json["total_length"]; - var content = []; - if (json["content"]) { - json["content"].forEach(function (c) { - content.push(DailyStatistic.fromJson(c)); - }); - } - result.Content = content; - return result; - }; - return SearchDailyStatisticsResult; -}()); -export { SearchDailyStatisticsResult }; -//# sourceMappingURL=search-dailystatistics-result.model.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/models/search-dailystatistics-result.model.js.map b/src/CaseManagement.Website/angularApp/app/home/models/search-dailystatistics-result.model.js.map deleted file mode 100644 index cd1dc632..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/models/search-dailystatistics-result.model.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"search-dailystatistics-result.model.js","sourceRoot":"","sources":["search-dailystatistics-result.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD;IAAA;IAsBA,CAAC;IAhBiB,oCAAQ,GAAtB,UAAuB,IAAS;QAE5B,IAAI,MAAM,GAAG,IAAI,2BAA2B,EAAE,CAAC;QAC/C,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAqB,EAAE,CAAC;QACnC,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE;YACjB,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAM;gBACpC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;SACN;QAED,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,kCAAC;AAAD,CAAC,AAtBD,IAsBC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/models/search-dailystatistics-result.model.ts b/src/CaseManagement.Website/angularApp/app/home/models/search-dailystatistics-result.model.ts deleted file mode 100644 index 940c4407..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/models/search-dailystatistics-result.model.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { DailyStatistic } from './dailystatistic.model'; - -export class SearchDailyStatisticsResult { - StartIndex: number; - Count: number; - TotalLength: number; - Content: DailyStatistic[]; - - public static fromJson(json: any): SearchDailyStatisticsResult - { - let result = new SearchDailyStatisticsResult(); - result.StartIndex = json["start_index"]; - result.Count = json["count"]; - result.TotalLength = json["total_length"]; - let content: DailyStatistic[] = []; - if (json["content"]) { - json["content"].forEach(function (c: any) { - content.push(DailyStatistic.fromJson(c)); - }); - } - - result.Content = content; - return result; - } -} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/services/statistic.service.js b/src/CaseManagement.Website/angularApp/app/home/services/statistic.service.js deleted file mode 100644 index dda701d0..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/services/statistic.service.js +++ /dev/null @@ -1,54 +0,0 @@ -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); -}; -import { HttpClient, HttpHeaders } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { map } from 'rxjs/operators'; -import { DailyStatistic } from '../models/dailystatistic.model'; -import { SearchDailyStatisticsResult } from '../models/search-dailystatistics-result.model'; -var StatisticService = (function () { - function StatisticService(http) { - this.http = http; - } - StatisticService.prototype.get = function () { - var headers = new HttpHeaders(); - headers = headers.set('Accept', 'application/json'); - var targetUrl = process.env.API_URL + "/statistics"; - return this.http.get(targetUrl, { headers: headers }).pipe(map(function (res) { - return DailyStatistic.fromJson(res); - })); - }; - StatisticService.prototype.search = function (startIndex, count, order, direction, startDate, endDate) { - var headers = new HttpHeaders(); - headers = headers.set('Accept', 'application/json'); - var targetUrl = process.env.API_URL + "/statistics/.search?start_index=" + startIndex + "&count=" + count; - if (order) { - targetUrl = targetUrl + "&order_by=" + order; - } - if (direction) { - targetUrl = targetUrl + "&order=" + direction; - } - if (startDate) { - targetUrl = targetUrl + "&start_datetime=" + startDate; - } - if (endDate) { - targetUrl = targetUrl + "&end_datetime=" + endDate; - } - return this.http.get(targetUrl, { headers: headers }).pipe(map(function (res) { - return SearchDailyStatisticsResult.fromJson(res); - })); - }; - StatisticService = __decorate([ - Injectable(), - __metadata("design:paramtypes", [HttpClient]) - ], StatisticService); - return StatisticService; -}()); -export { StatisticService }; -//# sourceMappingURL=statistic.service.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/home/services/statistic.service.js.map b/src/CaseManagement.Website/angularApp/app/home/services/statistic.service.js.map deleted file mode 100644 index 8903e426..00000000 --- a/src/CaseManagement.Website/angularApp/app/home/services/statistic.service.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"statistic.service.js","sourceRoot":"","sources":["statistic.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAG5F;IACI,0BAAoB,IAAgB;QAAhB,SAAI,GAAJ,IAAI,CAAY;IAAI,CAAC;IAEzC,8BAAG,GAAH;QACI,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,aAAa,CAAC;QACpD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,iCAAM,GAAN,UAAO,UAAkB,EAAE,KAAa,EAAE,KAAa,EAAE,SAAiB,EAAE,SAAiB,EAAE,OAAe;QAC1G,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,kCAAkC,GAAG,UAAU,GAAG,SAAS,GAAG,KAAK,CAAC;QAC1G,IAAI,KAAK,EAAE;YACP,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,CAAC;SAChD;QAED,IAAI,SAAS,EAAE;YACX,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;SACjD;QAED,IAAI,SAAS,EAAE;YACX,SAAS,GAAG,SAAS,GAAG,kBAAkB,GAAG,SAAS,CAAC;SAC1D;QAED,IAAI,OAAO,EAAE;YACT,SAAS,GAAG,SAAS,GAAG,gBAAgB,GAAG,OAAO,CAAC;SACtD;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,2BAA2B,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAnCQ,gBAAgB;QAD5B,UAAU,EAAE;yCAEiB,UAAU;OAD3B,gBAAgB,CAoC5B;IAAD,uBAAC;CAAA,AApCD,IAoCC;SApCY,gBAAgB"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list-actions.ts b/src/CaseManagement.Website/angularApp/app/performances/list/list-actions.ts deleted file mode 100644 index 66fcfd8d..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/list/list-actions.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Action } from '@ngrx/store'; -import { SearchPerformancesResult } from '../models/search-performances-result.model'; - -export enum ActionTypes { - PERFORMANCESLOAD = "[Performances] Load", - PERFORMANCESLOADED = "[Performances] Loaded", - ERRORLOADPERFORMANCES = "[CaseDefinitions] Error Load" -} - -export class LoadPerformancesAction implements Action { - type = ActionTypes.PERFORMANCESLOAD - constructor() { } -} - -export class PerformancesLoadedAction implements Action { - type = ActionTypes.PERFORMANCESLOADED - constructor(public result: SearchPerformancesResult) { } -} - -export type ActionsUnion = LoadPerformancesAction | PerformancesLoadedAction; \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list-effects.js b/src/CaseManagement.Website/angularApp/app/performances/list/list-effects.js deleted file mode 100644 index b646d34e..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/list/list-effects.js +++ /dev/null @@ -1,39 +0,0 @@ -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); -}; -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { of } from 'rxjs'; -import { catchError, map, mergeMap } from 'rxjs/operators'; -import { CaseDefinitionsService } from '../services/casedefinitions.service'; -import { ActionTypes } from './list-actions'; -var ListCaseDefinitionsEffects = (function () { - function ListCaseDefinitionsEffects(actions$, caseDefinitionsService) { - var _this = this; - this.actions$ = actions$; - this.caseDefinitionsService = caseDefinitionsService; - this.loadCaseFiles$ = this.actions$ - .pipe(ofType(ActionTypes.CASEDEFINITIONSLOAD), mergeMap(function (evt) { - return _this.caseDefinitionsService.search(evt.startIndex, evt.count, evt.order, evt.direction, evt.text) - .pipe(map(function (casefiles) { return { type: ActionTypes.CASEDEFINITIONSLOADED, result: casefiles }; }), catchError(function () { return of({ type: ActionTypes.ERRORLOADCASEDEFINITIONS }); })); - })); - } - __decorate([ - Effect(), - __metadata("design:type", Object) - ], ListCaseDefinitionsEffects.prototype, "loadCaseFiles$", void 0); - ListCaseDefinitionsEffects = __decorate([ - Injectable(), - __metadata("design:paramtypes", [Actions, - CaseDefinitionsService]) - ], ListCaseDefinitionsEffects); - return ListCaseDefinitionsEffects; -}()); -export { ListCaseDefinitionsEffects }; -//# sourceMappingURL=list-effects.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list-effects.js.map b/src/CaseManagement.Website/angularApp/app/performances/list/list-effects.js.map deleted file mode 100644 index 255c966d..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/list/list-effects.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"list-effects.js","sourceRoot":"","sources":["list-effects.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C;IACI,oCACY,QAAiB,EACjB,sBAA8C;QAF1D,iBAGK;QAFO,aAAQ,GAAR,QAAQ,CAAS;QACjB,2BAAsB,GAAtB,sBAAsB,CAAwB;QAI1D,mBAAc,GAAG,IAAI,CAAC,QAAQ;aACzB,IAAI,CACD,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,EACvC,QAAQ,CAAC,UAAC,GAAO;YACb,OAAO,KAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC;iBACnG,IAAI,CACD,GAAG,CAAC,UAAA,SAAS,IAAM,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,qBAAqB,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,EAC5F,UAAU,CAAC,cAAM,OAAA,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,wBAAwB,EAAE,CAAC,EAAlD,CAAkD,CAAC,CACvE,CAAC;QACN,CAAC,CACJ,CACJ,CAAC;IAdF,CAAC;IAGL;QADC,MAAM,EAAE;;sEAYH;IAlBG,0BAA0B;QADtC,UAAU,EAAE;yCAGa,OAAO;YACO,sBAAsB;OAHjD,0BAA0B,CAmBtC;IAAD,iCAAC;CAAA,AAnBD,IAmBC;SAnBY,0BAA0B"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list-effects.ts b/src/CaseManagement.Website/angularApp/app/performances/list/list-effects.ts deleted file mode 100644 index 166ad2a4..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/list/list-effects.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { of } from 'rxjs'; -import { catchError, map, mergeMap } from 'rxjs/operators'; -import { StatisticService } from '../services/statistic.service'; -import { ActionTypes } from './list-actions'; - -@Injectable() -export class ListPerformancesEffects { - constructor( - private actions$: Actions, - private statisticService: StatisticService - ) { } - - @Effect() - loadPerformances$ = this.actions$ - .pipe( - ofType(ActionTypes.PERFORMANCESLOAD), - mergeMap((evt: any) => { - return this.statisticService.searchPerformances(evt.startIndex, evt.count, evt.order, evt.direction, evt.startDateTime) - .pipe( - map(casefiles => { return { type: ActionTypes.PERFORMANCESLOADED, result: casefiles }; }), - catchError(() => of({ type: ActionTypes.ERRORLOADPERFORMANCES })) - ); - } - ) - ); -} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list-reducer.ts b/src/CaseManagement.Website/angularApp/app/performances/list/list-reducer.ts deleted file mode 100644 index 045100e3..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/list/list-reducer.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ActionsUnion, ActionTypes, PerformancesLoadedAction } from './list-actions'; -import { ListPerformancesState } from './list-states'; - -const initialCaseDefsAction: ListPerformancesState = { - content: null, - isLoading: true, - isErrorLoadOccured: false -}; - -export function performancesReducer(state = initialCaseDefsAction, action: ActionsUnion) { - switch (action.type) { - case ActionTypes.PERFORMANCESLOADED: - let caseDefsLoadedAction = action; - state.content = caseDefsLoadedAction.result; - state.isLoading = false; - state.isErrorLoadOccured = false; - return { ...state }; - case ActionTypes.ERRORLOADPERFORMANCES: - state.isErrorLoadOccured = true; - state.isLoading = false; - return { ...state }; - default: - return state; - } -} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list-states.js b/src/CaseManagement.Website/angularApp/app/performances/list/list-states.js deleted file mode 100644 index 003f655a..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/list/list-states.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=list-states.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list-states.js.map b/src/CaseManagement.Website/angularApp/app/performances/list/list-states.js.map deleted file mode 100644 index 31fae05b..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/list/list-states.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"list-states.js","sourceRoot":"","sources":["list-states.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list-states.ts b/src/CaseManagement.Website/angularApp/app/performances/list/list-states.ts deleted file mode 100644 index 0d3a71a4..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/list/list-states.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { SearchPerformancesResult } from '../models/search-performances-result.model'; - -export interface ListPerformancesState { - isLoading: boolean; - isErrorLoadOccured: boolean; - content: SearchPerformancesResult; -} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list.component.html b/src/CaseManagement.Website/angularApp/app/performances/list/list.component.html deleted file mode 100644 index d2b12d15..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/list/list.component.html +++ /dev/null @@ -1,43 +0,0 @@ -
-
-
{{ "PERFORMANCES" | translate }}
-
-
-
-
-
-
-

{{ "NB_THREADS" | translate }}

- - - -
-
-

{{ "MEMORY_CONSUMED_MB" | translate }}

- - - -
-
-
-
\ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list.component.js b/src/CaseManagement.Website/angularApp/app/performances/list/list.component.js deleted file mode 100644 index 64948fc6..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/list/list.component.js +++ /dev/null @@ -1,98 +0,0 @@ -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); -}; -import { Component, ViewChild } from '@angular/core'; -import { MatPaginator, MatSort } from '@angular/material'; -import { select, Store } from '@ngrx/store'; -import { merge } from 'rxjs'; -import { ActionTypes } from './list-actions'; -import { FormBuilder } from '@angular/forms'; -var ListCaseDefinitionsComponent = (function () { - function ListCaseDefinitionsComponent(store, formBuilder) { - this.store = store; - this.formBuilder = formBuilder; - this.caseDefinitions = []; - this.displayedColumns = ['name', 'create_datetime']; - this.searchForm = this.formBuilder.group({ - text: '' - }); - } - ListCaseDefinitionsComponent.prototype.ngOnInit = function () { - var _this = this; - this.isLoading = true; - this.isErrorLoadOccured = false; - this.subscription = this.store.pipe(select('caseDefinitions')).subscribe(function (st) { - if (!st) { - return; - } - _this.isLoading = st.isLoading; - _this.isErrorLoadOccured = st.isErrorLoadOccured; - if (st.content) { - _this.caseDefinitions = st.content.Content; - _this.length = st.content.TotalLength; - } - }); - this.refresh(); - }; - ListCaseDefinitionsComponent.prototype.ngAfterViewInit = function () { - var _this = this; - merge(this.sort.sortChange, this.paginator.page).subscribe(function () { return _this.refresh(); }); - }; - ListCaseDefinitionsComponent.prototype.onSubmit = function (evt) { - if (!evt) { - return; - } - this.refresh(); - }; - ListCaseDefinitionsComponent.prototype.refresh = function () { - var request = { - type: ActionTypes.CASEDEFINITIONSLOAD, - order: this.sort.active, - direction: this.sort.direction, - count: this.paginator.pageSize, - text: this.searchForm.get('text').value - }; - if (this.paginator.pageIndex && this.paginator.pageSize) { - request['startIndex'] = this.paginator.pageIndex * this.paginator.pageSize; - } - else { - request['startIndex'] = 0; - } - if (this.paginator.pageSize) { - request['count'] = this.paginator.pageSize; - } - else { - request['count'] = 5; - } - this.isLoading = true; - this.store.dispatch(request); - }; - ListCaseDefinitionsComponent.prototype.ngOnDestroy = function () { - this.subscription.unsubscribe(); - }; - __decorate([ - ViewChild(MatPaginator), - __metadata("design:type", MatPaginator) - ], ListCaseDefinitionsComponent.prototype, "paginator", void 0); - __decorate([ - ViewChild(MatSort), - __metadata("design:type", MatSort) - ], ListCaseDefinitionsComponent.prototype, "sort", void 0); - ListCaseDefinitionsComponent = __decorate([ - Component({ - selector: 'list-case-files', - templateUrl: './list.component.html', - styleUrls: ['./list.component.scss'] - }), - __metadata("design:paramtypes", [Store, FormBuilder]) - ], ListCaseDefinitionsComponent); - return ListCaseDefinitionsComponent; -}()); -export { ListCaseDefinitionsComponent }; -//# sourceMappingURL=list.component.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list.component.js.map b/src/CaseManagement.Website/angularApp/app/performances/list/list.component.js.map deleted file mode 100644 index de65935a..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/list/list.component.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"list.component.js","sourceRoot":"","sources":["list.component.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/list/list.component.ts b/src/CaseManagement.Website/angularApp/app/performances/list/list.component.ts deleted file mode 100644 index 72687cb6..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/list/list.component.ts +++ /dev/null @@ -1,112 +0,0 @@ -import { DatePipe } from '@angular/common'; -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { select, Store } from '@ngrx/store'; -import { Performance } from '../models/performance.model'; -import { ActionTypes } from './list-actions'; -import * as fromListPerformanceState from './list-states'; - -@Component({ - selector: 'list-performance', - templateUrl: './list.component.html', - styleUrls: ['./list.component.scss'] -}) - -export class ListPerformanceComponent implements OnInit, OnDestroy { - subscription: any; - viewChart: any[] = [500, 300]; - threadsPerformance: any[] = []; - memoryConsumedMBPerformance: any[] = []; - interval: any; - - constructor(private performancesStore: Store, private datePipe: DatePipe) { - } - - ngOnInit() { - let self = this; - this.subscription = this.performancesStore.pipe(select('performances')).subscribe((st: fromListPerformanceState.ListPerformancesState) => { - if (!st) { - return; - } - - if (st.content) { - self.threadsPerformance.forEach(function (r: any) { - r.series = []; - }); - self.memoryConsumedMBPerformance.forEach(function (r: any) { - r.series = []; - }); - st.content.Content.sort(function (a: Performance, b: Performance) { - return new Date(a.CaptureDateTime).getTime() - new Date(b.CaptureDateTime).getTime(); - }); - st.content.Content.forEach(function (performance: Performance) { - let threadDimension: any = null; - let memoryConsumedDimension: any = null; - self.threadsPerformance.forEach(function (th: any) { - if (th.name == performance.MachineName) { - threadDimension = th; - return; - } - }); - self.memoryConsumedMBPerformance.forEach(function (mc: any) { - if (mc.name == performance.MachineName) { - memoryConsumedDimension = mc; - return; - } - }); - - if (threadDimension == null) { - threadDimension = { - name: performance.MachineName, - series: [] - }; - self.threadsPerformance.push(threadDimension); - } - - if (memoryConsumedDimension == null) { - memoryConsumedDimension = { - name: performance.MachineName, - series: [] - }; - self.memoryConsumedMBPerformance.push(memoryConsumedDimension); - } - - threadDimension.series.push({ "name": self.datePipe.transform(performance.CaptureDateTime, 'medium'), "value": performance.NbWorkingThreads }); - memoryConsumedDimension.series.push({ "name": self.datePipe.transform(performance.CaptureDateTime, 'medium'), "value": performance.MemoryConsumedMB }); - }); - - self.threadsPerformance = [...self.threadsPerformance]; - self.memoryConsumedMBPerformance = [...self.memoryConsumedMBPerformance]; - } - }); - this.refresh(); - this.interval = setInterval(() => { - this.refresh(); - }, 4000); - } - - refresh() { - let request: any = { - type: ActionTypes.PERFORMANCESLOAD, - order: "datetime", - direction: "desc", - count: 30, - startIndex: 0, - startDateTime: this.getCurrentDate() - }; - - this.performancesStore.dispatch(request); - } - - private getCurrentDate() { - return this.getDate(new Date()); - } - - private getDate(d: Date) { - return d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate(); - } - - ngOnDestroy() { - clearInterval(this.interval); - this.subscription.unsubscribe(); - } -} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/models/performance.model.js b/src/CaseManagement.Website/angularApp/app/performances/models/performance.model.js deleted file mode 100644 index 90995ae6..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/models/performance.model.js +++ /dev/null @@ -1,19 +0,0 @@ -var CaseActivation = (function () { - function CaseActivation() { - } - CaseActivation.fromJson = function (json) { - var result = new CaseActivation(); - result.CaseDefinitionId = json["case_definition_id"]; - result.CaseInstanceId = json["case_instance_id"]; - result.CaseInstanceName = json["case_instance_name"]; - result.CaseElementId = json["case_element_id"]; - result.CaseElementInstanceId = json["case_element_instance_id"]; - result.CaseElementName = json["case_element_name"]; - result.CreateDateTime = json["create_datetime"]; - result.Performer = json["performer"]; - return result; - }; - return CaseActivation; -}()); -export { CaseActivation }; -//# sourceMappingURL=case-activation.model.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/models/performance.model.js.map b/src/CaseManagement.Website/angularApp/app/performances/models/performance.model.js.map deleted file mode 100644 index e667582f..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/models/performance.model.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"case-activation.model.js","sourceRoot":"","sources":["case-activation.model.ts"],"names":[],"mappings":"AAAA;IAAA;IAsBA,CAAC;IAZiB,uBAAQ,GAAtB,UAAuB,IAAS;QAC5B,IAAI,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACjD,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC/C,MAAM,CAAC,qBAAqB,GAAG,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAChE,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACnD,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAChD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;QACrC,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,qBAAC;AAAD,CAAC,AAtBD,IAsBC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/models/performance.model.ts b/src/CaseManagement.Website/angularApp/app/performances/models/performance.model.ts deleted file mode 100644 index 02faabdb..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/models/performance.model.ts +++ /dev/null @@ -1,15 +0,0 @@ -export class Performance { - CaptureDateTime: string; - MachineName: string; - NbWorkingThreads: number; - MemoryConsumedMB: number; - - public static fromJson(json: any): Performance { - var result = new Performance(); - result.CaptureDateTime = json["datetime"]; - result.MachineName = json["machine_name"]; - result.NbWorkingThreads = json["nb_working_threads"]; - result.MemoryConsumedMB = json["memory_consumed_mb"]; - return result; - } -} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/models/search-performances-result.model.js b/src/CaseManagement.Website/angularApp/app/performances/models/search-performances-result.model.js deleted file mode 100644 index 68892f8e..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/models/search-performances-result.model.js +++ /dev/null @@ -1,22 +0,0 @@ -import { CaseActivation } from './case-activation.model'; -var SearchCaseActivationsResult = (function () { - function SearchCaseActivationsResult() { - } - SearchCaseActivationsResult.fromJson = function (json) { - var result = new SearchCaseActivationsResult(); - result.StartIndex = json["start_index"]; - result.Count = json["count"]; - result.TotalLength = json["total_length"]; - var content = []; - if (json["content"]) { - json["content"].forEach(function (c) { - content.push(CaseActivation.fromJson(c)); - }); - } - result.Content = content; - return result; - }; - return SearchCaseActivationsResult; -}()); -export { SearchCaseActivationsResult }; -//# sourceMappingURL=search-case-activations-result.model.js.map \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/models/search-performances-result.model.js.map b/src/CaseManagement.Website/angularApp/app/performances/models/search-performances-result.model.js.map deleted file mode 100644 index 60f1a871..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/models/search-performances-result.model.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"search-case-activations-result.model.js","sourceRoot":"","sources":["search-case-activations-result.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD;IAAA;IAsBA,CAAC;IAhBiB,oCAAQ,GAAtB,UAAuB,IAAS;QAE5B,IAAI,MAAM,GAAG,IAAI,2BAA2B,EAAE,CAAC;QAC/C,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAqB,EAAE,CAAC;QACnC,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE;YACjB,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAM;gBACpC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;SACN;QAED,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,kCAAC;AAAD,CAAC,AAtBD,IAsBC"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/performances.routes.ts b/src/CaseManagement.Website/angularApp/app/performances/performances.routes.ts deleted file mode 100644 index b4750b23..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/performances.routes.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { RouterModule, Routes } from '@angular/router'; - -import { ListPerformanceComponent } from './list/list.component'; - -const routes: Routes = [ - { path: '', component: ListPerformanceComponent } -]; - -export const PerformancesRoutes = RouterModule.forChild(routes); \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/services/statistic.service.js.map b/src/CaseManagement.Website/angularApp/app/performances/services/statistic.service.js.map deleted file mode 100644 index 8903e426..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/services/statistic.service.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"statistic.service.js","sourceRoot":"","sources":["statistic.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAG5F;IACI,0BAAoB,IAAgB;QAAhB,SAAI,GAAJ,IAAI,CAAY;IAAI,CAAC;IAEzC,8BAAG,GAAH;QACI,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,aAAa,CAAC;QACpD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,iCAAM,GAAN,UAAO,UAAkB,EAAE,KAAa,EAAE,KAAa,EAAE,SAAiB,EAAE,SAAiB,EAAE,OAAe;QAC1G,IAAI,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,kCAAkC,GAAG,UAAU,GAAG,SAAS,GAAG,KAAK,CAAC;QAC1G,IAAI,KAAK,EAAE;YACP,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,CAAC;SAChD;QAED,IAAI,SAAS,EAAE;YACX,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;SACjD;QAED,IAAI,SAAS,EAAE;YACX,SAAS,GAAG,SAAS,GAAG,kBAAkB,GAAG,SAAS,CAAC;SAC1D;QAED,IAAI,OAAO,EAAE;YACT,SAAS,GAAG,SAAS,GAAG,gBAAgB,GAAG,OAAO,CAAC;SACtD;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;YACpE,OAAO,2BAA2B,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAnCQ,gBAAgB;QAD5B,UAAU,EAAE;yCAEiB,UAAU;OAD3B,gBAAgB,CAoC5B;IAAD,uBAAC;CAAA,AApCD,IAoCC;SApCY,gBAAgB"} \ No newline at end of file diff --git a/src/CaseManagement.Website/angularApp/app/performances/services/statistic.service.ts b/src/CaseManagement.Website/angularApp/app/performances/services/statistic.service.ts deleted file mode 100644 index 1a6679a5..00000000 --- a/src/CaseManagement.Website/angularApp/app/performances/services/statistic.service.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { HttpClient, HttpHeaders } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { SearchPerformancesResult } from '../models/search-performances-result.model'; - -@Injectable() -export class StatisticService { - constructor(private http: HttpClient) { } - - getPerformances(): Observable { - let headers = new HttpHeaders(); - headers = headers.set('Accept', 'application/json'); - let targetUrl = process.env.API_URL + "/statistics/performances"; - return this.http.get(targetUrl, { headers: headers }); - } - - searchPerformances(startIndex: number, count: number, order: string, direction: string, startDateTime: string): Observable { - let headers = new HttpHeaders(); - headers = headers.set('Accept', 'application/json'); - let targetUrl = process.env.API_URL + "/statistics/performances/search?start_index=" + startIndex + "&count=" + count + "&group_by=machine_name"; - if (order) { - targetUrl = targetUrl + "&order_by=" + order; - } - - if (direction) { - targetUrl = targetUrl + "&order=" + direction; - } - - if (startDateTime) { - targetUrl = targetUrl + "&start_datetime=" + startDateTime; - } - - return this.http.get(targetUrl, { headers: headers }).pipe(map((res: any) => { - return SearchPerformancesResult.fromJson(res); - })); - } -} \ No newline at end of file diff --git a/src/CaseManagement.Performance/angularApp/index.html b/src/CaseManagement.Website/angularApp/index.ejs similarity index 95% rename from src/CaseManagement.Performance/angularApp/index.html rename to src/CaseManagement.Website/angularApp/index.ejs index a10f3c5d..f5e7fbbd 100644 --- a/src/CaseManagement.Performance/angularApp/index.html +++ b/src/CaseManagement.Website/angularApp/index.ejs @@ -1,7 +1,7 @@  - + @@ -92,7 +92,7 @@
- + diff --git a/src/CaseManagement.Website/angularApp/manifest.webmanifest b/src/CaseManagement.Website/angularApp/manifest.webmanifest deleted file mode 100644 index 77c14d5f..00000000 --- a/src/CaseManagement.Website/angularApp/manifest.webmanifest +++ /dev/null @@ -1,27 +0,0 @@ -{ - "short_name": "BCV", - "name": "Bank CV", - "theme_color": "#eb5252", - "background_color": "#000000", - "display": "standalone", - "Scope": "/", - "orientation": "landscape", - "icons": [ - { - "src": "images/icon-48-48.png", - "type": "image/png", - "sizes": "48x48" - }, - { - "src": "images/icon-64-64.png", - "type": "image/png", - "sizes": "96x96" - }, - { - "src": "images/icon-192-192.png", - "type": "image/png", - "sizes": "192x192" - } - ], - "start_url": "index.html" -} \ No newline at end of file diff --git a/src/CaseManagement.Website/config/webpack.azure.js b/src/CaseManagement.Website/config/webpack.azure.js index 5681dd20..ddd6a636 100644 --- a/src/CaseManagement.Website/config/webpack.azure.js +++ b/src/CaseManagement.Website/config/webpack.azure.js @@ -7,11 +7,10 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const CleanWebpackPlugin = require('clean-webpack-plugin'); const FilterWarningsPlugin = require('webpack-filter-warnings-plugin'); -const WorkboxPlugin = require('workbox-webpack-plugin'); -const helpers = require('./webpack.helpers'); const ENV = process.env.ENV = process.env.NODE_ENV = 'azure'; const API_URL = process.env.API_URL = "http://simpleidserver.northeurope.cloudapp.azure.com/casemanagementapi"; +const BASE_URL = process.env.BASE_URL || '/casemanagement/'; const ROOT = path.resolve(__dirname, '..'); @@ -33,7 +32,7 @@ module.exports = { path: ROOT + '/wwwroot/', filename: 'dist/[name].bundle.js', chunkFilename: 'dist/[id].chunk.js', - publicPath: '/' + publicPath: BASE_URL }, resolve: { @@ -120,11 +119,13 @@ module.exports = { new HtmlWebpackPlugin({ filename: 'index.html', inject: 'body', - template: 'angularApp/index.html' + template: 'angularApp/index.ejs', + templateParameters: { + baseUrl: BASE_URL + } }), new CopyWebpackPlugin([ - { from: './angularApp/*.webmanifest', to: 'assets', flatten: true }, { from: './angularApp/images/*.*', to: 'assets/images', flatten: true }, { from: './angularApp/i18n/*.*', to: 'assets/i18n', flatten: true }, { from: './angularApp/fonts/*.*', to: 'assets/fonts', flatten: true } @@ -139,30 +140,9 @@ module.exports = { 'API_URL': JSON.stringify(API_URL), 'process.env': { 'ENV': JSON.stringify(ENV), - 'API_URL': JSON.stringify(API_URL) + 'API_URL': JSON.stringify(API_URL), + 'BASE_URL': JSON.stringify(BASE_URL) } - }), - /*, - new WorkboxPlugin.GenerateSW({ - // include: [/\.html$/, /\.js$/], - // importWorkboxFrom: 'local', - navigateFallback: '/index.html', - clientsClaim: true, - skipWaiting: true, - runtimeCaching: [{ - urlPattern: /^http:\/\/localhost:3001/, - handler: 'networkFirst', - options: { - cacheName: 'bankcv-api' - } - }, { - urlPattern: /^http:\/\/localhost:3000/, - handler: 'networkFirst', - options: { - cacheName: 'identity-api' - } - }] }) - */ ] }; diff --git a/src/CaseManagement.Website/config/webpack.dev.js b/src/CaseManagement.Website/config/webpack.dev.js index 49fdab1e..0ab3c580 100644 --- a/src/CaseManagement.Website/config/webpack.dev.js +++ b/src/CaseManagement.Website/config/webpack.dev.js @@ -7,11 +7,10 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const CleanWebpackPlugin = require('clean-webpack-plugin'); const FilterWarningsPlugin = require('webpack-filter-warnings-plugin'); -const WorkboxPlugin = require('workbox-webpack-plugin'); -const helpers = require('./webpack.helpers'); const ENV = process.env.ENV = process.env.NODE_ENV = 'development'; const API_URL = process.env.API_URL = "http://localhost:54942"; +const BASE_URL = process.env.BASE_URL || "/"; const ROOT = path.resolve(__dirname, '..'); @@ -33,7 +32,7 @@ module.exports = { path: ROOT + '/wwwroot/', filename: 'dist/[name].bundle.js', chunkFilename: 'dist/[id].chunk.js', - publicPath: '/' + publicPath: BASE_URL }, resolve: { @@ -120,11 +119,13 @@ module.exports = { new HtmlWebpackPlugin({ filename: 'index.html', inject: 'body', - template: 'angularApp/index.html' + template: 'angularApp/index.ejs', + templateParameters: { + baseUrl: BASE_URL + } }), new CopyWebpackPlugin([ - { from: './angularApp/*.webmanifest', to: 'assets', flatten: true }, { from: './angularApp/images/*.*', to: 'assets/images', flatten: true }, { from: './angularApp/i18n/*.*', to: 'assets/i18n', flatten: true }, { from: './angularApp/fonts/*.*', to: 'assets/fonts', flatten: true } @@ -139,30 +140,9 @@ module.exports = { 'API_URL': JSON.stringify(API_URL), 'process.env': { 'ENV': JSON.stringify(ENV), - 'API_URL': JSON.stringify(API_URL) + 'API_URL': JSON.stringify(API_URL), + 'BASE_URL': JSON.stringify(BASE_URL) } - }), - /*, - new WorkboxPlugin.GenerateSW({ - // include: [/\.html$/, /\.js$/], - // importWorkboxFrom: 'local', - navigateFallback: '/index.html', - clientsClaim: true, - skipWaiting: true, - runtimeCaching: [{ - urlPattern: /^http:\/\/localhost:3001/, - handler: 'networkFirst', - options: { - cacheName: 'bankcv-api' - } - }, { - urlPattern: /^http:\/\/localhost:3000/, - handler: 'networkFirst', - options: { - cacheName: 'identity-api' - } - }] }) - */ ] }; diff --git a/src/CaseManagement.Website/package-lock.json b/src/CaseManagement.Website/package-lock.json index 5ee743d4..2c606771 100644 --- a/src/CaseManagement.Website/package-lock.json +++ b/src/CaseManagement.Website/package-lock.json @@ -3157,6 +3157,20 @@ "tiny-svg": "2.2.2" } }, + "cmmn-js-properties-panel": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/cmmn-js-properties-panel/-/cmmn-js-properties-panel-0.8.2.tgz", + "integrity": "sha512-JtTbExGNHLALzrh7Ymp41zg2RxbMMhR5tHbgeTVrFaw3VBThH2y+UQTlPdfwyaVbiYAkMtnRfYi/3ATtmG+QTw==", + "dev": true, + "requires": { + "ids": "0.2.2", + "inherits": "2.0.4", + "lodash": "4.17.15", + "min-dom": "3.1.1", + "scroll-tabs": "1.0.1", + "selection-update": "0.1.2" + } + }, "cmmn-moddle": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/cmmn-moddle/-/cmmn-moddle-5.0.0.tgz", @@ -8696,6 +8710,12 @@ "through2": "2.0.5" } }, + "mitt": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz", + "integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==", + "dev": true + }, "mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", @@ -11044,6 +11064,17 @@ "ajv-keywords": "3.4.1" } }, + "scroll-tabs": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/scroll-tabs/-/scroll-tabs-1.0.1.tgz", + "integrity": "sha512-W4xjEwNS4QAyQnaJ450vQTcKpbnalBAfsTDV926WrxEMOqjyj2To8uv2d0Cp0oxMdk5TkygtzXmctPNc2zgBcg==", + "dev": true, + "requires": { + "min-dash": "3.5.2", + "min-dom": "3.1.1", + "mitt": "1.2.0" + } + }, "scss-tokenizer": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", @@ -11071,6 +11102,12 @@ "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", "dev": true }, + "selection-update": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/selection-update/-/selection-update-0.1.2.tgz", + "integrity": "sha1-gDoETcxu2rWjrmSPXwNX6JrWa5Y=", + "dev": true + }, "selenium-webdriver": { "version": "4.0.0-alpha.5", "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.5.tgz", diff --git a/src/CaseManagement.Website/package.json b/src/CaseManagement.Website/package.json index 9d1d3485..af6babb8 100644 --- a/src/CaseManagement.Website/package.json +++ b/src/CaseManagement.Website/package.json @@ -67,6 +67,7 @@ "angular2-template-loader": "^0.6.2", "awesome-typescript-loader": "^5.2.1", "clean-webpack-plugin": "^2.0.1", + "cmmn-js-properties-panel": "^0.8.2", "codelyzer": "~5.0.1", "concurrently": "^4.1.0", "copy-webpack-plugin": "^5.0.3", diff --git a/tests/CaseManagement.CMMN.Acceptance.Tests/CaseManagement.CMMN.Acceptance.Tests.csproj b/tests/CaseManagement.CMMN.Acceptance.Tests/CaseManagement.CMMN.Acceptance.Tests.csproj index bc16162e..f1133bea 100644 --- a/tests/CaseManagement.CMMN.Acceptance.Tests/CaseManagement.CMMN.Acceptance.Tests.csproj +++ b/tests/CaseManagement.CMMN.Acceptance.Tests/CaseManagement.CMMN.Acceptance.Tests.csproj @@ -4,6 +4,7 @@ false + @@ -67,6 +68,10 @@ $(UsingMicrosoftNETSdk) %(RelativeDir)%(Filename).feature$(DefaultLanguageSourceExtension) + + $(UsingMicrosoftNETSdk) + %(RelativeDir)%(Filename).feature$(DefaultLanguageSourceExtension) + @@ -74,4 +79,9 @@ + + + CaseFiles.feature + + diff --git a/tests/CaseManagement.CMMN.Acceptance.Tests/FakeStartup.cs b/tests/CaseManagement.CMMN.Acceptance.Tests/FakeStartup.cs index d8cb59e3..1d8bb167 100644 --- a/tests/CaseManagement.CMMN.Acceptance.Tests/FakeStartup.cs +++ b/tests/CaseManagement.CMMN.Acceptance.Tests/FakeStartup.cs @@ -23,6 +23,10 @@ public void ConfigureServices(IServiceCollection services) services.AddAuthorization(policy => { policy.AddPolicy("IsConnected", p => p.RequireAuthenticatedUser()); + policy.AddPolicy("get_statistic", p => p.RequireAuthenticatedUser()); + policy.AddPolicy("get_performance", p => p.RequireAuthenticatedUser()); + policy.AddPolicy("get_casedefinition", p => p.RequireAuthenticatedUser()); + policy.AddPolicy("add_casefile", p => p.RequireAuthenticatedUser()); }); services.AddMvc(); services.AddHostedService(); diff --git a/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseFiles.feature b/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseFiles.feature new file mode 100644 index 00000000..fa7137ed --- /dev/null +++ b/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseFiles.feature @@ -0,0 +1,18 @@ +Feature: CaseFiles + Check result returned by /case-files + +Scenario: Add case file and check it is created + When execute HTTP POST JSON request 'http://localhost/case-files' + | Key | Value | + | name | name | + | description | description | + And extract JSON from body + And extract 'id' from JSON body into 'casefileid' + And execute HTTP GET request 'http://localhost/case-files/$casefileid$' + And extract JSON from body into 'casefile' + When execute HTTP GET request 'http://localhost/case-definitions/search?case_file=$casefileid$' + And extract JSON from body into 'casedefinition' + + Then extract JSON 'casefile', JSON 'name'='name' + Then extract JSON 'casefile', JSON 'description'='description' + Then extract JSON 'casedefinition', JSON 'total_length'='1' \ No newline at end of file diff --git a/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseFiles.feature.cs b/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseFiles.feature.cs new file mode 100644 index 00000000..482aa6c3 --- /dev/null +++ b/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseFiles.feature.cs @@ -0,0 +1,141 @@ +// ------------------------------------------------------------------------------ +// +// This code was generated by SpecFlow (http://www.specflow.org/). +// SpecFlow Version:3.0.0.0 +// SpecFlow Generator Version:3.0.0.0 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +// ------------------------------------------------------------------------------ +#region Designer generated code +#pragma warning disable +namespace CaseManagement.CMMN.Acceptance.Tests.Features +{ + using TechTalk.SpecFlow; + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.0.0.0")] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public partial class CaseFilesFeature : Xunit.IClassFixture, System.IDisposable + { + + private static TechTalk.SpecFlow.ITestRunner testRunner; + + private Xunit.Abstractions.ITestOutputHelper _testOutputHelper; + +#line 1 "CaseFiles.feature" +#line hidden + + public CaseFilesFeature(CaseFilesFeature.FixtureData fixtureData, Xunit.Abstractions.ITestOutputHelper testOutputHelper) + { + this._testOutputHelper = testOutputHelper; + this.TestInitialize(); + } + + public static void FeatureSetup() + { + testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); + TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "CaseFiles", "\tCheck result returned by /case-files", ProgrammingLanguage.CSharp, ((string[])(null))); + testRunner.OnFeatureStart(featureInfo); + } + + public static void FeatureTearDown() + { + testRunner.OnFeatureEnd(); + testRunner = null; + } + + public virtual void TestInitialize() + { + } + + public virtual void ScenarioTearDown() + { + testRunner.OnScenarioEnd(); + } + + public virtual void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo) + { + testRunner.OnScenarioInitialize(scenarioInfo); + testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(_testOutputHelper); + } + + public virtual void ScenarioStart() + { + testRunner.OnScenarioStart(); + } + + public virtual void ScenarioCleanup() + { + testRunner.CollectScenarioErrors(); + } + + void System.IDisposable.Dispose() + { + this.ScenarioTearDown(); + } + + [Xunit.FactAttribute(DisplayName="Add case file and check it is created")] + [Xunit.TraitAttribute("FeatureTitle", "CaseFiles")] + [Xunit.TraitAttribute("Description", "Add case file and check it is created")] + public virtual void AddCaseFileAndCheckItIsCreated() + { + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Add case file and check it is created", null, ((string[])(null))); +#line 4 +this.ScenarioInitialize(scenarioInfo); + this.ScenarioStart(); +#line hidden + TechTalk.SpecFlow.Table table1 = new TechTalk.SpecFlow.Table(new string[] { + "Key", + "Value"}); + table1.AddRow(new string[] { + "name", + "name"}); + table1.AddRow(new string[] { + "description", + "description"}); +#line 5 + testRunner.When("execute HTTP POST JSON request \'http://localhost/case-files\'", ((string)(null)), table1, "When "); +#line 9 + testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 10 + testRunner.And("extract \'id\' from JSON body into \'casefileid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 11 + testRunner.And("execute HTTP GET request \'http://localhost/case-files/$casefileid$\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 12 + testRunner.And("extract JSON from body into \'casefile\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 13 + testRunner.When("execute HTTP GET request \'http://localhost/case-definitions/search?case_file=$cas" + + "efileid$\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); +#line 14 + testRunner.And("extract JSON from body into \'casedefinition\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 16 + testRunner.Then("extract JSON \'casefile\', JSON \'name\'=\'name\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 17 + testRunner.Then("extract JSON \'casefile\', JSON \'description\'=\'description\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 18 + testRunner.Then("extract JSON \'casedefinition\', JSON \'total_length\'=\'1\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line hidden + this.ScenarioCleanup(); + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.0.0.0")] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class FixtureData : System.IDisposable + { + + public FixtureData() + { + CaseFilesFeature.FeatureSetup(); + } + + void System.IDisposable.Dispose() + { + CaseFilesFeature.FeatureTearDown(); + } + } + } +} +#pragma warning restore +#endregion diff --git a/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseInstanceErrors.feature.cs b/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseInstanceErrors.feature.cs index d91188b0..4fe8ac5f 100644 --- a/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseInstanceErrors.feature.cs +++ b/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseInstanceErrors.feature.cs @@ -86,14 +86,14 @@ public virtual void CreateUnknownCaseDefinitionAndCheckErrorIsReturned() this.ScenarioInitialize(scenarioInfo); this.ScenarioStart(); #line hidden - TechTalk.SpecFlow.Table table1 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table1.AddRow(new string[] { + table2.AddRow(new string[] { "case_definition_id", "1"}); #line 5 - testRunner.When("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table1, "When "); + testRunner.When("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table2, "When "); #line 8 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 10 @@ -182,14 +182,14 @@ public virtual void SuspendUnknownCaseElementInstanceAndCheckErrorIsReturned() #line 36 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table3 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table2.AddRow(new string[] { + table3.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 37 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table2, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table3, "And "); #line 40 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 41 @@ -244,14 +244,14 @@ public virtual void ReactivateUnknownCaseElementInstanceAndCheckErrorIsReturned( #line 58 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table3 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table4 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table3.AddRow(new string[] { + table4.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 59 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table3, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table4, "And "); #line 62 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 63 @@ -285,14 +285,14 @@ public virtual void ReactivateNotFailedCaseInstanceAndCheckErrorIsReturned() #line 73 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table4 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table5 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table4.AddRow(new string[] { + table5.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 74 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table4, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table5, "And "); #line 77 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 78 @@ -348,14 +348,14 @@ public virtual void ActivateUnknownCaseElementInstanceAndCheckErrorIsReturned() #line 95 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table5 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table6 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table5.AddRow(new string[] { + table6.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 96 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table5, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table6, "And "); #line 99 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 100 diff --git a/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseInstances.feature.cs b/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseInstances.feature.cs index 82a10370..ab183c89 100644 --- a/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseInstances.feature.cs +++ b/tests/CaseManagement.CMMN.Acceptance.Tests/Features/CaseInstances.feature.cs @@ -93,14 +93,14 @@ public virtual void LaunchCaseWithOneTaskAndCheckHisStatusIsCompleted() #line 7 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table6 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table6.AddRow(new string[] { + table7.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 8 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table6, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table7, "And "); #line 11 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 12 @@ -136,14 +136,14 @@ public virtual void LaunchCaseWithOneLongProcessTaskAndCheckHisStatusIsCompleted #line 23 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table7.AddRow(new string[] { + table8.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 24 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table7, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table8, "And "); #line 27 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 28 @@ -195,14 +195,14 @@ public virtual void LaunchCaseWithTwoStagesAndCheckHisStatusIsCompleted() #line 47 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table9 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table8.AddRow(new string[] { + table9.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 48 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table8, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table9, "And "); #line 51 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 52 @@ -328,14 +328,14 @@ public virtual void LaunchCaseWithOneHumanTaskAndCheckHisStatusIsCompleted() #line 94 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table9 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table10 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table9.AddRow(new string[] { + table10.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 95 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table9, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table10, "And "); #line 98 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 99 @@ -350,15 +350,15 @@ public virtual void LaunchCaseWithOneHumanTaskAndCheckHisStatusIsCompleted() #line 103 testRunner.And("extract \'elements[0].id\' from JSON body into \'eltid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table10 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table11 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table10.AddRow(new string[] { + table11.AddRow(new string[] { "name", "name"}); #line 104 testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances/$insid$/confirm/$" + - "eltid$\'", ((string)(null)), table10, "And "); + "eltid$\'", ((string)(null)), table11, "And "); #line 107 testRunner.And("poll \'http://localhost/case-instances/$insid$\', until \'state\'=\'Completed\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 108 @@ -404,14 +404,14 @@ public virtual void LaunchCaseWithOneManualActivationTaskAndCheckHisStatusIsComp #line 124 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table11 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table12 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table11.AddRow(new string[] { + table12.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 125 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table11, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table12, "And "); #line 128 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 129 @@ -477,14 +477,14 @@ public virtual void LaunchCaseWithRepetitionRuleAndCheckHisStatusIsCompleted() #line 154 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table12 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table13 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table12.AddRow(new string[] { + table13.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 155 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table12, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table13, "And "); #line 158 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 159 @@ -548,14 +548,14 @@ public virtual void LaunchCaseWithOneSEntryAndCheckHisStatusIsCompleted() #line 184 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table13 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table14 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table13.AddRow(new string[] { + table14.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 185 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table13, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table14, "And "); #line 188 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 189 @@ -643,14 +643,14 @@ public virtual void LaunchCaseWithOneTimerEventListenerAndCheckHisStatusIsComple #line 226 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table14 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table15 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table14.AddRow(new string[] { + table15.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 227 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table14, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table15, "And "); #line 230 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 231 @@ -718,14 +718,14 @@ public virtual void LaunchCaseWithOneCaseFileItemAndCheckHisStatusIsCompleted() #line 258 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table15 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table16 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table15.AddRow(new string[] { + table16.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 259 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table15, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table16, "And "); #line 262 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 263 @@ -806,14 +806,14 @@ public virtual void LaunchCaseWithOneHumanTaskAndRoleAndCheckHisStatusIsComplete #line 291 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table16 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table17 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table16.AddRow(new string[] { + table17.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 292 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table16, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table17, "And "); #line 295 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 296 @@ -830,15 +830,15 @@ public virtual void LaunchCaseWithOneHumanTaskAndRoleAndCheckHisStatusIsComplete #line 301 testRunner.And("authenticate as \'thabart\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table17 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table18 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table17.AddRow(new string[] { + table18.AddRow(new string[] { "name", "name"}); #line 302 testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances/$insid$/confirm/$" + - "eltid$\'", ((string)(null)), table17, "And "); + "eltid$\'", ((string)(null)), table18, "And "); #line 305 testRunner.And("poll \'http://localhost/case-instances/$insid$\', until \'state\'=\'Completed\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 306 @@ -887,14 +887,14 @@ public virtual void LaunchCaseWithOneDiscretionaryItemAndCheckHisStatusIsComplet #line 322 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table18 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table19 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table18.AddRow(new string[] { + table19.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 323 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table18, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table19, "And "); #line 326 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 327 @@ -945,14 +945,14 @@ public virtual void LaunchCaseWithOneDiscretionaryItemAndCheckHisStatusIsComplet #line 343 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table19 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table20 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table19.AddRow(new string[] { + table20.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 344 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table19, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table20, "And "); #line 347 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 348 @@ -1038,14 +1038,14 @@ public virtual void LaunchCaseWithOneBlockedSEntryAndCheckHisStatusIsActive() #line 378 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table20 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table21 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table20.AddRow(new string[] { + table21.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 379 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table20, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table21, "And "); #line 382 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 383 @@ -1115,14 +1115,14 @@ public virtual void SuspendCaseWithOneLongProcessTaskAndCheckHisStatusIsSuspende #line 405 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table21 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table22 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table21.AddRow(new string[] { + table22.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 406 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table21, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table22, "And "); #line 409 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 410 @@ -1201,14 +1201,14 @@ public virtual void SuspendCaseWithOneLongProcessTaskAndCheckHisStatusIsSuspende #line 439 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table22 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table23 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table22.AddRow(new string[] { + table23.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 440 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table22, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table23, "And "); #line 443 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 444 @@ -1286,14 +1286,14 @@ public virtual void ReactiveFailedCaseWithTwoStagesAndCheckHisStatusIsFailedScop #line 475 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table23 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table24 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table23.AddRow(new string[] { + table24.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 476 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table23, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table24, "And "); #line 479 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 480 @@ -1457,14 +1457,14 @@ public virtual void ReactivateFailedCaseWithOneFailProcessTaskAndCheckHisStatusI #line 534 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table24 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table25 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table24.AddRow(new string[] { + table25.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 535 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table24, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table25, "And "); #line 538 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 539 @@ -1534,14 +1534,14 @@ public virtual void TerminateCaseWithOneLongProcessTaskAndCheckHisStatusIsTermin #line 566 testRunner.And("extract \'content[0].id\' from JSON body into \'defid\'", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden - TechTalk.SpecFlow.Table table25 = new TechTalk.SpecFlow.Table(new string[] { + TechTalk.SpecFlow.Table table26 = new TechTalk.SpecFlow.Table(new string[] { "Key", "Value"}); - table25.AddRow(new string[] { + table26.AddRow(new string[] { "case_definition_id", "$defid$"}); #line 567 - testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table25, "And "); + testRunner.And("execute HTTP POST JSON request \'http://localhost/case-instances\'", ((string)(null)), table26, "And "); #line 570 testRunner.And("extract JSON from body", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 571