prevent auditor from trying changing tasks

Author: abarz722

roles/lib/files/FWO.Services/WfHandler.cs

@@ -156,7 +156,7 @@ public async Task<bool> Init(bool fetchData = false, List<int>? ownerIds = null,
                     }
                     ActionHandler = new (apiConnection, this, UserGroups, usedInMwServer);
                     await ActionHandler.Init();
-                    dbAcc = new WfDbAccess(DisplayMessageInUi, userConfig, apiConnection, ActionHandler, AuthUser == null || AuthUser.IsInRole(Roles.Admin)){};
+                    dbAcc = new WfDbAccess(DisplayMessageInUi, userConfig, apiConnection, ActionHandler, AuthUser == null || AuthUser.IsInRole(Roles.Admin) || AuthUser.IsInRole(Roles.Auditor)){};
                     Devices = await apiConnection.SendQueryAsync<List<Device>>(DeviceQueries.getDeviceDetails);
                     AllOwners = await apiConnection.SendQueryAsync<List<FwoOwner>>(OwnerQueries.getOwners);
                     await stateMatrixDict.Init(Phase, apiConnection);
@@ -266,12 +266,12 @@ public void SetContinueEnv(ObjAction action)
 
         // Tickets
 
-        public async Task<WfTicket?> ResolveTicket(long ticketId, bool checkOwner = false)
+        public async Task<WfTicket?> ResolveTicket(long ticketId)
         {
             WfTicket? ticket = null;
             if(dbAcc != null)
             {
-                ticket = await dbAcc.FetchTicket(ticketId, checkOwner ? AllOwners.ConvertAll(x => x.Id) : null);
+                ticket = await dbAcc.FetchTicket(ticketId, userConfig.ReqOwnerBased ? AllOwners.ConvertAll(x => x.Id) : null);
                 if(ticket != null)
                 {
                     SetTicketEnv(ticket);

roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConn.razor

@@ -392,7 +392,7 @@
 					@if(ConnHandler.ActConn.IsRequested)
 					{
 						<button type="button" class="btn btn-sm btn-dark" @onclick="DisplayTicket">@(ConnHandler.DisplayButton("display_ticket", Icons.Display, userConfig.GetText("ticket")))</button>
-						@if(!ConnHandler.ReadOnly)
+						@if(!ConnHandler.ReadOnly && availableModules.Contains(Module.Workflow))
 						{
 							<button type="button" class="btn btn-sm btn-dark" @onclick="GotoTicket">@(ConnHandler.DisplayButton("edit_ticket", Icons.Edit, userConfig.GetText("ticket")))</button>
 						}
@@ -480,12 +480,15 @@
     private bool RejectInterfaceMode = false;
 
     private List<string> availableExtraConfigs = [];
+	private List<Module> availableModules { get; set; } = [];
 
 
     protected override void OnInitialized()
     {
         sidebarLeftWidth = sidebarInitWidth;
         availableExtraConfigs = JsonSerializer.Deserialize<List<string>>(userConfig.ModExtraConfigs) ?? new();
+		availableModules = string.IsNullOrEmpty(userConfig.AvailableModules) ? [.. Enum.GetValues(typeof(Module)).Cast<Module>()]
+            : JsonSerializer.Deserialize<List<Module>>(userConfig.AvailableModules) ?? throw new JsonException("Config data could not be parsed.");
     }
 
     protected override void OnParametersSet()

roles/ui/files/FWO.UI/Pages/Request/DisplayImplementationTask.razor

@@ -14,6 +14,24 @@
         {
             <form>
                 <div class="form-group row">
+                    <div class="col-sm-2">
+                        <div class="form-group row">
+                            <label class="col-sm-6 col-form-label col-form-label-sm">@(userConfig.GetText("id")):</label>
+                            <div class="col-sm-6">
+                                <label class="col-sm-12 border bg-secondary">@WfHandler.ActImplTask.Id</label>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-10">
+                        <div class="form-group row">
+                            <label class="col-sm-1 col-form-label col-form-label-sm">@(userConfig.GetText("title"))*:</label>
+                            <div class="col-sm-11">
+                                <input type="text" class="form-control form-control-sm" readonly="@(!WfHandler.EditImplTaskMode)" @bind="WfHandler.ActImplTask.Title" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group row mt-2">
                     <div class="col-sm-3">
                         <div class="form-group row">
                             <label class="col-sm-4 col-form-label col-form-label-sm">@(userConfig.GetText("state")):</label>

roles/ui/files/FWO.UI/Pages/Request/PromoteObject.razor

@@ -50,6 +50,9 @@
     [CascadingParameter]
     Action<Exception?, string, string, bool> DisplayMessageInUi { get; set; } = DefaultInit.DoNothing;
 
+    [CascadingParameter]
+    private Task<AuthenticationState>? authenticationStateTask { get; set; }
+
     [Parameter]
     public bool Promote { get; set; } = false;
 
@@ -91,7 +94,7 @@
         if (Promote)
         {
             possibleStates = StateMatrix.getAllowedTransitions(StatefulObject.StateId);
-            if(possibleStates.Count == 1)
+            if(possibleStates.Count == 1 && !authenticationStateTask!.Result.User.IsInRole(Roles.Auditor))
             {
                 int oldState = StatefulObject.StateId;
                 StatefulObject.StateId = possibleStates[0];

roles/ui/files/FWO.UI/Pages/Request/RequestImplementations.razor

@@ -51,6 +51,7 @@ else
     private bool DisplayTickets = true;
     private Device selectedDeviceOpt = new ();
     private FwoOwner selectedOwnerOpt = new (){ Id = -1 };
+    private bool JumpedIn = false;
 
 
     protected override async Task OnInitializedAsync()
@@ -69,9 +70,16 @@ else
             await HandleTicketId();
             await Select();
             wfHandler.SetContinueEnv(ObjAction.implement);
-            if(wfHandler.ActTicket.Tasks.Count >= 1 && wfHandler.ActTicket.Tasks.First().ImplementationTasks.Count >= 1)
+            if(wfHandler.ActTicket.Tasks.Count > 0 && wfHandler.ActTicket.Tasks[0].ImplementationTasks.Count > 0)
             {
-                await wfHandler.ContinueImplPhase(wfHandler.ActTicket.Tasks.First().ImplementationTasks.First());
+                if(JumpedIn && authenticationStateTask!.Result.User.IsInRole(Roles.Admin) || authenticationStateTask!.Result.User.IsInRole(Roles.Auditor))
+                {
+                    wfHandler.SelectImplTask(wfHandler.ActTicket.Tasks[0].ImplementationTasks[0], ObjAction.display);
+                }
+                else
+                {
+                    await wfHandler.ContinueImplPhase(wfHandler.ActTicket.Tasks[0].ImplementationTasks[0]);
+                }
             }
             InitComplete = true;
         }
@@ -90,6 +98,10 @@ else
             {
                 NavigationManager.NavigateTo($"/request/{newPhase.ToString()}s/{TicketId}");
             }
+            else
+            {
+                JumpedIn = true;
+            }
         }
     }