Merge pull request #2532 from abarz722/develop

fix duplicate objects etc
CactuseSecurity · Sep 13, 2024 · e97a7f6 · e97a7f6
2 parents f40a5a6 + 652c235
commit e97a7f6
Show file tree

Hide file tree

Showing 12 changed files with 145 additions and 47 deletions.
diff --git a/roles/lib/files/FWO.Api.Client/Data/WfReqTaskBase.cs b/roles/lib/files/FWO.Api.Client/Data/WfReqTaskBase.cs
@@ -16,6 +16,7 @@ public struct AdditionalInfoKeys
     {
         public const string ConnId = "ConnId";
         public const string ReqOwner = "ReqOwner";
+        public const string GrpName = "GrpName";
     }
 
     public class WfReqTaskBase : WfTaskBase

diff --git a/roles/lib/files/FWO.Report/ReportAppRules.cs b/roles/lib/files/FWO.Report/ReportAppRules.cs
@@ -132,6 +132,7 @@ private async Task GetAppServers(ApiConnection apiConnection)
                             {
                                 relevantObjects.Add(obj);
                                 found = true;
+                                break;
                             }
                         }
                     }
@@ -220,6 +221,7 @@ private void PrepareFilter(ManagementReport mgt)
                     }
                 }
             }
+            mgt.RelevantObjectIds = mgt.RelevantObjectIds.Distinct().ToList();
             mgt.HighlightedObjectIds = mgt.HighlightedObjectIds.Distinct().ToList();
         }
 

diff --git a/roles/ui/files/FWO.UI/Pages/Request/DisplayRequestTask.razor b/roles/ui/files/FWO.UI/Pages/Request/DisplayRequestTask.razor
@@ -161,6 +161,17 @@
                             }
                         }
                     }
+                    else if(actTaskType == TaskType.group_create)
+                    {
+                        <div class="col-sm-7">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label col-form-label-sm">@(userConfig.GetText("name"))*:</label>
+                                <div class="col-sm-11">
+                                    <input type="text" class="form-control form-control-sm" readonly="@(!WfHandler.EditReqTaskMode)" @bind="actGrpName" />
+                                </div>
+                            </div>
+                        </div>
+                    }
                 </div>
                 @if(actTaskType == TaskType.generic)
                 {
@@ -262,6 +273,26 @@
                 {
                     <DisplayRules @bind-Rules="actRules" TaskId="WfHandler.ActReqTask.Id" EditMode="WfHandler.EditReqTaskMode" />
                 }
+                else if(actTaskType == TaskType.group_create)
+                {
+                    <div class="col-sm-4 mt-2">
+                        @if (WfHandler.EditReqTaskMode)
+                        {
+                            <IpSelector IpAddresses="actSources" @bind-IpsToAdd="sourcesToAdd" @bind-IpsToDelete="sourcesToDelete" WithLabel="false"/>
+                        }
+                        else
+                        {
+                            <div class="list-group">
+                                @foreach(var source in actSources.Where(x => (x.NetworkId == null || x.NetworkId == 0)))
+                                {
+                                    <div class="list-group-item border bg-secondary">
+                                        <label>@source.Cidr.CidrString</label>
+                                    </div>
+                                }
+                            </div>
+                        }
+                    </div>
+                }
 
                 @if(!WfHandler.EditReqTaskMode)
                 {
@@ -271,7 +302,7 @@
                             @if(WfHandler.PlanReqTaskMode || WfHandler.ApproveReqTaskMode)
                             {
                                 <button type="button" class="btn btn-sm btn-success" @onclick:preventDefault @onclick="InitAddComment">
-                                        @(ModellingHandlerBase.DisplayButton(userConfig, "add_comment", Icons.Add))</button>
+                                    @(ModellingHandlerBase.DisplayButton(userConfig, "add_comment", Icons.Add))</button>
                             }
                         </div>
                         <div class="col-sm-11">
@@ -412,6 +443,7 @@
     private Tracking? actTracking;
     private FwoOwner? actOwner;
     private FwoOwner? oldOwner;
+    private string? actGrpName;
     private bool firstParamSet = false;
 
 
@@ -452,6 +484,7 @@
                     {
                         oldOwner = actOwner;
                     }
+                    actGrpName = WfHandler.GetAddInfoValue(AdditionalInfoKeys.GrpName);
                 }
                 firstParamSet = false;
              }
@@ -656,6 +689,12 @@
             {
                 WfHandler.ActReqTask.RequestAction = RequestAction.delete.ToString();
             }
+            else if(actTaskType == TaskType.group_create)
+            {
+                Dictionary<string, string>? addInfo = new() { {AdditionalInfoKeys.GrpName, actGrpName} };
+                WfHandler.ActReqTask.AdditionalInfo = System.Text.Json.JsonSerializer.Serialize(addInfo);
+            }
+
             UpdateElements();
             if (await CheckTaskValues())
             {
@@ -728,6 +767,14 @@
                 }
             }
         }
+        else if (actTaskType == TaskType.group_create)
+        {
+            if (actGrpName == null || actGrpName == "" || actSources.Count == 0)
+            {
+                DisplayMessageInUi(null, userConfig.GetText("save_task"), userConfig.GetText("E5102"), true);
+                return false;
+            }
+        }
         return true;
     }
 }
diff --git a/roles/ui/files/FWO.UI/Pages/Request/RequestApprovals.razor b/roles/ui/files/FWO.UI/Pages/Request/RequestApprovals.razor
@@ -73,7 +73,7 @@ else
     {
         if(long.TryParse(TicketId, out long ticketId))
         {
-            string newPhase = await wfHandler.HandleExtTicketId(WorkflowPhases.approval, ticketId);
+            string newPhase = await wfHandler.HandleInjectedTicketId(WorkflowPhases.approval, ticketId);
             if(newPhase != "")
             {
                 NavigationManager.NavigateTo($"/request/{newPhase.ToString()}s/{TicketId}");

diff --git a/roles/ui/files/FWO.UI/Pages/Request/RequestImplementations.razor b/roles/ui/files/FWO.UI/Pages/Request/RequestImplementations.razor
@@ -91,7 +91,7 @@ else
     {
         if(long.TryParse(TicketId, out long ticketId))
         {
-            string newPhase = await wfHandler.HandleExtTicketId(WorkflowPhases.implementation, ticketId);
+            string newPhase = await wfHandler.HandleInjectedTicketId(WorkflowPhases.implementation, ticketId);
             if(newPhase != "")
             {
                 NavigationManager.NavigateTo($"/request/{newPhase.ToString()}s/{TicketId}");

diff --git a/roles/ui/files/FWO.UI/Pages/Request/RequestPlannings.razor b/roles/ui/files/FWO.UI/Pages/Request/RequestPlannings.razor
@@ -73,7 +73,7 @@ else
     {
         if(long.TryParse(TicketId, out long ticketId))
         {
-            string newPhase = await wfHandler.HandleExtTicketId(WorkflowPhases.planning, ticketId);
+            string newPhase = await wfHandler.HandleInjectedTicketId(WorkflowPhases.planning, ticketId);
             if(newPhase != "")
             {
                 NavigationManager.NavigateTo($"/request/{newPhase.ToString()}s/{TicketId}");

diff --git a/roles/ui/files/FWO.UI/Pages/Request/RequestReviews.razor b/roles/ui/files/FWO.UI/Pages/Request/RequestReviews.razor
@@ -86,7 +86,7 @@ else
     {
         if(long.TryParse(TicketId, out long ticketId))
         {
-            string newPhase = await wfHandler.HandleExtTicketId(WorkflowPhases.review, ticketId);
+            string newPhase = await wfHandler.HandleInjectedTicketId(WorkflowPhases.review, ticketId);
             if(newPhase != "")
             {
                 NavigationManager.NavigateTo($"/request/{newPhase.ToString()}s/{TicketId}");

diff --git a/roles/ui/files/FWO.UI/Pages/Request/RequestTickets.razor b/roles/ui/files/FWO.UI/Pages/Request/RequestTickets.razor
@@ -70,7 +70,7 @@ else
     {
         if(long.TryParse(TicketId, out long ticketId))
         {
-            string newPhase = await wfHandler.HandleExtTicketId(WorkflowPhases.request, ticketId);
+            string newPhase = await wfHandler.HandleInjectedTicketId(WorkflowPhases.request, ticketId);
             if(newPhase != "")
             {
                 NavigationManager.NavigateTo($"/request/{newPhase.ToString()}s/{TicketId}");