Merge branch '2543-poi-panel-scrollable-horizontally' of github.com:d…

…igitalfabrik/integreat-app into 2543-poi-panel-scrollable-horizontally

.circleci/config.yml

@@ -485,8 +485,10 @@ jobs:
                 command: yarn prettier:check
                 name: Prettier
             - run:
-                command: yarn lint
+                command: yarn lint:ci
                 name: Lint
+            - store_test_results:
+                path: reports/lint
             - run:
                 command: yarn workspace web stylelint
                 name: Stylelint

.circleci/src/jobs/check.yml

@@ -17,7 +17,9 @@ steps:
       command: yarn prettier:check
   - run:
       name: Lint
-      command: yarn lint
+      command: yarn lint:ci
+  - store_test_results:
+      path: reports/lint
   - run:
       name: Stylelint
       command: yarn workspace web stylelint

.eslintrc.js

@@ -28,21 +28,15 @@ module.exports = {
     'jest/globals': true,
   },
   ignorePatterns: [
-    '**/reports/',
-    '**/node_modules/',
-    '**/ios/',
-    '**/stylelint.config.js',
-    '**/stylelint.config_css.js',
-    '**/dist/',
-    '**/lib-dist/',
-    '.eslintrc.js',
-    '**/babel.config.js',
-    '**/react-native.config.js',
-    '**/www/iframe.js',
-    '**/www/rasa-widget/chatbot.js',
-    '**/www/plugins/mapbox-gl-rtl-text-0.2.3.min.js',
-    '**/integreat-e2e/assets/**', //symlink
-    '**/integreat-test-cms/assets/**', //symlink
+    'reports/',
+    'node_modules/',
+    'ios/',
+    'android/',
+    'dist/',
+    '/.eslintrc.js',
+    '/web/www/',
+    '/build-configs/integreat-e2e/assets/', //symlink
+    '/build-configs/integreat-test-cms/assets/', //symlink
   ],
   rules: {
     // Overly strict rules (for now)
@@ -56,7 +50,9 @@ module.exports = {
     // Unwanted
     'lines-between-class-members': 'off',
     'import/extensions': 'off',
+    'import/named': 'off',
     'import/prefer-default-export': 'off',
+    'import/no-named-as-default-member': 'off',
     'react/require-default-props': 'off',
     'react/sort-comp': 'off',
     'jest/expect-expect': 'off',
@@ -157,14 +153,20 @@ module.exports = {
       },
     },
     {
-      files: ['**/native/**'],
+      files: ['e2e-tests/**/*.conf.ts'],
+      rules: {
+        'no-magic-numbers': 'off',
+      },
+    },
+    {
+      files: ['native/**'],
       rules: {
         // This rule does not make sense in react native as we don't have normal anchor tags
         'jsx-a11y/anchor-is-valid': 'off',
       },
     },
     {
-      files: ['**/tools/**', '**/translations/**', '**/e2e-tests/**'],
+      files: ['**/tools/**', 'translations/**', 'e2e-tests/**', 'metro.config.js'],
       rules: {
         'no-console': 'off',
         'import/no-extraneous-dependencies': 'off',
@@ -174,11 +176,13 @@ module.exports = {
       files: ['tools/**', 'e2e-tests/**'],
       plugins: ['unicorn'],
       rules: {
+        // esm specific rules
         'import/no-commonjs': 'error',
         'unicorn/prefer-node-protocol': 'error',
       },
     },
   ],
+  reportUnusedDisableDirectives: true,
   settings: {
     react: {
       version: 'detect',

api-client/package.json

@@ -8,10 +8,7 @@
     "test": "jest",
     "test:changed": "yarn run test -o",
     "test:watch": "yarn run test --watchAll",
-    "lint": "yarn run eslint .",
-    "lint:changed": "eslint . -c ../.eslintrc_changed.js",
-    "lint:fix": "yarn run eslint --fix",
-    "lint:ci": "yarn run eslint --quiet --format junit -o reports/lint/junit-lint.xml",
+    "lint": "eslint --cache --cache-location ../.eslintcache .",
     "ts:check": "tsc --build"
   },
   "peerDependencies": {

api-client/src/models/EventModel.ts

@@ -65,6 +65,7 @@ class EventModel extends ExtendedPageModel {
     body.push(
       `DESCRIPTION:${getExcerpt(excerpt, {
         query: undefined,
+
         maxChars: 150,
         replaceLineBreaks: false,
       })}\\n\\n${url}`,

api-client/src/models/PoiModel.ts

@@ -118,7 +118,6 @@ class PoiModel extends ExtendedPageModel {
     return (
       this._category ??
       new PoiCategoryModel({
-        // eslint-disable-next-line no-magic-numbers
         id: 12,
         name: 'Others',
         color: '#2E98FB',

api-client/src/types.ts

@@ -1,4 +1,3 @@
-/* eslint-disable camelcase */
 export type JsonAvailableLanguagesType = Record<
   string,
   {

api-client/tsconfig.json

@@ -4,7 +4,8 @@
     "composite": true,
     "lib": ["ES5", "ES6", "dom"],
     "outDir": "dist",
-    "types": ["jest"]
+    "types": ["jest", "node"],
+    "typeRoots": ["src/@types", "node_modules/@types", "../node_modules/@types"]
   },
-  "include": ["src/**/*", "jest.config.ts", "jest.setup.ts"]
+  "include": ["jest.config.ts", "jest.setup.ts", "src/**/*"]
 }

build-configs/package.json

@@ -16,9 +16,6 @@
   "scripts": {
     "manage": "ts-node tools/manage.ts",
     "ts:check": "tsc --build",
-    "lint": "yarn run eslint .",
-    "lint:changed": "eslint . -c ../.eslintrc_changed.js",
-    "lint:fix": "yarn run eslint --fix",
-    "lint:ci": "yarn run eslint --quiet --format junit -o reports/lint/junit-lint.xml"
+    "lint": "eslint --cache --cache-location ../.eslintcache ."
   }
 }

e2e-tests/native/capabilities.ts

@@ -19,6 +19,7 @@ const browserstackCaps = (
       debug: true,
       realMobile: isCi,
       appiumVersion: '2.0.0',
+
       idleTimeout: 10000,
     },
     ...config,
@@ -39,6 +40,7 @@ export default {
     {
       'appium:platformVersion': '16',
       'appium:deviceName': 'iPhone 14',
+
       'appium:waitForIdleTimeout': 10000,
     },
     'ios',

e2e-tests/package.json

@@ -12,7 +12,7 @@
     "prepare:native:android": "yarn workspace native android:integreat-e2e",
     "prepare:native:start": "yarn workspace native start:integreat-e2e",
     "prepare:web:start": "yarn workspace web start:integreat-e2e",
-    "lint": "yarn eslint ./",
+    "lint": "eslint --cache --cache-location ../.eslintcache .",
     "ts:check": "tsc --build"
   },
   "devDependencies": {

native/jest.setup.ts

@@ -17,7 +17,6 @@ jest.mock('react-native-permissions', () => require('react-native-permissions/mo
 require('react-native-gesture-handler/jestSetup')
 
 jest.mock('react-native-reanimated', () => {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
   const Reanimated = require('react-native-reanimated/mock')
 
   Reanimated.default.call = () => undefined
@@ -59,7 +58,6 @@ jest.doMock('path', () => path.posix)
 
 // See https://github.com/callstack/react-native-testing-library/issues/329#issuecomment-737307473
 jest.mock('react-native/Libraries/Components/Switch/Switch', () => {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
   const mockComponent = require('react-native/jest/mockComponent')
 
   return mockComponent('react-native/Libraries/Components/Switch/Switch')

native/metro.config.js

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable @typescript-eslint/no-var-requires */
 const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config')
 const path = require('path')

native/package.json

@@ -34,10 +34,7 @@
     "test": "jest",
     "test:changed": "yarn run test -o",
     "test:e2e": "yarn workspace e2e test:native:browserstack",
-    "lint": "yarn run eslint",
-    "lint:changed": "eslint . -c ../.eslintrc_changed.js",
-    "lint:ci": "yarn run eslint --quiet --format junit -o reports/lint/junit-lint.xml",
-    "eslint": "eslint .",
+    "lint": "eslint --cache --cache-location ../.eslintcache .",
     "license-crawler": "npm-license-crawler -onlyDirectDependencies -json ./src/assets/licenses.json",
     "postinstall": "patch-package && yarn license-crawler",
     "ts:check": "tsc --build",

native/src/@types/styled.d.ts

@@ -3,6 +3,6 @@ import 'styled-components'
 import { ThemeType } from 'build-configs/ThemeType'
 
 declare module 'styled-components' {
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface,@typescript-eslint/consistent-type-definitions
+  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
   export interface DefaultTheme extends ThemeType {}
 }

native/src/components/List.tsx

@@ -42,6 +42,7 @@ const List = <T,>({
     showsVerticalScrollIndicator={false}
     contentContainerStyle={{
       flexGrow: 1,
+
       paddingHorizontal: 10,
     }}
     onEndReachedThreshold={1}

native/src/components/RemoteContent.tsx

@@ -117,6 +117,7 @@ const RemoteContent = (props: RemoteContentProps): ReactElement | null => {
       setSupportMultipleWindows={false}
       style={{
         height: webViewHeight,
+
         opacity: 0.99, // fixes crashing in Android https://github.com/react-native-webview/react-native-webview/issues/811
       }}
     />

native/src/components/__tests__/FeedbackContainer.spec.tsx

@@ -14,7 +14,9 @@ import render from '../../testing/render'
 import sendTrackingSignal from '../../utils/sendTrackingSignal'
 import FeedbackContainer from '../FeedbackContainer'
 
-const mockRequest = jest.fn(() => Promise.resolve())
+const mockRequest = jest.fn(() => {
+  /* ignore */
+})
 jest.mock('styled-components')
 jest.mock('react-i18next')
 jest.mock('../../utils/sendTrackingSignal')
@@ -41,7 +43,7 @@ describe('FeedbackContainer', () => {
     )
     const positiveRatingButton = getByText('useful')
     fireEvent.press(positiveRatingButton)
-    expect(await findByText('send')).not.toBeDisabled()
+    expect(getByText('send')).not.toBeDisabled()
     const submitButton = getByText('send')
     fireEvent.press(submitButton)
     expect(await findByText('thanksMessage')).toBeDefined()
@@ -72,7 +74,6 @@ describe('FeedbackContainer', () => {
     const contactMail = 'test@example.com'
     const { getByText, findByText, getAllByDisplayValue } = render(
       <NavigationContainer>
-        {' '}
         <FeedbackContainer routeType={CATEGORIES_ROUTE} isSearchFeedback={false} language={language} cityCode={city} />
       </NavigationContainer>,
     )

native/src/hooks/useUserLocation.ts

@@ -54,7 +54,9 @@ const useUserLocation = (useSettingsListener = false): LocationInformationType =
       },
       {
         enableHighAccuracy: true,
+
         timeout: 50000,
+
         maximumAge: 3600000,
       },
     )

native/src/routes/Intro.tsx

@@ -148,6 +148,7 @@ const Intro = ({ route, navigation }: IntroProps): ReactElement => {
         pagingEnabled
         viewabilityConfig={{
           itemVisiblePercentThreshold: 51,
+
           minimumViewTime: 0.1,
         }}
         onViewableItemsChanged={onViewableItemsChanged}

native/src/routes/JpalTracking.tsx

@@ -1,7 +1,7 @@
 import { NavigationAction } from '@react-navigation/native'
 import React, { ReactElement, useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Alert, Text, View } from 'react-native'
+import { Alert, Text } from 'react-native'
 import styled from 'styled-components/native'
 
 import { JpalTrackingRouteType } from 'api-client'
@@ -34,6 +34,10 @@ const DescriptionContainer = styled(Pressable)`
   padding: 15px 0 5px;
 `
 
+const PaddedContainer = styled.View`
+  padding: 40px;
+`
+
 export type JpalTrackingProps = {
   navigation: NavigationProps<JpalTrackingRouteType>
 }
@@ -107,10 +111,7 @@ const JpalTracking = ({ navigation }: JpalTrackingProps): ReactElement => {
 
   return (
     <Layout>
-      <View
-        style={{
-          padding: 40,
-        }}>
+      <PaddedContainer>
         <Caption title={t('tracking')} />
         <Text>{t('trackingDescription', { appName: buildConfig().appName })}</Text>
 
@@ -120,7 +121,7 @@ const JpalTracking = ({ navigation }: JpalTrackingProps): ReactElement => {
         </DescriptionContainer>
 
         <Link url={moreInformationUrl} text={t('trackingMoreInformation')} />
-      </View>
+      </PaddedContainer>
     </Layout>
   )
 }

native/src/utils/DatabaseConnector.ts

@@ -1,4 +1,3 @@
-/* eslint-disable camelcase */
 import { BBox } from 'geojson'
 import { map, mapValues } from 'lodash'
 import { DateTime } from 'luxon'

native/tsconfig.json

@@ -21,15 +21,13 @@
   "include": [
     "src/**/*",
     "jest.setup.ts",
+    "src/assets/licenses.json",
     "index.ts",
     "jest.config.ts",
     "babel.config.js",
-    "metro.config.ci.js",
-    "metro.config.js",
-    ".yarn/plugins/root-command.js",
     "react-native.config.js",
-    "run.js",
-    "src/assets/licenses.json"
+    "metro.config.ci.js",
+    "metro.config.js"
   ],
   "references": [
     {

package.json

@@ -22,11 +22,11 @@
   },
   "scripts": {
     "prepare": "husky install",
-    "lint": "yarn run eslint",
-    "lint:changed": "eslint . -c .eslintrc_changed.js",
-    "test": "yarn jest",
-    "test:changed": "yarn jest -o",
-    "test:ci": "yarn test --coverage --ci",
+    "lint": "eslint --cache --cache-location .eslintcache .",
+    "lint:ci": "yarn node --max-old-space-size=1535 $(yarn bin eslint) --format junit -o reports/lint/junit-lint.xml .",
+    "test": "jest",
+    "test:changed": "jest -o",
+    "test:ci": "jest --coverage --ci",
     "circleci:update-config": "{ cat .circleci/autogenerated_header.yml; circleci config pack .circleci/src; } > .circleci/config.yml && circleci config validate",
     "prettier:check": "prettier --check .",
     "prettier:write": "prettier --write .",
@@ -49,7 +49,6 @@
     "eslint": "8.48.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-diff": "^2.0.1",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jest": "^27.2.3",
     "eslint-plugin-jsx-a11y": "^6.7.1",

translations/package.json

@@ -13,9 +13,7 @@
     "import:ods:override-malte": "./tools/ods-to-csv malte-ods malte-csv && yarn manage convert malte-csv override-translations/malte.json json&& rm -rf malte-csv ",
     "import:ods:override-aschaffenburg": "./tools/ods-to-csv aschaffenburg-ods aschaffenburg-csv && yarn manage convert aschaffenburg-csv override-translations/aschaffenburg.json json && rm -rf aschaffenburg-csv",
     "test": "jest --config jest.config.ts",
-    "lint": "yarn run eslint .",
-    "lint:fix": "yarn run eslint --fix",
-    "lint:ci": "yarn run eslint --quiet --format junit -o reports/lint/junit-lint.xml",
+    "lint": "eslint --cache --cache-location ../.eslintcache .",
     "ts:check": "tsc --build"
   },
   "dependencies": {},

translations/src/__mocks__/loadTranslations.ts

@@ -34,7 +34,7 @@ export const testTranslations: TranslationsType = {
     },
   },
 }
-// eslint-disable-next-line no-unused-vars
+
 export const testOverrideTranslations: TranslationsType = {
   dashboard: {
     de: {