From 24f80a88d6dfb93b5361f2b2f1946c1e592203f1 Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta.jc@gmail.com>
Date: Wed, 9 Oct 2024 21:39:44 +0530
Subject: [PATCH 1/6] FISH-9548 Added placeholder/tooltip added to UI
 components and Source Editor focused

---
 .../resources/ApplicationGenerator.java       |  3 +-
 starter-ui/src/main/webapp/assets/main.js     |  6 +-
 .../Membership Management System.mmd          |  3 +-
 starter-ui/src/main/webapp/index.html         | 99 +++++++++++--------
 4 files changed, 64 insertions(+), 47 deletions(-)

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
index 2344355..d83665a 100644
--- a/starter-ui/src/main/java/fish/payara/starter/resources/ApplicationGenerator.java
+++ b/starter-ui/src/main/java/fish/payara/starter/resources/ApplicationGenerator.java
@@ -136,11 +136,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
index 8d5f76f..bf6b2f8 100644
--- a/starter-ui/src/main/webapp/assets/main.js
+++ b/starter-ui/src/main/webapp/assets/main.js
@@ -108,6 +108,10 @@ form.addEventListener('submit', function (event) {
             }
         } else {
             jsonObject[key] = input.value;
+            if(input.id == 'erDiagram' && !$("#mermaidErDiagramList").val()) {
+                 jsonObject[key] = '';
+                 debugger;
+            }
         }
     });
 
@@ -118,7 +122,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
index 006c8e1..a61f07c 100644
--- 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
+    }
\ No newline at end of file
diff --git a/starter-ui/src/main/webapp/index.html b/starter-ui/src/main/webapp/index.html
index 2faec86..6b4df2e 100644
--- a/starter-ui/src/main/webapp/index.html
+++ b/starter-ui/src/main/webapp/index.html
@@ -425,7 +425,7 @@ <h2>Simply select your options, and click &lsquo;Generate&rsquo; - and Payara Pl
                                                 <div class="form-steps__inner">
                                                     <p class="form__row">
                                                         <label class="form__label" for="mermaidErDiagramList">Search ER Diagram</label>
-                                                        <select name="mermaidErDiagramList" id="mermaidErDiagramList" class="form__select" ></select>
+                                                        <select name="mermaidErDiagramList" id="mermaidErDiagramList" class="form__select" title="Select an existing diagram or type to create a new one" ></select>
                                                         <textarea id="erDiagram" name="erDiagram" hidden> </textarea>
                                                     </p>
                                                     <p class="form__row">
@@ -630,12 +630,12 @@ <h2>Simply select your options, and click &lsquo;Generate&rsquo; - and Payara Pl
                 <div class="half" id="diagramSource">
                     <div class="inline-elements"  id="diagramSourceTopTool">
                         <h2>Source</h2>
-                        <select name="mermaidErDiagramListPreview" id="mermaidErDiagramListPreview" class="form__select"></select>
+                        <select name="mermaidErDiagramListPreview" id="mermaidErDiagramListPreview" class="form__select" title="Select an existing diagram or type to create a new one"></select>
                     </div>
                     <textarea id="sourceCode"></textarea>
                     <div id="graphDiv"></div>
                     <div class="inline-elements" id="diagramSourceBottomTool">
-                        <input id="queryBox" type="text" class="form__text" style="width: -webkit-fill-available;" /> 
+                        <input id="queryBox" type="text" class="form__text" style="width: -webkit-fill-available;" placeholder="Tell us how you want to change the diagram (e.g., 'Add customer address') and press Enter" /> 
                     </div>
                 </div>
                 <div class="half" id="diagramView">
@@ -647,13 +647,12 @@ <h2 id="headerAI"  style="white-space: nowrap;">Live Preview</h2>
                     </div> 
                     <div id="livePreview" class="livePreview"></div>
                     <div class="inline-elements" id="diagramViewBottomTool">
-                        <input id="queryBoxHidden" type="text" class="form__text" style="width: -webkit-fill-available;display:none" /> 
-                        <button type="button" class="button button--ghost" id="updateERDiagram" ><i class="bi bi-chat"></i></button>
-                        <button type="button" class="button button--ghost" id="prevERDiagram" disabled><i class="bi bi-arrow-left"></i></button>
-                        <button type="button" class="button button--ghost" id="nextERDiagram" disabled><i class="bi bi-arrow-right"></i></button>
-                        <button type="button" class="button button--ghost" id="enlargeERDiagram">+</button>
-                        <button type="button" class="button button--ghost" id="shrinkERDiagram">-</button>
-                        <button type="button" class="button button--ghost" id="fullscreenDiagram" onclick="toggleDiagramView()"><i class="bi bi-fullscreen"></i></button>
+                        <input id="queryBoxHidden" type="text" class="form__text" style="width: -webkit-fill-available;display:none" placeholder="Tell us how you want to change the diagram (e.g., 'Add customer address') and press Enter" /> 
+                        <button type="button" class="button button--ghost" id="prevERDiagram" disabled title="Previous ER Diagram"><i class="bi bi-arrow-left"></i></button>
+                        <button type="button" class="button button--ghost" id="nextERDiagram" disabled title="Next ER Diagram"><i class="bi bi-arrow-right"></i></button>
+                        <button type="button" class="button button--ghost" id="enlargeERDiagram" title="Enlarge ER Diagram">+</button>
+                        <button type="button" class="button button--ghost" id="shrinkERDiagram" title="Shrink ER Diagram">-</button>
+                        <button type="button" class="button button--ghost" id="fullscreenDiagram" onclick="toggleDiagramView()" title="Fullscreen Diagram"><i class="bi bi-fullscreen" id="fullscreenIcon"></i></button>
                     </div>
                 </div>
                 <span class="close">&times;</span>
@@ -661,15 +660,24 @@ <h2 id="headerAI"  style="white-space: nowrap;">Live Preview</h2>
         </div>
         <script>
                 function toggleDiagramView() {
-                    debugger;
                     const diagramView = document.getElementById('diagramView');
                     const diagramSource = document.getElementById('diagramSource');
                     const makeFullscreen = diagramView.style.width !== '100%';
-                    diagramView.style.width = makeFullscreen ?  '100%' : '50%';
+                    diagramView.style.width = makeFullscreen ? '100%' : '50%';
                     diagramSource.style.width = makeFullscreen ? '0%' : '50%';
                     document.getElementById('queryBox').style.display = makeFullscreen ? 'none' : 'inline';
-                    document.getElementById('queryBoxHidden').style.display = makeFullscreen ?  'inline' : 'none';
+                    document.getElementById('queryBoxHidden').style.display = makeFullscreen ? 'inline' : 'none';
                     diagramSource.style.display = makeFullscreen ? 'none' : 'inline';
+                    const fullscreenIcon = document.getElementById('fullscreenIcon');
+                    if (makeFullscreen) {
+                        fullscreenIcon.classList.remove('bi-fullscreen');
+                        fullscreenIcon.classList.add('bi-fullscreen-exit');
+                        document.getElementById('fullscreenDiagram').title = 'Exit Fullscreen Diagram';
+                    } else {
+                        fullscreenIcon.classList.remove('bi-fullscreen-exit');
+                        fullscreenIcon.classList.add('bi-fullscreen');
+                        document.getElementById('fullscreenDiagram').title = 'Fullscreen Diagram';
+                    }
                 }
         </script>
         <!-- CSS for styling the modal dialog -->
@@ -678,8 +686,8 @@ <h2 id="headerAI"  style="white-space: nowrap;">Live Preview</h2>
                 color: #aaa;
             }
             button:disabled {
-    box-shadow: 0 0 0 1px #aaa inset !important;
-}
+                box-shadow: 0 0 0 1px #aaa inset !important;
+            }
             .modal {
                 display: none;
                 position: fixed;
@@ -768,6 +776,9 @@ <h2 id="headerAI"  style="white-space: nowrap;">Live Preview</h2>
                 color: #ff0000; /* Change this to your desired color */
             }
         </style>
+        <script>
+           var editor;
+        </script>
         <script type="module">
 //        https://chatgpt.com/share/99102a26-a8ac-45c5-8d5b-76fc118cd602
             const erDiagrams = [
@@ -796,24 +807,19 @@ <h2 id="headerAI"  style="white-space: nowrap;">Live Preview</h2>
             ];
 
             var erDiagramContent = {};
-            var editor;
             var erDiagram;
             var erDiagramChat = [];
             var erDiagramChatIndex = 0;
 
-            // register button press event for button id enlargeERDiagram
-
             document.getElementById('prevERDiagram').addEventListener('click', prevERDiagram);
             document.getElementById('nextERDiagram').addEventListener('click', nextERDiagram);
             document.getElementById('enlargeERDiagram').addEventListener('click', enlargeERDiagram);
             document.getElementById('shrinkERDiagram').addEventListener('click', shrinkERDiagram);
-//            document.getElementById('updateERDiagram').addEventListener('click', updateERDiagram);
-            $('#queryBox').on('keypress', async function (e) {
-                    if (e.key === 'Enter') {
-                        updateERDiagram();
-                    }
-                });
-
+            $('#queryBox, #queryBoxHidden').on('keypress', async function (e) {
+                if (e.key === 'Enter') {
+                    updateERDiagram();
+                }
+            });
 
             async function prevERDiagram() {
                 const selectedDiagramId = document.getElementById('mermaidErDiagramListPreview').value.trim();
@@ -847,12 +853,12 @@ <h2 id="headerAI"  style="white-space: nowrap;">Live Preview</h2>
                     updateButtonStates();
             }
             
-                function updateButtonStates() {
-                    const nextButton = document.getElementById('nextERDiagram');
-                    const prevButton = document.getElementById('prevERDiagram');
-                    nextButton.disabled = erDiagramChatIndex >= erDiagramChat.length - 1;
-                    prevButton.disabled = erDiagramChatIndex <= 0;
-                }
+            function updateButtonStates() {
+                const nextButton = document.getElementById('nextERDiagram');
+                const prevButton = document.getElementById('prevERDiagram');
+                nextButton.disabled = erDiagramChatIndex >= erDiagramChat.length - 1;
+                prevButton.disabled = erDiagramChatIndex <= 0;
+            }
             
             async function enlargeERDiagram() {
                 showAILoadingBar();
@@ -996,18 +1002,25 @@ <h2 id="headerAI"  style="white-space: nowrap;">Live Preview</h2>
                 $('#mermaidErDiagramList').change(async function () {
                     const selectedDiagramId = $(this).val();
                     const selectedDiagramContent = erDiagramContent[selectedDiagramId];
-                    if (!selectedDiagramContent) {
-                        const content = await fetchErDiagramContent(selectedDiagramId);
+                    var content;
+                    if (!selectedDiagramContent && selectedDiagramId) {
+                        content = await fetchErDiagramContent(selectedDiagramId);
                         if (content) {
                             erDiagramContent[selectedDiagramId] = content;
                         }
                     }
-                    editor.setValue(erDiagramContent[selectedDiagramId]);
-                    erDiagram.innerHTML = erDiagramContent[selectedDiagramId];
-                    
-                    erDiagramChat = [];
-                    erDiagramChat.push({"erd": content});
-                    erDiagramChatIndex = erDiagramChat.length - 1;
+                    if(erDiagramContent[selectedDiagramId]) {
+                        editor.setValue(erDiagramContent[selectedDiagramId]);
+                        erDiagram.innerHTML = erDiagramContent[selectedDiagramId];
+                        $('#mermaidErDiagramListPreview').val(selectedDiagramId);
+
+                        erDiagramChat = [];
+                        erDiagramChat.push({"erd": content});
+                        erDiagramChatIndex = erDiagramChat.length - 1;
+                    } else {
+                        erDiagramChat = [];
+                        erDiagramChatIndex = 0;
+                    }
                     updateButtonStates();
                 });
 
@@ -1028,7 +1041,6 @@ <h2 id="headerAI"  style="white-space: nowrap;">Live Preview</h2>
 
                 $('#mermaidErDiagramListPreview').on('keypress', async function (e) {
                     if (e.key === 'Enter') {
-                        debugger;
                         const selectedDiagramId = document.getElementById('mermaidErDiagramListPreview').value.trim();
                         if (erDiagrams.includes(selectedDiagramId)) {
                             if (!erDiagramContent[selectedDiagramId]) {
@@ -1106,7 +1118,6 @@ <h2 id="headerAI"  style="white-space: nowrap;">Live Preview</h2>
                             editor.setValue(erDiagramContent[selectedDiagramId]);
                             erDiagram.innerHTML = erDiagramContent[selectedDiagramId];
 
-
                             const selectElement = document.getElementById('mermaidErDiagramList');
                             for (let i = 0; i < selectElement.options.length; i++) {
                                 if (selectElement.options[i].value === selectedDiagramId) {
@@ -1141,7 +1152,6 @@ <h2 id="headerAI"  style="white-space: nowrap;">Live Preview</h2>
 
             function closeModal() {
                 document.getElementById("previewModal").style.display = "none";
-                debugger;
                 erDiagram.innerHTML = editor.getValue();
             }
             var modal = document.getElementById("previewModal");
@@ -1168,6 +1178,11 @@ <h2 id="headerAI"  style="white-space: nowrap;">Live Preview</h2>
             // Function to open the modal and populate live preview and source code
             function openMermaidPreview() {
                 document.getElementById("previewModal").style.display = "block";
+                setTimeout(() => {
+                    if (editor) {
+                        editor.refresh(); 
+                    }
+                }, 200); 
             }
 
         </script>

From 23a29761c002b0805267651b050fde98b0605c42 Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta.jc@gmail.com>
Date: Thu, 10 Oct 2024 11:52:12 +0530
Subject: [PATCH 2/6] FISH-9548 Rename Data Model Configuration to ER Diagram
 Designer

---
 starter-ui/src/main/webapp/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/starter-ui/src/main/webapp/index.html b/starter-ui/src/main/webapp/index.html
index 6b4df2e..e626436 100644
--- a/starter-ui/src/main/webapp/index.html
+++ b/starter-ui/src/main/webapp/index.html
@@ -412,8 +412,8 @@ <h2>Simply select your options, and click &lsquo;Generate&rsquo; - and Payara Pl
                                         </fieldset>
 
                                         <fieldset class="form-steps__step">
-                                            <legend class="visually-hidden form-steps__title">Data Model Configuration</legend>
-                                            <div class="legend h3 form-steps__title" aria-hidden="true">Data Model Configuration</div>
+                                            <legend class="visually-hidden form-steps__title">ER Diagram Designer</legend>
+                                            <div class="legend h3 form-steps__title" aria-hidden="true">ER Diagram Designer</div>
                                             <div class="form-steps__icon">
                                                 <svg class="icon" width="1em" height="1em" viewBox="0 0 16 16" aria-hidden="true" focusable="false">
                                                 <use href="ui/images/icons.svg#icon-tick" class="icon--tick"></use>

From a6e940329a45169f396a108dd21d60deb1e5a169 Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta.jc@gmail.com>
Date: Thu, 10 Oct 2024 11:59:58 +0530
Subject: [PATCH 3/6] FISH-9548 Rename Builder button

---
 starter-ui/src/main/webapp/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/starter-ui/src/main/webapp/index.html b/starter-ui/src/main/webapp/index.html
index e626436..4f419d1 100644
--- a/starter-ui/src/main/webapp/index.html
+++ b/starter-ui/src/main/webapp/index.html
@@ -430,7 +430,7 @@ <h2>Simply select your options, and click &lsquo;Generate&rsquo; - and Payara Pl
                                                     </p>
                                                     <p class="form__row">
                                                         <button type="button" class="button button--ghost" onclick="openMermaidPreview()">
-                                                            <span class="button__text">Live Preview</span>
+                                                            <span class="button__text">Diagram Builder & Live Preview</span>
                                                         </button>
                                                     </p>
                                                     <p class="form__row">

From 997d5fa8600e8b8b5e5a42b8aa16762985166dc2 Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta.jc@gmail.com>
Date: Thu, 10 Oct 2024 12:11:23 +0530
Subject: [PATCH 4/6] FISH-9548 Rename subproject

---
 .gitignore                                                      | 2 +-
 pom.xml                                                         | 2 +-
 {PayaraStarterGenerator => starter-generator}/pom.xml           | 0
 .../java/fish/payara/starter/application/domain/Attribute.java  | 0
 .../java/fish/payara/starter/application/domain/Constant.java   | 0
 .../java/fish/payara/starter/application/domain/ERModel.java    | 0
 .../java/fish/payara/starter/application/domain/Entity.java     | 0
 .../fish/payara/starter/application/domain/Relationship.java    | 0
 .../payara/starter/application/generator/CRUDAppGenerator.java  | 0
 .../payara/starter/application/generator/ERDiagramParser.java   | 0
 .../fish/payara/starter/application/util/AttributeType.java     | 0
 .../java/fish/payara/starter/application/util/Constants.java    | 0
 .../java/fish/payara/starter/application/util/Inflector.java    | 0
 .../main/java/fish/payara/starter/application/util/JPAUtil.java | 0
 .../java/fish/payara/starter/application/util/JavaUtil.java     | 0
 .../java/fish/payara/starter/application/util/StringHelper.java | 0
 .../java/fish/payara/starter/application/util/StringUtils.java  | 0
 .../src/main/resources/template/descriptor/beans.xml.ftl        | 0
 .../src/main/resources/template/descriptor/persistence.xml.ftl  | 0
 .../src/main/resources/template/html/about-us.html.ftl          | 0
 .../src/main/resources/template/html/app.html.ftl               | 0
 .../src/main/resources/template/html/entity.html.ftl            | 0
 .../src/main/resources/template/html/home.html.ftl              | 0
 .../resources/template/repository/AbstractRepository.java.ftl   | 0
 .../resources/template/repository/EntityRepository.java.ftl     | 0
 .../src/main/resources/template/rest/EntityController.java.ftl  | 0
 .../src/main/resources/template/rest/HeaderUtil.java.ftl        | 0
 .../src/main/resources/template/rest/RestConfiguration.java.ftl | 0
 .../template/service/producer/EntityManagerProducer.java.ftl    | 0
 starter-ui/src/main/webapp/assets/main.js                       | 1 -
 30 files changed, 2 insertions(+), 3 deletions(-)
 rename {PayaraStarterGenerator => starter-generator}/pom.xml (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/domain/Attribute.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/domain/Constant.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/domain/ERModel.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/domain/Entity.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/domain/Relationship.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/generator/CRUDAppGenerator.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/generator/ERDiagramParser.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/util/AttributeType.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/util/Constants.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/util/Inflector.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/util/JPAUtil.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/util/JavaUtil.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/util/StringHelper.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/java/fish/payara/starter/application/util/StringUtils.java (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/resources/template/descriptor/beans.xml.ftl (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/resources/template/descriptor/persistence.xml.ftl (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/resources/template/html/about-us.html.ftl (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/resources/template/html/app.html.ftl (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/resources/template/html/entity.html.ftl (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/resources/template/html/home.html.ftl (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/resources/template/repository/AbstractRepository.java.ftl (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/resources/template/repository/EntityRepository.java.ftl (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/resources/template/rest/EntityController.java.ftl (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/resources/template/rest/HeaderUtil.java.ftl (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/resources/template/rest/RestConfiguration.java.ftl (100%)
 rename {PayaraStarterGenerator => starter-generator}/src/main/resources/template/service/producer/EntityManagerProducer.java.ftl (100%)

diff --git a/.gitignore b/.gitignore
index 3068568..8bb7a9d 100644
--- 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
index 6eb5f0a..bef47e3 100644
--- 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/PayaraStarterGenerator/pom.xml b/starter-generator/pom.xml
similarity index 100%
rename from PayaraStarterGenerator/pom.xml
rename to starter-generator/pom.xml
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/Attribute.java b/starter-generator/src/main/java/fish/payara/starter/application/domain/Attribute.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/Attribute.java
rename to starter-generator/src/main/java/fish/payara/starter/application/domain/Attribute.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/Constant.java b/starter-generator/src/main/java/fish/payara/starter/application/domain/Constant.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/Constant.java
rename to starter-generator/src/main/java/fish/payara/starter/application/domain/Constant.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/ERModel.java b/starter-generator/src/main/java/fish/payara/starter/application/domain/ERModel.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/ERModel.java
rename to starter-generator/src/main/java/fish/payara/starter/application/domain/ERModel.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/Entity.java b/starter-generator/src/main/java/fish/payara/starter/application/domain/Entity.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/Entity.java
rename to starter-generator/src/main/java/fish/payara/starter/application/domain/Entity.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/Relationship.java b/starter-generator/src/main/java/fish/payara/starter/application/domain/Relationship.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/domain/Relationship.java
rename to starter-generator/src/main/java/fish/payara/starter/application/domain/Relationship.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/generator/CRUDAppGenerator.java b/starter-generator/src/main/java/fish/payara/starter/application/generator/CRUDAppGenerator.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/generator/CRUDAppGenerator.java
rename to starter-generator/src/main/java/fish/payara/starter/application/generator/CRUDAppGenerator.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/generator/ERDiagramParser.java b/starter-generator/src/main/java/fish/payara/starter/application/generator/ERDiagramParser.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/generator/ERDiagramParser.java
rename to starter-generator/src/main/java/fish/payara/starter/application/generator/ERDiagramParser.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/AttributeType.java b/starter-generator/src/main/java/fish/payara/starter/application/util/AttributeType.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/AttributeType.java
rename to starter-generator/src/main/java/fish/payara/starter/application/util/AttributeType.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/Constants.java b/starter-generator/src/main/java/fish/payara/starter/application/util/Constants.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/Constants.java
rename to starter-generator/src/main/java/fish/payara/starter/application/util/Constants.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/Inflector.java b/starter-generator/src/main/java/fish/payara/starter/application/util/Inflector.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/Inflector.java
rename to starter-generator/src/main/java/fish/payara/starter/application/util/Inflector.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/JPAUtil.java b/starter-generator/src/main/java/fish/payara/starter/application/util/JPAUtil.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/JPAUtil.java
rename to starter-generator/src/main/java/fish/payara/starter/application/util/JPAUtil.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/JavaUtil.java b/starter-generator/src/main/java/fish/payara/starter/application/util/JavaUtil.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/JavaUtil.java
rename to starter-generator/src/main/java/fish/payara/starter/application/util/JavaUtil.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/StringHelper.java b/starter-generator/src/main/java/fish/payara/starter/application/util/StringHelper.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/StringHelper.java
rename to starter-generator/src/main/java/fish/payara/starter/application/util/StringHelper.java
diff --git a/PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/StringUtils.java b/starter-generator/src/main/java/fish/payara/starter/application/util/StringUtils.java
similarity index 100%
rename from PayaraStarterGenerator/src/main/java/fish/payara/starter/application/util/StringUtils.java
rename to starter-generator/src/main/java/fish/payara/starter/application/util/StringUtils.java
diff --git a/PayaraStarterGenerator/src/main/resources/template/descriptor/beans.xml.ftl b/starter-generator/src/main/resources/template/descriptor/beans.xml.ftl
similarity index 100%
rename from PayaraStarterGenerator/src/main/resources/template/descriptor/beans.xml.ftl
rename to starter-generator/src/main/resources/template/descriptor/beans.xml.ftl
diff --git a/PayaraStarterGenerator/src/main/resources/template/descriptor/persistence.xml.ftl b/starter-generator/src/main/resources/template/descriptor/persistence.xml.ftl
similarity index 100%
rename from PayaraStarterGenerator/src/main/resources/template/descriptor/persistence.xml.ftl
rename to starter-generator/src/main/resources/template/descriptor/persistence.xml.ftl
diff --git a/PayaraStarterGenerator/src/main/resources/template/html/about-us.html.ftl b/starter-generator/src/main/resources/template/html/about-us.html.ftl
similarity index 100%
rename from PayaraStarterGenerator/src/main/resources/template/html/about-us.html.ftl
rename to starter-generator/src/main/resources/template/html/about-us.html.ftl
diff --git a/PayaraStarterGenerator/src/main/resources/template/html/app.html.ftl b/starter-generator/src/main/resources/template/html/app.html.ftl
similarity index 100%
rename from PayaraStarterGenerator/src/main/resources/template/html/app.html.ftl
rename to starter-generator/src/main/resources/template/html/app.html.ftl
diff --git a/PayaraStarterGenerator/src/main/resources/template/html/entity.html.ftl b/starter-generator/src/main/resources/template/html/entity.html.ftl
similarity index 100%
rename from PayaraStarterGenerator/src/main/resources/template/html/entity.html.ftl
rename to starter-generator/src/main/resources/template/html/entity.html.ftl
diff --git a/PayaraStarterGenerator/src/main/resources/template/html/home.html.ftl b/starter-generator/src/main/resources/template/html/home.html.ftl
similarity index 100%
rename from PayaraStarterGenerator/src/main/resources/template/html/home.html.ftl
rename to starter-generator/src/main/resources/template/html/home.html.ftl
diff --git a/PayaraStarterGenerator/src/main/resources/template/repository/AbstractRepository.java.ftl b/starter-generator/src/main/resources/template/repository/AbstractRepository.java.ftl
similarity index 100%
rename from PayaraStarterGenerator/src/main/resources/template/repository/AbstractRepository.java.ftl
rename to starter-generator/src/main/resources/template/repository/AbstractRepository.java.ftl
diff --git a/PayaraStarterGenerator/src/main/resources/template/repository/EntityRepository.java.ftl b/starter-generator/src/main/resources/template/repository/EntityRepository.java.ftl
similarity index 100%
rename from PayaraStarterGenerator/src/main/resources/template/repository/EntityRepository.java.ftl
rename to starter-generator/src/main/resources/template/repository/EntityRepository.java.ftl
diff --git a/PayaraStarterGenerator/src/main/resources/template/rest/EntityController.java.ftl b/starter-generator/src/main/resources/template/rest/EntityController.java.ftl
similarity index 100%
rename from PayaraStarterGenerator/src/main/resources/template/rest/EntityController.java.ftl
rename to starter-generator/src/main/resources/template/rest/EntityController.java.ftl
diff --git a/PayaraStarterGenerator/src/main/resources/template/rest/HeaderUtil.java.ftl b/starter-generator/src/main/resources/template/rest/HeaderUtil.java.ftl
similarity index 100%
rename from PayaraStarterGenerator/src/main/resources/template/rest/HeaderUtil.java.ftl
rename to starter-generator/src/main/resources/template/rest/HeaderUtil.java.ftl
diff --git a/PayaraStarterGenerator/src/main/resources/template/rest/RestConfiguration.java.ftl b/starter-generator/src/main/resources/template/rest/RestConfiguration.java.ftl
similarity index 100%
rename from PayaraStarterGenerator/src/main/resources/template/rest/RestConfiguration.java.ftl
rename to starter-generator/src/main/resources/template/rest/RestConfiguration.java.ftl
diff --git a/PayaraStarterGenerator/src/main/resources/template/service/producer/EntityManagerProducer.java.ftl b/starter-generator/src/main/resources/template/service/producer/EntityManagerProducer.java.ftl
similarity index 100%
rename from PayaraStarterGenerator/src/main/resources/template/service/producer/EntityManagerProducer.java.ftl
rename to starter-generator/src/main/resources/template/service/producer/EntityManagerProducer.java.ftl
diff --git a/starter-ui/src/main/webapp/assets/main.js b/starter-ui/src/main/webapp/assets/main.js
index bf6b2f8..5f94cf5 100644
--- a/starter-ui/src/main/webapp/assets/main.js
+++ b/starter-ui/src/main/webapp/assets/main.js
@@ -110,7 +110,6 @@ form.addEventListener('submit', function (event) {
             jsonObject[key] = input.value;
             if(input.id == 'erDiagram' && !$("#mermaidErDiagramList").val()) {
                  jsonObject[key] = '';
-                 debugger;
             }
         }
     });

From 789cee0c8c978871027d358e50c6e750a8c29b64 Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta.jc@gmail.com>
Date: Thu, 10 Oct 2024 12:39:26 +0530
Subject: [PATCH 5/6] FISH-9548 Tooltips for package

---
 starter-ui/src/main/webapp/index.html | 100 ++++++++++++--------------
 1 file changed, 46 insertions(+), 54 deletions(-)

diff --git a/starter-ui/src/main/webapp/index.html b/starter-ui/src/main/webapp/index.html
index 4f419d1..a0817bb 100644
--- a/starter-ui/src/main/webapp/index.html
+++ b/starter-ui/src/main/webapp/index.html
@@ -411,82 +411,74 @@ <h2>Simply select your options, and click &lsquo;Generate&rsquo; - and Payara Pl
                                             </div>
                                         </fieldset>
 
-                                        <fieldset class="form-steps__step">
-                                            <legend class="visually-hidden form-steps__title">ER Diagram Designer</legend>
-                                            <div class="legend h3 form-steps__title" aria-hidden="true">ER Diagram Designer</div>
-                                            <div class="form-steps__icon">
-                                                <svg class="icon" width="1em" height="1em" viewBox="0 0 16 16" aria-hidden="true" focusable="false">
+                                   <fieldset class="form-steps__step">
+                                        <legend class="visually-hidden form-steps__title">ER Diagram Designer</legend>
+                                        <div class="legend h3 form-steps__title" aria-hidden="true">ER Diagram Designer</div>
+                                        <div class="form-steps__icon">
+                                            <svg class="icon" width="1em" height="1em" viewBox="0 0 16 16" aria-hidden="true" focusable="false">
                                                 <use href="ui/images/icons.svg#icon-tick" class="icon--tick"></use>
                                                 <use href="ui/images/icons.svg#icon-dot" class="icon--dot"></use>
                                                 <use href="ui/images/icons.svg#icon-dot_outline" class="icon--dot-outline"></use>
-                                                </svg>
-                                            </div>
-                                            <div class="form-steps__fields">
-                                                <div class="form-steps__inner">
-                                                    <p class="form__row">
-                                                        <label class="form__label" for="mermaidErDiagramList">Search ER Diagram</label>
-                                                        <select name="mermaidErDiagramList" id="mermaidErDiagramList" class="form__select" title="Select an existing diagram or type to create a new one" ></select>
-                                                        <textarea id="erDiagram" name="erDiagram" hidden> </textarea>
-                                                    </p>
-                                                    <p class="form__row">
-                                                        <button type="button" class="button button--ghost" onclick="openMermaidPreview()">
-                                                            <span class="button__text">Diagram Builder & Live Preview</span>
-                                                        </button>
-                                                    </p>
-                                                    <p class="form__row">
-                                                        <span class="form__label">Generate Code For:</span>
-
-                                                        <!-- JPA Checkbox and Textfield -->
+                                            </svg>
+                                        </div>
+                                        <div class="form-steps__fields">
+                                            <div class="form-steps__inner">
+                                                <p class="form__row">
+                                                    <label class="form__label" for="mermaidErDiagramList">Search ER Diagram</label>
+                                                    <select name="mermaidErDiagramList" id="mermaidErDiagramList" class="form__select" title="Select an existing diagram or type to create a new one"></select>
+                                                    <textarea id="erDiagram" name="erDiagram" hidden> </textarea>
+                                                </p>
+                                                <p class="form__row">
+                                                    <button type="button" class="button button--ghost" title="Open the Diagram Builder and Preview" onclick="openMermaidPreview()">
+                                                        <span class="button__text">Diagram Builder & Live Preview</span>
+                                                    </button>
+                                                </p>
+                                                <p class="form__row">
+                                                    <span class="form__label">Generate Code For:</span>
                                                     <div>
-                                                        <input class="form__radbox" type="checkbox" id="generateJpa" name="generateJpa" value="true" checked>
+                                                        <input class="form__radbox" type="checkbox" id="generateJpa" name="generateJpa" value="true" checked title="Generate JPA code">
                                                         <label class="form__radbox-label" for="generateJpa">JPA</label>
-
                                                         <label class="form__label" for="jpaSubpackage">Package</label>
-                                                        <input class="form__textfield" type="text" id="jpaSubpackage" name="jpaSubpackage" value="domain" placeholder="Subpackage for JPA">
+                                                        <input class="form__textfield" type="text" id="jpaSubpackage" name="jpaSubpackage" value="domain" placeholder="Subpackage for JPA" title="Specify the subpackage for JPA">
                                                     </div>
-                                                    </br>
-                                                    <!-- Repository Checkbox and Textfield -->
+                                                    <br/>
                                                     <div>
-                                                        <input class="form__radbox" type="checkbox" id="generateRepository" name="generateRepository" value="true" checked>
+                                                        <input class="form__radbox" type="checkbox" id="generateRepository" name="generateRepository" value="true" checked title="Generate Repository code">
                                                         <label class="form__radbox-label" for="generateRepository">Repository</label>
-
                                                         <label class="form__label" for="repositorySubpackage">Package</label>
-                                                        <input class="form__textfield" type="text" id="repositorySubpackage" name="repositorySubpackage" value="service" placeholder="Subpackage for Repository">
+                                                        <input class="form__textfield" type="text" id="repositorySubpackage" name="repositorySubpackage" value="service" placeholder="Subpackage for Repository" title="Specify the subpackage for Repository">
                                                     </div>
-                                                    </br>
-                                                    <!-- REST Checkbox and Textfield -->
+                                                    <br/>
                                                     <div>
-                                                        <input class="form__radbox" type="checkbox" id="generateRest" name="generateRest" value="true" checked>
+                                                        <input class="form__radbox" type="checkbox" id="generateRest" name="generateRest" value="true" checked title="Generate REST code">
                                                         <label class="form__radbox-label" for="generateRest">REST</label>
-
                                                         <label class="form__label" for="restSubpackage">Package</label>
-                                                        <input class="form__textfield" type="text" id="restSubpackage" name="restSubpackage" value="resource" placeholder="Subpackage for REST">
+                                                        <input class="form__textfield" type="text" id="restSubpackage" name="restSubpackage" value="resource" placeholder="Subpackage for REST" title="Specify the subpackage for REST">
                                                     </div>
-                                                    </br>
-                                                    <!-- HTML Checkbox -->
+                                                    <br/>
                                                     <div>
-                                                        <input class="form__radbox" type="checkbox" id="generateWeb" name="generateWeb" value="true" checked>
+                                                        <input class="form__radbox" type="checkbox" id="generateWeb" name="generateWeb" value="true" checked title="Generate Web code">
                                                         <label class="form__radbox-label" for="generateWeb">Web</label>
                                                     </div>
-                                                    </p>
+                                                </p>
 
-                                                    <p class="form__row form-steps__controls">
-                                                        <a class="button button--ghost form__step__button-back">
-                                                            <svg class="icon icon--90deg" width="1em" height="1em" viewBox="0 0 16 16" aria-hidden="true" focusable="false">
+                                                <p class="form__row form-steps__controls">
+                                                    <a class="button button--ghost form__step__button-back" title="Go back to the previous step">
+                                                        <svg class="icon icon--90deg" width="1em" height="1em" viewBox="0 0 16 16" aria-hidden="true" focusable="false">
                                                             <use href="ui/images/icons.svg#icon-arrow"></use>
-                                                            </svg>
-                                                            <span class="button__text">Previous<span class="visually-hidden">: Payara Platform</span></span>
-                                                        </a>
-                                                        <a class="button button--ghost form__step__button">
-                                                            <svg class="icon icon--270deg" width="1em" height="1em" viewBox="0 0 16 16" aria-hidden="true" focusable="false">
+                                                        </svg>
+                                                        <span class="button__text">Previous<span class="visually-hidden">: Payara Platform</span></span>
+                                                    </a>
+                                                    <a class="button button--ghost form__step__button" title="Proceed to the next step">
+                                                        <svg class="icon icon--270deg" width="1em" height="1em" viewBox="0 0 16 16" aria-hidden="true" focusable="false">
                                                             <use href="ui/images/icons.svg#icon-arrow"></use>
-                                                            </svg>
-                                                            <span class="button__text">Next<span class="visually-hidden">: Security Configuration</span></span>
-                                                        </a>
-                                                    </p>
-                                                </div>
+                                                        </svg>
+                                                        <span class="button__text">Next<span class="visually-hidden">: Security Configuration</span></span>
+                                                    </a>
+                                                </p>
                                             </div>
-                                        </fieldset>
+                                        </div>
+                                    </fieldset>
 
                                         <fieldset class="form-steps__step">
                                             <legend class="visually-hidden form-steps__title">Security Configuration</legend>

From fe6c3b516da2b90e84d7a68e7860d5299d45c2be Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta.jc@gmail.com>
Date: Thu, 10 Oct 2024 13:48:09 +0530
Subject: [PATCH 6/6] FISH-9548 Add app main page to index.html

---
 .../META-INF/archetype-post-generate.groovy   |  8 +++++---
 .../META-INF/maven/archetype-metadata.xml     |  7 +++++++
 .../src/main/webapp/index.html                | 11 +++++++----
 .../resources/ApplicationConfiguration.java   | 19 ++++++++++++++++---
 .../resources/ApplicationGenerator.java       |  3 ++-
 starter-ui/src/main/webapp/index.html         |  2 +-
 6 files changed, 38 insertions(+), 12 deletions(-)

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
index 7f1852d..7ff38a8 100644
--- 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,7 +137,7 @@ 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"
 
@@ -144,7 +145,8 @@ private void bindEEPackage(String jakartaEEVersion, String mpConfig, String mpOp
         '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
index 90ce97d..ad994cb 100644
--- 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
index 2da2e00..276459f 100644
--- 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,7 +16,6 @@
     </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.
@@ -24,13 +23,18 @@ <h1>Greetings from Payara!</h1>
         <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/starter-ui/src/main/java/fish/payara/starter/resources/ApplicationConfiguration.java b/starter-ui/src/main/java/fish/payara/starter/resources/ApplicationConfiguration.java
index b2a54c3..76e925b 100644
--- 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
index d83665a..74b44e1 100644
--- 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,
diff --git a/starter-ui/src/main/webapp/index.html b/starter-ui/src/main/webapp/index.html
index a0817bb..7666ec7 100644
--- a/starter-ui/src/main/webapp/index.html
+++ b/starter-ui/src/main/webapp/index.html
@@ -425,7 +425,7 @@ <h2>Simply select your options, and click &lsquo;Generate&rsquo; - and Payara Pl
                                             <div class="form-steps__inner">
                                                 <p class="form__row">
                                                     <label class="form__label" for="mermaidErDiagramList">Search ER Diagram</label>
-                                                    <select name="mermaidErDiagramList" id="mermaidErDiagramList" class="form__select" title="Select an existing diagram or type to create a new one"></select>
+                                                    <select name="erDiagramName" id="mermaidErDiagramList" class="form__select" title="Select an existing diagram or type to create a new one"></select>
                                                     <textarea id="erDiagram" name="erDiagram" hidden> </textarea>
                                                 </p>
                                                 <p class="form__row">