Don't display empty tables

Author: Citrinate

src/components/item_table.js

@@ -182,16 +182,6 @@ export default class ItemTable extends Table {
 			]
 		});
 
-		const emptyTableRowElement = CreateElement("tr", {
-			children: [
-				CreateElement("td", {
-					class: "cs2s_table_empty",
-					colspan: 6,
-					text: this.#mode == ItemTable.MODE.RETRIEVE ? "Storage Unit is empty" : "Inventory has no storable items"
-				})
-			]
-		});
-
 		// Build Footer Elements
 		if (this.#mode === ItemTable.MODE.RETRIEVE) {
 			this.#selectionLimit = Constant.INVENTORY_ITEM_LIMIT - inventory.items.filter(x => typeof x.attributes["trade protected escrow date"] === "undefined").length;
@@ -419,7 +409,6 @@ export default class ItemTable extends Table {
 		// Build Table
 		this._CreateTable(items, tableHeaderElement, tableFooterElement, {
 				defaultSort: this.#defaultSort,
-				emptyTableRowElement: emptyTableRowElement,
 				popupTitle: popupTitle,
 				popupTitleChildren: [
 					popupTitleCrateNameElement

src/components/table.js

@@ -10,7 +10,6 @@ export default class Table {
 	_sortColumns = null;
 	_sortDirection = null;
 	#defaultSort;
-	#emptyTableRowElement;
 
 	static #ROW_HEIGHT = 69;
 	static #BUFFER_ROWS = 3;
@@ -38,7 +37,6 @@ export default class Table {
 		this._filteredData = tableData;
 
 		this.#defaultSort = options.defaultSort ?? null;
-		this.#emptyTableRowElement = options.emptyTableRowElement ?? null;
 
 		// Reset all row elements created by another table
 		this._data.map(item => delete item.element);
@@ -109,10 +107,6 @@ export default class Table {
 			this.#tableBodyElement.append(rowElement);
 		}
 
-		if (this._data.length == 0 && this.#emptyTableRowElement) {
-			this.#tableBodyElement.append(this.#emptyTableRowElement);
-		}
-
 		this.#spacerElement.style.height = "0px"
 		this.#spacerElement.style.height = `${(this._filteredData.length * Table.#ROW_HEIGHT) - this.#tableElement.clientHeight + 31}px`;
 

src/core/script.js

@@ -275,6 +275,47 @@ class Script {
 		return true;
 	}
 
+	ShowMessage(options, ...messages) {
+		const popup = new Popup({
+			title: options.title ?? "Counter-Strike 2 Script Message",
+			simpleMode: true,
+			popoverMode: true,
+			fade: false,
+			body: [
+				CreateElement("div", {
+					class: "cs2s_action_body",
+					children: [
+						CreateElement("div", {
+							class: "cs2s_action_message_tall cs2s_action_multi_message",
+							children: [
+								...messages.map(message => 
+									CreateElement("div", {
+										class: "cs2s_action_message",
+										text: message
+									})
+								)
+							]
+						}),
+						CreateElement("div", {
+							class: "cs2s_action_buttons",
+							children: [
+								CreateElement("div", {
+									class: "cs2s_grey_long_button",
+									text: "Close",
+									onclick: () => {
+										popup.Hide();
+									}
+								})
+							]
+						})
+					]
+				})
+			]
+		});
+
+		popup.Show();
+	}
+
 	ShowError(options, ...errors) {
 		if (!this.#errorTableBody) {
 			this.#errorTableBody = CreateElement("tbody");
@@ -305,44 +346,7 @@ class Script {
 		}
 
 		if (options.level === ERROR_LEVEL.HIGH) {
-			const popup = new Popup({
-				title: "Counter-Strike 2 Script Error",
-				simpleMode: true,
-				popoverMode: true,
-				fade: false,
-				body: [
-					CreateElement("div", {
-						class: "cs2s_action_body",
-						children: [
-							CreateElement("div", {
-								class: "cs2s_action_message_tall cs2s_action_multi_message",
-								children: [
-									...errors.map(error => 
-										CreateElement("div", {
-											class: "cs2s_action_message",
-											text: error.message
-										})
-									)
-								]
-							}),
-							CreateElement("div", {
-								class: "cs2s_action_buttons",
-								children: [
-									CreateElement("div", {
-										class: "cs2s_grey_long_button",
-										text: "Close",
-										onclick: () => {
-											popup.Hide();
-										}
-									})
-								]
-							})
-						]
-					})
-				]
-			});
-
-			popup.Show();
+			this.ShowMessage({title: "Counter-Strike 2 Script Error"}, ...errors.map(error => error.message));
 		} else if (options.level === ERROR_LEVEL.MEDIUM) {
 			const globalNavigationButton = unsafeWindow.document.getElementById(`account_pulldown`);
 			this.#navigationButton.classList.add("cs2s_navigation_status_error_glow");

src/cs2/items/assets/inventory_asset.js

@@ -394,7 +394,15 @@ export default class InventoryAsset extends Asset {
 									return;
 								}
 
-								const table = new ItemTable(inventory.storedItems.filter(x => x.casket_id == this._assetid), inventory, {
+								const casketItems = inventory.storedItems.filter(x => x.casket_id == this._assetid);
+
+								if (casketItems.length == 0) {
+									Script.ShowMessage({}, "Storage Unit is empty");
+
+									return;
+								}
+
+								const table = new ItemTable(casketItems, inventory, {
 									mode: ItemTable.MODE.RETRIEVE,
 									casket: casket,
 									casketName: casket.attributes["custom name attr"]
@@ -443,7 +451,15 @@ export default class InventoryAsset extends Asset {
 									return;
 								}
 
-								const table = new ItemTable(inventory.items.filter(x => x.moveable), inventory, {
+								const moveableItems = inventory.items.filter(x => x.moveable);
+
+								if (moveableItems.length == 0) {
+									Script.ShowMessage({}, "Inventory has no storable items");
+
+									return;
+								}
+
+								const table = new ItemTable(moveableItems, inventory, {
 									mode: ItemTable.MODE.STORE,
 									casket: casket,
 									casketName: casket.attributes["custom name attr"]

src/handlers/inventory_handlers.js

@@ -47,6 +47,12 @@ export function HandleShowItemInventory() {
 				return;
 			}
 
+			if (inventory.storedItems.length == 0) {
+				Script.ShowMessage({}, "No stored items found");
+
+				return;
+			}
+
 			const table = new ItemTable(inventory.storedItems.slice(), inventory, {
 				mode: ItemTable.MODE.RETRIEVE,
 				casketName: "All Storage Units",
@@ -86,6 +92,12 @@ export function HandleShowItemInventory() {
 				return;
 			}
 
+			if (store.items.length == 0) {
+				Script.ShowMessage({}, "No items found in the store");
+
+				return;
+			}
+
 			const table = new StoreTable(store);
 
 			table.Show();