Changes for page Nice Display

Summary

• Page properties (3 modified, 0 added, 0 removed)
• Objects (1 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]

Details

Page properties

Title

...	...	@@ -1,1 +1,1 @@
1		-Industry meets ErUM-Data
	1	+Nice Display

Parent

...	...	@@ -1,1 +1,1 @@
1		-Main.WebHome
	1	+Research Groups.WebHome

Content

...	...	@@ -1,21 +10,17 @@
1		-{{box cssClass="floatinginfobox" title="**The list thrives on being filled.**"}}
2		-To be added (or removed) you can:
3		-
4		-* contact [[judith.steinfeld@erumdatahub.de>>mailto:judith.steinfeld@erumdatahub.de]]
5		-* add or update an entry yourself [[How-To (end of page)>>||anchor="howto"]]
6		-{{/box}}
7		-
8		-This is a collection of various groups in industry that are adjacent or in cooperation with ErUM-Data science.
9		-
10	10	{{locationSearch width="100%;clear:both;" className="Research Groups.Code.Research GroupsClass" description="Search, including in excerpts."/}}
11	11
12	12	{{velocity}}
	4	+#if ( $ntrg_tagCols == $null )
	5	+#set( $ntrg_tagCols = [["Tags", true]] )
	6	+#end
	7	+#set ($discard = $xwiki.jsx.use('Research Groups.Nice Display.WebHome'))
	8	+
13	13	#set ($columnsProperties = {
14	14	'affiliation': {"filterable":true, "sortable":true, "html":true},
15	15	'URL': {"type": "hidden"},
16	16	"content": {"type": "hidden"},
17	17	"coop": {},
18		- "tags": {"sortable": false, "filterable": false, "html": true, "headerClass": "tagsCol"},
	14	+ "tags": {"sortable": false, "filterable": false, "html": true, "headerClass": "tagsCol", "aux": $ntrg_tagCols},
19	19	"doc.date": {"filterable": false, "displayName": "Last Updated"},
20	20	'_actions': {"actions":["view","edit"]}
21	21	})
...	...	@@ -22,7 +22,7 @@
22	22	#set ($options = {
23	23	'className': 'Research Groups.Code.Research GroupsClass',
24	24	'translationPrefix': 'research groups.livetable.',
25		- 'extraParams': '&location=Industry%20meets%20ErUM-Data',
	21	+ 'extraParams': "&location=${escapetool.url($doc.getSpace())}",
26	26	'tagCloud': true,
27	27	'rowCount': 25,
28	28	'maxPages': 10,
...	...	@@ -29,8 +29,11 @@
29	29	'selectedColumn': 'doc.date',
30	30	'defaultOrder': 'desc'
31	31	})
32		-#set ($columns = ['affiliation', 'URL', "content", "tags", "coop", "doc.date", '_actions'])
33		-#livetable('research_groups' $columns $columnsProperties $options)
	28	+#set ($columns = ['affiliation', 'URL', "content", "coop", "doc.date", '_actions'])
	29	+#foreach ($ntrg_tagCol in $ntrg_tagCols)
	30	+#set ($discard = $columns.add(3, "tags"))
	31	+#end
	32	+#livetable("research_groups" $columns $columnsProperties $options)
34	34	{{/velocity}}
35	35
36	36	(% id="howto" %)

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -1,87 +1,86 @@
1		-const tabName = "research_groups";
2		-const tagCols = [
3		- ["Tags", true],
4		-]
	1	+(()=>{
	2	+ const tabName = "research_groups";
	3	+ let tagCols;
5	5
6		-document.observe('xwiki:livetable:loading', () => {
7		- const mats = document.getElementById(tabName);
	5	+ document.observe('xwiki:livetable:loading', () => {
	6	+ const mats = document.getElementById(tabName);
	7	+ if (!mats) return;
8	8
9		- // coulmn data sources
10		- const conf = JSON.parse(mats.dataset.settings);
11		- tagCols.forEach(([name], i) => {
12		- const cn = `tags-${i}`;
13		- conf.columns.splice(conf.columns.indexOf("tags"), 1, cn);
14		- conf.columnDescriptors[cn] = {
15		- displayName: name,
16		- headerClass: "tagsCol",
17		- html: true,
18		- sortable: false,
19		- };
20		- });
21		- mats.dataset.settings = JSON.stringify(conf);
	9	+ // coulmn data sources
	10	+ const conf = JSON.parse(mats.dataset.settings);
	11	+ tagCols = (conf.columnDescriptors.tags ?? {aux: []}).aux ?? [["Tags", true]];
	12	+ tagCols.forEach(([name], i) => {
	13	+ const cn = `tags-${i}`;
	14	+ conf.columns.splice(conf.columns.indexOf("tags"), 1, cn);
	15	+ conf.columnDescriptors[cn] = {
	16	+ displayName: name,
	17	+ headerClass: "tagsCol",
	18	+ html: true,
	19	+ sortable: false,
	20	+ };
	21	+ });
	22	+ mats.dataset.settings = JSON.stringify(conf);
22	22
23		- // column headers
24		- mats.querySelectorAll(".xwiki-livetable-display-header .tagsCol").forEach(
25		- (v, i) => v.textContent = tagCols[i][0]
26		- );
	24	+ // column headers
	25	+ mats.querySelectorAll(".xwiki-livetable-display-header .tagsCol").forEach(
	26	+ (v, i) => v.textContent = tagCols[i][0]
	27	+ );
27	27
28		- // handle clicks for tags
29		- document.getElementById(`${tabName}-display`).addEventListener("click", ev => {
30		- if (ev.button) return; // only left click
31		- if (ev.target.nodeName !== "SPAN") return;
32		- if (!ev.target.classList.contains("ltTag")) return;
33		- const tag = ev.target.textContent;
34		- ev.preventDefault();
35		- const lt = mats.__liveTable;
36		- const st = lt.tagCloud.selectedTags;
37		- if (tag in st) delete st[tag];
38		- else st[tag] = {};
39		- lt.tags = Object.keys(st);
40		- lt.clearCache();
41		- lt.showRows(1, lt.limit);
42		- })
43		-});
	29	+ // handle clicks for tags
	30	+ document.getElementById(`${tabName}-display`).addEventListener("click", ev => {
	31	+ if (ev.button) return; // only left click
	32	+ if (ev.target.nodeName !== "SPAN") return;
	33	+ if (!ev.target.classList.contains("ltTag")) return;
	34	+ const tag = ev.target.textContent;
	35	+ ev.preventDefault();
	36	+ const lt = mats.__liveTable;
	37	+ const st = lt.tagCloud.selectedTags;
	38	+ if (tag in st) delete st[tag];
	39	+ else st[tag] = {};
	40	+ lt.tags = Object.keys(st);
	41	+ lt.clearCache();
	42	+ lt.showRows(1, lt.limit);
	43	+ })
	44	+ });
44	44
45		-document.observe(`xwiki:livetable:${tabName}:receivedEntries`, ({memo: {data}}) => {
46		- for (const row of data.rows) {
47		- const a = new Element("a", { href: row.URL });
48		- a.innerHTML = row.affiliation_value.split("\n").map((a, i) => i ? a : `<b class="wikiexternallink">${a}</b>`).join("<br/>");
49		- a.title = row.doc_title;
50		- if (row.content !== "-") {
51		- a.dataset.content = row.content;
52		- a.dataset.toggle = "popover";
53		- }
	46	+ document.observe(`xwiki:livetable:${tabName}:receivedEntries`, ({memo: {data}}) => {
	47	+ for (const row of data.rows) {
	48	+ const a = new Element("a", { href: row.URL });
	49	+ a.innerHTML = row.affiliation_value.split("\n").map((a, i) => i ? a : `<b class="wikiexternallink">${a}</b>`).join("<br/>");
	50	+ a.title = row.doc_title;
	51	+ if (row.content !== "-") {
	52	+ a.dataset.content = row.content;
	53	+ a.dataset.toggle = "popover";
	54	+ }
54	54
55		- row.affiliation = a.outerHTML;
	56	+ row.affiliation = a.outerHTML;
56	56
57		- row.doc_date = row.doc_date.split(" ")[0].split("/").slice(0, 2).join("/");
	58	+ row.doc_date = row.doc_date.split(" ")[0].split("/").slice(0, 2).join("/");
58	58
59		- // tags
60		- const tags = new Set(row.tags_value.slice(1, -1).split(", "));
61		- tagCols.forEach(([name, ...want], i) =>
62		- row[`tags-${i}`] = (
63		- want[0] === true
64		- ? Array.from(tags)
65		- : want.filter(tag => tags.delete(tag))
66		- ).sort().map(tag => `<span class="ltTag" style="cursor:pointer;">${tag}</span>`).join(", ")
67		- );
68		- }
69		-});
	60	+ // tags
	61	+ const tags = new Set(row.tags_value.slice(1, -1).split(", "));
	62	+ tagCols.forEach(([name, ...want], i) =>
	63	+ row[`tags-${i}`] = (
	64	+ want[0] === true
	65	+ ? Array.from(tags)
	66	+ : want.filter(tag => tags.delete(tag))
	67	+ ).sort().map(tag => `<span class="ltTag" style="cursor:pointer;">${tag}</span>`).join(", ")
	68	+ );
	69	+ }
	70	+ });
70	70
71		-require(['jquery', 'bootstrap'], function($) {
72		- document.styleSheets[0].insertRule(`#mainContentArea .popover {max-width: 50%;}`)
	72	+ require(['jquery', 'bootstrap'], function($) {
	73	+ document.styleSheets[0].insertRule(`#mainContentArea .popover {max-width: 50%;}`);
73	73
74		- const ttApply = () => {
75		- $(`#${tabName} [data-toggle="popover"]`).popover({
76		- html: true,
77		- container: `#mainContentArea`,
78		- trigger: "hover",
79		- });
80		- };
	75	+ const ttApply = () => {
	76	+ $(`#${tabName} [data-toggle="popover"]`).popover({
	77	+ html: true,
	78	+ container: `#mainContentArea`,
	79	+ trigger: "hover",
	80	+ });
	81	+ };
81	81
82		- document.observe(`xwiki:livetable:${tabName}:displayComplete`, ttApply);
83		- ttApply();
84		-});
85		-
86		-
87		-
	83	+ document.observe(`xwiki:livetable:${tabName}:displayComplete`, ttApply);
	84	+ ttApply();
	85	+ });
	86	+})();

Name

...	...	@@ -1,1 +1,1 @@
1		-Live Table - Research Groups
	1	+Nice Table - Research Groups

Use this extension

...	...	@@ -1,1 +1,1 @@
1		-currentPage
	1	+onDemand