{selectedThread && threadMails && threadMails.length > 0 ? (
@@ -231,6 +368,7 @@ export default function InboxMailView(props: InboxMailViewProps) {
handleInboxMailProgressChange={handleInboxMailProgressChange}
currentUser={currentUser}
refetchInboxMailOverview={refetchInboxMailOverview}
+ translator={t}
/>
}
{threadMails.map((mail: InboxMail) => (
diff --git a/components/inbox-mail/inboxMailLocalTranslations.json b/components/inbox-mail/inboxMailLocalTranslations.json
index 0374ec2..cf08907 100644
--- a/components/inbox-mail/inboxMailLocalTranslations.json
+++ b/components/inbox-mail/inboxMailLocalTranslations.json
@@ -36,7 +36,15 @@
"cancelButton": "Cancel",
"previous": "Previous",
"next": "Next",
- "to": "To"
+ "to": "To",
+ "addFilter": "Add Filter",
+ "filterAllTooltip": "Selecting 'All' clears other filters",
+ "markLastUnread": "Mark last unread",
+ "filterByOrg": "Filter by Org",
+ "readAllByError": "Read all by error",
+ "readAllByProject": "Read all by project",
+ "deleteAllByContent": "Delete all by content",
+ "deleteAllByContentTooltip": "Deletes all auto-generated threads with the same content in the same organization"
},
"InboxMailThreadSupportProgressState": {
"PENDING": "Pending",
diff --git a/components/inbox-mail/service-mail.tsx b/components/inbox-mail/service-mail.tsx
index d730e54..0bb94b8 100644
--- a/components/inbox-mail/service-mail.tsx
+++ b/components/inbox-mail/service-mail.tsx
@@ -1,5 +1,5 @@
import { FetchType, jsonFetchWrapper } from "@/submodules/javascript-functions/basic-fetch";
-import { InboxMailThreadSupportProgressState } from "./types-mail";
+import { InboxMailFilter, InboxMailThreadSupportProgressState } from "./types-mail";
import { convertCamelToSnakeCase } from "@/submodules/javascript-functions/case-types-parser";
const url = `/refinery-gateway/api/v1`;
@@ -11,8 +11,13 @@ export function createInboxMailByThread(content: string, onResult: (result: any)
}
-export function getInboxMailOverviewByThreadsPaginated(page: number, limit: number, onResult: (result: any) => void) {
- const fetchUrl = `${url}/inbox-mail/overview?page=${page}&limit=${limit}`;
+export function getInboxMailOverviewByThreadsPaginated(page?: number, limit?: number, filters?: string[], onResult?: (result: any) => void) {
+ const searchParams = new URLSearchParams();
+ if (page !== undefined) searchParams.append("page", page.toString());
+ if (limit !== undefined) searchParams.append("limit", limit.toString());
+ if (filters?.length) filters.forEach(filter => searchParams.append("filters", filter));
+ const queryString = searchParams.toString();
+ const fetchUrl = `${url}/inbox-mail/overview${queryString ? `?${queryString}` : ""}`;
jsonFetchWrapper(fetchUrl, FetchType.GET, onResult);
}
@@ -96,4 +101,14 @@ export function updateInboxMailThreadsUnreadByProject(threadId: string, onResult
export function updateInboxMailThreadsUnreadByContent(threadId: string, onResult: (result: any) => void) {
const finalUrl = `${url}/inbox-mail/thread/${threadId}/unread/content`;
jsonFetchWrapper(finalUrl, FetchType.PUT, onResult);
+}
+
+export function updateInboxMailThreadUnreadLast(threadId: string, onResult: (result: any) => void) {
+ const finalUrl = `${url}/inbox-mail/thread/${threadId}/unread-last`;
+ jsonFetchWrapper(finalUrl, FetchType.PUT, onResult);
+}
+
+export function deleteInboxMailThreadsSimilar(threadId: string, onResult: (result: any) => void) {
+ const finalUrl = `${url}/inbox-mail/thread/${threadId}/similar`;
+ jsonFetchWrapper(finalUrl, FetchType.DELETE, onResult);
}
\ No newline at end of file
diff --git a/components/inbox-mail/types-mail.tsx b/components/inbox-mail/types-mail.tsx
index 6dfe86b..9fb15c2 100644
--- a/components/inbox-mail/types-mail.tsx
+++ b/components/inbox-mail/types-mail.tsx
@@ -59,4 +59,24 @@ export enum InboxMailThreadSupportProgressState {
PENDING = "PENDING",
IN_PROGRESS = "IN_PROGRESS",
RESOLVED = "RESOLVED"
-}
\ No newline at end of file
+}
+
+export enum JumpDestination {
+ CONVERSATION = "CONVERSATION",
+ PROJECT = "PROJECT",
+ ORGANIZATION = "ORGANIZATION"
+}
+
+export enum InboxMailFilter {
+ ALL = "ALL",
+ UNREAD = "UNREAD",
+ IMPORTANT = "IMPORTANT",
+ SUPPORT_PENDING = "SUPPORT_PENDING",
+ SUPPORT_IN_PROGRESS = "SUPPORT_IN_PROGRESS",
+ SUPPORT_RESOLVED = "SUPPORT_RESOLVED",
+ ONLY_USER_THREADS = "ONLY_USER_THREADS",
+ ONLY_SYSTEM_THREADS = "ONLY_SYSTEM_THREADS"
+}
+
+export const SUPPORT_FILTERS = [InboxMailFilter.SUPPORT_PENDING, InboxMailFilter.SUPPORT_IN_PROGRESS, InboxMailFilter.SUPPORT_RESOLVED];
+export const THREAD_TYPE_FILTERS = [InboxMailFilter.ONLY_USER_THREADS, InboxMailFilter.ONLY_SYSTEM_THREADS];
\ No newline at end of file
diff --git a/components/kern-icons/icons.ts b/components/kern-icons/icons.ts
index 07c9b0b..8e3ead6 100644
--- a/components/kern-icons/icons.ts
+++ b/components/kern-icons/icons.ts
@@ -1,5 +1,5 @@
import { memo } from 'react';
-import { IconActivity, IconAdjustments, IconAdjustmentsAlt, IconAdjustmentsOff, IconAlertCircle, IconAlertTriangle, IconAlertTriangleFilled, IconAngle, IconApi, IconArchive, IconArrowAutofitDown, IconArrowCurveRight, IconArrowDown, IconArrowLeft, IconArrowNarrowLeft, IconArrowNarrowRight, IconArrowRight, IconArrowsRandom, IconArrowsSort, IconArrowUp, IconArrowUpRight, IconAssembly, IconBallpen, IconBallpenOff, IconBell, IconBolt, IconBottle, IconBox, IconBoxOff, IconBrandGithub, IconBrandOpenai, IconBrandPython, IconBulb, IconBulldozer, IconCamera, IconCategoryPlus, IconCell, IconChartBubble, IconChartCircles, IconChartDots3, IconChartLine, IconChartPie, IconCheck, IconChecks, IconChevronCompactLeft, IconChevronCompactRight, IconChevronDown, IconChevronLeft, IconChevronRight, IconChevronUp, IconCircle, IconCircleCheck, IconCircleCheckFilled, IconCircleMinus, IconCirclePlus, IconClick, IconClipboard, IconClipboardCheck, IconClipboardOff, IconClock, IconCode, IconCodePlus, IconColorPicker, IconColumns, IconColumns1, IconColumns2, IconColumns3, IconCopy, IconCrown, IconCrownOff, IconDatabase, IconDatabasePlus, IconDeviceFloppy, IconDots, IconDotsVertical, IconDownload, IconEdit, IconEngine, IconExclamationCircle, IconExclamationMark, IconExternalLink, IconEye, IconEyeCancel, IconEyeCheck, IconEyeOff, IconFile, IconFileDownload, IconFileImport, IconFileInfo, IconFilePencil, IconFiles, IconFileText, IconFileUpload, IconFileWord, IconFilter, IconFilterOff, IconFishHook, IconFolderBolt, IconGitCommit, IconGripVertical, IconHandClick, IconHeading, IconHelp, IconHexagons, IconHierarchy, IconHierarchy3, IconHistory, IconHome, IconHourglass, IconHourglassEmpty, IconInfoCircle, IconInfoCircleFilled, IconInfoSquare, IconLayoutList, IconLayoutNavbarCollapse, IconLayoutSidebar, IconLetterGSmall, IconLink, IconList, IconLoader, IconLoader2, IconLockAccess, IconMap, IconMaximize, IconMessageCircle, IconMinus, IconMessageCircleSearch, IconMessages, IconMinimize, IconMoustache, IconNews, IconNotes, IconPencil, IconPlayCardStar, IconPlayerPlay, IconPlayerPlayFilled, IconPlus, IconPoint, IconPointerOff, IconPointerSearch, IconPointFilled, IconQuestionMark, IconRecycle, IconRefresh, IconRefreshAlert, IconResize, IconRobot, IconRotate, IconScissors, IconScreenshot, IconSearch, IconSend, IconSettings, IconShare, IconShieldCheckFilled, IconShieldFilled, IconSquare, IconSquareCheck, IconStar, IconTag, IconTemplate, IconTerminal, IconThumbDown, IconThumbDownFilled, IconThumbUp, IconThumbUpFilled, IconTrash, IconTrashXFilled, IconTriangleInverted, IconTriangleSquareCircle, IconUpload, IconUser, IconUsersGroup, IconUserX, IconVariable, IconVariablePlus, IconVersions, IconWand, IconWaveSine, IconWebhook, IconWreckingBall, IconX, IconZoomCode, IconDragDrop2, IconCircleDotted, IconWorld, IconMail, IconHelpCircle, IconProgressCheck } from '@tabler/icons-react';
+import { IconActivity, IconAdjustments, IconAdjustmentsAlt, IconAdjustmentsOff, IconAlertCircle, IconAlertTriangle, IconAlertTriangleFilled, IconAngle, IconApi, IconArchive, IconArrowAutofitDown, IconArrowCurveRight, IconArrowDown, IconArrowLeft, IconArrowNarrowLeft, IconArrowNarrowRight, IconArrowRight, IconArrowsRandom, IconArrowsSort, IconArrowUp, IconArrowUpRight, IconAssembly, IconBallpen, IconBallpenOff, IconBell, IconBolt, IconBottle, IconBox, IconBoxOff, IconBrandGithub, IconBrandOpenai, IconBrandPython, IconBulb, IconBulldozer, IconCamera, IconCategoryPlus, IconCell, IconChartBubble, IconChartCircles, IconChartDots3, IconChartLine, IconChartPie, IconCheck, IconChecks, IconChevronCompactLeft, IconChevronCompactRight, IconChevronDown, IconChevronLeft, IconChevronRight, IconChevronUp, IconCircle, IconCircleCheck, IconCircleCheckFilled, IconCircleMinus, IconCirclePlus, IconClick, IconClipboard, IconClipboardCheck, IconClipboardOff, IconClock, IconCode, IconCodePlus, IconColorPicker, IconColumns, IconColumns1, IconColumns2, IconColumns3, IconCopy, IconCrown, IconCrownOff, IconDatabase, IconDatabasePlus, IconDeviceFloppy, IconDots, IconDotsVertical, IconDownload, IconEdit, IconEngine, IconExclamationCircle, IconExclamationMark, IconExternalLink, IconEye, IconEyeCancel, IconEyeCheck, IconEyeOff, IconFile, IconFileDownload, IconFileImport, IconFileInfo, IconFilePencil, IconFiles, IconFileText, IconFileUpload, IconFileWord, IconFilter, IconFilterOff, IconFishHook, IconFolderBolt, IconGitCommit, IconGripVertical, IconHandClick, IconHeading, IconHelp, IconHexagons, IconHierarchy, IconHierarchy3, IconHistory, IconHome, IconHourglass, IconHourglassEmpty, IconInfoCircle, IconInfoCircleFilled, IconInfoSquare, IconLayoutList, IconLayoutNavbarCollapse, IconLayoutSidebar, IconLetterGSmall, IconLink, IconList, IconLoader, IconLoader2, IconLockAccess, IconMap, IconMaximize, IconMessageCircle, IconMinus, IconMessageCircleSearch, IconMessages, IconMinimize, IconMoustache, IconNews, IconNotes, IconPencil, IconPlayCardStar, IconPlayerPlay, IconPlayerPlayFilled, IconPlus, IconPoint, IconPointerOff, IconPointerSearch, IconPointFilled, IconQuestionMark, IconRecycle, IconRefresh, IconRefreshAlert, IconResize, IconRobot, IconRotate, IconScissors, IconScreenshot, IconSearch, IconSend, IconSettings, IconShare, IconShieldCheckFilled, IconShieldFilled, IconSquare, IconSquareCheck, IconStar, IconTag, IconTemplate, IconTerminal, IconThumbDown, IconThumbDownFilled, IconThumbUp, IconThumbUpFilled, IconTrash, IconTrashXFilled, IconTriangleInverted, IconTriangleSquareCircle, IconUpload, IconUser, IconUsers, IconUsersGroup, IconUserX, IconVariable, IconVariablePlus, IconVersions, IconWand, IconWaveSine, IconWebhook, IconWreckingBall, IconX, IconZoomCode, IconDragDrop2, IconCircleDotted, IconWorld, IconMail, IconHelpCircle, IconProgressCheck } from '@tabler/icons-react';
export const MemoIconHome = memo(IconHome);
export const MemoIconInfoCircle = memo(IconInfoCircle);
@@ -188,4 +188,5 @@ export const MemoIconWorld = memo(IconWorld);
export const MemoIconMail = memo(IconMail);
export const MemoIconHelpCircle = memo(IconHelpCircle);
export const MemoIconProgressCheck = memo(IconProgressCheck);
-export const MemoIconFileWord = memo(IconFileWord);
\ No newline at end of file
+export const MemoIconFileWord = memo(IconFileWord);
+export const MemoIconUsers = memo(IconUsers);
\ No newline at end of file
diff --git a/components/kern-table/CellComponents.tsx b/components/kern-table/CellComponents.tsx
index 795e495..dc1f167 100644
--- a/components/kern-table/CellComponents.tsx
+++ b/components/kern-table/CellComponents.tsx
@@ -14,17 +14,19 @@ import { MemoIconAlertCircle, MemoIconAlertTriangleFilled, MemoIconArrowRight, M
function OrganizationAndUsersCell({ organization }) {
return (
-
+
{organization.name}
-
-
-
{organization.userCount}
-
+
+
+
+
{!organization.userCount ? : organization.userCount.total + " / " + organization.userCount.normal + " / " + organization.userCount.light}
+
)
}
@@ -73,6 +75,12 @@ function BadgeCell({ value }) {
return
{value ? () : ()}
}
+function NulledBadgeCell({ value, tooltip, tooltipPlacement }: { value: boolean | null | undefined, tooltip?: string, tooltipPlacement?: "top" | "bottom" | "left" | "right" }) {
+ const cell =
{value == true ? () : value == false ? () : ()}
+ if (tooltip) return
{cell}
+ else return cell;
+}
+
function OrganizationUserCell({ userToOrganization, organizations, user, onClickRemove, onClickAdd }) {
return <>{(userToOrganization && user.id in userToOrganization) ? (
{userToOrganization[user.id]['name']}
@@ -298,6 +306,15 @@ function EtlApiTokenCell({ organization }) {
)
}
+function LightUserConfigCell({ organization }) {
+ return (
+
+ {!organization.lightUserConfig ? :
+ {organization.lightUserConfig?.amount} / {organization.lightUserConfig.timeFrame}}
+
+ )
+}
+
function EmailCell({ user }) {
const tooltipContent = useMemo(() => {
let content = user.email;
@@ -406,4 +423,4 @@ function TaskStateCell({ value, color, tooltipValue }) {
);
}
-export { OrganizationAndUsersCell, MaxRowsColsCharsCell, CommentsCell, ExportConsumptionAndDeleteCell, BadgeCell, OrganizationUserCell, DeleteCell, LevelCell, ArchiveReasonCell, ProjectNameTaskCell, CancelTaskCell, IconCell, ConfigCell, EditDeleteOrgButtonCell, ViewStackCell, AbortSessionButtonCell, FeedbackMessageCell, FeedbackMessageTextCell, JumpToConversationCell, RemoteVersionCell, ExternalLinkCell, ModelDateCell, FileSizeCell, StatusModelCell, DeleteModelCell, LabelCell, ViewCell, EvaluationRunStateCell, EvaluationRunDetailsCell, EtlApiTokenCell, EmailCell, EditIntegrationCell, ExpiredTokenCell, LinkCell, ConfigReleaseNotificationCell, TruncateAndTooltipCell, JumpToConversationAndAssignCell, TaskStateCell }
\ No newline at end of file
+export { OrganizationAndUsersCell, MaxRowsColsCharsCell, CommentsCell, LightUserConfigCell, ExportConsumptionAndDeleteCell, BadgeCell, NulledBadgeCell, OrganizationUserCell, DeleteCell, LevelCell, ArchiveReasonCell, ProjectNameTaskCell, CancelTaskCell, IconCell, ConfigCell, EditDeleteOrgButtonCell, ViewStackCell, AbortSessionButtonCell, FeedbackMessageCell, FeedbackMessageTextCell, JumpToConversationCell, RemoteVersionCell, ExternalLinkCell, ModelDateCell, FileSizeCell, StatusModelCell, DeleteModelCell, LabelCell, ViewCell, EvaluationRunStateCell, EvaluationRunDetailsCell, EtlApiTokenCell, EmailCell, EditIntegrationCell, ExpiredTokenCell, LinkCell, ConfigReleaseNotificationCell, TruncateAndTooltipCell, JumpToConversationAndAssignCell, TaskStateCell }
\ No newline at end of file
diff --git a/components/kern-table/KernTable.tsx b/components/kern-table/KernTable.tsx
index 3b8657f..e138b7d 100644
--- a/components/kern-table/KernTable.tsx
+++ b/components/kern-table/KernTable.tsx
@@ -1,6 +1,6 @@
import SortArrows from "@/submodules/react-components/components/kern-table/SortArrows";
import { KernTableProps } from "../../types/kern-table";
-import { AbortSessionButtonCell, ArchiveReasonCell, BadgeCell, CancelTaskCell, CommentsCell, ConfigCell, DeleteModelCell, DeleteCell, EditDeleteOrgButtonCell, EmailCell, EtlApiTokenCell, EvaluationRunDetailsCell, EvaluationRunStateCell, ExportConsumptionAndDeleteCell, ExternalLinkCell, FeedbackMessageCell, FeedbackMessageTextCell, FileSizeCell, IconCell, JumpToConversationCell, LabelCell, LevelCell, MaxRowsColsCharsCell, ModelDateCell, OrganizationAndUsersCell, OrganizationUserCell, ProjectNameTaskCell, RemoteVersionCell, StatusModelCell, ViewCell, ViewStackCell, EditIntegrationCell, ExpiredTokenCell, LinkCell, ConfigReleaseNotificationCell, TruncateAndTooltipCell, JumpToConversationAndAssignCell, TaskStateCell } from "./CellComponents";
+import { AbortSessionButtonCell, ArchiveReasonCell, BadgeCell, CancelTaskCell, CommentsCell, ConfigCell, DeleteModelCell, DeleteCell, EditDeleteOrgButtonCell, EmailCell, EtlApiTokenCell, LightUserConfigCell, EvaluationRunDetailsCell, EvaluationRunStateCell, ExportConsumptionAndDeleteCell, ExternalLinkCell, FeedbackMessageCell, FeedbackMessageTextCell, FileSizeCell, IconCell, JumpToConversationCell, LabelCell, LevelCell, MaxRowsColsCharsCell, ModelDateCell, OrganizationAndUsersCell, OrganizationUserCell, ProjectNameTaskCell, RemoteVersionCell, StatusModelCell, ViewCell, ViewStackCell, EditIntegrationCell, ExpiredTokenCell, LinkCell, ConfigReleaseNotificationCell, TruncateAndTooltipCell, JumpToConversationAndAssignCell, TaskStateCell, NulledBadgeCell } from "./CellComponents";
import { Fragment, useMemo } from "react";
import KernDropdown from "../KernDropdown";
import { NotApplicableBadge } from "@/submodules/react-components/components/Badges";
@@ -102,6 +102,8 @@ function ComponentMapper(cell: any) {
return
;
case 'BadgeCell':
return
;
+ case 'NulledBadgeCell':
+ return
;
case 'OrganizationUserCell':
return
;
case 'DeleteCell':
@@ -152,6 +154,8 @@ function ComponentMapper(cell: any) {
return
;
case 'EtlApiTokenCell':
return
;
+ case 'LightUserConfigCell':
+ return
;
case 'EmailCell':
return
;
case 'EditIntegrationCell':
diff --git a/components/pagination/Pagination.tsx b/components/pagination/Pagination.tsx
index 3b9af42..c71ac79 100644
--- a/components/pagination/Pagination.tsx
+++ b/components/pagination/Pagination.tsx
@@ -1,49 +1,111 @@
import { PaginationProps } from '../../types/pagination'
import { MemoIconArrowLeft, MemoIconArrowRight } from '../kern-icons/icons';
-import { useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+const PAGE_BTN_BASE = 'inline-flex items-center border-t-2 px-4 pt-4 text-sm font-medium';
+const PAGE_BTN_ACTIVE = `${PAGE_BTN_BASE} border-indigo-500 text-indigo-600`;
+const PAGE_BTN_INACTIVE = `${PAGE_BTN_BASE} border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700`;
+const ELLIPSIS_CLASS = `${PAGE_BTN_BASE} border-transparent text-gray-500`;
+const NAV_BTN_BASE = 'inline-flex items-center border-t-2 border-transparent pt-4 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700 disabled:opacity-50 disabled:cursor-not-allowed';
+const NAV_BTN_PREV = `${NAV_BTN_BASE} pr-1`;
+const NAV_BTN_NEXT = `${NAV_BTN_BASE} pl-1`;
export default function Pagination(props: PaginationProps) {
+ const [currentPage, setCurrentPage] = useState(1);
- const [currentPage, setCurrentPage] = useState(0);
- const [totalPages, setTotalPages] = useState(0);
+ const totalPages = useMemo(() =>
+ Math.ceil(props.fullCount / props.limit),
+ [props.fullCount, props.limit]
+ );
- useMemo(() => {
+ // Sync currentPage when props change
+ useEffect(() => {
setCurrentPage(props.offset / props.limit + 1);
}, [props.offset, props.limit]);
- useMemo(() => {
- setTotalPages(Math.ceil(props.fullCount / props.limit));
- }, [props.fullCount, props.limit]);
-
+ // Sync offset back to parent when currentPage changes
useEffect(() => {
props.setOffset((currentPage - 1) * props.limit);
- }, [currentPage, props.limit]);
+ }, [currentPage, props.limit, props.setOffset]);
+
+ const handlePrevious = useCallback(() => {
+ setCurrentPage(prev => prev - 1);
+ }, []);
+
+ const handleNext = useCallback(() => {
+ setCurrentPage(prev => prev + 1);
+ }, []);
+
+ const pageButtons = useMemo(() => {
+ const ellipsis = (key: string) => (
+
...
+ );
+
+ const pageButton = (page: number) => (
+
+ );
+
+ // Show all pages when reducePageNumbers is off or total is small
+ if (!props.reducePageNumbers || totalPages <= 10) {
+ return Array.from({ length: totalPages }, (_, i) => pageButton(i + 1));
+ }
+
+ // Middle position: 1 ... (current-1, current, current+1) ... last
+ if (currentPage > 3 && currentPage < totalPages - 2) {
+ return [
+ pageButton(1),
+ ellipsis('start'),
+ pageButton(currentPage - 1),
+ pageButton(currentPage),
+ pageButton(currentPage + 1),
+ ellipsis('end'),
+ pageButton(totalPages)
+ ];
+ }
+
+ // Near start or end: first 3 ... last 3
+ return [
+ pageButton(1),
+ pageButton(2),
+ pageButton(3),
+ ellipsis('middle'),
+ pageButton(totalPages - 2),
+ pageButton(totalPages - 1),
+ pageButton(totalPages)
+ ];
+ }, [totalPages, currentPage, props.reducePageNumbers]);
return (
- )
+ );
}
diff --git a/types/pagination.ts b/types/pagination.ts
index 3f4689c..21247b5 100644
--- a/types/pagination.ts
+++ b/types/pagination.ts
@@ -5,4 +5,5 @@ export type PaginationProps = {
limit: number;
previousLabel?: string;
nextLabel?: string;
+ reducePageNumbers?: boolean;
}
\ No newline at end of file