Zammad send fixes, update deps
This commit is contained in:
parent
c47223f5e9
commit
a4053e6412
29 changed files with 626 additions and 500 deletions
|
|
@ -20,8 +20,8 @@
|
||||||
"@mui/icons-material": "^5",
|
"@mui/icons-material": "^5",
|
||||||
"@mui/material": "^5",
|
"@mui/material": "^5",
|
||||||
"@mui/material-nextjs": "^5.16.6",
|
"@mui/material-nextjs": "^5.16.6",
|
||||||
"@mui/x-data-grid-pro": "^7.12.0",
|
"@mui/x-data-grid-pro": "^7.12.1",
|
||||||
"@mui/x-date-pickers-pro": "^7.12.0",
|
"@mui/x-date-pickers-pro": "^7.12.1",
|
||||||
"@mui/x-license": "^7.12.0",
|
"@mui/x-license": "^7.12.0",
|
||||||
"@link-stack/bridge-common": "*",
|
"@link-stack/bridge-common": "*",
|
||||||
"@link-stack/bridge-ui": "*",
|
"@link-stack/bridge-ui": "*",
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
"react-timer-hook": "^3.0.7",
|
"react-timer-hook": "^3.0.7",
|
||||||
"sharp": "^0.33.4",
|
"sharp": "^0.33.4",
|
||||||
"tss-react": "^4.9.12",
|
"tss-react": "^4.9.12",
|
||||||
"tsx": "^4.16.5",
|
"tsx": "^4.17.0",
|
||||||
"@link-stack/ui": "*"
|
"@link-stack/ui": "*"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
"dotenv": "^16.4.5",
|
"dotenv": "^16.4.5",
|
||||||
"kysely": "0.26.1",
|
"kysely": "0.26.1",
|
||||||
"pg": "^8.12.0",
|
"pg": "^8.12.0",
|
||||||
"tsx": "^4.16.5"
|
"tsx": "^4.17.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^22",
|
"@types/node": "^22",
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
"@link-stack/typescript-config": "*",
|
"@link-stack/typescript-config": "*",
|
||||||
"@types/node": "*",
|
"@types/node": "*",
|
||||||
"dotenv-cli": "^7.4.2",
|
"dotenv-cli": "^7.4.2",
|
||||||
"tsx": "^4.16.5",
|
"tsx": "^4.17.0",
|
||||||
"typescript": "^5.5.4"
|
"typescript": "^5.5.4"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
"jest": "^29.7.0",
|
"jest": "^29.7.0",
|
||||||
"kysely": "^0.27.3",
|
"kysely": "^0.27.3",
|
||||||
"pg": "^8.12.0",
|
"pg": "^8.12.0",
|
||||||
"remeda": "^2.10.0",
|
"remeda": "^2.11.0",
|
||||||
"twilio": "^5.2.2"
|
"twilio": "^5.2.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,7 @@ const sendToLeafcutter = async (tickets: LabelStudioTicket[]) => {
|
||||||
},
|
},
|
||||||
body: JSON.stringify({ tickets: finalTickets }),
|
body: JSON.stringify({ tickets: finalTickets }),
|
||||||
});
|
});
|
||||||
console.log({ result });
|
|
||||||
};
|
};
|
||||||
*/
|
*/
|
||||||
const importLeafcutterTask = async (): Promise<void> => {
|
const importLeafcutterTask = async (): Promise<void> => {
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,8 @@
|
||||||
"@mui/icons-material": "^5",
|
"@mui/icons-material": "^5",
|
||||||
"@mui/material": "^5",
|
"@mui/material": "^5",
|
||||||
"@mui/material-nextjs": "^5.16.6",
|
"@mui/material-nextjs": "^5.16.6",
|
||||||
"@mui/x-data-grid-pro": "^7.12.0",
|
"@mui/x-data-grid-pro": "^7.12.1",
|
||||||
"@mui/x-date-pickers-pro": "^7.12.0",
|
"@mui/x-date-pickers-pro": "^7.12.1",
|
||||||
"@opensearch-project/opensearch": "^2.11.0",
|
"@opensearch-project/opensearch": "^2.11.0",
|
||||||
"cryptr": "^6.3.0",
|
"cryptr": "^6.3.0",
|
||||||
"date-fns": "^3.6.0",
|
"date-fns": "^3.6.0",
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.25.2",
|
"@babel/core": "^7.25.2",
|
||||||
"@types/node": "^22.1.0",
|
"@types/node": "^22.2.0",
|
||||||
"@types/react": "18.3.3",
|
"@types/react": "18.3.3",
|
||||||
"@types/uuid": "^10.0.0",
|
"@types/uuid": "^10.0.0",
|
||||||
"babel-loader": "^9.1.3",
|
"babel-loader": "^9.1.3",
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,6 @@ export const TicketCreateDialog: FC<TicketCreateDialogProps> = ({
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchUsers = async () => {
|
const fetchUsers = async () => {
|
||||||
const result = await getCustomersAction();
|
const result = await getCustomersAction();
|
||||||
console.log({ result });
|
|
||||||
setCustomers(result);
|
setCustomers(result);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,14 +3,19 @@
|
||||||
import { executeREST } from "app/_lib/zammad";
|
import { executeREST } from "app/_lib/zammad";
|
||||||
|
|
||||||
export const getGroupsAction = async () => {
|
export const getGroupsAction = async () => {
|
||||||
const groups = await executeREST({
|
try {
|
||||||
path: "/api/v1/groups",
|
const groups = await executeREST({
|
||||||
});
|
path: "/api/v1/groups",
|
||||||
const allGroups = groups ?? [];
|
});
|
||||||
const formattedGroups = allGroups.map((group: any) => ({
|
const allGroups = groups ?? [];
|
||||||
label: group.name,
|
const formattedGroups = allGroups.map((group: any) => ({
|
||||||
value: `gid://zammad/Group/${group.id}`,
|
label: group.name,
|
||||||
}));
|
value: `gid://zammad/Group/${group.id}`,
|
||||||
|
}));
|
||||||
|
|
||||||
return formattedGroups;
|
return formattedGroups;
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -16,75 +16,82 @@ const overviewLookup = {
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getOverviewTicketCountsAction = async () => {
|
export const getOverviewTicketCountsAction = async () => {
|
||||||
const recent = await executeREST({ path: "/api/v1/recent_view" });
|
try {
|
||||||
const countResult = await executeGraphQL({
|
const recent = await executeREST({ path: "/api/v1/recent_view" });
|
||||||
query: getTicketOverviewCountsQuery,
|
const countResult = await executeGraphQL({
|
||||||
});
|
query: getTicketOverviewCountsQuery,
|
||||||
const overviews = countResult?.ticketOverviews?.edges ?? [];
|
});
|
||||||
const counts = overviews.reduce((acc: any, overview: any) => {
|
const overviews = countResult?.ticketOverviews?.edges ?? [];
|
||||||
const name = overview.node.name;
|
const counts = overviews.reduce((acc: any, overview: any) => {
|
||||||
const key = Object.keys(overviewLookup)
|
const name = overview.node.name;
|
||||||
.find((k) => overviewLookup[k] === name)
|
const key = Object.keys(overviewLookup)
|
||||||
?.toLowerCase();
|
.find((k) => overviewLookup[k] === name)
|
||||||
if (key) {
|
?.toLowerCase();
|
||||||
acc[key] = overview.node.ticketCount ?? 0;
|
if (key) {
|
||||||
}
|
acc[key] = overview.node.ticketCount ?? 0;
|
||||||
return acc;
|
}
|
||||||
}, {});
|
return acc;
|
||||||
counts.recent = recent.length;
|
}, {});
|
||||||
|
counts.recent = recent.length;
|
||||||
|
|
||||||
return counts;
|
return counts;
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return {};
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getOverviewTicketsAction = async (name: string) => {
|
export const getOverviewTicketsAction = async (name: string) => {
|
||||||
let tickets = [];
|
let tickets = [];
|
||||||
let error = null;
|
|
||||||
|
|
||||||
if (name === "Recent") {
|
try {
|
||||||
const recent = await executeREST({ path: "/api/v1/recent_view" });
|
if (name === "Recent") {
|
||||||
|
const recent = await executeREST({ path: "/api/v1/recent_view" });
|
||||||
|
|
||||||
for (const rec of recent) {
|
for (const rec of recent) {
|
||||||
const tkt = await executeREST({
|
const tkt = await executeREST({
|
||||||
path: `/api/v1/tickets/${rec.o_id}`,
|
path: `/api/v1/tickets/${rec.o_id}`,
|
||||||
|
});
|
||||||
|
tickets.push({
|
||||||
|
...tkt,
|
||||||
|
internalId: tkt.id,
|
||||||
|
createdAt: tkt.created_at,
|
||||||
|
updatedAt: tkt.updated_at,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const fullName = overviewLookup[name];
|
||||||
|
const countResult = await executeGraphQL({
|
||||||
|
query: getTicketOverviewCountsQuery,
|
||||||
});
|
});
|
||||||
tickets.push({
|
const overviewID = countResult?.ticketOverviews?.edges?.find(
|
||||||
...tkt,
|
(overview: any) => overview.node.name === fullName,
|
||||||
internalId: tkt.id,
|
)?.node?.id;
|
||||||
createdAt: tkt.created_at,
|
|
||||||
updatedAt: tkt.updated_at,
|
const ticketsResult = await executeGraphQL({
|
||||||
|
query: getTicketsByOverviewQuery,
|
||||||
|
variables: { overviewId: overviewID, pageSize: 250 },
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const edges = ticketsResult?.ticketsByOverview?.edges;
|
||||||
|
if (edges) {
|
||||||
|
tickets = edges.map((edge: any) => edge.node);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
const fullName = overviewLookup[name];
|
|
||||||
const countResult = await executeGraphQL({
|
|
||||||
query: getTicketOverviewCountsQuery,
|
|
||||||
});
|
|
||||||
const overviewID = countResult?.ticketOverviews?.edges?.find(
|
|
||||||
(overview: any) => overview.node.name === fullName,
|
|
||||||
)?.node?.id;
|
|
||||||
|
|
||||||
console.log({ overviewID });
|
const sortedTickets = tickets.sort((a: any, b: any) => {
|
||||||
|
if (a.internalId < b.internalId) {
|
||||||
const ticketsResult = await executeGraphQL({
|
return 1;
|
||||||
query: getTicketsByOverviewQuery,
|
}
|
||||||
variables: { overviewId: overviewID, pageSize: 250 },
|
if (a.internalId > b.internalId) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
});
|
});
|
||||||
|
|
||||||
const edges = ticketsResult?.ticketsByOverview?.edges;
|
return { tickets: sortedTickets };
|
||||||
if (edges) {
|
} catch (e) {
|
||||||
tickets = edges.map((edge: any) => edge.node);
|
console.error(e);
|
||||||
}
|
return { tickets, message: e.message ?? "" };
|
||||||
}
|
}
|
||||||
|
|
||||||
const sortedTickets = tickets.sort((a: any, b: any) => {
|
|
||||||
if (a.internalId < b.internalId) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (a.internalId > b.internalId) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
});
|
|
||||||
|
|
||||||
return { tickets: sortedTickets, error };
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,15 @@ import { executeGraphQL } from "app/_lib/zammad";
|
||||||
import { searchQuery } from "@/app/_graphql/searchQuery";
|
import { searchQuery } from "@/app/_graphql/searchQuery";
|
||||||
|
|
||||||
export const searchAllAction = async (query: string, limit: number) => {
|
export const searchAllAction = async (query: string, limit: number) => {
|
||||||
const result = await executeGraphQL({
|
try {
|
||||||
query: searchQuery,
|
const result = await executeGraphQL({
|
||||||
variables: { search: query, limit },
|
query: searchQuery,
|
||||||
});
|
variables: { search: query, limit },
|
||||||
|
});
|
||||||
|
|
||||||
return result?.search;
|
return result?.search;
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ export const createTicketAction = async (
|
||||||
try {
|
try {
|
||||||
const ticket = {
|
const ticket = {
|
||||||
groupId: formData.get("groupId"),
|
groupId: formData.get("groupId"),
|
||||||
customerId: `gid://zammad/User/3`, // { email: formData.get("customerId") },
|
customerId: formData.get("customerId"),
|
||||||
title: formData.get("title"),
|
title: formData.get("title"),
|
||||||
article: {
|
article: {
|
||||||
internal: true,
|
internal: true,
|
||||||
|
|
@ -23,16 +23,13 @@ export const createTicketAction = async (
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
console.log({ ticket });
|
await executeGraphQL({
|
||||||
|
|
||||||
const result = await executeGraphQL({
|
|
||||||
query: createTicketMutation,
|
query: createTicketMutation,
|
||||||
variables: {
|
variables: {
|
||||||
input: ticket,
|
input: ticket,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log({ result });
|
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
values: ticket,
|
values: ticket,
|
||||||
|
|
@ -61,7 +58,6 @@ export const createTicketArticleAction = async (
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log({ result });
|
|
||||||
return {
|
return {
|
||||||
result,
|
result,
|
||||||
success: true,
|
success: true,
|
||||||
|
|
@ -114,10 +110,8 @@ export const updateTicketAction = async (
|
||||||
tags: ticketInfo.tags,
|
tags: ticketInfo.tags,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
console.log({ tagsResult });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log({ result });
|
|
||||||
return {
|
return {
|
||||||
result,
|
result,
|
||||||
success: true,
|
success: true,
|
||||||
|
|
@ -132,55 +126,80 @@ export const updateTicketAction = async (
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getTicketAction = async (id: string) => {
|
export const getTicketAction = async (id: string) => {
|
||||||
const ticketData = await executeGraphQL({
|
try {
|
||||||
query: getTicketQuery,
|
const ticketData = await executeGraphQL({
|
||||||
variables: { ticketId: `gid://zammad/Ticket/${id}` },
|
query: getTicketQuery,
|
||||||
});
|
variables: { ticketId: `gid://zammad/Ticket/${id}` },
|
||||||
console.log({ td: ticketData.ticket });
|
});
|
||||||
return ticketData?.ticket;
|
|
||||||
|
return ticketData?.ticket;
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return {};
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getTicketArticlesAction = async (id: string) => {
|
export const getTicketArticlesAction = async (id: string) => {
|
||||||
const ticketData = await executeGraphQL({
|
try {
|
||||||
query: getTicketArticlesQuery,
|
const ticketData = await executeGraphQL({
|
||||||
variables: { ticketId: `gid://zammad/Ticket/${id}` },
|
query: getTicketArticlesQuery,
|
||||||
});
|
variables: { ticketId: `gid://zammad/Ticket/${id}` },
|
||||||
|
});
|
||||||
|
|
||||||
return ticketData?.ticketArticles;
|
return ticketData?.ticketArticles;
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return {};
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getTicketStatesAction = async () => {
|
export const getTicketStatesAction = async () => {
|
||||||
const states = await executeREST({
|
try {
|
||||||
path: "/api/v1/ticket_states",
|
const states = await executeREST({
|
||||||
});
|
path: "/api/v1/ticket_states",
|
||||||
|
});
|
||||||
|
|
||||||
const formattedStates =
|
const formattedStates =
|
||||||
states?.map((state: any) => ({
|
states?.map((state: any) => ({
|
||||||
value: `gid://zammad/Ticket::State/${state.id}`,
|
value: `gid://zammad/Ticket::State/${state.id}`,
|
||||||
label: state.name,
|
label: state.name,
|
||||||
})) ?? [];
|
})) ?? [];
|
||||||
|
|
||||||
return formattedStates;
|
return formattedStates;
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getTagsAction = async () => {
|
export const getTagsAction = async () => {
|
||||||
const { tags } = await executeREST({
|
try {
|
||||||
path: "/api/v1/tags",
|
const { tags } = await executeREST({
|
||||||
});
|
path: "/api/v1/tags",
|
||||||
|
});
|
||||||
|
|
||||||
return tags;
|
return tags;
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getTicketPrioritiesAction = async () => {
|
export const getTicketPrioritiesAction = async () => {
|
||||||
const priorities = await executeREST({
|
try {
|
||||||
path: "/api/v1/ticket_priorities",
|
const priorities = await executeREST({
|
||||||
});
|
path: "/api/v1/ticket_priorities",
|
||||||
|
});
|
||||||
|
|
||||||
const formattedPriorities =
|
const formattedPriorities =
|
||||||
priorities?.map((priority: any) => ({
|
priorities?.map((priority: any) => ({
|
||||||
value: `gid://zammad/Ticket::Priority/${priority.id}`,
|
value: `gid://zammad/Ticket::Priority/${priority.id}`,
|
||||||
label: priority.name,
|
label: priority.name,
|
||||||
})) ?? [];
|
})) ?? [];
|
||||||
|
|
||||||
return formattedPriorities;
|
return formattedPriorities;
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -3,48 +3,63 @@
|
||||||
import { executeREST } from "app/_lib/zammad";
|
import { executeREST } from "app/_lib/zammad";
|
||||||
|
|
||||||
export const getAgentsAction = async () => {
|
export const getAgentsAction = async () => {
|
||||||
const users = await executeREST({
|
try {
|
||||||
path: "/api/v1/users",
|
const users = await executeREST({
|
||||||
});
|
path: "/api/v1/users",
|
||||||
const agents = users?.filter((user: any) => user.role_ids.includes(2)) ?? [];
|
});
|
||||||
const formattedAgents = agents
|
const agents =
|
||||||
.map((agent: any) => ({
|
users?.filter((user: any) => user.role_ids.includes(2)) ?? [];
|
||||||
label: `${agent.firstname} ${agent.lastname}`,
|
const formattedAgents = agents
|
||||||
value: `gid://zammad/User/${agent.id}`,
|
.map((agent: any) => ({
|
||||||
}))
|
label: `${agent.firstname} ${agent.lastname}`,
|
||||||
.sort((a: any, b: any) => a.label.localeCompare(b.label));
|
value: `gid://zammad/User/${agent.id}`,
|
||||||
|
}))
|
||||||
|
.sort((a: any, b: any) => a.label.localeCompare(b.label));
|
||||||
|
|
||||||
return formattedAgents;
|
return formattedAgents;
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getCustomersAction = async () => {
|
export const getCustomersAction = async () => {
|
||||||
const users = await executeREST({
|
try {
|
||||||
path: "/api/v1/users",
|
const users = await executeREST({
|
||||||
});
|
path: "/api/v1/users",
|
||||||
console.log({ users });
|
});
|
||||||
const customers =
|
const customers =
|
||||||
users?.filter((user: any) => user.role_ids.includes(3)) ?? [];
|
users?.filter((user: any) => user.role_ids.includes(3)) ?? [];
|
||||||
const formattedCustomers = customers
|
const formattedCustomers = customers
|
||||||
.map((customer: any) => ({
|
.map((customer: any) => ({
|
||||||
label: customer.login,
|
label: customer.login,
|
||||||
value: `gid://zammad/User/${customer.id}`,
|
value: `gid://zammad/User/${customer.id}`,
|
||||||
}))
|
}))
|
||||||
.sort((a: any, b: any) => a.label.localeCompare(b.label));
|
.sort((a: any, b: any) => a.label.localeCompare(b.label));
|
||||||
|
|
||||||
return formattedCustomers;
|
return formattedCustomers;
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getUsersAction = async () => {
|
export const getUsersAction = async () => {
|
||||||
const users = await executeREST({
|
try {
|
||||||
path: "/api/v1/users",
|
const users = await executeREST({
|
||||||
});
|
path: "/api/v1/users",
|
||||||
console.log({ users });
|
});
|
||||||
const formattedUsers = users
|
console.log({ users });
|
||||||
.map((customer: any) => ({
|
const formattedUsers = users
|
||||||
label: customer.login,
|
.map((customer: any) => ({
|
||||||
value: `gid://zammad/User/${customer.id}`,
|
label: customer.login,
|
||||||
}))
|
value: `gid://zammad/User/${customer.id}`,
|
||||||
.sort((a: any, b: any) => a.label.localeCompare(b.label));
|
}))
|
||||||
|
.sort((a: any, b: any) => a.label.localeCompare(b.label));
|
||||||
|
|
||||||
return formattedUsers;
|
return formattedUsers;
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,36 @@
|
||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { FC, PropsWithChildren, useEffect } from "react";
|
import { FC, PropsWithChildren, useState, useEffect } from "react";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
import { useSession } from "next-auth/react";
|
import { useSession } from "next-auth/react";
|
||||||
|
|
||||||
export const CSRFProvider: FC<PropsWithChildren> = ({ children }) => {
|
export const CSRFProvider: FC<PropsWithChildren> = ({ children }) => {
|
||||||
const { data: session, status, update } = useSession();
|
const { data: session, status, update } = useSession();
|
||||||
|
const router = useRouter();
|
||||||
|
const [redirectCount, setRedirectCount] = useState(0);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const interval = setInterval(async () => {
|
const interval = setInterval(async () => {
|
||||||
|
console.log("Checking session status...");
|
||||||
|
console.log(status);
|
||||||
if (status === "authenticated") {
|
if (status === "authenticated") {
|
||||||
const response = await fetch("/api/v1/users/me");
|
const response = await fetch("/api/v1/users/me");
|
||||||
const token = response.headers.get("CSRF-Token");
|
console.log(response.ok);
|
||||||
update({ csrfToken: token });
|
console.log(!!router);
|
||||||
|
if (!response.ok && !!router) {
|
||||||
|
console.log("redirecting");
|
||||||
|
setRedirectCount(redirectCount + 1);
|
||||||
|
router.push("/setup");
|
||||||
|
} else {
|
||||||
|
setRedirectCount(0);
|
||||||
|
const token = response.headers.get("CSRF-Token");
|
||||||
|
update({ csrfToken: token });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, 30000);
|
}, 15000);
|
||||||
|
|
||||||
return () => clearInterval(interval);
|
return () => clearInterval(interval);
|
||||||
}, [session, status, update]);
|
}, [session, status, update, router]);
|
||||||
|
|
||||||
return children;
|
return children;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import { getServerSession } from "app/_lib/authentication";
|
import { getServerSession } from "app/_lib/authentication";
|
||||||
|
import { redirect } from "next/navigation";
|
||||||
import { cookies } from "next/headers";
|
import { cookies } from "next/headers";
|
||||||
|
|
||||||
const getHeaders = async () => {
|
const getHeaders = async () => {
|
||||||
|
|
|
||||||
|
|
@ -10,12 +10,12 @@ const rewriteURL = (
|
||||||
const destinationURL = request.url.replace(originBaseURL, destinationBaseURL);
|
const destinationURL = request.url.replace(originBaseURL, destinationBaseURL);
|
||||||
console.log(`Rewriting ${request.url} to ${destinationURL}`);
|
console.log(`Rewriting ${request.url} to ${destinationURL}`);
|
||||||
const requestHeaders = new Headers(request.headers);
|
const requestHeaders = new Headers(request.headers);
|
||||||
// console.log({ beforeHeaders: requestHeaders });
|
|
||||||
for (const [key, value] of Object.entries(headers)) {
|
for (const [key, value] of Object.entries(headers)) {
|
||||||
requestHeaders.set(key, value as string);
|
requestHeaders.set(key, value as string);
|
||||||
}
|
}
|
||||||
requestHeaders.delete("connection");
|
requestHeaders.delete("connection");
|
||||||
// console.log({ afterHeaders: requestHeaders });
|
|
||||||
return NextResponse.rewrite(new URL(destinationURL), {
|
return NextResponse.rewrite(new URL(destinationURL), {
|
||||||
request: { headers: requestHeaders },
|
request: { headers: requestHeaders },
|
||||||
});
|
});
|
||||||
|
|
@ -26,7 +26,15 @@ const checkRewrites = async (request: NextRequestWithAuth) => {
|
||||||
const zammadURL = process.env.ZAMMAD_URL ?? "http://zammad-nginx:8080";
|
const zammadURL = process.env.ZAMMAD_URL ?? "http://zammad-nginx:8080";
|
||||||
const opensearchDashboardsURL =
|
const opensearchDashboardsURL =
|
||||||
process.env.OPENSEARCH_DASHBOARDS_URL ?? "http://macmini:5601";
|
process.env.OPENSEARCH_DASHBOARDS_URL ?? "http://macmini:5601";
|
||||||
const zammadPaths = ["/zammad", "/api/v1", "/auth/sso", "/assets", "/mobile"];
|
const zammadPaths = [
|
||||||
|
"/zammad",
|
||||||
|
"/api/v1",
|
||||||
|
"/auth/sso",
|
||||||
|
"/assets",
|
||||||
|
"/mobile",
|
||||||
|
"/graphql",
|
||||||
|
"/cable",
|
||||||
|
];
|
||||||
const { token } = request.nextauth;
|
const { token } = request.nextauth;
|
||||||
const email = token?.email?.toLowerCase() ?? "unknown";
|
const email = token?.email?.toLowerCase() ?? "unknown";
|
||||||
let headers = { "x-forwarded-user": email };
|
let headers = { "x-forwarded-user": email };
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,8 @@
|
||||||
"@mui/icons-material": "^5",
|
"@mui/icons-material": "^5",
|
||||||
"@mui/material": "^5",
|
"@mui/material": "^5",
|
||||||
"@mui/material-nextjs": "^5.16.6",
|
"@mui/material-nextjs": "^5.16.6",
|
||||||
"@mui/x-data-grid-pro": "^7.12.0",
|
"@mui/x-data-grid-pro": "^7.12.1",
|
||||||
"@mui/x-date-pickers-pro": "^7.12.0",
|
"@mui/x-date-pickers-pro": "^7.12.1",
|
||||||
"date-fns": "^3.6.0",
|
"date-fns": "^3.6.0",
|
||||||
"graphql": "^16.9.0",
|
"graphql": "^16.9.0",
|
||||||
"graphql-request": "^7.1.0",
|
"graphql-request": "^7.1.0",
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.25.2",
|
"@babel/core": "^7.25.2",
|
||||||
"@types/node": "^22.1.0",
|
"@types/node": "^22.2.0",
|
||||||
"@types/react": "18.3.3",
|
"@types/react": "18.3.3",
|
||||||
"@types/uuid": "^10.0.0",
|
"@types/uuid": "^10.0.0",
|
||||||
"babel-loader": "^9.1.3",
|
"babel-loader": "^9.1.3",
|
||||||
|
|
|
||||||
640
package-lock.json
generated
640
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -7,9 +7,10 @@
|
||||||
"build": "dotenv -- turbo build",
|
"build": "dotenv -- turbo build",
|
||||||
"migrate": "dotenv -- npm run migrate --workspace=database",
|
"migrate": "dotenv -- npm run migrate --workspace=database",
|
||||||
"lint": "dotenv turbo lint",
|
"lint": "dotenv turbo lint",
|
||||||
|
"update-version": "find . -name 'package.json' -exec sed -i '' -E \"s/\\\"version\\\": \\\"[^\\\"]+\\\"/\\\"version\\\": \\\"$npm_config_newversion\\\"/\" {} +",
|
||||||
"upgrade:setup": "npm i -g npm-check-updates",
|
"upgrade:setup": "npm i -g npm-check-updates",
|
||||||
"upgrade:check": "ncu && ncu -ws",
|
"upgrade:check": "ncu && ncu -ws",
|
||||||
"upgrade:all": "ncu -u -x eslint -x kysely && ncu -ws -u -x eslint -x kysely && npm i",
|
"upgrade": "ncu -u -x eslint -x kysely && ncu -ws -u -x eslint -x kysely && npm i",
|
||||||
"clean": "rm -f package-lock.json && rm -rf node_modules && rm -rf .turbo && rm -rf apps/*/node_modules && rm -rf apps/*/package-lock.json && rm -rf apps/*/.next && rm -rf packages/*/node_modules && rm -rf apps/*/.next && rm -rf packages/*/.turbo && rm -rf packages/*/build && rm -rf docker/zammad/addons/*",
|
"clean": "rm -f package-lock.json && rm -rf node_modules && rm -rf .turbo && rm -rf apps/*/node_modules && rm -rf apps/*/package-lock.json && rm -rf apps/*/.next && rm -rf packages/*/node_modules && rm -rf apps/*/.next && rm -rf packages/*/.turbo && rm -rf packages/*/build && rm -rf docker/zammad/addons/*",
|
||||||
"docker:all:up": "node docker/scripts/docker.js all up",
|
"docker:all:up": "node docker/scripts/docker.js all up",
|
||||||
"docker:all:down": "node docker/scripts/docker.js all down",
|
"docker:all:down": "node docker/scripts/docker.js all down",
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
"@babel/preset-typescript": "7.24.7",
|
"@babel/preset-typescript": "7.24.7",
|
||||||
"prettier": "^3.3.3",
|
"prettier": "^3.3.3",
|
||||||
"@link-stack/typescript-config": "*",
|
"@link-stack/typescript-config": "*",
|
||||||
"tsx": "^4.16.5",
|
"tsx": "^4.17.0",
|
||||||
"typescript": "^5.5.4"
|
"typescript": "^5.5.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,12 @@ export class Service {
|
||||||
req: NextRequest,
|
req: NextRequest,
|
||||||
{ params: { service, token } }: ServiceParams,
|
{ params: { service, token } }: ServiceParams,
|
||||||
): Promise<NextResponse> {
|
): Promise<NextResponse> {
|
||||||
|
const table = getServiceTable(service);
|
||||||
|
const row = await db
|
||||||
|
.selectFrom(table)
|
||||||
|
.selectAll()
|
||||||
|
.where("token", "=", token ?? "NEVER_MATCH")
|
||||||
|
.executeTakeFirstOrThrow();
|
||||||
const json = await req.json();
|
const json = await req.json();
|
||||||
const worker = await getWorkerUtils();
|
const worker = await getWorkerUtils();
|
||||||
await worker.addJob(`${service}/send-${service}-message`, {
|
await worker.addJob(`${service}/send-${service}-message`, {
|
||||||
|
|
@ -88,7 +94,17 @@ export class Service {
|
||||||
...json,
|
...json,
|
||||||
});
|
});
|
||||||
|
|
||||||
return NextResponse.json({ response: "ok" });
|
const response = {
|
||||||
|
response: "ok",
|
||||||
|
result: {
|
||||||
|
to: json.to,
|
||||||
|
from: row?.phoneNumber ?? null,
|
||||||
|
timestamp: new Date().toISOString(),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
console.log(response);
|
||||||
|
return NextResponse.json(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
async receiveMessage(
|
async receiveMessage(
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,8 @@
|
||||||
"@link-stack/signal-api": "*",
|
"@link-stack/signal-api": "*",
|
||||||
"@mui/icons-material": "^5",
|
"@mui/icons-material": "^5",
|
||||||
"@mui/material": "^5",
|
"@mui/material": "^5",
|
||||||
"@mui/x-data-grid-pro": "^7.12.0",
|
"@mui/x-data-grid-pro": "^7.12.1",
|
||||||
"@mui/x-date-pickers-pro": "^7.12.0",
|
"@mui/x-date-pickers-pro": "^7.12.1",
|
||||||
"date-fns": "^3.6.0",
|
"date-fns": "^3.6.0",
|
||||||
"kysely": "0.26.1",
|
"kysely": "0.26.1",
|
||||||
"material-ui-popup-state": "^5.1.2",
|
"material-ui-popup-state": "^5.1.2",
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.25.2",
|
"@babel/core": "^7.25.2",
|
||||||
"@types/node": "^22.1.0",
|
"@types/node": "^22.2.0",
|
||||||
"@types/react": "18.3.3",
|
"@types/react": "18.3.3",
|
||||||
"@types/react-dom": "^18.3.0",
|
"@types/react-dom": "^18.3.0",
|
||||||
"@types/uuid": "^10.0.0",
|
"@types/uuid": "^10.0.0",
|
||||||
|
|
|
||||||
|
|
@ -10,14 +10,14 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@rushstack/eslint-patch": "^1.10.4",
|
"@rushstack/eslint-patch": "^1.10.4",
|
||||||
"@typescript-eslint/eslint-plugin": "^8.0.1",
|
"@typescript-eslint/eslint-plugin": "^8.1.0",
|
||||||
"@typescript-eslint/parser": "^8.0.1",
|
"@typescript-eslint/parser": "^8.1.0",
|
||||||
"eslint-config-prettier": "^9.1.0",
|
"eslint-config-prettier": "^9.1.0",
|
||||||
"eslint-config-xo-space": "^0.35.0",
|
"eslint-config-xo-space": "^0.35.0",
|
||||||
"eslint-plugin-cypress": "^3.4.0",
|
"eslint-plugin-cypress": "^3.5.0",
|
||||||
"eslint-plugin-eslint-comments": "^3.2.0",
|
"eslint-plugin-eslint-comments": "^3.2.0",
|
||||||
"eslint-plugin-import": "^2.29.1",
|
"eslint-plugin-import": "^2.29.1",
|
||||||
"eslint-plugin-jest": "^28.7.0",
|
"eslint-plugin-jest": "^28.8.0",
|
||||||
"eslint-plugin-promise": "^7.1.0",
|
"eslint-plugin-promise": "^7.1.0",
|
||||||
"eslint-plugin-unicorn": "55.0.0",
|
"eslint-plugin-unicorn": "55.0.0",
|
||||||
"@babel/eslint-parser": "7.25.1"
|
"@babel/eslint-parser": "7.25.1"
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,8 @@
|
||||||
"@emotion/styled": "^11.13.0",
|
"@emotion/styled": "^11.13.0",
|
||||||
"@mui/icons-material": "^5",
|
"@mui/icons-material": "^5",
|
||||||
"@mui/material": "^5",
|
"@mui/material": "^5",
|
||||||
"@mui/x-data-grid-pro": "^7.12.0",
|
"@mui/x-data-grid-pro": "^7.12.1",
|
||||||
"@mui/x-date-pickers-pro": "^7.12.0",
|
"@mui/x-date-pickers-pro": "^7.12.1",
|
||||||
"@link-stack/opensearch-common": "*",
|
"@link-stack/opensearch-common": "*",
|
||||||
"date-fns": "^3.6.0",
|
"date-fns": "^3.6.0",
|
||||||
"material-ui-popup-state": "^5.1.2",
|
"material-ui-popup-state": "^5.1.2",
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.25.2",
|
"@babel/core": "^7.25.2",
|
||||||
"@types/node": "^22.1.0",
|
"@types/node": "^22.2.0",
|
||||||
"@types/react": "18.3.3",
|
"@types/react": "18.3.3",
|
||||||
"@types/uuid": "^10.0.0",
|
"@types/uuid": "^10.0.0",
|
||||||
"babel-loader": "^9.1.3",
|
"babel-loader": "^9.1.3",
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.25.2",
|
"@babel/core": "^7.25.2",
|
||||||
"@types/node": "^22.1.0",
|
"@types/node": "^22.2.0",
|
||||||
"@types/react": "18.3.3",
|
"@types/react": "18.3.3",
|
||||||
"@types/uuid": "^10.0.0",
|
"@types/uuid": "^10.0.0",
|
||||||
"babel-loader": "^9.1.3",
|
"babel-loader": "^9.1.3",
|
||||||
|
|
|
||||||
|
|
@ -9,14 +9,14 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mui/icons-material": "^5",
|
"@mui/icons-material": "^5",
|
||||||
"@mui/material": "^5",
|
"@mui/material": "^5",
|
||||||
"@mui/x-data-grid-pro": "^7.12.0",
|
"@mui/x-data-grid-pro": "^7.12.1",
|
||||||
"@mui/x-date-pickers-pro": "^7.12.0",
|
"@mui/x-date-pickers-pro": "^7.12.1",
|
||||||
"next": "14.2.5",
|
"next": "14.2.5",
|
||||||
"react": "18.3.1",
|
"react": "18.3.1",
|
||||||
"react-dom": "18.3.1"
|
"react-dom": "18.3.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^22.1.0",
|
"@types/node": "^22.2.0",
|
||||||
"@types/react": "18.3.3",
|
"@types/react": "18.3.3",
|
||||||
"typescript": "^5.5.4"
|
"typescript": "^5.5.4"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -61,16 +61,16 @@ class CommunicateCdrSignalJob < ApplicationJob
|
||||||
|
|
||||||
return if has_error
|
return if has_error
|
||||||
|
|
||||||
article.to = result['result']['recipient']
|
article.to = result['result']['to']
|
||||||
article.from = result['result']['source']
|
article.from = result['result']['from']
|
||||||
|
|
||||||
message_id = format('%<source>s@%<timestamp>s', source: result['result']['source'],
|
message_id = format('%<from>s@%<timestamp>s', from: result['result']['from'],
|
||||||
timestamp: result['result']['timestamp'])
|
timestamp: result['result']['timestamp'])
|
||||||
article.preferences['cdr_signal'] = {
|
article.preferences['cdr_signal'] = {
|
||||||
timestamp: result['result']['timestamp'],
|
timestamp: result['result']['timestamp'],
|
||||||
message_id: message_id,
|
message_id: message_id,
|
||||||
from: result['result']['source'],
|
from: result['result']['from'],
|
||||||
to: result['result']['recipient']
|
to: result['result']['to']
|
||||||
}
|
}
|
||||||
|
|
||||||
# set delivery status
|
# set delivery status
|
||||||
|
|
|
||||||
|
|
@ -61,16 +61,16 @@ class CommunicateCdrWhatsappJob < ApplicationJob
|
||||||
|
|
||||||
return if has_error
|
return if has_error
|
||||||
|
|
||||||
article.to = result['result']['recipient']
|
article.to = result['result']['to']
|
||||||
article.from = result['result']['source']
|
article.from = result['result']['from']
|
||||||
|
|
||||||
message_id = format('%<source>s@%<timestamp>s', source: result['result']['source'],
|
message_id = format('%<from>s@%<timestamp>s', from: result['result']['from'],
|
||||||
timestamp: result['result']['timestamp'])
|
timestamp: result['result']['timestamp'])
|
||||||
article.preferences['cdr_whatsapp'] = {
|
article.preferences['cdr_whatsapp'] = {
|
||||||
timestamp: result['result']['timestamp'],
|
timestamp: result['result']['timestamp'],
|
||||||
message_id: message_id,
|
message_id: message_id,
|
||||||
from: result['result']['source'],
|
from: result['result']['from'],
|
||||||
to: result['result']['recipient']
|
to: result['result']['to']
|
||||||
}
|
}
|
||||||
|
|
||||||
# set delivery status
|
# set delivery status
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ class CdrSignal
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.message_id(message_raw)
|
def self.message_id(message_raw)
|
||||||
format('%<source>s@%<timestamp>s', source: message_raw['source'], timestamp: message_raw['timestamp'])
|
format('%<from>s@%<timestamp>s', from: message_raw['from'], timestamp: message_raw['timestamp'])
|
||||||
end
|
end
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ class CdrWhatsapp
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.message_id(message_raw)
|
def self.message_id(message_raw)
|
||||||
format('%<source>s@%<timestamp>s', source: message_raw['source'], timestamp: message_raw['timestamp'])
|
format('%<from>s@%<timestamp>s', from: message_raw['from'], timestamp: message_raw['timestamp'])
|
||||||
end
|
end
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue