0 Votes

Changes for page IncidentGallery

Last modified by Ryan C on 2025/07/17 06:41

From version 2.14
edited by Ryan C
on 2025/07/17 05:04
Change comment: There is no comment for this version
To version 4.2
edited by Ryan C
on 2025/07/17 05:43
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,76 +1,70 @@
1 1  {{groovy}}
2 -def render(tags, max) {
3 - def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it }
4 - def maxCount = max?.toInteger() ?: 999
2 +def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it }
3 +def maxCount = 100
5 5  
6 - def hql = """
7 - select doc.fullName
8 - from XWikiDocument doc, BaseObject obj
9 - where obj.name = doc.fullName
10 - and obj.className = 'Main Categories.Anti White Incidents.Code.MoviesClass'
11 - order by doc.date desc
12 - """
5 +def hql = """
6 + select doc.fullName
7 + from XWikiDocument doc, BaseObject obj
8 + where obj.name = doc.fullName
9 + and obj.className = 'Main Categories.Anti White Incidents.Code.MoviesClass'
10 + order by doc.date desc
11 +"""
13 13  
14 - def docs = xwiki.search(hql, maxCount, 0)
15 - def results = []
13 +def docs = xwiki.search(hql, maxCount, 0)
14 +def results = []
16 16  
17 - docs.each { docName ->
18 - if (results.size() >= maxCount) return
16 +docs.each { docName ->
17 + def doc = xwiki.getDocument(docName)
18 + def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass")
19 + if (!obj) return
19 19  
20 - def doc = xwiki.getDocument(docName)
21 - def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass")
22 - if (!obj) return
21 + def title = obj.getProperty("shortText1")?.value?.toString()?.trim()
22 + def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim()
23 + def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim()
24 + def tagList = obj.getProperty("tags")?.value
23 23  
24 - def title = obj.getProperty("shortText1")?.value?.toString()?.trim()
25 - def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim()
26 - def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim()
27 - def tagList = obj.getProperty("tags")?.value
26 + if (!title || !summary) return
28 28  
29 - if (!title || !summary) return
28 + // ✅ Apply tag filtering if tags were provided
29 + if (includeTags && tagList instanceof List) {
30 + def docTags = tagList.collect { it.toString().toLowerCase() }
31 + if (!docTags.any { includeTags.contains(it) }) return
32 + }
30 30  
31 - if (includeTags && tagList) {
32 - def tagNames = tagList.collect { it.toString().toLowerCase() }
33 - if (!tagNames.any { includeTags.contains(it) }) return
34 - }
34 + def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://")
35 + def linkTarget = isValidURL ? externalURL : "doc:${docName}"
36 + def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B')
35 35  
36 - def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://")
37 - def linkTarget = isValidURL ? externalURL : "doc:${docName}"
38 - def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B')
38 + def imageFile = doc.getAttachmentList()?.find {
39 + it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)")
40 + }?.filename
39 39  
40 - def imageFile = doc.getAttachmentList()?.find {
41 - it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)")
42 - }?.filename
42 + def imageMarkup = ""
43 + if (imageFile) {
44 + imageMarkup = "[[image:${doc.fullName}@${imageFile}||alt=\"Image\" data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]"
45 + }
43 43  
44 - def imageMarkup = ""
45 - if (imageFile) {
46 - imageMarkup = "[[image:${doc.fullName}@${imageFile}||alt=\"Image\" data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]"
47 - }
47 + def block = """
48 + (% style="margin-bottom:20px; width:100%" %)
49 + |${imageMarkup}|
48 48  
49 - def block = """
50 - (% style="margin-bottom:20px; width:100%" %)
51 - |${imageMarkup}|
51 + === [[${safeTitle}>>${linkTarget}]] ===
52 52  
53 - === [[${safeTitle}>>${linkTarget}]] ===
53 + ${summary}
54 + [[Read More>>${linkTarget}]]
55 + """.trim()
54 54  
55 - ${summary}
56 - [[Read More>>${linkTarget}]]
57 - """.trim()
57 + results << block
58 +}
58 58  
59 - results << block
60 - }
61 -
62 - if (results.isEmpty()) {
63 - if (includeTags) {
64 - println "⚠️ No incidents found for tags: ${tags}"
65 - } else {
66 - println "⚠️ No incidents to display."
67 - }
60 +if (results.isEmpty()) {
61 + if (includeTags) {
62 + println "⚠️ No incidents found with selected tag(s): ${tags}"
68 68   } else {
69 - println results.join("\n\n")
64 + println "⚠️ No incidents to display."
70 70   }
66 +} else {
67 + println results.join("\n\n")
71 71  }
72 -
73 -// ✅ This is the actual macro parameter call
74 -render(tags, max)
75 75  {{/groovy}}
76 76  
XWiki.WikiMacroParameterClass[0]
Parameter description
... ... @@ -1,1 +1,0 @@
1 -Comma-separated tag filters
Parameter mandatory
... ... @@ -1,1 +1,0 @@
1 -No
Parameter name
... ... @@ -1,1 +1,0 @@
1 -tags
Parameter type
... ... @@ -1,1 +1,0 @@
1 -Wiki
XWiki.WikiMacroParameterClass[1]
Parameter description
... ... @@ -1,1 +1,0 @@
1 -Max number of returned incidents
Parameter mandatory
... ... @@ -1,1 +1,0 @@
1 -No
Parameter name
... ... @@ -1,1 +1,0 @@
1 -max
Parameter type
... ... @@ -1,1 +1,0 @@
1 -Wiki
Macros.AntiWhiteTagClass.WebHome[0]