kempo 4.9.6 → 4.9.7

package/dist/admin/content/pages/index.page.html

@@ -45,7 +45,7 @@
 		></script>
 		<script
 			type="module"
-			src="/admin/components/TableRowLink.js"
+			src="/kempo-ui/components/controls/TcOpen.js"
 		></script>
 		<script
 			type="module"
@@ -67,18 +67,14 @@
 		</div>
 
 		<h2>Custom Pages</h2>
-		<k-table
+		<k-table open-on-click
 			id="customTable"
 			enable-pages
 			page-size="25"
 			page-size-options="[10,25,50,100]"
 			placeholder="No custom pages have been created yet."
 		>
-			<admin-table-row-link
-				slot="before"
-				url-pattern="/admin/content/pages/edit?path={editPath}"
-				field-name="editPath"
-			></admin-table-row-link>
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div
 				slot="top"
 				class="d-f full"
@@ -108,18 +104,14 @@
 		</k-table>
 
 		<h2>Extension Pages</h2>
-		<k-table
+		<k-table open-on-click
 			id="extensionTable"
 			enable-pages
 			page-size="25"
 			page-size-options="[10,25,50,100]"
 			placeholder="No extension pages installed."
 		>
-			<admin-table-row-link
-				slot="before"
-				url-pattern="/admin/content/pages/edit?path={editPath}"
-				field-name="editPath"
-			></admin-table-row-link>
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div
 				class="d-f full"
 				style="align-items: center;"
@@ -138,18 +130,14 @@
 		</k-table>
 
 		<h2>System Pages</h2>
-		<k-table
+		<k-table open-on-click
 			id="systemTable"
 			enable-pages
 			page-size="25"
 			page-size-options="[10,25,50,100]"
 			placeholder="No system pages found."
 		>
-			<admin-table-row-link
-				slot="before"
-				url-pattern="/admin/content/pages/edit?path={editPath}"
-				field-name="editPath"
-			></admin-table-row-link>
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div
 				class="d-f full"
 				style="align-items: center;"
@@ -183,7 +171,7 @@
 				{ name: 'name', label: 'Name', size: 200 },
 				{ name: 'url', label: 'URL', size: 250 },
 				{ name: 'author', label: 'Author', size: 150 },
-				{ name: 'description', label: 'Description', size: 300 },
+				{ name: 'description', label: 'Description' },
 				{ name: 'updatedAt', label: 'Updated', size: 190, formatter: v => v ? new Date(v).toLocaleString() : '' },
 				{ name: 'createdAt', label: 'Created', size: 190, formatter: v => v ? new Date(v).toLocaleString() : '' }
 			];
@@ -214,7 +202,7 @@
 
 			setInterval(updateScanInfo, 1000);
 
-			const toEditPath = p => ({ ...p, editPath: p.file.replace(/\.page\.html$/, '') });
+			const withEditUrl = p => ({ ...p, _url: `/admin/content/pages/edit?path=${encodeURIComponent(p.file.replace(/\.page\.html$/, ''))}` });
 
 			const initTable = async ($table, tableFields, owner) => {
 				const [error, data] = await listPages({ owner, showHidden: false, offset: 0, limit: 25 });
@@ -222,11 +210,11 @@
 					Toast.error(error.msg || 'Failed to load pages');
 					return null;
 				}
-				$table.setData({ records: data.pages.map(toEditPath), fields: tableFields });
+				$table.setData({ records: data.pages.map(withEditUrl), fields: tableFields });
 				if(data.total > data.pages.length){
 					$table.setupFetchRecords(data.total, async (start, count) => {
 						const [, d] = await listPages({ owner, showHidden: false, offset: start, limit: count });
-						return (d?.pages || []).map(toEditPath);
+						return (d?.pages || []).map(withEditUrl);
 					});
 				}
 				return data.scannedAt;

package/dist/admin/content/templates/index.page.html

@@ -13,7 +13,7 @@
 		<script type="module" src="/kempo-ui/components/controls/TcDeleteRecord.js"></script>
 		<script type="module" src="/kempo-ui/components/controls/TcDeleteSelected.js"></script>
 		<script type="module" src="/kempo-ui/components/Icon.js"></script>
-		<script type="module" src="/admin/components/TableRowLink.js"></script>
+		<script type="module" src="/kempo-ui/components/controls/TcOpen.js"></script>
 		<script type="module" src="/kempo/components/Permission.js"></script>
 
 		<div class="d-f mb" style="align-items: center; gap: var(--spacer);">
@@ -24,18 +24,14 @@
 		</div>
 
 		<h2>Custom Templates</h2>
-		<k-table
+		<k-table open-on-click
 			id="customTable"
 			enable-pages
 			page-size="25"
 			page-size-options="[10,25,50,100]"
 			placeholder="No custom templates have been created yet."
 		>
-			<admin-table-row-link
-				slot="before"
-				url-pattern="/admin/content/templates/edit?template={editPath}"
-				field-name="editPath"
-			></admin-table-row-link>
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div slot="top" class="d-f full" style="align-items: center;">
 				<div>
 					<k-permission has="system:pages:delete">
@@ -58,18 +54,14 @@
 		</k-table>
 
 		<h2>Extension Templates</h2>
-		<k-table
+		<k-table open-on-click
 			id="extensionTable"
 			enable-pages
 			page-size="25"
 			page-size-options="[10,25,50,100]"
 			placeholder="No extension templates installed."
 		>
-			<admin-table-row-link
-				slot="before"
-				url-pattern="/admin/content/templates/edit?template={editPath}"
-				field-name="editPath"
-			></admin-table-row-link>
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div class="d-f full" style="align-items: center;">
 				<div>
 					<kc-tc-first-page></kc-tc-first-page>
@@ -85,18 +77,14 @@
 		</k-table>
 
 		<h2>System Templates</h2>
-		<k-table
+		<k-table open-on-click
 			id="systemTable"
 			enable-pages
 			page-size="25"
 			page-size-options="[10,25,50,100]"
 			placeholder="No system templates found."
 		>
-			<admin-table-row-link
-				slot="before"
-				url-pattern="/admin/content/templates/edit?template={editPath}"
-				field-name="editPath"
-			></admin-table-row-link>
+			<kc-tc-open slot="before"></kc-tc-open>
 			<div class="d-f full" style="align-items: center;">
 				<div>
 					<kc-tc-first-page></kc-tc-first-page>
@@ -124,7 +112,7 @@
 
 			const fields = [
 				{ name: 'locked', label: '', size: 40, calculator: r => r.locked ? html`<k-icon name="lock"></k-icon>` : html`` },
-				{ name: 'name', label: 'Name', size: 150 },
+				{ name: 'name', label: 'Name' },
 				{ name: 'directory', label: 'Directory', size: 200 },
 				{ name: 'author', label: 'Author', size: 150 },
 				{ name: 'updatedAt', label: 'Updated', size: 190, formatter: v => v ? new Date(v).toLocaleString() : '' },
@@ -146,14 +134,14 @@
 					Toast.error(error.msg || 'Failed to load templates');
 					return;
 				}
-				const toEditPath = t => ({
+				const withEditUrl = t => ({
 					...t,
 					directory: t.directory === '.' ? '/' : t.directory,
-					editPath: (t.directory === '.' ? t.name : `${t.directory}/${t.name}`)
+					_url: `/admin/content/templates/edit?template=${encodeURIComponent(t.directory === '.' ? t.name : `${t.directory}/${t.name}`)}`
 				});
-				const custom = data.templates.filter(t => t.owner === 'custom').map(toEditPath);
-				const extension = data.templates.filter(t => t.owner !== 'custom' && t.owner !== 'system').map(toEditPath);
-				const system = data.templates.filter(t => t.owner === 'system').map(toEditPath);
+				const custom = data.templates.filter(t => t.owner === 'custom').map(withEditUrl);
+				const extension = data.templates.filter(t => t.owner !== 'custom' && t.owner !== 'system').map(withEditUrl);
+				const system = data.templates.filter(t => t.owner === 'system').map(withEditUrl);
 				$customTable.setData({ records: custom, fields });
 				$extensionTable.setData({ records: extension, fields: extensionFields });
 				$systemTable.setData({ records: system, fields });

package/dist/admin/extensions/index.page.html

@@ -11,7 +11,7 @@
 <script type="module" src="/kempo-ui/components/controls/TcPageSelect.js"></script>
 <script type="module" src="/kempo-ui/components/controls/TcPageSize.js"></script>
 <script type="module" src="/admin/components/tableControls/InstallExtension.js"></script>
-<script type="module" src="/admin/components/tableControls/ExtensionDetails.js"></script>
+<script type="module" src="/kempo-ui/components/controls/TcOpen.js"></script>
 <script type="module" src="/admin/components/tableControls/ToggleExtension.js"></script>
 <script type="module" src="/admin/components/tableControls/UninstallExtension.js"></script>
 <script type="module" src="/kempo/components/Permission.js"></script>
@@ -22,8 +22,8 @@
 	</div>
 
 	<h2>Installed Extensions</h2>
-	<k-table id="installedTable" enable-pages page-size="25" placeholder="No extensions are currently installed.">
-		<admin-extension-details slot="after"></admin-extension-details>
+	<k-table open-on-click id="installedTable" enable-pages page-size="25" placeholder="No extensions are currently installed.">
+		<kc-tc-open slot="after" title="View in Store"><k-icon name="storefront"></k-icon></kc-tc-open>
 		<admin-toggle-extension slot="after"></admin-toggle-extension>
 		<admin-uninstall-extension slot="after"></admin-uninstall-extension>
 		<div class="d-f full" style="align-items: center;">
@@ -42,9 +42,9 @@
 
 	<h2>Downloaded, Not Installed</h2>
 	<p class="tc-muted">Extension packages already in this site. To find and download more, <a href="/admin/extensions/browse/">browse the marketplace</a>.</p>
-	<k-table id="availableTable" enable-pages page-size="25" placeholder="Every downloaded extension is installed.">
+	<k-table open-on-click id="availableTable" enable-pages page-size="25" placeholder="Every downloaded extension is installed.">
 		<admin-install-extension slot="after"></admin-install-extension>
-		<admin-extension-details slot="after"></admin-extension-details>
+		<kc-tc-open slot="after" title="View in Store"><k-icon name="storefront"></k-icon></kc-tc-open>
 		<div class="d-f full" style="align-items: center;">
 			<div>
 				<kc-tc-first-page></kc-tc-first-page>
@@ -66,11 +66,12 @@
 
 	const installedTable = document.getElementById('installedTable');
 	const availableTable = document.getElementById('availableTable');
+	const withDetailsUrl = e => ({ ...e, _url: `/admin/extensions/details/?name=${encodeURIComponent(e.name)}` });
 
 	const [installedErr, installedData] = await listExtensions();
 	if(!installedErr){
 		installedTable.setData({
-			records: installedData.items,
+			records: installedData.items.map(withDetailsUrl),
 			fields: [
 				{ name: 'name', label: 'Name' },
 				{ name: 'version', label: 'Version' },
@@ -85,7 +86,7 @@
 		const installedNames = new Set((installedData?.items || []).map(e => e.name));
 		const notInstalled = availableData.items.filter(e => !installedNames.has(e.name));
 		availableTable.setData({
-			records: notInstalled,
+			records: notInstalled.map(withDetailsUrl),
 			fields: [
 				{ name: 'name', label: 'Name' },
 				{ name: 'version', label: 'Version' },
@@ -97,7 +98,7 @@
 	const refreshInstalledTable = async () => {
 		const [err, data] = await listExtensions();
 		if(!err) installedTable.setData({
-			records: data.items,
+			records: data.items.map(withDetailsUrl),
 			fields: [
 				{ name: 'name', label: 'Name' },
 				{ name: 'version', label: 'Version' },
@@ -113,7 +114,7 @@
 		if(!instErr && !availErr){
 			const installedNames = new Set((instData?.items || []).map(e => e.name));
 			availableTable.setData({
-				records: availData.items.filter(e => !installedNames.has(e.name)),
+				records: availData.items.filter(e => !installedNames.has(e.name)).map(withDetailsUrl),
 				fields: [
 					{ name: 'name', label: 'Name' },
 					{ name: 'version', label: 'Version' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kempo",
-  "version": "4.9.6",
+  "version": "4.9.7",
   "type": "module",
   "description": "A fullstack CMS framework for creating websites with user authentication",
   "scripts": {
@@ -61,7 +61,7 @@
   "peerDependencies": {
     "kempo-css": ">=2.2.5",
     "kempo-server": ">=3.4.0",
-    "kempo-ui": ">=0.6.2"
+    "kempo-ui": ">=0.7.0"
   },
   "devDependencies": {
     "@electric-sql/pglite": "^0.5.9",

package/dist/admin/components/tableControls/ExtensionDetails.js

@@ -1,2 +0,0 @@
-import e from"../AdminTableControl.js";import{html as n}from"/kempo-ui/lit-all.min.js";import"/kempo-ui/components/Icon.js";export default class t extends e{connectedCallback(){super.connectedCallback(),this.hasAttribute("title")||(this.title="View in Store")}handleAction(){this.record&&(window.location.href=`/admin/extensions/details/?name=${encodeURIComponent(this.record.name)}`)}render(){return n`<k-icon name="storefront"></k-icon>`}}customElements.define("admin-extension-details",t);
-//# sourceMappingURL=C:\Users\dusti\dev\kempo\dist\admin\components\tableControls\ExtensionDetails.js.map

package/dist/admin/components/tableControls/ExtensionDetails.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"src\\admin\\components\\tableControls\\ExtensionDetails.js","names":["AdminTableControl","html","ExtensionDetails","connectedCallback","super","this","hasAttribute","title","handleAction","record","window","location","href","encodeURIComponent","name","render","customElements","define"],"sources":["0"],"sourcesContent":["import AdminTableControl from '../AdminTableControl.js';\nimport { html } from '/kempo-ui/lit-all.min.js';\nimport '/kempo-ui/components/Icon.js';\n\n/*\n  Opens the marketplace page for a row's extension: its README, what it requires and adds, its rating (which\n  can be changed from there once it is installed). The page shows whatever the marketplace knows; for an\n  extension it does not list it says so.\n*/\nexport default class ExtensionDetails extends AdminTableControl {\n  connectedCallback(){\n    super.connectedCallback();\n    if(!this.hasAttribute('title')) this.title = 'View in Store';\n  }\n\n  handleAction(){\n    if(!this.record) return;\n    window.location.href = `/admin/extensions/details/?name=${encodeURIComponent(this.record.name)}`;\n  }\n\n  render(){ return html`<k-icon name=\"storefront\"></k-icon>`; }\n}\n\ncustomElements.define('admin-extension-details', ExtensionDetails);\n"],"mappings":"OAAOA,MAAuB,yCACrBC,MAAY,iCACd,8CAOQ,MAAMC,UAAyBF,EAC5C,iBAAAG,GACEC,MAAMD,oBACFE,KAAKC,aAAa,WAAUD,KAAKE,MAAQ,gBAC/C,CAEA,YAAAC,GACMH,KAAKI,SACTC,OAAOC,SAASC,KAAO,mCAAmCC,mBAAmBR,KAAKI,OAAOK,QAC3F,CAEA,MAAAC,GAAU,OAAOd,CAAI,qCAAuC,EAG9De,eAAeC,OAAO,0BAA2Bf","ignoreList":[]}