@opexa/portal-components 0.0.1094 → 0.0.1096

package/dist/components/Quests/JourneyQuest.js

@@ -1,5 +1,4 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { endOfDay as getEndOfDay } from 'date-fns';
 import { isString } from 'lodash-es';
 import dynamic from 'next/dynamic';
 import Link from 'next/link';
@@ -87,7 +86,7 @@ export function JourneyQuest(props) {
         disclosure.setOpen(true);
     }, [disclosure]);
     const localeInfo = useLocaleInfo();
-    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: twMerge('flex h-full w-full flex-col space-y-6 rounded-2xl border border-border-primary bg-bg-tertiary px-4 pt-5 pb-6', classNames?.root), children: [_jsxs("div", { className: "flex flex-col space-y-2", children: [_jsxs("div", { className: "flex max-h-7.5 items-center justify-between", children: [_jsx(RemainingTime, { endOfDay: true, className: {
+    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: twMerge('flex h-full w-full flex-col space-y-6 rounded-2xl border border-border-primary bg-bg-tertiary px-4 pt-5 pb-6', classNames?.root), children: [_jsxs("div", { className: "flex flex-col space-y-2", children: [_jsxs("div", { className: "flex max-h-7.5 items-center justify-between", children: [_jsx(RemainingTime, { className: {
                                             timeBadgeRoot: classNames?.timeBadgeRoot,
                                             timeBadgeIcon: classNames?.timeBadgeIcon,
                                             timeBadgeLabel: classNames?.timeBadgeLabel,
@@ -135,14 +134,7 @@ function Rules(props) {
         return milestones.every((milestone) => milestone.isCompleted);
     }, [milestones]);
     //prevent members to perform actions after the quest has expired
-    const targetDateTime = useMemo(() => {
-        if (!quest?.dateTimeCreated)
-            return null;
-        const date = new Date(quest.dateTimeCreated);
-        date.setDate(date.getDate() + Number(quest?.daysToClear ?? 0));
-        return getEndOfDay(date);
-    }, [quest?.dateTimeCreated, quest?.daysToClear]);
-    const remainingTime = useRemainingTime(targetDateTime ?? new Date());
+    const remainingTime = useRemainingTime(quest?.endDateTime ?? '');
     const isExpired = quest?.status === 'FAILED' || remainingTime.expired;
     const sessionQuery = useSessionQuery();
     const session = sessionQuery.data;

package/dist/components/Quests/Quests.client.js

@@ -1,5 +1,6 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { isAfter } from 'date-fns';
 import { isString } from 'lodash-es';
 import dynamic from 'next/dynamic';
 import Image, {} from 'next/image';
@@ -52,17 +53,24 @@ export function Quests__client(props) {
     const questsQuery = useAvailableQuestsQuery({
         refetchInterval: 7500,
     });
+    const now = new Date();
     const quests = !questsQuery.data?.length
         ? []
         : questsQuery.data.filter((quest) => {
+            const isExpired = quest.endDateTime
+                ? isAfter(now, new Date(quest.endDateTime))
+                : false;
             if (tab === 'AVAILABLE') {
-                return quest.status === 'IN_PROGRESS' || quest.status === 'ACTIVE';
+                return ((quest.status === 'IN_PROGRESS' || quest.status === 'ACTIVE') &&
+                    !isExpired);
             }
             else if (tab === 'COMPLETED') {
                 return quest.status === 'COMPLETED';
             }
             else if (tab === 'FAILED') {
-                return quest.status === 'FAILED';
+                return (quest.status === 'FAILED' ||
+                    ((quest.status === 'IN_PROGRESS' || quest.status === 'ACTIVE') &&
+                        isExpired));
             }
             return false;
         });

package/dist/components/Quests/RemainingTime.js

@@ -1,21 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { endOfDay } from 'date-fns';
-import { useMemo } from 'react';
 import { useRemainingTime } from '../../client/hooks/useRemainingTime.js';
 import { ClockStopWatchIcon } from '../../icons/ClockStopWatchIcon.js';
 import { Badge } from '../../ui/Badge/index.js';
 import { useQuestContext } from './QuestsContext.js';
 export function RemainingTime({ endOfDay: useEndOfDay = false, className, }) {
     const quest = useQuestContext();
-    const targetDateTime = useMemo(() => {
-        const daysToClear = Number(quest.daysToClear);
-        if (Number.isInteger(daysToClear) && daysToClear > 0) {
-            const now = new Date();
-            now.setDate(now.getDate() + daysToClear);
-            return useEndOfDay ? endOfDay(now) : now;
-        }
-        return 0;
-    }, [quest.daysToClear, useEndOfDay]);
+    const targetDateTime = useEndOfDay
+        ? endOfDay(new Date(quest.endDateTime)).toISOString()
+        : quest.endDateTime;
     const remainingTime = useRemainingTime(targetDateTime);
     if (quest.status === 'COMPLETED') {
         return (_jsx(Badge.Root, { size: "lg", colorScheme: "success", round: false, className: className?.completedBadgeRoot, children: _jsx(Badge.Label, { className: className?.completedBadgeLabel, children: "Completed" }) }));

package/package.json

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