Changes for page Material Collection
Last modified by Judith Steinfeld on 2025/06/03 11:13
Summary
-
Page properties (1 modified, 0 added, 0 removed)
-
Objects (1 modified, 0 added, 0 removed)
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
-
... ... @@ -1,49 +2,13 @@ 1 -const tabName = "materials"; 2 2 const tagCols = [ 3 - ["T ype", "lecture", "exercise", "hands-on", "solution", "tutorial"],2 + ["Tag1", "CERN", "CHEP", "GPU", "VISPA"], 4 4 ["Tags", true], 5 5 ] 6 6 7 7 document.observe('xwiki:livetable:loading', () => { 8 - const mats = document.getElementById(tabName); 9 - 10 - // coulmn data sources 11 - const conf = JSON.parse(mats.dataset.settings); 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); 23 - 24 - // column headers 25 - mats.querySelectorAll(".xwiki-livetable-display-header .tagsCol").forEach( 26 - (v, i) => v.textContent = tagCols[i][0] 27 - ); 28 - 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 - }) 7 + debugger; 44 44 }); 45 45 46 -document.observe( `xwiki:livetable:${tabName}:receivedEntries`, ({memo: {data}}) => {10 +document.observe("xwiki:livetable:materials:receivedEntries", ({memo: {data}}) => { 47 47 for (const row of data.rows) { 48 48 const ol = new DOMParser().parseFromString(row.doc_location, "text/xml").documentElement; 49 49 const li = ol.children; ... ... @@ -53,15 +53,8 @@ 53 53 li[i].textContent = li[i].textContent; // remove link 54 54 55 55 const a = li[li.length - 1].children[0]; 56 - const b = a.ownerDocument.createElement("b"); 57 - a.replaceWith(b); 58 - b.appendChild(a); 59 - 60 60 const u = new URL(row.link_value); 61 61 let icon; 62 - if (u.hostname.includes("github")) icon = "github"; 63 - if (u.hostname.includes("gitlab")) icon = "gitlab"; 64 - if (u.hostname.includes("google")) icon = "google"; 65 65 if (u.pathname.endsWith(".pdf")) icon = "file-pdf-o"; 66 66 if (icon) { 67 67 const s = a.ownerDocument.createElement("span"); ... ... @@ -72,20 +72,18 @@ 72 72 } 73 73 a.setAttribute("class", "wikiexternallink"); 74 74 a.setAttribute("href", u.href); 75 - 76 - a.parentNode 77 77 78 78 row.doc_location = ol.outerHTML; 79 79 80 80 // tags 81 - const tags = new Set(row.tags_value.slice(1, -1).split(", ")); 82 - tagCols.forEach(([name, ...want], i) => 83 - 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++}`] = ( 84 84 want[0] === true 85 85 ? Array.from(tags) 86 - : want.filter(tag => tags.delete(tag)) 87 - ).sort().map(tag => `<span class="ltTag" style="cursor:pointer;">${tag}</span>`).join(", ") 88 - ); 42 + : want.filter(tag => tags.has(tag) && (tags.remove(tag) || true)) 43 + ).sort().map(tag => `<span>${tag}</span>`).join(" "); 89 89 } 90 90 }); 91 91