Merge branch 'master' into production

Author: Johaney-s

perun-wui-consolidator/src/main/webapp/PerunConsolidatorCESNET.html

@@ -391,7 +391,7 @@ public interface PerunProfileTranslation extends PerunTranslation {
 	@DefaultMessage("Examples of password descriptions: “email on mobile phone” or “teleconferences on tablet”.")
 	String alternativePasswordsExample();
 
-	@DefaultMessage("Copy to clipbord")
+	@DefaultMessage("Copy to clipboard")
 	String copyPassword();
 
 	@DefaultMessage("Close")

perun-wui-consolidator/src/main/webapp/PerunConsolidatorEINFRA.html

@@ -1,7 +1,5 @@
 package cz.metacentrum.perun.wui.profile.pages.resources;
 
-
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.inject.Inject;
 import com.google.web.bindery.event.shared.EventBus;
@@ -24,7 +22,6 @@
 import cz.metacentrum.perun.wui.model.PerunException;
 import cz.metacentrum.perun.wui.model.beans.Group;
 import cz.metacentrum.perun.wui.model.beans.Member;
-import cz.metacentrum.perun.wui.model.beans.Resource;
 import cz.metacentrum.perun.wui.model.beans.RichResource;
 import cz.metacentrum.perun.wui.model.beans.Vo;
 import cz.metacentrum.perun.wui.profile.client.PerunProfileUtils;
@@ -129,7 +126,7 @@ private void loadMemberAndResources(Integer userId, int voId) {
 			@Override
 			public void onFinished(JavaScriptObject result) {
 				Member member = (Member) result;
-				loadResources(member.getId());
+				loadResources(member);
 			}
 
 			@Override
@@ -144,15 +141,15 @@ public void onLoadingStart() {
 		});
 	}
 
-	private void loadResources(int id) {
-		ResourcesManager.getAssignedRichResources(id, new JsonEvents() {
+	private void loadResources(Member member) {
+		ResourcesManager.getAssignedRichResources(member.getId(), new JsonEvents() {
 			@Override
 			public void onFinished(JavaScriptObject result) {
 				List<RichResource> resources = JsUtils.jsoAsList(result);
 				if (resources.isEmpty()) {
 					getView().setResources(new HashMap<>());
 				} else {
-					loadGroupsForResources(resources);
+					loadGroupsForResources(member, resources);
 				}
 			}
 
@@ -168,44 +165,28 @@ public void onLoadingStart() {
 		});
 	}
 
-	private void loadGroupsForResources(List<RichResource> richResources) {
+	private void loadGroupsForResources(Member member, List<RichResource> richResources) {
 		final Integer userId = PerunProfileUtils.getUserId(placeManager);
 
 		final PlaceRequest request = placeManager.getCurrentPlaceRequest();
 
 		if (userId == null) {
 			placeManager.revealErrorPlace(request.getNameToken());
 		} else {
-
-			AbstractRepeatingJsonEvent memberEvent = new AbstractRepeatingJsonEvent(richResources.size()) {
-				@Override
-				public void done(List<JavaScriptObject> results) {
-					List<Member> members = JsUtils.jsListAsList(results);
-					loadGroupsFromMembers(richResources, members);
-				}
-
-				@Override
-				public void erred(PerunException exception) {
-					getView().setResourcesDataError(exception);
-				}
-
-				@Override
-				public void started() {
-					// do nothing
-				}
-			};
-
-			for (RichResource resource : richResources) {
-				MembersManager.getMemberByUser(userId, resource.getVoId(), memberEvent);
-			}
+			loadGroupsFromMember(richResources, member);
 		}
 	}
 
-	private void loadGroupsFromMembers(List<RichResource> resources, List<Member> members) {
+	private void loadGroupsFromMember(List<RichResource> resources, Member member) {
+
+		AbstractRepeatingJsonEvent event = new AbstractRepeatingJsonEvent(resources.size()) {
 
-		AbstractRepeatingJsonEvent resourceGroupsEvent = new AbstractRepeatingJsonEvent(members.size()) {
 			@Override
 			public void done(List<JavaScriptObject> results) {
+
+				// FIXME - this doesnt makes sense as AbstractRepeatingJsonEvent merges all results together
+				// and we don't have list of "list", but just the list of all groups assigned to all resources
+				// without any mapping (by id or other) between group and resource.
 				List<List<Group>> resourcesGroups = new ArrayList<>();
 
 				for (JavaScriptObject result : results) {
@@ -232,11 +213,18 @@ public void started() {
 			}
 		};
 
-		for (int i = 0; i < members.size(); i++) {
-			Member member = members.get(i);
-			Resource resource = resources.get(i);
+		/* FIXME - temporary disabled
+		for (RichResource resource : resources) {
+			ResourcesManager.getAssignedGroups(resource.getId(), member.getId(), event);
+		}
+		*/
 
-			ResourcesManager.getAssignedGroups(resource.getId(), member.getId(), resourceGroupsEvent);
+		// pass with empty groups
+		Map<RichResource, List<Group>> resourceWithGroups = new HashMap<>();
+		for (RichResource resource : resources) {
+			resourceWithGroups.put(resource,new ArrayList<Group>());
 		}
+		getView().setResources(resourceWithGroups);
+
 	}
 }

perun-wui-profile/src/main/java/cz/metacentrum/perun/wui/profile/client/resources/PerunProfileTranslation.java

@@ -263,6 +263,8 @@ private void resolveCantBeSubmittedException() {
 			setInfo(trans.cantSubmitLoA(), trans.notEligibleMETAIDP());
 		} else if (Objects.equals("NOT_ELIGIBLE_EINFRAIDP", exception.getReason())) {
 			setInfo(trans.cantSubmitLoA(), trans.notEligibleEINFRAIDP());
+		} else if (Objects.equals("NEVER_EXPIRATION", exception.getReason())) {
+			setInfo(trans.cantSubmitLoA(), trans.expirationNever());
 		} else {
 			setInfo(trans.cantSubmitLoA(), exception.getMessage());
 		}

perun-wui-profile/src/main/java/cz/metacentrum/perun/wui/profile/pages/resources/ResourcesPresenter.java

@@ -417,6 +417,9 @@ public interface PerunRegistrarTranslation extends PerunTranslation {
 	@DefaultMessage("<p>You are signed in with an e-INFRA CZ account. You <b>cannot register or renew your membership</b> using this identity.<p>Please <b>sign-out / close all browser windows</b> and sign-in again using an external identity provider - an account from your academic organization or a social identity provider if your institution doesn`t have one.")
 	public String notEligibleEINFRAIDP();
 
+	@DefaultMessage("<p>You <b>cannot renew your membership</b> because it will never expire.")
+	public String expirationNever();
+
 	@DefaultMessage("<p>Your application still awaits for mail address verification. If you continue now, it is most probable, that service will redirect you back to the registration form.<p>Please check your mailbox for verification mail. Once your application is verified and approved, you will be able to access the service.")
 	public String redirectWaitForVerification();
 

perun-wui-profile/src/main/webapp/PerunProfileCESNET.html

@@ -104,6 +104,7 @@ public void draw() {
 				@Override
 				public void onFinished(JavaScriptObject jso) {
 					grid.setList(JsUtils.<Application>jsoAsList(jso));
+					refresh.setEnabled(true);
 				}
 
 				@Override
@@ -114,10 +115,12 @@ public void onClick(ClickEvent event) {
 							RegistrarManager.getOpenApplicationsForUser(0, retry);
 						}
 					});
+					refresh.setEnabled(true);
 				}
 
 				@Override
 				public void onLoadingStart() {
+					refresh.setEnabled(false);
 					grid.clearTable();
 					grid.getLoaderWidget().onLoading(translation.loadingApplications());
 				}
@@ -131,6 +134,7 @@ public void onLoadingStart() {
 				@Override
 				public void onFinished(JavaScriptObject jso) {
 					grid.setList(JsUtils.<Application>jsoAsList(jso));
+					refresh.setEnabled(true);
 				}
 
 				@Override
@@ -141,10 +145,12 @@ public void onClick(ClickEvent event) {
 							RegistrarManager.getApplicationsForUser(0, retry);
 						}
 					});
+					refresh.setEnabled(true);
 				}
 
 				@Override
 				public void onLoadingStart() {
+					refresh.setEnabled(false);
 					grid.clearTable();
 					grid.getLoaderWidget().onLoading(translation.loadingApplications());
 				}