@axium/calendar 0.4.1 → 0.4.3

package/dist/common.d.ts

@@ -137,7 +137,6 @@ export declare const Calendar: z.ZodObject<{
             name: z.ZodString;
             email: z.ZodOptional<z.ZodEmail>;
             emailVerified: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodCoercedDate<unknown>>>>;
-            image: z.ZodOptional<z.ZodNullable<z.ZodURL>>;
             preferences: z.ZodOptional<z.ZodLazy<z.ZodObject<{
                 debug: z.ZodDefault<z.ZodBoolean>;
             }, z.core.$strip>>>;
@@ -179,7 +178,6 @@ declare const CalendarAPI: {
                     name: z.ZodString;
                     email: z.ZodOptional<z.ZodEmail>;
                     emailVerified: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodCoercedDate<unknown>>>>;
-                    image: z.ZodOptional<z.ZodNullable<z.ZodURL>>;
                     preferences: z.ZodOptional<z.ZodLazy<z.ZodObject<{
                         debug: z.ZodDefault<z.ZodBoolean>;
                     }, z.core.$strip>>>;
@@ -208,7 +206,6 @@ declare const CalendarAPI: {
                     name: z.ZodString;
                     email: z.ZodOptional<z.ZodEmail>;
                     emailVerified: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodCoercedDate<unknown>>>>;
-                    image: z.ZodOptional<z.ZodNullable<z.ZodURL>>;
                     preferences: z.ZodOptional<z.ZodLazy<z.ZodObject<{
                         debug: z.ZodDefault<z.ZodBoolean>;
                     }, z.core.$strip>>>;
@@ -239,7 +236,6 @@ declare const CalendarAPI: {
                     name: z.ZodString;
                     email: z.ZodOptional<z.ZodEmail>;
                     emailVerified: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodCoercedDate<unknown>>>>;
-                    image: z.ZodOptional<z.ZodNullable<z.ZodURL>>;
                     preferences: z.ZodOptional<z.ZodLazy<z.ZodObject<{
                         debug: z.ZodDefault<z.ZodBoolean>;
                     }, z.core.$strip>>>;
@@ -271,7 +267,6 @@ declare const CalendarAPI: {
                     name: z.ZodString;
                     email: z.ZodOptional<z.ZodEmail>;
                     emailVerified: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodCoercedDate<unknown>>>>;
-                    image: z.ZodOptional<z.ZodNullable<z.ZodURL>>;
                     preferences: z.ZodOptional<z.ZodLazy<z.ZodObject<{
                         debug: z.ZodDefault<z.ZodBoolean>;
                     }, z.core.$strip>>>;
@@ -300,7 +295,6 @@ declare const CalendarAPI: {
                     name: z.ZodString;
                     email: z.ZodOptional<z.ZodEmail>;
                     emailVerified: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodCoercedDate<unknown>>>>;
-                    image: z.ZodOptional<z.ZodNullable<z.ZodURL>>;
                     preferences: z.ZodOptional<z.ZodLazy<z.ZodObject<{
                         debug: z.ZodDefault<z.ZodBoolean>;
                     }, z.core.$strip>>>;

package/locales/en.json

@@ -35,6 +35,9 @@
 			"yearly": "Every year on {date}"
 		},
 		"submit_edit": "Update",
-		"title_placeholder": "Add title"
+		"title_placeholder": "Add title",
+		"discovery_placeholder": "Add attendees",
+		"discovery_invalid": "Can't determine attendee \"{target}\"",
+		"discovery_unsupported": "Specifying attendees without an email is not supported yet"
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/calendar",
-	"version": "0.4.1",
+	"version": "0.4.3",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "Calendar for Axium",
 	"funding": {
@@ -36,8 +36,8 @@
 		"build": "tsc"
 	},
 	"peerDependencies": {
-		"@axium/client": ">=0.17.0",
-		"@axium/core": ">=0.20.0",
+		"@axium/client": ">=0.23.0",
+		"@axium/core": ">=0.23.0",
 		"@axium/server": ">=0.36.0",
 		"@sveltejs/kit": "^2.27.3",
 		"utilium": "^2.7.0"

package/routes/calendar/+page.svelte

@@ -16,7 +16,8 @@
 	import * as Cal from '@axium/calendar/components';
 	import { fetchAPI, text } from '@axium/client';
 	import { contextMenu, dynamicRows } from '@axium/client/attachments';
-	import { AccessControlDialog, ColorPicker, FormDialog, Icon, Popover, UserDiscovery } from '@axium/client/components';
+	import { AccessControlDialog, ColorPicker, Discovery, discovery, FormDialog, Icon, Popover } from '@axium/client/components';
+	import { toast } from '@axium/client/toast';
 	import { colorHashHex, encodeColor } from '@axium/core/color';
 	import { rrulestr } from 'rrule';
 	import { useSwipe } from 'svelte-gestures';
@@ -182,7 +183,7 @@
 						<span>{text('generic.delete')}</span>
 					</div>
 				</Popover>
-				<AccessControlDialog editable itemType="calendars" item={cal} bind:dialog={dialogs['share:' + cal.id]} />
+				<AccessControlDialog itemType="calendars" item={cal} bind:dialog={dialogs['share:' + cal.id]} {user} />
 				<FormDialog
 					bind:dialog={dialogs['delete:' + cal.id]}
 					submitText={text('generic.delete')}
@@ -370,17 +371,18 @@
 	<div class="attendees-container">
 		<label for="eventInit.attendee"><Icon i="user-group" /></label>
 		<div class="attendees">
-			<UserDiscovery
-				noRoles
-				allowExact
-				onSelect={target => {
-					const { data: userId } = z.uuid().safeParse(target);
-					const { data: email } = z.email().safeParse(target);
-					if (!userId && !email) throw 'Can not determine attendee: ' + target;
-					if (!email) throw 'Specifying attendees without an email is not supported yet';
+			<Discovery
+				onSelect={result => {
+					const { id: userId, email } =
+						result.type == 'user' ? result.user : { id: null, email: z.email().safeParse(result.target).data };
+					if (!userId && !email) return toast('error', text('event_init.discovery_invalid', result));
+					if (!email) return toast('info', text('event_init.discovery_unsupported'));
+
 					// @todo supports roles and also contacts
 					eventInit.attendees.push({ userId, email });
 				}}
+				sources={[discovery.user, discovery.exact]}
+				placeholder={text('event_init.discovery_placeholder')}
 			/>
 			{#each eventInit.attendees as attendee (attendee.email)}
 				<div class="attendee">{attendee.email}</div>