From ebb1135fb3276324af2471d2c47b5a84f3825740 Mon Sep 17 00:00:00 2001
From: Damian Sobieralski <dsobiera@iu.edu>
Date: Mon, 22 Jul 2024 17:28:35 -0400
Subject: [PATCH] LMSA-9180 - made changes after code review

---
 .../ThemeContentJpaCustomRestController.java  |  2 +-
 .../coursesetupwizard/model/BannerImage.java  |  4 ++-
 .../coursesetupwizard/model/ThemeContent.java |  4 ++-
 .../lms/coursesetupwizard/model/ThemeLog.java |  4 ++-
 .../resources/templates/theme/guidance.html   | 23 +-------------
 src/main/resources/templates/theme/intro.html | 14 ++-------
 .../resources/templates/theme/navigation.html | 23 +-------------
 .../resources/templates/theme/review.html     | 21 -------------
 .../templates/theme/selectBanner.html         | 11 ++-----
 .../templates/theme/selectTheme.html          | 15 ++--------
 .../resources/templates/theme/submit.html     | 30 +------------------
 11 files changed, 20 insertions(+), 131 deletions(-)

diff --git a/src/main/java/edu/iu/uits/lms/coursesetupwizard/controller/rest/ThemeContentJpaCustomRestController.java b/src/main/java/edu/iu/uits/lms/coursesetupwizard/controller/rest/ThemeContentJpaCustomRestController.java
index aa8ddcf..29fcff1 100644
--- a/src/main/java/edu/iu/uits/lms/coursesetupwizard/controller/rest/ThemeContentJpaCustomRestController.java
+++ b/src/main/java/edu/iu/uits/lms/coursesetupwizard/controller/rest/ThemeContentJpaCustomRestController.java
@@ -63,7 +63,7 @@
 @Tag(name = "ThemeContentRepository")
 @Slf4j
 /*
- * This REST controller supplements the REST JPA endpoints auto-defined in BannerImageRepository.
+ * This REST controller supplements the REST JPA endpoints auto-defined in ThemeContentRepository.
  * That's why @Tag's name matches that repository so that via swagger these endpoints are grouped under
  * the JPA auto-generated ones.
  */
diff --git a/src/main/java/edu/iu/uits/lms/coursesetupwizard/model/BannerImage.java b/src/main/java/edu/iu/uits/lms/coursesetupwizard/model/BannerImage.java
index 1efeb85..2c8cade 100644
--- a/src/main/java/edu/iu/uits/lms/coursesetupwizard/model/BannerImage.java
+++ b/src/main/java/edu/iu/uits/lms/coursesetupwizard/model/BannerImage.java
@@ -53,6 +53,7 @@
 import javax.persistence.PreUpdate;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
 import java.util.Date;
 import java.util.List;
 
@@ -87,7 +88,8 @@ public class BannerImage {
                inverseJoinColumns = @JoinColumn(name = "BANNER_IMAGE_CATEGORY_ID"),
                indexes = {@Index(name = "IDX_CSW_BAN_IMG_X_CAT_BID", columnList = "BANNER_IMAGE_ID"),
                           @Index(name = "IDX_CSW_BAN_IMG_X_CAT_CAT", columnList = "BANNER_IMAGE_CATEGORY_ID")},
-               foreignKey = @ForeignKey(name = "FK_CSW_BANNER_IMAGE_ID"), inverseForeignKey = @ForeignKey(name = "FK_CSW_BANNER_IMAGE_CATEGORY_ID"))
+               foreignKey = @ForeignKey(name = "FK_CSW_BANNER_IMAGE_ID"), inverseForeignKey = @ForeignKey(name = "FK_CSW_BANNER_IMAGE_CATEGORY_ID"),
+               uniqueConstraints = @UniqueConstraint(columnNames = {"BANNER_IMAGE_ID", "BANNER_IMAGE_CATEGORY_ID"}))
     private List<BannerImageCategory> bannerImageCategories;
 
     @Column(name = "CREATEDON")
diff --git a/src/main/java/edu/iu/uits/lms/coursesetupwizard/model/ThemeContent.java b/src/main/java/edu/iu/uits/lms/coursesetupwizard/model/ThemeContent.java
index 459e8a1..10e8a46 100644
--- a/src/main/java/edu/iu/uits/lms/coursesetupwizard/model/ThemeContent.java
+++ b/src/main/java/edu/iu/uits/lms/coursesetupwizard/model/ThemeContent.java
@@ -40,6 +40,7 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Lob;
 import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
 import javax.persistence.Table;
@@ -55,7 +56,8 @@ public class ThemeContent {
     @Column(name = "NAME")
     private String name;
 
-    @Column(name = "TEMPLATE_TEXT")
+    @Lob
+    @Column(name = "TEMPLATE_TEXT", columnDefinition = "TEXT")
     private String templateText;
 
     @Column(name = "CREATEDON")
diff --git a/src/main/java/edu/iu/uits/lms/coursesetupwizard/model/ThemeLog.java b/src/main/java/edu/iu/uits/lms/coursesetupwizard/model/ThemeLog.java
index bfffd6b..d7f84ac 100644
--- a/src/main/java/edu/iu/uits/lms/coursesetupwizard/model/ThemeLog.java
+++ b/src/main/java/edu/iu/uits/lms/coursesetupwizard/model/ThemeLog.java
@@ -41,6 +41,7 @@
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.Lob;
 import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
 import javax.persistence.SequenceGenerator;
@@ -82,7 +83,8 @@ public class ThemeLog {
     @Column(name = "INCLUDE_GUIDANCE")
     private boolean includeGuidance;
 
-    @Column(name = "ERRORS")
+    @Lob
+    @Column(name = "ERRORS", columnDefinition = "TEXT")
     private String errors;
 
     @Column(name = "CREATEDON")
diff --git a/src/main/resources/templates/theme/guidance.html b/src/main/resources/templates/theme/guidance.html
index 627b20d..8dc6a98 100644
--- a/src/main/resources/templates/theme/guidance.html
+++ b/src/main/resources/templates/theme/guidance.html
@@ -48,30 +48,9 @@ <h2 id="page-title">Include guidance</h2>
 
 <th:block layout:fragment="script">
     <script th:inline="javascript">
-        /*<![CDATA[*/
-            const courseId = /*[[${courseId}]]*/
-            const selectedCourseId = /*[[${selectedCourseId}]]*/
-            var courses = /*[[${courses}]]*/;
-            window.config = {courses: courses};
-        /*]]>*/
-
         function doSubmit() {
-            //Select control
-            var inputControl = document.querySelector('input[id="course-select-input"]');
-            //Hidden input with the actual value
-            var inputValue = document.querySelector('input[name="selectedCourseId"]');
-            if (inputValue.value == "") {
-                inputControl.setAttribute("aria-invalid", "true");
-                inputControl.setAttribute("aria-describedby", "option-message");
-                alertMessage = document.getElementById('select-alert');
-                alertMessage.classList.remove("rvt-display-none");
-                inputControl.focus();
-                return false;
-            }
         }
-
     </script>
-    <script type="text/javascript" th:src="@{/app/jsreact/lms-lti-coursesetupwizard/lms-lti-coursesetupwizard.js}"></script>
 </th:block>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/theme/intro.html b/src/main/resources/templates/theme/intro.html
index 897cf7d..0e3e366 100644
--- a/src/main/resources/templates/theme/intro.html
+++ b/src/main/resources/templates/theme/intro.html
@@ -37,23 +37,13 @@ <h2 id="page-title">Intro</h2>
             </form>
         </div>
     </div>
-
 </div>
-
 <th:block layout:fragment="script">
     <script th:inline="javascript">
-        /*<![CDATA[*/
-            const courseId = /*[[${courseId}]]*/
-            const selectedCourseId = /*[[${selectedCourseId}]]*/
-            var courses = /*[[${courses}]]*/;
-            window.config = {courses: courses};
-        /*]]>*/
-
         function doSubmit() {
         }
-
     </script>
-    <script type="text/javascript" th:src="@{/app/jsreact/lms-lti-coursesetupwizard/lms-lti-coursesetupwizard.js}"></script>
 </th:block>
+
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/theme/navigation.html b/src/main/resources/templates/theme/navigation.html
index 96f1b70..9e7d4ef 100644
--- a/src/main/resources/templates/theme/navigation.html
+++ b/src/main/resources/templates/theme/navigation.html
@@ -55,30 +55,9 @@ <h2 id="page-title">Include navigation</h2>
 
 <th:block layout:fragment="script">
     <script th:inline="javascript">
-        /*<![CDATA[*/
-            const courseId = /*[[${courseId}]]*/
-            const selectedCourseId = /*[[${selectedCourseId}]]*/
-            var courses = /*[[${courses}]]*/;
-            window.config = {courses: courses};
-        /*]]>*/
-
         function doSubmit() {
-            //Select control
-            var inputControl = document.querySelector('input[id="course-select-input"]');
-            //Hidden input with the actual value
-            var inputValue = document.querySelector('input[name="selectedCourseId"]');
-            if (inputValue.value == "") {
-                inputControl.setAttribute("aria-invalid", "true");
-                inputControl.setAttribute("aria-describedby", "option-message");
-                alertMessage = document.getElementById('select-alert');
-                alertMessage.classList.remove("rvt-display-none");
-                inputControl.focus();
-                return false;
-            }
         }
-
     </script>
-    <script type="text/javascript" th:src="@{/app/jsreact/lms-lti-coursesetupwizard/lms-lti-coursesetupwizard.js}"></script>
 </th:block>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/theme/review.html b/src/main/resources/templates/theme/review.html
index d3b6b64..7146bbc 100644
--- a/src/main/resources/templates/theme/review.html
+++ b/src/main/resources/templates/theme/review.html
@@ -59,30 +59,9 @@ <h2 id="page-title">Review</h2>
 
 <th:block layout:fragment="script">
     <script th:inline="javascript">
-        /*<![CDATA[*/
-            const courseId = /*[[${courseId}]]*/
-            const selectedCourseId = /*[[${selectedCourseId}]]*/
-            var courses = /*[[${courses}]]*/;
-            window.config = {courses: courses};
-        /*]]>*/
-
         function doSubmit() {
-            //Select control
-            var inputControl = document.querySelector('input[id="course-select-input"]');
-            //Hidden input with the actual value
-            var inputValue = document.querySelector('input[name="selectedCourseId"]');
-            if (inputValue.value == "") {
-                inputControl.setAttribute("aria-invalid", "true");
-                inputControl.setAttribute("aria-describedby", "option-message");
-                alertMessage = document.getElementById('select-alert');
-                alertMessage.classList.remove("rvt-display-none");
-                inputControl.focus();
-                return false;
-            }
         }
-
     </script>
-    <script type="text/javascript" th:src="@{/app/jsreact/lms-lti-coursesetupwizard/lms-lti-coursesetupwizard.js}"></script>
 </th:block>
 </body>
 </html>
diff --git a/src/main/resources/templates/theme/selectBanner.html b/src/main/resources/templates/theme/selectBanner.html
index 55e9536..676db56 100644
--- a/src/main/resources/templates/theme/selectBanner.html
+++ b/src/main/resources/templates/theme/selectBanner.html
@@ -56,7 +56,7 @@ <h2 id="page-title">Select banner</h2>
                     </select>
                     <!-- radio list for banner options, dynamically rendered based on select component above -->
                     <fieldset class="rvt-fieldset">
-                        <legend th:text="'Image options for ' + ${bannerImageCategories.get(0).name}"></legend>
+                        <legend id="banner-image-category-legend" th:text="'Image options for ' + ${bannerImageCategories.get(0).name}"></legend>
                         <!-- ul will be filled by javascript on pulldown change -->
                         <ul id="image-ul" class="rvt-list-plain">
                         </ul>
@@ -75,16 +75,11 @@ <h2 id="page-title">Select banner</h2>
     <script th:inline="javascript">
         /*<![CDATA[*/
             const courseId = /*[[${courseId}]]*/
-            const selectedCourseId = /*[[${selectedCourseId}]]*/
-            var courses = /*[[${courses}]]*/;
-            window.config = {courses: courses};
         /*]]>*/
 
         function doSubmit() {
             let yesBannerImage = document.querySelector('#include-banner-image-radio-yes:checked');
 
-            console.log("yesBannerImage.length = " + yesBannerImage.length);
-
             if (yesBannerImage != null) {
                 let checkedRadio = document.querySelector('input[type=radio][name=banner-image-radio-group]:checked');
                 if (checkedRadio != null) {
@@ -97,7 +92,6 @@ <h2 id="page-title">Select banner</h2>
                     });
                     alertMessage = document.getElementById('select-alert');
                     alertMessage.classList.remove("rvt-display-none");
-                    allRadio[0].focus();
                     return false;
                 }
             }
@@ -105,6 +99,8 @@ <h2 id="page-title">Select banner</h2>
 
         function loadBannerImagesForSelectedCategory() {
             let categoryId = $('#select-input-categories').val();
+            let categoryName = $('#select-input-categories option[value="' + categoryId + '"]').text();
+            $('#banner-image-category-legend').text('Image options for ' + categoryName);
             $('#image-ul').load('/app/theme/' + courseId + '/bannerimage/' + categoryId ,  function() {
                 let bannerImageId = $('#banner-image-id').val();
 
@@ -147,7 +143,6 @@ <h2 id="page-title">Select banner</h2>
         });
 
     </script>
-    <script type="text/javascript" th:src="@{/app/jsreact/lms-lti-coursesetupwizard/lms-lti-coursesetupwizard.js}"></script>
 </th:block>
 </body>
 </html>
diff --git a/src/main/resources/templates/theme/selectTheme.html b/src/main/resources/templates/theme/selectTheme.html
index 85eb7c4..ba2b4ff 100644
--- a/src/main/resources/templates/theme/selectTheme.html
+++ b/src/main/resources/templates/theme/selectTheme.html
@@ -25,7 +25,6 @@ <h2 id="page-title">Select theme</h2>
                 <!-- radio list for theme options -->
                 <fieldset class="rvt-fieldset">
                     <legend>Theme options</legend>
-                    <div th:insert="fragments.html :: selectAlert"></div>
                     <ul id="image-ul" class="rvt-list-plain">
                         <th:block th:if="${themes != null}" th:each="theme : ${themes}">
                             <li class="rvt-border-all rvt-border-radius-md rvt-p-all-xs rvt-m-bottom-xxs radio-card--clickable">
@@ -39,24 +38,17 @@ <h2 id="page-title">Select theme</h2>
                             </li>
                         </th:block>
                     </ul>
+                    <div th:insert="fragments.html :: selectAlert"></div>
                 </fieldset>
                 <input type="hidden" name="currentPage" value="2">
                 <div th:insert="theme/wizardSteps.html :: buttons(nextOnclick='return doSubmit();')"></div>
             </form>
         </div>
     </div>
-
 </div>
 
 <th:block layout:fragment="script">
     <script th:inline="javascript">
-        /*<![CDATA[*/
-            const courseId = /*[[${courseId}]]*/
-            const selectedCourseId = /*[[${selectedCourseId}]]*/
-            var courses = /*[[${courses}]]*/;
-            window.config = {courses: courses};
-        /*]]>*/
-
         function doSubmit() {
             var checkedRadio = document.querySelector('input[name="themeId"]:checked');
             if (checkedRadio == null) {
@@ -66,13 +58,10 @@ <h2 id="page-title">Select theme</h2>
                 });
                 alertMessage = document.getElementById('select-alert');
                 alertMessage.classList.remove("rvt-display-none");
-                allRadio[0].focus();
                 return false;
             }
         }
-
     </script>
-    <script type="text/javascript" th:src="@{/app/jsreact/lms-lti-coursesetupwizard/lms-lti-coursesetupwizard.js}"></script>
 </th:block>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/theme/submit.html b/src/main/resources/templates/theme/submit.html
index 0d685f2..0ec563f 100644
--- a/src/main/resources/templates/theme/submit.html
+++ b/src/main/resources/templates/theme/submit.html
@@ -38,33 +38,5 @@ <h2 id="page-title">Submit</h2>
         </div>
     </div>
 </div>
-
-<th:block layout:fragment="script">
-    <script th:inline="javascript">
-        /*<![CDATA[*/
-            const courseId = /*[[${courseId}]]*/
-            const selectedCourseId = /*[[${selectedCourseId}]]*/
-            var courses = /*[[${courses}]]*/;
-            window.config = {courses: courses};
-        /*]]>*/
-
-        function doSubmit() {
-            //Select control
-            var inputControl = document.querySelector('input[id="course-select-input"]');
-            //Hidden input with the actual value
-            var inputValue = document.querySelector('input[name="selectedCourseId"]');
-            if (inputValue.value == "") {
-                inputControl.setAttribute("aria-invalid", "true");
-                inputControl.setAttribute("aria-describedby", "option-message");
-                alertMessage = document.getElementById('select-alert');
-                alertMessage.classList.remove("rvt-display-none");
-                inputControl.focus();
-                return false;
-            }
-        }
-
-    </script>
-    <script type="text/javascript" th:src="@{/app/jsreact/lms-lti-coursesetupwizard/lms-lti-coursesetupwizard.js}"></script>
-</th:block>
 </body>
-</html>
+</html>
\ No newline at end of file