From d0f1c1337c43e87a2c00fd79967f2891ada144f7 Mon Sep 17 00:00:00 2001 From: Darren Clarke Date: Tue, 14 Mar 2023 17:40:24 +0000 Subject: [PATCH] Fix build errors --- apps/leafcutter/pages/_document.tsx | 2 +- apps/link/pages/_document.tsx | 2 +- .../components/AdminLogin.tsx | 4 + apps/metamigo-frontend/components/Auth.tsx | 4 +- .../components/accounts/AccountEdit.tsx | 2 +- .../components/accounts/AccountList.tsx | 3 +- .../components/signal/bots/SignalBotShow.tsx | 35 ++--- .../components/users/UserCreate.tsx | 4 +- .../components/users/UserEdit.tsx | 2 +- .../components/users/shared.tsx | 2 +- .../components/voice/providers/shared.tsx | 2 +- .../components/voice/voicelines/MicInput.tsx | 32 +++-- .../voice/voicelines/VoiceLineList.tsx | 2 +- .../components/voice/voicelines/shared.tsx | 75 ++++++---- .../components/webhooks/WebhookEdit.tsx | 3 +- .../components/webhooks/shared.tsx | 14 +- .../attachments/WhatsappAttachmentList.tsx | 2 +- .../whatsapp/bots/WhatsappBotCreate.tsx | 2 +- .../whatsapp/bots/WhatsappBotList.tsx | 2 +- .../whatsapp/bots/WhatsappBotShow.tsx | 15 +- apps/metamigo-frontend/lib/cloudflare.ts | 5 +- apps/metamigo-frontend/lib/dataprovider.ts | 4 +- apps/metamigo-frontend/package.json | 12 +- apps/metamigo-frontend/pages/index.tsx | 4 +- apps/metamigo-worker/tasks/signald-message.ts | 2 +- apps/metamigo-worker/tsconfig.json | 2 +- docker/zammad/Dockerfile | 6 +- package-lock.json | 136 +++++++++++++++++- 28 files changed, 268 insertions(+), 112 deletions(-) diff --git a/apps/leafcutter/pages/_document.tsx b/apps/leafcutter/pages/_document.tsx index dc314e6..c023ed5 100644 --- a/apps/leafcutter/pages/_document.tsx +++ b/apps/leafcutter/pages/_document.tsx @@ -25,7 +25,7 @@ LeafcutterDocument.getInitialProps = async (ctx) => { ctx.renderPage = () => originalRenderPage({ - enhanceApp: (App: any) => (props) => + enhanceApp: (App: any) => (props: any) => , }); diff --git a/apps/link/pages/_document.tsx b/apps/link/pages/_document.tsx index 986ee3e..f0347fa 100644 --- a/apps/link/pages/_document.tsx +++ b/apps/link/pages/_document.tsx @@ -25,7 +25,7 @@ LinkDocument.getInitialProps = async (ctx) => { ctx.renderPage = () => originalRenderPage({ - enhanceApp: (App: any) => (props) => + enhanceApp: (App: any) => (props: any) => , }); diff --git a/apps/metamigo-frontend/components/AdminLogin.tsx b/apps/metamigo-frontend/components/AdminLogin.tsx index bee7c86..c5972e5 100644 --- a/apps/metamigo-frontend/components/AdminLogin.tsx +++ b/apps/metamigo-frontend/components/AdminLogin.tsx @@ -28,12 +28,16 @@ export const authProvider = { if (e.networkError && e.networkError.statusCode === 401) { return Promise.reject(); } + + return Promise.resolve(); }, checkAuth: async () => { const session = await getSession(); if (!session) { return Promise.reject(); } + + return Promise.resolve(); }, getIdentity: async () => { const session = await getSession(); diff --git a/apps/metamigo-frontend/components/Auth.tsx b/apps/metamigo-frontend/components/Auth.tsx index 9828f8a..aa1673c 100644 --- a/apps/metamigo-frontend/components/Auth.tsx +++ b/apps/metamigo-frontend/components/Auth.tsx @@ -1,9 +1,9 @@ -import { FC, PropsWithChildren, useEffect } from "react"; +import { FC, useEffect } from "react"; import { CircularProgress } from "@material-ui/core"; import { useSession } from "next-auth/react"; import { useRouter } from "next/router"; -export const Auth: FC = ({ children }) => { +export const Auth: FC = ({ children }) => { const router = useRouter(); const { data: session, status: loading } = useSession(); useEffect(() => { diff --git a/apps/metamigo-frontend/components/accounts/AccountEdit.tsx b/apps/metamigo-frontend/components/accounts/AccountEdit.tsx index bdbc463..e4c3866 100644 --- a/apps/metamigo-frontend/components/accounts/AccountEdit.tsx +++ b/apps/metamigo-frontend/components/accounts/AccountEdit.tsx @@ -25,7 +25,7 @@ type AccountEditToolbarProps = { record?: any; }; -const AccountEditToolbar: FC = (props) => { +const AccountEditToolbar: FC = (props: any) => { const { data: session } = useSession(); const classes = useStyles(props); return ( diff --git a/apps/metamigo-frontend/components/accounts/AccountList.tsx b/apps/metamigo-frontend/components/accounts/AccountList.tsx index 1ce42bf..9bfec3c 100644 --- a/apps/metamigo-frontend/components/accounts/AccountList.tsx +++ b/apps/metamigo-frontend/components/accounts/AccountList.tsx @@ -14,9 +14,10 @@ type DeleteNotSelfButtonProps = { record?: any; }; -const DeleteNotSelfButton: FC = (props) => { +const DeleteNotSelfButton: FC = (props: any) => { const { data: session } = useSession(); return ( + // @ts-ignore { variant="outlined" label="Message" multiline - rows={3} + minRows={3} fullWidth size="small" value={message} @@ -156,15 +156,15 @@ const handleRequestCode = async ({ "Content-Type": "application/json", }, }); + + if (response && response.ok) { + onSuccess(); + } else { + onFailure(response.status || 400); + } } catch (error: any) { console.error("Failed to request verification code:", error); } - - if (response && response.ok) { - onSuccess(); - } else { - onFailure(response.status || 400); - } }; const VerificationCodeRequest = ({ @@ -222,7 +222,7 @@ const VerificationCaptcha = ({ setSubmitting(false); }; - const handleCaptchaChange = (value) => { + const handleCaptchaChange = (value: any) => { if (value) setCode( value @@ -268,16 +268,16 @@ const VerificationCodeInput = ({ handleClose, handleRestartVerification, confirmVerification, -}) => { +}: any) => { const [code, setValue] = React.useState(""); const [isSubmitting, setSubmitting] = React.useState(false); const [isValid, setValid] = React.useState(false); const [submissionError, setSubmissionError] = React.useState(undefined); const translate = useTranslate(); - const validator = (v) => v.trim().length === 6; + const validator = (v: any) => v.trim().length === 6; - const handleValueChange = (newValue) => { + const handleValueChange = (newValue: any) => { setValue(newValue); setValid(validator(newValue)); }; @@ -300,11 +300,14 @@ const VerificationCodeInput = ({ if (response.status === 200) { confirmVerification(); } else if (responseBody.message) + // @ts-expect-error setSubmissionError(`Error: ${responseBody.message}`); - else + else { setSubmissionError( + // @ts-expect-error "There was an error, sorry about that. Please try again later or contact support." ); + } }; const title = @@ -355,7 +358,7 @@ const VerificationCodeInput = ({ ); }; -const VerificationCodeDialog = (props) => { +const VerificationCodeDialog = (props: any) => { const [stage, setStage] = React.useState("request"); const onRequestSuccess = () => setStage("verify"); const onRestartVerification = () => setStage("request"); @@ -406,7 +409,7 @@ const VerificationCodeDialog = (props) => { ); }; -const SignalBotShowActions = ({ basePath, data }) => { +const SignalBotShowActions = ({ basePath, data }: any) => { const [open, setOpen] = React.useState(false); const [verifyMode, setVerifyMode] = React.useState(""); const refresh = useRefresh(); @@ -429,7 +432,7 @@ const SignalBotShowActions = ({ basePath, data }) => { return ( - + {data && !data.isVerified && ( diff --git a/apps/metamigo-worker/tasks/signald-message.ts b/apps/metamigo-worker/tasks/signald-message.ts index 6cea8a5..b8d5d80 100644 --- a/apps/metamigo-worker/tasks/signald-message.ts +++ b/apps/metamigo-worker/tasks/signald-message.ts @@ -1,6 +1,6 @@ /* eslint-disable camelcase */ import logger from "../logger"; -import { IncomingMessagev1 } from "@digiresilience/node-signald/dist/generated"; +import { IncomingMessagev1 } from "@digiresilience/node-signald/build/main/generated"; import { withDb, AppDatabase } from "../db"; import workerUtils from "../utils"; diff --git a/apps/metamigo-worker/tsconfig.json b/apps/metamigo-worker/tsconfig.json index 7142609..390a34a 100644 --- a/apps/metamigo-worker/tsconfig.json +++ b/apps/metamigo-worker/tsconfig.json @@ -5,5 +5,5 @@ "esModuleInterop": true }, "include": ["**/*.ts", "**/.*.ts"], - "exclude": ["node_modules"] + "exclude": ["node_modules", "build"] } diff --git a/docker/zammad/Dockerfile b/docker/zammad/Dockerfile index e4e5239..6fd97a2 100644 --- a/docker/zammad/Dockerfile +++ b/docker/zammad/Dockerfile @@ -1,6 +1,6 @@ -FROM zammad/zammad-docker-compose:5.3.1-53 AS builder +FROM zammad/zammad-docker-compose:5.4.0 AS builder COPY auto_install ${ZAMMAD_TMP_DIR}/auto_install -RUN sed -i "s/# create install ready file/bundle exec rake zammad:package:migrate/g" contrib/docker/docker-entrypoint.sh +# RUN sed -i "s/# create install ready file/bundle exec rake zammad:package:migrate/g" contrib/docker/docker-entrypoint.sh -FROM zammad/zammad-docker-compose:5.3.1-53 +FROM zammad/zammad-docker-compose:5.4.0 COPY --from=builder ${ZAMMAD_TMP_DIR} ${ZAMMAD_TMP_DIR} diff --git a/package-lock.json b/package-lock.json index fa7d63f..cb0a1d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -637,8 +637,10 @@ "react-digit-input": "^2.1.0", "react-dom": "^17", "react-qr-code": "^2.0.11", + "react-redux": "^8.0.5", "react-timer-hook": "^3.0.5", - "swr": "^2.0.0" + "swr": "^2.0.0", + "twilio-client": "^1.15.0" }, "devDependencies": { "@next/eslint-plugin-next": "^13.1.2", @@ -6441,6 +6443,11 @@ "version": "2.0.6", "license": "MIT" }, + "node_modules/@types/use-sync-external-store": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz", + "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==" + }, "node_modules/@types/uuid": { "version": "9.0.1", "dev": true, @@ -18394,6 +18401,44 @@ } } }, + "node_modules/react-redux": { + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.0.5.tgz", + "integrity": "sha512-Q2f6fCKxPFpkXt1qNRZdEDLlScsDWyrgSj0mliK59qU6W5gvBiKkdMEG2lJzhd1rCctf0hb6EtePPLZ2e0m1uw==", + "dependencies": { + "@babel/runtime": "^7.12.1", + "@types/hoist-non-react-statics": "^3.3.1", + "@types/use-sync-external-store": "^0.0.3", + "hoist-non-react-statics": "^3.3.2", + "react-is": "^18.0.0", + "use-sync-external-store": "^1.0.0" + }, + "peerDependencies": { + "@types/react": "^16.8 || ^17.0 || ^18.0", + "@types/react-dom": "^16.8 || ^17.0 || ^18.0", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0", + "react-native": ">=0.59", + "redux": "^4" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + }, + "react-dom": { + "optional": true + }, + "react-native": { + "optional": true + }, + "redux": { + "optional": true + } + } + }, "node_modules/react-router": { "version": "6.8.2", "license": "MIT", @@ -20235,6 +20280,48 @@ "node": ">=6.0" } }, + "node_modules/twilio-client": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/twilio-client/-/twilio-client-1.15.0.tgz", + "integrity": "sha512-7JlyDZSDPVH1pwh7OwiZbUVKw+PFjW7h+Xy1thM+IDSdug7qXWpVyvxwaz3+SVHazZBNnz8DxHJTlsdbYkxN9g==", + "dependencies": { + "@twilio/audioplayer": "1.0.6", + "@twilio/voice-errors": "1.0.1", + "backoff": "2.5.0", + "loglevel": "1.6.7", + "rtcpeerconnection-shim": "1.2.8", + "ws": "7.4.6", + "xmlhttprequest": "1.8.0" + }, + "engines": { + "node": ">= 12" + } + }, + "node_modules/twilio-client/node_modules/@twilio/voice-errors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@twilio/voice-errors/-/voice-errors-1.0.1.tgz", + "integrity": "sha512-iXzCuiOhNMhrr8DVjRRzI14YwGUIBM83kWSWcDktxmXim0Tz9xoCth4QFAQcMkNL2h9DlfXlob6noH+3h2iA4A==" + }, + "node_modules/twilio-client/node_modules/ws": { + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/twilio/node_modules/axios": { "version": "0.26.1", "license": "MIT", @@ -28207,6 +28294,11 @@ "@types/unist": { "version": "2.0.6" }, + "@types/use-sync-external-store": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz", + "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==" + }, "@types/uuid": { "version": "9.0.1", "dev": true @@ -35543,9 +35635,11 @@ "react-digit-input": "^2.1.0", "react-dom": "^17", "react-qr-code": "^2.0.11", + "react-redux": "^8.0.5", "react-timer-hook": "^3.0.5", "swr": "^2.0.0", "tsconfig-link": "*", + "twilio-client": "*", "typescript": "^4.9.5" }, "dependencies": { @@ -37380,6 +37474,19 @@ "match-sorter": "^6.0.2" } }, + "react-redux": { + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.0.5.tgz", + "integrity": "sha512-Q2f6fCKxPFpkXt1qNRZdEDLlScsDWyrgSj0mliK59qU6W5gvBiKkdMEG2lJzhd1rCctf0hb6EtePPLZ2e0m1uw==", + "requires": { + "@babel/runtime": "^7.12.1", + "@types/hoist-non-react-statics": "^3.3.1", + "@types/use-sync-external-store": "^0.0.3", + "hoist-non-react-statics": "^3.3.2", + "react-is": "^18.0.0", + "use-sync-external-store": "^1.0.0" + } + }, "react-router": { "version": "6.8.2", "requires": { @@ -38524,6 +38631,33 @@ } } }, + "twilio-client": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/twilio-client/-/twilio-client-1.15.0.tgz", + "integrity": "sha512-7JlyDZSDPVH1pwh7OwiZbUVKw+PFjW7h+Xy1thM+IDSdug7qXWpVyvxwaz3+SVHazZBNnz8DxHJTlsdbYkxN9g==", + "requires": { + "@twilio/audioplayer": "1.0.6", + "@twilio/voice-errors": "1.0.1", + "backoff": "2.5.0", + "loglevel": "1.6.7", + "rtcpeerconnection-shim": "1.2.8", + "ws": "7.4.6", + "xmlhttprequest": "1.8.0" + }, + "dependencies": { + "@twilio/voice-errors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@twilio/voice-errors/-/voice-errors-1.0.1.tgz", + "integrity": "sha512-iXzCuiOhNMhrr8DVjRRzI14YwGUIBM83kWSWcDktxmXim0Tz9xoCth4QFAQcMkNL2h9DlfXlob6noH+3h2iA4A==" + }, + "ws": { + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", + "requires": {} + } + } + }, "type": { "version": "1.2.0" },