Remove Menu from node

adempiere · Jun 18, 2024 · 41bd5c2 · 41bd5c2
1 parent 2226b56
commit 41bd5c2
Show file tree

Hide file tree

Showing 6 changed files with 185 additions and 225 deletions.
diff --git a/src/main/java/org/spin/eca56/process/ExportDictionaryDefinition.java b/src/main/java/org/spin/eca56/process/ExportDictionaryDefinition.java
@@ -27,13 +27,15 @@
 import org.adempiere.core.domains.models.I_AD_Form;
 import org.adempiere.core.domains.models.I_AD_Menu;
 import org.adempiere.core.domains.models.I_AD_Process;
+import org.adempiere.core.domains.models.I_AD_Role;
 import org.adempiere.core.domains.models.I_AD_Tree;
 import org.adempiere.core.domains.models.I_AD_Window;
 import org.adempiere.model.MBrowse;
 import org.compiere.model.MClientInfo;
 import org.compiere.model.MForm;
 import org.compiere.model.MMenu;
 import org.compiere.model.MProcess;
+import org.compiere.model.MRole;
 import org.compiere.model.MTree;
 import org.compiere.model.MTreeNode;
 import org.compiere.model.MWindow;
@@ -85,7 +87,6 @@ protected String doIt() throws Exception {
 
 	private void exportMenuDefinition() {
 		exportTree();
-		exportMenuItemDefinition();
 		//	Old implementation
 		if (this.getMenuId() > 0) {
 			addLog("@AD_Menu_ID@");
@@ -129,6 +130,7 @@ private void exportMenuDefinition() {
 	}
 
 	private void exportTree() {
+		exportRoleDefinition();
 		new Query(
 				getCtx(),
 				I_AD_Tree.Table_Name,
@@ -149,6 +151,30 @@ private void exportTree() {
 				counter.incrementAndGet();
 			})
 		;
+		exportMenuItemDefinition();
+	}
+
+	private void exportRoleDefinition() {
+		addLog("@AD_Role_ID@");
+		new Query(
+				getCtx(),
+				I_AD_Role.Table_Name,
+				null,
+				get_TrxName()
+		)
+			.setOnlyActiveRecords(true)
+			.getIDsAsList()
+			.forEach(roleId -> {
+				MRole role = MRole.get(getCtx(), roleId);
+				QueueLoader.getInstance()
+					.getQueueManager(ApplicationDictionary.CODE)
+					.withEntity(role)
+					.addToQueue()
+				;
+				addLog(role.getAD_Role_ID() + " - " + role.getName());
+				counter.incrementAndGet();
+			})
+		;
 	}
 
 	private void exportMenuItemDefinition() {

diff --git a/src/main/java/org/spin/eca56/util/queue/ApplicationDictionary.java b/src/main/java/org/spin/eca56/util/queue/ApplicationDictionary.java
@@ -37,10 +37,10 @@
 import org.spin.eca56.util.support.IGenericSender;
 import org.spin.eca56.util.support.documents.Browser;
 import org.spin.eca56.util.support.documents.Form;
-import org.spin.eca56.util.support.documents.Menu;
 import org.spin.eca56.util.support.documents.MenuItem;
 import org.spin.eca56.util.support.documents.MenuTree;
 import org.spin.eca56.util.support.documents.Process;
+import org.spin.eca56.util.support.documents.Role;
 import org.spin.eca56.util.support.documents.Window;
 import org.spin.queue.model.MADQueue;
 import org.spin.queue.util.QueueManager;
@@ -136,6 +136,8 @@ public IGenericDictionaryDocument getDocumentManager(PO entity) {
 		}
 		if(tableName.equals(I_AD_Tree.Table_Name)) {
 			return MenuTree.newInstance().withEntity(entity);
+		} else if(tableName.equals(I_AD_Role.Table_Name)) {
+			return Role.newInstance().withClientId(Env.getAD_Client_ID(entity.getCtx())).withEntity(entity);
 		}
 		return null;
 	}
@@ -173,7 +175,7 @@ public IGenericDictionaryDocument getDocumentManagerByRole(PO entity, String lan
 		} else if(tableName.equals(I_AD_Window.Table_Name)) {
 			return null;//Window.newInstance().withLanguage(language).withClientId(Env.getAD_Client_ID(entity.getCtx())).withEntity(entity);
 		} else if(tableName.equals(I_AD_Menu.Table_Name)) {
-			return Menu.newInstance().withLanguage(language).withClientId(Env.getAD_Client_ID(entity.getCtx())).withRoleId(roleId).withEntity(entity);
+			return null;//Menu.newInstance().withLanguage(language).withClientId(Env.getAD_Client_ID(entity.getCtx())).withRoleId(roleId).withEntity(entity);
 		}
 		return null;
 	}

diff --git a/src/main/java/org/spin/eca56/util/support/DictionaryDocument.java b/src/main/java/org/spin/eca56/util/support/DictionaryDocument.java
@@ -22,6 +22,7 @@
 
 import org.compiere.model.PO;
 import org.compiere.util.Env;
+import org.compiere.util.Util;
 
 /**
  * 	Interface for determinate if is a document to send, note that this is a mapping of values.
@@ -60,7 +61,9 @@ public Map<String, Object> getValues() {
 
 	public void putDocument(Map<String, Object> document) {
 		//	Generic Detail
-		document.put("language", getLanguage());
+		if(!Util.isEmpty(getLanguage())) {
+			document.put("language", getLanguage());
+		}
 		if(getClientId() >= 0) {
 			document.put("client_id", getClientId());
 		}
@@ -112,8 +115,9 @@ public String getLanguage() {
 
 	private String getIndexValue() {
 		StringBuffer channel = new StringBuffer(getChannel());
-
-		channel.append("_").append(getLanguage());
+		if(!Util.isEmpty(getLanguage())) {
+			channel.append("_").append(getLanguage());
+		}
 		if(getClientId() >= 0) {
 			channel.append("_").append(getClientId());
 		}

diff --git a/src/main/java/org/spin/eca56/util/support/documents/Menu.java b/src/main/java/org/spin/eca56/util/support/documents/Menu.java
diff --git a/src/main/java/org/spin/eca56/util/support/documents/MenuTree.java b/src/main/java/org/spin/eca56/util/support/documents/MenuTree.java
@@ -105,6 +105,11 @@ private MenuTree() {
 	public static MenuTree newInstance() {
 		return new MenuTree();
 	}
+
+	@Override
+	public String getLanguage() {
+		return null;
+	}
 
 	@Override
 	public String getChannel() {