toh.js: fix disabling row filter, remove manadatory deviceid link

Signed-off-by: Jo-Philipp Wich <[email protected]>
openwrt · Feb 8, 2024 · bc7f072 · bc7f072
1 parent f696720
commit bc7f072
Showing 1 changed file with 19 additions and 20 deletions.
diff --git a/static/toh.js b/static/toh.js
@@ -274,26 +274,27 @@ function dataToTable(data, columnOrder, filterColumns, domSetting) {
 		th.style.textOverflow = 'ellipsis';
 		table.firstElementChild.firstElementChild.appendChild(th);
 
-		if (domSetting.indexOf('f') !== -1) {
-			let filter = document.createElement('th');
-
-			switch (data.columns[colSrcIdx]) {
-			case 'deviceid':
-			case 'devicepage':
-				break;
-
-			default:
-				filter.appendChild(document.createElement('input'));
-				filter.firstElementChild.type = 'text';
-				filter.firstElementChild.placeholder = data.captions[colSrcIdx];
-				filter.firstElementChild.style.width = '100%';
-				break;
-			}
-
-			table.firstElementChild.lastElementChild.appendChild(filter);
+		let filter = document.createElement('th');
+
+		switch (data.columns[colSrcIdx]) {
+		case 'deviceid':
+		case 'devicepage':
+			break;
+
+		default:
+			filter.appendChild(document.createElement('input'));
+			filter.firstElementChild.type = 'text';
+			filter.firstElementChild.placeholder = data.captions[colSrcIdx];
+			filter.firstElementChild.style.width = '100%';
+			break;
 		}
+
+		table.firstElementChild.lastElementChild.appendChild(filter);
 	});
 
+	if (domSetting.indexOf('f') === -1)
+		table.firstElementChild.removeChild(table.firstElementChild.lastElementChild);
+
 	data.entries.forEach((record, rowIdx) => {
 		for (let i = 0; i < record.length; i++)
 			if (!columnFilter[i](record[i]))
@@ -393,9 +394,7 @@ function initToH() {
 				if (m) filterColumns[colName] = decodeURIComponent(m[1]);
 			});
 
-			if (shownColumns.length && !shownColumns.includes('deviceid'))
-				shownColumns.push('deviceid');
-			else if (!shownColumns.length)
+			if (!shownColumns.length)
 				shownColumns = [ ...srcData.columns.filter(k => k != 'deviceid'), 'deviceid' ];
 
 			for (let colName of hiddenColumns)