From 181d2a817c6c89f5168819337129af9014fadf65 Mon Sep 17 00:00:00 2001
From: Alex Bogdanovski <alex@erudika.com>
Date: Fri, 26 Apr 2024 20:49:27 +0300
Subject: [PATCH] added support for tag descriptions, closes #425

---
 .../scoold/controllers/TagsController.java    | 17 +++---
 src/main/resources/static/scripts/scoold.js   |  3 ++
 src/main/resources/templates/tags.vm          | 53 ++++++++++++-------
 3 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/erudika/scoold/controllers/TagsController.java b/src/main/java/com/erudika/scoold/controllers/TagsController.java
index 54c5fea5..0725f602 100644
--- a/src/main/java/com/erudika/scoold/controllers/TagsController.java
+++ b/src/main/java/com/erudika/scoold/controllers/TagsController.java
@@ -28,6 +28,10 @@
 import com.erudika.scoold.core.Profile;
 import com.erudika.scoold.core.Question;
 import com.erudika.scoold.utils.ScooldUtils;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.MediaType;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,10 +42,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import jakarta.inject.Inject;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.core.MediaType;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -110,8 +110,8 @@ public String create(@RequestParam String tags, HttpServletRequest req, HttpServ
 	}
 
 	@PostMapping
-	public String rename(@RequestParam String tag, @RequestParam String newtag, HttpServletRequest req,
-			HttpServletResponse res, Model model) {
+	public String rename(@RequestParam String tag, @RequestParam String newtag, @RequestParam String description,
+			HttpServletRequest req, HttpServletResponse res, Model model) {
 		Profile authUser = utils.getAuthUser(req);
 		int count = 0;
 		if (utils.isMod(authUser)) {
@@ -157,6 +157,11 @@ public String rename(@RequestParam String tag, @RequestParam String newtag, Http
 				}
 				model.addAttribute("tag", updated);
 				count = t.getCount();
+			} else if (t != null && !StringUtils.equals(oldTag.getDescription(), description)) {
+				t.setDescription(description);
+				updated = pc.update(t);
+				model.addAttribute("tag", updated);
+				count = t.getCount();
 			}
 		}
 		if (utils.isAjaxRequest(req)) {
diff --git a/src/main/resources/static/scripts/scoold.js b/src/main/resources/static/scripts/scoold.js
index e71a942c..ff463924 100755
--- a/src/main/resources/static/scripts/scoold.js
+++ b/src/main/resources/static/scripts/scoold.js
@@ -862,11 +862,14 @@ $(function () {
 		var $form = $(form);
 		var hiddenTag = $form.find("input[type=hidden]");
 		var tag = $form.find("input[name=newtag]").val();
+		var description = $form.find("input[name=description]").val();
 		hiddenTag.val(tag);
 		$form.closest(".col").find(".tag-count").html("&times; " + (data.count || 0)).end().
 				find(".next-div-toggle").click().prevAll("a").text(data.tag || tag).attr("href", function (i, href) {
 					return href.substring(0, href.lastIndexOf('/') + 1) + encodeURIComponent(data.tag);
 				});
+		$form.closest(".card-panel").find(".editlink").click();
+		$form.closest(".card-panel").find(".tag-description-box").text(description);
 	});
 
 	$(document).on("click", "a.delete-tag",  function() {
diff --git a/src/main/resources/templates/tags.vm b/src/main/resources/templates/tags.vm
index 54d5fd42..ecaf04e0 100644
--- a/src/main/resources/templates/tags.vm
+++ b/src/main/resources/templates/tags.vm
@@ -43,29 +43,44 @@
 			#foreach($showtag in $tagslist)
 			<div class="col m3">
 				<div class="card-panel pvl tagbox">
-					<strong class="right tag-count">&times; $!showtag.count</strong>
-					<i class="fa fa-tag grey-text"></i>&nbsp;
-					<a href="$questionslink/tag/$!utils.urlEncode($showtag.tag)" title="Posts tagged $!showtag.tag" class="mrs">
-						$!showtag.tag
-					</a>
+					<div class="row mbn viewbox">
+						<div class="col s12">
+							<strong class="right tag-count">&times; $!showtag.count</strong>
+							<i class="fa fa-tag grey-text"></i>&nbsp;
+							<a href="$questionslink/tag/$!utils.urlEncode($showtag.tag)" title="Posts tagged $!showtag.tag" class="mrs">
+								$!showtag.tag
+							</a>
+							#if($isMod)
+								<a href="#" title="Rename" class="editlink"><i class="fa fa-pencil-square orange-text"></i></a>
+							#end
+							#if($showtag.description)
+								<div class="tag-description-box">$showtag.description</div>
+							#end
+						</div>
+					</div>
+
 					#if($isMod)
-						<a href="#" title="Rename" class="next-div-toggle"><i class="fa fa-pencil-square orange-text"></i></a>
-						<div class="row mbn hide">
-							<form method="post" class="tag-rename-form">
-								<div class="col s12 m8">
-									<div class="input-field">
-										<label for="new-tag-${showtag.tag}">$!lang.get('tags.tag')</label>
-										<input type="text" id="new-tag-${showtag.tag}" name="newtag" class="validate" value="$!showtag.tag" required>
-										<input type="hidden" name="tag" class="validate" value="$!showtag.tag">
-									</div>
-									<a href="$tagslink/delete?tag=$!showtag.tag" class="red-text delete-tag">$!lang.get('delete')</a>
+					<div class="row mbn hide editbox">
+						<form method="post" class="tag-rename-form">
+							<div class="col s12 m8">
+								<div class="input-field">
+									<label for="new-tag-${showtag.tag}">$!lang.get('tags.tag')</label>
+									<input type="text" id="new-tag-${showtag.tag}" name="newtag" class="validate" value="$!showtag.tag" required>
+									<input type="hidden" name="tag" class="validate" value="$!showtag.tag">
 								</div>
-								<div class="col s12 m4 r">
-									<button class="btn mtl waves-effect waves-light" type="submit">$!lang.get('save')</button>
+								<div class="input-field">
+									<label for="new-tag-info-${showtag.tag}">$!lang.get('description')</label>
+									<input type="text" id="new-tag-info-${showtag.tag}" name="description" value="$!showtag.description">
 								</div>
-							</form>
-						</div>
+								<a href="$tagslink/delete?tag=$!showtag.tag" class="red-text delete-tag">$!lang.get('delete')</a>
+							</div>
+							<div class="col s12 m4 r">
+								<button class="btn mtl waves-effect waves-light" type="submit">$!lang.get('save')</button>
+							</div>
+						</form>
+					</div>
 					#end
+
 				</div>
 			</div>
 			#end