From 5ebb6b82a0b81ff276f481d4982f20ddab4c3924 Mon Sep 17 00:00:00 2001 From: Dennis Beuchler Date: Thu, 6 Nov 2025 14:18:02 +0100 Subject: [PATCH 01/10] Fixed localization in SubworkplanStep --- src/Moryx/Properties/Strings.Designer.cs | 8 ++++---- src/Moryx/Properties/Strings.resx | 4 ++-- src/Moryx/Workplans/WorkplanSteps/SubWorkplanStep.cs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Moryx/Properties/Strings.Designer.cs b/src/Moryx/Properties/Strings.Designer.cs index 8404b9e7e..a2bdcd4f0 100644 --- a/src/Moryx/Properties/Strings.Designer.cs +++ b/src/Moryx/Properties/Strings.Designer.cs @@ -69,15 +69,15 @@ public static string SplitWorkplanStep_Name { } } - public static string SubworkflowStep_Description { + public static string SubworkplanStep_Description { get { - return ResourceManager.GetString("SubworkflowStep_Description", resourceCulture); + return ResourceManager.GetString("SubworkplanStep_Description", resourceCulture); } } - public static string SubworkflowStep_Name { + public static string SubworkplanStep_DisplayName { get { - return ResourceManager.GetString("SubworkflowStep_Name", resourceCulture); + return ResourceManager.GetString("SubworkplanStep_DisplayName", resourceCulture); } } } diff --git a/src/Moryx/Properties/Strings.resx b/src/Moryx/Properties/Strings.resx index 7e3503efc..816916c16 100644 --- a/src/Moryx/Properties/Strings.resx +++ b/src/Moryx/Properties/Strings.resx @@ -129,10 +129,10 @@ Split - + Nests a sub-workplan in the current workplan - + Sub-Workplan \ No newline at end of file diff --git a/src/Moryx/Workplans/WorkplanSteps/SubWorkplanStep.cs b/src/Moryx/Workplans/WorkplanSteps/SubWorkplanStep.cs index be802a009..c50665e11 100644 --- a/src/Moryx/Workplans/WorkplanSteps/SubWorkplanStep.cs +++ b/src/Moryx/Workplans/WorkplanSteps/SubWorkplanStep.cs @@ -12,7 +12,7 @@ namespace Moryx.Workplans.WorkplanSteps /// Step that creates a with the given workplan /// [DataContract] - [Display(ResourceType = typeof(Strings), Name = "SubworkplanStep_Name", Description = "SubworkplanStep_Description")] + [Display(ResourceType = typeof(Strings), Name = nameof(Strings.SubworkplanStep_DisplayName), Description = nameof(Strings.SubworkplanStep_Description))] public class SubworkplanStep : SubWorkplanStepBase { private SubworkplanStep() From b37117921fc07c1690f208e1b74a74896451fde3 Mon Sep 17 00:00:00 2001 From: Dennis Beuchler Date: Thu, 6 Nov 2025 14:45:29 +0100 Subject: [PATCH 02/10] Removed report from operation interrupt behaviour # Conflicts: # docs/migrations/v8_to_v10.md --- docs/migrations/v8_to_v10.md | 4 ++ .../OrderManagementController.cs | 29 +++++----- .../Components/IOperationData.cs | 5 +- .../Facade/OrderManagementFacade.cs | 18 +++--- .../OperationData/OperationData.cs | 38 ++++--------- .../States/AmountReachedState.cs | 17 +----- .../States/OperationDataStateBase.cs | 2 +- .../OperationData/States/RunningState.cs | 17 +----- .../OperationManager/IOperationManager.cs | 2 +- .../OperationManager/OperationManager.cs | 7 +-- .../Implementation/Pool/IOperationDataPool.cs | 2 +- .../Implementation/Pool/OperationDataPool.cs | 4 +- src/Moryx.Orders/Facade/IOrderManagement.cs | 11 +++- .../Integration/ProductionTests.cs | 2 +- .../OperationDataProductionTests.cs | 11 +--- .../OperationData/OperationDataReportTests.cs | 56 ++----------------- .../OperationData/OperationDataTestBase.cs | 8 +-- 17 files changed, 73 insertions(+), 160 deletions(-) diff --git a/docs/migrations/v8_to_v10.md b/docs/migrations/v8_to_v10.md index dc128827f..51afc39b7 100644 --- a/docs/migrations/v8_to_v10.md +++ b/docs/migrations/v8_to_v10.md @@ -77,6 +77,10 @@ These feature were infrequently used and has been removed to simplify the codeba - Moryx.Tools.FunctionResult: Moved to Moryx.Tools - Moryx.AbstractionLayer namespace: All classes have been moved to more specific domain namespaces e.g. Moryx.AbstractionLayer.Resources, Moryx.AbstractionLayer.Products, Moryx.AbstractionLayer.Processes etc. +## Modules-Orders + +- Removed report from interrupt of an operation. Reporting during an interruption doesn't add any value. The quantity for the report can only be predicted and will be inaccurate if something goes wrong or is reworked during the interruption. + ## Reworked driver APIs All driver APIs have been reworked to use TPL async/await instead of callbacks for the following reasons: diff --git a/src/Moryx.Orders.Endpoints/OrderManagementController.cs b/src/Moryx.Orders.Endpoints/OrderManagementController.cs index 3793c12f8..47b7d22a4 100644 --- a/src/Moryx.Orders.Endpoints/OrderManagementController.cs +++ b/src/Moryx.Orders.Endpoints/OrderManagementController.cs @@ -68,7 +68,7 @@ public async Task OperationStream(CancellationToken cancelToken) var updateEventHandler = new EventHandler((_, eventArgs) => { var json = JsonConvert.SerializeObject(Converter.ToModel(eventArgs.Operation), _serializerSettings); - operationsChannel.Writer.TryWrite(new Tuple(OperationTypes.Update.ToString(), json)); + operationsChannel.Writer.TryWrite(new Tuple(nameof(OperationTypes.Update), json)); }); _orderManagement.OperationUpdated += updateEventHandler; @@ -80,7 +80,7 @@ public async Task OperationStream(CancellationToken cancelToken) Advice = Converter.ToModel(eventArgs.Advice) }; var json = JsonConvert.SerializeObject(advicedOperation, _serializerSettings); - operationsChannel.Writer.TryWrite(new Tuple(OperationTypes.Advice.ToString(), json)); + operationsChannel.Writer.TryWrite(new Tuple(nameof(OperationTypes.Advice), json)); }); _orderManagement.OperationAdviced += adviceEventHandler; @@ -92,19 +92,14 @@ public async Task OperationStream(CancellationToken cancelToken) Report = Converter.ToModel(eventArgs.Report) }; var json = JsonConvert.SerializeObject(reportedOperation, _serializerSettings); - operationsChannel.Writer.TryWrite(new Tuple(OperationTypes.Report.ToString(), json)); + operationsChannel.Writer.TryWrite(new Tuple(nameof(OperationTypes.Report), json)); }); _orderManagement.OperationPartialReport += reportEventHandler; - var interruptedEventHandler = new EventHandler((_, eventArgs) => + var interruptedEventHandler = new EventHandler((_, eventArgs) => { - var interruptedOperation = new OperationReportedModel - { - OperationModel = Converter.ToModel(eventArgs.Operation), - Report = Converter.ToModel(eventArgs.Report) - }; - var json = JsonConvert.SerializeObject(interruptedOperation, _serializerSettings); - operationsChannel.Writer.TryWrite(new Tuple(OperationTypes.Interrupted.ToString(), json)); + var json = JsonConvert.SerializeObject(Converter.ToModel(eventArgs.Operation), _serializerSettings); + operationsChannel.Writer.TryWrite(new Tuple(nameof(OperationTypes.Interrupted), json)); }); _orderManagement.OperationInterrupted += interruptedEventHandler; @@ -116,7 +111,7 @@ public async Task OperationStream(CancellationToken cancelToken) Report = Converter.ToModel(eventArgs.Report) }; var json = JsonConvert.SerializeObject(completedOperation, _serializerSettings); - operationsChannel.Writer.TryWrite(new Tuple(OperationTypes.Completed.ToString(), json)); + operationsChannel.Writer.TryWrite(new Tuple(nameof(OperationTypes.Completed), json)); }); _orderManagement.OperationCompleted += completedEventHandler; @@ -128,14 +123,14 @@ public async Task OperationStream(CancellationToken cancelToken) UserId = eventArgs.User.Identifier }; var json = JsonConvert.SerializeObject(startedOperation, _serializerSettings); - operationsChannel.Writer.TryWrite(new Tuple(OperationTypes.Start.ToString(), json)); + operationsChannel.Writer.TryWrite(new Tuple(nameof(OperationTypes.Start), json)); }); _orderManagement.OperationStarted += startedEventHandler; var changedEventHandler = new EventHandler((_, eventArgs) => { var json = JsonConvert.SerializeObject(Converter.ToModel(eventArgs.Operation), _serializerSettings); - operationsChannel.Writer.TryWrite(new Tuple(OperationTypes.Progress.ToString(), json)); + operationsChannel.Writer.TryWrite(new Tuple(nameof(OperationTypes.Progress), json)); }); _orderManagement.OperationProgressChanged += changedEventHandler; @@ -424,13 +419,15 @@ public ActionResult ReportOperation(Guid guid, ReportModel report) [ProducesResponseType(typeof(MoryxExceptionResponse), StatusCodes.Status404NotFound)] [Route("{guid}/interrupt")] [Authorize(Policy = OrderPermissions.CanInterrupt)] - public ActionResult InterruptOperation(Guid guid, ReportModel report) + public ActionResult InterruptOperation(Guid guid, string userIdentifier) { var operation = _orderManagement.GetOperation(guid); if (operation == null) return NotFound(new MoryxExceptionResponse { Title = Strings.OrderManagementController_OperationNotFound }); - _orderManagement.InterruptOperation(operation, Converter.FromModel(report, _userManagement)); + var user = _userManagement?.GetUser(userIdentifier); + + _orderManagement.InterruptOperation(operation, user); return Ok(); } diff --git a/src/Moryx.Orders.Management/Components/IOperationData.cs b/src/Moryx.Orders.Management/Components/IOperationData.cs index eff7ed559..7f4b89b22 100644 --- a/src/Moryx.Orders.Management/Components/IOperationData.cs +++ b/src/Moryx.Orders.Management/Components/IOperationData.cs @@ -139,7 +139,8 @@ internal interface IOperationData /// /// Disables an operation which leads to complete all jobs /// - void Interrupt(OperationReport report); + /// + void Interrupt(User user); /// /// Will do a report for the operation. @@ -195,7 +196,7 @@ internal interface IOperationData /// /// Raised if the operation was interrupted /// - event EventHandler Interrupted; + event EventHandler Interrupted; /// /// Raised if the operation was completed diff --git a/src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs b/src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs index cfec87a74..48255c289 100644 --- a/src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs +++ b/src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs @@ -66,9 +66,9 @@ private void OnOperationStarted(object sender, StartedEventArgs e) OperationStarted?.Invoke(this, new OperationStartedEventArgs(e.OperationData.Operation, e.User)); } - private void OnOperationInterrupted(object sender, ReportEventArgs e) + private void OnOperationInterrupted(object sender, OperationEventArgs e) { - OperationInterrupted?.Invoke(this, new OperationReportEventArgs(e.OperationData.Operation, e.Report)); + OperationInterrupted?.Invoke(this, new OperationChangedEventArgs(e.OperationData.Operation)); } private void OnOperationCompleted(object sender, ReportEventArgs e) @@ -257,15 +257,17 @@ public ReportContext GetInterruptContext(Operation operation) return OperationManager.GetInterruptContext(operationData); } - public void InterruptOperation(Operation operation, OperationReport report) + public void InterruptOperation(Operation operation) { - ValidateHealthState(); + InterruptOperation(operation, UserManagement.DefaultUser); + } - // Get default user if there is no in the report - report.User ??= UserManagement.DefaultUser; + public void InterruptOperation(Operation operation, User user) + { + ValidateHealthState(); var operationData = GetOperationDataSave(operation); - OperationManager.Interrupt(operationData, report); + OperationManager.Interrupt(operationData, user); } private IOperationData GetOperationDataSave(Operation operation) @@ -332,7 +334,7 @@ public Task> GetAssignableRecipes(ProductIdentity public event EventHandler OperationCompleted; - public event EventHandler OperationInterrupted; + public event EventHandler OperationInterrupted; public event EventHandler OperationPartialReport; diff --git a/src/Moryx.Orders.Management/Implementation/OperationData/OperationData.cs b/src/Moryx.Orders.Management/Implementation/OperationData/OperationData.cs index dcdf8bf0b..f3a4964a6 100644 --- a/src/Moryx.Orders.Management/Implementation/OperationData/OperationData.cs +++ b/src/Moryx.Orders.Management/Implementation/OperationData/OperationData.cs @@ -420,42 +420,35 @@ internal void HandleStarted(User user) Started?.Invoke(this, new StartedEventArgs(this, user)); } + /// /// - public void Interrupt(OperationReport report) + public void Interrupt(User user) { - Log(LogLevel.Debug, "Operation will be interrupted with SuccessCount {0} and FailureCount {1} by user {2}", - report.SuccessCount, report.FailureCount, report.User.Identifier); + Log(LogLevel.Debug, "Operation will be interrupted by user {0}", + user.Identifier); lock (_stateLock) - _state.Interrupt(report); + _state.Interrupt(user); } /// /// Will complete all jobs and executes a partial report /// - internal void HandleManualInterrupting(OperationReport report) + internal void HandleManualInterrupting() { JobHandler.Complete(this); - HandlePartialReport(report); } /// /// Will handle manual interrupts. The interrupt was triggered by the user. /// Will throw the event /// - internal void HandleManualInterrupted(OperationReport report) + internal void HandleManualInterrupted() { Operation.TargetAmount = ReachableAmount; - lock (_reports) - { - _reports.Add(report); - Operation.Reports = _reports.ToArray(); - - } - Updated?.Invoke(this, new OperationEventArgs(this)); - Interrupted?.Invoke(this, new ReportEventArgs(this, report)); + Interrupted?.Invoke(this, new OperationEventArgs(this)); } /// @@ -466,19 +459,8 @@ internal void HandleInterrupted() { Operation.TargetAmount = ReachableAmount; - // Add report for interrupted with user which have started the interruption - OperationReport report; - lock (_reports) - { - var lastReportUser = Operation.Reports.Last().User; - report = new OperationReport(ConfirmationType.Partial, 0, 0, lastReportUser); - - _reports.Add(report); - Operation.Reports = _reports.ToArray(); - } - Updated?.Invoke(this, new OperationEventArgs(this)); - Interrupted?.Invoke(this, new ReportEventArgs(this, report)); + Interrupted?.Invoke(this, new OperationEventArgs(this)); } /// @@ -757,7 +739,7 @@ private TInfo GetOperationInfo() public event EventHandler Started; /// - public event EventHandler Interrupted; + public event EventHandler Interrupted; /// public event EventHandler Completed; diff --git a/src/Moryx.Orders.Management/Implementation/OperationData/States/AmountReachedState.cs b/src/Moryx.Orders.Management/Implementation/OperationData/States/AmountReachedState.cs index 4f22752b7..6ed15980d 100644 --- a/src/Moryx.Orders.Management/Implementation/OperationData/States/AmountReachedState.cs +++ b/src/Moryx.Orders.Management/Implementation/OperationData/States/AmountReachedState.cs @@ -54,21 +54,10 @@ public override void IncreaseTargetBy(int amount, User user) Context.HandleIncreaseTargetBy(amount); } - public override void Interrupt(OperationReport report) + public override void Interrupt(User user) { - switch (report.ConfirmationType) - { - case ConfirmationType.Final: - NextState(StateCompleted); - Context.HandleCompleted(report); - break; - case ConfirmationType.Partial: - NextState(StateInterrupted); - Context.HandleManualInterrupted(report); - break; - default: - throw new ArgumentOutOfRangeException(nameof(report.ConfirmationType), report.ConfirmationType, null); - } + NextState(StateInterrupted); + Context.HandleManualInterrupted(); } public override ReportContext GetReportContext() diff --git a/src/Moryx.Orders.Management/Implementation/OperationData/States/OperationDataStateBase.cs b/src/Moryx.Orders.Management/Implementation/OperationData/States/OperationDataStateBase.cs index d77768901..dd0d1f3b6 100644 --- a/src/Moryx.Orders.Management/Implementation/OperationData/States/OperationDataStateBase.cs +++ b/src/Moryx.Orders.Management/Implementation/OperationData/States/OperationDataStateBase.cs @@ -72,7 +72,7 @@ public virtual AdviceContext GetAdviceContext() return null; } - public virtual void Interrupt(OperationReport report) => InvalidState(); + public virtual void Interrupt(User user) => InvalidState(); public virtual void Report(OperationReport report) => InvalidState(); diff --git a/src/Moryx.Orders.Management/Implementation/OperationData/States/RunningState.cs b/src/Moryx.Orders.Management/Implementation/OperationData/States/RunningState.cs index af99b2132..7964e8dfe 100644 --- a/src/Moryx.Orders.Management/Implementation/OperationData/States/RunningState.cs +++ b/src/Moryx.Orders.Management/Implementation/OperationData/States/RunningState.cs @@ -34,21 +34,10 @@ public override void IncreaseTargetBy(int amount, User user) public override void DecreaseTargetBy(int amount, User user) => Context.HandleDecreaseTargetBy(amount); - public override void Interrupt(OperationReport report) + public override void Interrupt(User user) { - switch (report.ConfirmationType) - { - case ConfirmationType.Partial: - NextState(StateInterrupting); - Context.HandleManualInterrupting(report); - break; - case ConfirmationType.Final: - // ReSharper disable once ExplicitCallerInfoArgument - InvalidState(nameof(Report) + "(final)"); - break; - default: - throw new ArgumentOutOfRangeException(); - } + NextState(StateInterrupting); + Context.HandleManualInterrupting(); } public override ReportContext GetReportContext() diff --git a/src/Moryx.Orders.Management/Implementation/OperationManager/IOperationManager.cs b/src/Moryx.Orders.Management/Implementation/OperationManager/IOperationManager.cs index cbc97f7c4..bb23c1e76 100644 --- a/src/Moryx.Orders.Management/Implementation/OperationManager/IOperationManager.cs +++ b/src/Moryx.Orders.Management/Implementation/OperationManager/IOperationManager.cs @@ -45,7 +45,7 @@ internal interface IOperationManager /// /// Interrupts the given operation /// - void Interrupt(IOperationData operationData, OperationReport report); + void Interrupt(IOperationData operationData, User user); /// /// Aborts the given operation diff --git a/src/Moryx.Orders.Management/Implementation/OperationManager/OperationManager.cs b/src/Moryx.Orders.Management/Implementation/OperationManager/OperationManager.cs index 0e00c80ad..d30efd186 100644 --- a/src/Moryx.Orders.Management/Implementation/OperationManager/OperationManager.cs +++ b/src/Moryx.Orders.Management/Implementation/OperationManager/OperationManager.cs @@ -155,12 +155,9 @@ public void Report(IOperationData operationData, OperationReport report) } /// - public void Interrupt(IOperationData operationData, OperationReport report) + public void Interrupt(IOperationData operationData, User user) { - if (!report.User.SignedIn) - throw new InvalidOperationException("User for the interrupt of the operation was not signed in."); - - operationData.Interrupt(report); + operationData.Interrupt(user); } /// diff --git a/src/Moryx.Orders.Management/Implementation/Pool/IOperationDataPool.cs b/src/Moryx.Orders.Management/Implementation/Pool/IOperationDataPool.cs index 4eb9e6e40..0ec7982f0 100644 --- a/src/Moryx.Orders.Management/Implementation/Pool/IOperationDataPool.cs +++ b/src/Moryx.Orders.Management/Implementation/Pool/IOperationDataPool.cs @@ -68,7 +68,7 @@ internal interface IOperationDataPool : IPlugin /// /// Raised if an operation was interrupted /// - event EventHandler OperationInterrupted; + event EventHandler OperationInterrupted; /// /// Raised if an operation was partially reported diff --git a/src/Moryx.Orders.Management/Implementation/Pool/OperationDataPool.cs b/src/Moryx.Orders.Management/Implementation/Pool/OperationDataPool.cs index dc169fbbe..9fcf80079 100644 --- a/src/Moryx.Orders.Management/Implementation/Pool/OperationDataPool.cs +++ b/src/Moryx.Orders.Management/Implementation/Pool/OperationDataPool.cs @@ -351,8 +351,8 @@ private void OnOperationStarted(object sender, StartedEventArgs eventArgs) private void OnOperationCompleted(object sender, ReportEventArgs eventArgs) => OperationCompleted?.Invoke(this, eventArgs); - public event EventHandler OperationInterrupted; - private void OnOperationInterrupted(object sender, ReportEventArgs eventArgs) + public event EventHandler OperationInterrupted; + private void OnOperationInterrupted(object sender, OperationEventArgs eventArgs) => OperationInterrupted?.Invoke(this, eventArgs); public event EventHandler OperationPartialReport; diff --git a/src/Moryx.Orders/Facade/IOrderManagement.cs b/src/Moryx.Orders/Facade/IOrderManagement.cs index 8a9b26a0c..d4265893c 100644 --- a/src/Moryx.Orders/Facade/IOrderManagement.cs +++ b/src/Moryx.Orders/Facade/IOrderManagement.cs @@ -82,7 +82,12 @@ public interface IOrderManagement /// /// Processes a interrupt for the given operation /// - void InterruptOperation(Operation operation, OperationReport report); + void InterruptOperation(Operation operation); + + /// + /// Processes a interrupt for the given operation + /// + void InterruptOperation(Operation operation, User user); /// /// Updates the operation source @@ -107,7 +112,7 @@ public interface IOrderManagement /// /// Will be raised if an operation was interrupted /// - event EventHandler OperationInterrupted; + event EventHandler OperationInterrupted; /// /// Will be raised if an operation was partially reported @@ -146,7 +151,7 @@ public interface IOrderManagement AdviceContext GetAdviceContext(Operation operation); /// - /// Tries to advise the . + /// Tries to advise the . /// The returned advice result contains information regarding the successful or unsuccessful attempt. /// /// The to advice. diff --git a/src/Tests/Moryx.Orders.Management.Tests/Integration/ProductionTests.cs b/src/Tests/Moryx.Orders.Management.Tests/Integration/ProductionTests.cs index 3ea0ba047..5050bec11 100644 --- a/src/Tests/Moryx.Orders.Management.Tests/Integration/ProductionTests.cs +++ b/src/Tests/Moryx.Orders.Management.Tests/Integration/ProductionTests.cs @@ -192,7 +192,7 @@ public void SetUp() } [Test(Description = "Runs a full production of a operation. At the end, a final report will be executed.")] - [Ignore("This test takes very long and should be moved into an integration test.")] + [Ignore("This test takes very long should be fixed!")] public void SimpleCompletedProduction() { const int amount = 10; diff --git a/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataProductionTests.cs b/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataProductionTests.cs index 2d4f7dcc2..1a199f1c3 100644 --- a/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataProductionTests.cs +++ b/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataProductionTests.cs @@ -426,18 +426,12 @@ public void InterruptWhileRunning() // Arrange var operationData = GetRunningOperation(10, false, 10, 10); - var partialReportRaised = false; - operationData.PartialReport += (_, _) => partialReportRaised = true; - - var report = new OperationReport(ConfirmationType.Partial, 0, 0, User); - // Act - operationData.Interrupt(report); + operationData.Interrupt(); // Assert // We should now be interrupting JobHandlerMock.Verify(d => d.Complete(operationData), Times.Once); - Assert.That(partialReportRaised); Assert.That(operationData.State.CanBegin); Assert.That(operationData.State.CanPartialReport); Assert.That(operationData.State.CanFinalReport, Is.False); @@ -451,7 +445,6 @@ public void JobCompletionWhileInterrupting() // Arrange var operationData = GetInterruptingOperation(10, false, 10, 10); var initialJob = operationData.Operation.Jobs.First(); - var report = new OperationReport(ConfirmationType.Partial, 0, 0, User); // Act initialJob.SuccessCount = initialJob.Amount; @@ -461,7 +454,7 @@ public void JobCompletionWhileInterrupting() // Assert Assert.That(operationData.State.CanInterrupt, Is.False); - Assert.Throws(() => operationData.Interrupt(report)); + Assert.Throws(() => operationData.Interrupt()); } } } diff --git a/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataReportTests.cs b/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataReportTests.cs index 1715f85f5..049d302d0 100644 --- a/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataReportTests.cs +++ b/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataReportTests.cs @@ -3,6 +3,7 @@ using System; using System.Linq; +using Moq; using Moryx.ControlSystem.Jobs; using NUnit.Framework; @@ -129,63 +130,18 @@ public void ReportWhileInterruptingByReport(ConfirmationType confirmationType) } } - [TestCase(ConfirmationType.Partial, Description = "Tests interrupting the running operation. Only partial report should be possible.")] - [TestCase(ConfirmationType.Final, Description = "Tests interrupting the running operation. Final reports should not be possible.")] - public void ReportWhileRunningByInterrupt(ConfirmationType confirmationType) + [Test(Description = "Tests interrupting the running operation.")] + public void ReportWhileRunningByInterrupt() { // Arrange var operationData = GetRunningOperation(10, false, 10, 10); - var partialReportRaised = false; - operationData.PartialReport += (_, _) => partialReportRaised = true; - - var report = new OperationReport(confirmationType, 5, 5, User); - - switch (confirmationType) - { - case ConfirmationType.Partial: - // Act - operationData.Interrupt(report); - - // Assert - // Raise partial report - Assert.That(partialReportRaised); - break; - case ConfirmationType.Final: - // Final reports by interrupt are not allowed - // Act - Assert - Assert.Throws(() => operationData.Interrupt(report), "No final report while interrupting the OperationData"); - Assert.That(partialReportRaised, Is.False); - break; - } - } - - [TestCase(ConfirmationType.Partial, false, true, Description = "Tests interrupting the amount reached operation. " + - "Partial report should be possible. The operation should be interrupted.")] - [TestCase(ConfirmationType.Final, true, false, Description = "Tests interrupting the amount reached operation. " + - "By final reporting, the operation will be completed.")] - public void ReportWhileAmountReachedByInterrupt(ConfirmationType confirmationType, bool expectedCompleted, bool expectedInterrupted) - { - // Arrange - var operationData = GetAmountReachedOperation(10, false, 10, 10); - - var partialReportRaised = false; - operationData.PartialReport += (_, _) => partialReportRaised = true; - - var interruptedRaised = false; - operationData.Interrupted += (_, _) => interruptedRaised = true; - - var completedRaised = false; - operationData.Completed += (_, _) => completedRaised = true; - // Act - var report = new OperationReport(confirmationType, 5, 5, User); - operationData.Interrupt(report); + operationData.Interrupt(); // Assert - Assert.That(partialReportRaised, Is.False); - Assert.That(interruptedRaised, Is.EqualTo(expectedInterrupted)); - Assert.That(completedRaised, Is.EqualTo(expectedCompleted)); + // Raise partial report + JobHandlerMock.Verify(j => j.Complete(operationData), Times.Once); } [TestCase(ConfirmationType.Partial, false, true, Description = "Tests reporting the amount reached operation. " + diff --git a/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataTestBase.cs b/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataTestBase.cs index 2c8bbff97..c123ffb55 100644 --- a/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataTestBase.cs +++ b/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataTestBase.cs @@ -124,7 +124,7 @@ internal IOperationData GetOperationDataInstance(bool replaceScrap) ModuleConfig = new ModuleConfig() //Order and Operation must be set automatically during OperationData.Initialize! //Removed for OperationDataRestoreTests.RestoreAmountReached() - //OrderData = orderdata, + //OrderData = orderdata, //Operation = { Number = "0010" } }; } @@ -149,9 +149,8 @@ internal IOperationData GetRunningOperation(int amount, bool replaceScrap, int o internal IOperationData GetInterruptingOperation(int amount, bool replaceScrap, int overDeliveryAmount, int underDeliveryAmount) { var operationData = GetRunningOperation(amount, replaceScrap, overDeliveryAmount, underDeliveryAmount); - var report = new OperationReport(ConfirmationType.Partial, 0, 0, User); - operationData.Interrupt(report); + operationData.Interrupt(); return operationData; } @@ -174,8 +173,7 @@ internal IOperationData GetInterruptedOperation(int amount, bool replaceScrap, i var operationData = GetAmountReachedOperation(amount, replaceScrap, overDeliveryAmount, underDeliveryAmount); // Interrupt - var report = new OperationReport(ConfirmationType.Partial, 5, 5, User); - operationData.Interrupt(report); + operationData.Interrupt(); return operationData; } From 098db04df9d96ce18da6d7d3b10cde7ade0cff34 Mon Sep 17 00:00:00 2001 From: Dennis Beuchler Date: Fri, 7 Nov 2025 10:42:57 +0100 Subject: [PATCH 03/10] Updated documentation --- .../module-orders/images/OperationsStates.png | 4 ++-- docs/articles/module-orders/index.md | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/articles/module-orders/images/OperationsStates.png b/docs/articles/module-orders/images/OperationsStates.png index 39f7f3646..5cc8c12d0 100644 --- a/docs/articles/module-orders/images/OperationsStates.png +++ b/docs/articles/module-orders/images/OperationsStates.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:758db121f6f251e6153aee8817d5d607affdc970c185401a3f35b479532db4c1 -size 93467 +oid sha256:29ec9024f55258e704f32ca80a2b3f0d410219f7cf91c5a0b29df9b6e9a21f7b +size 91326 diff --git a/docs/articles/module-orders/index.md b/docs/articles/module-orders/index.md index 0e37fd35a..ab704ebba 100644 --- a/docs/articles/module-orders/index.md +++ b/docs/articles/module-orders/index.md @@ -38,7 +38,7 @@ This modules exports the `IOrderManagement` facade. ## Structure -![Components](images\OrderManagementComponents.png) +![Components](images/OrderManagementComponents.png) The internal structure of the OrderManagement is shown in the component diagram. On the top is the OrderWcf which uses the OperationPool to get any update of each `OperationData` or perform some operations on each one. The `OperationPool` is an implementation of the Object Pooling Pattern which holds all known OperationData. The `OperationData` is the main component which handles all operation related functionalities. There is the `OperationAssignment` to assign all needed Information to a new or reloaded OperationData to make it producible. The `JobHandler` will be used to communicate with the `JobManagement` of the ProcessEngine to dispatch Jobs for the production. @@ -62,7 +62,7 @@ The [IOperationPool](xref:Moryx.Orders.IOperationPool) is used for all module pl ### State Machine -![OperationData State Machine](images\OperationsStates.png) +![OperationData State Machine](images/OperationsStates.png) #### Initial @@ -86,7 +86,7 @@ The OperationData is still running in this state until the User decides to start #### Interrupted -The OperationData can be Interrupted if the it is in the RunningState or AmountReachedState (both of the states have the state classification [Running](xref:Moryx.Orders.OperationClassification)). In both case all jobs will be completed and the worker can add some report information which is a partial report. The OperationData switches from the RunningState to the InterruptingState first to wait until all jobs are completed. After all jobs are completed the state switches to the InterruptedState which leads to a Interrupted event with the user from the last partial report. In the AmountReachedState all jobs are already completed so there is no reason to wait for some jobs. +The OperationData can be Interrupted if the it is in the RunningState or AmountReachedState (both of the states have the state classification [Running](xref:Moryx.Orders.OperationClassification)). In both case all jobs will be completed. The OperationData switches from the RunningState to the InterruptingState first to wait until all jobs are completed. After all jobs are completed the state switches to the InterruptedState which leads to a Interrupted event. In the AmountReachedState all jobs are already completed so there is no reason to wait for some jobs. #### Completed @@ -134,7 +134,7 @@ In all cases a reporting will be performed. The reporting information are encaps - Comment: Optional information - UserId: The id of the user which was selected to document who has done the report -Each report is depending to the machine state and only possible if the state has the classification `Production`. It is possible that there is are no states or no production state. In this case the reports are independent to the machine state. A state change to the production state will lead to a state change task followed by a report task if there is something to report. If the state switches from the production state to a non production state then this will lead to a report task followed by a state change task to ensure that everything will be reported in the production state. +Each report is depending to the machine state and only possible if the state has the classification `Production`. It is possible that there is are no states or no production state. In this case the reports are independent to the machine state. A state change to the production state will lead to a state change task followed by a report task if there is something to report. If the state switches from the production state to a non production state then this will lead to a report task followed by a state change task to ensure that everything will be reported in the production state. ### Advice PickParts/Order @@ -196,8 +196,6 @@ For example there are two failure parts and 5 reworked. So the user spends only #### Interrupt Behavior An interrupt can be performed in the `AmountReachedState` and in the `RunningState`. The main difference is that in the `RunningState` there are running jobs which are still producing. -So if the worker decides to interrupt the OperationData during the `RunningState` then he only gets the current `SuccessCount` and `ScrapCount`. The parts which are not done are not taken into account for the possible reporting and will be finished afterwards and can be reported later. -An interrupt is predefined with the `ConfirmationType` [Partial](@ref Moryx.Orders.ConfirmationType). So only a partial report is possible. #### Restore Behavior @@ -290,7 +288,7 @@ If the OrderManagement will be restarted, it is necessary to reload the jobs whi The ui of the order management will be used to show all orders to produce on the current machine. It is also possible to create order without an external system like HYDRA or SAP. **Concept** -The orders ui contains a list of orders for a first overview. The details of each order can be displayed by selecting it. +The orders ui contains a list of orders for a first overview. The details of each order can be displayed by selecting it. The ui has an area for all order details. This contains general information like order number and the due date, information about the product to produce and a list of operations of the selected order. **Hide completed** @@ -309,7 +307,7 @@ The job UI provides also the possibility to start, abort and reorder each job. **Concept** The job UI is basically a list of all current jobs. There are some buttons on the bottom side to start, abort and moving each job. -To start, abort or moving a job it is necessary to select the job and click on the button you want. +To start, abort or moving a job it is necessary to select the job and click on the button you want. The buttons will be automatically disabled and enabled depending if the action is executable with the selected job. From 274295f9e7f14337ebdd6262f6d2739392ad02a8 Mon Sep 17 00:00:00 2001 From: Dennis Beuchler Date: Fri, 7 Nov 2025 10:49:25 +0100 Subject: [PATCH 04/10] Added diagrams EAP to lfs for not migrated diagrams --- docs/articles/ControlSystem.eap | 3 +++ docs/articles/module-orders/images/OperationsStates.png | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 docs/articles/ControlSystem.eap diff --git a/docs/articles/ControlSystem.eap b/docs/articles/ControlSystem.eap new file mode 100644 index 000000000..267483594 --- /dev/null +++ b/docs/articles/ControlSystem.eap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fea37e004e1755faf50e8176950cc861dcae45223e7ae955ace2c747391dba33 +size 2246656 diff --git a/docs/articles/module-orders/images/OperationsStates.png b/docs/articles/module-orders/images/OperationsStates.png index 5cc8c12d0..639deab04 100644 --- a/docs/articles/module-orders/images/OperationsStates.png +++ b/docs/articles/module-orders/images/OperationsStates.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29ec9024f55258e704f32ca80a2b3f0d410219f7cf91c5a0b29df9b6e9a21f7b -size 91326 +oid sha256:8aa560e942ca545e036310330b834a3a40cc430da8a5e8975463abe945f6dc20 +size 92037 From fbe83bffd0c55a17f718f9ba79ed8148bccefe1a Mon Sep 17 00:00:00 2001 From: Marcel Vielhaus Date: Mon, 17 Nov 2025 10:53:27 +0100 Subject: [PATCH 05/10] Fix build errors in tests due to internal API changes --- .../OperationData/OperationDataProductionTests.cs | 4 ++-- .../OperationData/OperationDataReportTests.cs | 2 +- .../OperationData/OperationDataTestBase.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataProductionTests.cs b/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataProductionTests.cs index 1a199f1c3..95fbd344b 100644 --- a/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataProductionTests.cs +++ b/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataProductionTests.cs @@ -427,7 +427,7 @@ public void InterruptWhileRunning() var operationData = GetRunningOperation(10, false, 10, 10); // Act - operationData.Interrupt(); + operationData.Interrupt(User); // Assert // We should now be interrupting @@ -454,7 +454,7 @@ public void JobCompletionWhileInterrupting() // Assert Assert.That(operationData.State.CanInterrupt, Is.False); - Assert.Throws(() => operationData.Interrupt()); + Assert.Throws(() => operationData.Interrupt(User)); } } } diff --git a/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataReportTests.cs b/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataReportTests.cs index 049d302d0..d027dc1ec 100644 --- a/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataReportTests.cs +++ b/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataReportTests.cs @@ -137,7 +137,7 @@ public void ReportWhileRunningByInterrupt() var operationData = GetRunningOperation(10, false, 10, 10); // Act - operationData.Interrupt(); + operationData.Interrupt(User); // Assert // Raise partial report diff --git a/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataTestBase.cs b/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataTestBase.cs index c123ffb55..3d65f3217 100644 --- a/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataTestBase.cs +++ b/src/Tests/Moryx.Orders.Management.Tests/OperationData/OperationDataTestBase.cs @@ -150,7 +150,7 @@ internal IOperationData GetInterruptingOperation(int amount, bool replaceScrap, { var operationData = GetRunningOperation(amount, replaceScrap, overDeliveryAmount, underDeliveryAmount); - operationData.Interrupt(); + operationData.Interrupt(User); return operationData; } @@ -173,7 +173,7 @@ internal IOperationData GetInterruptedOperation(int amount, bool replaceScrap, i var operationData = GetAmountReachedOperation(amount, replaceScrap, overDeliveryAmount, underDeliveryAmount); // Interrupt - operationData.Interrupt(); + operationData.Interrupt(User); return operationData; } From e353b54c593917bc15911bcb87caee9d97538be0 Mon Sep 17 00:00:00 2001 From: Marcel Vielhaus Date: Tue, 18 Nov 2025 07:56:39 +0100 Subject: [PATCH 06/10] Regenerate API client with latest ng-openapi-gen version Due to a change in the tool the model names do not include the namespaces anymore and are centrally located under `/api/models/` instead of subfolders --- MORYX-Framework.sln | 6 +- ResXManager.config.xml | 4 + src/Moryx.Orders.Web/ng-openapi-gen.json | 10 +- .../src/app/api/api-configuration.ts | 1 - .../src/app/api/api.module.ts | 1 - src/Moryx.Orders.Web/src/app/api/api.ts | 64 ++++++ .../src/app/api/base-service.ts | 1 - .../src/app/api/fn/operator-management/add.ts | 5 +- .../fn/operator-management/delete-operator.ts | 1 - .../app/api/fn/operator-management/get-all.ts | 7 +- .../get-default-operator.ts | 7 +- .../get-operators-by-resource.ts | 7 +- .../fn/operator-management/get-resources-1.ts | 7 +- .../fn/operator-management/get-resources.ts | 7 +- .../src/app/api/fn/operator-management/get.ts | 7 +- .../app/api/fn/operator-management/sign-in.ts | 1 - .../api/fn/operator-management/sign-out.ts | 1 - .../app/api/fn/operator-management/update.ts | 5 +- .../fn/order-management/abort-operation.ts | 1 - .../api/fn/order-management/add-operation.ts | 11 +- .../fn/order-management/advice-operation.ts | 5 +- .../fn/order-management/begin-operation.ts | 5 +- .../fn/order-management/get-advice-context.ts | 7 +- .../get-assignable-recipes.ts | 7 +- .../fn/order-management/get-begin-context.ts | 7 +- .../order-management/get-document-stream.ts | 1 - .../api/fn/order-management/get-documents.ts | 7 +- .../order-management/get-interrupt-context.ts | 7 +- .../app/api/fn/order-management/get-logs.ts | 7 +- .../api/fn/order-management/get-operation.ts | 7 +- .../api/fn/order-management/get-operations.ts | 7 +- .../fn/order-management/get-product-parts.ts | 7 +- .../fn/order-management/get-report-context.ts | 7 +- .../order-management/interrupt-operation.ts | 6 +- .../fn/order-management/operation-stream.ts | 7 +- .../src/app/api/fn/order-management/reload.ts | 1 - .../fn/order-management/report-operation.ts | 5 +- .../set-operation-sort-order.ts | 1 - .../fn/product-management/create-instance.ts | 7 +- .../fn/product-management/create-recipe.ts | 7 +- .../api/fn/product-management/delete-type.ts | 1 - .../api/fn/product-management/duplicate.ts | 7 +- .../api/fn/product-management/get-instance.ts | 7 +- .../fn/product-management/get-instances.ts | 7 +- .../get-product-customization.ts | 7 +- .../api/fn/product-management/get-recipe.ts | 7 +- .../api/fn/product-management/get-recipes.ts | 7 +- .../fn/product-management/get-type-by-id.ts | 7 +- .../get-type-by-identity.ts | 7 +- .../api/fn/product-management/get-types.ts | 11 +- .../app/api/fn/product-management/import.ts | 11 +- .../fn/product-management/save-instance.ts | 5 +- .../api/fn/product-management/save-recipe.ts | 5 +- .../api/fn/product-management/save-type.ts | 5 +- .../fn/product-management/update-recipe.ts | 5 +- .../api/fn/product-management/update-type.ts | 5 +- .../app/api/fn/workplan/delete-workplan.ts | 1 - .../app/api/fn/workplan/get-all-workplans.ts | 7 +- .../src/app/api/fn/workplan/get-versions.ts | 7 +- .../src/app/api/fn/workplan/get-workplan.ts | 7 +- .../src/app/api/fn/workplan/save-workplan.ts | 5 +- .../app/api/fn/workplan/update-workplan.ts | 5 +- src/Moryx.Orders.Web/src/app/api/functions.ts | 113 +++++++++ src/Moryx.Orders.Web/src/app/api/models.ts | 113 +++++---- .../Products/Endpoints/part-connector.ts | 14 -- .../Products/Endpoints/part-model.ts | 11 - .../Endpoints/product-customization.ts | 12 - .../Products/Endpoints/product-file-model.ts | 11 - .../Products/Endpoints/product-importer.ts | 9 - .../Endpoints/product-instance-model.ts | 12 - .../Products/Endpoints/product-model.ts | 21 -- .../Products/Endpoints/recipe-model.ts | 21 -- .../Products/Endpoints/workplan-model.ts | 11 - .../Products/product-query.ts | 20 -- .../Products/property-filter.ts | 10 - .../Moryx/Operators/i-operator-assignable.ts | 11 - .../Models/operation-adviced-model.ts | 10 - .../Models/operation-changed-model.ts | 12 - .../Models/operation-reported-model.ts | 10 - .../Models/operation-started-model.ts | 9 - .../Orders/Endpoints/product-part-model.ts | 15 -- .../Restrictions/restriction-description.ts | 9 - .../Moryx/Orders/part-creation-context.ts | 14 -- .../Moryx/Serialization/entry-unit-type.ts | 11 - .../Moryx/Serialization/entry-validation.ts | 10 - .../Moryx/Serialization/entry-value-type.ts | 22 -- .../models/Moryx/Serialization/entry-value.ts | 14 -- .../api/models/Moryx/Serialization/entry.ts | 15 -- .../{Moryx/Orders => }/advice-context.ts | 1 - .../Orders/Endpoints => }/advice-model.ts | 1 - .../Operators => }/assignable-operator.ts | 5 +- ...-model.ts => attendable-resource-model.ts} | 4 +- .../{Moryx/Orders => }/begin-context.ts | 5 +- .../Orders/Endpoints => }/begin-model.ts | 1 - .../{Moryx/Orders => }/confirmation-type.ts | 1 - .../Orders/Endpoints => }/document-model.ts | 1 - .../Endpoints => }/extended-operator-model.ts | 5 +- .../Capabilities => }/i-capabilities.ts | 1 - .../app/api/models/i-operator-assignable.ts | 10 + .../Extensions/Logging => }/log-level.ts | 1 - .../moryx-exception-response.ts | 1 - .../app/api/models/operation-adviced-model.ts | 9 + .../app/api/models/operation-changed-model.ts | 11 + .../Orders => }/operation-classification.ts | 1 - .../operation-creation-context-model.ts | 9 +- .../operation-log-message-model.ts | 5 +- .../Orders/Endpoints => }/operation-model.ts | 8 +- .../Endpoints => }/operation-recipe-model.ts | 1 - .../api/models/operation-reported-model.ts | 9 + .../app/api/models/operation-started-model.ts | 8 + .../Endpoints => }/operator-model.ts | 1 - .../{Moryx/Orders => }/part-classification.ts | 1 - .../src/app/api/models/part-connector.ts | 13 ++ .../app/api/models/part-creation-context.ts | 13 ++ .../src/app/api/models/part-model.ts | 10 + .../AspNetCore/Mvc => }/problem-details.ts | 1 - .../app/api/models/product-customization.ts | 11 + .../product-definition-model.ts | 5 +- .../src/app/api/models/product-importer.ts | 8 + .../app/api/models/product-instance-model.ts | 11 + .../Products => }/product-instance-state.ts | 1 - .../src/app/api/models/product-model.ts | 18 ++ .../src/app/api/models/product-part-model.ts | 14 ++ .../src/app/api/models/product-query.ts | 19 ++ .../Products => }/product-state.ts | 1 - .../Products => }/property-filter-operator.ts | 1 - .../src/app/api/models/property-filter.ts | 9 + .../recipe-classification-model.ts | 1 - .../Endpoints => }/recipe-definition-model.ts | 1 - .../Products => }/recipe-filter.ts | 1 - .../src/app/api/models/recipe-model.ts | 18 ++ .../Recipes => }/recipe-state.ts | 1 - .../{Moryx/Orders => }/report-context.ts | 5 +- .../Orders/Endpoints => }/report-model.ts | 5 +- .../app/api/models/restriction-description.ts | 8 + .../Restrictions => }/restriction-severity.ts | 1 - .../Products => }/revision-filter.ts | 1 - .../Products => }/selector.ts | 1 - .../{Moryx/Orders => }/staging-indicator.ts | 1 - .../src/app/api/models/workplan-model.ts | 10 + .../{Moryx/Workplans => }/workplan-state.ts | 1 - .../src/app/api/request-builder.ts | 1 - src/Moryx.Orders.Web/src/app/api/services.ts | 1 - .../services/operator-management.service.ts | 109 +++++---- .../api/services/order-management.service.ts | 215 +++++++++++------- .../services/product-management.service.ts | 189 ++++++++------- .../src/app/api/services/workplan.service.ts | 57 +++-- .../src/app/api/strict-http-response.ts | 1 - .../operation-documents.component.ts | 4 +- .../operation-recipes.component.ts | 9 +- .../log-message-list.component.ts | 4 +- .../operations/operations.component.ts | 12 +- .../part-list/part-list.component.ts | 2 +- .../begin-dialog/begin-dialog.component.ts | 10 +- .../create-dialog/create-dialog.component.ts | 16 +- .../report-dialog/report-dialog.component.ts | 6 +- .../src/app/models/operation-models.ts | 6 +- .../src/app/models/operation-view-model.ts | 4 +- .../src/app/services/operation.service.ts | 2 +- .../src/app/services/operators.service.ts | 4 +- 160 files changed, 985 insertions(+), 902 deletions(-) create mode 100644 ResXManager.config.xml create mode 100644 src/Moryx.Orders.Web/src/app/api/api.ts create mode 100644 src/Moryx.Orders.Web/src/app/api/functions.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/part-connector.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/part-model.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-customization.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-file-model.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-importer.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-instance-model.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-model.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/product-query.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/property-filter.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/i-operator-assignable.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-adviced-model.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-changed-model.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-reported-model.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-started-model.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/product-part-model.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Restrictions/restriction-description.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/part-creation-context.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-unit-type.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-validation.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-value-type.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-value.ts delete mode 100644 src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry.ts rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders => }/advice-context.ts (86%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders/Endpoints => }/advice-model.ts (89%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Operators => }/assignable-operator.ts (53%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Operators/Endpoints/resource-model.ts => attendable-resource-model.ts} (59%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders => }/begin-context.ts (52%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders/Endpoints => }/begin-model.ts (87%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders => }/confirmation-type.ts (87%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders/Endpoints => }/document-model.ts (93%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Operators/Endpoints => }/extended-operator-model.ts (50%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/AbstractionLayer/Capabilities => }/i-capabilities.ts (86%) create mode 100644 src/Moryx.Orders.Web/src/app/api/models/i-operator-assignable.ts rename src/Moryx.Orders.Web/src/app/api/models/{Microsoft/Extensions/Logging => }/log-level.ts (92%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Asp/Extensions => }/moryx-exception-response.ts (89%) create mode 100644 src/Moryx.Orders.Web/src/app/api/models/operation-adviced-model.ts create mode 100644 src/Moryx.Orders.Web/src/app/api/models/operation-changed-model.ts rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders => }/operation-classification.ts (96%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders/Endpoints/Models => }/operation-creation-context-model.ts (60%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders/Endpoints => }/operation-log-message-model.ts (50%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders/Endpoints => }/operation-model.ts (83%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders/Endpoints => }/operation-recipe-model.ts (88%) create mode 100644 src/Moryx.Orders.Web/src/app/api/models/operation-reported-model.ts create mode 100644 src/Moryx.Orders.Web/src/app/api/models/operation-started-model.ts rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Operators/Endpoints => }/operator-model.ts (91%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders => }/part-classification.ts (93%) create mode 100644 src/Moryx.Orders.Web/src/app/api/models/part-connector.ts create mode 100644 src/Moryx.Orders.Web/src/app/api/models/part-creation-context.ts create mode 100644 src/Moryx.Orders.Web/src/app/api/models/part-model.ts rename src/Moryx.Orders.Web/src/app/api/models/{Microsoft/AspNetCore/Mvc => }/problem-details.ts (93%) create mode 100644 src/Moryx.Orders.Web/src/app/api/models/product-customization.ts rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/AbstractionLayer/Products/Endpoints => }/product-definition-model.ts (56%) create mode 100644 src/Moryx.Orders.Web/src/app/api/models/product-importer.ts create mode 100644 src/Moryx.Orders.Web/src/app/api/models/product-instance-model.ts rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/AbstractionLayer/Products => }/product-instance-state.ts (91%) create mode 100644 src/Moryx.Orders.Web/src/app/api/models/product-model.ts create mode 100644 src/Moryx.Orders.Web/src/app/api/models/product-part-model.ts create mode 100644 src/Moryx.Orders.Web/src/app/api/models/product-query.ts rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/AbstractionLayer/Products => }/product-state.ts (89%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/AbstractionLayer/Products => }/property-filter-operator.ts (90%) create mode 100644 src/Moryx.Orders.Web/src/app/api/models/property-filter.ts rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/AbstractionLayer/Products/Endpoints => }/recipe-classification-model.ts (91%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/AbstractionLayer/Products/Endpoints => }/recipe-definition-model.ts (90%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/AbstractionLayer/Products => }/recipe-filter.ts (89%) create mode 100644 src/Moryx.Orders.Web/src/app/api/models/recipe-model.ts rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/AbstractionLayer/Recipes => }/recipe-state.ts (88%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders => }/report-context.ts (55%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders/Endpoints => }/report-model.ts (53%) create mode 100644 src/Moryx.Orders.Web/src/app/api/models/restriction-description.ts rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders/Restrictions => }/restriction-severity.ts (88%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/AbstractionLayer/Products => }/revision-filter.ts (88%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/AbstractionLayer/Products => }/selector.ts (88%) rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Orders => }/staging-indicator.ts (93%) create mode 100644 src/Moryx.Orders.Web/src/app/api/models/workplan-model.ts rename src/Moryx.Orders.Web/src/app/api/models/{Moryx/Workplans => }/workplan-state.ts (88%) diff --git a/MORYX-Framework.sln b/MORYX-Framework.sln index 15da3e8b7..63195f719 100644 --- a/MORYX-Framework.sln +++ b/MORYX-Framework.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.2.32630.192 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartProject.Asp", "src\StartProject.Asp\StartProject.Asp.csproj", "{4F1466B5-131E-4080-AC4F-BD1630EDF11F}" EndProject @@ -937,7 +937,5 @@ Global EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {36EFC961-F4E7-49DC-A36A-99594FFB8243} - RESX_TaskErrorCategory = Message - RESX_ShowErrorsInErrorList = True EndGlobalSection EndGlobal diff --git a/ResXManager.config.xml b/ResXManager.config.xml new file mode 100644 index 000000000..b34fc8965 --- /dev/null +++ b/ResXManager.config.xml @@ -0,0 +1,4 @@ + + + Message + \ No newline at end of file diff --git a/src/Moryx.Orders.Web/ng-openapi-gen.json b/src/Moryx.Orders.Web/ng-openapi-gen.json index 36bda35b0..c10d9823a 100644 --- a/src/Moryx.Orders.Web/ng-openapi-gen.json +++ b/src/Moryx.Orders.Web/ng-openapi-gen.json @@ -1,4 +1,6 @@ { + "_README": "To (re)generate the api services disable https in the demo run `ng-openapi-gen` in the terminal.", + "_NOTE": "Note: You will need to revert the changes related to the Entry format, as they are provided by the ngx-web-framework.", "$schema": "node_modules/ng-openapi-gen/ng-openapi-gen-schema.json", "input": "http://localhost:5000/swagger/v1/swagger.json", "ignoreUnusedModels": true, @@ -7,5 +9,11 @@ "ProductManagement", "Workplan", "OperatorManagement" - ] + ], + "module": true, + "services": true, + "apiService": "", + "enumStyle": "pascal", + "enumArray": false, + "promises": false } \ No newline at end of file diff --git a/src/Moryx.Orders.Web/src/app/api/api-configuration.ts b/src/Moryx.Orders.Web/src/app/api/api-configuration.ts index 5f96088ca..735f0ae46 100644 --- a/src/Moryx.Orders.Web/src/app/api/api-configuration.ts +++ b/src/Moryx.Orders.Web/src/app/api/api-configuration.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/api.module.ts b/src/Moryx.Orders.Web/src/app/api/api.module.ts index cedda095a..32a1d4f13 100644 --- a/src/Moryx.Orders.Web/src/app/api/api.module.ts +++ b/src/Moryx.Orders.Web/src/app/api/api.module.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/api.ts b/src/Moryx.Orders.Web/src/app/api/api.ts new file mode 100644 index 000000000..856c060a0 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/api.ts @@ -0,0 +1,64 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { Injectable } from '@angular/core'; +import { HttpClient, HttpContext, HttpResponse } from '@angular/common/http'; +import { Observable } from 'rxjs'; +import { filter, map } from 'rxjs/operators'; +import { ApiConfiguration } from './api-configuration'; +import { StrictHttpResponse } from './strict-http-response'; + +export type ApiFnOptional = (http: HttpClient, rootUrl: string, params?: P, context?: HttpContext) => Observable>; +export type ApiFnRequired = (http: HttpClient, rootUrl: string, params: P, context?: HttpContext) => Observable>; + +/** + * Helper service to call API functions directly + */ +@Injectable({ providedIn: 'root' }) +export class Api { + constructor( + private config: ApiConfiguration, + private http: HttpClient + ) { + } + + private _rootUrl?: string; + + /** + * Returns the root url for API operations. If not set directly here, + * will fallback to `ApiConfiguration.rootUrl`. + */ + get rootUrl(): string { + return this._rootUrl || this.config.rootUrl; + } + + /** + * Sets the root URL for API operations + */ + set rootUrl(rootUrl: string) { + this._rootUrl = rootUrl; + } + + /** + * Executes an API call, returning the response body only + */ + invoke(fn: ApiFnRequired, params: P, context?: HttpContext): Observable; + invoke(fn: ApiFnOptional, params?: P, context?: HttpContext): Observable; + invoke(fn: ApiFnRequired | ApiFnOptional, params: P, context?: HttpContext): Observable { + const resp = this.invoke$Response(fn, params, context); + return resp.pipe(map(r => r.body)); + } + + /** + * Executes an API call, returning the entire response + */ + invoke$Response(fn: ApiFnRequired, params: P, context?: HttpContext): Observable>; + invoke$Response(fn: ApiFnOptional, params?: P, context?: HttpContext): Observable>; + invoke$Response(fn: ApiFnRequired | ApiFnOptional, params: P, context?: HttpContext): Observable> { + const obs = fn(this.http, this.rootUrl, params, context) + .pipe( + filter(r => r instanceof HttpResponse), + map(r => r as StrictHttpResponse)); + return obs; + } +} diff --git a/src/Moryx.Orders.Web/src/app/api/base-service.ts b/src/Moryx.Orders.Web/src/app/api/base-service.ts index 7bb77d7c4..fcebae4ef 100644 --- a/src/Moryx.Orders.Web/src/app/api/base-service.ts +++ b/src/Moryx.Orders.Web/src/app/api/base-service.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/add.ts b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/add.ts index cb53d63c0..1eb14ee70 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/add.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/add.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,10 +7,10 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { OperatorModel as MoryxOperatorsEndpointsOperatorModel } from '../../models/Moryx/Operators/Endpoints/operator-model'; +import { OperatorModel } from '../../models/operator-model'; export interface Add$Params { - body?: MoryxOperatorsEndpointsOperatorModel + body?: OperatorModel } export function add(http: HttpClient, rootUrl: string, params?: Add$Params, context?: HttpContext): Observable> { diff --git a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/delete-operator.ts b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/delete-operator.ts index 5808adb73..e014572ec 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/delete-operator.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/delete-operator.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-all.ts b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-all.ts index e881db931..c4c7a1f6c 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-all.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-all.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,12 +7,12 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { AssignableOperator as MoryxOperatorsAssignableOperator } from '../../models/Moryx/Operators/assignable-operator'; +import { AssignableOperator } from '../../models/assignable-operator'; export interface GetAll$Params { } -export function getAll(http: HttpClient, rootUrl: string, params?: GetAll$Params, context?: HttpContext): Observable>> { +export function getAll(http: HttpClient, rootUrl: string, params?: GetAll$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getAll.PATH, 'get'); if (params) { } @@ -23,7 +22,7 @@ export function getAll(http: HttpClient, rootUrl: string, params?: GetAll$Params ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-default-operator.ts b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-default-operator.ts index 8fcd9c847..aab62982c 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-default-operator.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-default-operator.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,12 +7,12 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ExtendedOperatorModel as MoryxOperatorsEndpointsExtendedOperatorModel } from '../../models/Moryx/Operators/Endpoints/extended-operator-model'; +import { ExtendedOperatorModel } from '../../models/extended-operator-model'; export interface GetDefaultOperator$Params { } -export function getDefaultOperator(http: HttpClient, rootUrl: string, params?: GetDefaultOperator$Params, context?: HttpContext): Observable> { +export function getDefaultOperator(http: HttpClient, rootUrl: string, params?: GetDefaultOperator$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, getDefaultOperator.PATH, 'get'); if (params) { } @@ -23,7 +22,7 @@ export function getDefaultOperator(http: HttpClient, rootUrl: string, params?: G ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-operators-by-resource.ts b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-operators-by-resource.ts index 49a231dc9..3ca845849 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-operators-by-resource.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-operators-by-resource.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ExtendedOperatorModel as MoryxOperatorsEndpointsExtendedOperatorModel } from '../../models/Moryx/Operators/Endpoints/extended-operator-model'; +import { ExtendedOperatorModel } from '../../models/extended-operator-model'; export interface GetOperatorsByResource$Params { resourceId: number; } -export function getOperatorsByResource(http: HttpClient, rootUrl: string, params: GetOperatorsByResource$Params, context?: HttpContext): Observable>> { +export function getOperatorsByResource(http: HttpClient, rootUrl: string, params: GetOperatorsByResource$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getOperatorsByResource.PATH, 'get'); if (params) { rb.path('resourceId', params.resourceId, {}); @@ -25,7 +24,7 @@ export function getOperatorsByResource(http: HttpClient, rootUrl: string, params ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-resources-1.ts b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-resources-1.ts index fd4371b79..2d9581ba9 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-resources-1.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-resources-1.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,12 +7,12 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ResourceModel as MoryxOperatorsEndpointsResourceModel } from '../../models/Moryx/Operators/Endpoints/resource-model'; +import { AttendableResourceModel } from '../../models/attendable-resource-model'; export interface GetResources_1$Params { } -export function getResources_1(http: HttpClient, rootUrl: string, params?: GetResources_1$Params, context?: HttpContext): Observable>> { +export function getResources_1(http: HttpClient, rootUrl: string, params?: GetResources_1$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getResources_1.PATH, 'get'); if (params) { } @@ -23,7 +22,7 @@ export function getResources_1(http: HttpClient, rootUrl: string, params?: GetRe ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-resources.ts b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-resources.ts index dffe1fc0b..82b1ed4a5 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-resources.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get-resources.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ResourceModel as MoryxOperatorsEndpointsResourceModel } from '../../models/Moryx/Operators/Endpoints/resource-model'; +import { AttendableResourceModel } from '../../models/attendable-resource-model'; export interface GetResources$Params { operatorIdentifier: string; } -export function getResources(http: HttpClient, rootUrl: string, params: GetResources$Params, context?: HttpContext): Observable>> { +export function getResources(http: HttpClient, rootUrl: string, params: GetResources$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getResources.PATH, 'get'); if (params) { rb.path('operatorIdentifier', params.operatorIdentifier, {}); @@ -25,7 +24,7 @@ export function getResources(http: HttpClient, rootUrl: string, params: GetResou ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get.ts b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get.ts index 1c54b124e..2c13d8245 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/get.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ExtendedOperatorModel as MoryxOperatorsEndpointsExtendedOperatorModel } from '../../models/Moryx/Operators/Endpoints/extended-operator-model'; +import { ExtendedOperatorModel } from '../../models/extended-operator-model'; export interface Get$Params { identifier: string; } -export function get(http: HttpClient, rootUrl: string, params: Get$Params, context?: HttpContext): Observable> { +export function get(http: HttpClient, rootUrl: string, params: Get$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, get.PATH, 'get'); if (params) { rb.path('identifier', params.identifier, {}); @@ -25,7 +24,7 @@ export function get(http: HttpClient, rootUrl: string, params: Get$Params, conte ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/sign-in.ts b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/sign-in.ts index 4e2e9a3c3..9f899f027 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/sign-in.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/sign-in.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/sign-out.ts b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/sign-out.ts index c5d4678f5..cd3b3b3d0 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/sign-out.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/sign-out.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/update.ts b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/update.ts index 30eb54b1b..b0074d9b4 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/operator-management/update.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/operator-management/update.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,11 +7,11 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { OperatorModel as MoryxOperatorsEndpointsOperatorModel } from '../../models/Moryx/Operators/Endpoints/operator-model'; +import { OperatorModel } from '../../models/operator-model'; export interface Update$Params { identifier: string; - body?: MoryxOperatorsEndpointsOperatorModel + body?: OperatorModel } export function update(http: HttpClient, rootUrl: string, params: Update$Params, context?: HttpContext): Observable> { diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/abort-operation.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/abort-operation.ts index 2b5cc6e6c..3a891b409 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/abort-operation.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/abort-operation.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/add-operation.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/add-operation.ts index 75d74ee40..a71f2edc0 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/add-operation.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/add-operation.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,15 +7,15 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { OperationCreationContextModel as MoryxOrdersEndpointsModelsOperationCreationContextModel } from '../../models/Moryx/Orders/Endpoints/Models/operation-creation-context-model'; -import { OperationModel as MoryxOrdersEndpointsOperationModel } from '../../models/Moryx/Orders/Endpoints/operation-model'; +import { OperationCreationContextModel } from '../../models/operation-creation-context-model'; +import { OperationModel } from '../../models/operation-model'; export interface AddOperation$Params { sourceId?: string; - body?: MoryxOrdersEndpointsModelsOperationCreationContextModel + body?: OperationCreationContextModel } -export function addOperation(http: HttpClient, rootUrl: string, params?: AddOperation$Params, context?: HttpContext): Observable> { +export function addOperation(http: HttpClient, rootUrl: string, params?: AddOperation$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, addOperation.PATH, 'post'); if (params) { rb.query('sourceId', params.sourceId, {}); @@ -28,7 +27,7 @@ export function addOperation(http: HttpClient, rootUrl: string, params?: AddOper ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/advice-operation.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/advice-operation.ts index 5f9c7c023..4a3aff3c6 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/advice-operation.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/advice-operation.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,11 +7,11 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { AdviceModel as MoryxOrdersEndpointsAdviceModel } from '../../models/Moryx/Orders/Endpoints/advice-model'; +import { AdviceModel } from '../../models/advice-model'; export interface AdviceOperation$Params { guid: string; - body?: MoryxOrdersEndpointsAdviceModel + body?: AdviceModel } export function adviceOperation(http: HttpClient, rootUrl: string, params: AdviceOperation$Params, context?: HttpContext): Observable> { diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/begin-operation.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/begin-operation.ts index f6f692b6b..f11eb6d2f 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/begin-operation.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/begin-operation.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,11 +7,11 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { BeginModel as MoryxOrdersEndpointsBeginModel } from '../../models/Moryx/Orders/Endpoints/begin-model'; +import { BeginModel } from '../../models/begin-model'; export interface BeginOperation$Params { guid: string; - body?: MoryxOrdersEndpointsBeginModel + body?: BeginModel } export function beginOperation(http: HttpClient, rootUrl: string, params: BeginOperation$Params, context?: HttpContext): Observable> { diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-advice-context.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-advice-context.ts index ff0a367a7..e1dc084ae 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-advice-context.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-advice-context.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { AdviceContext as MoryxOrdersAdviceContext } from '../../models/Moryx/Orders/advice-context'; +import { AdviceContext } from '../../models/advice-context'; export interface GetAdviceContext$Params { guid: string; } -export function getAdviceContext(http: HttpClient, rootUrl: string, params: GetAdviceContext$Params, context?: HttpContext): Observable> { +export function getAdviceContext(http: HttpClient, rootUrl: string, params: GetAdviceContext$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, getAdviceContext.PATH, 'get'); if (params) { rb.path('guid', params.guid, {}); @@ -25,7 +24,7 @@ export function getAdviceContext(http: HttpClient, rootUrl: string, params: GetA ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-assignable-recipes.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-assignable-recipes.ts index 205a8309f..0b3649476 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-assignable-recipes.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-assignable-recipes.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,14 +7,14 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { OperationRecipeModel as MoryxOrdersEndpointsOperationRecipeModel } from '../../models/Moryx/Orders/Endpoints/operation-recipe-model'; +import { OperationRecipeModel } from '../../models/operation-recipe-model'; export interface GetAssignableRecipes$Params { identifier?: string; revision?: number; } -export function getAssignableRecipes(http: HttpClient, rootUrl: string, params?: GetAssignableRecipes$Params, context?: HttpContext): Observable>> { +export function getAssignableRecipes(http: HttpClient, rootUrl: string, params?: GetAssignableRecipes$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getAssignableRecipes.PATH, 'get'); if (params) { rb.query('identifier', params.identifier, {}); @@ -27,7 +26,7 @@ export function getAssignableRecipes(http: HttpClient, rootUrl: string, params?: ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-begin-context.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-begin-context.ts index 5eaeed174..4051ab861 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-begin-context.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-begin-context.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { BeginContext as MoryxOrdersBeginContext } from '../../models/Moryx/Orders/begin-context'; +import { BeginContext } from '../../models/begin-context'; export interface GetBeginContext$Params { guid: string; } -export function getBeginContext(http: HttpClient, rootUrl: string, params: GetBeginContext$Params, context?: HttpContext): Observable> { +export function getBeginContext(http: HttpClient, rootUrl: string, params: GetBeginContext$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, getBeginContext.PATH, 'get'); if (params) { rb.path('guid', params.guid, {}); @@ -25,7 +24,7 @@ export function getBeginContext(http: HttpClient, rootUrl: string, params: GetBe ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-document-stream.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-document-stream.ts index 0923398a8..432ba2fc4 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-document-stream.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-document-stream.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-documents.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-documents.ts index 2894e4067..83d81aeab 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-documents.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-documents.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { DocumentModel as MoryxOrdersEndpointsDocumentModel } from '../../models/Moryx/Orders/Endpoints/document-model'; +import { DocumentModel } from '../../models/document-model'; export interface GetDocuments$Params { guid: string; } -export function getDocuments(http: HttpClient, rootUrl: string, params: GetDocuments$Params, context?: HttpContext): Observable>> { +export function getDocuments(http: HttpClient, rootUrl: string, params: GetDocuments$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getDocuments.PATH, 'get'); if (params) { rb.path('guid', params.guid, {}); @@ -25,7 +24,7 @@ export function getDocuments(http: HttpClient, rootUrl: string, params: GetDocum ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-interrupt-context.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-interrupt-context.ts index 9db4e2652..6cc585e96 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-interrupt-context.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-interrupt-context.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ReportContext as MoryxOrdersReportContext } from '../../models/Moryx/Orders/report-context'; +import { ReportContext } from '../../models/report-context'; export interface GetInterruptContext$Params { guid: string; } -export function getInterruptContext(http: HttpClient, rootUrl: string, params: GetInterruptContext$Params, context?: HttpContext): Observable> { +export function getInterruptContext(http: HttpClient, rootUrl: string, params: GetInterruptContext$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, getInterruptContext.PATH, 'get'); if (params) { rb.path('guid', params.guid, {}); @@ -25,7 +24,7 @@ export function getInterruptContext(http: HttpClient, rootUrl: string, params: G ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-logs.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-logs.ts index 4d60b69ea..27571fe80 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-logs.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-logs.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { OperationLogMessageModel as MoryxOrdersEndpointsOperationLogMessageModel } from '../../models/Moryx/Orders/Endpoints/operation-log-message-model'; +import { OperationLogMessageModel } from '../../models/operation-log-message-model'; export interface GetLogs$Params { guid: string; } -export function getLogs(http: HttpClient, rootUrl: string, params: GetLogs$Params, context?: HttpContext): Observable>> { +export function getLogs(http: HttpClient, rootUrl: string, params: GetLogs$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getLogs.PATH, 'get'); if (params) { rb.path('guid', params.guid, {}); @@ -25,7 +24,7 @@ export function getLogs(http: HttpClient, rootUrl: string, params: GetLogs$Param ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-operation.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-operation.ts index 5b9b3d72d..36e467c3b 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-operation.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-operation.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { OperationModel as MoryxOrdersEndpointsOperationModel } from '../../models/Moryx/Orders/Endpoints/operation-model'; +import { OperationModel } from '../../models/operation-model'; export interface GetOperation$Params { guid: string; } -export function getOperation(http: HttpClient, rootUrl: string, params: GetOperation$Params, context?: HttpContext): Observable> { +export function getOperation(http: HttpClient, rootUrl: string, params: GetOperation$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, getOperation.PATH, 'get'); if (params) { rb.path('guid', params.guid, {}); @@ -25,7 +24,7 @@ export function getOperation(http: HttpClient, rootUrl: string, params: GetOpera ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-operations.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-operations.ts index ad6f506f4..9c36010ea 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-operations.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-operations.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,14 +7,14 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { OperationModel as MoryxOrdersEndpointsOperationModel } from '../../models/Moryx/Orders/Endpoints/operation-model'; +import { OperationModel } from '../../models/operation-model'; export interface GetOperations$Params { orderNumber?: string; operationNumber?: string; } -export function getOperations(http: HttpClient, rootUrl: string, params?: GetOperations$Params, context?: HttpContext): Observable>> { +export function getOperations(http: HttpClient, rootUrl: string, params?: GetOperations$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getOperations.PATH, 'get'); if (params) { rb.query('orderNumber', params.orderNumber, {}); @@ -27,7 +26,7 @@ export function getOperations(http: HttpClient, rootUrl: string, params?: GetOpe ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-product-parts.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-product-parts.ts index a9a5274d0..7f65297f9 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-product-parts.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-product-parts.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductPartModel as MoryxOrdersEndpointsProductPartModel } from '../../models/Moryx/Orders/Endpoints/product-part-model'; +import { ProductPartModel } from '../../models/product-part-model'; export interface GetProductParts$Params { guid: string; } -export function getProductParts(http: HttpClient, rootUrl: string, params: GetProductParts$Params, context?: HttpContext): Observable>> { +export function getProductParts(http: HttpClient, rootUrl: string, params: GetProductParts$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getProductParts.PATH, 'get'); if (params) { rb.path('guid', params.guid, {}); @@ -25,7 +24,7 @@ export function getProductParts(http: HttpClient, rootUrl: string, params: GetPr ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-report-context.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-report-context.ts index 40051efc4..f45b0f7e6 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-report-context.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/get-report-context.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ReportContext as MoryxOrdersReportContext } from '../../models/Moryx/Orders/report-context'; +import { ReportContext } from '../../models/report-context'; export interface GetReportContext$Params { guid: string; } -export function getReportContext(http: HttpClient, rootUrl: string, params: GetReportContext$Params, context?: HttpContext): Observable> { +export function getReportContext(http: HttpClient, rootUrl: string, params: GetReportContext$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, getReportContext.PATH, 'get'); if (params) { rb.path('guid', params.guid, {}); @@ -25,7 +24,7 @@ export function getReportContext(http: HttpClient, rootUrl: string, params: GetR ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/interrupt-operation.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/interrupt-operation.ts index 6116efe0d..f2d12cee2 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/interrupt-operation.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/interrupt-operation.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,18 +7,17 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ReportModel as MoryxOrdersEndpointsReportModel } from '../../models/Moryx/Orders/Endpoints/report-model'; export interface InterruptOperation$Params { guid: string; - body?: MoryxOrdersEndpointsReportModel + userIdentifier?: string; } export function interruptOperation(http: HttpClient, rootUrl: string, params: InterruptOperation$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, interruptOperation.PATH, 'post'); if (params) { rb.path('guid', params.guid, {}); - rb.body(params.body, 'application/*+json'); + rb.query('userIdentifier', params.userIdentifier, {}); } return http.request( diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/operation-stream.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/operation-stream.ts index 560b70d28..7cf0a2b30 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/operation-stream.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/operation-stream.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,12 +7,12 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { OperationChangedModel as MoryxOrdersEndpointsModelsOperationChangedModel } from '../../models/Moryx/Orders/Endpoints/Models/operation-changed-model'; +import { OperationChangedModel } from '../../models/operation-changed-model'; export interface OperationStream$Params { } -export function operationStream(http: HttpClient, rootUrl: string, params?: OperationStream$Params, context?: HttpContext): Observable> { +export function operationStream(http: HttpClient, rootUrl: string, params?: OperationStream$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, operationStream.PATH, 'get'); if (params) { } @@ -23,7 +22,7 @@ export function operationStream(http: HttpClient, rootUrl: string, params?: Oper ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/reload.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/reload.ts index 5b2c731bc..746afaec5 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/reload.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/reload.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/report-operation.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/report-operation.ts index 82aaef960..4a1311c96 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/report-operation.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/report-operation.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,11 +7,11 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ReportModel as MoryxOrdersEndpointsReportModel } from '../../models/Moryx/Orders/Endpoints/report-model'; +import { ReportModel } from '../../models/report-model'; export interface ReportOperation$Params { guid: string; - body?: MoryxOrdersEndpointsReportModel + body?: ReportModel } export function reportOperation(http: HttpClient, rootUrl: string, params: ReportOperation$Params, context?: HttpContext): Observable> { diff --git a/src/Moryx.Orders.Web/src/app/api/fn/order-management/set-operation-sort-order.ts b/src/Moryx.Orders.Web/src/app/api/fn/order-management/set-operation-sort-order.ts index 6bf0708ca..df33a114d 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/order-management/set-operation-sort-order.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/order-management/set-operation-sort-order.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/create-instance.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/create-instance.ts index c46d2653c..2a154aa4e 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/create-instance.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/create-instance.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,7 +7,7 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductInstanceModel as MoryxAbstractionLayerProductsEndpointsProductInstanceModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/product-instance-model'; +import { ProductInstanceModel } from '../../models/product-instance-model'; export interface CreateInstance$Params { identifier?: string; @@ -16,7 +15,7 @@ export interface CreateInstance$Params { save?: boolean; } -export function createInstance(http: HttpClient, rootUrl: string, params?: CreateInstance$Params, context?: HttpContext): Observable> { +export function createInstance(http: HttpClient, rootUrl: string, params?: CreateInstance$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, createInstance.PATH, 'post'); if (params) { rb.query('identifier', params.identifier, {}); @@ -29,7 +28,7 @@ export function createInstance(http: HttpClient, rootUrl: string, params?: Creat ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/create-recipe.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/create-recipe.ts index c2e7bb936..e24ae9f48 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/create-recipe.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/create-recipe.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { RecipeModel as MoryxAbstractionLayerProductsEndpointsRecipeModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model'; +import { RecipeModel } from '../../models/recipe-model'; export interface CreateRecipe$Params { recipeType: string; } -export function createRecipe(http: HttpClient, rootUrl: string, params: CreateRecipe$Params, context?: HttpContext): Observable> { +export function createRecipe(http: HttpClient, rootUrl: string, params: CreateRecipe$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, createRecipe.PATH, 'get'); if (params) { rb.path('recipeType', params.recipeType, {}); @@ -25,7 +24,7 @@ export function createRecipe(http: HttpClient, rootUrl: string, params: CreateRe ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/delete-type.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/delete-type.ts index 8619eb03e..bcd931800 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/delete-type.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/delete-type.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/duplicate.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/duplicate.ts index 54afa6743..4614c65dc 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/duplicate.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/duplicate.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,14 +7,14 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductModel as MoryxAbstractionLayerProductsEndpointsProductModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/product-model'; +import { ProductModel } from '../../models/product-model'; export interface Duplicate$Params { id: number; body?: string } -export function duplicate(http: HttpClient, rootUrl: string, params: Duplicate$Params, context?: HttpContext): Observable> { +export function duplicate(http: HttpClient, rootUrl: string, params: Duplicate$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, duplicate.PATH, 'post'); if (params) { rb.path('id', params.id, {}); @@ -27,7 +26,7 @@ export function duplicate(http: HttpClient, rootUrl: string, params: Duplicate$P ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-instance.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-instance.ts index a9b0ed966..23e0e7fb1 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-instance.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-instance.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductInstanceModel as MoryxAbstractionLayerProductsEndpointsProductInstanceModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/product-instance-model'; +import { ProductInstanceModel } from '../../models/product-instance-model'; export interface GetInstance$Params { id: number; } -export function getInstance(http: HttpClient, rootUrl: string, params: GetInstance$Params, context?: HttpContext): Observable> { +export function getInstance(http: HttpClient, rootUrl: string, params: GetInstance$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, getInstance.PATH, 'get'); if (params) { rb.path('id', params.id, {}); @@ -25,7 +24,7 @@ export function getInstance(http: HttpClient, rootUrl: string, params: GetInstan ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-instances.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-instances.ts index 6a439b359..88cde8e4a 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-instances.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-instances.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductInstanceModel as MoryxAbstractionLayerProductsEndpointsProductInstanceModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/product-instance-model'; +import { ProductInstanceModel } from '../../models/product-instance-model'; export interface GetInstances$Params { ids?: Array; } -export function getInstances(http: HttpClient, rootUrl: string, params?: GetInstances$Params, context?: HttpContext): Observable>> { +export function getInstances(http: HttpClient, rootUrl: string, params?: GetInstances$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getInstances.PATH, 'get'); if (params) { rb.query('ids', params.ids, {}); @@ -25,7 +24,7 @@ export function getInstances(http: HttpClient, rootUrl: string, params?: GetInst ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-product-customization.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-product-customization.ts index 21d8600cd..000b4af37 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-product-customization.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-product-customization.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,12 +7,12 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductCustomization as MoryxAbstractionLayerProductsEndpointsProductCustomization } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/product-customization'; +import { ProductCustomization } from '../../models/product-customization'; export interface GetProductCustomization$Params { } -export function getProductCustomization(http: HttpClient, rootUrl: string, params?: GetProductCustomization$Params, context?: HttpContext): Observable> { +export function getProductCustomization(http: HttpClient, rootUrl: string, params?: GetProductCustomization$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, getProductCustomization.PATH, 'get'); if (params) { } @@ -23,7 +22,7 @@ export function getProductCustomization(http: HttpClient, rootUrl: string, param ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-recipe.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-recipe.ts index 4e6e63434..26dfca3ad 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-recipe.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-recipe.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { RecipeModel as MoryxAbstractionLayerProductsEndpointsRecipeModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model'; +import { RecipeModel } from '../../models/recipe-model'; export interface GetRecipe$Params { id: number; } -export function getRecipe(http: HttpClient, rootUrl: string, params: GetRecipe$Params, context?: HttpContext): Observable> { +export function getRecipe(http: HttpClient, rootUrl: string, params: GetRecipe$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, getRecipe.PATH, 'get'); if (params) { rb.path('id', params.id, {}); @@ -25,7 +24,7 @@ export function getRecipe(http: HttpClient, rootUrl: string, params: GetRecipe$P ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-recipes.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-recipes.ts index 82b8766b2..b1cc67684 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-recipes.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-recipes.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,14 +7,14 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { RecipeModel as MoryxAbstractionLayerProductsEndpointsRecipeModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model'; +import { RecipeModel } from '../../models/recipe-model'; export interface GetRecipes$Params { id: number; classification: number; } -export function getRecipes(http: HttpClient, rootUrl: string, params: GetRecipes$Params, context?: HttpContext): Observable>> { +export function getRecipes(http: HttpClient, rootUrl: string, params: GetRecipes$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getRecipes.PATH, 'get'); if (params) { rb.path('id', params.id, {}); @@ -27,7 +26,7 @@ export function getRecipes(http: HttpClient, rootUrl: string, params: GetRecipes ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-type-by-id.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-type-by-id.ts index c3fff6acc..4ef9d5887 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-type-by-id.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-type-by-id.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductModel as MoryxAbstractionLayerProductsEndpointsProductModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/product-model'; +import { ProductModel } from '../../models/product-model'; export interface GetTypeById$Params { id: number; } -export function getTypeById(http: HttpClient, rootUrl: string, params: GetTypeById$Params, context?: HttpContext): Observable> { +export function getTypeById(http: HttpClient, rootUrl: string, params: GetTypeById$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, getTypeById.PATH, 'get'); if (params) { rb.path('id', params.id, {}); @@ -25,7 +24,7 @@ export function getTypeById(http: HttpClient, rootUrl: string, params: GetTypeBy ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-type-by-identity.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-type-by-identity.ts index 631a9c54c..8fadbe809 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-type-by-identity.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-type-by-identity.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductModel as MoryxAbstractionLayerProductsEndpointsProductModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/product-model'; +import { ProductModel } from '../../models/product-model'; export interface GetTypeByIdentity$Params { identity?: string; } -export function getTypeByIdentity(http: HttpClient, rootUrl: string, params?: GetTypeByIdentity$Params, context?: HttpContext): Observable>> { +export function getTypeByIdentity(http: HttpClient, rootUrl: string, params?: GetTypeByIdentity$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getTypeByIdentity.PATH, 'get'); if (params) { rb.query('identity', params.identity, {}); @@ -25,7 +24,7 @@ export function getTypeByIdentity(http: HttpClient, rootUrl: string, params?: Ge ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-types.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-types.ts index f87304a71..f82ba58e8 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-types.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/get-types.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,14 +7,14 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductModel as MoryxAbstractionLayerProductsEndpointsProductModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/product-model'; -import { ProductQuery as MoryxAbstractionLayerProductsProductQuery } from '../../models/Moryx/AbstractionLayer/Products/product-query'; +import { ProductModel } from '../../models/product-model'; +import { ProductQuery } from '../../models/product-query'; export interface GetTypes$Params { - body?: MoryxAbstractionLayerProductsProductQuery + body?: ProductQuery } -export function getTypes(http: HttpClient, rootUrl: string, params?: GetTypes$Params, context?: HttpContext): Observable>> { +export function getTypes(http: HttpClient, rootUrl: string, params?: GetTypes$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getTypes.PATH, 'post'); if (params) { rb.body(params.body, 'application/*+json'); @@ -26,7 +25,7 @@ export function getTypes(http: HttpClient, rootUrl: string, params?: GetTypes$Pa ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/import.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/import.ts index 02e5f16f5..86541999a 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/import.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/import.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,15 +7,15 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductModel as MoryxAbstractionLayerProductsEndpointsProductModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/product-model'; -import { Entry as MoryxSerializationEntry } from '../../models/Moryx/Serialization/entry'; +import { Entry } from '@moryx/ngx-web-framework/entry-editor'; +import { ProductModel } from '../../models/product-model'; export interface Import$Params { importerName: string; - body?: MoryxSerializationEntry + body?: Entry } -export function import$(http: HttpClient, rootUrl: string, params: Import$Params, context?: HttpContext): Observable>> { +export function import$(http: HttpClient, rootUrl: string, params: Import$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, import$.PATH, 'post'); if (params) { rb.path('importerName', params.importerName, {}); @@ -28,7 +27,7 @@ export function import$(http: HttpClient, rootUrl: string, params: Import$Params ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/save-instance.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/save-instance.ts index 598e45297..c15daf963 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/save-instance.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/save-instance.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,10 +7,10 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductInstanceModel as MoryxAbstractionLayerProductsEndpointsProductInstanceModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/product-instance-model'; +import { ProductInstanceModel } from '../../models/product-instance-model'; export interface SaveInstance$Params { - body?: MoryxAbstractionLayerProductsEndpointsProductInstanceModel + body?: ProductInstanceModel } export function saveInstance(http: HttpClient, rootUrl: string, params?: SaveInstance$Params, context?: HttpContext): Observable> { diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/save-recipe.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/save-recipe.ts index ed5657d6f..e804961bf 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/save-recipe.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/save-recipe.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,10 +7,10 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { RecipeModel as MoryxAbstractionLayerProductsEndpointsRecipeModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model'; +import { RecipeModel } from '../../models/recipe-model'; export interface SaveRecipe$Params { - body?: MoryxAbstractionLayerProductsEndpointsRecipeModel + body?: RecipeModel } export function saveRecipe(http: HttpClient, rootUrl: string, params?: SaveRecipe$Params, context?: HttpContext): Observable> { diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/save-type.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/save-type.ts index 74ef4bb89..212c44708 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/save-type.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/save-type.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,10 +7,10 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductModel as MoryxAbstractionLayerProductsEndpointsProductModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/product-model'; +import { ProductModel } from '../../models/product-model'; export interface SaveType$Params { - body?: MoryxAbstractionLayerProductsEndpointsProductModel + body?: ProductModel } export function saveType(http: HttpClient, rootUrl: string, params?: SaveType$Params, context?: HttpContext): Observable> { diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/update-recipe.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/update-recipe.ts index 970ab7f02..33ff85489 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/update-recipe.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/update-recipe.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,11 +7,11 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { RecipeModel as MoryxAbstractionLayerProductsEndpointsRecipeModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model'; +import { RecipeModel } from '../../models/recipe-model'; export interface UpdateRecipe$Params { id: number; - body?: MoryxAbstractionLayerProductsEndpointsRecipeModel + body?: RecipeModel } export function updateRecipe(http: HttpClient, rootUrl: string, params: UpdateRecipe$Params, context?: HttpContext): Observable> { diff --git a/src/Moryx.Orders.Web/src/app/api/fn/product-management/update-type.ts b/src/Moryx.Orders.Web/src/app/api/fn/product-management/update-type.ts index 994284575..e0a22460a 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/product-management/update-type.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/product-management/update-type.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,11 +7,11 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { ProductModel as MoryxAbstractionLayerProductsEndpointsProductModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/product-model'; +import { ProductModel } from '../../models/product-model'; export interface UpdateType$Params { id: number; - body?: MoryxAbstractionLayerProductsEndpointsProductModel + body?: ProductModel } export function updateType(http: HttpClient, rootUrl: string, params: UpdateType$Params, context?: HttpContext): Observable> { diff --git a/src/Moryx.Orders.Web/src/app/api/fn/workplan/delete-workplan.ts b/src/Moryx.Orders.Web/src/app/api/fn/workplan/delete-workplan.ts index c019bae0c..53e4fc0a3 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/workplan/delete-workplan.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/workplan/delete-workplan.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/fn/workplan/get-all-workplans.ts b/src/Moryx.Orders.Web/src/app/api/fn/workplan/get-all-workplans.ts index 2e6a1465b..bbd92b6fd 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/workplan/get-all-workplans.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/workplan/get-all-workplans.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,12 +7,12 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { WorkplanModel as MoryxAbstractionLayerProductsEndpointsWorkplanModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model'; +import { WorkplanModel } from '../../models/workplan-model'; export interface GetAllWorkplans$Params { } -export function getAllWorkplans(http: HttpClient, rootUrl: string, params?: GetAllWorkplans$Params, context?: HttpContext): Observable>> { +export function getAllWorkplans(http: HttpClient, rootUrl: string, params?: GetAllWorkplans$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getAllWorkplans.PATH, 'get'); if (params) { } @@ -23,7 +22,7 @@ export function getAllWorkplans(http: HttpClient, rootUrl: string, params?: GetA ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/workplan/get-versions.ts b/src/Moryx.Orders.Web/src/app/api/fn/workplan/get-versions.ts index 48609f326..1b812b44a 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/workplan/get-versions.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/workplan/get-versions.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { WorkplanModel as MoryxAbstractionLayerProductsEndpointsWorkplanModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model'; +import { WorkplanModel } from '../../models/workplan-model'; export interface GetVersions$Params { id: number; } -export function getVersions(http: HttpClient, rootUrl: string, params: GetVersions$Params, context?: HttpContext): Observable>> { +export function getVersions(http: HttpClient, rootUrl: string, params: GetVersions$Params, context?: HttpContext): Observable>> { const rb = new RequestBuilder(rootUrl, getVersions.PATH, 'get'); if (params) { rb.path('id', params.id, {}); @@ -25,7 +24,7 @@ export function getVersions(http: HttpClient, rootUrl: string, params: GetVersio ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse>; + return r as StrictHttpResponse>; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/workplan/get-workplan.ts b/src/Moryx.Orders.Web/src/app/api/fn/workplan/get-workplan.ts index beffbfca7..7dd7a6d40 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/workplan/get-workplan.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/workplan/get-workplan.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,13 +7,13 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { WorkplanModel as MoryxAbstractionLayerProductsEndpointsWorkplanModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model'; +import { WorkplanModel } from '../../models/workplan-model'; export interface GetWorkplan$Params { id: number; } -export function getWorkplan(http: HttpClient, rootUrl: string, params: GetWorkplan$Params, context?: HttpContext): Observable> { +export function getWorkplan(http: HttpClient, rootUrl: string, params: GetWorkplan$Params, context?: HttpContext): Observable> { const rb = new RequestBuilder(rootUrl, getWorkplan.PATH, 'get'); if (params) { rb.path('id', params.id, {}); @@ -25,7 +24,7 @@ export function getWorkplan(http: HttpClient, rootUrl: string, params: GetWorkpl ).pipe( filter((r: any): r is HttpResponse => r instanceof HttpResponse), map((r: HttpResponse) => { - return r as StrictHttpResponse; + return r as StrictHttpResponse; }) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/fn/workplan/save-workplan.ts b/src/Moryx.Orders.Web/src/app/api/fn/workplan/save-workplan.ts index 8abfa92a5..7ec54ee12 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/workplan/save-workplan.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/workplan/save-workplan.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,10 +7,10 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { WorkplanModel as MoryxAbstractionLayerProductsEndpointsWorkplanModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model'; +import { WorkplanModel } from '../../models/workplan-model'; export interface SaveWorkplan$Params { - body?: MoryxAbstractionLayerProductsEndpointsWorkplanModel + body?: WorkplanModel } export function saveWorkplan(http: HttpClient, rootUrl: string, params?: SaveWorkplan$Params, context?: HttpContext): Observable> { diff --git a/src/Moryx.Orders.Web/src/app/api/fn/workplan/update-workplan.ts b/src/Moryx.Orders.Web/src/app/api/fn/workplan/update-workplan.ts index eaabc6366..340c50c03 100644 --- a/src/Moryx.Orders.Web/src/app/api/fn/workplan/update-workplan.ts +++ b/src/Moryx.Orders.Web/src/app/api/fn/workplan/update-workplan.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -8,11 +7,11 @@ import { filter, map } from 'rxjs/operators'; import { StrictHttpResponse } from '../../strict-http-response'; import { RequestBuilder } from '../../request-builder'; -import { WorkplanModel as MoryxAbstractionLayerProductsEndpointsWorkplanModel } from '../../models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model'; +import { WorkplanModel } from '../../models/workplan-model'; export interface UpdateWorkplan$Params { id: string; - body?: MoryxAbstractionLayerProductsEndpointsWorkplanModel + body?: WorkplanModel } export function updateWorkplan(http: HttpClient, rootUrl: string, params: UpdateWorkplan$Params, context?: HttpContext): Observable> { diff --git a/src/Moryx.Orders.Web/src/app/api/functions.ts b/src/Moryx.Orders.Web/src/app/api/functions.ts new file mode 100644 index 000000000..732a0c42e --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/functions.ts @@ -0,0 +1,113 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +export type { GetAll$Params } from './fn/operator-management/get-all'; +export { getAll } from './fn/operator-management/get-all'; +export type { Add$Params } from './fn/operator-management/add'; +export { add } from './fn/operator-management/add'; +export type { DeleteOperator$Params } from './fn/operator-management/delete-operator'; +export { deleteOperator } from './fn/operator-management/delete-operator'; +export type { Get$Params } from './fn/operator-management/get'; +export { get } from './fn/operator-management/get'; +export type { Update$Params } from './fn/operator-management/update'; +export { update } from './fn/operator-management/update'; +export type { GetOperatorsByResource$Params } from './fn/operator-management/get-operators-by-resource'; +export { getOperatorsByResource } from './fn/operator-management/get-operators-by-resource'; +export type { GetResources$Params } from './fn/operator-management/get-resources'; +export { getResources } from './fn/operator-management/get-resources'; +export type { GetResources_1$Params } from './fn/operator-management/get-resources-1'; +export { getResources_1 } from './fn/operator-management/get-resources-1'; +export type { GetDefaultOperator$Params } from './fn/operator-management/get-default-operator'; +export { getDefaultOperator } from './fn/operator-management/get-default-operator'; +export type { SignIn$Params } from './fn/operator-management/sign-in'; +export { signIn } from './fn/operator-management/sign-in'; +export type { SignOut$Params } from './fn/operator-management/sign-out'; +export { signOut } from './fn/operator-management/sign-out'; +export type { GetOperations$Params } from './fn/order-management/get-operations'; +export { getOperations } from './fn/order-management/get-operations'; +export type { AddOperation$Params } from './fn/order-management/add-operation'; +export { addOperation } from './fn/order-management/add-operation'; +export type { OperationStream$Params } from './fn/order-management/operation-stream'; +export { operationStream } from './fn/order-management/operation-stream'; +export type { GetOperation$Params } from './fn/order-management/get-operation'; +export { getOperation } from './fn/order-management/get-operation'; +export type { GetDocuments$Params } from './fn/order-management/get-documents'; +export { getDocuments } from './fn/order-management/get-documents'; +export type { GetDocumentStream$Params } from './fn/order-management/get-document-stream'; +export { getDocumentStream } from './fn/order-management/get-document-stream'; +export type { GetProductParts$Params } from './fn/order-management/get-product-parts'; +export { getProductParts } from './fn/order-management/get-product-parts'; +export type { GetBeginContext$Params } from './fn/order-management/get-begin-context'; +export { getBeginContext } from './fn/order-management/get-begin-context'; +export type { BeginOperation$Params } from './fn/order-management/begin-operation'; +export { beginOperation } from './fn/order-management/begin-operation'; +export type { GetReportContext$Params } from './fn/order-management/get-report-context'; +export { getReportContext } from './fn/order-management/get-report-context'; +export type { ReportOperation$Params } from './fn/order-management/report-operation'; +export { reportOperation } from './fn/order-management/report-operation'; +export type { GetInterruptContext$Params } from './fn/order-management/get-interrupt-context'; +export { getInterruptContext } from './fn/order-management/get-interrupt-context'; +export type { InterruptOperation$Params } from './fn/order-management/interrupt-operation'; +export { interruptOperation } from './fn/order-management/interrupt-operation'; +export type { GetAdviceContext$Params } from './fn/order-management/get-advice-context'; +export { getAdviceContext } from './fn/order-management/get-advice-context'; +export type { AdviceOperation$Params } from './fn/order-management/advice-operation'; +export { adviceOperation } from './fn/order-management/advice-operation'; +export type { GetLogs$Params } from './fn/order-management/get-logs'; +export { getLogs } from './fn/order-management/get-logs'; +export type { GetAssignableRecipes$Params } from './fn/order-management/get-assignable-recipes'; +export { getAssignableRecipes } from './fn/order-management/get-assignable-recipes'; +export type { AbortOperation$Params } from './fn/order-management/abort-operation'; +export { abortOperation } from './fn/order-management/abort-operation'; +export type { SetOperationSortOrder$Params } from './fn/order-management/set-operation-sort-order'; +export { setOperationSortOrder } from './fn/order-management/set-operation-sort-order'; +export type { Reload$Params } from './fn/order-management/reload'; +export { reload } from './fn/order-management/reload'; +export type { GetProductCustomization$Params } from './fn/product-management/get-product-customization'; +export { getProductCustomization } from './fn/product-management/get-product-customization'; +export type { Import$Params } from './fn/product-management/import'; +export { import$ } from './fn/product-management/import'; +export type { GetTypeByIdentity$Params } from './fn/product-management/get-type-by-identity'; +export { getTypeByIdentity } from './fn/product-management/get-type-by-identity'; +export type { SaveType$Params } from './fn/product-management/save-type'; +export { saveType } from './fn/product-management/save-type'; +export type { GetTypes$Params } from './fn/product-management/get-types'; +export { getTypes } from './fn/product-management/get-types'; +export type { GetTypeById$Params } from './fn/product-management/get-type-by-id'; +export { getTypeById } from './fn/product-management/get-type-by-id'; +export type { UpdateType$Params } from './fn/product-management/update-type'; +export { updateType } from './fn/product-management/update-type'; +export type { Duplicate$Params } from './fn/product-management/duplicate'; +export { duplicate } from './fn/product-management/duplicate'; +export type { DeleteType$Params } from './fn/product-management/delete-type'; +export { deleteType } from './fn/product-management/delete-type'; +export type { GetRecipes$Params } from './fn/product-management/get-recipes'; +export { getRecipes } from './fn/product-management/get-recipes'; +export type { GetInstance$Params } from './fn/product-management/get-instance'; +export { getInstance } from './fn/product-management/get-instance'; +export type { GetInstances$Params } from './fn/product-management/get-instances'; +export { getInstances } from './fn/product-management/get-instances'; +export type { SaveInstance$Params } from './fn/product-management/save-instance'; +export { saveInstance } from './fn/product-management/save-instance'; +export type { CreateInstance$Params } from './fn/product-management/create-instance'; +export { createInstance } from './fn/product-management/create-instance'; +export type { GetRecipe$Params } from './fn/product-management/get-recipe'; +export { getRecipe } from './fn/product-management/get-recipe'; +export type { UpdateRecipe$Params } from './fn/product-management/update-recipe'; +export { updateRecipe } from './fn/product-management/update-recipe'; +export type { SaveRecipe$Params } from './fn/product-management/save-recipe'; +export { saveRecipe } from './fn/product-management/save-recipe'; +export type { CreateRecipe$Params } from './fn/product-management/create-recipe'; +export { createRecipe } from './fn/product-management/create-recipe'; +export type { GetAllWorkplans$Params } from './fn/workplan/get-all-workplans'; +export { getAllWorkplans } from './fn/workplan/get-all-workplans'; +export type { SaveWorkplan$Params } from './fn/workplan/save-workplan'; +export { saveWorkplan } from './fn/workplan/save-workplan'; +export type { GetVersions$Params } from './fn/workplan/get-versions'; +export { getVersions } from './fn/workplan/get-versions'; +export type { GetWorkplan$Params } from './fn/workplan/get-workplan'; +export { getWorkplan } from './fn/workplan/get-workplan'; +export type { UpdateWorkplan$Params } from './fn/workplan/update-workplan'; +export { updateWorkplan } from './fn/workplan/update-workplan'; +export type { DeleteWorkplan$Params } from './fn/workplan/delete-workplan'; +export { deleteWorkplan } from './fn/workplan/delete-workplan'; diff --git a/src/Moryx.Orders.Web/src/app/api/models.ts b/src/Moryx.Orders.Web/src/app/api/models.ts index af75077d6..1282a9fde 100644 --- a/src/Moryx.Orders.Web/src/app/api/models.ts +++ b/src/Moryx.Orders.Web/src/app/api/models.ts @@ -1,63 +1,56 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ -export { ProblemDetails as MicrosoftAspNetCoreMvcProblemDetails } from './models/Microsoft/AspNetCore/Mvc/problem-details'; -export { LogLevel as MicrosoftExtensionsLoggingLogLevel } from './models/Microsoft/Extensions/Logging/log-level'; -export { ICapabilities as MoryxAbstractionLayerCapabilitiesICapabilities } from './models/Moryx/AbstractionLayer/Capabilities/i-capabilities'; -export { PartConnector as MoryxAbstractionLayerProductsEndpointsPartConnector } from './models/Moryx/AbstractionLayer/Products/Endpoints/part-connector'; -export { PartModel as MoryxAbstractionLayerProductsEndpointsPartModel } from './models/Moryx/AbstractionLayer/Products/Endpoints/part-model'; -export { ProductCustomization as MoryxAbstractionLayerProductsEndpointsProductCustomization } from './models/Moryx/AbstractionLayer/Products/Endpoints/product-customization'; -export { ProductDefinitionModel as MoryxAbstractionLayerProductsEndpointsProductDefinitionModel } from './models/Moryx/AbstractionLayer/Products/Endpoints/product-definition-model'; -export { ProductFileModel as MoryxAbstractionLayerProductsEndpointsProductFileModel } from './models/Moryx/AbstractionLayer/Products/Endpoints/product-file-model'; -export { ProductImporter as MoryxAbstractionLayerProductsEndpointsProductImporter } from './models/Moryx/AbstractionLayer/Products/Endpoints/product-importer'; -export { ProductInstanceModel as MoryxAbstractionLayerProductsEndpointsProductInstanceModel } from './models/Moryx/AbstractionLayer/Products/Endpoints/product-instance-model'; -export { ProductModel as MoryxAbstractionLayerProductsEndpointsProductModel } from './models/Moryx/AbstractionLayer/Products/Endpoints/product-model'; -export { RecipeClassificationModel as MoryxAbstractionLayerProductsEndpointsRecipeClassificationModel } from './models/Moryx/AbstractionLayer/Products/Endpoints/recipe-classification-model'; -export { RecipeDefinitionModel as MoryxAbstractionLayerProductsEndpointsRecipeDefinitionModel } from './models/Moryx/AbstractionLayer/Products/Endpoints/recipe-definition-model'; -export { RecipeModel as MoryxAbstractionLayerProductsEndpointsRecipeModel } from './models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model'; -export { WorkplanModel as MoryxAbstractionLayerProductsEndpointsWorkplanModel } from './models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model'; -export { ProductInstanceState as MoryxAbstractionLayerProductsProductInstanceState } from './models/Moryx/AbstractionLayer/Products/product-instance-state'; -export { ProductQuery as MoryxAbstractionLayerProductsProductQuery } from './models/Moryx/AbstractionLayer/Products/product-query'; -export { ProductState as MoryxAbstractionLayerProductsProductState } from './models/Moryx/AbstractionLayer/Products/product-state'; -export { PropertyFilter as MoryxAbstractionLayerProductsPropertyFilter } from './models/Moryx/AbstractionLayer/Products/property-filter'; -export { PropertyFilterOperator as MoryxAbstractionLayerProductsPropertyFilterOperator } from './models/Moryx/AbstractionLayer/Products/property-filter-operator'; -export { RecipeFilter as MoryxAbstractionLayerProductsRecipeFilter } from './models/Moryx/AbstractionLayer/Products/recipe-filter'; -export { RevisionFilter as MoryxAbstractionLayerProductsRevisionFilter } from './models/Moryx/AbstractionLayer/Products/revision-filter'; -export { Selector as MoryxAbstractionLayerProductsSelector } from './models/Moryx/AbstractionLayer/Products/selector'; -export { RecipeState as MoryxAbstractionLayerRecipesRecipeState } from './models/Moryx/AbstractionLayer/Recipes/recipe-state'; -export { MoryxExceptionResponse as MoryxAspExtensionsMoryxExceptionResponse } from './models/Moryx/Asp/Extensions/moryx-exception-response'; -export { AssignableOperator as MoryxOperatorsAssignableOperator } from './models/Moryx/Operators/assignable-operator'; -export { ExtendedOperatorModel as MoryxOperatorsEndpointsExtendedOperatorModel } from './models/Moryx/Operators/Endpoints/extended-operator-model'; -export { OperatorModel as MoryxOperatorsEndpointsOperatorModel } from './models/Moryx/Operators/Endpoints/operator-model'; -export { ResourceModel as MoryxOperatorsEndpointsResourceModel } from './models/Moryx/Operators/Endpoints/resource-model'; -export { IOperatorAssignable as MoryxOperatorsIOperatorAssignable } from './models/Moryx/Operators/i-operator-assignable'; -export { AdviceContext as MoryxOrdersAdviceContext } from './models/Moryx/Orders/advice-context'; -export { BeginContext as MoryxOrdersBeginContext } from './models/Moryx/Orders/begin-context'; -export { ConfirmationType as MoryxOrdersConfirmationType } from './models/Moryx/Orders/confirmation-type'; -export { AdviceModel as MoryxOrdersEndpointsAdviceModel } from './models/Moryx/Orders/Endpoints/advice-model'; -export { BeginModel as MoryxOrdersEndpointsBeginModel } from './models/Moryx/Orders/Endpoints/begin-model'; -export { DocumentModel as MoryxOrdersEndpointsDocumentModel } from './models/Moryx/Orders/Endpoints/document-model'; -export { OperationAdvicedModel as MoryxOrdersEndpointsModelsOperationAdvicedModel } from './models/Moryx/Orders/Endpoints/Models/operation-adviced-model'; -export { OperationChangedModel as MoryxOrdersEndpointsModelsOperationChangedModel } from './models/Moryx/Orders/Endpoints/Models/operation-changed-model'; -export { OperationCreationContextModel as MoryxOrdersEndpointsModelsOperationCreationContextModel } from './models/Moryx/Orders/Endpoints/Models/operation-creation-context-model'; -export { OperationReportedModel as MoryxOrdersEndpointsModelsOperationReportedModel } from './models/Moryx/Orders/Endpoints/Models/operation-reported-model'; -export { OperationStartedModel as MoryxOrdersEndpointsModelsOperationStartedModel } from './models/Moryx/Orders/Endpoints/Models/operation-started-model'; -export { OperationLogMessageModel as MoryxOrdersEndpointsOperationLogMessageModel } from './models/Moryx/Orders/Endpoints/operation-log-message-model'; -export { OperationModel as MoryxOrdersEndpointsOperationModel } from './models/Moryx/Orders/Endpoints/operation-model'; -export { OperationRecipeModel as MoryxOrdersEndpointsOperationRecipeModel } from './models/Moryx/Orders/Endpoints/operation-recipe-model'; -export { ProductPartModel as MoryxOrdersEndpointsProductPartModel } from './models/Moryx/Orders/Endpoints/product-part-model'; -export { ReportModel as MoryxOrdersEndpointsReportModel } from './models/Moryx/Orders/Endpoints/report-model'; -export { OperationClassification as MoryxOrdersOperationClassification } from './models/Moryx/Orders/operation-classification'; -export { PartClassification as MoryxOrdersPartClassification } from './models/Moryx/Orders/part-classification'; -export { PartCreationContext as MoryxOrdersPartCreationContext } from './models/Moryx/Orders/part-creation-context'; -export { ReportContext as MoryxOrdersReportContext } from './models/Moryx/Orders/report-context'; -export { RestrictionDescription as MoryxOrdersRestrictionsRestrictionDescription } from './models/Moryx/Orders/Restrictions/restriction-description'; -export { RestrictionSeverity as MoryxOrdersRestrictionsRestrictionSeverity } from './models/Moryx/Orders/Restrictions/restriction-severity'; -export { StagingIndicator as MoryxOrdersStagingIndicator } from './models/Moryx/Orders/staging-indicator'; -export { Entry as MoryxSerializationEntry } from './models/Moryx/Serialization/entry'; -export { EntryUnitType as MoryxSerializationEntryUnitType } from './models/Moryx/Serialization/entry-unit-type'; -export { EntryValidation as MoryxSerializationEntryValidation } from './models/Moryx/Serialization/entry-validation'; -export { EntryValue as MoryxSerializationEntryValue } from './models/Moryx/Serialization/entry-value'; -export { EntryValueType as MoryxSerializationEntryValueType } from './models/Moryx/Serialization/entry-value-type'; -export { WorkplanState as MoryxWorkplansWorkplanState } from './models/Moryx/Workplans/workplan-state'; +export type { AdviceContext } from './models/advice-context'; +export type { AdviceModel } from './models/advice-model'; +export type { AssignableOperator } from './models/assignable-operator'; +export type { AttendableResourceModel } from './models/attendable-resource-model'; +export type { BeginContext } from './models/begin-context'; +export type { BeginModel } from './models/begin-model'; +export { ConfirmationType } from './models/confirmation-type'; +export type { DocumentModel } from './models/document-model'; +export type { ExtendedOperatorModel } from './models/extended-operator-model'; +export type { ICapabilities } from './models/i-capabilities'; +export type { IOperatorAssignable } from './models/i-operator-assignable'; +export { LogLevel } from './models/log-level'; +export type { MoryxExceptionResponse } from './models/moryx-exception-response'; +export type { OperationAdvicedModel } from './models/operation-adviced-model'; +export type { OperationChangedModel } from './models/operation-changed-model'; +export { OperationClassification } from './models/operation-classification'; +export type { OperationCreationContextModel } from './models/operation-creation-context-model'; +export type { OperationLogMessageModel } from './models/operation-log-message-model'; +export type { OperationModel } from './models/operation-model'; +export type { OperationRecipeModel } from './models/operation-recipe-model'; +export type { OperationReportedModel } from './models/operation-reported-model'; +export type { OperationStartedModel } from './models/operation-started-model'; +export type { OperatorModel } from './models/operator-model'; +export { PartClassification } from './models/part-classification'; +export type { PartConnector } from './models/part-connector'; +export type { PartCreationContext } from './models/part-creation-context'; +export type { PartModel } from './models/part-model'; +export type { ProblemDetails } from './models/problem-details'; +export type { ProductCustomization } from './models/product-customization'; +export type { ProductDefinitionModel } from './models/product-definition-model'; +export type { ProductImporter } from './models/product-importer'; +export type { ProductInstanceModel } from './models/product-instance-model'; +export { ProductInstanceState } from './models/product-instance-state'; +export type { ProductModel } from './models/product-model'; +export type { ProductPartModel } from './models/product-part-model'; +export type { ProductQuery } from './models/product-query'; +export { ProductState } from './models/product-state'; +export type { PropertyFilter } from './models/property-filter'; +export { PropertyFilterOperator } from './models/property-filter-operator'; +export { RecipeClassificationModel } from './models/recipe-classification-model'; +export type { RecipeDefinitionModel } from './models/recipe-definition-model'; +export { RecipeFilter } from './models/recipe-filter'; +export type { RecipeModel } from './models/recipe-model'; +export { RecipeState } from './models/recipe-state'; +export type { ReportContext } from './models/report-context'; +export type { ReportModel } from './models/report-model'; +export type { RestrictionDescription } from './models/restriction-description'; +export { RestrictionSeverity } from './models/restriction-severity'; +export { RevisionFilter } from './models/revision-filter'; +export { Selector } from './models/selector'; +export { StagingIndicator } from './models/staging-indicator'; +export type { WorkplanModel } from './models/workplan-model'; +export { WorkplanState } from './models/workplan-state'; diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/part-connector.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/part-connector.ts deleted file mode 100644 index ff1b2b957..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/part-connector.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { PartModel as MoryxAbstractionLayerProductsEndpointsPartModel } from '../../../../../models/Moryx/AbstractionLayer/Products/Endpoints/part-model'; -import { Entry as MoryxSerializationEntry } from '../../../../../models/Moryx/Serialization/entry'; -export interface PartConnector { - displayName?: string | null; - isCollection?: boolean; - name?: string | null; - parts?: Array | null; - propertyTemplates?: MoryxSerializationEntry; - type?: string | null; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/part-model.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/part-model.ts deleted file mode 100644 index 62414bab0..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/part-model.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { ProductModel as MoryxAbstractionLayerProductsEndpointsProductModel } from '../../../../../models/Moryx/AbstractionLayer/Products/Endpoints/product-model'; -import { Entry as MoryxSerializationEntry } from '../../../../../models/Moryx/Serialization/entry'; -export interface PartModel { - id?: number; - product?: MoryxAbstractionLayerProductsEndpointsProductModel; - properties?: MoryxSerializationEntry; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-customization.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-customization.ts deleted file mode 100644 index 3c3f23867..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-customization.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { ProductDefinitionModel as MoryxAbstractionLayerProductsEndpointsProductDefinitionModel } from '../../../../../models/Moryx/AbstractionLayer/Products/Endpoints/product-definition-model'; -import { ProductImporter as MoryxAbstractionLayerProductsEndpointsProductImporter } from '../../../../../models/Moryx/AbstractionLayer/Products/Endpoints/product-importer'; -import { RecipeDefinitionModel as MoryxAbstractionLayerProductsEndpointsRecipeDefinitionModel } from '../../../../../models/Moryx/AbstractionLayer/Products/Endpoints/recipe-definition-model'; -export interface ProductCustomization { - importers?: Array | null; - productTypes?: Array | null; - recipeTypes?: Array | null; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-file-model.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-file-model.ts deleted file mode 100644 index 9c192fd1f..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-file-model.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -export interface ProductFileModel { - fileHash?: string | null; - fileName?: string | null; - filePath?: string | null; - mimeType?: string | null; - propertyName?: string | null; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-importer.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-importer.ts deleted file mode 100644 index 0643e0c11..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-importer.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { Entry as MoryxSerializationEntry } from '../../../../../models/Moryx/Serialization/entry'; -export interface ProductImporter { - name?: string | null; - parameters?: MoryxSerializationEntry; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-instance-model.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-instance-model.ts deleted file mode 100644 index b218a1dae..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-instance-model.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { ProductInstanceState as MoryxAbstractionLayerProductsProductInstanceState } from '../../../../../models/Moryx/AbstractionLayer/Products/product-instance-state'; -import { Entry as MoryxSerializationEntry } from '../../../../../models/Moryx/Serialization/entry'; -export interface ProductInstanceModel { - id?: number; - properties?: MoryxSerializationEntry; - state?: MoryxAbstractionLayerProductsProductInstanceState; - type?: string | null; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-model.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-model.ts deleted file mode 100644 index e333174a2..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-model.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { PartConnector as MoryxAbstractionLayerProductsEndpointsPartConnector } from '../../../../../models/Moryx/AbstractionLayer/Products/Endpoints/part-connector'; -import { ProductFileModel as MoryxAbstractionLayerProductsEndpointsProductFileModel } from '../../../../../models/Moryx/AbstractionLayer/Products/Endpoints/product-file-model'; -import { RecipeModel as MoryxAbstractionLayerProductsEndpointsRecipeModel } from '../../../../../models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model'; -import { ProductState as MoryxAbstractionLayerProductsProductState } from '../../../../../models/Moryx/AbstractionLayer/Products/product-state'; -import { Entry as MoryxSerializationEntry } from '../../../../../models/Moryx/Serialization/entry'; -export interface ProductModel { - files?: Array | null; - id?: number; - identifier?: string | null; - name?: string | null; - parts?: Array | null; - properties?: MoryxSerializationEntry; - recipes?: Array | null; - revision?: number; - state?: MoryxAbstractionLayerProductsProductState; - type?: string | null; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model.ts deleted file mode 100644 index 2bbee7597..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { Entry } from '@moryx/ngx-web-framework'; -import { RecipeClassificationModel as MoryxAbstractionLayerProductsEndpointsRecipeClassificationModel } from '../../../../../models/Moryx/AbstractionLayer/Products/Endpoints/recipe-classification-model'; -import { WorkplanModel as MoryxAbstractionLayerProductsEndpointsWorkplanModel } from '../../../../../models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model'; -import { RecipeState as MoryxAbstractionLayerRecipesRecipeState } from '../../../../../models/Moryx/AbstractionLayer/Recipes/recipe-state'; - -export interface RecipeModel { - classification?: MoryxAbstractionLayerProductsEndpointsRecipeClassificationModel; - id?: number; - isClone?: boolean; - name?: string | null; - properties?: Entry; - revision?: number; - state?: MoryxAbstractionLayerRecipesRecipeState; - type?: string | null; - /** @deprecated */workplanId?: number; - workplanModel?: MoryxAbstractionLayerProductsEndpointsWorkplanModel; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model.ts deleted file mode 100644 index c3f52ae86..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { WorkplanState as MoryxWorkplansWorkplanState } from '../../../../../models/Moryx/Workplans/workplan-state'; -export interface WorkplanModel { - id?: number; - name?: string | null; - state?: MoryxWorkplansWorkplanState; - version?: number; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/product-query.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/product-query.ts deleted file mode 100644 index 91112702b..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/product-query.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { PropertyFilter as MoryxAbstractionLayerProductsPropertyFilter } from '../../../../models/Moryx/AbstractionLayer/Products/property-filter'; -import { RecipeFilter as MoryxAbstractionLayerProductsRecipeFilter } from '../../../../models/Moryx/AbstractionLayer/Products/recipe-filter'; -import { RevisionFilter as MoryxAbstractionLayerProductsRevisionFilter } from '../../../../models/Moryx/AbstractionLayer/Products/revision-filter'; -import { Selector as MoryxAbstractionLayerProductsSelector } from '../../../../models/Moryx/AbstractionLayer/Products/selector'; -export interface ProductQuery { - excludeDerivedTypes?: boolean; - identifier?: string | null; - includeDeleted?: boolean; - name?: string | null; - propertyFilters?: Array | null; - recipeFilter?: MoryxAbstractionLayerProductsRecipeFilter; - revision?: number; - revisionFilter?: MoryxAbstractionLayerProductsRevisionFilter; - selector?: MoryxAbstractionLayerProductsSelector; - type?: string | null; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/property-filter.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/property-filter.ts deleted file mode 100644 index 5d979c0a9..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/property-filter.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { PropertyFilterOperator as MoryxAbstractionLayerProductsPropertyFilterOperator } from '../../../../models/Moryx/AbstractionLayer/Products/property-filter-operator'; -import { Entry as MoryxSerializationEntry } from '../../../../models/Moryx/Serialization/entry'; -export interface PropertyFilter { - entry?: MoryxSerializationEntry; - operator?: MoryxAbstractionLayerProductsPropertyFilterOperator; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/i-operator-assignable.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/i-operator-assignable.ts deleted file mode 100644 index c2d4a3e76..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/i-operator-assignable.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { ICapabilities as MoryxAbstractionLayerCapabilitiesICapabilities } from '../../../models/Moryx/AbstractionLayer/Capabilities/i-capabilities'; -export interface IOperatorAssignable { - capabilities?: MoryxAbstractionLayerCapabilitiesICapabilities; - id?: number; - name?: string | null; - requiredSkills?: MoryxAbstractionLayerCapabilitiesICapabilities; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-adviced-model.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-adviced-model.ts deleted file mode 100644 index 416ab0610..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-adviced-model.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { AdviceModel as MoryxOrdersEndpointsAdviceModel } from '../../../../../models/Moryx/Orders/Endpoints/advice-model'; -import { OperationModel as MoryxOrdersEndpointsOperationModel } from '../../../../../models/Moryx/Orders/Endpoints/operation-model'; -export interface OperationAdvicedModel { - advice?: MoryxOrdersEndpointsAdviceModel; - operationModel?: MoryxOrdersEndpointsOperationModel; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-changed-model.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-changed-model.ts deleted file mode 100644 index be811bd66..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-changed-model.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { OperationAdvicedModel as MoryxOrdersEndpointsModelsOperationAdvicedModel } from '../../../../../models/Moryx/Orders/Endpoints/Models/operation-adviced-model'; -import { OperationReportedModel as MoryxOrdersEndpointsModelsOperationReportedModel } from '../../../../../models/Moryx/Orders/Endpoints/Models/operation-reported-model'; -import { OperationStartedModel as MoryxOrdersEndpointsModelsOperationStartedModel } from '../../../../../models/Moryx/Orders/Endpoints/Models/operation-started-model'; -export interface OperationChangedModel { - advicedModel?: MoryxOrdersEndpointsModelsOperationAdvicedModel; - reportedModel?: MoryxOrdersEndpointsModelsOperationReportedModel; - startedModel?: MoryxOrdersEndpointsModelsOperationStartedModel; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-reported-model.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-reported-model.ts deleted file mode 100644 index 4373e8bbe..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-reported-model.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { OperationModel as MoryxOrdersEndpointsOperationModel } from '../../../../../models/Moryx/Orders/Endpoints/operation-model'; -import { ReportModel as MoryxOrdersEndpointsReportModel } from '../../../../../models/Moryx/Orders/Endpoints/report-model'; -export interface OperationReportedModel { - operationModel?: MoryxOrdersEndpointsOperationModel; - report?: MoryxOrdersEndpointsReportModel; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-started-model.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-started-model.ts deleted file mode 100644 index 2995466c0..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-started-model.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { OperationModel as MoryxOrdersEndpointsOperationModel } from '../../../../../models/Moryx/Orders/Endpoints/operation-model'; -export interface OperationStartedModel { - operationModel?: MoryxOrdersEndpointsOperationModel; - userId?: string | null; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/product-part-model.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/product-part-model.ts deleted file mode 100644 index 45d886d7c..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/product-part-model.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { PartClassification as MoryxOrdersPartClassification } from '../../../../models/Moryx/Orders/part-classification'; -import { StagingIndicator as MoryxOrdersStagingIndicator } from '../../../../models/Moryx/Orders/staging-indicator'; -export interface ProductPartModel { - classification?: MoryxOrdersPartClassification; - id?: number; - identifier?: string | null; - name?: string | null; - quantity?: number; - stagingIndicator?: MoryxOrdersStagingIndicator; - unit?: string | null; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Restrictions/restriction-description.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Restrictions/restriction-description.ts deleted file mode 100644 index f15dd2c5a..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Restrictions/restriction-description.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { RestrictionSeverity as MoryxOrdersRestrictionsRestrictionSeverity } from '../../../../models/Moryx/Orders/Restrictions/restriction-severity'; -export interface RestrictionDescription { - severity?: MoryxOrdersRestrictionsRestrictionSeverity; - text?: string | null; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/part-creation-context.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/part-creation-context.ts deleted file mode 100644 index 8c1f1ad98..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/part-creation-context.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { PartClassification as MoryxOrdersPartClassification } from '../../../models/Moryx/Orders/part-classification'; -import { StagingIndicator as MoryxOrdersStagingIndicator } from '../../../models/Moryx/Orders/staging-indicator'; -export interface PartCreationContext { - classification?: MoryxOrdersPartClassification; - name?: string | null; - number?: string | null; - quantity?: number; - stagingIndicator?: MoryxOrdersStagingIndicator; - unit?: string | null; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-unit-type.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-unit-type.ts deleted file mode 100644 index 8a1a45261..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-unit-type.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -export enum EntryUnitType { - None = 'None', - Password = 'Password', - File = 'File', - Directory = 'Directory', - Flags = 'Flags' -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-validation.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-validation.ts deleted file mode 100644 index eb0bcd226..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-validation.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -export interface EntryValidation { - isRequired?: boolean; - maximum?: number; - minimum?: number; - regex?: string | null; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-value-type.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-value-type.ts deleted file mode 100644 index 60dd47c35..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-value-type.ts +++ /dev/null @@ -1,22 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -export enum EntryValueType { - Byte = 'Byte', - Boolean = 'Boolean', - Int16 = 'Int16', - UInt16 = 'UInt16', - Int32 = 'Int32', - UInt32 = 'UInt32', - Int64 = 'Int64', - UInt64 = 'UInt64', - Single = 'Single', - Double = 'Double', - String = 'String', - Enum = 'Enum', - Class = 'Class', - Collection = 'Collection', - Exception = 'Exception', - Stream = 'Stream' -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-value.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-value.ts deleted file mode 100644 index 809b28309..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry-value.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { EntryUnitType as MoryxSerializationEntryUnitType } from '../../../models/Moryx/Serialization/entry-unit-type'; -import { EntryValueType as MoryxSerializationEntryValueType } from '../../../models/Moryx/Serialization/entry-value-type'; -export interface EntryValue { - current?: string | null; - default?: string | null; - isReadOnly?: boolean; - possible?: Array | null; - type?: MoryxSerializationEntryValueType; - unitType?: MoryxSerializationEntryUnitType; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry.ts b/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry.ts deleted file mode 100644 index 626aff2d9..000000000 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Serialization/entry.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/* Code generated by ng-openapi-gen DO NOT EDIT. */ - -import { EntryValidation as MoryxSerializationEntryValidation } from '../../../models/Moryx/Serialization/entry-validation'; -import { EntryValue as MoryxSerializationEntryValue } from '../../../models/Moryx/Serialization/entry-value'; -export interface Entry { - description?: string | null; - displayName?: string | null; - identifier?: string | null; - prototypes?: Array | null; - subEntries?: Array | null; - validation?: MoryxSerializationEntryValidation; - value?: MoryxSerializationEntryValue; -} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/advice-context.ts b/src/Moryx.Orders.Web/src/app/api/models/advice-context.ts similarity index 86% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/advice-context.ts rename to src/Moryx.Orders.Web/src/app/api/models/advice-context.ts index 8cc335b62..639305499 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/advice-context.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/advice-context.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/advice-model.ts b/src/Moryx.Orders.Web/src/app/api/models/advice-model.ts similarity index 89% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/advice-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/advice-model.ts index feb4da29b..e59971ec9 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/advice-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/advice-model.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/assignable-operator.ts b/src/Moryx.Orders.Web/src/app/api/models/assignable-operator.ts similarity index 53% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/assignable-operator.ts rename to src/Moryx.Orders.Web/src/app/api/models/assignable-operator.ts index 9661f7c1e..c595b9dbc 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/assignable-operator.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/assignable-operator.ts @@ -1,10 +1,9 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ -import { IOperatorAssignable as MoryxOperatorsIOperatorAssignable } from '../../../models/Moryx/Operators/i-operator-assignable'; +import { IOperatorAssignable } from '../models/i-operator-assignable'; export interface AssignableOperator { - assignedResources?: Array | null; + assignedResources?: Array | null; firstName?: string | null; identifier?: string | null; lastName?: string | null; diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/Endpoints/resource-model.ts b/src/Moryx.Orders.Web/src/app/api/models/attendable-resource-model.ts similarity index 59% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/Endpoints/resource-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/attendable-resource-model.ts index 5db5c2a6d..7cfd7fb0e 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/Endpoints/resource-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/attendable-resource-model.ts @@ -1,8 +1,8 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ -export interface ResourceModel { +export interface AttendableResourceModel { id?: number | null; name?: string | null; + requiredSkills?: Array | null; } diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/begin-context.ts b/src/Moryx.Orders.Web/src/app/api/models/begin-context.ts similarity index 52% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/begin-context.ts rename to src/Moryx.Orders.Web/src/app/api/models/begin-context.ts index 5182ce247..1963f9e13 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/begin-context.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/begin-context.ts @@ -1,15 +1,14 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ -import { RestrictionDescription as MoryxOrdersRestrictionsRestrictionDescription } from '../../../models/Moryx/Orders/Restrictions/restriction-description'; +import { RestrictionDescription } from '../models/restriction-description'; export interface BeginContext { canBegin?: boolean; canReduce?: boolean; minimalTargetAmount?: number; partialAmount?: number; residualAmount?: number; - restrictions?: Array | null; + restrictions?: Array | null; scrapCount?: number; successCount?: number; } diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/begin-model.ts b/src/Moryx.Orders.Web/src/app/api/models/begin-model.ts similarity index 87% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/begin-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/begin-model.ts index 1fe0ca87d..a86e809b4 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/begin-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/begin-model.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/confirmation-type.ts b/src/Moryx.Orders.Web/src/app/api/models/confirmation-type.ts similarity index 87% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/confirmation-type.ts rename to src/Moryx.Orders.Web/src/app/api/models/confirmation-type.ts index dd49dd32e..027010719 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/confirmation-type.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/confirmation-type.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/document-model.ts b/src/Moryx.Orders.Web/src/app/api/models/document-model.ts similarity index 93% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/document-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/document-model.ts index d819e719d..0a4277362 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/document-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/document-model.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/Endpoints/extended-operator-model.ts b/src/Moryx.Orders.Web/src/app/api/models/extended-operator-model.ts similarity index 50% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/Endpoints/extended-operator-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/extended-operator-model.ts index 04e39ef4b..6bdf4328a 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/Endpoints/extended-operator-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/extended-operator-model.ts @@ -1,10 +1,9 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ -import { ResourceModel as MoryxOperatorsEndpointsResourceModel } from '../../../../models/Moryx/Operators/Endpoints/resource-model'; +import { AttendableResourceModel } from '../models/attendable-resource-model'; export interface ExtendedOperatorModel { - assignedResources?: Array | null; + assignedResources?: Array | null; firstName?: string | null; identifier?: string | null; lastName?: string | null; diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Capabilities/i-capabilities.ts b/src/Moryx.Orders.Web/src/app/api/models/i-capabilities.ts similarity index 86% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Capabilities/i-capabilities.ts rename to src/Moryx.Orders.Web/src/app/api/models/i-capabilities.ts index 34810e7f0..a4322cbc0 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Capabilities/i-capabilities.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/i-capabilities.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/i-operator-assignable.ts b/src/Moryx.Orders.Web/src/app/api/models/i-operator-assignable.ts new file mode 100644 index 000000000..906040cb0 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/i-operator-assignable.ts @@ -0,0 +1,10 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { ICapabilities } from '../models/i-capabilities'; +export interface IOperatorAssignable { + capabilities?: ICapabilities; + id?: number; + name?: string | null; + requiredSkills?: ICapabilities; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Microsoft/Extensions/Logging/log-level.ts b/src/Moryx.Orders.Web/src/app/api/models/log-level.ts similarity index 92% rename from src/Moryx.Orders.Web/src/app/api/models/Microsoft/Extensions/Logging/log-level.ts rename to src/Moryx.Orders.Web/src/app/api/models/log-level.ts index 3ce6758dd..ef11a8712 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Microsoft/Extensions/Logging/log-level.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/log-level.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Asp/Extensions/moryx-exception-response.ts b/src/Moryx.Orders.Web/src/app/api/models/moryx-exception-response.ts similarity index 89% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Asp/Extensions/moryx-exception-response.ts rename to src/Moryx.Orders.Web/src/app/api/models/moryx-exception-response.ts index a269b5759..dda2e841e 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Asp/Extensions/moryx-exception-response.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/moryx-exception-response.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/operation-adviced-model.ts b/src/Moryx.Orders.Web/src/app/api/models/operation-adviced-model.ts new file mode 100644 index 000000000..abd6b9424 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/operation-adviced-model.ts @@ -0,0 +1,9 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { AdviceModel } from '../models/advice-model'; +import { OperationModel } from '../models/operation-model'; +export interface OperationAdvicedModel { + advice?: AdviceModel; + operationModel?: OperationModel; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/operation-changed-model.ts b/src/Moryx.Orders.Web/src/app/api/models/operation-changed-model.ts new file mode 100644 index 000000000..14a90769d --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/operation-changed-model.ts @@ -0,0 +1,11 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { OperationAdvicedModel } from '../models/operation-adviced-model'; +import { OperationReportedModel } from '../models/operation-reported-model'; +import { OperationStartedModel } from '../models/operation-started-model'; +export interface OperationChangedModel { + advicedModel?: OperationAdvicedModel; + reportedModel?: OperationReportedModel; + startedModel?: OperationStartedModel; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/operation-classification.ts b/src/Moryx.Orders.Web/src/app/api/models/operation-classification.ts similarity index 96% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/operation-classification.ts rename to src/Moryx.Orders.Web/src/app/api/models/operation-classification.ts index dd9f35144..4954e448f 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/operation-classification.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/operation-classification.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-creation-context-model.ts b/src/Moryx.Orders.Web/src/app/api/models/operation-creation-context-model.ts similarity index 60% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-creation-context-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/operation-creation-context-model.ts index c75c4f2d0..9266980d3 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/Models/operation-creation-context-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/operation-creation-context-model.ts @@ -1,16 +1,15 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ -import { PartCreationContext as MoryxOrdersPartCreationContext } from '../../../../../models/Moryx/Orders/part-creation-context'; -import { Entry as MoryxSerializationEntry } from '../../../../../models/Moryx/Serialization/entry'; +import { Entry } from '@moryx/ngx-web-framework/entry-editor'; +import { PartCreationContext } from '../models/part-creation-context'; export interface OperationCreationContextModel { - materialParameters?: Array | null; + materialParameters?: Array | null; name?: string | null; operationNumber?: string | null; orderNumber?: string | null; overDeliveryAmount?: number; - parts?: Array | null; + parts?: Array | null; plannedEnd?: string; plannedStart?: string; productIdentifier?: string | null; diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/operation-log-message-model.ts b/src/Moryx.Orders.Web/src/app/api/models/operation-log-message-model.ts similarity index 50% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/operation-log-message-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/operation-log-message-model.ts index 29ad208c4..f8f702c65 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/operation-log-message-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/operation-log-message-model.ts @@ -1,11 +1,10 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ -import { LogLevel as MicrosoftExtensionsLoggingLogLevel } from '../../../../models/Microsoft/Extensions/Logging/log-level'; +import { LogLevel } from '../models/log-level'; export interface OperationLogMessageModel { exception?: string | null; - logLevel?: MicrosoftExtensionsLoggingLogLevel; + logLevel?: LogLevel; message?: string | null; timeStamp?: string; } diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/operation-model.ts b/src/Moryx.Orders.Web/src/app/api/models/operation-model.ts similarity index 83% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/operation-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/operation-model.ts index ed0d138a0..68e8a0ff3 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/operation-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/operation-model.ts @@ -1,17 +1,15 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ -import { Entry } from '@moryx/ngx-web-framework'; -import { OperationClassification as MoryxOrdersOperationClassification } from '../../../../models/Moryx/Orders/operation-classification'; - +import { Entry } from '@moryx/ngx-web-framework/entry-editor'; +import { OperationClassification } from '../models/operation-classification'; export interface OperationModel { canAdvice?: boolean; canAssign?: boolean; canBegin?: boolean; canInterrupt?: boolean; canReport?: boolean; - classification?: MoryxOrdersOperationClassification; + classification?: OperationClassification; end?: string | null; hasDocuments?: boolean; hasPartList?: boolean; diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/operation-recipe-model.ts b/src/Moryx.Orders.Web/src/app/api/models/operation-recipe-model.ts similarity index 88% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/operation-recipe-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/operation-recipe-model.ts index b858251d5..e702f1bf1 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/operation-recipe-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/operation-recipe-model.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/operation-reported-model.ts b/src/Moryx.Orders.Web/src/app/api/models/operation-reported-model.ts new file mode 100644 index 000000000..d5babeb7c --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/operation-reported-model.ts @@ -0,0 +1,9 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { OperationModel } from '../models/operation-model'; +import { ReportModel } from '../models/report-model'; +export interface OperationReportedModel { + operationModel?: OperationModel; + report?: ReportModel; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/operation-started-model.ts b/src/Moryx.Orders.Web/src/app/api/models/operation-started-model.ts new file mode 100644 index 000000000..5721aacff --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/operation-started-model.ts @@ -0,0 +1,8 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { OperationModel } from '../models/operation-model'; +export interface OperationStartedModel { + operationModel?: OperationModel; + userId?: string | null; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/Endpoints/operator-model.ts b/src/Moryx.Orders.Web/src/app/api/models/operator-model.ts similarity index 91% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/Endpoints/operator-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/operator-model.ts index 3edfbdadd..2a1020e6a 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Operators/Endpoints/operator-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/operator-model.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/part-classification.ts b/src/Moryx.Orders.Web/src/app/api/models/part-classification.ts similarity index 93% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/part-classification.ts rename to src/Moryx.Orders.Web/src/app/api/models/part-classification.ts index 860dab734..37620a9f0 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/part-classification.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/part-classification.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/part-connector.ts b/src/Moryx.Orders.Web/src/app/api/models/part-connector.ts new file mode 100644 index 000000000..394210f93 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/part-connector.ts @@ -0,0 +1,13 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { Entry } from '@moryx/ngx-web-framework/entry-editor'; +import { PartModel } from '../models/part-model'; +export interface PartConnector { + displayName?: string | null; + isCollection?: boolean; + name?: string | null; + parts?: Array | null; + propertyTemplates?: Entry; + type?: string | null; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/part-creation-context.ts b/src/Moryx.Orders.Web/src/app/api/models/part-creation-context.ts new file mode 100644 index 000000000..e06e462b5 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/part-creation-context.ts @@ -0,0 +1,13 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { PartClassification } from '../models/part-classification'; +import { StagingIndicator } from '../models/staging-indicator'; +export interface PartCreationContext { + classification?: PartClassification; + name?: string | null; + number?: string | null; + quantity?: number; + stagingIndicator?: StagingIndicator; + unit?: string | null; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/part-model.ts b/src/Moryx.Orders.Web/src/app/api/models/part-model.ts new file mode 100644 index 000000000..7dfe0bd96 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/part-model.ts @@ -0,0 +1,10 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { Entry } from '@moryx/ngx-web-framework/entry-editor'; +import { ProductModel } from '../models/product-model'; +export interface PartModel { + id?: number; + product?: ProductModel; + properties?: Entry; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Microsoft/AspNetCore/Mvc/problem-details.ts b/src/Moryx.Orders.Web/src/app/api/models/problem-details.ts similarity index 93% rename from src/Moryx.Orders.Web/src/app/api/models/Microsoft/AspNetCore/Mvc/problem-details.ts rename to src/Moryx.Orders.Web/src/app/api/models/problem-details.ts index d93d5f570..756c332c8 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Microsoft/AspNetCore/Mvc/problem-details.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/problem-details.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/product-customization.ts b/src/Moryx.Orders.Web/src/app/api/models/product-customization.ts new file mode 100644 index 000000000..54bf9487d --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/product-customization.ts @@ -0,0 +1,11 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { ProductDefinitionModel } from '../models/product-definition-model'; +import { ProductImporter } from '../models/product-importer'; +import { RecipeDefinitionModel } from '../models/recipe-definition-model'; +export interface ProductCustomization { + importers?: Array | null; + productTypes?: Array | null; + recipeTypes?: Array | null; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-definition-model.ts b/src/Moryx.Orders.Web/src/app/api/models/product-definition-model.ts similarity index 56% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-definition-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/product-definition-model.ts index 28584e807..52d7b05d2 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-definition-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/product-definition-model.ts @@ -1,11 +1,10 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ -import { Entry as MoryxSerializationEntry } from '../../../../../models/Moryx/Serialization/entry'; +import { Entry } from '@moryx/ngx-web-framework/entry-editor'; export interface ProductDefinitionModel { baseDefinition?: string | null; displayName?: string | null; name?: string | null; - properties?: MoryxSerializationEntry; + properties?: Entry; } diff --git a/src/Moryx.Orders.Web/src/app/api/models/product-importer.ts b/src/Moryx.Orders.Web/src/app/api/models/product-importer.ts new file mode 100644 index 000000000..2071944a6 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/product-importer.ts @@ -0,0 +1,8 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { Entry } from '@moryx/ngx-web-framework/entry-editor'; +export interface ProductImporter { + name?: string | null; + parameters?: Entry; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/product-instance-model.ts b/src/Moryx.Orders.Web/src/app/api/models/product-instance-model.ts new file mode 100644 index 000000000..4f10a5fdc --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/product-instance-model.ts @@ -0,0 +1,11 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { Entry } from '@moryx/ngx-web-framework/entry-editor'; +import { ProductInstanceState } from '../models/product-instance-state'; +export interface ProductInstanceModel { + id?: number; + properties?: Entry; + state?: ProductInstanceState; + type?: string | null; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/product-instance-state.ts b/src/Moryx.Orders.Web/src/app/api/models/product-instance-state.ts similarity index 91% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/product-instance-state.ts rename to src/Moryx.Orders.Web/src/app/api/models/product-instance-state.ts index 59e0b3c4e..a36efd439 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/product-instance-state.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/product-instance-state.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/product-model.ts b/src/Moryx.Orders.Web/src/app/api/models/product-model.ts new file mode 100644 index 000000000..c7eab058f --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/product-model.ts @@ -0,0 +1,18 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { Entry } from '@moryx/ngx-web-framework/entry-editor'; +import { PartConnector } from '../models/part-connector'; +import { ProductState } from '../models/product-state'; +import { RecipeModel } from '../models/recipe-model'; +export interface ProductModel { + id?: number; + identifier?: string | null; + name?: string | null; + parts?: Array | null; + properties?: Entry; + recipes?: Array | null; + revision?: number; + state?: ProductState; + type?: string | null; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/product-part-model.ts b/src/Moryx.Orders.Web/src/app/api/models/product-part-model.ts new file mode 100644 index 000000000..d67f19af8 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/product-part-model.ts @@ -0,0 +1,14 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { PartClassification } from '../models/part-classification'; +import { StagingIndicator } from '../models/staging-indicator'; +export interface ProductPartModel { + classification?: PartClassification; + id?: number; + identifier?: string | null; + name?: string | null; + quantity?: number; + stagingIndicator?: StagingIndicator; + unit?: string | null; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/product-query.ts b/src/Moryx.Orders.Web/src/app/api/models/product-query.ts new file mode 100644 index 000000000..ae9ac0ae0 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/product-query.ts @@ -0,0 +1,19 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { PropertyFilter } from '../models/property-filter'; +import { RecipeFilter } from '../models/recipe-filter'; +import { RevisionFilter } from '../models/revision-filter'; +import { Selector } from '../models/selector'; +export interface ProductQuery { + excludeDerivedTypes?: boolean; + identifier?: string | null; + includeDeleted?: boolean; + name?: string | null; + propertyFilters?: Array | null; + recipeFilter?: RecipeFilter; + revision?: number; + revisionFilter?: RevisionFilter; + selector?: Selector; + type?: string | null; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/product-state.ts b/src/Moryx.Orders.Web/src/app/api/models/product-state.ts similarity index 89% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/product-state.ts rename to src/Moryx.Orders.Web/src/app/api/models/product-state.ts index cc052a192..010deb809 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/product-state.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/product-state.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/property-filter-operator.ts b/src/Moryx.Orders.Web/src/app/api/models/property-filter-operator.ts similarity index 90% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/property-filter-operator.ts rename to src/Moryx.Orders.Web/src/app/api/models/property-filter-operator.ts index 97ae96999..d288cc0aa 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/property-filter-operator.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/property-filter-operator.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/property-filter.ts b/src/Moryx.Orders.Web/src/app/api/models/property-filter.ts new file mode 100644 index 000000000..f11db5f61 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/property-filter.ts @@ -0,0 +1,9 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { Entry } from '@moryx/ngx-web-framework/entry-editor'; +import { PropertyFilterOperator } from '../models/property-filter-operator'; +export interface PropertyFilter { + entry?: Entry; + operator?: PropertyFilterOperator; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-classification-model.ts b/src/Moryx.Orders.Web/src/app/api/models/recipe-classification-model.ts similarity index 91% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-classification-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/recipe-classification-model.ts index 67332d96a..8f8c7f27b 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-classification-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/recipe-classification-model.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-definition-model.ts b/src/Moryx.Orders.Web/src/app/api/models/recipe-definition-model.ts similarity index 90% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-definition-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/recipe-definition-model.ts index 1782d5229..180d408fd 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-definition-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/recipe-definition-model.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/recipe-filter.ts b/src/Moryx.Orders.Web/src/app/api/models/recipe-filter.ts similarity index 89% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/recipe-filter.ts rename to src/Moryx.Orders.Web/src/app/api/models/recipe-filter.ts index b01b9f204..c81ceeb31 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/recipe-filter.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/recipe-filter.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/recipe-model.ts b/src/Moryx.Orders.Web/src/app/api/models/recipe-model.ts new file mode 100644 index 000000000..b707ef262 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/recipe-model.ts @@ -0,0 +1,18 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { Entry } from '@moryx/ngx-web-framework/entry-editor'; +import { RecipeClassificationModel } from '../models/recipe-classification-model'; +import { RecipeState } from '../models/recipe-state'; +import { WorkplanModel } from '../models/workplan-model'; +export interface RecipeModel { + classification?: RecipeClassificationModel; + id?: number; + isClone?: boolean; + name?: string | null; + properties?: Entry; + revision?: number; + state?: RecipeState; + type?: string | null; + workplanModel?: WorkplanModel; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Recipes/recipe-state.ts b/src/Moryx.Orders.Web/src/app/api/models/recipe-state.ts similarity index 88% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Recipes/recipe-state.ts rename to src/Moryx.Orders.Web/src/app/api/models/recipe-state.ts index 3d01957cb..c416c5234 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Recipes/recipe-state.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/recipe-state.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/report-context.ts b/src/Moryx.Orders.Web/src/app/api/models/report-context.ts similarity index 55% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/report-context.ts rename to src/Moryx.Orders.Web/src/app/api/models/report-context.ts index d3dc93f35..b52b6d67b 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/report-context.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/report-context.ts @@ -1,14 +1,13 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ -import { RestrictionDescription as MoryxOrdersRestrictionsRestrictionDescription } from '../../../models/Moryx/Orders/Restrictions/restriction-description'; +import { RestrictionDescription } from '../models/restriction-description'; export interface ReportContext { canFinal?: boolean; canPartial?: boolean; reportedFailure?: number; reportedSuccess?: number; - restrictions?: Array | null; + restrictions?: Array | null; scrapCount?: number; successCount?: number; unreportedFailure?: number; diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/report-model.ts b/src/Moryx.Orders.Web/src/app/api/models/report-model.ts similarity index 53% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/report-model.ts rename to src/Moryx.Orders.Web/src/app/api/models/report-model.ts index 0b42e49cd..68ae34bce 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Endpoints/report-model.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/report-model.ts @@ -1,11 +1,10 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ -import { ConfirmationType as MoryxOrdersConfirmationType } from '../../../../models/Moryx/Orders/confirmation-type'; +import { ConfirmationType } from '../models/confirmation-type'; export interface ReportModel { comment?: string | null; - confirmationType?: MoryxOrdersConfirmationType; + confirmationType?: ConfirmationType; failureCount?: number; successCount?: number; userIdentifier?: string | null; diff --git a/src/Moryx.Orders.Web/src/app/api/models/restriction-description.ts b/src/Moryx.Orders.Web/src/app/api/models/restriction-description.ts new file mode 100644 index 000000000..460424f49 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/restriction-description.ts @@ -0,0 +1,8 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { RestrictionSeverity } from '../models/restriction-severity'; +export interface RestrictionDescription { + severity?: RestrictionSeverity; + text?: string | null; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Restrictions/restriction-severity.ts b/src/Moryx.Orders.Web/src/app/api/models/restriction-severity.ts similarity index 88% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Restrictions/restriction-severity.ts rename to src/Moryx.Orders.Web/src/app/api/models/restriction-severity.ts index 5ca4b0972..2fc18c7ef 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/Restrictions/restriction-severity.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/restriction-severity.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/revision-filter.ts b/src/Moryx.Orders.Web/src/app/api/models/revision-filter.ts similarity index 88% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/revision-filter.ts rename to src/Moryx.Orders.Web/src/app/api/models/revision-filter.ts index b70ce0d0e..bdf1eb2f2 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/revision-filter.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/revision-filter.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/selector.ts b/src/Moryx.Orders.Web/src/app/api/models/selector.ts similarity index 88% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/selector.ts rename to src/Moryx.Orders.Web/src/app/api/models/selector.ts index c3190a29d..ff52846c7 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/AbstractionLayer/Products/selector.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/selector.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/staging-indicator.ts b/src/Moryx.Orders.Web/src/app/api/models/staging-indicator.ts similarity index 93% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/staging-indicator.ts rename to src/Moryx.Orders.Web/src/app/api/models/staging-indicator.ts index bf9558e08..8e8ee9f5a 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Orders/staging-indicator.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/staging-indicator.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/models/workplan-model.ts b/src/Moryx.Orders.Web/src/app/api/models/workplan-model.ts new file mode 100644 index 000000000..47bd55e22 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/api/models/workplan-model.ts @@ -0,0 +1,10 @@ +/* eslint-disable */ +/* Code generated by ng-openapi-gen DO NOT EDIT. */ + +import { WorkplanState } from '../models/workplan-state'; +export interface WorkplanModel { + id?: number; + name?: string | null; + state?: WorkplanState; + version?: number; +} diff --git a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Workplans/workplan-state.ts b/src/Moryx.Orders.Web/src/app/api/models/workplan-state.ts similarity index 88% rename from src/Moryx.Orders.Web/src/app/api/models/Moryx/Workplans/workplan-state.ts rename to src/Moryx.Orders.Web/src/app/api/models/workplan-state.ts index d6fab6c32..794969c04 100644 --- a/src/Moryx.Orders.Web/src/app/api/models/Moryx/Workplans/workplan-state.ts +++ b/src/Moryx.Orders.Web/src/app/api/models/workplan-state.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/request-builder.ts b/src/Moryx.Orders.Web/src/app/api/request-builder.ts index a7f253b15..9e287882b 100644 --- a/src/Moryx.Orders.Web/src/app/api/request-builder.ts +++ b/src/Moryx.Orders.Web/src/app/api/request-builder.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/services.ts b/src/Moryx.Orders.Web/src/app/api/services.ts index fd4c94b5a..a401e1e22 100644 --- a/src/Moryx.Orders.Web/src/app/api/services.ts +++ b/src/Moryx.Orders.Web/src/app/api/services.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/api/services/operator-management.service.ts b/src/Moryx.Orders.Web/src/app/api/services/operator-management.service.ts index 15a12c0a3..1af5648a0 100644 --- a/src/Moryx.Orders.Web/src/app/api/services/operator-management.service.ts +++ b/src/Moryx.Orders.Web/src/app/api/services/operator-management.service.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -13,8 +12,11 @@ import { StrictHttpResponse } from '../strict-http-response'; import { add } from '../fn/operator-management/add'; import { Add$Params } from '../fn/operator-management/add'; +import { AssignableOperator } from '../models/assignable-operator'; +import { AttendableResourceModel } from '../models/attendable-resource-model'; import { deleteOperator } from '../fn/operator-management/delete-operator'; import { DeleteOperator$Params } from '../fn/operator-management/delete-operator'; +import { ExtendedOperatorModel } from '../models/extended-operator-model'; import { get } from '../fn/operator-management/get'; import { Get$Params } from '../fn/operator-management/get'; import { getAll } from '../fn/operator-management/get-all'; @@ -27,9 +29,6 @@ import { getResources } from '../fn/operator-management/get-resources'; import { getResources_1 } from '../fn/operator-management/get-resources-1'; import { GetResources_1$Params } from '../fn/operator-management/get-resources-1'; import { GetResources$Params } from '../fn/operator-management/get-resources'; -import { AssignableOperator as MoryxOperatorsAssignableOperator } from '../models/Moryx/Operators/assignable-operator'; -import { ExtendedOperatorModel as MoryxOperatorsEndpointsExtendedOperatorModel } from '../models/Moryx/Operators/Endpoints/extended-operator-model'; -import { ResourceModel as MoryxOperatorsEndpointsResourceModel } from '../models/Moryx/Operators/Endpoints/resource-model'; import { signIn } from '../fn/operator-management/sign-in'; import { SignIn$Params } from '../fn/operator-management/sign-in'; import { signOut } from '../fn/operator-management/sign-out'; @@ -52,8 +51,9 @@ export class OperatorManagementService extends BaseService { * * This method doesn't expect any request body. */ - getAll$Response(params?: GetAll$Params, context?: HttpContext): Observable>> { - return getAll(this.http, this.rootUrl, params, context); + getAll$Response(params?: GetAll$Params, context?: HttpContext): Observable>> { + const obs = getAll(this.http, this.rootUrl, params, context); + return obs; } /** @@ -62,9 +62,10 @@ export class OperatorManagementService extends BaseService { * * This method doesn't expect any request body. */ - getAll(params?: GetAll$Params, context?: HttpContext): Observable> { - return this.getAll$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getAll(params?: GetAll$Params, context?: HttpContext): Observable> { + const resp = this.getAll$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -78,7 +79,8 @@ export class OperatorManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ add$Response(params?: Add$Params, context?: HttpContext): Observable> { - return add(this.http, this.rootUrl, params, context); + const obs = add(this.http, this.rootUrl, params, context); + return obs; } /** @@ -88,7 +90,8 @@ export class OperatorManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ add(params?: Add$Params, context?: HttpContext): Observable { - return this.add$Response(params, context).pipe( + const resp = this.add$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): string => r.body) ); } @@ -103,7 +106,8 @@ export class OperatorManagementService extends BaseService { * This method doesn't expect any request body. */ deleteOperator$Response(params?: DeleteOperator$Params, context?: HttpContext): Observable> { - return deleteOperator(this.http, this.rootUrl, params, context); + const obs = deleteOperator(this.http, this.rootUrl, params, context); + return obs; } /** @@ -113,7 +117,8 @@ export class OperatorManagementService extends BaseService { * This method doesn't expect any request body. */ deleteOperator(params?: DeleteOperator$Params, context?: HttpContext): Observable { - return this.deleteOperator$Response(params, context).pipe( + const resp = this.deleteOperator$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } @@ -127,8 +132,9 @@ export class OperatorManagementService extends BaseService { * * This method doesn't expect any request body. */ - get$Response(params: Get$Params, context?: HttpContext): Observable> { - return get(this.http, this.rootUrl, params, context); + get$Response(params: Get$Params, context?: HttpContext): Observable> { + const obs = get(this.http, this.rootUrl, params, context); + return obs; } /** @@ -137,9 +143,10 @@ export class OperatorManagementService extends BaseService { * * This method doesn't expect any request body. */ - get(params: Get$Params, context?: HttpContext): Observable { - return this.get$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxOperatorsEndpointsExtendedOperatorModel => r.body) + get(params: Get$Params, context?: HttpContext): Observable { + const resp = this.get$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): ExtendedOperatorModel => r.body) ); } @@ -153,7 +160,8 @@ export class OperatorManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ update$Response(params: Update$Params, context?: HttpContext): Observable> { - return update(this.http, this.rootUrl, params, context); + const obs = update(this.http, this.rootUrl, params, context); + return obs; } /** @@ -163,7 +171,8 @@ export class OperatorManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ update(params: Update$Params, context?: HttpContext): Observable { - return this.update$Response(params, context).pipe( + const resp = this.update$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): string => r.body) ); } @@ -177,8 +186,9 @@ export class OperatorManagementService extends BaseService { * * This method doesn't expect any request body. */ - getOperatorsByResource$Response(params: GetOperatorsByResource$Params, context?: HttpContext): Observable>> { - return getOperatorsByResource(this.http, this.rootUrl, params, context); + getOperatorsByResource$Response(params: GetOperatorsByResource$Params, context?: HttpContext): Observable>> { + const obs = getOperatorsByResource(this.http, this.rootUrl, params, context); + return obs; } /** @@ -187,9 +197,10 @@ export class OperatorManagementService extends BaseService { * * This method doesn't expect any request body. */ - getOperatorsByResource(params: GetOperatorsByResource$Params, context?: HttpContext): Observable> { - return this.getOperatorsByResource$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getOperatorsByResource(params: GetOperatorsByResource$Params, context?: HttpContext): Observable> { + const resp = this.getOperatorsByResource$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -202,8 +213,9 @@ export class OperatorManagementService extends BaseService { * * This method doesn't expect any request body. */ - getResources$Response(params: GetResources$Params, context?: HttpContext): Observable>> { - return getResources(this.http, this.rootUrl, params, context); + getResources$Response(params: GetResources$Params, context?: HttpContext): Observable>> { + const obs = getResources(this.http, this.rootUrl, params, context); + return obs; } /** @@ -212,9 +224,10 @@ export class OperatorManagementService extends BaseService { * * This method doesn't expect any request body. */ - getResources(params: GetResources$Params, context?: HttpContext): Observable> { - return this.getResources$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getResources(params: GetResources$Params, context?: HttpContext): Observable> { + const resp = this.getResources$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -227,8 +240,9 @@ export class OperatorManagementService extends BaseService { * * This method doesn't expect any request body. */ - getResources_1$Response(params?: GetResources_1$Params, context?: HttpContext): Observable>> { - return getResources_1(this.http, this.rootUrl, params, context); + getResources_1$Response(params?: GetResources_1$Params, context?: HttpContext): Observable>> { + const obs = getResources_1(this.http, this.rootUrl, params, context); + return obs; } /** @@ -237,9 +251,10 @@ export class OperatorManagementService extends BaseService { * * This method doesn't expect any request body. */ - getResources_1(params?: GetResources_1$Params, context?: HttpContext): Observable> { - return this.getResources_1$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getResources_1(params?: GetResources_1$Params, context?: HttpContext): Observable> { + const resp = this.getResources_1$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -252,8 +267,9 @@ export class OperatorManagementService extends BaseService { * * This method doesn't expect any request body. */ - getDefaultOperator$Response(params?: GetDefaultOperator$Params, context?: HttpContext): Observable> { - return getDefaultOperator(this.http, this.rootUrl, params, context); + getDefaultOperator$Response(params?: GetDefaultOperator$Params, context?: HttpContext): Observable> { + const obs = getDefaultOperator(this.http, this.rootUrl, params, context); + return obs; } /** @@ -262,9 +278,10 @@ export class OperatorManagementService extends BaseService { * * This method doesn't expect any request body. */ - getDefaultOperator(params?: GetDefaultOperator$Params, context?: HttpContext): Observable { - return this.getDefaultOperator$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxOperatorsEndpointsExtendedOperatorModel => r.body) + getDefaultOperator(params?: GetDefaultOperator$Params, context?: HttpContext): Observable { + const resp = this.getDefaultOperator$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): ExtendedOperatorModel => r.body) ); } @@ -278,7 +295,8 @@ export class OperatorManagementService extends BaseService { * This method doesn't expect any request body. */ signIn$Response(params?: SignIn$Params, context?: HttpContext): Observable> { - return signIn(this.http, this.rootUrl, params, context); + const obs = signIn(this.http, this.rootUrl, params, context); + return obs; } /** @@ -288,7 +306,8 @@ export class OperatorManagementService extends BaseService { * This method doesn't expect any request body. */ signIn(params?: SignIn$Params, context?: HttpContext): Observable { - return this.signIn$Response(params, context).pipe( + const resp = this.signIn$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } @@ -303,7 +322,8 @@ export class OperatorManagementService extends BaseService { * This method doesn't expect any request body. */ signOut$Response(params?: SignOut$Params, context?: HttpContext): Observable> { - return signOut(this.http, this.rootUrl, params, context); + const obs = signOut(this.http, this.rootUrl, params, context); + return obs; } /** @@ -313,7 +333,8 @@ export class OperatorManagementService extends BaseService { * This method doesn't expect any request body. */ signOut(params?: SignOut$Params, context?: HttpContext): Observable { - return this.signOut$Response(params, context).pipe( + const resp = this.signOut$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/services/order-management.service.ts b/src/Moryx.Orders.Web/src/app/api/services/order-management.service.ts index a27e8927f..56fb3665b 100644 --- a/src/Moryx.Orders.Web/src/app/api/services/order-management.service.ts +++ b/src/Moryx.Orders.Web/src/app/api/services/order-management.service.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -15,10 +14,13 @@ import { abortOperation } from '../fn/order-management/abort-operation'; import { AbortOperation$Params } from '../fn/order-management/abort-operation'; import { addOperation } from '../fn/order-management/add-operation'; import { AddOperation$Params } from '../fn/order-management/add-operation'; +import { AdviceContext } from '../models/advice-context'; import { adviceOperation } from '../fn/order-management/advice-operation'; import { AdviceOperation$Params } from '../fn/order-management/advice-operation'; +import { BeginContext } from '../models/begin-context'; import { beginOperation } from '../fn/order-management/begin-operation'; import { BeginOperation$Params } from '../fn/order-management/begin-operation'; +import { DocumentModel } from '../models/document-model'; import { getAdviceContext } from '../fn/order-management/get-advice-context'; import { GetAdviceContext$Params } from '../fn/order-management/get-advice-context'; import { getAssignableRecipes } from '../fn/order-management/get-assignable-recipes'; @@ -43,19 +45,16 @@ import { getReportContext } from '../fn/order-management/get-report-context'; import { GetReportContext$Params } from '../fn/order-management/get-report-context'; import { interruptOperation } from '../fn/order-management/interrupt-operation'; import { InterruptOperation$Params } from '../fn/order-management/interrupt-operation'; -import { AdviceContext as MoryxOrdersAdviceContext } from '../models/Moryx/Orders/advice-context'; -import { BeginContext as MoryxOrdersBeginContext } from '../models/Moryx/Orders/begin-context'; -import { DocumentModel as MoryxOrdersEndpointsDocumentModel } from '../models/Moryx/Orders/Endpoints/document-model'; -import { OperationChangedModel as MoryxOrdersEndpointsModelsOperationChangedModel } from '../models/Moryx/Orders/Endpoints/Models/operation-changed-model'; -import { OperationLogMessageModel as MoryxOrdersEndpointsOperationLogMessageModel } from '../models/Moryx/Orders/Endpoints/operation-log-message-model'; -import { OperationModel as MoryxOrdersEndpointsOperationModel } from '../models/Moryx/Orders/Endpoints/operation-model'; -import { OperationRecipeModel as MoryxOrdersEndpointsOperationRecipeModel } from '../models/Moryx/Orders/Endpoints/operation-recipe-model'; -import { ProductPartModel as MoryxOrdersEndpointsProductPartModel } from '../models/Moryx/Orders/Endpoints/product-part-model'; -import { ReportContext as MoryxOrdersReportContext } from '../models/Moryx/Orders/report-context'; +import { OperationChangedModel } from '../models/operation-changed-model'; +import { OperationLogMessageModel } from '../models/operation-log-message-model'; +import { OperationModel } from '../models/operation-model'; +import { OperationRecipeModel } from '../models/operation-recipe-model'; import { operationStream } from '../fn/order-management/operation-stream'; import { OperationStream$Params } from '../fn/order-management/operation-stream'; +import { ProductPartModel } from '../models/product-part-model'; import { reload } from '../fn/order-management/reload'; import { Reload$Params } from '../fn/order-management/reload'; +import { ReportContext } from '../models/report-context'; import { reportOperation } from '../fn/order-management/report-operation'; import { ReportOperation$Params } from '../fn/order-management/report-operation'; import { setOperationSortOrder } from '../fn/order-management/set-operation-sort-order'; @@ -76,8 +75,9 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getOperations$Response(params?: GetOperations$Params, context?: HttpContext): Observable>> { - return getOperations(this.http, this.rootUrl, params, context); + getOperations$Response(params?: GetOperations$Params, context?: HttpContext): Observable>> { + const obs = getOperations(this.http, this.rootUrl, params, context); + return obs; } /** @@ -86,9 +86,10 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getOperations(params?: GetOperations$Params, context?: HttpContext): Observable> { - return this.getOperations$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getOperations(params?: GetOperations$Params, context?: HttpContext): Observable> { + const resp = this.getOperations$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -101,8 +102,9 @@ export class OrderManagementService extends BaseService { * * This method sends `application/*+json` and handles request body of type `application/*+json`. */ - addOperation$Response(params?: AddOperation$Params, context?: HttpContext): Observable> { - return addOperation(this.http, this.rootUrl, params, context); + addOperation$Response(params?: AddOperation$Params, context?: HttpContext): Observable> { + const obs = addOperation(this.http, this.rootUrl, params, context); + return obs; } /** @@ -111,9 +113,10 @@ export class OrderManagementService extends BaseService { * * This method sends `application/*+json` and handles request body of type `application/*+json`. */ - addOperation(params?: AddOperation$Params, context?: HttpContext): Observable { - return this.addOperation$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxOrdersEndpointsOperationModel => r.body) + addOperation(params?: AddOperation$Params, context?: HttpContext): Observable { + const resp = this.addOperation$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): OperationModel => r.body) ); } @@ -126,8 +129,9 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - operationStream$Response(params?: OperationStream$Params, context?: HttpContext): Observable> { - return operationStream(this.http, this.rootUrl, params, context); + operationStream$Response(params?: OperationStream$Params, context?: HttpContext): Observable> { + const obs = operationStream(this.http, this.rootUrl, params, context); + return obs; } /** @@ -136,9 +140,10 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - operationStream(params?: OperationStream$Params, context?: HttpContext): Observable { - return this.operationStream$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxOrdersEndpointsModelsOperationChangedModel => r.body) + operationStream(params?: OperationStream$Params, context?: HttpContext): Observable { + const resp = this.operationStream$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): OperationChangedModel => r.body) ); } @@ -151,8 +156,9 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getOperation$Response(params: GetOperation$Params, context?: HttpContext): Observable> { - return getOperation(this.http, this.rootUrl, params, context); + getOperation$Response(params: GetOperation$Params, context?: HttpContext): Observable> { + const obs = getOperation(this.http, this.rootUrl, params, context); + return obs; } /** @@ -161,9 +167,10 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getOperation(params: GetOperation$Params, context?: HttpContext): Observable { - return this.getOperation$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxOrdersEndpointsOperationModel => r.body) + getOperation(params: GetOperation$Params, context?: HttpContext): Observable { + const resp = this.getOperation$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): OperationModel => r.body) ); } @@ -176,8 +183,9 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getDocuments$Response(params: GetDocuments$Params, context?: HttpContext): Observable>> { - return getDocuments(this.http, this.rootUrl, params, context); + getDocuments$Response(params: GetDocuments$Params, context?: HttpContext): Observable>> { + const obs = getDocuments(this.http, this.rootUrl, params, context); + return obs; } /** @@ -186,9 +194,10 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getDocuments(params: GetDocuments$Params, context?: HttpContext): Observable> { - return this.getDocuments$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getDocuments(params: GetDocuments$Params, context?: HttpContext): Observable> { + const resp = this.getDocuments$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -202,7 +211,8 @@ export class OrderManagementService extends BaseService { * This method doesn't expect any request body. */ getDocumentStream$Response(params: GetDocumentStream$Params, context?: HttpContext): Observable> { - return getDocumentStream(this.http, this.rootUrl, params, context); + const obs = getDocumentStream(this.http, this.rootUrl, params, context); + return obs; } /** @@ -212,7 +222,8 @@ export class OrderManagementService extends BaseService { * This method doesn't expect any request body. */ getDocumentStream(params: GetDocumentStream$Params, context?: HttpContext): Observable { - return this.getDocumentStream$Response(params, context).pipe( + const resp = this.getDocumentStream$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): Blob => r.body) ); } @@ -226,8 +237,9 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getProductParts$Response(params: GetProductParts$Params, context?: HttpContext): Observable>> { - return getProductParts(this.http, this.rootUrl, params, context); + getProductParts$Response(params: GetProductParts$Params, context?: HttpContext): Observable>> { + const obs = getProductParts(this.http, this.rootUrl, params, context); + return obs; } /** @@ -236,9 +248,10 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getProductParts(params: GetProductParts$Params, context?: HttpContext): Observable> { - return this.getProductParts$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getProductParts(params: GetProductParts$Params, context?: HttpContext): Observable> { + const resp = this.getProductParts$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -251,8 +264,9 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getBeginContext$Response(params: GetBeginContext$Params, context?: HttpContext): Observable> { - return getBeginContext(this.http, this.rootUrl, params, context); + getBeginContext$Response(params: GetBeginContext$Params, context?: HttpContext): Observable> { + const obs = getBeginContext(this.http, this.rootUrl, params, context); + return obs; } /** @@ -261,9 +275,10 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getBeginContext(params: GetBeginContext$Params, context?: HttpContext): Observable { - return this.getBeginContext$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxOrdersBeginContext => r.body) + getBeginContext(params: GetBeginContext$Params, context?: HttpContext): Observable { + const resp = this.getBeginContext$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): BeginContext => r.body) ); } @@ -277,7 +292,8 @@ export class OrderManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ beginOperation$Response(params: BeginOperation$Params, context?: HttpContext): Observable> { - return beginOperation(this.http, this.rootUrl, params, context); + const obs = beginOperation(this.http, this.rootUrl, params, context); + return obs; } /** @@ -287,7 +303,8 @@ export class OrderManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ beginOperation(params: BeginOperation$Params, context?: HttpContext): Observable { - return this.beginOperation$Response(params, context).pipe( + const resp = this.beginOperation$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } @@ -301,8 +318,9 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getReportContext$Response(params: GetReportContext$Params, context?: HttpContext): Observable> { - return getReportContext(this.http, this.rootUrl, params, context); + getReportContext$Response(params: GetReportContext$Params, context?: HttpContext): Observable> { + const obs = getReportContext(this.http, this.rootUrl, params, context); + return obs; } /** @@ -311,9 +329,10 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getReportContext(params: GetReportContext$Params, context?: HttpContext): Observable { - return this.getReportContext$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxOrdersReportContext => r.body) + getReportContext(params: GetReportContext$Params, context?: HttpContext): Observable { + const resp = this.getReportContext$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): ReportContext => r.body) ); } @@ -327,7 +346,8 @@ export class OrderManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ reportOperation$Response(params: ReportOperation$Params, context?: HttpContext): Observable> { - return reportOperation(this.http, this.rootUrl, params, context); + const obs = reportOperation(this.http, this.rootUrl, params, context); + return obs; } /** @@ -337,7 +357,8 @@ export class OrderManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ reportOperation(params: ReportOperation$Params, context?: HttpContext): Observable { - return this.reportOperation$Response(params, context).pipe( + const resp = this.reportOperation$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } @@ -351,8 +372,9 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getInterruptContext$Response(params: GetInterruptContext$Params, context?: HttpContext): Observable> { - return getInterruptContext(this.http, this.rootUrl, params, context); + getInterruptContext$Response(params: GetInterruptContext$Params, context?: HttpContext): Observable> { + const obs = getInterruptContext(this.http, this.rootUrl, params, context); + return obs; } /** @@ -361,9 +383,10 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getInterruptContext(params: GetInterruptContext$Params, context?: HttpContext): Observable { - return this.getInterruptContext$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxOrdersReportContext => r.body) + getInterruptContext(params: GetInterruptContext$Params, context?: HttpContext): Observable { + const resp = this.getInterruptContext$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): ReportContext => r.body) ); } @@ -374,20 +397,22 @@ export class OrderManagementService extends BaseService { * This method provides access to the full `HttpResponse`, allowing access to response headers. * To access only the response body, use `interruptOperation()` instead. * - * This method sends `application/*+json` and handles request body of type `application/*+json`. + * This method doesn't expect any request body. */ interruptOperation$Response(params: InterruptOperation$Params, context?: HttpContext): Observable> { - return interruptOperation(this.http, this.rootUrl, params, context); + const obs = interruptOperation(this.http, this.rootUrl, params, context); + return obs; } /** * This method provides access only to the response body. * To access the full response (for headers, for example), `interruptOperation$Response()` instead. * - * This method sends `application/*+json` and handles request body of type `application/*+json`. + * This method doesn't expect any request body. */ interruptOperation(params: InterruptOperation$Params, context?: HttpContext): Observable { - return this.interruptOperation$Response(params, context).pipe( + const resp = this.interruptOperation$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } @@ -401,8 +426,9 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getAdviceContext$Response(params: GetAdviceContext$Params, context?: HttpContext): Observable> { - return getAdviceContext(this.http, this.rootUrl, params, context); + getAdviceContext$Response(params: GetAdviceContext$Params, context?: HttpContext): Observable> { + const obs = getAdviceContext(this.http, this.rootUrl, params, context); + return obs; } /** @@ -411,9 +437,10 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getAdviceContext(params: GetAdviceContext$Params, context?: HttpContext): Observable { - return this.getAdviceContext$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxOrdersAdviceContext => r.body) + getAdviceContext(params: GetAdviceContext$Params, context?: HttpContext): Observable { + const resp = this.getAdviceContext$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): AdviceContext => r.body) ); } @@ -427,7 +454,8 @@ export class OrderManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ adviceOperation$Response(params: AdviceOperation$Params, context?: HttpContext): Observable> { - return adviceOperation(this.http, this.rootUrl, params, context); + const obs = adviceOperation(this.http, this.rootUrl, params, context); + return obs; } /** @@ -437,7 +465,8 @@ export class OrderManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ adviceOperation(params: AdviceOperation$Params, context?: HttpContext): Observable { - return this.adviceOperation$Response(params, context).pipe( + const resp = this.adviceOperation$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } @@ -451,8 +480,9 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getLogs$Response(params: GetLogs$Params, context?: HttpContext): Observable>> { - return getLogs(this.http, this.rootUrl, params, context); + getLogs$Response(params: GetLogs$Params, context?: HttpContext): Observable>> { + const obs = getLogs(this.http, this.rootUrl, params, context); + return obs; } /** @@ -461,9 +491,10 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getLogs(params: GetLogs$Params, context?: HttpContext): Observable> { - return this.getLogs$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getLogs(params: GetLogs$Params, context?: HttpContext): Observable> { + const resp = this.getLogs$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -476,8 +507,9 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getAssignableRecipes$Response(params?: GetAssignableRecipes$Params, context?: HttpContext): Observable>> { - return getAssignableRecipes(this.http, this.rootUrl, params, context); + getAssignableRecipes$Response(params?: GetAssignableRecipes$Params, context?: HttpContext): Observable>> { + const obs = getAssignableRecipes(this.http, this.rootUrl, params, context); + return obs; } /** @@ -486,9 +518,10 @@ export class OrderManagementService extends BaseService { * * This method doesn't expect any request body. */ - getAssignableRecipes(params?: GetAssignableRecipes$Params, context?: HttpContext): Observable> { - return this.getAssignableRecipes$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getAssignableRecipes(params?: GetAssignableRecipes$Params, context?: HttpContext): Observable> { + const resp = this.getAssignableRecipes$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -502,7 +535,8 @@ export class OrderManagementService extends BaseService { * This method doesn't expect any request body. */ abortOperation$Response(params: AbortOperation$Params, context?: HttpContext): Observable> { - return abortOperation(this.http, this.rootUrl, params, context); + const obs = abortOperation(this.http, this.rootUrl, params, context); + return obs; } /** @@ -512,7 +546,8 @@ export class OrderManagementService extends BaseService { * This method doesn't expect any request body. */ abortOperation(params: AbortOperation$Params, context?: HttpContext): Observable { - return this.abortOperation$Response(params, context).pipe( + const resp = this.abortOperation$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } @@ -527,7 +562,8 @@ export class OrderManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ setOperationSortOrder$Response(params: SetOperationSortOrder$Params, context?: HttpContext): Observable> { - return setOperationSortOrder(this.http, this.rootUrl, params, context); + const obs = setOperationSortOrder(this.http, this.rootUrl, params, context); + return obs; } /** @@ -537,7 +573,8 @@ export class OrderManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ setOperationSortOrder(params: SetOperationSortOrder$Params, context?: HttpContext): Observable { - return this.setOperationSortOrder$Response(params, context).pipe( + const resp = this.setOperationSortOrder$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } @@ -552,7 +589,8 @@ export class OrderManagementService extends BaseService { * This method doesn't expect any request body. */ reload$Response(params: Reload$Params, context?: HttpContext): Observable> { - return reload(this.http, this.rootUrl, params, context); + const obs = reload(this.http, this.rootUrl, params, context); + return obs; } /** @@ -562,7 +600,8 @@ export class OrderManagementService extends BaseService { * This method doesn't expect any request body. */ reload(params: Reload$Params, context?: HttpContext): Observable { - return this.reload$Response(params, context).pipe( + const resp = this.reload$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/services/product-management.service.ts b/src/Moryx.Orders.Web/src/app/api/services/product-management.service.ts index 46076a8d1..863c284f0 100644 --- a/src/Moryx.Orders.Web/src/app/api/services/product-management.service.ts +++ b/src/Moryx.Orders.Web/src/app/api/services/product-management.service.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -37,10 +36,10 @@ import { getTypes } from '../fn/product-management/get-types'; import { GetTypes$Params } from '../fn/product-management/get-types'; import { import$ } from '../fn/product-management/import'; import { Import$Params } from '../fn/product-management/import'; -import { ProductCustomization as MoryxAbstractionLayerProductsEndpointsProductCustomization } from '../models/Moryx/AbstractionLayer/Products/Endpoints/product-customization'; -import { ProductInstanceModel as MoryxAbstractionLayerProductsEndpointsProductInstanceModel } from '../models/Moryx/AbstractionLayer/Products/Endpoints/product-instance-model'; -import { ProductModel as MoryxAbstractionLayerProductsEndpointsProductModel } from '../models/Moryx/AbstractionLayer/Products/Endpoints/product-model'; -import { RecipeModel as MoryxAbstractionLayerProductsEndpointsRecipeModel } from '../models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model'; +import { ProductCustomization } from '../models/product-customization'; +import { ProductInstanceModel } from '../models/product-instance-model'; +import { ProductModel } from '../models/product-model'; +import { RecipeModel } from '../models/recipe-model'; import { saveInstance } from '../fn/product-management/save-instance'; import { SaveInstance$Params } from '../fn/product-management/save-instance'; import { saveRecipe } from '../fn/product-management/save-recipe'; @@ -67,8 +66,9 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getProductCustomization$Response(params?: GetProductCustomization$Params, context?: HttpContext): Observable> { - return getProductCustomization(this.http, this.rootUrl, params, context); + getProductCustomization$Response(params?: GetProductCustomization$Params, context?: HttpContext): Observable> { + const obs = getProductCustomization(this.http, this.rootUrl, params, context); + return obs; } /** @@ -77,9 +77,10 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getProductCustomization(params?: GetProductCustomization$Params, context?: HttpContext): Observable { - return this.getProductCustomization$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxAbstractionLayerProductsEndpointsProductCustomization => r.body) + getProductCustomization(params?: GetProductCustomization$Params, context?: HttpContext): Observable { + const resp = this.getProductCustomization$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): ProductCustomization => r.body) ); } @@ -92,8 +93,9 @@ export class ProductManagementService extends BaseService { * * This method sends `application/*+json` and handles request body of type `application/*+json`. */ - import$Response(params: Import$Params, context?: HttpContext): Observable>> { - return import$(this.http, this.rootUrl, params, context); + import$Response(params: Import$Params, context?: HttpContext): Observable>> { + const obs = import$(this.http, this.rootUrl, params, context); + return obs; } /** @@ -102,9 +104,10 @@ export class ProductManagementService extends BaseService { * * This method sends `application/*+json` and handles request body of type `application/*+json`. */ - import(params: Import$Params, context?: HttpContext): Observable> { - return this.import$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + import(params: Import$Params, context?: HttpContext): Observable> { + const resp = this.import$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -117,8 +120,9 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getTypeByIdentity$Response(params?: GetTypeByIdentity$Params, context?: HttpContext): Observable>> { - return getTypeByIdentity(this.http, this.rootUrl, params, context); + getTypeByIdentity$Response(params?: GetTypeByIdentity$Params, context?: HttpContext): Observable>> { + const obs = getTypeByIdentity(this.http, this.rootUrl, params, context); + return obs; } /** @@ -127,9 +131,10 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getTypeByIdentity(params?: GetTypeByIdentity$Params, context?: HttpContext): Observable> { - return this.getTypeByIdentity$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getTypeByIdentity(params?: GetTypeByIdentity$Params, context?: HttpContext): Observable> { + const resp = this.getTypeByIdentity$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -143,7 +148,8 @@ export class ProductManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ saveType$Response(params?: SaveType$Params, context?: HttpContext): Observable> { - return saveType(this.http, this.rootUrl, params, context); + const obs = saveType(this.http, this.rootUrl, params, context); + return obs; } /** @@ -153,7 +159,8 @@ export class ProductManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ saveType(params?: SaveType$Params, context?: HttpContext): Observable { - return this.saveType$Response(params, context).pipe( + const resp = this.saveType$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): number => r.body) ); } @@ -167,8 +174,9 @@ export class ProductManagementService extends BaseService { * * This method sends `application/*+json` and handles request body of type `application/*+json`. */ - getTypes$Response(params?: GetTypes$Params, context?: HttpContext): Observable>> { - return getTypes(this.http, this.rootUrl, params, context); + getTypes$Response(params?: GetTypes$Params, context?: HttpContext): Observable>> { + const obs = getTypes(this.http, this.rootUrl, params, context); + return obs; } /** @@ -177,9 +185,10 @@ export class ProductManagementService extends BaseService { * * This method sends `application/*+json` and handles request body of type `application/*+json`. */ - getTypes(params?: GetTypes$Params, context?: HttpContext): Observable> { - return this.getTypes$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getTypes(params?: GetTypes$Params, context?: HttpContext): Observable> { + const resp = this.getTypes$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -192,8 +201,9 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getTypeById$Response(params: GetTypeById$Params, context?: HttpContext): Observable> { - return getTypeById(this.http, this.rootUrl, params, context); + getTypeById$Response(params: GetTypeById$Params, context?: HttpContext): Observable> { + const obs = getTypeById(this.http, this.rootUrl, params, context); + return obs; } /** @@ -202,9 +212,10 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getTypeById(params: GetTypeById$Params, context?: HttpContext): Observable { - return this.getTypeById$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxAbstractionLayerProductsEndpointsProductModel => r.body) + getTypeById(params: GetTypeById$Params, context?: HttpContext): Observable { + const resp = this.getTypeById$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): ProductModel => r.body) ); } @@ -218,7 +229,8 @@ export class ProductManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ updateType$Response(params: UpdateType$Params, context?: HttpContext): Observable> { - return updateType(this.http, this.rootUrl, params, context); + const obs = updateType(this.http, this.rootUrl, params, context); + return obs; } /** @@ -228,7 +240,8 @@ export class ProductManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ updateType(params: UpdateType$Params, context?: HttpContext): Observable { - return this.updateType$Response(params, context).pipe( + const resp = this.updateType$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): number => r.body) ); } @@ -242,8 +255,9 @@ export class ProductManagementService extends BaseService { * * This method sends `application/*+json` and handles request body of type `application/*+json`. */ - duplicate$Response(params: Duplicate$Params, context?: HttpContext): Observable> { - return duplicate(this.http, this.rootUrl, params, context); + duplicate$Response(params: Duplicate$Params, context?: HttpContext): Observable> { + const obs = duplicate(this.http, this.rootUrl, params, context); + return obs; } /** @@ -252,9 +266,10 @@ export class ProductManagementService extends BaseService { * * This method sends `application/*+json` and handles request body of type `application/*+json`. */ - duplicate(params: Duplicate$Params, context?: HttpContext): Observable { - return this.duplicate$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxAbstractionLayerProductsEndpointsProductModel => r.body) + duplicate(params: Duplicate$Params, context?: HttpContext): Observable { + const resp = this.duplicate$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): ProductModel => r.body) ); } @@ -268,7 +283,8 @@ export class ProductManagementService extends BaseService { * This method doesn't expect any request body. */ deleteType$Response(params: DeleteType$Params, context?: HttpContext): Observable> { - return deleteType(this.http, this.rootUrl, params, context); + const obs = deleteType(this.http, this.rootUrl, params, context); + return obs; } /** @@ -278,7 +294,8 @@ export class ProductManagementService extends BaseService { * This method doesn't expect any request body. */ deleteType(params: DeleteType$Params, context?: HttpContext): Observable { - return this.deleteType$Response(params, context).pipe( + const resp = this.deleteType$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): boolean => r.body) ); } @@ -292,8 +309,9 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getRecipes$Response(params: GetRecipes$Params, context?: HttpContext): Observable>> { - return getRecipes(this.http, this.rootUrl, params, context); + getRecipes$Response(params: GetRecipes$Params, context?: HttpContext): Observable>> { + const obs = getRecipes(this.http, this.rootUrl, params, context); + return obs; } /** @@ -302,9 +320,10 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getRecipes(params: GetRecipes$Params, context?: HttpContext): Observable> { - return this.getRecipes$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getRecipes(params: GetRecipes$Params, context?: HttpContext): Observable> { + const resp = this.getRecipes$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -317,8 +336,9 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getInstance$Response(params: GetInstance$Params, context?: HttpContext): Observable> { - return getInstance(this.http, this.rootUrl, params, context); + getInstance$Response(params: GetInstance$Params, context?: HttpContext): Observable> { + const obs = getInstance(this.http, this.rootUrl, params, context); + return obs; } /** @@ -327,9 +347,10 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getInstance(params: GetInstance$Params, context?: HttpContext): Observable { - return this.getInstance$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxAbstractionLayerProductsEndpointsProductInstanceModel => r.body) + getInstance(params: GetInstance$Params, context?: HttpContext): Observable { + const resp = this.getInstance$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): ProductInstanceModel => r.body) ); } @@ -342,8 +363,9 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getInstances$Response(params?: GetInstances$Params, context?: HttpContext): Observable>> { - return getInstances(this.http, this.rootUrl, params, context); + getInstances$Response(params?: GetInstances$Params, context?: HttpContext): Observable>> { + const obs = getInstances(this.http, this.rootUrl, params, context); + return obs; } /** @@ -352,9 +374,10 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getInstances(params?: GetInstances$Params, context?: HttpContext): Observable> { - return this.getInstances$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getInstances(params?: GetInstances$Params, context?: HttpContext): Observable> { + const resp = this.getInstances$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -368,7 +391,8 @@ export class ProductManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ saveInstance$Response(params?: SaveInstance$Params, context?: HttpContext): Observable> { - return saveInstance(this.http, this.rootUrl, params, context); + const obs = saveInstance(this.http, this.rootUrl, params, context); + return obs; } /** @@ -378,7 +402,8 @@ export class ProductManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ saveInstance(params?: SaveInstance$Params, context?: HttpContext): Observable { - return this.saveInstance$Response(params, context).pipe( + const resp = this.saveInstance$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } @@ -392,8 +417,9 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - createInstance$Response(params?: CreateInstance$Params, context?: HttpContext): Observable> { - return createInstance(this.http, this.rootUrl, params, context); + createInstance$Response(params?: CreateInstance$Params, context?: HttpContext): Observable> { + const obs = createInstance(this.http, this.rootUrl, params, context); + return obs; } /** @@ -402,9 +428,10 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - createInstance(params?: CreateInstance$Params, context?: HttpContext): Observable { - return this.createInstance$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxAbstractionLayerProductsEndpointsProductInstanceModel => r.body) + createInstance(params?: CreateInstance$Params, context?: HttpContext): Observable { + const resp = this.createInstance$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): ProductInstanceModel => r.body) ); } @@ -417,8 +444,9 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getRecipe$Response(params: GetRecipe$Params, context?: HttpContext): Observable> { - return getRecipe(this.http, this.rootUrl, params, context); + getRecipe$Response(params: GetRecipe$Params, context?: HttpContext): Observable> { + const obs = getRecipe(this.http, this.rootUrl, params, context); + return obs; } /** @@ -427,9 +455,10 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - getRecipe(params: GetRecipe$Params, context?: HttpContext): Observable { - return this.getRecipe$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxAbstractionLayerProductsEndpointsRecipeModel => r.body) + getRecipe(params: GetRecipe$Params, context?: HttpContext): Observable { + const resp = this.getRecipe$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): RecipeModel => r.body) ); } @@ -443,7 +472,8 @@ export class ProductManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ updateRecipe$Response(params: UpdateRecipe$Params, context?: HttpContext): Observable> { - return updateRecipe(this.http, this.rootUrl, params, context); + const obs = updateRecipe(this.http, this.rootUrl, params, context); + return obs; } /** @@ -453,7 +483,8 @@ export class ProductManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ updateRecipe(params: UpdateRecipe$Params, context?: HttpContext): Observable { - return this.updateRecipe$Response(params, context).pipe( + const resp = this.updateRecipe$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): number => r.body) ); } @@ -468,7 +499,8 @@ export class ProductManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ saveRecipe$Response(params?: SaveRecipe$Params, context?: HttpContext): Observable> { - return saveRecipe(this.http, this.rootUrl, params, context); + const obs = saveRecipe(this.http, this.rootUrl, params, context); + return obs; } /** @@ -478,7 +510,8 @@ export class ProductManagementService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ saveRecipe(params?: SaveRecipe$Params, context?: HttpContext): Observable { - return this.saveRecipe$Response(params, context).pipe( + const resp = this.saveRecipe$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): number => r.body) ); } @@ -492,8 +525,9 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - createRecipe$Response(params: CreateRecipe$Params, context?: HttpContext): Observable> { - return createRecipe(this.http, this.rootUrl, params, context); + createRecipe$Response(params: CreateRecipe$Params, context?: HttpContext): Observable> { + const obs = createRecipe(this.http, this.rootUrl, params, context); + return obs; } /** @@ -502,9 +536,10 @@ export class ProductManagementService extends BaseService { * * This method doesn't expect any request body. */ - createRecipe(params: CreateRecipe$Params, context?: HttpContext): Observable { - return this.createRecipe$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxAbstractionLayerProductsEndpointsRecipeModel => r.body) + createRecipe(params: CreateRecipe$Params, context?: HttpContext): Observable { + const resp = this.createRecipe$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): RecipeModel => r.body) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/services/workplan.service.ts b/src/Moryx.Orders.Web/src/app/api/services/workplan.service.ts index 2b72fdc0f..3e9a302b7 100644 --- a/src/Moryx.Orders.Web/src/app/api/services/workplan.service.ts +++ b/src/Moryx.Orders.Web/src/app/api/services/workplan.service.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ @@ -19,11 +18,11 @@ import { getVersions } from '../fn/workplan/get-versions'; import { GetVersions$Params } from '../fn/workplan/get-versions'; import { getWorkplan } from '../fn/workplan/get-workplan'; import { GetWorkplan$Params } from '../fn/workplan/get-workplan'; -import { WorkplanModel as MoryxAbstractionLayerProductsEndpointsWorkplanModel } from '../models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model'; import { saveWorkplan } from '../fn/workplan/save-workplan'; import { SaveWorkplan$Params } from '../fn/workplan/save-workplan'; import { updateWorkplan } from '../fn/workplan/update-workplan'; import { UpdateWorkplan$Params } from '../fn/workplan/update-workplan'; +import { WorkplanModel } from '../models/workplan-model'; @Injectable({ providedIn: 'root' }) export class WorkplanService extends BaseService { @@ -40,8 +39,9 @@ export class WorkplanService extends BaseService { * * This method doesn't expect any request body. */ - getAllWorkplans$Response(params?: GetAllWorkplans$Params, context?: HttpContext): Observable>> { - return getAllWorkplans(this.http, this.rootUrl, params, context); + getAllWorkplans$Response(params?: GetAllWorkplans$Params, context?: HttpContext): Observable>> { + const obs = getAllWorkplans(this.http, this.rootUrl, params, context); + return obs; } /** @@ -50,9 +50,10 @@ export class WorkplanService extends BaseService { * * This method doesn't expect any request body. */ - getAllWorkplans(params?: GetAllWorkplans$Params, context?: HttpContext): Observable> { - return this.getAllWorkplans$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getAllWorkplans(params?: GetAllWorkplans$Params, context?: HttpContext): Observable> { + const resp = this.getAllWorkplans$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -66,7 +67,8 @@ export class WorkplanService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ saveWorkplan$Response(params?: SaveWorkplan$Params, context?: HttpContext): Observable> { - return saveWorkplan(this.http, this.rootUrl, params, context); + const obs = saveWorkplan(this.http, this.rootUrl, params, context); + return obs; } /** @@ -76,7 +78,8 @@ export class WorkplanService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ saveWorkplan(params?: SaveWorkplan$Params, context?: HttpContext): Observable { - return this.saveWorkplan$Response(params, context).pipe( + const resp = this.saveWorkplan$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } @@ -90,8 +93,9 @@ export class WorkplanService extends BaseService { * * This method doesn't expect any request body. */ - getVersions$Response(params: GetVersions$Params, context?: HttpContext): Observable>> { - return getVersions(this.http, this.rootUrl, params, context); + getVersions$Response(params: GetVersions$Params, context?: HttpContext): Observable>> { + const obs = getVersions(this.http, this.rootUrl, params, context); + return obs; } /** @@ -100,9 +104,10 @@ export class WorkplanService extends BaseService { * * This method doesn't expect any request body. */ - getVersions(params: GetVersions$Params, context?: HttpContext): Observable> { - return this.getVersions$Response(params, context).pipe( - map((r: StrictHttpResponse>): Array => r.body) + getVersions(params: GetVersions$Params, context?: HttpContext): Observable> { + const resp = this.getVersions$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse>): Array => r.body) ); } @@ -115,8 +120,9 @@ export class WorkplanService extends BaseService { * * This method doesn't expect any request body. */ - getWorkplan$Response(params: GetWorkplan$Params, context?: HttpContext): Observable> { - return getWorkplan(this.http, this.rootUrl, params, context); + getWorkplan$Response(params: GetWorkplan$Params, context?: HttpContext): Observable> { + const obs = getWorkplan(this.http, this.rootUrl, params, context); + return obs; } /** @@ -125,9 +131,10 @@ export class WorkplanService extends BaseService { * * This method doesn't expect any request body. */ - getWorkplan(params: GetWorkplan$Params, context?: HttpContext): Observable { - return this.getWorkplan$Response(params, context).pipe( - map((r: StrictHttpResponse): MoryxAbstractionLayerProductsEndpointsWorkplanModel => r.body) + getWorkplan(params: GetWorkplan$Params, context?: HttpContext): Observable { + const resp = this.getWorkplan$Response(params, context); + return resp.pipe( + map((r: StrictHttpResponse): WorkplanModel => r.body) ); } @@ -141,7 +148,8 @@ export class WorkplanService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ updateWorkplan$Response(params: UpdateWorkplan$Params, context?: HttpContext): Observable> { - return updateWorkplan(this.http, this.rootUrl, params, context); + const obs = updateWorkplan(this.http, this.rootUrl, params, context); + return obs; } /** @@ -151,7 +159,8 @@ export class WorkplanService extends BaseService { * This method sends `application/*+json` and handles request body of type `application/*+json`. */ updateWorkplan(params: UpdateWorkplan$Params, context?: HttpContext): Observable { - return this.updateWorkplan$Response(params, context).pipe( + const resp = this.updateWorkplan$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } @@ -166,7 +175,8 @@ export class WorkplanService extends BaseService { * This method doesn't expect any request body. */ deleteWorkplan$Response(params: DeleteWorkplan$Params, context?: HttpContext): Observable> { - return deleteWorkplan(this.http, this.rootUrl, params, context); + const obs = deleteWorkplan(this.http, this.rootUrl, params, context); + return obs; } /** @@ -176,7 +186,8 @@ export class WorkplanService extends BaseService { * This method doesn't expect any request body. */ deleteWorkplan(params: DeleteWorkplan$Params, context?: HttpContext): Observable { - return this.deleteWorkplan$Response(params, context).pipe( + const resp = this.deleteWorkplan$Response(params, context); + return resp.pipe( map((r: StrictHttpResponse): void => r.body) ); } diff --git a/src/Moryx.Orders.Web/src/app/api/strict-http-response.ts b/src/Moryx.Orders.Web/src/app/api/strict-http-response.ts index b3fa5fbcb..174f119c9 100644 --- a/src/Moryx.Orders.Web/src/app/api/strict-http-response.ts +++ b/src/Moryx.Orders.Web/src/app/api/strict-http-response.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /* Code generated by ng-openapi-gen DO NOT EDIT. */ diff --git a/src/Moryx.Orders.Web/src/app/components/operation-documents/operation-documents.component.ts b/src/Moryx.Orders.Web/src/app/components/operation-documents/operation-documents.component.ts index 8fa6112f4..3bf8bfbf1 100644 --- a/src/Moryx.Orders.Web/src/app/components/operation-documents/operation-documents.component.ts +++ b/src/Moryx.Orders.Web/src/app/components/operation-documents/operation-documents.component.ts @@ -13,8 +13,8 @@ import { EmptyStateComponent, MoryxSnackbarService } from '@moryx/ngx-web-framew import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { NgxDocViewerModule } from 'ngx-doc-viewer'; import { BehaviorSubject } from 'rxjs'; -import { DocumentModel } from 'src/app/api/models/Moryx/Orders/Endpoints/document-model'; -import { OperationModel } from 'src/app/api/models/Moryx/Orders/Endpoints/operation-model'; +import { DocumentModel } from "../../api/models"; +import { OperationModel } from "../../api/models"; import { OrderManagementService } from 'src/app/api/services'; import { TranslationConstants } from 'src/app/extensions/translation-constants.extensions'; import { environment } from 'src/environments/environment'; diff --git a/src/Moryx.Orders.Web/src/app/components/operation-recipes/operation-recipes.component.ts b/src/Moryx.Orders.Web/src/app/components/operation-recipes/operation-recipes.component.ts index 597eec551..c6b272631 100644 --- a/src/Moryx.Orders.Web/src/app/components/operation-recipes/operation-recipes.component.ts +++ b/src/Moryx.Orders.Web/src/app/components/operation-recipes/operation-recipes.component.ts @@ -14,10 +14,10 @@ import { ProductManagementService, } from "../../api/services"; import { WorkplanService } from "../../api/services/workplan.service"; -import { RecipeClassificationModel } from "src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-classification-model"; -import { RecipeModel } from "src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model"; -import { WorkplanModel } from "src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/workplan-model"; -import { OperationModel } from "src/app/api/models/Moryx/Orders/Endpoints/operation-model"; +import { RecipeClassificationModel } from "../../api/models"; +import { RecipeModel } from "../../api/models"; +import { WorkplanModel } from "../../api/models"; +import { OperationModel } from "../../api/models"; import { MatProgressBarModule } from "@angular/material/progress-bar"; import { MatSidenavModule } from "@angular/material/sidenav"; import { MatToolbarModule } from "@angular/material/toolbar"; @@ -164,7 +164,6 @@ export class OperationRecipesComponent implements OnInit { this.isEditMode.update((_) => false); this.isLoading.update((_) => true); this.selectedRecipe.update((item) => { - item!.workplanId = this.selectedWorkplan()!.id!; item!.workplanModel = this.selectedWorkplan(); return item; }); diff --git a/src/Moryx.Orders.Web/src/app/components/operations/log-message-list/log-message-list.component.ts b/src/Moryx.Orders.Web/src/app/components/operations/log-message-list/log-message-list.component.ts index 1834c7959..8d2f65c73 100644 --- a/src/Moryx.Orders.Web/src/app/components/operations/log-message-list/log-message-list.component.ts +++ b/src/Moryx.Orders.Web/src/app/components/operations/log-message-list/log-message-list.component.ts @@ -3,8 +3,8 @@ import { Component, effect, input, Input, OnInit, signal, untracked } from '@ang import { MatExpansionModule } from '@angular/material/expansion'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { delay, tap } from 'rxjs'; -import { LogLevel } from 'src/app/api/models/Microsoft/Extensions/Logging/log-level'; -import { OperationLogMessageModel } from 'src/app/api/models/Moryx/Orders/Endpoints/operation-log-message-model'; +import { LogLevel } from '../../../api/models'; +import { OperationLogMessageModel } from '../../../api/models'; import { OrderManagementService } from 'src/app/api/services'; import { TranslationConstants } from 'src/app/extensions/translation-constants.extensions'; diff --git a/src/Moryx.Orders.Web/src/app/components/operations/operations.component.ts b/src/Moryx.Orders.Web/src/app/components/operations/operations.component.ts index 9536cd7dd..06cb9db1e 100644 --- a/src/Moryx.Orders.Web/src/app/components/operations/operations.component.ts +++ b/src/Moryx.Orders.Web/src/app/components/operations/operations.component.ts @@ -15,11 +15,11 @@ import { CreateDialogComponent } from '../../dialogs/create-dialog/create-dialog import { ReportDialogComponent, ReportDialogData } from '../../dialogs/report-dialog/report-dialog.component'; import '../../extensions/observable.extensions'; import { OperationViewModel } from '../../models/operation-view-model'; -import { OperationModel } from 'src/app/api/models/Moryx/Orders/Endpoints/operation-model'; -import { ReportModel } from 'src/app/api/models/Moryx/Orders/Endpoints/report-model'; -import { OperationClassification } from 'src/app/api/models/Moryx/Orders/operation-classification'; -import { ReportContext } from 'src/app/api/models/Moryx/Orders/report-context'; -import { LogLevel } from 'src/app/api/models/Microsoft/Extensions/Logging/log-level'; +import { OperationModel } from '../../api/models'; +import { ReportModel } from '../../api/models'; +import { OperationClassification } from '../../api/models'; +import { ReportContext } from '../../api/models'; +import { LogLevel } from '../../api/models'; import { MediaMatcher } from '@angular/cdk/layout'; import { DrawerContent } from './drawer-content'; import { CommonModule } from '@angular/common'; @@ -200,7 +200,7 @@ export class OperationsComponent implements OnInit, OnDestroy { private submitInterruption(guid: string, body: ReportModel): Observable { return this.orderManagementService.interruptOperation({ guid: guid, - body: body, + // body: body, }); } diff --git a/src/Moryx.Orders.Web/src/app/components/operations/part-list/part-list.component.ts b/src/Moryx.Orders.Web/src/app/components/operations/part-list/part-list.component.ts index b0f6f5043..bacca592e 100644 --- a/src/Moryx.Orders.Web/src/app/components/operations/part-list/part-list.component.ts +++ b/src/Moryx.Orders.Web/src/app/components/operations/part-list/part-list.component.ts @@ -3,7 +3,7 @@ import { HttpErrorResponse } from '@angular/common/http'; import { Component, input, OnInit, signal } from '@angular/core'; import { MoryxSnackbarService } from '@moryx/ngx-web-framework'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { ProductPartModel } from 'src/app/api/models/Moryx/Orders/Endpoints/product-part-model'; +import { ProductPartModel } from '../../../api/models'; import { OrderManagementService } from 'src/app/api/services'; import { TranslationConstants } from 'src/app/extensions/translation-constants.extensions'; import { OperationViewModel } from 'src/app/models/operation-view-model'; diff --git a/src/Moryx.Orders.Web/src/app/dialogs/begin-dialog/begin-dialog.component.ts b/src/Moryx.Orders.Web/src/app/dialogs/begin-dialog/begin-dialog.component.ts index 3671fefb7..5c9a44273 100644 --- a/src/Moryx.Orders.Web/src/app/dialogs/begin-dialog/begin-dialog.component.ts +++ b/src/Moryx.Orders.Web/src/app/dialogs/begin-dialog/begin-dialog.component.ts @@ -1,16 +1,16 @@ import { Component, computed, Inject, OnInit, signal, WritableSignal } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { BeginModel } from 'src/app/api/models/Moryx/Orders/Endpoints/begin-model'; +import { BeginModel } from '../../api/models'; import { TranslationConstants } from 'src/app/extensions/translation-constants.extensions'; import { OperationViewModel } from 'src/app/models/operation-view-model'; import { FormControl, FormsModule, ReactiveFormsModule, ValidationErrors, Validators } from '@angular/forms'; -import { RestrictionDescription } from 'src/app/api/models/Moryx/Orders/Restrictions/restriction-description'; +import { RestrictionDescription } from '../../api/models'; import { OperatorsService } from 'src/app/services/operators.service'; -import { AssignableOperator } from 'src/app/api/models/Moryx/Operators/assignable-operator'; +import { AssignableOperator } from '../../api/models'; import { map, Observable, startWith } from 'rxjs'; -import { BeginContext } from 'src/app/api/models/Moryx/Orders/begin-context'; -import { OperationClassification } from 'src/app/api/models/Moryx/Orders/operation-classification'; +import { BeginContext } from '../../api/models'; +import { OperationClassification } from '../../api/models'; import { CommonModule } from '@angular/common'; import { MatCardModule } from '@angular/material/card'; import { MatListModule } from '@angular/material/list'; diff --git a/src/Moryx.Orders.Web/src/app/dialogs/create-dialog/create-dialog.component.ts b/src/Moryx.Orders.Web/src/app/dialogs/create-dialog/create-dialog.component.ts index 5622cb7fc..05ea0386a 100644 --- a/src/Moryx.Orders.Web/src/app/dialogs/create-dialog/create-dialog.component.ts +++ b/src/Moryx.Orders.Web/src/app/dialogs/create-dialog/create-dialog.component.ts @@ -19,14 +19,14 @@ import { TranslationConstants } from "src/app/extensions/translation-constants.e import { OperationNumberValidations } from "src/app/validations/operationNumberValidations"; import { OrderManagementService } from "../../api/services/order-management.service"; import { ProductManagementService } from "../../api/services/product-management.service"; -import { ProductModel } from "src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/product-model"; -import { RecipeClassificationModel } from "src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-classification-model"; -import { RecipeModel } from "src/app/api/models/Moryx/AbstractionLayer/Products/Endpoints/recipe-model"; -import { ProductQuery } from "src/app/api/models/Moryx/AbstractionLayer/Products/product-query"; -import { RecipeFilter } from "src/app/api/models/Moryx/AbstractionLayer/Products/recipe-filter"; -import { RevisionFilter } from "src/app/api/models/Moryx/AbstractionLayer/Products/revision-filter"; -import { OperationCreationContextModel } from "src/app/api/models/Moryx/Orders/Endpoints/Models/operation-creation-context-model"; -import { OperationRecipeModel } from "src/app/api/models/Moryx/Orders/Endpoints/operation-recipe-model"; +import { ProductModel } from '../../api/models'; +import { RecipeClassificationModel } from '../../api/models'; +import { RecipeModel } from '../../api/models'; +import { ProductQuery } from '../../api/models'; +import { RecipeFilter } from '../../api/models'; +import { RevisionFilter } from '../../api/models'; +import { OperationCreationContextModel } from '../../api/models'; +import { OperationRecipeModel } from '../../api/models'; import { MatFormFieldModule } from "@angular/material/form-field"; import { MatButtonModule } from "@angular/material/button"; import { MatSelectModule } from "@angular/material/select"; diff --git a/src/Moryx.Orders.Web/src/app/dialogs/report-dialog/report-dialog.component.ts b/src/Moryx.Orders.Web/src/app/dialogs/report-dialog/report-dialog.component.ts index 06eb37f8d..257a8f087 100644 --- a/src/Moryx.Orders.Web/src/app/dialogs/report-dialog/report-dialog.component.ts +++ b/src/Moryx.Orders.Web/src/app/dialogs/report-dialog/report-dialog.component.ts @@ -8,9 +8,9 @@ import { TranslateModule, TranslateService } from "@ngx-translate/core"; import { Observable } from "rxjs"; import { TranslationConstants } from "src/app/extensions/translation-constants.extensions"; import { OperationViewModel } from "../../models/operation-view-model"; -import { ConfirmationType } from "src/app/api/models/Moryx/Orders/confirmation-type"; -import { ReportModel } from "src/app/api/models/Moryx/Orders/Endpoints/report-model"; -import { ReportContext } from "src/app/api/models/Moryx/Orders/report-context"; +import { ConfirmationType } from '../../api/models'; +import { ReportModel } from '../../api/models'; +import { ReportContext } from '../../api/models'; import { CommonModule } from "@angular/common"; import { MatGridListModule } from "@angular/material/grid-list"; import { MatFormFieldModule } from "@angular/material/form-field"; diff --git a/src/Moryx.Orders.Web/src/app/models/operation-models.ts b/src/Moryx.Orders.Web/src/app/models/operation-models.ts index 8184448e5..ada6075eb 100644 --- a/src/Moryx.Orders.Web/src/app/models/operation-models.ts +++ b/src/Moryx.Orders.Web/src/app/models/operation-models.ts @@ -1,6 +1,6 @@ -import { AdviceModel } from "../api/models/Moryx/Orders/Endpoints/advice-model"; -import { OperationModel } from "../api/models/Moryx/Orders/Endpoints/operation-model"; -import { ReportModel } from "../api/models/Moryx/Orders/Endpoints/report-model"; +import { AdviceModel } from '../api/models'; +import { OperationModel } from '../api/models'; +import { ReportModel } from '../api/models'; export class OperationChangedModelBase { diff --git a/src/Moryx.Orders.Web/src/app/models/operation-view-model.ts b/src/Moryx.Orders.Web/src/app/models/operation-view-model.ts index 9d35d602a..84432f54d 100644 --- a/src/Moryx.Orders.Web/src/app/models/operation-view-model.ts +++ b/src/Moryx.Orders.Web/src/app/models/operation-view-model.ts @@ -1,5 +1,5 @@ -import { OperationModel } from "../api/models/Moryx/Orders/Endpoints/operation-model"; -import { OperationClassification } from "../api/models/Moryx/Orders/operation-classification"; +import { OperationModel } from '../api/models'; +import { OperationClassification } from '../api/models'; export class OperationViewModel{ model: OperationModel; diff --git a/src/Moryx.Orders.Web/src/app/services/operation.service.ts b/src/Moryx.Orders.Web/src/app/services/operation.service.ts index b2219e017..7c901ffb6 100644 --- a/src/Moryx.Orders.Web/src/app/services/operation.service.ts +++ b/src/Moryx.Orders.Web/src/app/services/operation.service.ts @@ -1,6 +1,6 @@ import { Injectable, NgZone } from '@angular/core'; import { ApiConfiguration } from 'src/app/api/api-configuration'; -import { OperationModel } from 'src/app/api/models/Moryx/Orders/Endpoints/operation-model'; +import { OperationModel } from '../api/models'; import { OperationAdvicedModel, OperationReportedModel, OperationStartedModel, OperationType } from 'src/app/models/operation-models'; @Injectable({ diff --git a/src/Moryx.Orders.Web/src/app/services/operators.service.ts b/src/Moryx.Orders.Web/src/app/services/operators.service.ts index 41b901035..cf6617e85 100644 --- a/src/Moryx.Orders.Web/src/app/services/operators.service.ts +++ b/src/Moryx.Orders.Web/src/app/services/operators.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { OperatorManagementService } from '../api/services'; -import { AssignableOperator } from '../api/models/Moryx/Operators/assignable-operator'; -import { OperatorModel } from '../api/models/Moryx/Operators/Endpoints/operator-model'; +import { AssignableOperator } from '../api/models'; +import { OperatorModel } from '../api/models'; @Injectable({ providedIn: 'root', From c5a2b410b80e9dc7a8b7108ad8a87dfa0bd3b75b Mon Sep 17 00:00:00 2001 From: Marcel Vielhaus Date: Tue, 18 Nov 2025 12:33:59 +0100 Subject: [PATCH 07/10] Seperate Interruption and Report dialog --- .../operations/operations.component.ts | 15 ++---- .../begin-dialog/begin-dialog.component.html | 2 +- .../create-dialog.component.html | 2 +- .../interrupt-dialog/interrupt-dialog-data.ts | 8 +++ .../interrupt-dialog.component.html | 24 +++++++++ .../interrupt-dialog.component.scss | 34 +++++++++++++ .../interrupt-dialog.component.spec.ts | 25 +++++++++ .../interrupt-dialog.component.ts | 51 +++++++++++++++++++ .../report-dialog.component.html | 8 +-- .../report-dialog/report-dialog.component.ts | 7 ++- .../translation-constants.extensions.ts | 12 +++-- .../src/assets/languages/de.json | 9 ++-- .../src/assets/languages/en.json | 13 ++--- .../src/assets/languages/it.json | 13 ++--- .../src/assets/languages/zh.json | 13 ++--- 15 files changed, 190 insertions(+), 46 deletions(-) create mode 100644 src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog-data.ts create mode 100644 src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.html create mode 100644 src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.scss create mode 100644 src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.spec.ts create mode 100644 src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.ts diff --git a/src/Moryx.Orders.Web/src/app/components/operations/operations.component.ts b/src/Moryx.Orders.Web/src/app/components/operations/operations.component.ts index 06cb9db1e..cd6b2cc33 100644 --- a/src/Moryx.Orders.Web/src/app/components/operations/operations.component.ts +++ b/src/Moryx.Orders.Web/src/app/components/operations/operations.component.ts @@ -13,6 +13,8 @@ import { OrderManagementService } from '../../api/services/order-management.serv import { BeginDialogComponent, BeginDialogData } from '../../dialogs/begin-dialog/begin-dialog.component'; import { CreateDialogComponent } from '../../dialogs/create-dialog/create-dialog.component'; import { ReportDialogComponent, ReportDialogData } from '../../dialogs/report-dialog/report-dialog.component'; +import { InterruptDialogComponent } from '../../dialogs/interrupt-dialog/interrupt-dialog.component'; +import { InterruptDialogData } from '../../dialogs/interrupt-dialog/interrupt-dialog-data'; import '../../extensions/observable.extensions'; import { OperationViewModel } from '../../models/operation-view-model'; import { OperationModel } from '../../api/models'; @@ -183,24 +185,17 @@ export class OperationsComponent implements OnInit, OnDestroy { } onInterrupt(operation: OperationViewModel) { - this.dialog.open(ReportDialogComponent, { - data: { + this.dialog.open(InterruptDialogComponent, { + data: { operation: operation, - isReport: false, - onGetContext: this.getInterruptContext.bind(this), onSubmit: this.submitInterruption.bind(this), }, }); } - private getInterruptContext(guid: string): Observable { - return this.orderManagementService.getInterruptContext({ guid: guid }); - } - - private submitInterruption(guid: string, body: ReportModel): Observable { + private submitInterruption(guid: string): Observable { return this.orderManagementService.interruptOperation({ guid: guid, - // body: body, }); } diff --git a/src/Moryx.Orders.Web/src/app/dialogs/begin-dialog/begin-dialog.component.html b/src/Moryx.Orders.Web/src/app/dialogs/begin-dialog/begin-dialog.component.html index 96cdc0187..d93a0dab0 100644 --- a/src/Moryx.Orders.Web/src/app/dialogs/begin-dialog/begin-dialog.component.html +++ b/src/Moryx.Orders.Web/src/app/dialogs/begin-dialog/begin-dialog.component.html @@ -254,7 +254,7 @@

diff --git a/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog-data.ts b/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog-data.ts new file mode 100644 index 000000000..c8802757a --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog-data.ts @@ -0,0 +1,8 @@ +import { Observable } from "rxjs"; +import { OperationViewModel } from "src/app/models/operation-view-model"; + + +export interface InterruptDialogData { + operation: OperationViewModel; + onSubmit: (guid: string, user: string | undefined) => Observable; +} diff --git a/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.html b/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.html new file mode 100644 index 000000000..800ac6be8 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.html @@ -0,0 +1,24 @@ +

+ {{ TranslationConstants.INTERRUPT_DIALOG.TITLE | translate }} + {{ data.operation.model.order }} - {{ data.operation.model.number }} +

+ +

+ {{ TranslationConstants.INTERRUPT_DIALOG.PROMPT | translate }} +

+ + + + + + +
+ + +
diff --git a/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.scss b/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.scss new file mode 100644 index 000000000..3367897c8 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.scss @@ -0,0 +1,34 @@ +.amounts-list { + min-width: 450px; +} +.amounts-data-entry { + position: absolute; + left: 0px; + font-size: 16px; +} + +mat-form-field { + margin-bottom: 8px; +} + +.interrupt-dialog-comment { + width: 100%; +} + +.mat-radio-button ~ .mat-radio-button { + margin-left: 16px; +} + +.interrupt-dialog-report-success-count { + width: 100%; + margin-right: 4px; +} + +.interrupt-dialog-report-failure-count { + width: 100%; + margin-left: 4px; +} + +.interrupt-dialog-title { + margin-left: -5px; +} \ No newline at end of file diff --git a/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.spec.ts b/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.spec.ts new file mode 100644 index 000000000..8cb4a84e2 --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ReportDialogComponent } from './interrupt-dialog.component'; + +describe('InterruptDialogComponent', () => { + let component: ReportDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ReportDialogComponent] +}) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ReportDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + xit('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.ts b/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.ts new file mode 100644 index 000000000..500410edc --- /dev/null +++ b/src/Moryx.Orders.Web/src/app/dialogs/interrupt-dialog/interrupt-dialog.component.ts @@ -0,0 +1,51 @@ +import { Component, Inject, signal } from "@angular/core"; +import { + MatDialogRef, + MAT_DIALOG_DATA, + MatDialogModule, +} from "@angular/material/dialog"; +import { TranslateModule, TranslateService } from "@ngx-translate/core"; +import { TranslationConstants } from "src/app/extensions/translation-constants.extensions"; +import { CommonModule } from "@angular/common"; +import { MatProgressBarModule } from "@angular/material/progress-bar"; +import { MatButtonModule } from "@angular/material/button"; +import { InterruptDialogData } from "./interrupt-dialog-data"; + +@Component({ + selector: "app-interrupt-dialog", + templateUrl: "./interrupt-dialog.component.html", + styleUrls: ["./interrupt-dialog.component.scss"], + standalone: true, + imports: [ + CommonModule, + MatDialogModule, + TranslateModule, + MatProgressBarModule, + MatButtonModule + ], +}) +export class InterruptDialogComponent { + + isLoading = signal(false); + TranslationConstants = TranslationConstants; + + constructor( + private dialog: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: InterruptDialogData, + public translate: TranslateService + ) {} + + async submit(): Promise { + this.isLoading.update(_=> true); + let failed = false; + + await this.data + .onSubmit(this.data.operation.model.identifier!, undefined) + .toAsync() + .catch(() => { + failed = true; + this.isLoading.update(_=> false); + }); + if (!failed) this.dialog.close(); + } +} diff --git a/src/Moryx.Orders.Web/src/app/dialogs/report-dialog/report-dialog.component.html b/src/Moryx.Orders.Web/src/app/dialogs/report-dialog/report-dialog.component.html index 4fb1c77b9..a682b2bf0 100644 --- a/src/Moryx.Orders.Web/src/app/dialogs/report-dialog/report-dialog.component.html +++ b/src/Moryx.Orders.Web/src/app/dialogs/report-dialog/report-dialog.component.html @@ -1,5 +1,5 @@

- {{ (data.isReport ? TranslationConstants.REPORT_DIALOG.REPORT_TITLE : TranslationConstants.REPORT_DIALOG.INTERRUPT_TITLE) | translate }} + {{ TranslationConstants.REPORT_DIALOG.REPORT_TITLE | translate }}

@@ -132,13 +132,13 @@

{{ TranslationConstants.REPORT_DIALOG.CONFIRMATION | translate }}
diff --git a/src/Moryx.Orders.Web/src/app/dialogs/report-dialog/report-dialog.component.ts b/src/Moryx.Orders.Web/src/app/dialogs/report-dialog/report-dialog.component.ts index 257a8f087..edd1d677d 100644 --- a/src/Moryx.Orders.Web/src/app/dialogs/report-dialog/report-dialog.component.ts +++ b/src/Moryx.Orders.Web/src/app/dialogs/report-dialog/report-dialog.component.ts @@ -49,7 +49,7 @@ export class ReportDialogComponent implements OnInit { confirmationType = signal(""); estimatedSuccess = computed(() => this.success() + (this.context()?.reportedSuccess ?? 0)); estimatedFailure = computed(() => this.scrap() + (this.context()?.reportedFailure ?? 0)); - canInterrupt = computed(() => { + canReport = computed(() => { if (this.success() < 0 || this.scrap() < 0) return false; if (this.confirmationType() == "partial" && !this.context()?.canPartial) @@ -74,8 +74,8 @@ export class ReportDialogComponent implements OnInit { .onGetContext(this.data.operation.model.identifier!) .toAsync(); this.context.update(_=> result); - this.success.update(_=> this.data.isReport ? this.context()?.unreportedSuccess! : 0); - this.scrap.update(_=> this.data.isReport ? this.context()?.unreportedFailure! : 0); + this.success.update(_=> this.context()?.unreportedSuccess ?? 0); + this.scrap.update(_=> this.context()?.unreportedFailure ?? 0); this.isLoading.update(_=> false); if (this.context()?.canPartial) this.confirmationType.update(_=> "partial"); else this.confirmationType.update(_=> "final"); @@ -107,7 +107,6 @@ export class ReportDialogComponent implements OnInit { } export interface ReportDialogData { - isReport: boolean; operation: OperationViewModel; onSubmit: (guid: string, body: ReportModel) => Observable; onGetContext: (guid: string) => Observable; diff --git a/src/Moryx.Orders.Web/src/app/extensions/translation-constants.extensions.ts b/src/Moryx.Orders.Web/src/app/extensions/translation-constants.extensions.ts index 907f94c15..58367cc25 100644 --- a/src/Moryx.Orders.Web/src/app/extensions/translation-constants.extensions.ts +++ b/src/Moryx.Orders.Web/src/app/extensions/translation-constants.extensions.ts @@ -73,9 +73,7 @@ export class TranslationConstants { public static readonly REPORT_DIALOG = { REPORT_TITLE: 'REPORT_DIALOG.REPORT_TITLE', - INTERRUPT_TITLE: 'REPORT_DIALOG.INTERRUPT_TITLE', REPORT: 'REPORT_DIALOG.REPORT', - INTERRUPT: 'REPORT_DIALOG.INTERRUPT', OPERATION: 'REPORT_DIALOG.OPERATION', ORDER: 'REPORT_DIALOG.ORDER', PRODUCT: 'REPORT_DIALOG.PRODUCT', @@ -90,7 +88,11 @@ export class TranslationConstants { CONFIRMATION: 'REPORT_DIALOG.CONFIRMATION', PARTIAL: 'REPORT_DIALOG.PARTIAL', FINAL: 'REPORT_DIALOG.FINAL', - CANCEL: 'REPORT_DIALOG.CANCEL', + }; + + public static readonly INTERRUPT_DIALOG = { + TITLE: 'INTERRUPT_DIALOG.TITLE', + PROMPT: 'INTERRUPT_DIALOG.PROMPT', }; public static readonly CREATE_DIALOG = { @@ -103,7 +105,6 @@ export class TranslationConstants { RECIPE: 'CREATE_DIALOG.RECIPE', AMOUNT: 'CREATE_DIALOG.AMOUNT', ADDED_OPERATIONS: 'CREATE_DIALOG.ADDED_OPERATIONS', - CANCEL: 'CREATE_DIALOG.CANCEL', CLEAR: 'CREATE_DIALOG.CLEAR', CREATE: 'CREATE_DIALOG.CREATE', ADD: 'CREATE_DIALOG.ADD', @@ -128,7 +129,6 @@ export class TranslationConstants { OVERDELIVERY: 'BEGIN_DIALOG.OVERDELIVERY', UNDERDELIVERY: 'BEGIN_DIALOG.UNDERDELIVERY', PARTIAL_AMOUNT: 'BEGIN_DIALOG.PARTIAL_AMOUNT', - CANCEL: 'BEGIN_DIALOG.CANCEL', BEGIN: 'BEGIN_DIALOG.BEGIN', OPERATOR_SELECTION_LABEL: 'BEGIN_DIALOG.OPERATOR_SELECTION_LABEL', OPERATOR_SELECTION_PLACEHOLDER: 'BEGIN_DIALOG.OPERATOR_SELECTION_PLACEHOLDER', @@ -136,4 +136,6 @@ export class TranslationConstants { }; public static readonly DISMISS = 'DISMISS'; + public static readonly CANCEL = 'CANCEL'; + public static readonly CONFIRM = 'CONFIRM'; } diff --git a/src/Moryx.Orders.Web/src/assets/languages/de.json b/src/Moryx.Orders.Web/src/assets/languages/de.json index 76e844a8c..285c264f3 100644 --- a/src/Moryx.Orders.Web/src/assets/languages/de.json +++ b/src/Moryx.Orders.Web/src/assets/languages/de.json @@ -79,7 +79,10 @@ "CONFIRMATION": "Rückmeldeart", "PARTIAL": "Teilrückmelden", "FINAL": "Endrückmelden", - "CANCEL": "ABBRECHEN" + }, + "INTERRUPT_DIALOG": { + "TITLE": "Vorgang unterbrechen", + "PROMPT": "Es werden keine neuen Prozesse für den Vorgang gestartet. Bereits gestartete Prozesse werden normal beendet und anschließend wechselt der Status des Vorgangs zu 'Unterbrochen'." }, "CREATE_DIALOG": { "TITLE": "Neuer Auftrag", @@ -91,7 +94,6 @@ "RECIPE": "Rezept", "AMOUNT": "Menge", "ADDED_OPERATIONS": "Hinzugefügte Vorgänge", - "CANCEL": "ABBRECHEN", "CLEAR": "ZURÜCKSETZEN", "CREATE": "ERSTELLEN", "ADD": "HINZUFÜGEN", @@ -109,7 +111,6 @@ "OVERDELIVERY": "Überlieferung", "UNDERDELIVERY": "Unterlieferung", "PARTIAL_AMOUNT": "Zielmenge", - "CANCEL": "ABBRECHEN", "BEGIN": "BEGINNEN", "OPERATOR_SELECTION_LABEL": "Bediener", "OPERATOR_SELECTION_PLACEHOLDER": "(Optional) Wählen Sie einen Bediener", @@ -121,6 +122,8 @@ "CANNOT_REDUCE_TARGET_AMOUNT": "Die Zielmenge kann nicht weiter reduziert werden" }, "DISMISS": "OKAY", + "CANCEL": "ABBRECHEN", + "CONFIRM": "BESTÄTIGEN", "DEFAULT_MESSAGE": "Auf dem Server ist etwas schief gelaufen.", "SERVER_NOT_REACHABLE": "Der Server ist nicht erreichbar, bitte überprüfe deine Internetverbindung oder Proxy-Einstellungen." } diff --git a/src/Moryx.Orders.Web/src/assets/languages/en.json b/src/Moryx.Orders.Web/src/assets/languages/en.json index fbf1ff3a5..694282c87 100644 --- a/src/Moryx.Orders.Web/src/assets/languages/en.json +++ b/src/Moryx.Orders.Web/src/assets/languages/en.json @@ -62,9 +62,7 @@ }, "REPORT_DIALOG": { "REPORT_TITLE": "Report Operation", - "INTERRUPT_TITLE": "Interrupt Operation", "REPORT": "REPORT", - "INTERRUPT": "INTERRUPT", "OPERATION": "Operation", "ORDER": "Order", "PRODUCT": "Product", @@ -78,8 +76,11 @@ "COMMENT": "Comment", "CONFIRMATION": "Confirmation", "PARTIAL": "Partial", - "FINAL": "Final", - "CANCEL": "CANCEL" + "FINAL": "Final" + }, + "INTERRUPT_DIALOG": { + "TITLE": "Interrupt Operation", + "PROMPT": "No new processes are started for the operation. Processes that have already been started are completed normally and the status of the operation then changes to 'Interrupted'." }, "CREATE_DIALOG": { "TITLE": "New Order", @@ -91,7 +92,6 @@ "RECIPE": "Recipe", "AMOUNT": "Amount", "ADDED_OPERATIONS": "Added Operations", - "CANCEL": "CANCEL", "CLEAR": "CLEAR", "CREATE": "CREATE", "ADD": "ADD", @@ -109,7 +109,6 @@ "OVERDELIVERY": "Overdelivery", "UNDERDELIVERY": "Underdelivery", "PARTIAL_AMOUNT": "Target Amount", - "CANCEL": "CANCEL", "BEGIN": "BEGIN", "OPERATOR_SELECTION_LABEL": "Operator", "OPERATOR_SELECTION_PLACEHOLDER": "(Optional) Select an operator", @@ -121,6 +120,8 @@ "CANNOT_REDUCE_TARGET_AMOUNT": "The target amount cannot be further reduced" }, "DISMISS": "DISMISS", + "CANCEL": "CANCEL", + "CONFIRM": "CONFIRM", "DEFAULT_MESSAGE": "Something went wrong on the server.", "SERVER_NOT_REACHABLE": "The server is unreachable, please check your internet connection or proxy settings." } diff --git a/src/Moryx.Orders.Web/src/assets/languages/it.json b/src/Moryx.Orders.Web/src/assets/languages/it.json index cc3512589..25966a728 100644 --- a/src/Moryx.Orders.Web/src/assets/languages/it.json +++ b/src/Moryx.Orders.Web/src/assets/languages/it.json @@ -62,9 +62,7 @@ }, "REPORT_DIALOG": { "REPORT_TITLE": "Report Operazione", - "INTERRUPT_TITLE": "Ferma Operazione", "REPORT": "REPORT", - "INTERRUPT": "INTERROMPERE", "OPERATION": "Operazione", "ORDER": "Ordine", "PRODUCT": "Prodotto", @@ -78,8 +76,11 @@ "COMMENT": "Commenti", "CONFIRMATION": "Conferma", "PARTIAL": "Parziale", - "FINAL": "Finale", - "CANCEL": "CANCELLA" + "FINAL": "Finale" + }, + "INTERRUPT_DIALOG": { + "TITLE": "Ferma Operazione", + "PROMPT": "Per la seguente operazione non vengono avviati nuovi processi. I processi già avviati vengono completati normalmente e lo stato dell'operazione passa a 'Interrotto'." }, "CREATE_DIALOG": { "TITLE": "Nuovo Ordine", @@ -91,7 +92,6 @@ "RECIPE": "Ricetta", "AMOUNT": "Quantità", "ADDED_OPERATIONS": "Operazioni aggiunte", - "CANCEL": "CANCELLA", "CLEAR": "PULISCI", "CREATE": "CREA", "ADD": "AGGIUNGERE", @@ -109,7 +109,6 @@ "OVERDELIVERY": "Prodotte", "UNDERDELIVERY": "Non prodotte", "PARTIAL_AMOUNT": "Quantità parziale", - "CANCEL": "CANCELLA", "BEGIN": "INIZIA", "OPERATOR_SELECTION_LABEL": "Operatore", "OPERATOR_SELECTION_PLACEHOLDER": "(Facoltativo) Selezionare un operatore", @@ -121,6 +120,8 @@ "CANNOT_REDUCE_TARGET_AMOUNT": "L'importo target non può essere ulteriormente ridotto" }, "DISMISS": "RIFIUTARE", + "CANCEL": "CANCELLA", + "CONFIRM": "CONFERMARE", "DEFAULT_MESSAGE": "Qualcosa è andato storto sul server.", "SERVER_NOT_REACHABLE": "Il server non è raggiungibile, controllare la connessione internet o le impostazioni del proxy." } diff --git a/src/Moryx.Orders.Web/src/assets/languages/zh.json b/src/Moryx.Orders.Web/src/assets/languages/zh.json index 44abc2f00..8a4754b0a 100644 --- a/src/Moryx.Orders.Web/src/assets/languages/zh.json +++ b/src/Moryx.Orders.Web/src/assets/languages/zh.json @@ -62,9 +62,7 @@ }, "REPORT_DIALOG": { "REPORT_TITLE": "报告操作", - "INTERRUPT_TITLE": "中断操作", "REPORT": "报告", - "INTERRUPT": "中断", "OPERATION": "操作", "ORDER": "订单", "PRODUCT": "产品", @@ -78,8 +76,11 @@ "COMMENT": "评论", "CONFIRMATION": "确认", "PARTIAL": "部分", - "FINAL": "最终", - "CANCEL": "取消" + "FINAL": "最终" + }, + "INTERRUPT_DIALOG": { + "TITLE": "中断操作", + "PROMPT": "接下来的操作不会启动新进程。已经启动的进程将正常完成，操作状态将变为 '中断'。" }, "CREATE_DIALOG": { "TITLE": "新订单", @@ -91,7 +92,6 @@ "RECIPE": "配方", "AMOUNT": "数量", "ADDED_OPERATIONS": "已添加的操作", - "CANCEL": "取消", "CLEAR": "清除", "CREATE": "创建", "ADD": "添加", @@ -109,7 +109,6 @@ "OVERDELIVERY": "超交", "UNDERDELIVERY": "欠交", "PARTIAL_AMOUNT": "部分数量", - "CANCEL": "取消", "BEGIN": "开始", "OPERATOR_SELECTION_LABEL": "操作", "OPERATOR_SELECTION_PLACEHOLDER": "(可选） 请选择您的助手", @@ -121,6 +120,8 @@ "CANNOT_REDUCE_TARGET_AMOUNT": "目标金额不得进一步减少" }, "DISMISS": "关闭", + "CANCEL": "取消", + "CONFIRM": "证", "DEFAULT_MESSAGE": "服务器发生了错误。", "SERVER_NOT_REACHABLE": "无法访问服务器，请检查您的网络连接或代理设置。" } From cf14b7566e552ee6b79f98bb1d72b3ff339f35e6 Mon Sep 17 00:00:00 2001 From: Marcel Vielhaus Date: Thu, 20 Nov 2025 11:26:14 +0100 Subject: [PATCH 08/10] Add usage of `DefaultUser` if user is null in facade --- src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs b/src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs index 48255c289..6ec6c80a3 100644 --- a/src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs +++ b/src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs @@ -267,7 +267,7 @@ public void InterruptOperation(Operation operation, User user) ValidateHealthState(); var operationData = GetOperationDataSave(operation); - OperationManager.Interrupt(operationData, user); + OperationManager.Interrupt(operationData, user ?? UserManagement.DefaultUser); } private IOperationData GetOperationDataSave(Operation operation) From 79a4ea7b843e4bf87bf3c4a87945af09aca39880 Mon Sep 17 00:00:00 2001 From: Marcel Vielhaus Date: Fri, 21 Nov 2025 06:47:48 +0100 Subject: [PATCH 09/10] Revert ResX related changes This reverts part of commit bea5e6a9a0f28af089e49b4e9e929a174db764b3. --- MORYX-Framework.sln | 6 ++++-- ResXManager.config.xml | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 ResXManager.config.xml diff --git a/MORYX-Framework.sln b/MORYX-Framework.sln index 63195f719..15da3e8b7 100644 --- a/MORYX-Framework.sln +++ b/MORYX-Framework.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 18 -VisualStudioVersion = 18.0.11205.157 d18.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32630.192 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartProject.Asp", "src\StartProject.Asp\StartProject.Asp.csproj", "{4F1466B5-131E-4080-AC4F-BD1630EDF11F}" EndProject @@ -937,5 +937,7 @@ Global EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {36EFC961-F4E7-49DC-A36A-99594FFB8243} + RESX_TaskErrorCategory = Message + RESX_ShowErrorsInErrorList = True EndGlobalSection EndGlobal diff --git a/ResXManager.config.xml b/ResXManager.config.xml deleted file mode 100644 index b34fc8965..000000000 --- a/ResXManager.config.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Message - \ No newline at end of file From 9b2bbfb4a774be54c9cf04fcc65ec04499305409 Mon Sep 17 00:00:00 2001 From: Dennis Beuchler Date: Fri, 21 Nov 2025 10:19:13 +0100 Subject: [PATCH 10/10] Removed Interrupt without user for consitency --- MORYX-Framework.sln | 2 +- .../Facade/OrderManagementFacade.cs | 10 ++++------ src/Moryx.Orders/Facade/IOrderManagement.cs | 5 ----- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/MORYX-Framework.sln b/MORYX-Framework.sln index 15da3e8b7..311087c01 100644 --- a/MORYX-Framework.sln +++ b/MORYX-Framework.sln @@ -65,7 +65,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DFC092A6-B935-4D19-A564-9AEDEEF999B9}" ProjectSection(SolutionItems) = preProject .build\Common.props = .build\Common.props - Directory.build.props = Directory.build.props + Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets Directory.Packages.props = Directory.Packages.props LICENSE = LICENSE diff --git a/src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs b/src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs index 6ec6c80a3..845d101b8 100644 --- a/src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs +++ b/src/Moryx.Orders.Management/Facade/OrderManagementFacade.cs @@ -257,17 +257,15 @@ public ReportContext GetInterruptContext(Operation operation) return OperationManager.GetInterruptContext(operationData); } - public void InterruptOperation(Operation operation) - { - InterruptOperation(operation, UserManagement.DefaultUser); - } - public void InterruptOperation(Operation operation, User user) { ValidateHealthState(); + // Get default user if there is no + user ??= UserManagement.DefaultUser; + var operationData = GetOperationDataSave(operation); - OperationManager.Interrupt(operationData, user ?? UserManagement.DefaultUser); + OperationManager.Interrupt(operationData, user); } private IOperationData GetOperationDataSave(Operation operation) diff --git a/src/Moryx.Orders/Facade/IOrderManagement.cs b/src/Moryx.Orders/Facade/IOrderManagement.cs index d4265893c..e3713d9dc 100644 --- a/src/Moryx.Orders/Facade/IOrderManagement.cs +++ b/src/Moryx.Orders/Facade/IOrderManagement.cs @@ -79,11 +79,6 @@ public interface IOrderManagement ///

ReportContext GetInterruptContext(Operation operation); - /// - /// Processes a interrupt for the given operation - /// - void InterruptOperation(Operation operation); - /// /// Processes a interrupt for the given operation ///