@hotstaq/admin-panel 0.3.9 → 0.3.12

package/build-web/AdminPanelWeb_AppAPI.js

@@ -220,8 +220,8 @@ class users
 	 * @property {string} registeredDate The registered date.
 	 * @property {string} loginDate The login date.
 	 * @property {boolean} verified Indicates if the account has been verified.
-	 * @property {string} ip The player's ip.
-	 * @property {string} jwtToken The player's JWT token.
+	 * @property {string} ip The user's ip.
+	 * @property {string} jwtToken The user's JWT token.
 	 */
 
 	/**
@@ -563,8 +563,8 @@ class admins
 	 * @property {string} registeredDate The registered date.
 	 * @property {string} loginDate The login date.
 	 * @property {boolean} verified Indicates if the account has been verified.
-	 * @property {string} ip The player's ip.
-	 * @property {string} jwtToken The player's JWT token.
+	 * @property {string} ip The user's ip.
+	 * @property {string} jwtToken The user's JWT token.
 	 */
 
 	/**
@@ -743,8 +743,8 @@ class admins
 	 * @property {string} registeredDate The registered date.
 	 * @property {string} loginDate The login date.
 	 * @property {boolean} verified Indicates if the account has been verified.
-	 * @property {string} ip The player's ip.
-	 * @property {string} jwtToken The player's JWT token.
+	 * @property {string} ip The user's ip.
+	 * @property {string} jwtToken The user's JWT token.
 	 */
 
 	/**
@@ -798,8 +798,8 @@ class admins
 	 * @property {string} registeredDate The registered date.
 	 * @property {string} loginDate The login date.
 	 * @property {boolean} verified Indicates if the account has been verified.
-	 * @property {string} ip The player's ip.
-	 * @property {string} jwtToken The player's JWT token.
+	 * @property {string} ip The user's ip.
+	 * @property {string} jwtToken The user's JWT token.
 	 */
 
 	/**
@@ -853,8 +853,8 @@ class admins
 	 * @property {string} registeredDate The registered date.
 	 * @property {string} loginDate The login date.
 	 * @property {boolean} verified Indicates if the account has been verified.
-	 * @property {string} ip The player's ip.
-	 * @property {string} jwtToken The player's JWT token.
+	 * @property {string} ip The user's ip.
+	 * @property {string} jwtToken The user's JWT token.
 	 * @property {string} newPassword The new password to set.
 	 */
 
@@ -916,8 +916,8 @@ class admins
 	 * @property {string} registeredDate The registered date.
 	 * @property {string} loginDate The login date.
 	 * @property {boolean} verified Indicates if the account has been verified.
-	 * @property {string} ip The player's ip.
-	 * @property {string} jwtToken The player's JWT token.
+	 * @property {string} ip The user's ip.
+	 * @property {string} jwtToken The user's JWT token.
 	 */
 
 	/**

package/package.json

@@ -1,24 +1,24 @@
 {
   "name": "@hotstaq/admin-panel",
   "description": "",
-  "version": "0.3.9",
+  "version": "0.3.12",
   "main": "build/index.js",
   "scripts": {
     "start": "hotstaq --hotsite ./HotSite.json --env-file ./.env run --server-type web-api",
     "dev": "hotstaq --hotsite ./HotSite.json --development-mode run --server-type web-api --web-http-port 8080",
     "test": "hotstaq --dev --env-file .env run --server-type web-api --web-test",
     "build": "tsc --build ./tsconfig.json",
-    "build-web": "npm run build && hotstaq create --copy-libraries-to-location ./public/js/ app && webpack --mode=production && hotstaq module build && cp -f ./build-web/AdminPanelComponents.js ./public/js/AdminPanelComponents.js && hotstaq generate --copy-to ./public/js/",
-    "build-web-debug": "npm run build && hotstaq create --copy-libraries-to-location ./public/js/ app && cp -f ./public/js/HotStaq.js ./public/js/HotStaq.min.js && webpack --mode=development && cp -f ./build-web/AdminPanelComponents.js ./public/js/AdminPanelComponents.js && hotstaq module build && hotstaq generate --copy-to ./public/js/",
+    "build-web": "npm run build && hotstaq create --copy-libraries-to-location ./public/js/ app && webpack --mode=production && hotstaq module build && cp -f ./build-web/AdminPanelComponents.js ./public/js/AdminPanelComponents.js && hotstaq generate --api --generate-type javascript --copy-to ./public/js/",
+    "build-web-debug": "npm run build && hotstaq create --copy-libraries-to-location ./public/js/ app && cp -f ./public/js/HotStaq.js ./public/js/HotStaq.min.js && webpack --mode=development && cp -f ./build-web/AdminPanelComponents.js ./public/js/AdminPanelComponents.js && hotstaq module build && hotstaq generate --api --generate-type javascript --copy-to ./public/js/",
     "build-doc": "hotstaq generate --generate-type openapi-3.0.0-yaml",
-    "prepublishOnly": "npm run build && npm run build-web"
+    "prepublishOnly": "npm run build-web"
   },
   "keywords": [],
   "author": "FreeLight, Inc",
   "license": "MIT",
   "dependencies": {
     "@hotstaq/dataroute": "^0.2.10",
-    "@hotstaq/userroute": "^0.6.13",
+    "@hotstaq/userroute": "^0.6.14",
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.3",
     "datatables.net": "^2.2.2",
@@ -52,6 +52,6 @@
     "webpack-cli": "^5.0.1"
   },
   "peerDependencies": {
-    "hotstaq": "^0.8.118"
+    "hotstaq": "^0.8.120"
   }
 }

package/src/components/admin-edit.ts

@@ -198,7 +198,7 @@ export class AdminEdit extends HotComponent
 	/**
 	 * Get the attached lists.
 	 */
-	getAttachedLists (): HTMLElement[]
+	getAttachedHTMLLists (): HTMLElement[]
 	{
 		const strs = this.attached_list.split (",");
 		const attachedLists: HTMLElement[] = [];
@@ -213,10 +213,30 @@ export class AdminEdit extends HotComponent
 		return (attachedLists);
 	}
 
+	/**
+	 * Get the attached lists.
+	 */
+	getAttachedLists (): HotComponent[]
+	{
+		const attachedLists = this.getAttachedHTMLLists ();
+		let attachedListObjs = [];
+
+		for (let iIdx = 0; iIdx < attachedLists.length; iIdx++)
+		{
+			let attachedList = attachedLists[iIdx];
+			// @ts-ignore
+			const hotComponent = attachedList.hotComponent;
+
+			attachedListObjs.push (hotComponent);
+		}
+
+		return (attachedListObjs);
+	}
+
 	/**
 	 * Executes when the edit button is clicked.
 	 */
-	async editClicked (attachedList: AdminTable, selectedFields: any[] = []): Promise<void>
+	async editClicked (selectedFields: any[] = []): Promise<void>
 	{
 		if (this.onEditClicked != null)
 		{
@@ -232,31 +252,39 @@ export class AdminEdit extends HotComponent
 
 		if (this.attached_list !== "")
 		{
-			attachedList.attachedEdit = this;
-			let selectedField = attachedList.getSelected ();
+			const attachedLists = this.getAttachedLists ();
 
-			if (selectedField != null)
+			for (let iIdx = 0; iIdx < attachedLists.length; iIdx++)
 			{
-				await this.processHotFields (
-					async (htmlElement: Element, field: { name: string; type: string; input: string; }) =>
-					{
-						// @ts-ignore
-						let value = selectedField[field.name];
+				let attachedList = attachedLists[iIdx];
+				let table: AdminTable = (<AdminTable>attachedList);
 
-						if (field.input != null)
+				table.attachedEdit = this;
+				let selectedField = table.getSelected ();
+
+				if (selectedField != null)
+				{
+					await this.processHotFields (
+						async (htmlElement: Element, field: { name: string; type: string; input: string; }) =>
 						{
-							if (field.input !== "")
+							// @ts-ignore
+							let value = selectedField[field.name];
+
+							if (field.input != null)
 							{
-								let func = new Function (field.input);
-								value = await func.call (this, this, htmlElement, value);
+								if (field.input !== "")
+								{
+									let func = new Function (field.input);
+									value = await func.call (this, this, htmlElement, value);
+								}
 							}
-						}
 
-						if (value != null)
-							$(htmlElement).val (value);
-					});
+							if (value != null)
+								$(htmlElement).val (value);
+						});
 
-				this.selectedFields = [selectedField];
+					this.selectedFields = [selectedField];
+				}
 			}
 		}
 
@@ -308,8 +336,8 @@ export class AdminEdit extends HotComponent
 			for (let iIdx = 0; iIdx < attachedLists.length; iIdx++)
 			{
 				let attachedList = attachedLists[iIdx];
-				// @ts-ignore
-				hotComponent = attachedList.hotComponent;
+				hotComponent = (<AdminTable>attachedList);
+
 				hotComponent.attachedEdit = this;
 				let checkedRows = hotComponent.getCheckedRows ();
 
@@ -512,8 +540,7 @@ export class AdminEdit extends HotComponent
 			for (let iIdx = 0; iIdx < attachedLists.length; iIdx++)
 			{
 				let attachedList = attachedLists[iIdx];
-				// @ts-ignore
-				let table: AdminTable = attachedList.hotComponent;
+				let table: AdminTable = (<AdminTable>attachedList);
 
 				table.attachedEdit = this;
 
@@ -548,8 +575,7 @@ export class AdminEdit extends HotComponent
 					for (let iIdx = 0; iIdx < attachedLists.length; iIdx++)
 					{
 						let attachedList = attachedLists[iIdx];
-						// @ts-ignore
-						let table: AdminTable = attachedList.hotComponent;
+						let table: AdminTable = (<AdminTable>attachedList);
 
 						if (table != null)
 							table.attachedEdit = this;

package/src/components/admin-table.ts

@@ -2,7 +2,7 @@ import { HotStaq, Hot, HotAPI, HotComponent, HotComponentOutput } from "hotstaq"
 import { AdminTableField } from "./admin-table-field";
 import { AdminEdit } from "./admin-edit";
 
-import DataTable, { Api, ConfigColumns } from "datatables.net";
+import DataTable, { Api, ConfigColumns, InternalSettings } from "datatables.net";
 import dt5 from 'datatables.net-bs5';
 import dtc from 'datatables.net-colreorder-bs5';
 import dts from 'datatables.net-scroller-bs5';
@@ -209,22 +209,6 @@ export class AdminTable extends HotComponent
 	 */
 	async selectRow (htmlElement: HTMLElement, rowIndex: number): Promise<void>
 	{
-		if (this.onselectedrow != null)
-		{
-			if (typeof (this.onselectedrow) === "string")
-				this.onselectedrow = (<(rowIndex: number, item: any[]) => Promise<boolean>>new Function (this.onselectedrow));
-
-			let item: any[] = null;
-
-			if (this.rowElements[rowIndex] != null)
-				item = this.rowElements[rowIndex].fields;
-
-			let result = await this.onselectedrow (rowIndex, item);
-
-			if (result === false)
-				return;
-		}
-
 		// In the future, we will support multiple rows being selected. For now 
 		// this will ensure that only one row is selected at a time.
 		{
@@ -250,7 +234,19 @@ export class AdminTable extends HotComponent
 		if (this.singleclickedit === true)
 		{
 			if (this.attachedEdit != null)
-				await this.attachedEdit.editClicked (this);
+				await this.attachedEdit.editClicked ();
+		}
+
+		if (this.onselectedrow != null)
+		{
+			if (typeof (this.onselectedrow) === "string")
+				this.onselectedrow = (<(rowIndex: number, item: any[]) => Promise<boolean>>new Function (this.onselectedrow));
+
+			let item: any[] = this.getSelected ();
+			let result = await this.onselectedrow (rowIndex, item);
+
+			if (result === false)
+				return;
 		}
 
 		/*this.selectedRows = [];
@@ -478,8 +474,12 @@ export class AdminTable extends HotComponent
 		/*let tbody = this.htmlElements[1].getElementsByTagName ("tbody")[0];
 
 		tbody.innerHTML = "";*/
-		// @ts-ignore
-		this.dataTable.clear ();
+
+		if (this.dataTable != null)
+		{
+			// @ts-ignore
+			this.dataTable.clear ();
+		}
 	}
 
 	/**
@@ -616,31 +616,41 @@ export class AdminTable extends HotComponent
 					dom: 'Qlfrtip',
 					columns: columns,
 					data: [],
-					ajax: async (data, callback, settings) =>
+					ajax: async (data: object, callback: ((data: any) => void), settings: InternalSettings) =>
 						{
 							if (this.isListRefreshing === true)
 								return;
 
-							const currentData = await this.refreshList ();
+							let currentData = await this.refreshList ();
+
 							const callbackObj: any = {
+									// @ts-ignore
+									draw: data.draw,
 									data: [],
 									recordsTotal: 0,
 									recordsFiltered: 0
 								};
 
-							if (! (currentData instanceof Array))
+							if (currentData != null)
 							{
-								if (currentData.length != null)
+								if (! (currentData instanceof Array))
+								{
+									if (currentData.length != null)
+									{
+										callbackObj.recordsTotal = currentData.length;
+										callbackObj.recordsFiltered = currentData.length;
+									}
+
+									if (currentData.data != null)
+										callbackObj.data = currentData.data;
+								}
+								else
 								{
+									callbackObj.data = currentData;
 									callbackObj.recordsTotal = currentData.length;
 									callbackObj.recordsFiltered = currentData.length;
 								}
-
-								if (currentData.data != null)
-									callbackObj.data = currentData.data;
 							}
-							else
-								callbackObj.data = currentData;
 
 							callback (callbackObj);
 						}