Fix build errors

This commit is contained in:
Darren Clarke 2024-04-21 20:47:55 +02:00
parent f93c4ad317
commit e720336768
22 changed files with 91 additions and 96 deletions

View file

@ -13,7 +13,7 @@ type GraphileJob = {
}; };
export const addGraphileJob = async (jobInfo: GraphileJob) => { export const addGraphileJob = async (jobInfo: GraphileJob) => {
await db().insertInto("graphile_worker.jobs").values(jobInfo).execute(); // await db.insertInto("graphile_worker.jobs").values(jobInfo).execute();
}; };
interface Database { interface Database {

View file

@ -67,6 +67,12 @@ const deleteBot = async (req: NextRequest) => {
return NextResponse.json({ response: "ok" }); return NextResponse.json({ response: "ok" });
}; };
const handleWebhook = async (req: NextRequest) => {
console.log({ req });
return NextResponse.json({ response: "ok" });
};
export const Signal: Service = { export const Signal: Service = {
getAllBots, getAllBots,
getOneBot, getOneBot,
@ -79,4 +85,5 @@ export const Signal: Service = {
refreshBot, refreshBot,
createBot, createBot,
deleteBot, deleteBot,
handleWebhook,
}; };

View file

@ -67,6 +67,12 @@ const deleteBot = async (req: NextRequest) => {
return NextResponse.json({ response: "ok" }); return NextResponse.json({ response: "ok" });
}; };
const handleWebhook = async (req: NextRequest) => {
console.log({ req });
return NextResponse.json({ response: "ok" });
};
export const Voice: Service = { export const Voice: Service = {
getAllBots, getAllBots,
getOneBot, getOneBot,
@ -79,4 +85,5 @@ export const Voice: Service = {
refreshBot, refreshBot,
createBot, createBot,
deleteBot, deleteBot,
handleWebhook,
}; };

View file

@ -67,6 +67,12 @@ const deleteBot = async (req: NextRequest) => {
return NextResponse.json({ response: "ok" }); return NextResponse.json({ response: "ok" });
}; };
const handleWebhook = async (req: NextRequest) => {
console.log({ req });
return NextResponse.json({ response: "ok" });
};
export const Whatsapp: Service = { export const Whatsapp: Service = {
getAllBots, getAllBots,
getOneBot, getOneBot,
@ -79,4 +85,5 @@ export const Whatsapp: Service = {
refreshBot, refreshBot,
createBot, createBot,
deleteBot, deleteBot,
handleWebhook,
}; };

View file

@ -40,7 +40,5 @@ export default function Page() {
}, },
]; ];
return ( return <List title="Facebook" rows={rows} columns={columns} />;
<List title="Facebook" entity="facebook" rows={rows} columns={columns} />
);
} }

View file

@ -40,7 +40,5 @@ export default function Page() {
}, },
]; ];
return ( return <List title="Signal Bots" rows={rows} columns={columns} />;
<List title="Signal Bots" entity="signal" rows={rows} columns={columns} />
);
} }

View file

@ -40,5 +40,5 @@ export default function Page() {
}, },
]; ];
return <List title="Users" entity="users" rows={rows} columns={columns} />; return <List title="Users" rows={rows} columns={columns} />;
} }

View file

@ -40,7 +40,5 @@ export default function Page() {
}, },
]; ];
return ( return <List title="Voice bots" rows={rows} columns={columns} />;
<List title="Voice bots" entity="users" rows={rows} columns={columns} />
);
} }

View file

@ -1,6 +1,6 @@
import { db } from "@/app/_lib/database"; // import { db } from "@/app/_lib/database";
export default async function Page() { export default async function Page() {
const rows = await db.selectFrom("WhatsAppBot"). const rows = []; // await db.selectFrom("WhatsAppBot").
return <h1>Whatsapp View</h1>; return <h1>Whatsapp View</h1>;
} }

View file

@ -1,8 +1,8 @@
"use client";
import { GridColDef } from "@mui/x-data-grid-pro"; import { GridColDef } from "@mui/x-data-grid-pro";
import { List } from "ui"; import { List } from "ui";
import { db } from "@/app/_lib/database"; // import { db } from "@/app/_lib/database";
export const dynamic = "force-dynamic";
export default async function Page() { export default async function Page() {
const columns: GridColDef[] = [ const columns: GridColDef[] = [
@ -32,7 +32,7 @@ export default async function Page() {
}, },
]; ];
const rows = await db.selectFrom("WhatsAppBot").selectAll().execute(); const rows: any = []; // await db.selectFrom("WhatsAppBot").selectAll().execute();
return ( return (
<List <List

View file

@ -1,58 +0,0 @@
import { run, Runner, RunnerOptions } from "graphile-worker";
// import { parseCronItems } from "graphile-worker";
// import { initPgp } from "./db.js";
// import logger from "./logger.js";
// import workerUtils from "./utils.js";
// import { assertFfmpegAvailable } from "./lib/media-convert.js";
/*
const logFactory = (scope: any) => (level: any, message: any, meta: any) => {
const pinoLevel = level === "warning" ? "warn" : level;
const childLogger = logger.child({ scope });
if (meta) childLogger[pinoLevel](meta, message);
else childLogger[pinoLevel](message);
};
*/
const getConfig = (): RunnerOptions => {
// logger.info({ concurrency, pollInterval }, "Starting worker");
return {
concurrency: 10,
pollInterval: 1000,
// logger: new Worker.Logger(logFactory),
connectionString: process.env.DATABASE_URL,
// eslint-disable-next-line unicorn/prefer-module
taskDirectory: `${__dirname}/tasks`,
// parsedCronItems: parseCronItems(
// leafcutterEnabled
// ? [
// { task: "import-label-studio", pattern: "*/15 * * * *" },
// { task: "import-leafcutter", pattern: "*/17 * * * *" },
// ]
// : [],
// )
};
};
export const startWorker = async (): Promise<Runner> => {
const workerConfig = await configWorker();
const worker = await Worker.run(workerConfig);
return worker;
};
export const stopWorker = async (): Promise<void> => {
await worker.stop();
};
const main = async () => {
await worker.start();
process.on("SIGTERM", async () => {
await worker.stop();
process.exit(0);
});
};
main().catch((err) => {
console.error(err);
process.exit(1);
});

View file

@ -7,9 +7,14 @@
"skipLibCheck": true "skipLibCheck": true
}, },
"ts-node": { "ts-node": {
"module": "ESNext", "esm": true,
"target": "ESNext", "experimentalSpecifierResolution": "node",
"moduleResolution": "node" "transpileOnly": true,
"compilerOptions": {
"module": "ESNext",
"target": "ESNext",
"moduleResolution": "node"
}
}, },
"include": ["**/*.ts", "**/.*.ts"], "include": ["**/*.ts", "**/.*.ts"],
"exclude": ["node_modules", "build"] "exclude": ["node_modules", "build"]

View file

@ -80,7 +80,7 @@ export const StyledDataGrid: FC<StyledDataGridProps> = ({
pageSizeOptions={[5, 10, 25]} pageSizeOptions={[5, 10, 25]}
paginationMode="client" paginationMode="client"
sx={{ height }} sx={{ height }}
rowBuffer={30} // rowBuffer={30}
rowHeight={46} rowHeight={46}
scrollbarSize={0} scrollbarSize={0}
disableVirtualization disableVirtualization

View file

@ -1,6 +1,8 @@
import { getTemplates } from "opensearch-common"; import { getTemplates } from "opensearch-common";
import { Create } from "leafcutter-ui"; import { Create } from "leafcutter-ui";
export const dynamic = "force-dynamic";
export default async function Page() { export default async function Page() {
const templates = await getTemplates(100); const templates = await getTemplates(100);

View file

@ -1,9 +1,11 @@
import { Home, LeafcutterWrapper } from "leafcutter-ui"; import { Home, LeafcutterWrapper } from "leafcutter-ui";
export const dynamic = "force-dynamic";
export default async function Page() { export default async function Page() {
return ( return (
<LeafcutterWrapper> <LeafcutterWrapper>
<Home /> <Home visualizations={{}} />
</LeafcutterWrapper> </LeafcutterWrapper>
); );
} }

View file

@ -31,25 +31,27 @@ export const TicketList: FC<TicketListProps> = ({ title, tickets }) => {
{ {
field: "customer", field: "customer",
headerName: "Sender", headerName: "Sender",
valueGetter: (params) => params.row?.customer?.fullname, valueGetter: (params: any) => params.row?.customer?.fullname,
flex: 2, flex: 2,
}, },
{ {
field: "createdAt", field: "createdAt",
headerName: "Created At", headerName: "Created At",
valueGetter: (params) => new Date(params.row?.createdAt).toLocaleString(), valueGetter: (params: any) =>
new Date(params.row?.createdAt).toLocaleString(),
flex: 1, flex: 1,
}, },
{ {
field: "updatedAt", field: "updatedAt",
headerName: "Updated At", headerName: "Updated At",
valueGetter: (params) => new Date(params.row?.updatedAt).toLocaleString(), valueGetter: (params: any) =>
new Date(params.row?.updatedAt).toLocaleString(),
flex: 1, flex: 1,
}, },
{ {
field: "group", field: "group",
headerName: "Group", headerName: "Group",
valueGetter: (params) => params.row?.group?.name, valueGetter: (params: any) => params.row?.group?.name,
flex: 1, flex: 1,
}, },
]; ];

View file

@ -60,7 +60,7 @@ export const QueryDateRangeSelector: FC<QueryDateRangeSelectorProps> = () => {
<DatePicker <DatePicker
label={t("startDate")} label={t("startDate")}
value={startDate} value={startDate}
onChange={(date) => { onChange={(date: any) => {
setStartDate(date); setStartDate(date);
updateQuery({ updateQuery({
startDate: { values: [date] }, startDate: { values: [date] },
@ -87,7 +87,7 @@ export const QueryDateRangeSelector: FC<QueryDateRangeSelectorProps> = () => {
<DatePicker <DatePicker
label={t("endDate")} label={t("endDate")}
value={endDate} value={endDate}
onChange={(date) => { onChange={(date: any) => {
setEndDate(date); setEndDate(date);
updateQuery({ updateQuery({
endDate: { values: [date] }, endDate: { values: [date] },

File diff suppressed because one or more lines are too long

View file

@ -348,8 +348,8 @@ export const performLeafcutterQuery = async (
}; };
if (searchQuery.relativeDate.values.length > 0) { if (searchQuery.relativeDate.values.length > 0) {
/*
searchQuery.relativeDate.values.forEach((value: string) => { searchQuery.relativeDate.values.forEach((value: string) => {
// @ts-expect-error
body.query.bool.must.push({ body.query.bool.must.push({
range: { range: {
date: { date: {
@ -358,9 +358,11 @@ export const performLeafcutterQuery = async (
}, },
}); });
}); });
*/
} }
if (searchQuery.startDate.values.length > 0) { if (searchQuery.startDate.values.length > 0) {
/*
searchQuery.startDate.values.forEach((value: string) => { searchQuery.startDate.values.forEach((value: string) => {
// @ts-expect-error // @ts-expect-error
body.query.bool.must.push({ body.query.bool.must.push({
@ -370,10 +372,12 @@ export const performLeafcutterQuery = async (
}, },
}, },
}); });
}); })
; */
} }
if (searchQuery.endDate.values.length > 0) { if (searchQuery.endDate.values.length > 0) {
/*
searchQuery.endDate.values.forEach((value: string) => { searchQuery.endDate.values.forEach((value: string) => {
// @ts-expect-error // @ts-expect-error
body.query.bool.must.push({ body.query.bool.must.push({
@ -384,69 +388,88 @@ export const performLeafcutterQuery = async (
}, },
}); });
}); });
*/
} }
if (searchQuery.incidentType.values.length > 0) { if (searchQuery.incidentType.values.length > 0) {
/*
// @ts-expect-error // @ts-expect-error
body.query.bool.must.push({ body.query.bool.must.push({
terms: { "incident.keyword": searchQuery.incidentType.values }, terms: { "incident.keyword": searchQuery.incidentType.values },
}); });
*/
} }
if (searchQuery.targetedGroup.values.length > 0) { if (searchQuery.targetedGroup.values.length > 0) {
/*
// @ts-expect-error // @ts-expect-error
body.query.bool.must.push({ body.query.bool.must.push({
terms: { "targeted_group.keyword": searchQuery.targetedGroup.values }, terms: { "targeted_group.keyword": searchQuery.targetedGroup.values },
}); });
*/
} }
if (searchQuery.platform.values.length > 0) { if (searchQuery.platform.values.length > 0) {
/*
// @ts-expect-error // @ts-expect-error
body.query.bool.must.push({ body.query.bool.must.push({
terms: { "technology.keyword": searchQuery.platform.values }, terms: { "technology.keyword": searchQuery.platform.values },
}); });
*/
} }
if (searchQuery.device.values.length > 0) { if (searchQuery.device.values.length > 0) {
/*
// @ts-expect-error // @ts-expect-error
body.query.bool.must.push({ body.query.bool.must.push({
terms: { "technology.keyword": searchQuery.device.values }, terms: { "technology.keyword": searchQuery.device.values },
}); });
*/
} }
if (searchQuery.service.values.length > 0) { if (searchQuery.service.values.length > 0) {
/*
// @ts-expect-error // @ts-expect-error
body.query.bool.must.push({ body.query.bool.must.push({
terms: { "technology.keyword": searchQuery.service.values }, terms: { "technology.keyword": searchQuery.service.values },
}); });
*/
} }
if (searchQuery.maker.values.length > 0) { if (searchQuery.maker.values.length > 0) {
/*
// @ts-expect-error // @ts-expect-error
body.query.bool.must.push({ body.query.bool.must.push({
terms: { "technology.keyword": searchQuery.maker.values }, terms: { "technology.keyword": searchQuery.maker.values },
}); });
*/
} }
if (searchQuery.subregion.values.length > 0) { if (searchQuery.subregion.values.length > 0) {
/*
// @ts-expect-error // @ts-expect-error
body.query.bool.must.push({ body.query.bool.must.push({
terms: { "region.keyword": searchQuery.subregion.values }, terms: { "region.keyword": searchQuery.subregion.values },
}); });
*/
} }
if (searchQuery.country.values.length > 0) { if (searchQuery.country.values.length > 0) {
/*
// @ts-expect-error // @ts-expect-error
body.query.bool.must.push({ body.query.bool.must.push({
terms: { "country.keyword": searchQuery.country.values }, terms: { "country.keyword": searchQuery.country.values },
}); });
*/
} }
if (searchQuery.continent.values.length > 0) { if (searchQuery.continent.values.length > 0) {
/*
// @ts-expect-error // @ts-expect-error
body.query.bool.must.push({ body.query.bool.must.push({
terms: { "continent.keyword": searchQuery.continent.values }, terms: { "continent.keyword": searchQuery.continent.values },
}); });
*/
} }
const dataResponse = await client.search({ const dataResponse = await client.search({

File diff suppressed because one or more lines are too long

View file

@ -9,11 +9,17 @@ interface ListProps {
title: string; title: string;
rows: any; rows: any;
columns: GridColDef<any>[]; columns: GridColDef<any>[];
onRowClick: (id: string) => void; onRowClick?: (id: string) => void;
buttons?: React.ReactNode; buttons?: React.ReactNode;
} }
export const List: FC<ListProps> = ({ title, rows, columns, onRowClick, buttons }) => { export const List: FC<ListProps> = ({
title,
rows,
columns,
onRowClick = () => {},
buttons,
}) => {
const { h3 } = typography; const { h3 } = typography;
return ( return (
@ -23,9 +29,7 @@ export const List: FC<ListProps> = ({ title, rows, columns, onRowClick, buttons
<Grid item> <Grid item>
<Box sx={h3}>{title}</Box> <Box sx={h3}>{title}</Box>
</Grid> </Grid>
<Grid item> <Grid item>{buttons}</Grid>
{buttons}
</Grid>
</Grid> </Grid>
<Grid item> <Grid item>
<Box <Box

File diff suppressed because one or more lines are too long