@axium/server 0.28.4 → 0.28.6

package/dist/acl.d.ts

@@ -21,7 +21,7 @@ export type Result<TB extends TableName> = AccessControlInternal & PermissionsFo
 export type WithACL<TB extends TargetName> = kysely.Selectable<db.Schema[TB]> & {
     userId: string;
     acl: Result<`acl.${TB}`>[];
-} & Record<string, any>;
+};
 export interface ACLSelectionOptions {
     /** If specified, files by user UUID */
     user?: Pick<UserInternal, 'id' | 'roles' | 'tags'>;

package/dist/api/admin.js

@@ -1,5 +1,5 @@
 import { AuditFilter, Severity } from '@axium/core';
-import { plugins } from '@axium/core/plugins';
+import { getVersionInfo, plugins } from '@axium/core/plugins';
 import { jsonArrayFrom, jsonObjectFrom } from 'kysely/helpers/postgres';
 import { omit } from 'utilium';
 import * as z from 'zod';
@@ -38,7 +38,7 @@ addRoute({
     path: '/api/admin/plugins',
     async GET(req) {
         await assertAdmin(this, req);
-        return Array.from(plugins.values()).map(p => omit(p, '_hooks'));
+        return await Array.fromAsync(plugins.values().map(async (p) => Object.assign(omit(p, '_hooks', '_client'), await getVersionInfo(p))));
     },
 });
 addRoute({

package/dist/auth.js

@@ -120,6 +120,7 @@ export async function checkAuthForItem(request, itemType, itemId, permissions) {
         error(401, 'Missing token');
     const session = await getSessionAndUser(token).catch(() => null);
     const { userId, user } = session ?? {};
+    // Note: we need to do casting because of TS limitations with generics
     const item = await db
         .selectFrom(itemType)
         .selectAll()

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.28.4",
+	"version": "0.28.6",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"funding": {
 		"type": "individual",
@@ -47,7 +47,7 @@
 		"clean": "rm -rf build .svelte-kit node_modules/{.vite,.vite-temp}"
 	},
 	"peerDependencies": {
-		"@axium/client": ">=0.9.0",
+		"@axium/client": ">=0.9.5",
 		"@axium/core": ">=0.12.0",
 		"kysely": "^0.28.0",
 		"utilium": "^2.3.8",

package/routes/account/+page.svelte

@@ -96,23 +96,31 @@
 		<h3>Passkeys</h3>
 		{#each passkeys as passkey}
 			<div class="item passkey">
-				<dfn title={passkey.deviceType == 'multiDevice' ? 'Multiple devices' : 'Single device'}>
-					<Icon i={passkey.deviceType == 'multiDevice' ? 'laptop-mobile' : 'mobile'} --size="16px" />
-				</dfn>
-				<dfn title="This passkey is {passkey.backedUp ? '' : 'not '}backed up">
-					<Icon i={passkey.backedUp ? 'circle-check' : 'circle-xmark'} --size="16px" />
-				</dfn>
-				{#if passkey.name}
-					<p>{passkey.name}</p>
-				{:else}
-					<p class="subtle"><i>Unnamed</i></p>
-				{/if}
+				<p>
+					<dfn title={passkey.deviceType == 'multiDevice' ? 'Multiple devices' : 'Single device'}>
+						<Icon i={passkey.deviceType == 'multiDevice' ? 'laptop-mobile' : 'mobile'} --size="16px" />
+					</dfn>
+					<dfn title="This passkey is {passkey.backedUp ? '' : 'not '}backed up">
+						<Icon i={passkey.backedUp ? 'circle-check' : 'circle-xmark'} --size="16px" />
+					</dfn>
+					{#if passkey.name}
+						<p>{passkey.name}</p>
+					{:else}
+						<p class="subtle"><i>Unnamed</i></p>
+					{/if}
+				</p>
 				<p>Created {passkey.createdAt.toLocaleString()}</p>
-				{@render action('edit_passkey:' + passkey.id)}
+				<button commandfor="edit_passkey:{passkey.id}" command="show-modal" class="icon-text">
+					<Icon i="pen" --size="16px" />
+					<span class="mobile-only">Rename</span>
+				</button>
 				{#if passkeys.length > 1}
-					{@render action('delete_passkey:' + passkey.id, 'trash')}
+					<button commandfor="delete_passkey:{passkey.id}" command="show-modal" class="icon-text">
+						<Icon i="trash" --size="16px" />
+						<span class="mobile-only">Delete</span>
+					</button>
 				{:else}
-					<dfn title="You must have at least one passkey" class="disabled">
+					<dfn title="You must have at least one passkey" class="disabled icon-text mobile-hide">
 						<Icon i="trash-slash" --fill="#888" --size="16px" />
 					</dfn>
 				{/if}

package/routes/admin/+page.svelte

@@ -1,4 +1,5 @@
 <script>
+	import { Version } from '@axium/client/components';
 	import { Severity } from '@axium/core';
 
 	const { data } = $props();
@@ -10,7 +11,7 @@
 
 <h2>Administration</h2>
 
-<p>Axium Server <span class="version">{data.version}</span></p>
+<p>Axium Server <Version v={data.version} latest={data.latest} /></p>
 
 <h3><a href="/admin/users">Users</a></h3>
 

package/routes/admin/plugins/+page.svelte

@@ -1,4 +1,6 @@
 <script lang="ts">
+	import { Version } from '@axium/client/components';
+
 	const { data } = $props();
 </script>
 
@@ -10,7 +12,7 @@
 
 {#each data.plugins as plugin}
 	<div class="plugin">
-		<h3>{plugin.name}<span class="version">{plugin.version}</span></h3>
+		<h3>{plugin.name}<Version v={plugin.version} latest={plugin.latest} /></h3>
 		<p>
 			<strong>Loaded from</strong>
 			{#if plugin.path.endsWith('/package.json')}
@@ -18,9 +20,9 @@
 			{:else}
 				<span class="path">{plugin.path}</span>
 			{/if}
-			{#if plugin._loadedBy}
+			{#if plugin.loadedBy}
 				by
-				<a class="path" href="/admin/config#{plugin._loadedBy}">{plugin._loadedBy}</a>
+				<a class="path" href="/admin/config#{plugin.loadedBy}">{plugin.loadedBy}</a>
 			{/if}
 		</p>
 		<p><strong>Author:</strong> {plugin.author}</p>