fixes for #197

Author: divino

quick-start/src/main/java/com/marklogic/hub/model/EntityModel.java

@@ -107,7 +107,7 @@ public String toString() {
         sb.append("{");
         sb.append("entityName=");
         sb.append(entityName);
-        sb.append("isSynched=");
+        sb.append(" isSynched=");
         sb.append(isSynched);
         sb.append("}");
 

quick-start/src/main/java/com/marklogic/hub/service/DataHubService.java

@@ -31,6 +31,7 @@ public void install() throws DataHubException {
     }
 
     public void installUserModules() throws DataHubException {
+    	LOGGER.debug("installUserModules");
         DataHub dataHub = getDataHub();
         try {
         	LOGGER.debug("pluginDir:" + environmentConfiguration.getUserPluginDir());

quick-start/src/main/java/com/marklogic/hub/web/controller/api/DataHubServerApiController.java

@@ -52,6 +52,7 @@ public class DataHubServerApiController extends BaseController {
 			MediaType.APPLICATION_JSON_UTF8_VALUE }, produces = { MediaType.APPLICATION_JSON_UTF8_VALUE })
 	public LoginForm postLogin(@RequestBody LoginForm loginForm, BindingResult bindingResult, HttpSession session,
 			HttpServletRequest request) throws Exception {
+		LOGGER.debug("POST: login");
 		try {
 			if (isValidDirectory(loginForm.getUserPluginDir())) {
 
@@ -61,6 +62,7 @@ public LoginForm postLogin(@RequestBody LoginForm loginForm, BindingResult bindi
 				loginForm.setServerVersionAccepted(dataHubService.isServerAcceptable());
 				loginForm.setHasErrors(false);
 				loginForm.setLoggedIn(true);
+				loginForm.setUninstalling(false);
 				environmentConfiguration.saveConfigurationToFile();
 				session.setAttribute("loginForm", loginForm);
 
@@ -106,32 +108,26 @@ private boolean isValidDirectory(String userPluginDir) {
 		return false;
 	}
 
-	@RequestMapping(value = "login", method = RequestMethod.GET)
+	@RequestMapping(value = "login-status", method = RequestMethod.GET)
 	public LoginForm getLoginStatus(HttpSession session) {
+		LOGGER.debug("GET: login-status");
 		LoginForm loginForm = (LoginForm) session.getAttribute("loginForm");
+		
 		if (loginForm == null) {
+			// need to load last configuration
 			loginForm = new LoginForm();
 			this.environmentConfiguration.loadConfigurationFromFiles();
 			this.retrieveEnvironmentConfiguration(loginForm);
+			loginForm.setUninstalling(false);
 			session.setAttribute("loginForm", loginForm);
-
 		} else if (loginForm.isInstalled()) {
 			loginForm.setEntities(entityManagerService.getEntities());
 			loginForm.refreshSelectedEntity();
-
-			List<EntityModel> entities = loginForm.getEntities();
-			for (Iterator iterator = entities.iterator(); iterator.hasNext();) {
-				EntityModel entityModel = (EntityModel) iterator.next();
-				if (!entityModel.isSynched()) {
-					synchronized (syncStatusService) {
-						LOGGER.debug("not synched ... installing modules ...");
-						this.installUserModules(session);
-						LOGGER.debug("modules installed.");
-					}
-					break;
-				}
+			synchronized (syncStatusService) {
+				LOGGER.debug("installing modules ...");
+				this.installUserModules(session);
+				LOGGER.debug("modules installed.");
 			}
-
 		}
 
 		LOGGER.debug("after login: " + loginForm.toString());
@@ -141,8 +137,10 @@ public LoginForm getLoginStatus(HttpSession session) {
 
 	@RequestMapping(value = "logout", method = RequestMethod.POST)
 	public LoginForm postLogout(HttpSession session) {
+		LOGGER.debug("POST: logout");
 		LoginForm loginForm = (LoginForm) session.getAttribute("loginForm");
 		loginForm.setLoggedIn(false);
+		loginForm.setUninstalling(false);
 		this.retrieveEnvironmentConfiguration(loginForm);
 
 		Enumeration<String> attrNames = session.getAttributeNames();
@@ -155,6 +153,7 @@ public LoginForm postLogout(HttpSession session) {
 
 	@RequestMapping(value = "install", method = RequestMethod.POST)
 	public LoginForm install(HttpSession session) {
+		LOGGER.debug("POST: install");
 		dataHubService.install();
 		LoginForm loginForm = (LoginForm) session.getAttribute("loginForm");
 		loginForm.setInstalled(true);
@@ -164,15 +163,18 @@ public LoginForm install(HttpSession session) {
 
 	@RequestMapping(value = "uninstall", method = RequestMethod.POST)
 	public LoginForm uninstall(HttpSession session) {
-		dataHubService.uninstall();
+		LOGGER.debug("POST: uninstall");
 		LoginForm loginForm = (LoginForm) session.getAttribute("loginForm");
+		loginForm.setUninstalling(true);
+		dataHubService.uninstall();
 		loginForm.setInstalled(false);
 		this.unLoadUserModules(loginForm);
 		return loginForm;
 	}
 
 	@RequestMapping(value = "install-user-modules", method = RequestMethod.POST)
 	public LoginForm installUserModules(HttpSession session) {
+		LOGGER.debug("POST: install-user-modules");
 		synchronized (syncStatusService) {
 			dataHubService.installUserModules();
 
@@ -188,6 +190,7 @@ public LoginForm installUserModules(HttpSession session) {
 
 	@RequestMapping(value = "validate-user-modules", method = RequestMethod.GET)
 	public JsonNode validateUserModules(HttpSession session) {
+		LOGGER.debug("GET: validate-user-modules");
 		synchronized (syncStatusService) {
 			return dataHubService.validateUserModules();
 		}

quick-start/src/main/java/com/marklogic/hub/web/controller/api/EntityApiController.java

@@ -99,35 +99,41 @@ public LoginForm saveEntity(@RequestBody EntityForm entityForm, BindingResult bi
 	 */
 	@RequestMapping(value = "status-change", method = RequestMethod.GET)
 	public LoginForm getStatusChange(HttpServletRequest request) {
+		LOGGER.debug("GET: status-change");
 		HttpSession session = request.getSession();
 
 		synchronized (syncStatusService) {
 			try {
 				syncStatusService.wait();
-				LOGGER.debug("status change");
 			} catch (InterruptedException e) {
 			}
 
 			// refresh the list of entities saved in the session
 			LoginForm loginForm = (LoginForm) session.getAttribute("loginForm");
-			if (null == loginForm) {
-				loginForm = new LoginForm();
+			if (null != loginForm && loginForm.isLoggedIn()) {
+				LOGGER.debug("status change:" + loginForm.toString());
+				// add checking if data hub is installed and the server is
+				// acceptable. Something may have changed the server or removed
+				// the
+				// data hub outside the app
+
+				if (!loginForm.isUninstalling()) {
+					loginForm.setInstalled(dataHubService.isInstalled());
+					loginForm.setServerVersionAccepted(dataHubService.isServerAcceptable());
+					if (loginForm.isInstalled()) {
+						// if (loginForm.isInstalled()) {
+						List<EntityModel> entities = entityManagerService.getEntities();
+						loginForm.setEntities(entities);
+						loginForm.refreshSelectedEntity();
+					}
+				}
+
+				// refresh the session loginForm
+				session.setAttribute("loginForm", loginForm);
+				// LOGGER.debug("installing modules ...");
+				// dataHubService.installUserModules();
 			}
 
-			// add checking if data hub is installed and the server is
-			// acceptable. Something may have changed the server or removed the
-			// data hub outside the app
-			loginForm.setInstalled(dataHubService.isInstalled());
-			loginForm.setServerVersionAccepted(dataHubService.isServerAcceptable());
-			if (loginForm.isInstalled()) {
-				List<EntityModel> entities = entityManagerService.getEntities();
-				loginForm.setEntities(entities);
-				loginForm.refreshSelectedEntity();
-			}
-
-			// refresh the session loginForm
-			session.setAttribute("loginForm", loginForm);
-
 			return loginForm;
 		}
 	}
@@ -148,10 +154,8 @@ public void destroy() throws Exception {
 	@Override
 	public void onWatchEvent(Path path, WatchEvent<Path> event) {
 		synchronized (syncStatusService) {
-        	LOGGER.debug("change detected ...");
+			LOGGER.debug("change detected ...");
 			syncStatusService.notifyAll();
-        	LOGGER.debug("installing modules ...");
-			dataHubService.installUserModules();
 		}
 	}
 }

quick-start/src/main/java/com/marklogic/hub/web/form/LoginForm.java

@@ -18,6 +18,7 @@ public class LoginForm extends BaseForm {
 	private boolean serverVersionAccepted;
 	private boolean installed;
 	private boolean loggedIn;
+	private boolean uninstalling;
     private List<EntityModel> entities = new ArrayList<EntityModel>();
     private EntityModel selectedEntity;
 
@@ -89,6 +90,14 @@ public boolean isLoggedIn() {
 		return loggedIn;
 	}
 
+	public boolean isUninstalling() {
+		return uninstalling;
+	}
+
+	public void setUninstalling(boolean uninstalling) {
+		this.uninstalling = uninstalling;
+	}
+
 	public void setLoggedIn(boolean loggedIn) {
 		this.loggedIn = loggedIn;
 	}
@@ -144,7 +153,8 @@ public String toString() {
 		return "LoginForm [mlHost=" + mlHost + ", mlStagingPort=" + mlStagingPort + ", mlFinalPort=" + mlFinalPort
 				+ ", mlTracePort=" + mlTracePort + ", mlUsername=" + mlUsername + ", mlPassword=" + mlPassword
 				+ ", userPluginDir=" + userPluginDir + ", serverVersionAccepted=" + serverVersionAccepted
-				+ ", installed=" + installed + ", loggedIn=" + loggedIn + ", entities=" + entities + ", selectedEntity="
+				+ ", installed=" + installed + ", loggedIn=" + loggedIn + " uninstalling=" + uninstalling  
+				+ ", entities=" + entities + ", selectedEntity="
 				+ selectedEntity + "]";
 	}
 

quick-start/src/main/resources/static/app/services/dataHubService.js

@@ -52,7 +52,7 @@
     }
 
     function getLoginStatus() {
-      return $http.get('api/data-hub/login')
+      return $http.get('api/data-hub/login-status')
         .success(function(data) {
           self.status = data;
         })
@@ -203,11 +203,11 @@
         'params': params
       });
     }
-    
+
     function getJsonFile(filePath) {
       return $http.get(filePath);
     }
-    
+
     function downloadMlcpOptionsFile(data) {
       return $http.post('api/flows/options/download', data);
     }