Changes for page Material Collection

Last modified by Judith Steinfeld on 2025/06/03 11:13

From version 55.1
edited by admin
on 2024/10/23 12:01
Change comment: There is no comment for this version
To version 54.2
edited by admin
on 2024/10/21 15:07
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -21,8 +21,7 @@
21 21   'link': {"type": "hidden"},
22 22   'date': {"html": true},
23 23   'author': {},
24 - "tags": {"sortable": false, "filterable": false, "html": true, "headerClass": "tagsCol"},
25 - "_actions": {"actions": ["view", "edit"]}
24 + "tags": {"sortable": false, "html": true, "headerClass": "tagsCol"}
26 26  })
27 27  #set ($options = {
28 28   'className': 'Materials.Code.MaterialsClass',
... ... @@ -35,8 +35,5 @@
35 35   'defaultOrder': 'desc'
36 36  })
37 37  #set ($columns = ['doc.location', 'link', "tags", "tags", 'date', 'author'])
38 -#if (!$isGuest)
39 - #set($discard = $columns.add("_actions"))
40 -#end
41 41  #livetable('materials' $columns $columnsProperties $options)
42 42  {{/velocity}}
XWiki.JavaScriptExtension[0]
Code
... ... @@ -4,42 +4,7 @@
4 4  ]
5 5  
6 6  document.observe('xwiki:livetable:loading', () => {
7 - const mats = document.getElementById("materials");
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);
22 -
23 - // column headers
24 - mats.querySelectorAll(".xwiki-livetable-display-header .tagsCol").forEach(
25 - (v, i) => v.firstElementChild.textContent = tagCols[i][0]
26 - );
27 -
28 - // handle clicks for tags
29 - document.getElementById("materials-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 - })
7 + debugger;
43 43  });
44 44  
45 45  document.observe("xwiki:livetable:materials:receivedEntries", ({memo: {data}}) => {
... ... @@ -68,14 +68,14 @@
68 68   row.doc_location = ol.outerHTML;
69 69  
70 70   // tags
71 - const tags = new Set(row.tags_value.slice(1, -1).split(", "));
72 - tagCols.forEach(([name, ...want], i) =>
73 - row[`tags-${i}`] = (
36 + const tags = new Set(e.tags_value.slice(1, -1).split(", "));
37 + let i = 1;
38 + for (const [[name, ...want] of tagCols)
39 + row[`tags${i++}`] = (
74 74   want[0] === true
75 75   ? Array.from(tags)
76 - : want.filter(tag => tags.delete(tag))
77 - ).sort().map(tag => `<span class="ltTag" style="cursor:pointer;">${tag}</span>`).join(", ")
78 - );
42 + : want.filter(tag => tags.has(tag) && (tags.remove(tag) || true));
43 + ).sort().map(tag => `<span>${tag}</span>`).join(" ");
79 79   }
80 80  });
81 81