Middleware proxy updates

This commit is contained in:
Darren Clarke 2023-07-21 12:26:02 +00:00 committed by GitHub
parent 282808583b
commit 38d3e9349c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 329 additions and 224 deletions

View file

@ -166,11 +166,11 @@ export const Sidebar: FC<SidebarProps> = ({ open, setOpen }) => {
{
document: getTicketOverviewCountsQuery,
},
{ refreshInterval: 10000 }
{ refreshInterval: 10000 },
);
const findOverviewCountByID = (id: number) =>
overviewData?.ticketOverviews?.edges?.find((overview: any) =>
overview.node.id.endsWith(`/${id}`)
overview.node.id.endsWith(`/${id}`),
)?.node?.ticketCount ?? 0;
const assignedCount = findOverviewCountByID(1);
const urgentCount = findOverviewCountByID(7);
@ -426,7 +426,7 @@ export const Sidebar: FC<SidebarProps> = ({ open, setOpen }) => {
/>
<MenuItem
name="Leafcutter"
href="/leafcutter/about"
href="/leafcutter"
Icon={AnalyticsIcon}
iconSize={20}
selected={pathname.endsWith("/leafcutter")}
@ -439,7 +439,6 @@ export const Sidebar: FC<SidebarProps> = ({ open, setOpen }) => {
onClick={undefined}
>
<List component="div" disablePadding>
{/*
<MenuItem
name="Dashboard"
href="/leafcutter"
@ -447,7 +446,6 @@ export const Sidebar: FC<SidebarProps> = ({ open, setOpen }) => {
selected={pathname.endsWith("/leafcutter")}
open={open}
/>
<MenuItem
name="Search and Create"
href="/leafcutter/create"
@ -455,7 +453,6 @@ export const Sidebar: FC<SidebarProps> = ({ open, setOpen }) => {
selected={pathname.endsWith("/leafcutter/create")}
open={open}
/>
<MenuItem
name="Trends"
href="/leafcutter/trends"
@ -463,7 +460,6 @@ export const Sidebar: FC<SidebarProps> = ({ open, setOpen }) => {
selected={pathname.endsWith("/leafcutter/trends")}
open={open}
/>
*/}
<MenuItem
name="FAQ"
href="/leafcutter/faq"

View file

@ -1,7 +1,6 @@
"use client";
import { FC, useState } from "react";
import getConfig from "next/config";
import { useRouter } from "next/navigation";
import Iframe from "react-iframe";
@ -55,7 +54,7 @@ export const ZammadWrapper: FC<ZammadWrapperProps> = ({
// @ts-ignore
(
linkElement.contentDocument.querySelector(
".overview-header"
".overview-header",
) as any
).style = "display: none";
}

View file

@ -13,8 +13,8 @@ export const LabelStudioWrapper: FC = () => (
>
<Grid item sx={{ height: "100vh", width: "100%" }}>
<Iframe
id="link"
url={"https://label-studio:3000"}
id="label-studio"
url={"/proxy/label-studio"}
width="100%"
height="100%"
frameBorder={0}

View file

@ -1,7 +1,6 @@
"use client";
import { FC } from "react";
import getConfig from "next/config";
import { Grid } from "@mui/material";
import Iframe from "react-iframe";
@ -10,11 +9,6 @@ type MetamigoWrapperProps = {
};
export const MetamigoWrapper: FC<MetamigoWrapperProps> = ({ path }) => {
const {
publicRuntimeConfig: { linkURL },
} = getConfig();
const fullMetamigoURL = `${linkURL}/metamigo/${path}`;
return (
<Grid
container
@ -24,8 +18,8 @@ export const MetamigoWrapper: FC<MetamigoWrapperProps> = ({ path }) => {
>
<Grid item sx={{ height: "100vh", width: "100%" }}>
<Iframe
id="link"
url={fullMetamigoURL}
id="metamigo"
url="/proxy/metamigo"
width="100%"
height="100%"
frameBorder={0}

View file

@ -1,7 +1,6 @@
"use client";
import { FC } from "react";
import getConfig from "next/config";
import { Grid } from "@mui/material";
import Iframe from "react-iframe";
@ -10,10 +9,7 @@ type LeafcutterWrapperProps = {
};
export const LeafcutterWrapper: FC<LeafcutterWrapperProps> = ({ path }) => {
const {
publicRuntimeConfig: { linkURL },
} = getConfig();
const fullLeafcutterURL = `${linkURL}/proxy/leafcutter/${path}`;
const leafcutterURL = `https://lc.digiresilience.org/${path}`;
return (
<Grid
@ -25,7 +21,7 @@ export const LeafcutterWrapper: FC<LeafcutterWrapperProps> = ({ path }) => {
<Grid item sx={{ height: "100vh", width: "100%" }}>
<Iframe
id="leafcutter"
url={fullLeafcutterURL}
url={leafcutterURL}
width="100%"
height="100%"
frameBorder={0}

View file

@ -7,5 +7,5 @@ type PageProps = {
};
export default function Page({ params: { view } }: PageProps) {
<LeafcutterWrapper path={view} />;
return <LeafcutterWrapper path={view} />;
}