From 16e3478fa690a1a0a7d4f1c4301320fd4aca7152 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Fri, 28 Oct 2022 21:50:26 -0400
Subject: [PATCH] Popup fixes

---
 aiserver.py        |  2 +-
 static/koboldai.js | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index a7ea0b5a..5aec2cb0 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -8781,7 +8781,7 @@ def UI_2_load_userscripts_list(data):
                                                                   deleteable=True, show_breadcrumbs=False, item_check=valid_userscripts_to_load,
                                                                   valid_only=True, hide_extention=True, extra_parameter_function=get_userscripts_desc,
                                                                   column_names=['Module Name', 'Description'],
-                                                                  show_filename=True, show_folders=False,
+                                                                  show_filename=False, show_folders=False,
                                                                   column_widths=['150px', 'auto'])
                                                                 
 @logger.catch
diff --git a/static/koboldai.js b/static/koboldai.js
index 1644e308..b7d7e93e 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -971,8 +971,7 @@ function redrawPopup() {
 		let gridIndex = 0;
 		if (row.showFilename) {
 			let popup_item = document.createElement("span");
-			popup_item.style = `overflow-x: hidden; grid-area: p${gridIndex};`;
-			gridIndex += 1;
+			popup_item.style = `overflow-x: hidden; grid-area: file;`;
 
 			popup_item.id = row.path;
 			popup_item.setAttribute("folder", row.isFolder);
@@ -1111,7 +1110,7 @@ function popup_items(data) {
 		dataRow.path = item[1];
 		dataRow.fileName = item[2];
 		dataRow.isValid = item[3];
-		dataRow.showFilename = item.show_filename;
+		dataRow.showFilename = data.show_filename;
 
 		popup_rows.push(dataRow);
 	}
@@ -1126,15 +1125,17 @@ function popup_items(data) {
 	
 	//create the column widths
 	popup_style = 'display: grid; grid-template-areas: "icons';
+	if (data.show_filename) {
+		popup_style += ' file';
+	}
 	for (let i=0; i < data.column_widths.length; i++) {
 		popup_style += ` p${i}`;
 	}
 
-	if (data.show_filename) {
-		popup_style += ` p${i}`;
-	}
-
 	popup_style += '"; grid-template-columns: 50px';
+	if (data.show_filename) {
+		popup_style += ' 100px';
+	}
 	for (const column_width of data.column_widths) {
 		popup_style += " "+column_width;
 	}
@@ -1155,8 +1156,7 @@ function popup_items(data) {
 		td = document.createElement("span");
 		td.textContent = "File Name";
 		td.classList.add("table-header-container")
-		td.style = "overflow-x: hidden; grid-area: p"+i+";";
-		i+=1;
+		td.style = "overflow-x: hidden; grid-area: file;";
 		tr.append(td)
 	}