JNG-5859 CRUD actions

judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/data/transferDeclaration.eol

@@ -17,11 +17,25 @@ operation JSL!TransferDeclaration getExposedTransferObjects(): Set {
 
     for (relation in relations) {
         transfers.addAll(relation.referenceType.getExposedTransferObjects());
+        var targetCreateEvent = relation.referenceType.getCreateEventDeclaration();
+        if (targetCreateEvent.isDefined() and targetCreateEvent.parameterType.isKindOf(JSL!TransferDeclaration)) {
+            transfers.add(targetCreateEvent.parameterType);
+        }
     }
 
     return transfers;
 }
 
+@cached
+operation JSL!TransferDeclaration getReferencingCreateEvent(): JSL!TransferCreateDeclaration {
+    return JSL!TransferCreateDeclaration.all.selectOne(s | s.parameterType == self);
+}
+
+@cached
+operation JSL!TransferDeclaration isCreateEventParameter(): Boolean {
+    return self.getReferencingCreateEvent().isDefined();
+}
+
 @cached
 operation JSL!TransferDeclaration getExposedRelations(): Set {
     return self.collectExposedRelations(new Set());
@@ -89,7 +103,7 @@ operation JSL!TransferDeclaration getDirectRelations(): Set {
     }
 
     for (member in self.members.select(m | m.isKindOf(JSL!ViewPanelDeclaration))) {
-        relations.addAll(member.getAllRelations());
+        relations.addAll(member.getDirectRelations());
     }
 
     return relations;
@@ -110,23 +124,26 @@ operation JSL!TransferDeclaration getAllPrimitiveFields(): Set {
 @cached
 operation JSL!TransferDeclaration isDeleteSupported(): Boolean {
     if (self.map.isDefined()) {
-        return self.members.exists(m | m.isKindOf(JSL!TransferDeleteDeclaration) and m.isEventInstead());
+        var event = self.getDeleteEventDeclaration();
+        return event.isDefined() and event.isEventInstead();
     }
     return false;
 }
 
 @cached
 operation JSL!TransferDeclaration isCreateSupported(): Boolean {
     if (self.map.isDefined()) {
-        return self.members.exists(m | m.isKindOf(JSL!TransferCreateDeclaration) and m.isEventInstead());
+        var event = self.getCreateEventDeclaration();
+        return event.isDefined() and event.isEventInstead();
     }
     return false;
 }
 
 @cached
 operation JSL!TransferDeclaration isUpdateSupported(): Boolean {
     if (self.map.isDefined()) {
-        return self.members.exists(m | m.isKindOf(JSL!TransferUpdateDeclaration) and m.isEventInstead());
+        var event = self.getUpdateEventDeclaration();
+        return event.isDefined() and event.isEventInstead();
     }
     return false;
 }
@@ -154,10 +171,29 @@ operation JSL!TransferDeclaration isRefreshSupported(): Boolean {
 
 @cached
 operation JSL!TransferDeclaration isGenerated() : Boolean {
-	return actorDeclaration.getExposedTransferObjects().includes(self);
+    return actorDeclaration.getExposedTransferObjects().includes(self);
 }
 
-
 operation JSL!TransferDeclaration uiContainer() : UI!ui::VisualElement {
     return self.equivalent("TransferDeclarationVisualElement");
 }
+
+@cached
+operation JSL!TransferDeclaration getCreateEventDeclaration() : JSL!TransferCreateDeclaration {
+    return self.members.selectOne(m | m.isKindOf(JSL!TransferCreateDeclaration));
+}
+
+@cached
+operation JSL!TransferDeclaration getFetchEventDeclaration() : JSL!TransferFetchDeclaration {
+    return self.members.selectOne(m | m.isKindOf(JSL!TransferFetchDeclaration));
+}
+
+@cached
+operation JSL!TransferDeclaration getUpdateEventDeclaration() : JSL!TransferUpdateDeclaration {
+    return self.members.selectOne(m | m.isKindOf(JSL!TransferUpdateDeclaration));
+}
+
+@cached
+operation JSL!TransferDeclaration getDeleteEventDeclaration() : JSL!TransferDeleteDeclaration {
+    return self.members.selectOne(m | m.isKindOf(JSL!TransferDeleteDeclaration));
+}

judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/data/transferRelationDeclaration.eol

@@ -8,6 +8,13 @@ operation JSL!TransferRelationDeclaration getFqName(): String {
     return self.eContainer.getFqName() + "::" + self.name;
 }
 
+@cached
+operation JSL!TransferRelationDeclaration isFormRelation(): Boolean {
+    return self.isCreateAllowed()
+        and self.referenceType.getCreateEventDeclaration().isDefined()
+        and self.referenceType.getCreateEventDeclaration().parameterType.isDefined();
+}
+
 @cached
 operation JSL!TransferRelationDeclaration isEager(): Boolean {
     return jslUtils.isEager(self);
@@ -111,7 +118,7 @@ operation JSL!TransferRelationDeclaration isGetRangeAllowed(): Boolean {
 
 @cached
 operation JSL!TransferRelationDeclaration isRefreshAllowed(): Boolean {
-    return self.maps();
+    return self.maps() or self.reads();
 }
 
 @cached

judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/namespace/_importNamespace.eol

@@ -1,2 +1,3 @@
 import "modelDeclaration.eol";
 import "modifiable.eol";
+import "modifier.eol";

judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/namespace/modifier.eol

@@ -0,0 +1,9 @@
+@cached
+operation JSL!Modifier getId(): String {
+    return (self.eContainer.getId() + "/" + self.name);
+}
+
+@cached
+operation JSL!Modifier getFqName(): String {
+    return self.eContainer.getFqName() + "::" + self.name;
+}

judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/ui/_importUI.eol

@@ -1,4 +1,6 @@
+import "icon.eol";
 import "rowLinkDeclaration.eol";
+import "viewActionDeclaration.eol";
 import "viewDeclaration.eol";
 import "viewFieldDeclaration.eol";
 import "viewGroupDeclaration.eol";

judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/ui/icon.eol

@@ -0,0 +1,7 @@
+operation String createSyntheticIcon(id: String, prefix: String): UI!ui::Icon {
+    var icon: UI!ui::Icon = new UI!ui::Icon();
+    icon.iconName = self;
+    icon.name = prefix + "::" + self + "::" + "Icon";
+    icon.setId(actorDeclaration.name + "/(jsl/" + id + ")/" + self + "SyntheticIcon");
+    return icon;
+}

judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/ui/viewActionDeclaration.eol

@@ -0,0 +1,9 @@
+@cached
+operation JSL!ViewActionDeclaration getId(): String {
+    return (self.eContainer.getId() + "/" + self.name);
+}
+
+@cached
+operation JSL!ViewActionDeclaration getFqName(): String {
+    return self.eContainer.getFqName() + "::" + self.name;
+}

judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/ui/viewPanelDeclaration.eol

@@ -1,3 +1,25 @@
+@cached
+operation JSL!ViewPanelDeclaration getDirectRelations(): Set {
+    var relations = new Set();
+
+    if (self.isTypeOf(JSL!ViewGroupDeclaration)) {
+        var ownRelations = self.members.select(m | m.isKindOf(JSL!TransferRelationDeclaration));
+        relations.addAll(ownRelations);
+        for (group in self.members.select(m | m.isKindOf(JSL!ViewGroupDeclaration))) {
+            relations.addAll(group.getAllRelations());
+        }
+        for (tabs in self.members.select(m | m.isKindOf(JSL!ViewTabsDeclaration))) {
+            relations.addAll(tabs.getAllRelations());
+        }
+    } else if (self.isTypeOf(JSL!ViewTabsDeclaration)) {
+        for (group in self.groups) {
+            relations.addAll(group.getAllRelations());
+        }
+    }
+
+    return relations;
+}
+
 @cached
 operation JSL!ViewPanelDeclaration getAllRelations(): Set {
     var relations = new Set();

judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl

@@ -35,14 +35,14 @@ pre {
                group.~pos = container.groups.indexOf(group) + 1;
            }
        }
-	}
-	for (visible : JSL!VisibleDeclaration in JSL!VisibleDeclaration.all()) {
+    }
+    for (visible : JSL!VisibleDeclaration in JSL!VisibleDeclaration.all()) {
         if (visible.isTypeOf(JSL!ViewDeclaration) or visible.isTypeOf(JSL!RowDeclaration)) {
             for (member in visible.members) {
                 member.~pos = visible.members.indexOf(member) + 1;
             }
         }
-	}
+    }
 }
 
 post {

judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/application/actorDeclaration.etl

@@ -113,10 +113,10 @@ rule EmptyDashboardPageDefinition
     to t: UI!ui::PageDefinition {
         guard: s = actorDeclaration
 
-	    t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/EmptyDashboardPageDefinition");
-	    t.name = s.getFqName() + "::DashboardPage";
-		t.dashboard = true;
-		t.dataElement = s.equivalent("Actor");
+        t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/EmptyDashboardPageDefinition");
+        t.name = s.getFqName() + "::DashboardPage";
+        t.dashboard = true;
+        t.dataElement = s.equivalent("Actor");
 
         t.container = s.equivalent("EmptyDashboardPageContainer");
         actorDeclaration.equivalent("Application").pages.add(t);
@@ -130,12 +130,12 @@ rule EmptyDashboardPageContainer
         guard: s = actorDeclaration
 
         t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/EmptyDashboardPageContainer");
-    	t.name = s.getFqName() + "::Dashboard";
-    	t.label = "Dashboard";
-    	t.type = UI!ui::PageContainerType#TABLE;
-		t.dataElement = s.equivalent("Actor");
+        t.name = s.getFqName() + "::Dashboard";
+        t.label = "Dashboard";
+        t.type = UI!ui::PageContainerType#TABLE;
+        t.dataElement = s.equivalent("Actor");
 
-		actorDeclaration.equivalent("Application").pageContainers.add(t);
+        actorDeclaration.equivalent("Application").pageContainers.add(t);
 
-	    log.debug("EmptyDashboardPageContainer [" + t.name + "]");
+        log.debug("EmptyDashboardPageContainer [" + t.name + "]");
 }

judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/application/actorGroupDeclaration.etl

@@ -3,8 +3,8 @@ rule MenuItemGroup
     to t : UI!ui::NavigationItem {
         guard: s.getActorDeclaration().isDefined() and s.getActorDeclaration() == actorDeclaration
 
-          t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/MenuItemGroup");
-          t.name = s.getFqName();
+        t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/MenuItemGroup");
+        t.name = s.getFqName();
 
         log.debug("Create Navigation Group: " + s.name );
 

judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/application/actorLinkDeclaration.etl

@@ -37,7 +37,7 @@ rule AccessPageDefinition
 
         t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/AccessPageDefinition");
 
-        t.name = s.getFqName() + "::PageDefinition";
+        t.name = s.getFqName() + "::View::PageDefinition";
         t.container = s.referenceType.equivalent("TransferDeclarationPageContainer");
 
         actorDeclaration.equivalent("Application").pages.add(t);
@@ -54,16 +54,47 @@ rule AccessPageDefinition
         */
 
         for (link in relations.select(r | r.isKindOf(JSL!ViewLinkDeclaration))) {
-            t.actions.add(link.equivalent("ViewLinkDeclarationOpenPageAction"));
+            t.actions.add(link.equivalentDiscriminated("ViewLinkDeclarationOpenPageAction", "AccessPageDefinition"));
+            if (link.isRefreshAllowed() and not link.isEager()) {
+                t.actions.add(link.equivalentDiscriminated("ViewLinkDeclarationRefreshAction", "AccessPageDefinition"));
+            }
+            if (link.isCreateAllowed()) {
+                t.actions.add(link.equivalentDiscriminated("ViewLinkDeclarationOpenFormAction", "AccessPageDefinition"));
+            }
+            if (link.isDeleteAllowed()) {
+                t.actions.add(link.equivalentDiscriminated("ViewLinkDeclarationRowDeleteAction", "AccessPageDefinition"));
+            }
         }
 
         for (table in relations.select(r | r.isKindOf(JSL!ViewTableDeclaration))) {
             var detailLink = table.getDetailLink();
 
             if (detailLink.isDefined()) {
-                log.info(" - detail: true");
-                t.actions.add(table.equivalent("ViewTableDeclarationOpenPageAction"));
+                t.actions.add(table.equivalentDiscriminated("ViewTableDeclarationOpenPageAction", "AccessPageDefinition"));
+            }
+            if (table.isFilterSupported()) {
+                t.actions.add(table.equivalentDiscriminated("ViewTableDeclarationFilterAction", "AccessPageDefinition"));
+            }
+            if (table.isRefreshAllowed()) {
+                t.actions.add(table.equivalentDiscriminated("ViewTableDeclarationRefreshAction", "AccessPageDefinition"));
+            }
+            if (table.isCreateAllowed()) {
+                t.actions.add(table.equivalentDiscriminated("ViewTableDeclarationOpenCreateAction", "AccessPageDefinition"));
             }
+            if (table.isDeleteAllowed()) {
+                t.actions.add(table.equivalentDiscriminated("ViewTableDeclarationRowDeleteAction", "AccessPageDefinition"));
+            }
+        }
+
+        t.actions.add(s.equivalent("ViewLinkPageDefinitionBackAction"));
+        if (s.isRefreshAllowed()) {
+            t.actions.add(s.equivalent("ViewLinkPageDefinitionRefreshAction"));
+        }
+        if (s.isUpdateAllowed()) {
+            t.actions.add(s.equivalent("ViewLinkPageDefinitionUpdateAction"));
+        }
+        if (s.isDeleteAllowed()) {
+            t.actions.add(s.equivalent("ViewLinkPageDefinitionDeleteAction"));
         }
 
         log.debug("Create AccessPageDefinition: " + t.name);