diff --git a/client/src/components/support/StaffDashboard.tsx b/client/src/components/support/StaffDashboard.tsx
index f7864d8c..5c6aa1ae 100644
--- a/client/src/components/support/StaffDashboard.tsx
+++ b/client/src/components/support/StaffDashboard.tsx
@@ -80,7 +80,7 @@ const StaffDashboard = () => {
useEffect(() => {
setActivePage(1); // Reset to first page when itemsPerPage changes
- }, [itemsPerPage])
+ }, [itemsPerPage]);
async function getOpenTickets({
page,
@@ -172,7 +172,7 @@ const StaffDashboard = () => {
return {
totalOpenTickets: res.data.metrics.totalOpenTickets ?? 0,
lastSevenTicketCount: res.data.metrics.lastSevenTicketCount ?? 0,
- avgDaysToClose: avgDays.toPrecision(1) ?? "0",
+ avgDaysToClose: Math.floor(avgDays).toString() ?? "0",
};
} catch (err) {
handleGlobalError(err);
@@ -262,6 +262,7 @@ const StaffDashboard = () => {
size="tiny"
onClick={() => setShowSettingsModal(true)}
basic
+ className="ml-2"
>
Support Center Settings
@@ -275,12 +276,12 @@ const StaffDashboard = () => {
title="Open/In Progress Tickets"
/>
diff --git a/client/src/components/support/TicketDetails.tsx b/client/src/components/support/TicketDetails.tsx
index d6e7b56c..a4d1ea2a 100644
--- a/client/src/components/support/TicketDetails.tsx
+++ b/client/src/components/support/TicketDetails.tsx
@@ -30,12 +30,13 @@ const TicketDetails: React.FC = ({ ticket }) => {
basic
color="green"
size="mini"
- onClick={() =>
+ onClick={() => {
+ if (!ticket.user?.centralID) return;
window.open(
- `/controlpanel/libreone/users?user_id=${ticket?.user?.uuid}`,
+ `/controlpanel/libreone/users?user_id=${ticket?.user?.centralID}`,
"_blank"
- )
- }
+ );
+ }}
>
Authenticated
diff --git a/client/src/types/User.ts b/client/src/types/User.ts
index 236123d7..24589422 100644
--- a/client/src/types/User.ts
+++ b/client/src/types/User.ts
@@ -45,3 +45,7 @@ export type AuthorizedApp = {
infoURL: string;
icon: string;
};
+
+export type UserWCentralID = User & {
+ centralID?: string;
+};
diff --git a/client/src/types/index.ts b/client/src/types/index.ts
index e9b4b0d4..2114a896 100644
--- a/client/src/types/index.ts
+++ b/client/src/types/index.ts
@@ -41,7 +41,7 @@ import {
ProjectModuleConfig,
ProjectModuleSettings,
} from "./Project";
-import { User, Account, AuthorizedApp } from "./User";
+import { User, Account, AuthorizedApp, UserWCentralID } from "./User";
import { Homework, AdaptAssignment } from "./Homework";
import {
AccountRequest,
@@ -184,6 +184,7 @@ export type {
User,
Account,
AuthorizedApp,
+ UserWCentralID,
Homework,
AdaptAssignment,
AccountRequest,
diff --git a/client/src/types/support.ts b/client/src/types/support.ts
index c4076550..a523b4b7 100644
--- a/client/src/types/support.ts
+++ b/client/src/types/support.ts
@@ -1,4 +1,4 @@
-import { User } from "./User";
+import { User, UserWCentralID } from "./User";
export type SupportTicketGuest = {
firstName: string;
@@ -18,8 +18,8 @@ export type SupportTicket = {
category: string;
capturedURL?: string;
assignedUUIDs?: string[]; // User uuids
- assignedUsers?: User[];
- user?: User;
+ assignedUsers?: UserWCentralID[];
+ user?: UserWCentralID;
guest?: SupportTicketGuest;
timeOpened: string;
timeClosed?: string;