user-friendly messages for shopping cart

Evolveum · Feb 15, 2019 · b6f33f2 · b6f33f2
1 parent 5ae66a1
commit b6f33f2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
@@ -266,6 +266,7 @@ private void onSingleUserRequestPerformed(AjaxRequestTarget target) {
             storage.getRoleCatalog().getAssignmentShoppingCart().clear();
         } catch (Exception e) {
             result.recordFatalError(e);
+            result.setMessage(createStringResource("PageAssignmentsList.requestError").getString());
             LoggingUtils.logUnexpectedException(LOGGER, "Could not save assignments ", e);
         } finally {
             result.recomputeStatus();
@@ -274,20 +275,22 @@ private void onSingleUserRequestPerformed(AjaxRequestTarget target) {
         findBackgroundTaskOperation(result);
         if (backgroundTaskOperationResult != null
                 && StringUtils.isNotEmpty(backgroundTaskOperationResult.getBackgroundTaskOid())){
-            result.setMessage(createStringResource("operation.com.evolveum.midpoint.web.page.self.PageRequestRole.taskCreated").getString());
+            result.setMessage(createStringResource("PageAssignmentsList.requestInProgress").getString());
             showResult(result);
             clearStorage();
             setResponsePage(PageAssignmentShoppingCart.class);
             return;
         }
-        showResult(result);
         if (!WebComponentUtil.isSuccessOrHandledError(result)) {
+            result.setMessage(createStringResource("PageAssignmentsList.requestError").getString());
             target.add(getFeedbackPanel());
             target.add(PageAssignmentsList.this.get(ID_FORM));
         } else {
             clearStorage();
+            result.setMessage(createStringResource("PageAssignmentsList.requestSuccess").getString());
             setResponsePage(PageAssignmentShoppingCart.class);
         }
+        showResult(result);
     }
 
     private void targetUserChangePerformed(AjaxRequestTarget target){
@@ -326,14 +329,15 @@ private void onMultiUserRequestPerformed(AjaxRequestTarget target) {
                 WebModelServiceUtils.runTask(task, operationalTask, result, PageAssignmentsList.this);
             } catch (SchemaException e) {
                 result.recordFatalError(result.getOperation(), e);
+                result.setMessage(createStringResource("PageAssignmentsList.requestError").getString());
                 LoggingUtils.logUnexpectedException(LOGGER,
                         "Failed to execute operaton " + result.getOperation(), e);
                 target.add(getFeedbackPanel());
             }
             findBackgroundTaskOperation(result);
             if (backgroundTaskOperationResult != null
                     && StringUtils.isNotEmpty(backgroundTaskOperationResult.getBackgroundTaskOid())) {
-                result.setMessage(createStringResource("operation.com.evolveum.midpoint.web.page.self.PageRequestRole.taskCreated").getString());
+                result.setMessage(createStringResource("PageAssignmentsList.requestInProgress").getString());
                 showResult(result);
                 clearStorage();
                 setResponsePage(PageAssignmentShoppingCart.class);
@@ -342,12 +346,14 @@ private void onMultiUserRequestPerformed(AjaxRequestTarget target) {
             if (WebComponentUtil.isSuccessOrHandledError(result)
                     || OperationResultStatus.IN_PROGRESS.equals(result.getStatus())) {
                 clearStorage();
+                result.setMessage(createStringResource("PageAssignmentsList.requestSuccess").getString());
                 setResponsePage(PageAssignmentShoppingCart.class);
             } else {
-                showResult(result);
+                result.setMessage(createStringResource("PageAssignmentsList.requestError").getString());
                 target.add(getFeedbackPanel());
                 target.add(PageAssignmentsList.this.get(ID_FORM));
             }
+            showResult(result);
     }
 
     private void clearStorage(){
@@ -672,11 +678,9 @@ private Component getTargetUserSelectionButton(){
 
     private String getTargetUserSelectionButtonLabel(List<UserType> usersList){
         if (usersList == null || usersList.size() == 0){
-            StringBuilder sb = new StringBuilder();
-            sb.append(createStringResource("AssignmentCatalogPanel.requestFor").getString());
-            sb.append(" ");
-            sb.append(createStringResource("AssignmentCatalogPanel.requestForMe").getString());
-            return sb.toString();
+            String label = createStringResource("AssignmentCatalogPanel.requestFor",
+                    createStringResource("AssignmentCatalogPanel.requestForMe").getString()).getString();
+            return label;
         } else if (usersList.size() == 1){
             String name = usersList.get(0).getName().getOrig();
             return createStringResource("AssignmentCatalogPanel.requestFor", name).getString();

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3951,6 +3951,9 @@ AssignmentViewType.USER_TYPE=User's assignments
 PageAssignmentsList.requestButton = Request
 operation.com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Request assignment
 com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Request assignments
+PageAssignmentsList.requestInProgress=Processing of your request is in progress. Your request may be subject to approval or other manual or asynchronous processing. Please allow sufficient time for the request to be processed.
+PageAssignmentsList.requestSuccess=Your request has been processed. Assignments are ready to use.
+PageAssignmentsList.requestError=There was an error processing your request.
 PageAssignmentsList.title=New assignments list
 PageAssignmentsList.assignmentsToRequest=Assignments to request
 PageAuditLogViewer.title=Audit Log Viewer