@opexa/portal-components 0.0.433 → 0.0.435

package/dist/client/hooks/useIdleLogout.d.ts

@@ -1 +1,4 @@
-export declare function useIdleLogout(timer?: number): void;
+export declare function useIdleLogout(timer?: number): {
+    isIdle: boolean;
+    isLoggingOut: boolean;
+};

package/dist/client/hooks/useIdleLogout.js

@@ -16,66 +16,56 @@ export function useIdleLogout(timer = DEFAULT_IDLE_TIMER) {
         onSuccess: () => {
             router.refresh();
             localStorage.removeItem(IDLE_TIMESTAMP_KEY);
+            logoutInitiated.current = false;
+            isLoggingOut.current = false;
         },
         onError: () => {
             isLoggingOut.current = false;
+            logoutInitiated.current = false;
         },
     });
     const isIdle = useIdle(timer);
-    const sessionStatusRef = useRef(sessionQuery.data?.status);
-    sessionStatusRef.current = sessionQuery.data?.status;
     useEffect(() => {
-        const handleUnload = () => {
-            if (sessionStatusRef.current === 'authenticated' && !isLoggingOut.current) {
-                localStorage.setItem(IDLE_TIMESTAMP_KEY, Date.now().toString());
-            }
-        };
-        if (sessionQuery.data?.status === 'authenticated') {
-            const lastActivityTimestamp = localStorage.getItem(IDLE_TIMESTAMP_KEY);
-            if (lastActivityTimestamp) {
-                localStorage.removeItem(IDLE_TIMESTAMP_KEY);
-                const timeElapsed = Date.now() - parseInt(lastActivityTimestamp, 10);
-                if (timeElapsed > timer) {
-                    if (!logoutInitiated.current) {
-                        logoutInitiated.current = true;
-                        setTimeout(() => {
-                            toaster.warning({
-                                title: 'You have been away for a while.',
-                                description: 'You have been logged out for inactivity.',
-                            });
-                            isLoggingOut.current = true;
-                            signOutMutation.mutate();
-                        }, 0);
-                    }
-                    return;
-                }
-            }
-            window.addEventListener('beforeunload', handleUnload);
-        }
-        else {
+        if (sessionQuery.data?.status === 'unauthenticated') {
+            logoutInitiated.current = false;
+            isLoggingOut.current = false;
             localStorage.removeItem(IDLE_TIMESTAMP_KEY);
         }
-        return () => {
-            window.removeEventListener('beforeunload', handleUnload);
-        };
-    }, [sessionQuery.data?.status, signOutMutation, timer]);
+    }, [sessionQuery.data?.status]);
     useEffect(() => {
-        if (isIdle && sessionQuery.data?.status === 'authenticated') {
-            if (logoutInitiated.current) {
-                return;
-            }
-            logoutInitiated.current = true;
-            setTimeout(() => {
-                toaster.warning({
-                    title: 'You have been idle for a while.',
-                    description: 'You will be logged out for inactivity.',
-                });
-                isLoggingOut.current = true;
-                signOutMutation.mutate();
-            }, 0);
-        }
-        else {
-            logoutInitiated.current = false;
+        if (sessionQuery.data?.status === 'unauthenticated' || !isIdle || logoutInitiated.current || isLoggingOut.current) {
+            return;
         }
+        const handleIdleLogout = async () => {
+            logoutInitiated.current = true;
+            isLoggingOut.current = true;
+            const timestamp = Date.now().toString();
+            localStorage.setItem(IDLE_TIMESTAMP_KEY, timestamp);
+            toaster.warning({ description: 'You have been logged out due to inactivity.' });
+            try {
+                await signOutMutation.mutateAsync();
+            }
+            catch {
+                logoutInitiated.current = false;
+                isLoggingOut.current = false;
+            }
+        };
+        handleIdleLogout();
     }, [isIdle, sessionQuery.data?.status, signOutMutation]);
+    useEffect(() => {
+        const handleStorageChange = (e) => {
+            if (e.key === IDLE_TIMESTAMP_KEY && e.newValue && sessionQuery.data?.status === 'authenticated') {
+                if (!logoutInitiated.current) {
+                    logoutInitiated.current = true;
+                    router.refresh();
+                }
+            }
+        };
+        window.addEventListener('storage', handleStorageChange);
+        return () => window.removeEventListener('storage', handleStorageChange);
+    }, [router, sessionQuery.data?.status]);
+    return {
+        isIdle,
+        isLoggingOut: isLoggingOut.current,
+    };
 }

package/dist/components/BetRecords/BetRecords.client.js

@@ -72,7 +72,7 @@ export function BetRecords__client(props) {
             }),
             ...(state.status && {
                 status: {
-                    in: [state.status],
+                    equal: state.status,
                 },
             }),
             ...(state.timestamp && {
@@ -139,9 +139,7 @@ export function BetRecords__client(props) {
                         }, children: [_jsxs(Select.Trigger, { className: "w-full lg:w-[14rem]", children: [_jsx(Select.ValueText, { placeholder: props.placeholder?.gameProvider ?? 'Game Vendor' }), _jsx(Select.Context, { children: (api) => (_jsx(_Fragment, { children: api.value.length ? (_jsx(Select.ClearTrigger, { asChild: true, children: _jsx("span", { onClick: (e) => {
                                                         e.stopPropagation();
                                                     }, children: "Clear" }) })) : (_jsx(Select.Indicator, { asChild: true, children: _jsx(ChevronDownIcon, {}) })) })) })] }), _jsx(Portal, { children: _jsx(Select.Positioner, { children: _jsx(Select.Content, { children: _jsx(Select.ItemGroup, { children: providerCollection.items.map((provider) => (_jsxs(Select.Item, { item: provider, children: [_jsx(Select.ItemText, { children: provider.name }), _jsx(Select.ItemIndicator, { asChild: true, children: _jsx(CheckIcon, {}) })] }, provider.id))) }) }) }) })] }), _jsxs(Select.Root, { collection: statusCollection, value: state.status ? [state.status] : [], onValueChange: (details) => {
-                            const value = z
-                                .enum(STATUSES)
-                                .safeParse(details.value.at(0)).data;
+                            const value = z.enum(STATUSES).safeParse(details.value.at(0)).data;
                             firstPage();
                             setState({
                                 status: value ?? null,
@@ -185,7 +183,7 @@ export function BetRecords__client(props) {
                                                             delimiter: capitalize.delimiters.UNDERSCORE,
                                                         }) }) }) }), _jsx(Table.Cell, { className: "!py-1", children: data.game.name }), _jsx(Table.Cell, { className: "!py-1", children: data.vendorRoundId })] }, data.id))) })] }) }), _jsxs("div", { className: "flex items-center justify-between gap-lg px-4 py-3", children: [_jsx(IconButton, { size: "xs", variant: "outline", colorScheme: "gray", disabled: !hasPrevPage || loading, onClick: () => prev(), children: _jsx(ChevronLeftIcon, { className: "size-5" }) }), _jsxs("p", { className: "font-medium text-sm text-text-secondary-700", children: ["Page ", page, " of ", totalPages] }), _jsx(IconButton, { size: "xs", variant: "outline", colorScheme: "gray", disabled: !hasNextPage || loading, onClick: () => next(), children: _jsx(ChevronRightIcon, { className: "size-5" }) })] })] }))] }));
 }
-const STATUSES = ['CANCELLED', 'SETTLED', 'STARTED'];
+const STATUSES = ['STARTED', 'SETTLED', 'CANCELLED'];
 const statusCollection = createListCollection({
     items: STATUSES,
     itemToValue: (item) => item,

package/dist/components/SignUp/SignUpDefault/SignUpDefaultForm.js

@@ -83,7 +83,7 @@ export function SignUpDefaultForm() {
         }),
         firstName: z
             .string()
-            .regex(/^[a-z0-9 ]+$/gi, 'First name must contain only letters')
+            .regex(/^[a-z ]+$/gi, 'First name must contain only letters')
             .transform((val) => val.trim())
             .refine((val) => val.length >= 2, {
             message: 'First name must be 2 or more characters',
@@ -93,7 +93,7 @@ export function SignUpDefaultForm() {
         }),
         lastName: z
             .string()
-            .regex(/^[a-z0-9 ]+$/gi, 'Last name must contain only letters')
+            .regex(/^[a-z ]+$/gi, 'Last name must contain only letters')
             .transform((val) => val.trim())
             .refine((val) => val.length >= 2, {
             message: 'Last name must be 2 or more characters',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@opexa/portal-components",
-	"version": "0.0.433",
+	"version": "0.0.435",
 	"exports": {
 		"./ui/*": {
 			"types": "./dist/ui/*/index.d.ts",