From 38d3e9349cb67b57647309dfb7e726f0c7892ae2 Mon Sep 17 00:00:00 2001 From: Darren Clarke Date: Fri, 21 Jul 2023 12:26:02 +0000 Subject: [PATCH] Middleware proxy updates --- .gitlab-ci.yml | 2 +- apps/leafcutter/package.json | 10 +- apps/link/app/(main)/_components/Sidebar.tsx | 10 +- .../app/(main)/_components/ZammadWrapper.tsx | 3 +- .../_components/LabelStudioWrapper.tsx | 4 +- .../_components/MetamigoWrapper.tsx | 10 +- .../admin/metamigo/{[...path] => }/page.tsx | 0 .../[view]/_components/LeafcutterWrapper.tsx | 8 +- .../app/(main)/leafcutter/[view]/page.tsx | 2 +- .../api/auth/[...nextauth]/route.ts | 0 .../app/{(main) => }/api/v1/users/route.ts | 0 apps/link/middleware.ts | 35 +- apps/link/next.config.js | 6 +- apps/link/package.json | 10 +- apps/metamigo-frontend/package.json | 6 +- docker-compose.label-studio.yml | 18 + docker-compose.zammad.yml | 1 + package-lock.json | 420 +++++++++++------- package.json | 4 +- packages/metamigo-db/scripts/afterCurrent.sh | 4 - 20 files changed, 329 insertions(+), 224 deletions(-) rename apps/link/app/(main)/admin/metamigo/{[...path] => }/_components/MetamigoWrapper.tsx (72%) rename apps/link/app/(main)/admin/metamigo/{[...path] => }/page.tsx (100%) rename apps/link/app/{(main) => }/api/auth/[...nextauth]/route.ts (100%) rename apps/link/app/{(main) => }/api/v1/users/route.ts (100%) create mode 100644 docker-compose.label-studio.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5a0478..5588f90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -206,7 +206,7 @@ zammad-docker-build: - npm install npm@latest -g - npm install -g turbo - npm ci - - turbo build + - turbo build --filter zammad-addon-* - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - DOCKER_BUILDKIT=1 docker build --pull --no-cache -t ${DOCKER_NS}:${DOCKER_TAG} -f ${DOCKERFILE_PATH} ${DOCKER_CONTEXT} - docker push ${DOCKER_NS}:${DOCKER_TAG} diff --git a/apps/leafcutter/package.json b/apps/leafcutter/package.json index 0ebc319..4af7328 100644 --- a/apps/leafcutter/package.json +++ b/apps/leafcutter/package.json @@ -23,13 +23,13 @@ "@mui/icons-material": "^5", "@mui/lab": "^5.0.0-alpha.137", "@mui/material": "^5", - "@mui/x-data-grid-pro": "^6.10.0", - "@mui/x-date-pickers-pro": "^6.10.0", + "@mui/x-data-grid-pro": "^6.10.1", + "@mui/x-date-pickers-pro": "^6.10.1", "@opensearch-project/opensearch": "^2.3.1", "date-fns": "^2.30.0", "http-proxy-middleware": "^2.0.6", "material-ui-popup-state": "^5.0.9", - "next": "13.4.10", + "next": "13.4.11", "next-auth": "^4.22.3", "next-http-proxy-middleware": "^1.2.5", "nodemailer": "^6.9.4", @@ -53,12 +53,12 @@ "babel-loader": "^9.1.3", "eslint": "^8.45.0", "eslint-config-airbnb": "^19.0.4", - "eslint-config-next": "^13.4.10", + "eslint-config-next": "^13.4.11", "eslint-config-prettier": "^8.8.0", "eslint-plugin-import": "^2.27.5", "eslint-plugin-jsx-a11y": "^6.7.1", "eslint-plugin-prettier": "^5.0.0", - "eslint-plugin-react": "^7.32.2", + "eslint-plugin-react": "^7.33.0", "typescript": "5.1.6" } } diff --git a/apps/link/app/(main)/_components/Sidebar.tsx b/apps/link/app/(main)/_components/Sidebar.tsx index b1813da..32f4e71 100644 --- a/apps/link/app/(main)/_components/Sidebar.tsx +++ b/apps/link/app/(main)/_components/Sidebar.tsx @@ -166,11 +166,11 @@ export const Sidebar: FC = ({ 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 = ({ open, setOpen }) => { /> = ({ open, setOpen }) => { onClick={undefined} > - {/* = ({ open, setOpen }) => { selected={pathname.endsWith("/leafcutter")} open={open} /> - = ({ open, setOpen }) => { selected={pathname.endsWith("/leafcutter/create")} open={open} /> - = ({ open, setOpen }) => { selected={pathname.endsWith("/leafcutter/trends")} open={open} /> -*/} = ({ // @ts-ignore ( linkElement.contentDocument.querySelector( - ".overview-header" + ".overview-header", ) as any ).style = "display: none"; } diff --git a/apps/link/app/(main)/admin/label-studio/_components/LabelStudioWrapper.tsx b/apps/link/app/(main)/admin/label-studio/_components/LabelStudioWrapper.tsx index 369bb2a..7f70aa5 100644 --- a/apps/link/app/(main)/admin/label-studio/_components/LabelStudioWrapper.tsx +++ b/apps/link/app/(main)/admin/label-studio/_components/LabelStudioWrapper.tsx @@ -13,8 +13,8 @@ export const LabelStudioWrapper: FC = () => ( >