MID-7976 removed old shopping cart code

Evolveum · Sep 7, 2022 · 57460ea · 57460ea
1 parent 618988a
commit 57460ea
Show file tree

Hide file tree

Showing 27 changed files with 21 additions and 3,249 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
@@ -41,15 +41,6 @@
                         </li>
                     </ol>
                 </li>
-                <wicket:enclosure child="cartButton">
-                    <li class="nav-item">
-                        <a wicket:id="cartButton" class="nav-link">
-                            <i class="fa fa-shopping-cart"></i>
-                            <span wicket:id="itemsCount" class="badge bg-danger"
-                                    style="position: absolute; top: 1px; margin-left: -10px;"></span>
-                        </a>
-                    </li>
-                </wicket:enclosure>
                 <wicket:enclosure child="cartLink">
                     <li class="nav-item">
                         <a class="nav-link" wicket:id="cartLink">

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -9,8 +9,6 @@
 import java.util.*;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.gui.api.component.result.MessagePanel;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
@@ -39,10 +37,9 @@
 import com.evolveum.midpoint.common.validator.EventResult;
 import com.evolveum.midpoint.common.validator.LegacyValidator;
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.gui.api.component.result.MessagePanel;
 import com.evolveum.midpoint.gui.api.component.wizard.WizardModel;
-import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.gui.impl.component.menu.LeftMenuPanel;
 import com.evolveum.midpoint.gui.impl.page.self.PageRequestAccess;
@@ -58,15 +55,13 @@
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.schema.result.OperationConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.security.api.MidPointPrincipal;
 import com.evolveum.midpoint.security.api.OwnerResolver;
 import com.evolveum.midpoint.security.enforcer.api.AuthorizationParameters;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.Holder;
 import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.web.application.AsyncWebProcessManager;
-import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.AjaxIconButton;
 import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
 import com.evolveum.midpoint.web.component.dialog.MainPopupDialog;
@@ -79,8 +74,6 @@
 import com.evolveum.midpoint.web.component.util.EnableBehaviour;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.page.error.PageError404;
-import com.evolveum.midpoint.web.page.self.PageAssignmentsList;
-import com.evolveum.midpoint.web.page.self.PageSelf;
 import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.midpoint.web.security.util.SecurityUtils;
 import com.evolveum.midpoint.web.session.SessionStorage;
@@ -105,7 +98,6 @@ public abstract class PageBase extends PageAdminLTE {
     private static final String ID_PAGE_TITLE = "pageTitle";
     public static final String ID_FEEDBACK_CONTAINER = "feedbackContainer";
     private static final String ID_FEEDBACK = "feedback";
-    private static final String ID_CART_BUTTON = "cartButton";
     private static final String ID_CART_ITEMS_COUNT = "itemsCount";
     private static final String ID_SIDEBAR_MENU = "sidebarMenu";
     private static final String ID_LOCALE = "locale";
@@ -341,32 +333,6 @@ public void onClick(AjaxRequestTarget target) {
     }
 
     private void initCartButton(WebMarkupContainer mainHeader) {
-        // todo old, to be removed
-        AjaxButton cartButton = new AjaxButton(ID_CART_BUTTON) {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public void onClick(AjaxRequestTarget ajaxRequestTarget) {
-                navigateToNext(new PageAssignmentsList<>(true));
-            }
-        };
-        cartButton.setOutputMarkupId(true);
-        cartButton.add(getShoppingCartVisibleBehavior());
-        mainHeader.add(cartButton);
-
-        Label cartItemsCount = new Label(ID_CART_ITEMS_COUNT, new LoadableModel<String>(true) {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public String load() {
-                return Integer.toString(getSessionStorage().getRoleCatalog().getAssignmentShoppingCart().size());
-            }
-        });
-        cartItemsCount.add(new VisibleBehaviour(() -> !(getSessionStorage().getRoleCatalog().getAssignmentShoppingCart().size() == 0)));
-        cartItemsCount.setOutputMarkupId(true);
-        cartButton.add(cartItemsCount);
-
-        // new header item starts here
         AjaxLink cartLink = new AjaxLink<>(ID_CART_LINK) {
 
             @Override
@@ -490,12 +456,6 @@ public void hideMainPopup(AjaxRequestTarget target) {
         getMainPopup().close(target);
     }
 
-    private VisibleBehaviour getShoppingCartVisibleBehavior() {
-        return new VisibleBehaviour(() -> !isErrorPage() && isSideMenuVisible() &&
-                (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_SELF_REQUESTS_ASSIGNMENTS_URL, PageSelf.AUTH_SELF_ALL_URI)
-                        && getSessionStorage().getRoleCatalog().getAssignmentShoppingCart().size() > 0));
-    }
-
     private VisibleBehaviour createUserStatusBehaviour() {
         return new VisibleBehaviour(() -> !isErrorPage() && isSideMenuVisible());
     }
@@ -990,7 +950,6 @@ protected String determineDataLanguage() {
 
     public void reloadShoppingCartIcon(AjaxRequestTarget target) {
         target.add(get(createComponentPath(ID_MAIN_HEADER)));
-        target.add(get(createComponentPath(ID_MAIN_HEADER, ID_CART_BUTTON)));
     }
 
     public AsyncWebProcessManager getAsyncWebProcessManager() {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -428,19 +428,6 @@ public static <O extends ObjectType> List<O> loadReferencedObjectList(List<Objec
         return loadedObjectsList;
     }
 
-    public static List<UserType> loadTargetUsersListForShoppingCart(String operation, PageBase pageBase) {
-        List<String> usersOidsList = pageBase.getSessionStorage().getRoleCatalog().getTargetUserOidsList();
-        if (CollectionUtils.isEmpty(usersOidsList)) {
-            return new ArrayList<>();
-        }
-        List<ObjectReferenceType> usersReferenceList = new ArrayList<>();
-        usersOidsList.forEach(userOid -> {
-            usersReferenceList.add(ObjectTypeUtil.createObjectRef(userOid, ObjectTypes.USER));
-        });
-        return WebComponentUtil.loadReferencedObjectList(usersReferenceList, operation, pageBase);
-
-    }
-
     public static ObjectFilter getShadowTypeFilterForAssociation(ConstructionType construction, String operation, PageBase pageBase) {
         PrismContext prismContext = pageBase.getPrismContext();
         if (construction == null) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
@@ -77,7 +77,6 @@
 import com.evolveum.midpoint.web.page.admin.server.PageTasksCertScheduling;
 import com.evolveum.midpoint.web.page.admin.workflow.PageAttorneySelection;
 import com.evolveum.midpoint.web.page.admin.workflow.PageWorkItemsAttorney;
-import com.evolveum.midpoint.web.page.self.PageAssignmentShoppingCart;
 import com.evolveum.midpoint.web.page.self.PageSelfConsents;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
@@ -63,8 +63,6 @@
 import com.evolveum.midpoint.web.page.admin.configuration.component.ChooseTypePanel;
 import com.evolveum.midpoint.web.page.admin.users.component.AssignmentInfoDto;
 import com.evolveum.midpoint.web.page.admin.users.dto.UserDtoStatus;
-import com.evolveum.midpoint.web.page.self.PageAssignmentDetails;
-import com.evolveum.midpoint.web.page.self.PageAssignmentsList;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
 
@@ -1026,16 +1024,6 @@ private ItemSecurityConstraints loadSecurityConstraints() {
         PrismObject<? extends FocusType> operationObject = null;
         if (pageBase instanceof PageFocusDetails) {
             operationObject = ((PageFocusDetails) pageBase).getPrismObject();
-        } else if ((pageBase instanceof PageAssignmentDetails || pageBase instanceof PageAssignmentsList) //shopping cart assignment details panels
-                && !pageBase.getSessionStorage().getRoleCatalog().isMultiUserRequest()) {
-            String targetUserOid = pageBase.getSessionStorage().getRoleCatalog().isSelfRequest() ?
-                    pageBase.getPrincipalFocus().getOid() :
-                    pageBase.getSessionStorage().getRoleCatalog().getTargetUserOidsList().get(0);
-            Task task = pageBase.createSimpleTask(OPERATION_LOAD_ASSIGNMENT_TARGET_USER_OBJECT);
-            OperationResult result = new OperationResult(OPERATION_LOAD_ASSIGNMENT_TARGET_USER_OBJECT);
-            operationObject = WebModelServiceUtils.loadObject(UserType.class,
-                    targetUserOid, pageBase, task, result);
-
         }
         if (operationObject == null) {
             return null;

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
@@ -13,30 +13,26 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
-import com.evolveum.midpoint.prism.PrismObject;
-
-import com.evolveum.midpoint.task.api.Task;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;
+import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.page.admin.users.dto.UserDtoStatus;
-import com.evolveum.midpoint.web.session.RoleCatalogStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
@@ -492,23 +488,6 @@ public static QName getTargetType(AssignmentType assignment) {
 
     }
 
-    public static IModel<String> getShoppingCartAssignmentsLimitReachedTitleModel(PageBase pageBase) {
-        return new LoadableModel<String>(true) {
-            @Override
-            protected String load() {
-                int assignmentsLimit = pageBase.getSessionStorage().getRoleCatalog().getAssignmentRequestLimit();
-                return isShoppingCartAssignmentsLimitReached(assignmentsLimit, pageBase) ?
-                        pageBase.createStringResource("RoleCatalogItemButton.assignmentsLimitReachedTitle", assignmentsLimit)
-                                .getString() : "";
-            }
-        };
-    }
-
-    public static boolean isShoppingCartAssignmentsLimitReached(int assignmentsLimit, PageBase pageBase) {
-        RoleCatalogStorage storage = pageBase.getSessionStorage().getRoleCatalog();
-        return assignmentsLimit >= 0 && storage.getAssignmentShoppingCart().size() >= assignmentsLimit;
-    }
-
     public static int loadAssignmentsLimit(OperationResult result, PageBase pageBase) {
         int assignmentsLimit = -1;
         try {
@@ -517,7 +496,8 @@ public static int loadAssignmentsLimit(OperationResult result, PageBase pageBase
             if (adminGuiConfig.getRoleManagement() != null) {
                 assignmentsLimit = adminGuiConfig.getRoleManagement().getAssignmentApprovalRequestLimit();
             }
-        } catch (ObjectNotFoundException | SchemaException | CommunicationException | ConfigurationException | SecurityViolationException | ExpressionEvaluationException ex) {
+        } catch (ObjectNotFoundException | SchemaException | CommunicationException | ConfigurationException |
+                SecurityViolationException | ExpressionEvaluationException ex) {
             LOGGER.error("Error getting system configuration: {}", ex.getMessage(), ex);
         }
         return assignmentsLimit;
@@ -540,7 +520,7 @@ public static <AR extends AbstractRoleType> IModel<String> getIdentifierLabelMod
         return Model.of("");
     }
 
-    public static  <F extends FocusType> PrismObject<F> loadTargetObject(AssignmentType assignmentType, PageBase pageBase) {
+    public static <F extends FocusType> PrismObject<F> loadTargetObject(AssignmentType assignmentType, PageBase pageBase) {
         if (assignmentType == null) {
             return null;
         }

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.html b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.html