From 94f1de3e254d8de8a7cd3552fd7fd21f5f11f9ed Mon Sep 17 00:00:00 2001
From: Michael Schramm <michael.schramm@gmail.com>
Date: Sat, 15 May 2021 10:25:22 +0200
Subject: [PATCH] improvements

---
 CHANGELOG.md                                    |  2 +-
 components/auth/footer.tsx                      | 11 -----------
 .../form/admin/export.submission.action.tsx     | 11 ++++++-----
 graphql/client.ts                               |  7 ++++---
 pages/_app.tsx                                  | 17 ++++-------------
 pages/form/[id]/index.tsx                       | 13 ++-----------
 6 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0970172f..6867f103 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - combined notificationts to become more versatile
 - use exported hooks for graphql
-
+- disable swipe gesture
 
 ### Fixed
 
diff --git a/components/auth/footer.tsx b/components/auth/footer.tsx
index ca2c05dc..5e8d624a 100644
--- a/components/auth/footer.tsx
+++ b/components/auth/footer.tsx
@@ -1,5 +1,4 @@
 import { Button, Select } from 'antd'
-import getConfig from 'next/config'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
 import React from 'react'
@@ -7,12 +6,9 @@ import GitHubButton from 'react-github-button'
 import { useTranslation } from 'react-i18next'
 import { useSettingsQuery } from '../../graphql/query/settings.query'
 import { languages } from '../../i18n'
-import { NextConfigType } from '../../next.config.type'
 import { clearAuth, withAuth } from '../with.auth'
 import scss from './footer.module.scss'
 
-const { publicRuntimeConfig } = getConfig() as NextConfigType
-
 interface Props {
   me?: {
     id: string
@@ -42,7 +38,6 @@ const AuthFooterInner: React.FC<Props> = (props) => {
               <Link key={'admin'} href={'/admin'}>
                 <Button
                   type={'link'}
-                  ghost
                   style={{
                     color: '#FFF',
                   }}
@@ -54,7 +49,6 @@ const AuthFooterInner: React.FC<Props> = (props) => {
             <Link key={'profile'} href={'/admin/profile'}>
               <Button
                 type={'link'}
-                ghost
                 style={{
                   color: '#FFF',
                 }}
@@ -65,7 +59,6 @@ const AuthFooterInner: React.FC<Props> = (props) => {
             <Button
               key={'logout'}
               type={'link'}
-              ghost
               onClick={logout}
               style={{
                 color: '#FFF',
@@ -78,7 +71,6 @@ const AuthFooterInner: React.FC<Props> = (props) => {
             <Link href={'/login'} key={'login'}>
               <Button
                 type={'link'}
-                ghost
                 style={{
                   color: '#FFF',
                 }}
@@ -90,7 +82,6 @@ const AuthFooterInner: React.FC<Props> = (props) => {
               <Link href={'/register'} key={'register'}>
                 <Button
                   type={'link'}
-                  ghost
                   style={{
                     color: '#FFF',
                   }}
@@ -124,7 +115,6 @@ const AuthFooterInner: React.FC<Props> = (props) => {
             type={'link'}
             target={'_blank'}
             rel={'noreferrer'}
-            ghost
             href={'https://www.ohmyform.com'}
             style={{
               color: '#FFF',
@@ -136,7 +126,6 @@ const AuthFooterInner: React.FC<Props> = (props) => {
             type={'link'}
             target={'_blank'}
             rel={'noreferrer'}
-            ghost
             href={'https://lokalise.com/'}
             style={{
               color: '#FFF',
diff --git a/components/form/admin/export.submission.action.tsx b/components/form/admin/export.submission.action.tsx
index 3c0e5c65..3a760300 100644
--- a/components/form/admin/export.submission.action.tsx
+++ b/components/form/admin/export.submission.action.tsx
@@ -1,5 +1,5 @@
 import { message } from 'antd'
-import ExcelJS from 'exceljs'
+import ExcelJS, { CellValue } from 'exceljs'
 import { useCallback, useState } from 'react'
 import { SubmissionFragment } from '../../../graphql/fragment/submission.fragment'
 import { useFormQuery } from '../../../graphql/query/form.query'
@@ -53,8 +53,8 @@ export const ExportSubmissionAction: React.FC<Props> = (props) => {
         start: 0,
       })
 
-      const buildRow = (data: SubmissionFragment): any[] => {
-        const row = [
+      const buildRow = (data: SubmissionFragment): CellValue[] => {
+        const row: CellValue[] = [
           data.id,
           data.created,
           data.lastModified,
@@ -66,8 +66,9 @@ export const ExportSubmissionAction: React.FC<Props> = (props) => {
 
         data.fields.forEach((field) => {
           try {
-            const decoded = JSON.parse(field.value)
-            row.push(decoded.value)
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            const decoded: { value: CellValue } = JSON.parse(field.value)
+            row.push(decoded.value || '')
           } catch (e) {
             row.push('')
           }
diff --git a/graphql/client.ts b/graphql/client.ts
index 08f276ec..3eb2f8f9 100644
--- a/graphql/client.ts
+++ b/graphql/client.ts
@@ -1,12 +1,13 @@
 import { ApolloClient, from, HttpLink, InMemoryCache } from '@apollo/client'
+import { NormalizedCacheObject } from '@apollo/client/cache/inmemory/types'
 import { setContext } from '@apollo/client/link/context'
 import 'isomorphic-fetch'
 import getConfig from 'next/config'
 import { NextConfigType } from '../next.config.type'
 
-let client: ApolloClient<any>
+let client: ApolloClient<NormalizedCacheObject>
 
-const getClient = (): ApolloClient<any> => {
+const getClient = (): ApolloClient<NormalizedCacheObject> => {
   if (!client) {
     const config = getConfig() as NextConfigType
 
@@ -14,7 +15,7 @@ const getClient = (): ApolloClient<any> => {
 
     const { publicRuntimeConfig, serverRuntimeConfig } = config
 
-    client = new ApolloClient({
+    client = new ApolloClient<NormalizedCacheObject>({
       cache: new InMemoryCache(),
       link: from([
         setContext((request, context) => {
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 9da045bc..ee2a7832 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -3,21 +3,14 @@ import 'antd/dist/antd.css'
 import 'assets/global.scss'
 import 'assets/variables.scss'
 import 'i18n'
-import { AppInitialProps } from 'next/app'
-import getConfig from 'next/config'
+import App, { AppInitialProps } from 'next/app'
 import { AppType } from 'next/dist/next-server/lib/utils'
 import Head from 'next/head'
 import React from 'react'
 import { wrapper } from 'store'
 import getClient from '../graphql/client'
 
-const { publicRuntimeConfig } = getConfig() as {
-  publicRuntimeConfig: {
-    endpoint: string
-  }
-}
-
-const App: AppType = ({ Component, pageProps }) => {
+const MyApp: AppType = ({ Component, pageProps }) => {
   return (
     <ApolloProvider client={getClient()}>
       <Head>
@@ -29,8 +22,6 @@ const App: AppType = ({ Component, pageProps }) => {
   )
 }
 
-App.getInitialProps = (): AppInitialProps => ({
-  pageProps: {},
-})
+MyApp.getInitialProps = (context): Promise<AppInitialProps> => App.getInitialProps(context as any)
 
-export default wrapper.withRedux(App)
+export default wrapper.withRedux(MyApp)
diff --git a/pages/form/[id]/index.tsx b/pages/form/[id]/index.tsx
index ceff7345..0a8ea31c 100644
--- a/pages/form/[id]/index.tsx
+++ b/pages/form/[id]/index.tsx
@@ -14,11 +14,7 @@ import { Omf } from '../../../components/omf'
 import { useSubmission } from '../../../components/use.submission'
 import { useFormPublicQuery } from '../../../graphql/query/form.public.query'
 
-interface Props {
-  id: string
-}
-
-const Index: NextPage<Props> = () => {
+const Index: NextPage = () => {
   const { t, i18n } = useTranslation()
   const router = useRouter()
   const id = router.query.id as string
@@ -67,6 +63,7 @@ const Index: NextPage<Props> = () => {
     direction: 'vertical',
     allowSlideNext: false,
     allowSlidePrev: true,
+    noSwiping: true,
     updateOnWindowResize: true,
   }
 
@@ -147,10 +144,4 @@ const Index: NextPage<Props> = () => {
   )
 }
 
-Index.getInitialProps = ({ query }) => {
-  return {
-    id: query.id as string,
-  }
-}
-
 export default Index