Merge pull request #71 from jGauravGupta/FISH-9548-2

FISH-9548 Added placeholder/tooltip added to UI components and Source Editor focused
payara · Oct 10, 2024 · 7a998db · 7a998db
2 parents 2644404 + fe6c3b5
commit 7a998db
Show file tree

Hide file tree

Showing 37 changed files with 147 additions and 113 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,6 @@
 /starter-archetype/payara-starter-archetype.iml
 /starter-archetype/src/main/resources/archetype-resources/.gradle
 /starter-ui/payara-starter-ui.iml
-/PayaraStarterGenerator/target/
+/starter-generator/target/
 starter-ui/nb-configuration.xml
 starter-ui/nb-configuration.xml
diff --git a/pom.xml b/pom.xml
@@ -72,7 +72,7 @@
     <modules>
         <module>starter-archetype</module>
         <module>starter-ui</module>
-        <module>PayaraStarterGenerator</module>
+        <module>starter-generator</module>
     </modules>
 
     <build>

diff --git a/starter-archetype/src/main/resources/META-INF/archetype-post-generate.groovy b/starter-archetype/src/main/resources/META-INF/archetype-post-generate.groovy
@@ -16,12 +16,13 @@ def mpOpenAPI = request.properties["mpOpenAPI"].trim()
 def mpFaultTolerance = request.properties["mpFaultTolerance"].trim()
 def mpMetrics = request.properties["mpMetrics"].trim()
 def auth = request.properties["auth"].trim()
+def erDiagram = request.properties["erDiagram"].trim()
 
 def outputDirectory = new File(request.getOutputDirectory(), request.getArtifactId())
 
 validateInput(profile, jakartaEEVersion, javaVersion, platform, outputDirectory)
 generateSource(build, _package, platform, jakartaEEVersion, includeTests, docker, mpConfig, mpOpenAPI, auth, outputDirectory)
-bindEEPackage(jakartaEEVersion, mpConfig, mpOpenAPI, mpFaultTolerance, mpMetrics, auth, outputDirectory)
+bindEEPackage(jakartaEEVersion, mpConfig, mpOpenAPI, mpFaultTolerance, mpMetrics, auth, erDiagram, outputDirectory)
 
 private void validateInput(String profile, String jakartaEEVersion, String javaVersion, String platform, File outputDirectory) {
     boolean deleteDirectory = true;
@@ -136,15 +137,16 @@ private generateSource(build, _package, platform, jakartaEEVersion,
     }
 }
 
-private void bindEEPackage(String jakartaEEVersion, String mpConfig, String mpOpenAPI, String mpFaultTolerance, String mpMetrics, String auth, File outputDirectory) {
+private void bindEEPackage(String jakartaEEVersion, String mpConfig, String mpOpenAPI, String mpFaultTolerance, String mpMetrics, String auth, String erDiagram, File outputDirectory) {
     def eePackage = (jakartaEEVersion == '8') ? 'javax' : 'jakarta'
     println "Binding EE package: $eePackage"
 
     def binding = [eePackage: eePackage, \
         'mpConfig': mpConfig.toBoolean(), 'mpOpenAPI': mpOpenAPI.toBoolean(), 'mpFaultTolerance': mpFaultTolerance.toBoolean(), 'mpMetrics': mpMetrics.toBoolean(),
         'formAuthFileRealm': auth.equals("formAuthFileRealm"),
         'formAuthDB': auth.equals("formAuthDB"),
-        'formAuthLDAP': auth.equals("formAuthLDAP")
+        'formAuthLDAP': auth.equals("formAuthLDAP"),
+        'erDiagram': erDiagram.toBoolean()
     ]
     def engine = new SimpleTemplateEngine()
 

diff --git a/starter-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/starter-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -138,6 +138,13 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
             <defaultValue>none</defaultValue>
             <validationRegex>^(none|formAuthFileRealm|formAuthDB|formAuthLDAP)$</validationRegex>
         </requiredProperty>
+        <requiredProperty key="erDiagram">
+            <defaultValue>false</defaultValue>
+            <validationRegex>^(false|true)$</validationRegex>
+        </requiredProperty>
+        <requiredProperty key="erDiagramName">
+            <defaultValue></defaultValue>
+        </requiredProperty>
     </requiredProperties>
 
     <fileSets>

diff --git a/starter-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html b/starter-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html
@@ -16,21 +16,25 @@
     </head>
     <body>
 
-
         <h1>Greetings from Payara!</h1>
         <p>
             Thank you for visiting <a href="https://www.payara.fish/">Payara</a>! We're thrilled to have you here. Payara is your go-to destination for all things Jakarta EE and Java enterprise applications.
         </p>
         <p>
             <a href="https://www.payara.fish/"><img width="50%" src="images/payara-fish-logo.svg" alt="Payara Logo"></a>
         </p>
-
+        <% if (erDiagram) { %>
+        <h2>${erDiagramName} Home Page</h2>
+        <p>
+            To manage the ${erDiagramName}, visit the home page: 
+            <a href="main.html">Main Page</a>.
+        </p>
+        <% } %>
         <h2>RESTful Service</h2>
         <p>
             The REST end-point is available at <a href="resources/hello">resources/hello</a>.
             You can supply a name to the end-point using a query parameter like this: <a href="resources/hello?name=John">resources/hello?name=John</a>
         </p>
-
         <% if (formAuthFileRealm || formAuthDB || formAuthLDAP) { %>
         <h2>Secure Pages</h2>
         <p>
@@ -50,7 +54,6 @@ <h2>Secured RESTful Endpoints</h2>
             <li><a href="resources/admin">Secured Admin Resource</a></li>
         </ul>
         <% } %>
-
         <% if (mpOpenAPI) { %>        
         <h2>API Documentation</h2>
         <p>

diff --git a/PayaraStarterGenerator/pom.xml → starter-generator/pom.xml b/PayaraStarterGenerator/pom.xml → starter-generator/pom.xml
diff --git a/...starter/application/domain/Attribute.java → ...starter/application/domain/Attribute.java b/...starter/application/domain/Attribute.java → ...starter/application/domain/Attribute.java
diff --git a/.../starter/application/domain/Constant.java → .../starter/application/domain/Constant.java b/.../starter/application/domain/Constant.java → .../starter/application/domain/Constant.java
diff --git a/...a/starter/application/domain/ERModel.java → ...a/starter/application/domain/ERModel.java b/...a/starter/application/domain/ERModel.java → ...a/starter/application/domain/ERModel.java
diff --git a/...ra/starter/application/domain/Entity.java → ...ra/starter/application/domain/Entity.java b/...ra/starter/application/domain/Entity.java → ...ra/starter/application/domain/Entity.java
diff --git a/...rter/application/domain/Relationship.java → ...rter/application/domain/Relationship.java b/...rter/application/domain/Relationship.java → ...rter/application/domain/Relationship.java
diff --git a/...plication/generator/CRUDAppGenerator.java → ...plication/generator/CRUDAppGenerator.java b/...plication/generator/CRUDAppGenerator.java → ...plication/generator/CRUDAppGenerator.java
diff --git a/...pplication/generator/ERDiagramParser.java → ...pplication/generator/ERDiagramParser.java b/...pplication/generator/ERDiagramParser.java → ...pplication/generator/ERDiagramParser.java
diff --git a/...arter/application/util/AttributeType.java → ...arter/application/util/AttributeType.java b/...arter/application/util/AttributeType.java → ...arter/application/util/AttributeType.java
diff --git a/...a/starter/application/util/Constants.java → ...a/starter/application/util/Constants.java b/...a/starter/application/util/Constants.java → ...a/starter/application/util/Constants.java
diff --git a/...a/starter/application/util/Inflector.java → ...a/starter/application/util/Inflector.java b/...a/starter/application/util/Inflector.java → ...a/starter/application/util/Inflector.java
diff --git a/...ara/starter/application/util/JPAUtil.java → ...ara/starter/application/util/JPAUtil.java b/...ara/starter/application/util/JPAUtil.java → ...ara/starter/application/util/JPAUtil.java
diff --git a/...ra/starter/application/util/JavaUtil.java → ...ra/starter/application/util/JavaUtil.java b/...ra/starter/application/util/JavaUtil.java → ...ra/starter/application/util/JavaUtil.java
diff --git a/...tarter/application/util/StringHelper.java → ...tarter/application/util/StringHelper.java b/...tarter/application/util/StringHelper.java → ...tarter/application/util/StringHelper.java
diff --git a/...starter/application/util/StringUtils.java → ...starter/application/util/StringUtils.java b/...starter/application/util/StringUtils.java → ...starter/application/util/StringUtils.java
diff --git a/...sources/template/descriptor/beans.xml.ftl → ...sources/template/descriptor/beans.xml.ftl b/...sources/template/descriptor/beans.xml.ftl → ...sources/template/descriptor/beans.xml.ftl
diff --git a/...s/template/descriptor/persistence.xml.ftl → ...s/template/descriptor/persistence.xml.ftl b/...s/template/descriptor/persistence.xml.ftl → ...s/template/descriptor/persistence.xml.ftl
diff --git a/...resources/template/html/about-us.html.ftl → ...resources/template/html/about-us.html.ftl b/...resources/template/html/about-us.html.ftl → ...resources/template/html/about-us.html.ftl
diff --git a/...main/resources/template/html/app.html.ftl → ...main/resources/template/html/app.html.ftl b/...main/resources/template/html/app.html.ftl → ...main/resources/template/html/app.html.ftl
diff --git a/...n/resources/template/html/entity.html.ftl → ...n/resources/template/html/entity.html.ftl b/...n/resources/template/html/entity.html.ftl → ...n/resources/template/html/entity.html.ftl
diff --git a/...ain/resources/template/html/home.html.ftl → ...ain/resources/template/html/home.html.ftl b/...ain/resources/template/html/home.html.ftl → ...ain/resources/template/html/home.html.ftl
diff --git a/...te/repository/AbstractRepository.java.ftl → ...te/repository/AbstractRepository.java.ftl b/...te/repository/AbstractRepository.java.ftl → ...te/repository/AbstractRepository.java.ftl
diff --git a/...late/repository/EntityRepository.java.ftl → ...late/repository/EntityRepository.java.ftl b/...late/repository/EntityRepository.java.ftl → ...late/repository/EntityRepository.java.ftl
diff --git a/...s/template/rest/EntityController.java.ftl → ...s/template/rest/EntityController.java.ftl b/...s/template/rest/EntityController.java.ftl → ...s/template/rest/EntityController.java.ftl
diff --git a/...sources/template/rest/HeaderUtil.java.ftl → ...sources/template/rest/HeaderUtil.java.ftl b/...sources/template/rest/HeaderUtil.java.ftl → ...sources/template/rest/HeaderUtil.java.ftl
diff --git a/.../template/rest/RestConfiguration.java.ftl → .../template/rest/RestConfiguration.java.ftl b/.../template/rest/RestConfiguration.java.ftl → .../template/rest/RestConfiguration.java.ftl
diff --git a/...e/producer/EntityManagerProducer.java.ftl → ...e/producer/EntityManagerProducer.java.ftl b/...e/producer/EntityManagerProducer.java.ftl → ...e/producer/EntityManagerProducer.java.ftl
diff --git a/starter-ui/src/main/java/fish/payara/starter/resources/ApplicationConfiguration.java b/starter-ui/src/main/java/fish/payara/starter/resources/ApplicationConfiguration.java
@@ -73,7 +73,8 @@ public class ApplicationConfiguration {
     public static final String DEPLOY_WAR = "deployWar";
     public static final String CONTEXT_ROOT = "contextRoot";
     public static final String AUTH = "auth";
-    public static final String ENTITIES = "entities";
+    public static final String ER_DIAGRAM = "erDiagram";
+    public static final String ER_DIAGRAM_NAME = "erDiagramName";
 
     public static final String PAYARA_VERSION_6_2023_11 = "6.2023.11";
 
@@ -157,9 +158,13 @@ public class ApplicationConfiguration {
 
     @JsonbProperty(AUTH)
     private String auth = "none";
-    
-
+
+    @JsonbProperty(ER_DIAGRAM)
     private String erDiagram = null;
+
+    @JsonbProperty(ER_DIAGRAM_NAME)
+    private String erDiagramName = null;
+
     private boolean generateJPA = true;
     private boolean generateRepository = true;
     private boolean generateRest = true;
@@ -396,6 +401,14 @@ public void setErDiagram(String erDiagram) {
         this.erDiagram = erDiagram;
     }
 
+    public String getErDiagramName() {
+        return erDiagramName;
+    }
+
+    public void setErDiagramName(String erDiagramName) {
+        this.erDiagramName = erDiagramName;
+    }
+
     public boolean isGenerateJPA() {
         return generateJPA;
     }

diff --git a/starter-ui/src/main/java/fish/payara/starter/resources/ApplicationGenerator.java b/starter-ui/src/main/java/fish/payara/starter/resources/ApplicationGenerator.java
@@ -125,7 +125,8 @@ public Future<File> generate(ApplicationConfiguration appProperties) {
                     ERDiagramParser parser = new ERDiagramParser();
                     erModel = parser.parse(appProperties.getErDiagram());
                     if (erModel != null && !erModel.getEntities().isEmpty()) {
-                        properties.put(ApplicationConfiguration.ENTITIES, appProperties.getAuth());
+                        properties.put(ApplicationConfiguration.ER_DIAGRAM, true);
+                        properties.put(ApplicationConfiguration.ER_DIAGRAM_NAME, appProperties.getErDiagramName());
                     }
                 }
                 invokeMavenArchetype(ARCHETYPE_GROUP_ID, ARCHETYPE_ARTIFACT_ID, ARCHETYPE_VERSION,
@@ -136,11 +137,10 @@ public Future<File> generate(ApplicationConfiguration appProperties) {
                 if (erModel != null && !erModel.getEntities().isEmpty()) {
                     Jsonb jsonb = JsonbBuilder.create();
                     String jsonString = jsonb.toJson(erModel);
+                    LOGGER.info("Generating web components info from AI.");
                     String outputJson = langChainChatService.addFronEndDetailsToERDiagram(jsonString);
                     if (outputJson != null && !outputJson.isEmpty()) {
                         String updatedJson = outputJson.strip().replaceAll("^```json|```$", "");
-                        // convert json to ERModel
-
                         erModel = jsonb.fromJson(updatedJson, ERModel.class);
                     }
                     CRUDAppGenerator generator = new CRUDAppGenerator(erModel,

diff --git a/starter-ui/src/main/webapp/assets/main.js b/starter-ui/src/main/webapp/assets/main.js
@@ -108,6 +108,9 @@ form.addEventListener('submit', function (event) {
             }
         } else {
             jsonObject[key] = input.value;
+            if(input.id == 'erDiagram' && !$("#mermaidErDiagramList").val()) {
+                 jsonObject[key] = '';
+            }
         }
     });
 
@@ -118,7 +121,7 @@ form.addEventListener('submit', function (event) {
         },
         body: JSON.stringify(jsonObject),
     };
-debugger;
+
     fetch('resources/starter', requestOptions)
             .then(response => {
                 if (response.status === 200) {

diff --git a/starter-ui/src/main/webapp/erDiagram/Membership Management System.mmd b/starter-ui/src/main/webapp/erDiagram/Membership Management System.mmd
@@ -48,5 +48,4 @@ erDiagram
         int adminId PK					
         string name
         string role
-    }
-%%{ icon[card],title[Membership Management System],home-page-description[A system for managing membership registrations and benefits. Track members, subscriptions, and privileges efficiently.],about-us-page-description[Explore our membership management system and discover exclusive benefits for our members. Connect with other members and stay updated with our events and notifications.],menu[Home, Memberships, Benefits, About Us, Contact
+    }