I18n redesign

.github/workflows/build.yml

@@ -14,12 +14,6 @@ jobs:
         with:
           path: Vitro
 
-      - name: Checkout vitro languages
-        uses: actions/checkout@v3
-        with:
-          repository: vivo-project/Vitro-languages
-          path: Vitro-languages
-
       - name: Maven Cache
         uses: actions/cache@v2
         with:
@@ -34,7 +28,5 @@ jobs:
 
       - name: Maven Build
         run: |
-          cd ./Vitro-languages
-          mvn clean install
-          cd ../Vitro
+          cd ./Vitro
           mvn clean install

api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java

@@ -6,8 +6,6 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -17,6 +15,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
@@ -272,6 +271,37 @@ public static List<Option> makeOptionListOfSubVClasses(
 		return options;
 	}
 
+    public static List<Option> makeOptionListOfNotDisjointClasses(WebappDaoFactory wadf, String baseVclassUri, String selectedUri) {
+        VClassDao vClassDao = wadf.getVClassDao();
+        Set<String> uris = getNotDisjointClassUris(wadf, baseVclassUri, vClassDao);
+        uris.add(baseVclassUri);
+
+        List<Option> options = new LinkedList<>();
+        for (String vclassUri : uris) {
+            VClass vclass = vClassDao.getVClassByURI(vclassUri);
+            Option option = new Option();
+            option.setValue(vclass.getURI());
+            option.setBody(vclass.getPickListName());
+            options.add(option);
+            if (Objects.equals(selectedUri, vclass.getURI())) {
+                option.setSelected(true);
+            }
+        }
+        options.sort((o1, o2) -> o1.getBody().compareTo(o2.getBody()));
+        return options;
+    }
+
+	private static Set<String> getNotDisjointClassUris(WebappDaoFactory wadf, String classUri, VClassDao vClassDao) {
+		Set<String> allClasses = wadf.getVClassDao()
+				.getAllVclasses()
+				.stream()
+				.map(vclass -> vclass.getURI())
+				.collect(Collectors.toSet());
+		Set<String> disjointClasses = new HashSet<>(vClassDao.getDisjointWithClassURIs(classUri));
+		allClasses.removeAll(disjointClasses);
+		return allClasses;
+	}
+
     public static void beanSet(Object newObj, String field, String value) {
         beanSet (newObj, field, value, null);
     }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataProperty.java

@@ -87,6 +87,11 @@ public void setDomainClassURI(String domainClassURI) {
     public String getRangeDatatypeURI() {
         return rangeDatatypeURI;
     }
+
+    @Override
+    public String getRangeVClassURI() {
+        return rangeDatatypeURI;
+    }
 
     public void setRangeDatatypeURI(String rangeDatatypeURI) {
         this.rangeDatatypeURI = rangeDatatypeURI;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java

@@ -6,6 +6,8 @@
 
 import java.util.Objects;
 
+import org.apache.commons.lang3.StringUtils;
+
 import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.RoleRestrictedProperty;
 
 /**
@@ -20,7 +22,9 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 	private String configUri;
 
 	// Must not be null on insert or update. Partial identifier on delete.
-	private String rangeURI;
+	private String rangeURI = "";
+
+	private String rootRangeURI;
 	// May be null. Partial identifier on delete.
 	private String domainURI;
 
@@ -55,7 +59,7 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 	 */
 	public FauxProperty(String domainURI, String baseURI, String rangeURI) {
 		super(Objects.requireNonNull(baseURI, "baseURI may not be null"));
-		this.rangeURI = rangeURI;
+		this.setRangeURI(rangeURI);
 		this.domainURI = domainURI;
 	}
 
@@ -93,7 +97,11 @@ public String getRangeURI() {
 	}
 
 	public void setRangeURI(String rangeURI) {
-		this.rangeURI = rangeURI;
+		if (StringUtils.isEmpty(rangeURI)) {
+			this.rangeURI = "";
+		} else {
+			this.rangeURI = rangeURI;	
+		}
 	}
 
 	public String getBaseLabel() {
@@ -105,7 +113,14 @@ public void setBaseLabel(String baseLabel) {
 	}
 
 	public String getRangeLabel() {
-		return (rangeLabel == null) ? localName(rangeURI) : rangeLabel;
+		if  (StringUtils.isEmpty(rangeLabel)) {
+			if (StringUtils.isEmpty(rangeURI)) {
+				return "untyped";
+			}
+			return localName(rangeURI);
+		} else {
+			return rangeLabel;
+		}
 	}
 
 	public void setRangeLabel(String rangeLabel) {
@@ -247,4 +262,12 @@ public String getDomainVClassURI() {
 	public String getRangeVClassURI() {
 		return getRangeURI();
 	}
+
+	public void setRootRangeUri(String rootRangeUri) {
+		this.rootRangeURI = rootRangeUri;
+	}
+
+	public String getRootRangeUri() {
+		return rootRangeURI;
+	}
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java

@@ -4,7 +4,6 @@
 
 import java.beans.XMLEncoder;
 import java.text.Collator;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.Iterator;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSmokeTests.java

@@ -160,7 +160,7 @@ private void checkLanguages(ServletContext ctx, ConfigurationProperties props, S
 				String vivoBundle = VIVO_BUNDLE_PREFIX + language + ".properties";
 				String vitroBundle = VITRO_BUNDLE_PREFIX + language + ".properties";
 				if (!i18nNames.contains(vivoBundle) && !i18nNames.contains(vitroBundle)) {
-					ss.warning(this, language + " was found in the value for "
+					ss.info(this, language + " was found in the value for "
 						+ PROPERTY_LANGUAGE_SELECTABLE + " but no corresponding "
 							+ "language file was found.");
 				}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBean.java

@@ -41,7 +41,7 @@ public class RevisionInfoBean {
 			new Date(0), Collections.singleton(LevelRevisionInfo.DUMMY_LEVEL));
 
 	/** The bean is attached to the session by this name. */
-	static final String ATTRIBUTE_NAME = RevisionInfoBean.class.getName();
+	public static final String ATTRIBUTE_NAME = RevisionInfoBean.class.getName();
 
 	// ----------------------------------------------------------------------
 	// static methods

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java

@@ -21,7 +21,6 @@ public class Controllers {
 
     public static final String ABOUT = "/about";
     public static final String CONTACT_URL = "/comments";
-    public static final String TERMS_OF_USE_URL = "/termsOfUse";
     public static final String SEARCH_URL = "/search";
     public static final String ENTITY = "/entity";
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPageStrategy.java

@@ -57,8 +57,6 @@ public UserAccountsAddPageStrategy(VitroRequest vreq,
 
 	private static class EmailStrategy extends UserAccountsAddPageStrategy {
 		public static final String CREATE_PASSWORD_URL = "/accounts/createPassword";
-		private static final String EMAIL_TEMPLATE_WITH_PASSWORD = "userAccounts-acctCreatedEmail.ftl";
-		private static final String EMAIL_TEMPLATE_NO_PASSWORD = "userAccounts-acctCreatedExternalOnlyEmail.ftl";
 
 		private boolean sentEmail;
 
@@ -100,15 +98,19 @@ protected void notifyUser() {
 			body.put("userAccount", page.getAddedAccount());
 			body.put("passwordLink", buildCreatePasswordLink());
 			body.put("siteName", getSiteName());
-
 			FreemarkerEmailMessage email = FreemarkerEmailFactory
 					.createNewMessage(vreq);
 			email.addRecipient(TO, page.getAddedAccount().getEmailAddress());
-			email.setSubject(i18n.text("account_created_subject", getSiteName()));
+			String subject = i18n.text("account_created_subject", getSiteName());
+			email.setSubject(subject);
 			if (page.isExternalAuthOnly()) {
-				email.setTemplate(EMAIL_TEMPLATE_NO_PASSWORD);
+				body.put("subject", subject);
+				body.put("textMessage", i18n.text("acct_created_external_only_email_plain_text"));
+				body.put("htmlMessage", i18n.text("acct_created_external_only_email_html_text"));
 			} else {
-				email.setTemplate(EMAIL_TEMPLATE_WITH_PASSWORD);
+				body.put("subject", subject);
+				body.put("textMessage", i18n.text("acct_created_email_plain_text"));
+				body.put("htmlMessage", i18n.text("acct_created_email_html_text"));
 			}
 			email.setBodyMap(body);
 			email.processTemplate();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java

@@ -56,8 +56,6 @@ public UserAccountsEditPageStrategy(VitroRequest vreq,
 
 	private static class EmailStrategy extends UserAccountsEditPageStrategy {
 		private static final String PARAMETER_RESET_PASSWORD = "resetPassword";
-		private static final String EMAIL_TEMPLATE = "userAccounts-passwordResetPendingEmail.ftl";
-
 		public static final String RESET_PASSWORD_URL = "/accounts/resetPassword";
 
 		private boolean resetPassword;
@@ -107,11 +105,13 @@ protected void notifyUser() {
 			body.put("userAccount", page.getUpdatedAccount());
 			body.put("passwordLink", buildResetPasswordLink());
 			body.put("siteName", getSiteName());
+			body.put("subject", i18n.text("password_reset_pending_email_subject"));
+			body.put("textMessage",i18n.text("password_reset_pending_email_plain_text"));
+			body.put("htmlMessage", i18n.text("password_reset_pending_email_html_text"));
 
 			FreemarkerEmailMessage email = FreemarkerEmailFactory
 					.createNewMessage(vreq);
 			email.addRecipient(TO, page.getUpdatedAccount().getEmailAddress());
-			email.setTemplate(EMAIL_TEMPLATE);
 			email.setBodyMap(body);
 			email.processTemplate();
 			email.send();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java

@@ -26,8 +26,6 @@ public class UserAccountsCreatePasswordPage extends
 			.getLog(UserAccountsCreatePasswordPage.class);
 
 	private static final String TEMPLATE_NAME = "userAccounts-createPassword.ftl";
-	private static final String EMAIL_TEMPLATE = "userAccounts-passwordCreatedEmail.ftl";
-
 	public UserAccountsCreatePasswordPage(VitroRequest vreq) {
 		super(vreq);
 	}
@@ -73,8 +71,11 @@ private void notifyUser() {
 		FreemarkerEmailMessage email = FreemarkerEmailFactory
 				.createNewMessage(vreq);
 		email.addRecipient(TO, userAccount.getEmailAddress());
-		email.setSubject(i18n.text("password_created_subject", getSiteName()));
-		email.setTemplate(EMAIL_TEMPLATE);
+		final String subject = i18n.text("password_created_subject", getSiteName());
+		email.setSubject(subject);
+		body.put("subject", subject);
+		body.put("textMessage", i18n.text("password_created_email_plain_text"));
+		body.put("htmlMessage", i18n.text("password_created_email_html_text"));
 		email.setBodyMap(body);
 		email.processTemplate();
 		email.send();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java

@@ -52,8 +52,6 @@ public UserAccountsFirstTimeExternalPageStrategy(VitroRequest vreq,
 	public static class EmailStrategy extends
 			UserAccountsFirstTimeExternalPageStrategy {
 
-		private static final String EMAIL_TEMPLATE = "userAccounts-firstTimeExternalEmail.ftl";
-
 		public EmailStrategy(VitroRequest vreq,
 				UserAccountsFirstTimeExternalPage page) {
 			super(vreq, page);
@@ -73,8 +71,11 @@ public void notifyUser(UserAccount ua) {
 			FreemarkerEmailMessage email = FreemarkerEmailFactory
 					.createNewMessage(vreq);
 			email.addRecipient(TO, ua.getEmailAddress());
-			email.setSubject(i18n.text("account_created_subject", getSiteName()));
-			email.setTemplate(EMAIL_TEMPLATE);
+			final String subject = i18n.text("account_created_subject", getSiteName());
+			email.setSubject(subject);
+			body.put("subject", subject);
+			body.put("textMessage", i18n.text("first_time_external_email_plain_text"));
+			body.put("htmlMessage", i18n.text("first_time_external_email_html_text"));
 			email.setBodyMap(body);
 			email.processTemplate();
 			email.send();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java

@@ -108,8 +108,6 @@ private static class InternalAuthStrategy extends
 		private static final String ERROR_WRONG_PASSWORD_LENGTH = "errorPasswordIsWrongLength";
 		private static final String ERROR_PASSWORDS_DONT_MATCH = "errorPasswordsDontMatch";
 
-		private static final String EMAIL_TEMPLATE = "userAccounts-confirmEmailChangedEmail.ftl";
-
 		private final String originalEmail;
 
 		private String newPassword;
@@ -179,8 +177,11 @@ public void notifyUser() {
 			FreemarkerEmailMessage email = FreemarkerEmailFactory
 					.createNewMessage(vreq);
 			email.addRecipient(TO, page.getUserAccount().getEmailAddress());
-			email.setSubject(i18n.text("email_changed_subject", getSiteName()));
-			email.setTemplate(EMAIL_TEMPLATE);
+			final String subject = i18n.text("email_changed_subject", getSiteName());
+			email.setSubject(subject);
+			body.put("subject", subject);
+			body.put("textMessage", i18n.text("confirm_email_changed_email_plain_text"));
+			body.put("htmlMessage", i18n.text("confirm_email_changed_email_html_text"));
 			email.setBodyMap(body);
 			email.processTemplate();
 			email.send();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java

@@ -26,8 +26,6 @@ public class UserAccountsResetPasswordPage extends UserAccountsPasswordBasePage
 
 	private static final String TEMPLATE_NAME = "userAccounts-resetPassword.ftl";
 
-	private static final String EMAIL_TEMPLATE = "userAccounts-passwordResetCompleteEmail.ftl";
-
 	protected UserAccountsResetPasswordPage(VitroRequest vreq) {
 		super(vreq);
 	}
@@ -68,14 +66,16 @@ protected String templateName() {
 
 	private void notifyUser() {
 		Map<String, Object> body = new HashMap<String, Object>();
+		FreemarkerEmailMessage email = FreemarkerEmailFactory.createNewMessage(vreq);
+		final String subject = i18n.text("password_changed_subject");
+		email.setSubject(subject);
+
 		body.put("userAccount", userAccount);
 		body.put("siteName", getSiteName());
-
-		FreemarkerEmailMessage email = FreemarkerEmailFactory
-				.createNewMessage(vreq);
+		body.put("subject", subject);
+		body.put("textMessage", i18n.text("password_reset_complete_email_plain_text"));
+		body.put("htmlMessage", i18n.text("password_reset_complete_email_html_text"));
 		email.addRecipient(TO, userAccount.getEmailAddress());
-		email.setSubject(i18n.text("password_changed_subject"));
-		email.setTemplate(EMAIL_TEMPLATE);
 		email.setBodyMap(body);
 		email.processTemplate();
 		email.send();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java

@@ -22,6 +22,7 @@
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
 import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
@@ -176,6 +177,11 @@ public void doPost (HttpServletRequest request, HttpServletResponse response) {
                 assertionsDpDao.getEquivalentPropertyURIs(dp.getURI()), assertionsDpDao);
         sortForPickList(eqProps, vreq);
         request.setAttribute("equivalentProperties", eqProps);
+
+        List<FauxProperty> fauxProps = vreq.getUnfilteredAssertionsWebappDaoFactory().getFauxPropertyDao().
+        		getFauxPropertiesForBaseUri(dp.getURI());
+        sortForPickList(fauxProps, vreq);
+        request.setAttribute("fauxproperties", fauxProps);	
 
         ApplicationBean appBean = vreq.getAppBean();