From 21db95a8e40d18dbc9cf756a5227b46a8cd8f3d3 Mon Sep 17 00:00:00 2001 From: Darren Clarke Date: Mon, 17 Jul 2023 12:23:12 +0000 Subject: [PATCH] GraphQL and MUI license updates --- .gitlab-ci.yml | 18 +- .../app/_components/MultiProvider.tsx | 6 +- .../[overview]/_components/TicketList.tsx | 36 +- .../[overview]/_components/ZammadOverview.tsx | 2 +- .../app/(main)/overview/[overview]/page.tsx | 11 +- .../[id]/@detail/_components/TicketDetail.tsx | 21 +- .../[id]/@edit/_components/TicketEdit.tsx | 281 ++++----- .../app/(main)/tickets/[id]/@edit/page.tsx | 10 +- apps/link/app/(main)/tickets/[id]/layout.tsx | 1 - apps/link/app/_components/Button.tsx | 3 +- apps/link/app/_components/MultiProvider.tsx | 5 + .../app/_graphql/getTicketArticlesQuery.ts | 21 + apps/link/app/_graphql/getTicketQuery.ts | 21 +- apps/link/app/layout.tsx | 5 - apps/link/package.json | 21 +- package-lock.json | 556 +++++++++++++++++- 16 files changed, 811 insertions(+), 207 deletions(-) create mode 100644 apps/link/app/_graphql/getTicketArticlesQuery.ts diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 172df14..870ef94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,16 +51,16 @@ build-all: - docker tag ${DOCKER_NS}:${DOCKER_TAG} ${DOCKER_NS}:${DOCKER_TAG_NEW} - docker push ${DOCKER_NS}:${DOCKER_TAG_NEW} -# link-docker-build: -# extends: .docker-build -# variables: -# DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link -# DOCKERFILE_PATH: ./apps/link/Dockerfile +link-docker-build: + extends: .docker-build + variables: + DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link + DOCKERFILE_PATH: ./apps/link/Dockerfile -# link-docker-release: -# extends: .docker-release -# variables: -# DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link +link-docker-release: + extends: .docker-release + variables: + DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link # leafcutter-docker-build: # extends: .docker-build diff --git a/apps/leafcutter/app/_components/MultiProvider.tsx b/apps/leafcutter/app/_components/MultiProvider.tsx index 7f34422..c6e6f04 100644 --- a/apps/leafcutter/app/_components/MultiProvider.tsx +++ b/apps/leafcutter/app/_components/MultiProvider.tsx @@ -18,9 +18,11 @@ import "@fontsource/roboto/400.css"; import "@fontsource/roboto/700.css"; import "@fontsource/playfair-display/900.css"; import "app/_styles/global.css"; -import { LicenseInfo } from "@mui/x-data-grid-pro"; +import { LicenseInfo } from "@mui/x-date-pickers-pro"; -LicenseInfo.setLicenseKey(process.env.MUI_LICENSE_KEY ?? ""); +LicenseInfo.setLicenseKey( + "7c9bf25d9e240f76e77cbf7d2ba58a23Tz02NjU4OCxFPTE3MTU4NjIzMzQ2ODgsUz1wcm8sTE09c3Vic2NyaXB0aW9uLEtWPTI=" +); const messages: any = { en, fr }; diff --git a/apps/link/app/(main)/overview/[overview]/_components/TicketList.tsx b/apps/link/app/(main)/overview/[overview]/_components/TicketList.tsx index 899183a..16c40af 100644 --- a/apps/link/app/(main)/overview/[overview]/_components/TicketList.tsx +++ b/apps/link/app/(main)/overview/[overview]/_components/TicketList.tsx @@ -4,6 +4,7 @@ import { FC } from "react"; import { Grid, Box } from "@mui/material"; import { GridColDef } from "@mui/x-data-grid-pro"; import { StyledDataGrid } from "../../../_components/StyledDataGrid"; +import { Button } from "app/_components/Button"; import { typography } from "app/_styles/theme"; import { useRouter } from "next/navigation"; @@ -46,18 +47,29 @@ export const TicketList: FC = ({ title, tickets }) => { return ( - - - {title} - + + + + {title} + + + +