X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-gui%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fgui%2Fpages%2FApprovalForm.java;h=a5337369cbd94510b8ae4ed5b144bfe7fb8e7320;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=cb868b16c5c8a52d3b89dc8c3ac54e50ac2db558;hpb=bdce7667a6e272e2fa32e298d957a0d9090c5bc9;p=aaf%2Fauthz.git diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApprovalForm.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApprovalForm.java index cb868b16..a5337369 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApprovalForm.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/ApprovalForm.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -67,8 +67,8 @@ public class ApprovalForm extends Page { static final String NAME="Approvals"; static final String HREF = "/gui/approve"; static final String[] FIELDS = new String[] {"line[]","user","delegate_of","as_user"}; - - + + public ApprovalForm(final AAF_GUI gui, final Page ... breadcrumbs) throws APIException, IOException { super(gui.env,NAME,HREF, FIELDS, @@ -106,38 +106,38 @@ public class ApprovalForm extends Page { } }); } - + /** * Implement the Table Content for Approvals - * + * * @author Jonathan * */ private static class Model extends TableData { //TODO come up with a generic way to do ILM Info (people page) // private static final String TODO_ILM_INFO = "TODO: ILM Info"; - - + + private static final String[] headers = new String[] {"Identity","Request","Approve","Deny"}; private Slot sUser; private Slot sAsDelegate; private Slot sAsUser; - + public Model(AuthzEnv env) { sUser = env.slot(NAME+".user"); sAsDelegate = env.slot(NAME+".delegate_of"); sAsUser = env.slot(NAME + ".as_user"); } - + @Override public String[] headers() { return headers; } - + @Override public Cells get(final AuthzTrans trans, final AAF_GUI gui) { final String userParam = trans.get(sUser, null); - + final String asDelegate = trans.get(sAsDelegate, null); final String approver; if(asDelegate==null) { @@ -145,7 +145,7 @@ public class ApprovalForm extends Page { } else { approver = asDelegate; } - + ArrayList rv = new ArrayList<>(); String msg = null; TimeTaken tt = trans.start("AAF Get Approvals for Approver",Env.REMOTE); @@ -158,7 +158,7 @@ public class ApprovalForm extends Page { Future fa = client.read("/authz/approval/approver/"+approver,gui.getDF(Approvals.class)); int numLeft = 0; if (fa.get(AAF_GUI.TIMEOUT)) { - + if (fa.value!=null) { for (Approval appr : fa.value.getApprovals()) { if ("pending".equals(appr.getStatus())) { @@ -170,10 +170,10 @@ public class ApprovalForm extends Page { } } } - + String prevApprover = null; int overallIndex = 0; - + for (Approval appr : pendingApprovals) { String currApprover = appr.getApprover(); if (!currApprover.equals(prevApprover)) { @@ -186,7 +186,7 @@ public class ApprovalForm extends Page { return numLeft; } }); - + if (!pendingApprovals.isEmpty()) { // Only add select all links if we have approvals AbsCell[] selectAllRow = new AbsCell[] { @@ -197,14 +197,14 @@ public class ApprovalForm extends Page { }; rv.add(selectAllRow); } - + int line=-1; - + while (!beginIndicesPerApprover.isEmpty()) { int beginIndex = beginIndicesPerApprover.remove(0); int endIndex = (beginIndicesPerApprover.isEmpty()?pendingApprovals.size():beginIndicesPerApprover.get(0)); List currApproverList = pendingApprovals.subList(beginIndex, endIndex); - + Identity iapprover = trans.org().getIdentity(trans,currApproverList.get(0).getApprover()); if(iapprover==null) { rv.add(new AbsCell[] { @@ -213,25 +213,25 @@ public class ApprovalForm extends Page { }); } else { if (!iapprover.fullID().equals(trans.user())) { - + AbsCell[] approverHeader; // if (domainOfUser.equals(domainOfApprover)) { - // approverHeader = new AbsCell[] { + // approverHeader = new AbsCell[] { // new TextAndRefCell("Approvals Delegated to Me by ", currApproverFull, - // TODO_ILM_INFO + currApproverShort, + // TODO_ILM_INFO + currApproverShort, // true, // new String[] {"colspan=4", "class=head"}) // }; // } else { - approverHeader = new AbsCell[] { - new TextCell("Approvals Delegated to Me by " + iapprover.fullName() + approverHeader = new AbsCell[] { + new TextCell("Approvals Delegated to Me by " + iapprover.fullName() + '(' + iapprover.id() + ')', new String[] {"colspan=4", "class=head"}) }; // } rv.add(approverHeader); } - + // Sort by User Requesting Collections.sort(currApproverList, new Comparator() { @Override @@ -239,16 +239,16 @@ public class ApprovalForm extends Page { return a1.getUser().compareTo(a2.getUser()); } }); - + String prevUser = null; boolean userOK=true; for (Approval appr : currApproverList) { if (++line0) { - msg = "No Approvals to process at this time for user " + userParam +". You have " + msg = "No Approvals to process at this time for user " + userParam +". You have " + numLeft + " other approvals to process."; } else { msg = "No Approvals to process at this time";