diff --git a/gradle/changelog/enforce_eslint.yaml b/gradle/changelog/enforce_eslint.yaml
new file mode 100644
index 0000000000..5c97e197d0
--- /dev/null
+++ b/gradle/changelog/enforce_eslint.yaml
@@ -0,0 +1,2 @@
+- type: changed
+  description: Enforce eslint to ensure accessible html ([#1878](https://github.com/scm-manager/scm-manager/pull/1878))
diff --git a/package.json b/package.json
index ae6378a4ab..5d8b6d1a37 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "test": "lerna run --scope '@scm-manager/ui-*' test",
     "e2e-tests": "lerna run --scope '@scm-manager/e2e-tests' ci",
     "typecheck": "lerna run --scope '@scm-manager/ui-*' typecheck",
+    "lint": "lerna run --scope '@scm-manager/ui-*' lint",
     "serve": "ui-scripts serve development",
     "deploy": "ui-scripts publish",
     "set-version": "ui-scripts version"
diff --git a/scm-ui/build.gradle b/scm-ui/build.gradle
index 3424b96efe..3298ad0bb3 100644
--- a/scm-ui/build.gradle
+++ b/scm-ui/build.gradle
@@ -55,6 +55,26 @@ task typecheck(type: YarnTask) {
   }
 }
 
+task lint(type: YarnTask) {
+  args = ['lint']
+  inputs.files(fileTree(project.projectDir) {
+    include 'ui-*/src/**'
+    include 'ui-*/**/*.js'
+    include 'ui-*/**/*.jsx'
+    include 'ui-*/**/*.ts'
+    include 'ui-*/**/*.tsx'
+  })
+    .withPathSensitivity(PathSensitivity.RELATIVE)
+  outputs.file('build/tmp/lint/marker')
+  dependsOn('yarn_install')
+  doLast {
+    File directory = new File(project.buildDir, 'tmp/lint')
+    directory.mkdirs()
+    File marker = new File(directory, 'marker')
+    marker.createNewFile()
+  }
+}
+
 task test(type: YarnTask) {
   args = ['run', 'test']
   inputs.files(fileTree(project.projectDir) {
@@ -103,7 +123,7 @@ task updateUiTestTimestamps(type: TouchFiles) {
 }
 
 task check {
-  dependsOn('typecheck', 'test', 'chromatic', 'checkLicenses')
+  dependsOn('typecheck', 'test', 'chromatic', 'checkLicenses', 'lint')
 }
 
 yarn_install {
diff --git a/scm-ui/ui-api/src/import.ts b/scm-ui/ui-api/src/import.ts
index b0cd8f4589..373e203523 100644
--- a/scm-ui/ui-api/src/import.ts
+++ b/scm-ui/ui-api/src/import.ts
@@ -30,12 +30,12 @@ import { requiredLink } from "./links";
 
 export const useImportLog = (logId: string): ApiResult<string> => {
   const link = useRequiredIndexLink("importLog").replace("{logId}", logId);
-  return useQuery<string, Error>(["importLog", logId], () => apiClient.get(link).then((response) => response.text()));
+  return useQuery<string, Error>(["importLog", logId], () => apiClient.get(link).then(response => response.text()));
 };
 
 export const useImportRepositoryFromUrl = (repositoryType: RepositoryType) => {
   const url = requiredLink(repositoryType, "import", "url");
-  const { isLoading, error, data, mutate } = useMutation<Repository, Error, RepositoryUrlImport>((repo) =>
+  const { isLoading, error, data, mutate } = useMutation<Repository, Error, RepositoryUrlImport>(repo =>
     apiClient
       .post(url, repo, "application/vnd.scmm-repository+json;v=2")
       .then(fetchResourceFromLocationHeader)
@@ -46,14 +46,14 @@ export const useImportRepositoryFromUrl = (repositoryType: RepositoryType) => {
     isLoading,
     error,
     importRepositoryFromUrl: (repository: RepositoryUrlImport) => mutate(repository),
-    importedRepository: data,
+    importedRepository: data
   };
 };
 
 const importRepository = (url: string, repository: RepositoryCreation, file: File, password?: string) => {
   return apiClient
-    .postBinary(url, (formData) => {
-      formData.append("bundle", file, file?.name);
+    .postBinary(url, formData => {
+      formData.append("bundle", file, file.name);
       formData.append("repository", JSON.stringify({ ...repository, password }));
     })
     .then(fetchResourceFromLocationHeader)
@@ -82,9 +82,9 @@ export const useImportRepositoryFromBundle = (repositoryType: RepositoryType) =>
         repository,
         file,
         compressed,
-        password,
+        password
       }),
-    importedRepository: data,
+    importedRepository: data
   };
 };
 
@@ -107,8 +107,8 @@ export const useImportFullRepository = (repositoryType: RepositoryType) => {
       mutate({
         repository,
         file,
-        password,
+        password
       }),
-    importedRepository: data,
+    importedRepository: data
   };
 };
diff --git a/scm-ui/ui-api/src/repositories.test.ts b/scm-ui/ui-api/src/repositories.test.ts
index 98ab014a33..95ffc733c7 100644
--- a/scm-ui/ui-api/src/repositories.test.ts
+++ b/scm-ui/ui-api/src/repositories.test.ts
@@ -37,7 +37,7 @@ import {
   useRepository,
   useRepositoryTypes,
   useUnarchiveRepository,
-  useUpdateRepository,
+  useUpdateRepository
 } from "./repositories";
 import { Repository } from "@scm-manager/ui-types";
 import { QueryClient } from "react-query";
@@ -50,25 +50,25 @@ describe("Test repository hooks", () => {
     type: "git",
     _links: {
       delete: {
-        href: "/r/spaceships/heartOfGold",
+        href: "/r/spaceships/heartOfGold"
       },
       update: {
-        href: "/r/spaceships/heartOfGold",
+        href: "/r/spaceships/heartOfGold"
       },
       archive: {
-        href: "/r/spaceships/heartOfGold/archive",
+        href: "/r/spaceships/heartOfGold/archive"
       },
       unarchive: {
-        href: "/r/spaceships/heartOfGold/unarchive",
-      },
-    },
+        href: "/r/spaceships/heartOfGold/unarchive"
+      }
+    }
   };
 
   const repositoryCollection = {
     _embedded: {
-      repositories: [heartOfGold],
+      repositories: [heartOfGold]
     },
-    _links: {},
+    _links: {}
   };
 
   afterEach(() => {
@@ -78,7 +78,7 @@ describe("Test repository hooks", () => {
   describe("useRepositories tests", () => {
     const expectCollection = async (queryClient: QueryClient, request?: UseRepositoriesRequest) => {
       const { result, waitFor } = renderHook(() => useRepositories(request), {
-        wrapper: createWrapper(undefined, queryClient),
+        wrapper: createWrapper(undefined, queryClient)
       });
       await waitFor(() => {
         return !!result.current.data;
@@ -91,8 +91,8 @@ describe("Test repository hooks", () => {
       setIndexLink(queryClient, "repositories", "/repos");
       fetchMock.get("/api/v2/repos", repositoryCollection, {
         query: {
-          sortBy: "namespaceAndName",
-        },
+          sortBy: "namespaceAndName"
+        }
       });
 
       await expectCollection(queryClient);
@@ -104,12 +104,12 @@ describe("Test repository hooks", () => {
       fetchMock.get("/api/v2/repos", repositoryCollection, {
         query: {
           sortBy: "namespaceAndName",
-          page: "42",
-        },
+          page: "42"
+        }
       });
 
       await expectCollection(queryClient, {
-        page: 42,
+        page: 42
       });
     });
 
@@ -118,8 +118,8 @@ describe("Test repository hooks", () => {
       setIndexLink(queryClient, "repositories", "/repos");
       fetchMock.get("/api/v2/spaceships", repositoryCollection, {
         query: {
-          sortBy: "namespaceAndName",
-        },
+          sortBy: "namespaceAndName"
+        }
       });
 
       await expectCollection(queryClient, {
@@ -127,10 +127,10 @@ describe("Test repository hooks", () => {
           namespace: "spaceships",
           _links: {
             repositories: {
-              href: "/spaceships",
-            },
-          },
-        },
+              href: "/spaceships"
+            }
+          }
+        }
       });
     });
 
@@ -140,12 +140,12 @@ describe("Test repository hooks", () => {
       fetchMock.get("/api/v2/repos", repositoryCollection, {
         query: {
           sortBy: "namespaceAndName",
-          q: "heart",
-        },
+          q: "heart"
+        }
       });
 
       await expectCollection(queryClient, {
-        search: "heart",
+        search: "heart"
       });
     });
 
@@ -154,8 +154,8 @@ describe("Test repository hooks", () => {
       setIndexLink(queryClient, "repositories", "/repos");
       fetchMock.get("/api/v2/repos", repositoryCollection, {
         query: {
-          sortBy: "namespaceAndName",
-        },
+          sortBy: "namespaceAndName"
+        }
       });
 
       await expectCollection(queryClient);
@@ -168,7 +168,7 @@ describe("Test repository hooks", () => {
       const queryClient = createInfiniteCachingClient();
       setIndexLink(queryClient, "repositories", "/repos");
       const { result } = renderHook(() => useRepositories({ disabled: true }), {
-        wrapper: createWrapper(undefined, queryClient),
+        wrapper: createWrapper(undefined, queryClient)
       });
 
       expect(result.current.isLoading).toBe(false);
@@ -185,19 +185,18 @@ describe("Test repository hooks", () => {
       fetchMock.postOnce("/api/v2/r", {
         status: 201,
         headers: {
-          Location: "/r/spaceships/heartOfGold",
-        },
+          Location: "/r/spaceships/heartOfGold"
+        }
       });
 
       fetchMock.getOnce("/api/v2/r/spaceships/heartOfGold", heartOfGold);
 
       const { result, waitForNextUpdate } = renderHook(() => useCreateRepository(), {
-        wrapper: createWrapper(undefined, queryClient),
+        wrapper: createWrapper(undefined, queryClient)
       });
 
       const repository = {
-        ...heartOfGold,
-        contextEntries: [],
+        ...heartOfGold
       };
 
       await act(() => {
@@ -216,19 +215,18 @@ describe("Test repository hooks", () => {
       fetchMock.postOnce("/api/v2/r?initialize=true", {
         status: 201,
         headers: {
-          Location: "/r/spaceships/heartOfGold",
-        },
+          Location: "/r/spaceships/heartOfGold"
+        }
       });
 
       fetchMock.getOnce("/api/v2/r/spaceships/heartOfGold", heartOfGold);
 
       const { result, waitForNextUpdate } = renderHook(() => useCreateRepository(), {
-        wrapper: createWrapper(undefined, queryClient),
+        wrapper: createWrapper(undefined, queryClient)
       });
 
       const repository = {
-        ...heartOfGold,
-        contextEntries: [],
+        ...heartOfGold
       };
 
       await act(() => {
@@ -245,16 +243,15 @@ describe("Test repository hooks", () => {
       setIndexLink(queryClient, "repositories", "/r");
 
       fetchMock.postOnce("/api/v2/r", {
-        status: 201,
+        status: 201
       });
 
       const { result, waitForNextUpdate } = renderHook(() => useCreateRepository(), {
-        wrapper: createWrapper(undefined, queryClient),
+        wrapper: createWrapper(undefined, queryClient)
       });
 
       const repository = {
-        ...heartOfGold,
-        contextEntries: [],
+        ...heartOfGold
       };
 
       await act(() => {
@@ -274,7 +271,7 @@ describe("Test repository hooks", () => {
       fetchMock.get("/api/v2/r/spaceships/heartOfGold", heartOfGold);
 
       const { result, waitFor } = renderHook(() => useRepository("spaceships", "heartOfGold"), {
-        wrapper: createWrapper(undefined, queryClient),
+        wrapper: createWrapper(undefined, queryClient)
       });
       await waitFor(() => {
         return !!result.current.data;
@@ -293,15 +290,15 @@ describe("Test repository hooks", () => {
             {
               name: "git",
               displayName: "Git",
-              _links: {},
-            },
-          ],
+              _links: {}
+            }
+          ]
         },
-        _links: {},
+        _links: {}
       });
 
       const { result, waitFor } = renderHook(() => useRepositoryTypes(), {
-        wrapper: createWrapper(undefined, queryClient),
+        wrapper: createWrapper(undefined, queryClient)
       });
       await waitFor(() => {
         return !!result.current.data;
@@ -322,11 +319,11 @@ describe("Test repository hooks", () => {
 
     const deleteRepository = async (options?: UseDeleteRepositoryOptions) => {
       fetchMock.deleteOnce("/api/v2/r/spaceships/heartOfGold", {
-        status: 204,
+        status: 204
       });
 
       const { result, waitForNextUpdate } = renderHook(() => useDeleteRepository(options), {
-        wrapper: createWrapper(undefined, queryClient),
+        wrapper: createWrapper(undefined, queryClient)
       });
 
       await act(() => {
@@ -371,9 +368,9 @@ describe("Test repository hooks", () => {
     it("should call onSuccess callback", async () => {
       let repo;
       await deleteRepository({
-        onSuccess: (repository) => {
+        onSuccess: repository => {
           repo = repository;
-        },
+        }
       });
       expect(repo).toEqual(heartOfGold);
     });
@@ -388,11 +385,11 @@ describe("Test repository hooks", () => {
 
     const updateRepository = async () => {
       fetchMock.putOnce("/api/v2/r/spaceships/heartOfGold", {
-        status: 204,
+        status: 204
       });
 
       const { result, waitForNextUpdate } = renderHook(() => useUpdateRepository(), {
-        wrapper: createWrapper(undefined, queryClient),
+        wrapper: createWrapper(undefined, queryClient)
       });
 
       await act(() => {
@@ -436,11 +433,11 @@ describe("Test repository hooks", () => {
 
     const archiveRepository = async () => {
       fetchMock.postOnce("/api/v2/r/spaceships/heartOfGold/archive", {
-        status: 204,
+        status: 204
       });
 
       const { result, waitForNextUpdate } = renderHook(() => useArchiveRepository(), {
-        wrapper: createWrapper(undefined, queryClient),
+        wrapper: createWrapper(undefined, queryClient)
       });
 
       await act(() => {
@@ -484,11 +481,11 @@ describe("Test repository hooks", () => {
 
     const unarchiveRepository = async () => {
       fetchMock.postOnce("/api/v2/r/spaceships/heartOfGold/unarchive", {
-        status: 204,
+        status: 204
       });
 
       const { result, waitForNextUpdate } = renderHook(() => useUnarchiveRepository(), {
-        wrapper: createWrapper(undefined, queryClient),
+        wrapper: createWrapper(undefined, queryClient)
       });
 
       await act(() => {
diff --git a/scm-ui/ui-components/src/ErrorBoundary.tsx b/scm-ui/ui-components/src/ErrorBoundary.tsx
index 2550a3262b..54756fc6fb 100644
--- a/scm-ui/ui-components/src/ErrorBoundary.tsx
+++ b/scm-ui/ui-components/src/ErrorBoundary.tsx
@@ -113,7 +113,7 @@ const ErrorDisplay: FC<ErrorDisplayProps> = ({ error, errorInfo, fallback: Fallb
 
   const fallbackProps = {
     error,
-    errorInfo,
+    errorInfo
   };
 
   return <FallbackComponent {...fallbackProps} />;
@@ -135,7 +135,7 @@ class ErrorBoundary extends React.Component<Props, State> {
   componentDidCatch(error: Error, errorInfo: ErrorInfo) {
     this.setState({
       error,
-      errorInfo,
+      errorInfo
     });
   }
 
diff --git a/scm-ui/ui-components/src/forms/InputField.tsx b/scm-ui/ui-components/src/forms/InputField.tsx
index b2e0d21c00..dfc7e5fda7 100644
--- a/scm-ui/ui-components/src/forms/InputField.tsx
+++ b/scm-ui/ui-components/src/forms/InputField.tsx
@@ -33,7 +33,7 @@ type BaseProps = {
   label?: string;
   name?: string;
   placeholder?: string;
-  value?: string;
+  value?: string | number;
   type?: string;
   autofocus?: boolean;
   onReturnPressed?: () => void;
@@ -44,7 +44,7 @@ type BaseProps = {
   helpText?: string;
   className?: string;
   testId?: string;
-  defaultValue?: string;
+  defaultValue?: string | number;
   readOnly?: boolean;
 };
 
diff --git a/scm-ui/ui-components/src/navigation/RoutingProps.ts b/scm-ui/ui-components/src/navigation/RoutingProps.ts
index 20f9d8d900..3ba7f4efcc 100644
--- a/scm-ui/ui-components/src/navigation/RoutingProps.ts
+++ b/scm-ui/ui-components/src/navigation/RoutingProps.ts
@@ -22,8 +22,10 @@
  * SOFTWARE.
  */
 
+import { RouteProps } from "react-router-dom";
+
 export type RoutingProps = {
   to: string;
   activeOnlyWhenExact?: boolean;
-  activeWhenMatch?: (route: any) => boolean;
+  activeWhenMatch?: (route: RouteProps) => boolean;
 };
diff --git a/scm-ui/ui-components/src/navigation/SecondaryNavigation.stories.tsx b/scm-ui/ui-components/src/navigation/SecondaryNavigation.stories.tsx
index 1efe03142b..d623eb9c76 100644
--- a/scm-ui/ui-components/src/navigation/SecondaryNavigation.stories.tsx
+++ b/scm-ui/ui-components/src/navigation/SecondaryNavigation.stories.tsx
@@ -53,8 +53,8 @@ const withRoute = (route: string) => {
 };
 
 storiesOf("Secondary Navigation", module)
-  .addDecorator((story) => <StateMenuContextProvider>{story()}</StateMenuContextProvider>)
-  .addDecorator((story) => (
+  .addDecorator(story => <StateMenuContextProvider>{story()}</StateMenuContextProvider>)
+  .addDecorator(story => (
     <Columns className="columns">
       <div className="column is-3">{story()}</div>
     </Columns>
@@ -92,7 +92,7 @@ storiesOf("Secondary Navigation", module)
       <SecondaryNavigation label="Hitchhiker">
         <SecondaryNavigationItem to="/42" icon="fas fa-puzzle-piece" label="Puzzle 42" title="Puzzle 42" />
         <SecondaryNavigationItem
-          activeWhenMatch={(route) => route.location.pathname === "/hog"}
+          activeWhenMatch={route => route.location?.pathname === "/hog"}
           to="/heart-of-gold"
           icon="fas fa-star"
           label="Heart Of Gold"
diff --git a/scm-ui/ui-tests/i18n.ts b/scm-ui/ui-tests/i18n.ts
index 2588bc6d9b..2032c75cde 100644
--- a/scm-ui/ui-tests/i18n.ts
+++ b/scm-ui/ui-tests/i18n.ts
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-jest.mock("react-i18next", () => ({
+export const jestMock = jest.mock("react-i18next", () => ({
   // this mock makes sure any components using the translate HoC receive the t function as a prop
   withTranslation: () => (Component: any) => {
     Component.defaultProps = {
@@ -32,8 +32,6 @@ jest.mock("react-i18next", () => ({
     return Component;
   },
   useTranslation: (ns: string) => {
-    return [
-      (key: string) => key
-    ];
+    return [(key: string) => key];
   }
 }));
diff --git a/scm-ui/ui-tests/index.ts b/scm-ui/ui-tests/index.ts
new file mode 100644
index 0000000000..08403a19cb
--- /dev/null
+++ b/scm-ui/ui-tests/index.ts
@@ -0,0 +1,27 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+export * from "./enzyme";
+export * from "./enzyme-router";
+export * from "./i18n";
diff --git a/scm-ui/ui-types/src/General.ts b/scm-ui/ui-types/src/General.ts
new file mode 100644
index 0000000000..9b72b56d1d
--- /dev/null
+++ b/scm-ui/ui-types/src/General.ts
@@ -0,0 +1,32 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import { Config } from "./Config";
+import { HalRepresentation } from "./hal";
+
+export type ConfigChangeHandler = <Name extends Exclude<keyof Config, keyof HalRepresentation>>(
+  isValid: boolean,
+  changedValue: Config[Name],
+  name: Name
+) => void;
diff --git a/scm-ui/ui-types/src/Repositories.ts b/scm-ui/ui-types/src/Repositories.ts
index 4f5fab167c..4f3dd48c87 100644
--- a/scm-ui/ui-types/src/Repositories.ts
+++ b/scm-ui/ui-types/src/Repositories.ts
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { PagedCollection, Links, HalRepresentation } from "./hal";
+import { HalRepresentation, Links, PagedCollection } from "./hal";
 
 export type NamespaceAndName = {
   namespace: string;
@@ -53,7 +53,7 @@ export type Repository = HalRepresentation &
   };
 
 export type RepositoryCreation = RepositoryBase & {
-  contextEntries: { [key: string]: any };
+  contextEntries?: { [key: string]: object | undefined };
 };
 
 export type RepositoryUrlImport = RepositoryCreation & {
diff --git a/scm-ui/ui-types/src/index.ts b/scm-ui/ui-types/src/index.ts
index 8d6d1e13bf..535aaab5a1 100644
--- a/scm-ui/ui-types/src/index.ts
+++ b/scm-ui/ui-types/src/index.ts
@@ -71,3 +71,4 @@ export * from "./ApiKeys";
 export * from "./PublicKeys";
 export * from "./GlobalPermissions";
 export * from "./Search";
+export * from "./General";
diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json
index 332161424a..1e2b303c28 100644
--- a/scm-ui/ui-webapp/package.json
+++ b/scm-ui/ui-webapp/package.json
@@ -25,7 +25,8 @@
     "systemjs": "0.21.6"
   },
   "scripts": {
-    "test": "jest"
+    "test": "jest",
+    "lint": "eslint src"
   },
   "devDependencies": {
     "@scm-manager/jest-preset": "^2.13.0",
diff --git a/scm-ui/ui-webapp/src/LegacyReduxProvider.tsx b/scm-ui/ui-webapp/src/LegacyReduxProvider.tsx
index 229548485c..8c1ffe5ba4 100644
--- a/scm-ui/ui-webapp/src/LegacyReduxProvider.tsx
+++ b/scm-ui/ui-webapp/src/LegacyReduxProvider.tsx
@@ -65,16 +65,16 @@ const reducer = (state: State = initialState, action: ActionTypes = { type: ACTI
         ...state,
         indexResources: {
           version: action.payload.version,
-          links: action.payload._links,
-        },
+          links: action.payload._links
+        }
       };
     }
     case "scm/me_success": {
       return {
         ...state,
         auth: {
-          me: action.payload,
-        },
+          me: action.payload
+        }
       };
     }
     default: {
@@ -90,14 +90,14 @@ const store = createStore(reducer, initialState);
 export const fetchIndexResourcesSuccess = (index: IndexResources): ActionTypes => {
   return {
     type: ACTION_TYPE_INDEX,
-    payload: index,
+    payload: index
   };
 };
 
 export const fetchMeSuccess = (me: Me): ActionTypes => {
   return {
     type: ACTION_TYPE_ME,
-    payload: me,
+    payload: me
   };
 };
 
diff --git a/scm-ui/ui-webapp/src/ReduxAwareApiProvider.tsx b/scm-ui/ui-webapp/src/ReduxAwareApiProvider.tsx
index 671865fc2c..9fc61e2038 100644
--- a/scm-ui/ui-webapp/src/ReduxAwareApiProvider.tsx
+++ b/scm-ui/ui-webapp/src/ReduxAwareApiProvider.tsx
@@ -40,9 +40,10 @@ const mapDispatchToProps = (dispatch: Dispatch<ActionTypes>) => {
     },
     onMeFetched: (me: Me) => {
       dispatch(fetchMeSuccess(me));
-    },
+    }
   };
 };
 
+// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
 // @ts-ignore no clue how to type it
 export default connect(undefined, mapDispatchToProps)(ReduxAwareApiProvider);
diff --git a/scm-ui/ui-webapp/src/admin/components/form/BaseUrlSettings.tsx b/scm-ui/ui-webapp/src/admin/components/form/BaseUrlSettings.tsx
index 7801c8bbf3..72e8866588 100644
--- a/scm-ui/ui-webapp/src/admin/components/form/BaseUrlSettings.tsx
+++ b/scm-ui/ui-webapp/src/admin/components/form/BaseUrlSettings.tsx
@@ -24,11 +24,12 @@
 import React from "react";
 import { WithTranslation, withTranslation } from "react-i18next";
 import { Checkbox, InputField, Subtitle } from "@scm-manager/ui-components";
+import { ConfigChangeHandler } from "@scm-manager/ui-types";
 
 type Props = WithTranslation & {
   baseUrl: string;
   forceBaseUrl: boolean;
-  onChange: (p1: boolean, p2: any, p3: string) => void;
+  onChange: ConfigChangeHandler;
   hasUpdatePermission: boolean;
 };
 
diff --git a/scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx b/scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx
index 3385e2903c..48e7ec5e38 100644
--- a/scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx
+++ b/scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx
@@ -23,7 +23,7 @@
  */
 import React, { FC, useState, useEffect, FormEvent } from "react";
 import { useTranslation } from "react-i18next";
-import { Config, NamespaceStrategies } from "@scm-manager/ui-types";
+import { Config, ConfigChangeHandler, NamespaceStrategies } from "@scm-manager/ui-types";
 import { Level, Notification, SubmitButton } from "@scm-manager/ui-components";
 import ProxySettings from "./ProxySettings";
 import GeneralSettings from "./GeneralSettings";
@@ -45,7 +45,7 @@ const ConfigForm: FC<Props> = ({
   loading,
   configReadPermission,
   configUpdatePermission,
-  namespaceStrategies,
+  namespaceStrategies
 }) => {
   const [t] = useTranslation("config");
   const [innerConfig, setInnerConfig] = useState<Config>({
@@ -74,7 +74,7 @@ const ConfigForm: FC<Props> = ({
     mailDomainName: "",
     emergencyContacts: [],
     enabledApiKeys: true,
-    _links: {},
+    _links: {}
   });
   const [showNotification, setShowNotification] = useState(false);
   const [changed, setChanged] = useState(false);
@@ -83,7 +83,7 @@ const ConfigForm: FC<Props> = ({
     loginAttemptLimit: boolean;
   }>({
     loginAttemptLimitTimeout: false,
-    loginAttemptLimit: false,
+    loginAttemptLimit: false
   });
 
   useEffect(() => {
@@ -101,7 +101,7 @@ const ConfigForm: FC<Props> = ({
     submitForm(innerConfig);
   };
 
-  const onChange = (isValid: boolean, changedValue: any, name: string) => {
+  const onChange: ConfigChangeHandler = (isValid: boolean, changedValue: unknown, name: string) => {
     setInnerConfig({ ...innerConfig, [name]: changedValue });
     setError({ ...error, [name]: !isValid });
     setChanged(true);
@@ -150,21 +150,21 @@ const ConfigForm: FC<Props> = ({
         enabledApiKeys={innerConfig.enabledApiKeys}
         emergencyContacts={innerConfig.emergencyContacts}
         namespaceStrategy={innerConfig.namespaceStrategy}
-        onChange={(isValid, changedValue, name) => onChange(isValid, changedValue, name)}
+        onChange={onChange}
         hasUpdatePermission={configUpdatePermission}
       />
       <hr />
       <LoginAttempt
         loginAttemptLimit={innerConfig.loginAttemptLimit}
         loginAttemptLimitTimeout={innerConfig.loginAttemptLimitTimeout}
-        onChange={(isValid, changedValue, name) => onChange(isValid, changedValue, name)}
+        onChange={onChange}
         hasUpdatePermission={configUpdatePermission}
       />
       <hr />
       <BaseUrlSettings
         baseUrl={innerConfig.baseUrl}
         forceBaseUrl={innerConfig.forceBaseUrl}
-        onChange={(isValid, changedValue, name) => onChange(isValid, changedValue, name)}
+        onChange={onChange}
         hasUpdatePermission={configUpdatePermission}
       />
       <hr />
@@ -175,7 +175,7 @@ const ConfigForm: FC<Props> = ({
         proxyUser={innerConfig.proxyUser ? innerConfig.proxyUser : ""}
         enableProxy={innerConfig.enableProxy}
         proxyExcludes={innerConfig.proxyExcludes}
-        onChange={(isValid, changedValue, name) => onChange(isValid, changedValue, name)}
+        onChange={onChange}
         hasUpdatePermission={configUpdatePermission}
       />
       <hr />
diff --git a/scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx b/scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx
index 3562f9856a..63099b9868 100644
--- a/scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx
+++ b/scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx
@@ -24,13 +24,13 @@
 import React, { FC } from "react";
 import { useTranslation } from "react-i18next";
 import { useUserSuggestions } from "@scm-manager/ui-api";
-import { NamespaceStrategies, AnonymousMode, SelectValue } from "@scm-manager/ui-types";
+import { NamespaceStrategies, AnonymousMode, SelectValue, ConfigChangeHandler } from "@scm-manager/ui-types";
 import {
   Checkbox,
   InputField,
   MemberNameTagGroup,
   AutocompleteAddEntryToTableField,
-  Select,
+  Select
 } from "@scm-manager/ui-components";
 import NamespaceStrategySelect from "./NamespaceStrategySelect";
 
@@ -50,7 +50,7 @@ type Props = {
   emergencyContacts: string[];
   namespaceStrategy: string;
   namespaceStrategies?: NamespaceStrategies;
-  onChange: (p1: boolean, p2: any, p3: string) => void;
+  onChange: ConfigChangeHandler;
   hasUpdatePermission: boolean;
 };
 
@@ -68,7 +68,7 @@ const GeneralSettings: FC<Props> = ({
   namespaceStrategy,
   namespaceStrategies,
   onChange,
-  hasUpdatePermission,
+  hasUpdatePermission
 }) => {
   const { t } = useTranslation("config");
   const userSuggestions = useUserSuggestions();
@@ -86,7 +86,7 @@ const GeneralSettings: FC<Props> = ({
     onChange(true, value, "enabledUserConverter");
   };
   const handleAnonymousMode = (value: string) => {
-    onChange(true, value, "anonymousMode");
+    onChange(true, value as AnonymousMode, "anonymousMode");
   };
   const handleNamespaceStrategyChange = (value: string) => {
     onChange(true, value, "namespaceStrategy");
@@ -181,7 +181,7 @@ const GeneralSettings: FC<Props> = ({
             options={[
               { label: t("general-settings.anonymousMode.full"), value: "FULL" },
               { label: t("general-settings.anonymousMode.protocolOnly"), value: "PROTOCOL_ONLY" },
-              { label: t("general-settings.anonymousMode.off"), value: "OFF" },
+              { label: t("general-settings.anonymousMode.off"), value: "OFF" }
             ]}
             helpText={t("help.allowAnonymousAccessHelpText")}
             testId={"anonymous-mode-select"}
diff --git a/scm-ui/ui-webapp/src/admin/components/form/LoginAttempt.tsx b/scm-ui/ui-webapp/src/admin/components/form/LoginAttempt.tsx
index 094e87f8bc..7ff526aafb 100644
--- a/scm-ui/ui-webapp/src/admin/components/form/LoginAttempt.tsx
+++ b/scm-ui/ui-webapp/src/admin/components/form/LoginAttempt.tsx
@@ -24,11 +24,12 @@
 import React from "react";
 import { WithTranslation, withTranslation } from "react-i18next";
 import { InputField, Subtitle, validation as validator } from "@scm-manager/ui-components";
+import { ConfigChangeHandler } from "@scm-manager/ui-types";
 
 type Props = WithTranslation & {
   loginAttemptLimit: number;
   loginAttemptLimitTimeout: number;
-  onChange: (p1: boolean, p2: any, p3: string) => void;
+  onChange: ConfigChangeHandler;
   hasUpdatePermission: boolean;
 };
 
@@ -43,7 +44,7 @@ class LoginAttempt extends React.Component<Props, State> {
 
     this.state = {
       loginAttemptLimitError: false,
-      loginAttemptLimitTimeoutError: false,
+      loginAttemptLimitTimeoutError: false
     };
   }
   render() {
@@ -84,17 +85,17 @@ class LoginAttempt extends React.Component<Props, State> {
   handleLoginAttemptLimitChange = (value: string) => {
     this.setState({
       ...this.state,
-      loginAttemptLimitError: !validator.isNumberValid(value),
+      loginAttemptLimitError: !validator.isNumberValid(value)
     });
-    this.props.onChange(validator.isNumberValid(value), value, "loginAttemptLimit");
+    this.props.onChange(validator.isNumberValid(value), Number(value), "loginAttemptLimit");
   };
 
   handleLoginAttemptLimitTimeoutChange = (value: string) => {
     this.setState({
       ...this.state,
-      loginAttemptLimitTimeoutError: !validator.isNumberValid(value),
+      loginAttemptLimitTimeoutError: !validator.isNumberValid(value)
     });
-    this.props.onChange(validator.isNumberValid(value), value, "loginAttemptLimitTimeout");
+    this.props.onChange(validator.isNumberValid(value), Number(value), "loginAttemptLimitTimeout");
   };
 }
 
diff --git a/scm-ui/ui-webapp/src/admin/components/form/NamespaceStrategySelect.tsx b/scm-ui/ui-webapp/src/admin/components/form/NamespaceStrategySelect.tsx
index 0e20d32de9..e5a17fa47a 100644
--- a/scm-ui/ui-webapp/src/admin/components/form/NamespaceStrategySelect.tsx
+++ b/scm-ui/ui-webapp/src/admin/components/form/NamespaceStrategySelect.tsx
@@ -43,7 +43,7 @@ class NamespaceStrategySelect extends React.Component<Props> {
       available = namespaceStrategies.available;
     }
 
-    return available.map((ns) => {
+    return available.map(ns => {
       const key = "namespaceStrategies." + ns;
       let label = t(key);
       if (label === key) {
@@ -51,7 +51,7 @@ class NamespaceStrategySelect extends React.Component<Props> {
       }
       return {
         value: ns,
-        label: label,
+        label: label
       };
     });
   };
diff --git a/scm-ui/ui-webapp/src/admin/components/form/ProxySettings.tsx b/scm-ui/ui-webapp/src/admin/components/form/ProxySettings.tsx
index d435bebb96..1e380c3f02 100644
--- a/scm-ui/ui-webapp/src/admin/components/form/ProxySettings.tsx
+++ b/scm-ui/ui-webapp/src/admin/components/form/ProxySettings.tsx
@@ -25,6 +25,7 @@ import React from "react";
 import { WithTranslation, withTranslation } from "react-i18next";
 import { AddEntryToTableField, Checkbox, InputField, Subtitle } from "@scm-manager/ui-components";
 import ProxyExcludesTable from "../table/ProxyExcludesTable";
+import { ConfigChangeHandler } from "@scm-manager/ui-types";
 
 type Props = WithTranslation & {
   proxyPassword: string;
@@ -33,14 +34,22 @@ type Props = WithTranslation & {
   proxyUser: string;
   enableProxy: boolean;
   proxyExcludes: string[];
-  onChange: (p1: boolean, p2: any, p3: string) => void;
+  onChange: ConfigChangeHandler;
   hasUpdatePermission: boolean;
 };
 
 class ProxySettings extends React.Component<Props> {
   render() {
-    const { t, proxyPassword, proxyPort, proxyServer, proxyUser, enableProxy, proxyExcludes, hasUpdatePermission } =
-      this.props;
+    const {
+      t,
+      proxyPassword,
+      proxyPort,
+      proxyServer,
+      proxyUser,
+      enableProxy,
+      proxyExcludes,
+      hasUpdatePermission
+    } = this.props;
 
     return (
       <div>
@@ -101,7 +110,7 @@ class ProxySettings extends React.Component<Props> {
           <div className="column is-full">
             <ProxyExcludesTable
               proxyExcludes={proxyExcludes}
-              onChange={(isValid, changedValue, name) => this.props.onChange(isValid, changedValue, name)}
+              onChange={this.props.onChange}
               disabled={!enableProxy || !hasUpdatePermission}
             />
             <AddEntryToTableField
@@ -122,7 +131,7 @@ class ProxySettings extends React.Component<Props> {
     this.props.onChange(true, value, "proxyPassword");
   };
   handleProxyPortChange = (value: string) => {
-    this.props.onChange(true, value, "proxyPort");
+    this.props.onChange(true, Number(value), "proxyPort");
   };
   handleProxyServerChange = (value: string) => {
     this.props.onChange(true, value, "proxyServer");
@@ -130,7 +139,7 @@ class ProxySettings extends React.Component<Props> {
   handleProxyUserChange = (value: string) => {
     this.props.onChange(true, value, "proxyUser");
   };
-  handleEnableProxyChange = (value: string) => {
+  handleEnableProxyChange = (value: boolean) => {
     this.props.onChange(true, value, "enableProxy");
   };
 
diff --git a/scm-ui/ui-webapp/src/admin/components/table/ArrayConfigTable.tsx b/scm-ui/ui-webapp/src/admin/components/table/ArrayConfigTable.tsx
index 50f4915e13..13200e8f46 100644
--- a/scm-ui/ui-webapp/src/admin/components/table/ArrayConfigTable.tsx
+++ b/scm-ui/ui-webapp/src/admin/components/table/ArrayConfigTable.tsx
@@ -42,7 +42,7 @@ class ArrayConfigTable extends React.Component<Props> {
           <LabelWithHelpIcon label={label} helpText={helpText} />
           <table className="table is-hoverable is-fullwidth">
             <tbody>
-              {items.map((item) => {
+              {items.map(item => {
                 return (
                   <tr key={item}>
                     <td>{item}</td>
@@ -66,7 +66,7 @@ class ArrayConfigTable extends React.Component<Props> {
   }
 
   removeEntry = (item: string) => {
-    const newItems = this.props.items.filter((name) => name !== item);
+    const newItems = this.props.items.filter(name => name !== item);
     this.props.onRemove(newItems, item);
   };
 }
diff --git a/scm-ui/ui-webapp/src/admin/components/table/ProxyExcludesTable.tsx b/scm-ui/ui-webapp/src/admin/components/table/ProxyExcludesTable.tsx
index c439d047b1..5d403aa20c 100644
--- a/scm-ui/ui-webapp/src/admin/components/table/ProxyExcludesTable.tsx
+++ b/scm-ui/ui-webapp/src/admin/components/table/ProxyExcludesTable.tsx
@@ -24,10 +24,11 @@
 import React from "react";
 import { WithTranslation, withTranslation } from "react-i18next";
 import ArrayConfigTable from "./ArrayConfigTable";
+import { ConfigChangeHandler } from "@scm-manager/ui-types";
 
 type Props = WithTranslation & {
   proxyExcludes: string[];
-  onChange: (p1: boolean, p2: any, p3: string) => void;
+  onChange: ConfigChangeHandler;
   disabled: boolean;
 };
 
diff --git a/scm-ui/ui-webapp/src/admin/containers/Admin.tsx b/scm-ui/ui-webapp/src/admin/containers/Admin.tsx
index ff4b20bc50..e7fccb56fe 100644
--- a/scm-ui/ui-webapp/src/admin/containers/Admin.tsx
+++ b/scm-ui/ui-webapp/src/admin/containers/Admin.tsx
@@ -23,7 +23,7 @@
  */
 import React, { FC } from "react";
 import { useTranslation } from "react-i18next";
-import { Redirect, Route, Switch, useRouteMatch } from "react-router-dom";
+import { Redirect, Route, RouteProps, Switch, useRouteMatch } from "react-router-dom";
 import { ExtensionPoint } from "@scm-manager/ui-extensions";
 import {
   CustomQueryFlexWrappedColumns,
@@ -34,7 +34,7 @@ import {
   SecondaryNavigationColumn,
   StateMenuContextProvider,
   SubNavigation,
-  urls,
+  urls
 } from "@scm-manager/ui-components";
 import AdminDetails from "./AdminDetails";
 import PluginsOverview from "../plugins/containers/PluginsOverview";
@@ -51,16 +51,16 @@ const Admin: FC = () => {
   const availablePluginsLink = links.availablePlugins;
   const installedPluginsLink = links.installedPlugins;
 
-  const matchesRoles = (route: any) => {
+  const matchesRoles = (route: RouteProps) => {
     const url = urls.matchedUrlFromMatch(match);
     const regex = new RegExp(`${url}/role/`);
-    return route.location.pathname.match(regex);
+    return !!route.location?.pathname.match(regex);
   };
 
   const url = urls.matchedUrlFromMatch(match);
   const extensionProps = {
     links,
-    url,
+    url
   };
 
   return (
diff --git a/scm-ui/ui-webapp/src/admin/containers/AdminDetails.tsx b/scm-ui/ui-webapp/src/admin/containers/AdminDetails.tsx
index f01cf49369..a2c1768c97 100644
--- a/scm-ui/ui-webapp/src/admin/containers/AdminDetails.tsx
+++ b/scm-ui/ui-webapp/src/admin/containers/AdminDetails.tsx
@@ -60,7 +60,7 @@ const AdminDetails: FC = () => {
               <h3 className="has-text-weight-medium">{t("admin.info.newRelease.title")}</h3>
               <p>
                 {t("admin.info.newRelease.description", {
-                  version: updateInfo?.latestVersion,
+                  version: updateInfo?.latestVersion
                 })}
               </p>
               <a className="button is-warning is-pulled-right" target="_blank" href={updateInfo?.link} rel="noreferrer">
diff --git a/scm-ui/ui-webapp/src/admin/containers/GlobalConfig.tsx b/scm-ui/ui-webapp/src/admin/containers/GlobalConfig.tsx
index 1457a085d3..35a05cc9a7 100644
--- a/scm-ui/ui-webapp/src/admin/containers/GlobalConfig.tsx
+++ b/scm-ui/ui-webapp/src/admin/containers/GlobalConfig.tsx
@@ -34,7 +34,7 @@ const GlobalConfig: FC = () => {
   const {
     data: namespaceStrategies,
     error: namespaceStrategiesLoadingError,
-    isLoading: isLoadingNamespaceStrategies,
+    isLoading: isLoadingNamespaceStrategies
   } = useNamespaceStrategies();
   const [t] = useTranslation("config");
   const error = configLoadingError || namespaceStrategiesLoadingError || updateError || undefined;
diff --git a/scm-ui/ui-webapp/src/admin/plugins/components/PendingPluginsQueue.tsx b/scm-ui/ui-webapp/src/admin/plugins/components/PendingPluginsQueue.tsx
index b52c232269..f8fd298674 100644
--- a/scm-ui/ui-webapp/src/admin/plugins/components/PendingPluginsQueue.tsx
+++ b/scm-ui/ui-webapp/src/admin/plugins/components/PendingPluginsQueue.tsx
@@ -44,7 +44,7 @@ const Section: FC<SectionProps> = ({ pendingPlugins, type, label }) => {
     <>
       <strong>{label}</strong>
       <ul>
-        {plugins.map((plugin) => (
+        {plugins.map(plugin => (
           <li key={plugin.name}>{plugin.name}</li>
         ))}
       </ul>
diff --git a/scm-ui/ui-webapp/src/admin/plugins/components/PluginActionModal.tsx b/scm-ui/ui-webapp/src/admin/plugins/components/PluginActionModal.tsx
index 2f66273cf0..df7a15c1d7 100644
--- a/scm-ui/ui-webapp/src/admin/plugins/components/PluginActionModal.tsx
+++ b/scm-ui/ui-webapp/src/admin/plugins/components/PluginActionModal.tsx
@@ -72,8 +72,8 @@ class PluginActionModal extends React.Component<Props> {
             <strong>{t("plugins.modal.updateQueue")}</strong>
             <ul>
               {installedPlugins._embedded.plugins
-                .filter((plugin) => plugin._links && plugin._links.update)
-                .map((plugin) => (
+                .filter(plugin => plugin._links && plugin._links.update)
+                .map(plugin => (
                   <li key={plugin.name}>{plugin.name}</li>
                 ))}
             </ul>
@@ -91,7 +91,7 @@ class PluginActionModal extends React.Component<Props> {
           <>
             <strong>{t("plugins.modal.installQueue")}</strong>
             <ul>
-              {pendingPlugins._embedded.new.map((plugin) => (
+              {pendingPlugins._embedded.new.map(plugin => (
                 <li key={plugin.name}>{plugin.name}</li>
               ))}
             </ul>
@@ -109,7 +109,7 @@ class PluginActionModal extends React.Component<Props> {
           <>
             <strong>{t("plugins.modal.updateQueue")}</strong>
             <ul>
-              {pendingPlugins._embedded.update.map((plugin) => (
+              {pendingPlugins._embedded.update.map(plugin => (
                 <li key={plugin.name}>{plugin.name}</li>
               ))}
             </ul>
@@ -127,7 +127,7 @@ class PluginActionModal extends React.Component<Props> {
           <>
             <strong>{t("plugins.modal.uninstallQueue")}</strong>
             <ul>
-              {pendingPlugins._embedded.uninstall.map((plugin) => (
+              {pendingPlugins._embedded.uninstall.map(plugin => (
                 <li key={plugin.name}>{plugin.name}</li>
               ))}
             </ul>
diff --git a/scm-ui/ui-webapp/src/admin/plugins/components/PluginAvatar.tsx b/scm-ui/ui-webapp/src/admin/plugins/components/PluginAvatar.tsx
index 794a98f3e4..13517528c6 100644
--- a/scm-ui/ui-webapp/src/admin/plugins/components/PluginAvatar.tsx
+++ b/scm-ui/ui-webapp/src/admin/plugins/components/PluginAvatar.tsx
@@ -47,7 +47,7 @@ export default class PluginAvatar extends React.Component<Props> {
         <ExtensionPoint
           name="plugins.plugin-avatar"
           props={{
-            plugin,
+            plugin
           }}
         >
           <Image src={plugin.avatarUrl ? plugin.avatarUrl : "/images/blib.jpg"} alt="Logo" />
diff --git a/scm-ui/ui-webapp/src/admin/plugins/components/PluginEntry.tsx b/scm-ui/ui-webapp/src/admin/plugins/components/PluginEntry.tsx
index 9278c52913..71c8c19f3b 100644
--- a/scm-ui/ui-webapp/src/admin/plugins/components/PluginEntry.tsx
+++ b/scm-ui/ui-webapp/src/admin/plugins/components/PluginEntry.tsx
@@ -40,8 +40,8 @@ const ActionbarWrapper = styled.div`
   }
 `;
 
-const IconWrapperStyle = styled.span.attrs((props) => ({
-  className: "level-item mb-0 p-2 is-clickable",
+const IconWrapperStyle = styled.span.attrs(props => ({
+  className: "level-item mb-0 p-2 is-clickable"
 }))`
   border: 1px solid #cdcdcd; // $dark-25
   border-radius: 4px;
@@ -53,7 +53,7 @@ const IconWrapperStyle = styled.span.attrs((props) => ({
 
 const IconWrapper: FC<{ action: () => void }> = ({ action, children }) => {
   return (
-    <IconWrapperStyle onClick={action} onKeyDown={(e) => e.key === "Enter" && action()} tabIndex={0}>
+    <IconWrapperStyle onClick={action} onKeyDown={e => e.key === "Enter" && action()} tabIndex={0}>
       {children}
     </IconWrapperStyle>
   );
diff --git a/scm-ui/ui-webapp/src/admin/plugins/components/PluginGroupEntry.tsx b/scm-ui/ui-webapp/src/admin/plugins/components/PluginGroupEntry.tsx
index e47e979bcb..7021080343 100644
--- a/scm-ui/ui-webapp/src/admin/plugins/components/PluginGroupEntry.tsx
+++ b/scm-ui/ui-webapp/src/admin/plugins/components/PluginGroupEntry.tsx
@@ -33,7 +33,7 @@ type Props = {
 };
 
 const PluginGroupEntry: FC<Props> = ({ openModal, group }) => {
-  const entries = group.plugins.map((plugin) => {
+  const entries = group.plugins.map(plugin => {
     return <PluginEntry plugin={plugin} openModal={openModal} key={plugin.name} />;
   });
   return <CardColumnGroup name={group.name} elements={entries} />;
diff --git a/scm-ui/ui-webapp/src/admin/plugins/components/PluginList.tsx b/scm-ui/ui-webapp/src/admin/plugins/components/PluginList.tsx
index b409fecd05..feca1f71a4 100644
--- a/scm-ui/ui-webapp/src/admin/plugins/components/PluginList.tsx
+++ b/scm-ui/ui-webapp/src/admin/plugins/components/PluginList.tsx
@@ -36,7 +36,7 @@ const PluginList: FC<Props> = ({ plugins, openModal }) => {
   const groups = groupByCategory(plugins);
   return (
     <div className="content is-plugin-page">
-      {groups.map((group) => {
+      {groups.map(group => {
         return <PluginGroupEntry group={group} openModal={openModal} key={group.name} />;
       })}
     </div>
diff --git a/scm-ui/ui-webapp/src/admin/plugins/components/PluginModal.tsx b/scm-ui/ui-webapp/src/admin/plugins/components/PluginModal.tsx
index 259dfb1bd5..3eba219ab3 100644
--- a/scm-ui/ui-webapp/src/admin/plugins/components/PluginModal.tsx
+++ b/scm-ui/ui-webapp/src/admin/plugins/components/PluginModal.tsx
@@ -41,10 +41,10 @@ type ParentWithPluginAction = {
   pluginAction?: PluginAction;
 };
 
-const ListParent = styled.div.attrs((props) => ({
-  className: "field-label is-inline-flex mr-0 has-text-left",
+const ListParent = styled.div.attrs(props => ({
+  className: "field-label is-inline-flex mr-0 has-text-left"
 }))<ParentWithPluginAction>`
-  min-width: ${(props) => (props.pluginAction === PluginAction.INSTALL ? "5.5em" : "10em")};
+  min-width: ${props => (props.pluginAction === PluginAction.INSTALL ? "5.5em" : "10em")};
 `;
 
 const ListChild = styled.div`
@@ -236,7 +236,7 @@ const PluginModal: FC<Props> = ({ onClose, pluginAction, plugin }) => {
   return (
     <Modal
       title={t(`plugins.modal.title.${pluginAction}`, {
-        name: plugin.displayName ? plugin.displayName : plugin.name,
+        name: plugin.displayName ? plugin.displayName : plugin.name
       })}
       closeFunction={onClose}
       body={body}
diff --git a/scm-ui/ui-webapp/src/admin/plugins/components/SuccessNotification.tsx b/scm-ui/ui-webapp/src/admin/plugins/components/SuccessNotification.tsx
index cc64569f1e..63ad28500c 100644
--- a/scm-ui/ui-webapp/src/admin/plugins/components/SuccessNotification.tsx
+++ b/scm-ui/ui-webapp/src/admin/plugins/components/SuccessNotification.tsx
@@ -48,7 +48,7 @@ class InstallSuccessNotification extends React.Component<Props> {
     return (
       <Notification type="success">
         {this.createMessageForPluginAction()}{" "}
-        <NoStyleButton onClick={(_) => window.location.reload(true)} className="has-text-info">
+        <NoStyleButton onClick={_ => window.location.reload(true)} className="has-text-info">
           {t("plugins.modal.reload")}
         </NoStyleButton>
       </Notification>
diff --git a/scm-ui/ui-webapp/src/admin/plugins/components/groupByCategory.ts b/scm-ui/ui-webapp/src/admin/plugins/components/groupByCategory.ts
index 16871ca62f..c92a7faed2 100644
--- a/scm-ui/ui-webapp/src/admin/plugins/components/groupByCategory.ts
+++ b/scm-ui/ui-webapp/src/admin/plugins/components/groupByCategory.ts
@@ -33,7 +33,7 @@ export default function groupByCategory(plugins: Plugin[]): PluginGroup[] {
     if (!group) {
       group = {
         name: groupName,
-        plugins: [],
+        plugins: []
       };
       groups[groupName] = group;
     }
diff --git a/scm-ui/ui-webapp/src/admin/plugins/containers/PluginsOverview.tsx b/scm-ui/ui-webapp/src/admin/plugins/containers/PluginsOverview.tsx
index e0bf31f868..d13b2c3d80 100644
--- a/scm-ui/ui-webapp/src/admin/plugins/containers/PluginsOverview.tsx
+++ b/scm-ui/ui-webapp/src/admin/plugins/containers/PluginsOverview.tsx
@@ -32,7 +32,7 @@ import {
   Loading,
   Notification,
   Subtitle,
-  Title,
+  Title
 } from "@scm-manager/ui-components";
 import PluginsList from "../components/PluginList";
 import PluginTopActions from "../components/PluginTopActions";
@@ -48,7 +48,7 @@ export enum PluginAction {
   INSTALL = "install",
   UPDATE = "update",
   UNINSTALL = "uninstall",
-  CLOUDOGU = "cloudoguInstall",
+  CLOUDOGU = "cloudoguInstall"
 }
 
 export type PluginModalContent = {
@@ -65,12 +65,12 @@ const PluginsOverview: FC<Props> = ({ installed }) => {
   const {
     data: availablePlugins,
     isLoading: isLoadingAvailablePlugins,
-    error: availablePluginsError,
+    error: availablePluginsError
   } = useAvailablePlugins({ enabled: !installed });
   const {
     data: installedPlugins,
     isLoading: isLoadingInstalledPlugins,
-    error: installedPluginsError,
+    error: installedPluginsError
   } = useInstalledPlugins({ enabled: installed });
   const { data: pendingPlugins, isLoading: isLoadingPendingPlugins, error: pendingPluginsError } = usePendingPlugins();
   const [showPendingModal, setShowPendingModal] = useState(false);
@@ -167,7 +167,7 @@ const PluginsOverview: FC<Props> = ({ installed }) => {
   const computeUpdateAllSize = () => {
     const outdatedPlugins = collection?._embedded.plugins.filter((p: Plugin) => p._links.update).length;
     return t("plugins.outdatedPlugins", {
-      count: outdatedPlugins,
+      count: outdatedPlugins
     });
   };
 
diff --git a/scm-ui/ui-webapp/src/admin/roles/components/PermissionRoleDetails.tsx b/scm-ui/ui-webapp/src/admin/roles/components/PermissionRoleDetails.tsx
index 86c926fa50..a00e5a8e86 100644
--- a/scm-ui/ui-webapp/src/admin/roles/components/PermissionRoleDetails.tsx
+++ b/scm-ui/ui-webapp/src/admin/roles/components/PermissionRoleDetails.tsx
@@ -58,7 +58,7 @@ class PermissionRoleDetails extends React.Component<Props> {
           name="repositoryRole.role-details.information"
           renderAll={true}
           props={{
-            role,
+            role
           }}
         />
       </>
diff --git a/scm-ui/ui-webapp/src/admin/roles/containers/DeleteRepositoryRole.tsx b/scm-ui/ui-webapp/src/admin/roles/containers/DeleteRepositoryRole.tsx
index f675a1abfb..9c7db53587 100644
--- a/scm-ui/ui-webapp/src/admin/roles/containers/DeleteRepositoryRole.tsx
+++ b/scm-ui/ui-webapp/src/admin/roles/containers/DeleteRepositoryRole.tsx
@@ -67,12 +67,12 @@ const DeleteRepositoryRole: FC<Props> = ({ confirmDialog = true, role }: Props)
           {
             className: "is-outlined",
             label: t("repositoryRole.delete.confirmAlert.submit"),
-            onClick: deleteRoleCallback,
+            onClick: deleteRoleCallback
           },
           {
             label: t("repositoryRole.delete.confirmAlert.cancel"),
-            onClick: () => null,
-          },
+            onClick: () => null
+          }
         ]}
         close={() => setShowConfirmAlert(false)}
       />
diff --git a/scm-ui/ui-webapp/src/admin/roles/containers/RepositoryRoleForm.tsx b/scm-ui/ui-webapp/src/admin/roles/containers/RepositoryRoleForm.tsx
index 10f28f0b10..a524f0b52b 100644
--- a/scm-ui/ui-webapp/src/admin/roles/containers/RepositoryRoleForm.tsx
+++ b/scm-ui/ui-webapp/src/admin/roles/containers/RepositoryRoleForm.tsx
@@ -42,8 +42,8 @@ const RepositoryRoleForm: FC<Props> = ({ role: initialRole, submitForm }) => {
       name: "",
       verbs: [],
       _links: {
-        create: { href: createLink },
-      },
+        create: { href: createLink }
+      }
     }
   );
   const availableVerbs = data?.verbs;
@@ -58,7 +58,7 @@ const RepositoryRoleForm: FC<Props> = ({ role: initialRole, submitForm }) => {
   const handleVerbChange = (value: boolean, name: string) =>
     setRole({
       ...role,
-      verbs: value ? [...role.verbs, name] : role.verbs.filter((v) => v !== name),
+      verbs: value ? [...role.verbs, name] : role.verbs.filter(v => v !== name)
     });
 
   const submit = (event: FormEvent<HTMLFormElement>) => {
diff --git a/scm-ui/ui-webapp/src/admin/roles/containers/RepositoryRoles.tsx b/scm-ui/ui-webapp/src/admin/roles/containers/RepositoryRoles.tsx
index 62b69754ef..f3c64062c1 100644
--- a/scm-ui/ui-webapp/src/admin/roles/containers/RepositoryRoles.tsx
+++ b/scm-ui/ui-webapp/src/admin/roles/containers/RepositoryRoles.tsx
@@ -32,7 +32,7 @@ import {
   Notification,
   Subtitle,
   Title,
-  urls,
+  urls
 } from "@scm-manager/ui-components";
 import PermissionRoleTable from "../components/PermissionRoleTable";
 import { useRepositoryRoles } from "@scm-manager/ui-api";
diff --git a/scm-ui/ui-webapp/src/admin/roles/containers/SingleRepositoryRole.tsx b/scm-ui/ui-webapp/src/admin/roles/containers/SingleRepositoryRole.tsx
index 295764a949..c13eeb64a4 100644
--- a/scm-ui/ui-webapp/src/admin/roles/containers/SingleRepositoryRole.tsx
+++ b/scm-ui/ui-webapp/src/admin/roles/containers/SingleRepositoryRole.tsx
@@ -50,7 +50,7 @@ const SingleRepositoryRole: FC = () => {
 
   const extensionProps = {
     role,
-    url,
+    url
   };
 
   return (
diff --git a/scm-ui/ui-webapp/src/components/LoginForm.tsx b/scm-ui/ui-webapp/src/components/LoginForm.tsx
index d36fc4d567..65808dfdd2 100644
--- a/scm-ui/ui-webapp/src/components/LoginForm.tsx
+++ b/scm-ui/ui-webapp/src/components/LoginForm.tsx
@@ -60,7 +60,7 @@ class LoginForm extends React.Component<Props, State> {
     super(props);
     this.state = {
       username: "",
-      password: "",
+      password: ""
     };
   }
 
@@ -73,13 +73,13 @@ class LoginForm extends React.Component<Props, State> {
 
   handleUsernameChange = (value: string) => {
     this.setState({
-      username: value,
+      username: value
     });
   };
 
   handlePasswordChange = (value: string) => {
     this.setState({
-      password: value,
+      password: value
     });
   };
 
diff --git a/scm-ui/ui-webapp/src/components/LoginInfo.tsx b/scm-ui/ui-webapp/src/components/LoginInfo.tsx
index eb380d85cd..bfbf900bda 100644
--- a/scm-ui/ui-webapp/src/components/LoginInfo.tsx
+++ b/scm-ui/ui-webapp/src/components/LoginInfo.tsx
@@ -76,23 +76,23 @@ class LoginInfo extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props);
     this.state = {
-      loading: !!props.loginInfoLink,
+      loading: !!props.loginInfoLink
     };
   }
 
   fetchLoginInfo = (url: string) => {
     return fetch(url)
-      .then((response) => response.json())
-      .then((info) => {
+      .then(response => response.json())
+      .then(info => {
         this.setState({
           info,
-          loading: false,
+          loading: false
         });
       });
   };
 
-  timeout = (ms: number, promise: Promise<any>) => {
-    return new Promise<LoginInfoResponse>((resolve, reject) => {
+  timeout = (ms: number, promise: Promise<void>) => {
+    return new Promise<void>((resolve, reject) => {
       setTimeout(() => {
         reject(new Error("timeout during fetch of login info"));
       }, ms);
@@ -107,7 +107,7 @@ class LoginInfo extends React.Component<Props, State> {
     }
     this.timeout(1000, this.fetchLoginInfo(loginInfoLink)).catch(() => {
       this.setState({
-        loading: false,
+        loading: false
       });
     });
   }
diff --git a/scm-ui/ui-webapp/src/containers/ChangeUserPassword.tsx b/scm-ui/ui-webapp/src/containers/ChangeUserPassword.tsx
index d30e0af69d..71464c1a94 100644
--- a/scm-ui/ui-webapp/src/containers/ChangeUserPassword.tsx
+++ b/scm-ui/ui-webapp/src/containers/ChangeUserPassword.tsx
@@ -29,7 +29,7 @@ import {
   Notification,
   PasswordConfirmation,
   SubmitButton,
-  Subtitle,
+  Subtitle
 } from "@scm-manager/ui-components";
 import { useTranslation } from "react-i18next";
 import { Me } from "@scm-manager/ui-types";
diff --git a/scm-ui/ui-webapp/src/containers/Index.tsx b/scm-ui/ui-webapp/src/containers/Index.tsx
index cada9064a9..e1e2be082b 100644
--- a/scm-ui/ui-webapp/src/containers/Index.tsx
+++ b/scm-ui/ui-webapp/src/containers/Index.tsx
@@ -39,7 +39,7 @@ const Index: FC = () => {
 
   // TODO check componentDidUpdate method for anonymous user stuff
 
-  i18next.on("languageChanged", (lng) => {
+  i18next.on("languageChanged", lng => {
     document.documentElement.setAttribute("lang", lng);
   });
 
diff --git a/scm-ui/ui-webapp/src/containers/InitializationAdminAccountStep.tsx b/scm-ui/ui-webapp/src/containers/InitializationAdminAccountStep.tsx
index 4a17483ce8..788a4a08b2 100644
--- a/scm-ui/ui-webapp/src/containers/InitializationAdminAccountStep.tsx
+++ b/scm-ui/ui-webapp/src/containers/InitializationAdminAccountStep.tsx
@@ -48,21 +48,15 @@ type AdminAccountCreation = {
   passwordConfirmation: string;
 };
 
-const createAdmin = (link: string) => {
-  return (data: AdminAccountCreation) => {
-    return apiClient.post(link, data, "application/json").then(() => {
-      return new Promise<void>((resolve) => resolve());
-    });
-  };
-};
+const createAdmin = (link: string) => (data: AdminAccountCreation) => apiClient.post(link, data, "application/json");
 
 const useCreateAdmin = (link: string) => {
-  const { mutate, isLoading, error, isSuccess } = useMutation<void, Error, AdminAccountCreation>(createAdmin(link));
+  const { mutate, isLoading, error, isSuccess } = useMutation<unknown, Error, AdminAccountCreation>(createAdmin(link));
   return {
     create: mutate,
     isLoading,
     error,
-    isCreated: isSuccess,
+    isCreated: isSuccess
   };
 };
 
@@ -74,16 +68,16 @@ const InitializationAdminAccountStep: FC<Props> = ({ data }) => {
       displayName: "SCM Administrator",
       email: "",
       password: "",
-      passwordConfirmation: "",
+      passwordConfirmation: ""
     },
-    mode: "onChange",
+    mode: "onChange"
   });
 
   const { create, isLoading, error, isCreated } = useCreateAdmin((data._links.initialAdminUser as Link).href);
 
   useEffect(() => {
     if (isCreated) {
-      window.location.reload(false);
+      window.location.reload();
     }
   }, [isCreated]);
 
diff --git a/scm-ui/ui-webapp/src/containers/LoginButton.tsx b/scm-ui/ui-webapp/src/containers/LoginButton.tsx
index 375c99a18b..905a68f8cd 100644
--- a/scm-ui/ui-webapp/src/containers/LoginButton.tsx
+++ b/scm-ui/ui-webapp/src/containers/LoginButton.tsx
@@ -59,7 +59,7 @@ const LoginButton: FC<Props> = ({ burgerMode, links, className }) => {
     from,
     to,
     className: headerButtonContentClassName,
-    content,
+    content
   };
 
   if (links?.login) {
diff --git a/scm-ui/ui-webapp/src/containers/LogoutButton.tsx b/scm-ui/ui-webapp/src/containers/LogoutButton.tsx
index 1c83921c8e..887dddd7dd 100644
--- a/scm-ui/ui-webapp/src/containers/LogoutButton.tsx
+++ b/scm-ui/ui-webapp/src/containers/LogoutButton.tsx
@@ -48,7 +48,7 @@ const LogoutButton: FC<Props> = ({ burgerMode, links, className }) => {
     label,
 
     className: headerButtonContentClassName,
-    content,
+    content
   };
 
   if (links?.logout) {
diff --git a/scm-ui/ui-webapp/src/containers/Main.tsx b/scm-ui/ui-webapp/src/containers/Main.tsx
index 1bc40749c6..a7bcfeec89 100644
--- a/scm-ui/ui-webapp/src/containers/Main.tsx
+++ b/scm-ui/ui-webapp/src/containers/Main.tsx
@@ -56,7 +56,7 @@ type Props = {
   authenticated?: boolean;
 };
 
-const Main: FC<Props> = (props) => {
+const Main: FC<Props> = props => {
   const { authenticated, me } = props;
   const redirectUrlFactory = binder.getExtension("main.redirect", props);
   let url = "/";
diff --git a/scm-ui/ui-webapp/src/containers/Notifications.tsx b/scm-ui/ui-webapp/src/containers/Notifications.tsx
index b597c86ccb..b0ba6e19e9 100644
--- a/scm-ui/ui-webapp/src/containers/Notifications.tsx
+++ b/scm-ui/ui-webapp/src/containers/Notifications.tsx
@@ -30,7 +30,7 @@ import {
   useClearNotifications,
   useDismissNotification,
   useNotifications,
-  useNotificationSubscription,
+  useNotificationSubscription
 } from "@scm-manager/ui-api";
 import { Notification, NotificationCollection } from "@scm-manager/ui-types";
 import {
@@ -43,7 +43,7 @@ import {
   ToastType,
   Loading,
   DateFromNow,
-  devices,
+  devices
 } from "@scm-manager/ui-components";
 
 const DropDownMenu = styled.div`
@@ -283,7 +283,7 @@ type NotificationCounterProps = {
 const NotificationCounter = styled.span<NotificationCounterProps>`
   position: absolute;
   top: -0.5rem;
-  right: ${(props) => (props.count < 10 ? "0" : "-0.25")}rem;
+  right: ${props => (props.count < 10 ? "0" : "-0.25")}rem;
 `;
 
 type BellNotificationIconProps = {
@@ -351,14 +351,14 @@ const Notifications: FC<NotificationProps> = ({ className }) => {
           "dropdown",
           "is-hoverable",
           {
-            "is-active": open,
+            "is-active": open
           },
           className
         )}
-        onClick={(e) => e.stopPropagation()}
+        onClick={e => e.stopPropagation()}
       >
         <div className={classNames("is-flex", "dropdown-trigger", "is-clickable")}>
-          <BellNotificationIcon data={data} onClick={() => setOpen((o) => !o)} />
+          <BellNotificationIcon data={data} onClick={() => setOpen(o => !o)} />
         </div>
         <DropDownMenu className="dropdown-menu" id="dropdown-menu" role="menu">
           <ErrorBox error={error} />
diff --git a/scm-ui/ui-webapp/src/containers/OmniSearch.tsx b/scm-ui/ui-webapp/src/containers/OmniSearch.tsx
index 6c5737c4bf..ce4fc423c8 100644
--- a/scm-ui/ui-webapp/src/containers/OmniSearch.tsx
+++ b/scm-ui/ui-webapp/src/containers/OmniSearch.tsx
@@ -328,7 +328,7 @@ const OmniSearch: FC = () => {
     }
   };
 
-  const { onKeyDown, index } = useKeyBoardNavigation(gotoDetailSearch, clearQuery, data?._embedded.hits);
+  const { onKeyDown, index } = useKeyBoardNavigation(gotoDetailSearch, clearQuery, data?._embedded?.hits);
 
   return (
     <div className={classNames("navbar-item", "field", "mb-0")}>
@@ -372,7 +372,7 @@ const OmniSearch: FC = () => {
                 gotoDetailSearch={gotoDetailSearch}
                 clear={clearQuery}
                 index={index}
-                hits={data._embedded.hits}
+                hits={data._embedded?.hits || []}
               />
             ) : null}
           </DropdownMenu>
diff --git a/scm-ui/ui-webapp/src/containers/PluginLoader.tsx b/scm-ui/ui-webapp/src/containers/PluginLoader.tsx
index 3f5d8900ae..9a7395f444 100644
--- a/scm-ui/ui-webapp/src/containers/PluginLoader.tsx
+++ b/scm-ui/ui-webapp/src/containers/PluginLoader.tsx
@@ -53,7 +53,7 @@ class PluginLoader extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props);
     this.state = {
-      message: "booting",
+      message: "booting"
     };
   }
 
@@ -61,26 +61,26 @@ class PluginLoader extends React.Component<Props, State> {
     const { loaded } = this.props;
     if (!loaded) {
       this.setState({
-        message: "loading plugin information",
+        message: "loading plugin information"
       });
 
       this.getPlugins(this.props.link);
     }
   }
 
-  getPlugins = (link: string): Promise<any> => {
-    return apiClient
+  getPlugins = (link: string) => {
+    apiClient
       .get(link)
-      .then((response) => response.text())
+      .then(response => response.text())
       .then(JSON.parse)
-      .then((pluginCollection) => pluginCollection._embedded.plugins)
+      .then(pluginCollection => pluginCollection._embedded.plugins)
       .then(this.loadPlugins)
       .then(this.props.callback);
   };
 
   loadPlugins = (plugins: Plugin[]) => {
     this.setState({
-      message: "loading plugins",
+      message: "loading plugins"
     });
 
     const promises = [];
@@ -89,21 +89,21 @@ class PluginLoader extends React.Component<Props, State> {
       promises.push(this.loadPlugin(plugin));
     }
     return promises.reduce((chain, current) => {
-      return chain.then((chainResults) => {
-        return current.then((currentResult) => [...chainResults, currentResult]);
+      return chain.then(chainResults => {
+        return current.then(currentResult => [...chainResults, currentResult]);
       });
     }, Promise.resolve([]));
   };
 
   loadPlugin = (plugin: Plugin) => {
     this.setState({
-      message: `loading ${plugin.name}`,
+      message: `loading ${plugin.name}`
     });
 
     const promises = [];
     for (const bundle of plugin.bundles) {
       promises.push(
-        loadBundle(bundle).catch((error) => this.setState({ error, errorMessage: `loading ${plugin.name} failed` }))
+        loadBundle(bundle).catch(error => this.setState({ error, errorMessage: `loading ${plugin.name} failed` }))
       );
     }
     return Promise.all(promises);
diff --git a/scm-ui/ui-webapp/src/containers/ProfileInfo.tsx b/scm-ui/ui-webapp/src/containers/ProfileInfo.tsx
index 5a65938604..7f86f39b60 100644
--- a/scm-ui/ui-webapp/src/containers/ProfileInfo.tsx
+++ b/scm-ui/ui-webapp/src/containers/ProfileInfo.tsx
@@ -77,7 +77,7 @@ class ProfileInfo extends React.Component<Props> {
           <th>{t("profile.groups")}</th>
           <td className="p-0">
             <ul>
-              {me.groups.map((group) => {
+              {me.groups.map(group => {
                 return <li>{group}</li>;
               })}
             </ul>
diff --git a/scm-ui/ui-webapp/src/containers/ScrollToTop.ts b/scm-ui/ui-webapp/src/containers/ScrollToTop.tsx
similarity index 76%
rename from scm-ui/ui-webapp/src/containers/ScrollToTop.ts
rename to scm-ui/ui-webapp/src/containers/ScrollToTop.tsx
index 32fe4b61e4..541e22c462 100644
--- a/scm-ui/ui-webapp/src/containers/ScrollToTop.ts
+++ b/scm-ui/ui-webapp/src/containers/ScrollToTop.tsx
@@ -22,24 +22,23 @@
  * SOFTWARE.
  */
 
-import React from "react";
-import { withRouter } from "react-router-dom";
+import { FC, ReactElement, useEffect, useRef } from "react";
 
 type Props = {
-  location: any;
-  children: any;
+  location?: Location;
+  children: ReactElement;
 };
 
-class ScrollToTop extends React.Component<Props> {
-  componentDidUpdate(prevProps) {
-    if (this.props.location.pathname !== prevProps.location.pathname) {
+const ScrollToTop: FC<Props> = ({ location, children }) => {
+  const previousLocation = useRef(location);
+
+  useEffect(() => {
+    if (previousLocation?.current?.pathname !== location?.pathname) {
       window.scrollTo(0, 0);
     }
-  }
+  }, [location]);
 
-  render() {
-    return this.props.children;
-  }
-}
+  return children;
+};
 
-export default withRouter(ScrollToTop);
+export default ScrollToTop;
diff --git a/scm-ui/ui-webapp/src/containers/loadBundle.ts b/scm-ui/ui-webapp/src/containers/loadBundle.ts
index 33847e18ef..ea8a6f955c 100644
--- a/scm-ui/ui-webapp/src/containers/loadBundle.ts
+++ b/scm-ui/ui-webapp/src/containers/loadBundle.ts
@@ -55,12 +55,12 @@ const BundleLoader = {
       headers: {
         Cache: "no-cache",
         // identify the request as ajax request
-        "X-Requested-With": "XMLHttpRequest",
-      },
-    }).then((response) => {
+        "X-Requested-With": "XMLHttpRequest"
+      }
+    }).then(response => {
       return response.text();
     });
-  },
+  }
 };
 
 SystemJS.registry.set(BundleLoader.name, SystemJS.newModule(BundleLoader));
@@ -69,12 +69,13 @@ SystemJS.config({
   baseURL: urls.withContextPath("/assets"),
   meta: {
     "/*": {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
       // @ts-ignore typing missing, but seems required
       esModule: true,
       authorization: true,
-      loader: BundleLoader.name,
-    },
-  },
+      loader: BundleLoader.name
+    }
+  }
 });
 
 // We have to patch the resolve methods of SystemJS
@@ -89,17 +90,18 @@ const resolveModuleUrl = (key: string) => {
 };
 
 const defaultResolve = SystemJS.resolve;
-SystemJS.resolve = function (key, parentName) {
+SystemJS.resolve = function(key, parentName) {
   const module = resolveModuleUrl(key);
   return defaultResolve.apply(this, [module, parentName]);
 };
 
 const defaultResolveSync = SystemJS.resolveSync;
-SystemJS.resolveSync = function (key, parentName) {
+SystemJS.resolveSync = function(key, parentName) {
   const module = resolveModuleUrl(key);
   return defaultResolveSync.apply(this, [module, parentName]);
 };
 
+//eslint-disable-next-line @typescript-eslint/no-explicit-any
 const expose = (name: string, cmp: any, defaultCmp?: any) => {
   let mod = cmp;
   if (defaultCmp) {
@@ -107,7 +109,7 @@ const expose = (name: string, cmp: any, defaultCmp?: any) => {
     // https://github.com/systemjs/systemjs/issues/1749
     mod = {
       ...cmp,
-      __useDefault: defaultCmp,
+      __useDefault: defaultCmp
     };
   }
   SystemJS.set(name, SystemJS.newModule(mod));
diff --git a/scm-ui/ui-webapp/src/groups/components/GroupForm.tsx b/scm-ui/ui-webapp/src/groups/components/GroupForm.tsx
index ce9afbcd42..73ad1cfee4 100644
--- a/scm-ui/ui-webapp/src/groups/components/GroupForm.tsx
+++ b/scm-ui/ui-webapp/src/groups/components/GroupForm.tsx
@@ -32,7 +32,7 @@ import {
   MemberNameTagGroup,
   SubmitButton,
   Subtitle,
-  Textarea,
+  Textarea
 } from "@scm-manager/ui-components";
 import * as validator from "./groupValidation";
 
@@ -40,7 +40,7 @@ type Props = WithTranslation & {
   submitForm: (p: Group) => void;
   loading?: boolean;
   group?: Group;
-  loadUserSuggestions: (p: string) => any;
+  loadUserSuggestions: (p: string) => Promise<SelectValue[]>;
 };
 
 type State = {
@@ -56,14 +56,14 @@ class GroupForm extends React.Component<Props, State> {
         name: "",
         description: "",
         _embedded: {
-          members: [],
+          members: []
         },
         _links: {},
         members: [],
         type: "",
-        external: false,
+        external: false
       },
-      nameValidationError: false,
+      nameValidationError: false
     };
   }
 
@@ -73,8 +73,8 @@ class GroupForm extends React.Component<Props, State> {
       this.setState({
         ...this.state,
         group: {
-          ...group,
-        },
+          ...group
+        }
       });
     }
   }
@@ -183,13 +183,13 @@ class GroupForm extends React.Component<Props, State> {
     );
   }
 
-  memberListChanged = (membernames) => {
+  memberListChanged = membernames => {
     this.setState({
       ...this.state,
       group: {
         ...this.state.group,
-        members: membernames,
-      },
+        members: membernames
+      }
     });
   };
 
@@ -202,8 +202,8 @@ class GroupForm extends React.Component<Props, State> {
       ...this.state,
       group: {
         ...this.state.group,
-        members: [...this.state.group.members, value.value.id],
-      },
+        members: [...this.state.group.members, value.value.id]
+      }
     });
   };
 
@@ -216,8 +216,8 @@ class GroupForm extends React.Component<Props, State> {
       nameValidationError: !validator.isNameValid(name),
       group: {
         ...this.state.group,
-        name,
-      },
+        name
+      }
     });
   };
 
@@ -225,8 +225,8 @@ class GroupForm extends React.Component<Props, State> {
     this.setState({
       group: {
         ...this.state.group,
-        description,
-      },
+        description
+      }
     });
   };
 
@@ -234,8 +234,8 @@ class GroupForm extends React.Component<Props, State> {
     this.setState({
       group: {
         ...this.state.group,
-        external,
-      },
+        external
+      }
     });
   };
 }
diff --git a/scm-ui/ui-webapp/src/groups/components/navLinks/EditGroupNavLink.test.tsx b/scm-ui/ui-webapp/src/groups/components/navLinks/EditGroupNavLink.test.tsx
index 1d770dc6d0..34b6941b90 100644
--- a/scm-ui/ui-webapp/src/groups/components/navLinks/EditGroupNavLink.test.tsx
+++ b/scm-ui/ui-webapp/src/groups/components/navLinks/EditGroupNavLink.test.tsx
@@ -23,13 +23,12 @@
  */
 import React from "react";
 import { shallow } from "enzyme";
-import "@scm-manager/ui-tests/enzyme";
-import "@scm-manager/ui-tests/i18n";
+import "@scm-manager/ui-tests";
 import EditGroupNavLink from "./EditGroupNavLink";
 
 it("should render nothing, if the edit link is missing", () => {
   const group = {
-    _links: {},
+    _links: {}
   };
 
   const navLink = shallow(<EditGroupNavLink group={group} editUrl="/group/edit" />);
@@ -40,9 +39,9 @@ it("should render the navLink", () => {
   const group = {
     _links: {
       update: {
-        href: "/groups",
-      },
-    },
+        href: "/groups"
+      }
+    }
   };
 
   const navLink = shallow(<EditGroupNavLink group={group} editUrl="/group/edit" />);
diff --git a/scm-ui/ui-webapp/src/groups/components/table/GroupMember.tsx b/scm-ui/ui-webapp/src/groups/components/table/GroupMember.tsx
index f20c252cc3..83659477cb 100644
--- a/scm-ui/ui-webapp/src/groups/components/table/GroupMember.tsx
+++ b/scm-ui/ui-webapp/src/groups/components/table/GroupMember.tsx
@@ -46,7 +46,7 @@ export default class GroupMember extends React.Component<Props> {
     );
   }
 
-  showName(to: any, member: Member) {
+  showName(to: string, member: Member) {
     if (member._links.self) {
       return this.renderLink(to, member.name);
     } else {
diff --git a/scm-ui/ui-webapp/src/groups/containers/DeleteGroup.tsx b/scm-ui/ui-webapp/src/groups/containers/DeleteGroup.tsx
index bc9dbd0e85..8c55be6710 100644
--- a/scm-ui/ui-webapp/src/groups/containers/DeleteGroup.tsx
+++ b/scm-ui/ui-webapp/src/groups/containers/DeleteGroup.tsx
@@ -62,12 +62,12 @@ export const DeleteGroup: FC<Props> = ({ confirmDialog = true, group }) => {
           {
             className: "is-outlined",
             label: t("deleteGroup.confirmAlert.submit"),
-            onClick: deleteGroupCallback,
+            onClick: deleteGroupCallback
           },
           {
             label: t("deleteGroup.confirmAlert.cancel"),
-            onClick: () => null,
-          },
+            onClick: () => null
+          }
         ]}
         close={() => setShowConfirmAlert(false)}
       />
diff --git a/scm-ui/ui-webapp/src/groups/containers/Groups.tsx b/scm-ui/ui-webapp/src/groups/containers/Groups.tsx
index 8d88c95812..e42f0e028d 100644
--- a/scm-ui/ui-webapp/src/groups/containers/Groups.tsx
+++ b/scm-ui/ui-webapp/src/groups/containers/Groups.tsx
@@ -31,7 +31,7 @@ import {
   OverviewPageActions,
   Page,
   PageActions,
-  urls,
+  urls
 } from "@scm-manager/ui-components";
 import { GroupTable } from "./../components/table";
 import { useGroups } from "@scm-manager/ui-api";
diff --git a/scm-ui/ui-webapp/src/groups/containers/SingleGroup.tsx b/scm-ui/ui-webapp/src/groups/containers/SingleGroup.tsx
index 983708e315..0711aef0d6 100644
--- a/scm-ui/ui-webapp/src/groups/containers/SingleGroup.tsx
+++ b/scm-ui/ui-webapp/src/groups/containers/SingleGroup.tsx
@@ -36,7 +36,7 @@ import {
   SecondaryNavigationColumn,
   StateMenuContextProvider,
   SubNavigation,
-  urls,
+  urls
 } from "@scm-manager/ui-components";
 import { Details } from "./../components/table";
 import { EditGroupNavLink, SetPermissionsNavLink } from "./../components/navLinks";
@@ -62,7 +62,7 @@ const SingleGroup: FC = () => {
 
   const extensionProps = {
     group,
-    url,
+    url
   };
 
   return (
diff --git a/scm-ui/ui-webapp/src/i18n.ts b/scm-ui/ui-webapp/src/i18n.ts
index 1153e0f35b..a72e4f001a 100644
--- a/scm-ui/ui-webapp/src/i18n.ts
+++ b/scm-ui/ui-webapp/src/i18n.ts
@@ -23,6 +23,7 @@
  */
 
 import i18n from "i18next";
+// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
 // @ts-ignore
 import Backend from "i18next-fetch-backend";
 import LanguageDetector from "i18next-browser-languagedetector";
@@ -48,19 +49,19 @@ i18n
     debug: false,
 
     interpolation: {
-      escapeValue: false, // not needed for react!!
+      escapeValue: false // not needed for react!!
     },
 
     react: {
       wait: true,
-      useSuspense: false,
+      useSuspense: false
     },
 
     backend: {
       loadPath: loadPath,
       init: {
-        credentials: "same-origin",
-      },
+        credentials: "same-origin"
+      }
     },
 
     // configure LanguageDetector
@@ -69,8 +70,8 @@ i18n
       // we only use browser configuration
       order: ["navigator"],
       // we do not cache the detected language
-      caches: [],
-    },
+      caches: []
+    }
   });
 
 export default i18n;
diff --git a/scm-ui/ui-webapp/src/permissions/components/PermissionsWrapper.tsx b/scm-ui/ui-webapp/src/permissions/components/PermissionsWrapper.tsx
index 9a21bf9126..100535beb0 100644
--- a/scm-ui/ui-webapp/src/permissions/components/PermissionsWrapper.tsx
+++ b/scm-ui/ui-webapp/src/permissions/components/PermissionsWrapper.tsx
@@ -55,7 +55,7 @@ export default class PermissionsWrapper extends React.Component<Props> {
     return (
       <div className="columns">
         <StyledWrapper className={classNames("column", "is-half", "pb-0")}>
-          {permissionArray.slice(0, permissionArray.length / 2 + 1).map((p) => (
+          {permissionArray.slice(0, permissionArray.length / 2 + 1).map(p => (
             <PermissionCheckbox
               key={p}
               name={p}
@@ -67,7 +67,7 @@ export default class PermissionsWrapper extends React.Component<Props> {
           ))}
         </StyledWrapper>
         <StyledWrapper className={classNames("column", "is-half")}>
-          {permissionArray.slice(permissionArray.length / 2 + 1, permissionArray.length).map((p) => (
+          {permissionArray.slice(permissionArray.length / 2 + 1, permissionArray.length).map(p => (
             <PermissionCheckbox
               key={p}
               name={p}
diff --git a/scm-ui/ui-webapp/src/permissions/components/SetGroupPermissions.tsx b/scm-ui/ui-webapp/src/permissions/components/SetGroupPermissions.tsx
index 5e3e3b64d8..c653005a72 100644
--- a/scm-ui/ui-webapp/src/permissions/components/SetGroupPermissions.tsx
+++ b/scm-ui/ui-webapp/src/permissions/components/SetGroupPermissions.tsx
@@ -31,16 +31,14 @@ type Props = {
 };
 
 const SetGroupPermissions: FC<Props> = ({ group }) => {
-  const {
-    data: selectedPermissions,
-    isLoading: loadingPermissions,
-    error: permissionsLoadError,
-  } = useGroupPermissions(group);
+  const { data: selectedPermissions, isLoading: loadingPermissions, error: permissionsLoadError } = useGroupPermissions(
+    group
+  );
   const {
     isLoading: isUpdatingPermissions,
     isUpdated: permissionsUpdated,
     setPermissions,
-    error: permissionsUpdateError,
+    error: permissionsUpdateError
   } = useSetGroupPermissions(group, selectedPermissions);
   return (
     <SetPermissions
diff --git a/scm-ui/ui-webapp/src/permissions/components/SetPermissions.tsx b/scm-ui/ui-webapp/src/permissions/components/SetPermissions.tsx
index 41116af471..1db281e5a6 100644
--- a/scm-ui/ui-webapp/src/permissions/components/SetPermissions.tsx
+++ b/scm-ui/ui-webapp/src/permissions/components/SetPermissions.tsx
@@ -45,13 +45,13 @@ const SetPermissions: FC<Props> = ({
   permissionsUpdateError,
   updatePermissions,
   permissionsUpdated,
-  selectedPermissions,
+  selectedPermissions
 }) => {
   const [t] = useTranslation("permissions");
   const {
     data: availablePermissions,
     error: availablePermissionsLoadError,
-    isLoading: isLoadingAvailablePermissions,
+    isLoading: isLoadingAvailablePermissions
   } = useAvailableGlobalPermissions();
   const [permissions, setPermissions] = useState<Record<string, boolean>>({});
   const [permissionsSubmitted, setPermissionsSubmitted] = useState(false);
@@ -61,8 +61,8 @@ const SetPermissions: FC<Props> = ({
   useEffect(() => {
     if (selectedPermissions && availablePermissions) {
       const newPermissions: Record<string, boolean> = {};
-      availablePermissions.permissions.forEach((p) => (newPermissions[p] = false));
-      selectedPermissions.permissions.forEach((p) => (newPermissions[p] = true));
+      availablePermissions.permissions.forEach(p => (newPermissions[p] = false));
+      selectedPermissions.permissions.forEach(p => (newPermissions[p] = true));
       setPermissions(newPermissions);
     }
   }, [availablePermissions, selectedPermissions]);
@@ -85,7 +85,7 @@ const SetPermissions: FC<Props> = ({
   const valueChanged = (value: boolean, name: string) => {
     setPermissions({
       ...permissions,
-      [name]: value,
+      [name]: value
     });
     setPermissionsChanged(true);
   };
@@ -96,9 +96,11 @@ const SetPermissions: FC<Props> = ({
     event.preventDefault();
     if (permissions) {
       const selectedPermissions = Object.entries(permissions)
-        .filter((e) => e[1])
-        .map((e) => e[0]);
-      updatePermissions!(selectedPermissions);
+        .filter(e => e[1])
+        .map(e => e[0]);
+      if (updatePermissions) {
+        updatePermissions(selectedPermissions);
+      }
     }
   };
 
diff --git a/scm-ui/ui-webapp/src/permissions/components/SetUserPermissions.tsx b/scm-ui/ui-webapp/src/permissions/components/SetUserPermissions.tsx
index d8a75fcc9c..98065a53d8 100644
--- a/scm-ui/ui-webapp/src/permissions/components/SetUserPermissions.tsx
+++ b/scm-ui/ui-webapp/src/permissions/components/SetUserPermissions.tsx
@@ -31,16 +31,14 @@ type Props = {
 };
 
 const SetUserPermissions: FC<Props> = ({ user }) => {
-  const {
-    data: selectedPermissions,
-    isLoading: loadingPermissions,
-    error: permissionsLoadError,
-  } = useUserPermissions(user);
+  const { data: selectedPermissions, isLoading: loadingPermissions, error: permissionsLoadError } = useUserPermissions(
+    user
+  );
   const {
     isLoading: isUpdatingPermissions,
     isUpdated: permissionsUpdated,
     setPermissions,
-    error: permissionsUpdateError,
+    error: permissionsUpdateError
   } = useSetUserPermissions(user, selectedPermissions);
   return (
     <SetPermissions
diff --git a/scm-ui/ui-webapp/src/repos/branches/components/BranchForm.tsx b/scm-ui/ui-webapp/src/repos/branches/components/BranchForm.tsx
index e45f6397ad..389d8b191b 100644
--- a/scm-ui/ui-webapp/src/repos/branches/components/BranchForm.tsx
+++ b/scm-ui/ui-webapp/src/repos/branches/components/BranchForm.tsx
@@ -21,119 +21,84 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React, { FormEvent } from "react";
-import { WithTranslation, withTranslation } from "react-i18next";
-import { Branch, BranchCreation, Repository } from "@scm-manager/ui-types";
+import React, { FC, FormEvent, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Branch, BranchCreation } from "@scm-manager/ui-types";
 import { InputField, Level, Select, SubmitButton, validation as validator } from "@scm-manager/ui-components";
 import { orderBranches } from "../util/orderBranches";
 
-type Props = WithTranslation & {
+type Props = {
   submitForm: (p: BranchCreation) => void;
-  repository: Repository;
   branches: Branch[];
   loading?: boolean;
   transmittedName?: string;
   disabled?: boolean;
 };
 
-type State = {
-  source?: string;
-  name?: string;
-  nameValidationError: boolean;
-};
+const BranchForm: FC<Props> = ({ submitForm, branches, disabled, transmittedName, loading }) => {
+  const [t] = useTranslation("repos");
+  const [name, setName] = useState(transmittedName || "");
+  const [source, setSource] = useState("");
+  const [nameValid, setNameValid] = useState(false);
 
-class BranchForm extends React.Component<Props, State> {
-  constructor(props: Props) {
-    super(props);
+  useEffect(() => {
+    setNameValid(validator.isBranchValid(name));
+  }, [name]);
 
-    this.state = {
-      nameValidationError: false,
-      name: props.transmittedName,
-    };
-  }
+  const isValid = () => nameValid && source && name;
 
-  isFalsy(value?: string) {
-    return !value;
-  }
-
-  isValid = () => {
-    const { source, name } = this.state;
-    return !(this.state.nameValidationError || this.isFalsy(source) || this.isFalsy(name));
-  };
-
-  submit = (event: FormEvent<HTMLFormElement>) => {
+  const submit = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
-    if (this.isValid()) {
-      this.props.submitForm({
-        name: this.state.name!,
-        parent: this.state.source!,
+    if (isValid()) {
+      submitForm({
+        name,
+        parent: source
       });
     }
   };
 
-  render() {
-    const { t, branches, loading, transmittedName, disabled } = this.props;
-    const { name } = this.state;
-    orderBranches(branches);
-    const options = branches.map((branch) => ({
-      label: branch.name,
-      value: branch.name,
-    }));
+  orderBranches(branches);
+  const options = branches.map(branch => ({
+    label: branch.name,
+    value: branch.name
+  }));
 
-    return (
-      <>
-        <form onSubmit={this.submit}>
-          <div className="columns">
-            <div className="column">
-              <Select
-                name="source"
-                label={t("branches.create.source")}
-                options={options}
-                onChange={this.handleSourceChange}
-                loading={loading}
-                disabled={disabled}
-              />
-              <InputField
-                name="name"
-                label={t("branches.create.name")}
-                onChange={this.handleNameChange}
-                value={name ? name : ""}
-                validationError={this.state.nameValidationError}
-                errorMessage={t("validation.branch.nameInvalid")}
-                disabled={!!transmittedName || disabled}
-              />
-            </div>
+  return (
+    <>
+      <form onSubmit={submit}>
+        <div className="columns">
+          <div className="column">
+            <Select
+              name="source"
+              label={t("branches.create.source")}
+              options={options}
+              onChange={setSource}
+              loading={loading}
+              disabled={disabled}
+            />
+            <InputField
+              name="name"
+              label={t("branches.create.name")}
+              onChange={setName}
+              value={name ? name : ""}
+              validationError={!nameValid}
+              errorMessage={t("validation.branch.nameInvalid")}
+              disabled={!!transmittedName || disabled}
+            />
           </div>
-          <div className="columns">
-            <div className="column">
-              <Level
-                right={
-                  <SubmitButton
-                    disabled={disabled || !this.isValid()}
-                    loading={loading}
-                    label={t("branches.create.submit")}
-                  />
-                }
-              />
-            </div>
+        </div>
+        <div className="columns">
+          <div className="column">
+            <Level
+              right={
+                <SubmitButton disabled={disabled || !isValid()} loading={loading} label={t("branches.create.submit")} />
+              }
+            />
           </div>
-        </form>
-      </>
-    );
-  }
+        </div>
+      </form>
+    </>
+  );
+};
 
-  handleSourceChange = (source: string) => {
-    this.setState({
-      source,
-    });
-  };
-
-  handleNameChange = (name: string) => {
-    this.setState({
-      nameValidationError: !validator.isBranchValid(name),
-      name,
-    });
-  };
-}
-
-export default withTranslation("repos")(BranchForm);
+export default BranchForm;
diff --git a/scm-ui/ui-webapp/src/repos/branches/components/BranchView.tsx b/scm-ui/ui-webapp/src/repos/branches/components/BranchView.tsx
index 7c89fa2599..d7d13e43e3 100644
--- a/scm-ui/ui-webapp/src/repos/branches/components/BranchView.tsx
+++ b/scm-ui/ui-webapp/src/repos/branches/components/BranchView.tsx
@@ -45,7 +45,7 @@ class BranchView extends React.Component<Props> {
             renderAll={true}
             props={{
               repository,
-              branch,
+              branch
             }}
           />
         </div>
diff --git a/scm-ui/ui-webapp/src/repos/branches/containers/CreateBranch.tsx b/scm-ui/ui-webapp/src/repos/branches/containers/CreateBranch.tsx
index 3ab3d76539..f09030a306 100644
--- a/scm-ui/ui-webapp/src/repos/branches/containers/CreateBranch.tsx
+++ b/scm-ui/ui-webapp/src/repos/branches/containers/CreateBranch.tsx
@@ -40,9 +40,15 @@ const CreateBranch: FC<Props> = ({ repository }) => {
   const location = useLocation();
   const [t] = useTranslation("repos");
 
-  const transmittedName = (url: string) => {
-    const params = queryString.parse(url);
-    return params.name;
+  const transmittedName = (url: string): string | undefined => {
+    const paramsName = queryString.parse(url).name;
+    if (paramsName === null) {
+      return undefined;
+    }
+    if (Array.isArray(paramsName)) {
+      return paramsName[0];
+    }
+    return paramsName;
   };
 
   if (createdBranch) {
@@ -68,8 +74,7 @@ const CreateBranch: FC<Props> = ({ repository }) => {
       <BranchForm
         submitForm={create}
         loading={isLoadingCreate}
-        repository={repository}
-        branches={branches._embedded.branches}
+        branches={branches._embedded?.branches || []}
         transmittedName={transmittedName(location.search)}
       />
     </>
diff --git a/scm-ui/ui-webapp/src/repos/branches/util/orderBranches.test.ts b/scm-ui/ui-webapp/src/repos/branches/util/orderBranches.test.ts
index 2f956efe96..13024ace8a 100644
--- a/scm-ui/ui-webapp/src/repos/branches/util/orderBranches.test.ts
+++ b/scm-ui/ui-webapp/src/repos/branches/util/orderBranches.test.ts
@@ -26,36 +26,36 @@ import { orderBranches } from "./orderBranches";
 
 const branch1 = {
   name: "branch1",
-  revision: "revision1",
+  revision: "revision1"
 };
 const branch2 = {
   name: "branch2",
-  revision: "revision2",
+  revision: "revision2"
 };
 const branch3 = {
   name: "branch3",
   revision: "revision3",
-  defaultBranch: true,
+  defaultBranch: true
 };
 const defaultBranch = {
   name: "default",
   revision: "revision4",
-  defaultBranch: false,
+  defaultBranch: false
 };
 const developBranch = {
   name: "develop",
   revision: "revision5",
-  defaultBranch: false,
+  defaultBranch: false
 };
 const mainBranch = {
   name: "main",
   revision: "revision6",
-  defaultBranch: false,
+  defaultBranch: false
 };
 const masterBranch = {
   name: "master",
   revision: "revision7",
-  defaultBranch: false,
+  defaultBranch: false
 };
 
 describe("order branches", () => {
diff --git a/scm-ui/ui-webapp/src/repos/codeSection/utils/filepathSearch.test.ts b/scm-ui/ui-webapp/src/repos/codeSection/utils/filepathSearch.test.ts
index 1c38b681be..44ff43fc25 100644
--- a/scm-ui/ui-webapp/src/repos/codeSection/utils/filepathSearch.test.ts
+++ b/scm-ui/ui-webapp/src/repos/codeSection/utils/filepathSearch.test.ts
@@ -48,7 +48,7 @@ describe("filepathSearch tests", () => {
       "SomeResolver",
       "SomeTokenResolver",
       "accesstokenresolver",
-      "ActorExpression",
+      "ActorExpression"
     ];
 
     const matches = filepathSearch(paths, "AcToRe");
diff --git a/scm-ui/ui-webapp/src/repos/codeSection/utils/filepathSearch.ts b/scm-ui/ui-webapp/src/repos/codeSection/utils/filepathSearch.ts
index ed9bbff11d..22894d3c15 100644
--- a/scm-ui/ui-webapp/src/repos/codeSection/utils/filepathSearch.ts
+++ b/scm-ui/ui-webapp/src/repos/codeSection/utils/filepathSearch.ts
@@ -33,10 +33,10 @@ declare global {
 export const filepathSearch = (paths: string[], query: string): string[] => {
   return paths
     .map(createMatcher(query))
-    .filter((m) => m.matches)
+    .filter(m => m.matches)
     .sort((a, b) => b.score - a.score)
     .slice(0, 50)
-    .map((m) => m.path);
+    .map(m => m.path);
 };
 
 const includes = (value: string, query: string) => {
@@ -58,7 +58,7 @@ export const createMatcher = (query: string) => {
     return {
       matches: score > 0,
       score,
-      path,
+      path
     };
   };
 };
diff --git a/scm-ui/ui-webapp/src/repos/components/EditRepoNavLink.test.tsx b/scm-ui/ui-webapp/src/repos/components/EditRepoNavLink.test.tsx
index 4822cb58ad..0fd665e93d 100644
--- a/scm-ui/ui-webapp/src/repos/components/EditRepoNavLink.test.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/EditRepoNavLink.test.tsx
@@ -22,16 +22,16 @@
  * SOFTWARE.
  */
 import React from "react";
-import { mount, shallow } from "@scm-manager/ui-tests/enzyme-router";
-import "@scm-manager/ui-tests/enzyme";
-import "@scm-manager/ui-tests/i18n";
-
 import EditRepoNavLink from "./EditRepoNavLink";
+import { mount, shallow } from "@scm-manager/ui-tests";
 
 describe("GeneralNavLink", () => {
   it("should render nothing, if the modify link is missing", () => {
     const repository = {
-      _links: {},
+      namespace: "space",
+      name: "name",
+      type: "git",
+      _links: {}
     };
 
     const navLink = shallow(<EditRepoNavLink repository={repository} editUrl="" />);
@@ -40,11 +40,14 @@ describe("GeneralNavLink", () => {
 
   it("should render the navLink", () => {
     const repository = {
+      namespace: "space",
+      name: "name",
+      type: "git",
       _links: {
         update: {
-          href: "/repositories",
-        },
-      },
+          href: "/repositories"
+        }
+      }
     };
 
     const navLink = mount(<EditRepoNavLink repository={repository} editUrl="" />);
diff --git a/scm-ui/ui-webapp/src/repos/components/EditRepoNavLink.tsx b/scm-ui/ui-webapp/src/repos/components/EditRepoNavLink.tsx
index eb2bbd165c..688418a077 100644
--- a/scm-ui/ui-webapp/src/repos/components/EditRepoNavLink.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/EditRepoNavLink.tsx
@@ -21,29 +21,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React from "react";
-import { WithTranslation, withTranslation } from "react-i18next";
+import React, { FC } from "react";
+import { useTranslation } from "react-i18next";
 import { Repository } from "@scm-manager/ui-types";
 import { NavLink } from "@scm-manager/ui-components";
 
-type Props = WithTranslation & {
+type Props = {
   repository: Repository;
   editUrl: string;
 };
 
-class EditRepoNavLink extends React.Component<Props> {
-  isEditable = () => {
-    return this.props.repository._links.update;
-  };
-
-  render() {
-    const { editUrl, t } = this.props;
-
-    if (!this.isEditable()) {
-      return null;
-    }
-    return <NavLink to={editUrl} label={t("repositoryRoot.menu.generalNavLink")} />;
+const EditRepoNavLink: FC<Props> = ({ repository, editUrl }) => {
+  const [t] = useTranslation("repos");
+  if (!repository._links.update) {
+    return null;
   }
-}
+  return <NavLink to={editUrl} label={t("repositoryRoot.menu.generalNavLink")} />;
+};
 
-export default withTranslation("repos")(EditRepoNavLink);
+export default EditRepoNavLink;
diff --git a/scm-ui/ui-webapp/src/repos/components/ImportFromBundleForm.tsx b/scm-ui/ui-webapp/src/repos/components/ImportFromBundleForm.tsx
index cf6fd0133a..292757b890 100644
--- a/scm-ui/ui-webapp/src/repos/components/ImportFromBundleForm.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/ImportFromBundleForm.tsx
@@ -43,7 +43,7 @@ const ImportFromBundleForm: FC<Props> = ({
   setCompressed,
   password,
   setPassword,
-  disabled,
+  disabled
 }) => {
   const [t] = useTranslation("repos");
 
@@ -53,7 +53,7 @@ const ImportFromBundleForm: FC<Props> = ({
         <div className="column is-half is-vcentered">
           <LabelWithHelpIcon label={t("import.bundle.title")} helpText={t("import.bundle.helpText")} />
           <FileUpload
-            handleFile={(file) => {
+            handleFile={file => {
               setFile(file);
               setValid(!!file);
             }}
@@ -74,7 +74,7 @@ const ImportFromBundleForm: FC<Props> = ({
         <div className="column is-half is-vcentered">
           <InputField
             value={password}
-            onChange={(value) => setPassword(value)}
+            onChange={value => setPassword(value)}
             type="password"
             label={t("import.bundle.password.title")}
             helpText={t("import.bundle.password.helpText")}
diff --git a/scm-ui/ui-webapp/src/repos/components/ImportFromUrlForm.tsx b/scm-ui/ui-webapp/src/repos/components/ImportFromUrlForm.tsx
index f22b5be696..4ab75c82c7 100644
--- a/scm-ui/ui-webapp/src/repos/components/ImportFromUrlForm.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/ImportFromUrlForm.tsx
@@ -47,7 +47,7 @@ const ImportFromUrlForm: FC<Props> = ({ repository, onChange, setValid, disabled
   const handleImportUrlBlur = (importUrl: string) => {
     if (!repository.name) {
       // If the repository name is not fill we set a name suggestion
-      const match = importUrl.match(/([^\/]+?)(?:.git)?$/);
+      const match = importUrl.match(/([^/]+?)(?:.git)?$/);
       if (match && match[1]) {
         onChange({ ...repository, name: match[1] });
       }
@@ -71,7 +71,7 @@ const ImportFromUrlForm: FC<Props> = ({ repository, onChange, setValid, disabled
       <div className="column is-half px-3">
         <InputField
           label={t("import.username")}
-          onChange={(username) => onChange({ ...repository, username })}
+          onChange={username => onChange({ ...repository, username })}
           value={repository.username}
           helpText={t("help.usernameHelpText")}
           disabled={disabled}
@@ -80,7 +80,7 @@ const ImportFromUrlForm: FC<Props> = ({ repository, onChange, setValid, disabled
       <div className="column is-half px-3">
         <InputField
           label={t("import.password")}
-          onChange={(password) => onChange({ ...repository, password })}
+          onChange={password => onChange({ ...repository, password })}
           value={repository.password}
           type="password"
           helpText={t("help.passwordHelpText")}
diff --git a/scm-ui/ui-webapp/src/repos/components/ImportFullRepository.tsx b/scm-ui/ui-webapp/src/repos/components/ImportFullRepository.tsx
index 5ff33c19ac..925dd347fd 100644
--- a/scm-ui/ui-webapp/src/repos/components/ImportFullRepository.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/ImportFullRepository.tsx
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React, { FC, FormEvent, useEffect, useState } from "react";
+import React, { FC, FormEvent, useCallback, useEffect, useState } from "react";
 import { Repository, RepositoryCreation, RepositoryType } from "@scm-manager/ui-types";
 import { ErrorNotification, Level, SubmitButton } from "@scm-manager/ui-components";
 import { useTranslation } from "react-i18next";
@@ -42,35 +42,46 @@ const ImportFullRepository: FC<Props> = ({
   setImportPending,
   setImportedRepository,
   nameForm: NameForm,
-  informationForm: InformationForm,
+  informationForm: InformationForm
 }) => {
   const [repo, setRepo] = useState<RepositoryCreation>({
     name: "",
     namespace: "",
     type: repositoryType.name,
     contact: "",
-    description: "",
-    contextEntries: [],
+    description: ""
   });
   const [password, setPassword] = useState("");
   const [valid, setValid] = useState({ namespaceAndName: false, contact: true, file: false });
   const [file, setFile] = useState<File | null>(null);
   const [t] = useTranslation("repos");
   const { importFullRepository, importedRepository, isLoading, error } = useImportFullRepository(repositoryType);
+  const setContactValid = useCallback((contact: boolean) => setValid(currentValid => ({ ...currentValid, contact })), [
+    setValid
+  ]);
+  const setNamespaceAndNameValid = useCallback(
+    (namespaceAndName: boolean) => setValid(currentValid => ({ ...currentValid, namespaceAndName })),
+    [setValid]
+  );
+  const setFileValid = useCallback((file: boolean) => setValid(currentValid => ({ ...currentValid, file })), [
+    setValid
+  ]);
 
-  useEffect(() => setRepo({ ...repo, type: repositoryType.name }), [repositoryType]);
-  useEffect(() => setImportPending(isLoading), [isLoading]);
+  useEffect(() => setImportPending(isLoading), [isLoading, setImportPending]);
   useEffect(() => {
     if (importedRepository) {
       setImportedRepository(importedRepository);
     }
-  }, [importedRepository]);
+  }, [importedRepository, setImportedRepository]);
 
-  const isValid = () => Object.values(valid).every((v) => v);
+  const isValid = () => Object.values(valid).every(v => v);
 
   const submit = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
-    importFullRepository(repo, file!, password);
+    if (!file) {
+      throw new Error("File is required for import");
+    }
+    importFullRepository({ ...repo, type: repositoryType.name }, file, password);
   };
 
   return (
@@ -80,20 +91,20 @@ const ImportFullRepository: FC<Props> = ({
         setFile={setFile}
         password={password}
         setPassword={setPassword}
-        setValid={(file: boolean) => setValid({ ...valid, file })}
+        setValid={setFileValid}
       />
       <hr />
       <NameForm
         repository={repo}
         onChange={setRepo as React.Dispatch<React.SetStateAction<RepositoryCreation>>}
-        setValid={(namespaceAndName: boolean) => setValid({ ...valid, namespaceAndName })}
+        setValid={setNamespaceAndNameValid}
         disabled={isLoading}
       />
       <InformationForm
         repository={repo}
         onChange={setRepo as React.Dispatch<React.SetStateAction<RepositoryCreation>>}
         disabled={isLoading}
-        setValid={(contact: boolean) => setValid({ ...valid, contact })}
+        setValid={setContactValid}
       />
       <Level
         right={<SubmitButton disabled={!isValid()} loading={isLoading} label={t("repositoryForm.submitImport")} />}
diff --git a/scm-ui/ui-webapp/src/repos/components/ImportFullRepositoryForm.tsx b/scm-ui/ui-webapp/src/repos/components/ImportFullRepositoryForm.tsx
index e85bf3a4d2..4d02f2096d 100644
--- a/scm-ui/ui-webapp/src/repos/components/ImportFullRepositoryForm.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/ImportFullRepositoryForm.tsx
@@ -50,7 +50,7 @@ const ImportFullRepositoryForm: FC<Props> = ({ setFile, setValid, password, setP
       <div className="column is-half is-vcentered">
         <InputField
           value={password}
-          onChange={(value) => setPassword(value)}
+          onChange={setPassword}
           type="password"
           label={t("import.bundle.password.title")}
           helpText={t("import.bundle.password.helpText")}
diff --git a/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromBundle.tsx b/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromBundle.tsx
index c8ecef2ec3..c0da6fd048 100644
--- a/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromBundle.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromBundle.tsx
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React, { FC, FormEvent, useEffect, useState } from "react";
+import React, { FC, FormEvent, useCallback, useEffect, useState } from "react";
 import { Repository, RepositoryCreation, RepositoryType } from "@scm-manager/ui-types";
 import { ErrorNotification, Level, SubmitButton } from "@scm-manager/ui-components";
 import { useTranslation } from "react-i18next";
@@ -42,37 +42,49 @@ const ImportRepositoryFromBundle: FC<Props> = ({
   setImportPending,
   setImportedRepository,
   nameForm: NameForm,
-  informationForm: InformationForm,
+  informationForm: InformationForm
 }) => {
   const [repo, setRepo] = useState<RepositoryCreation>({
     name: "",
     namespace: "",
     type: repositoryType.name,
     contact: "",
-    description: "",
-    contextEntries: [],
+    description: ""
   });
   const [password, setPassword] = useState("");
   const [valid, setValid] = useState({ namespaceAndName: false, contact: true, file: false });
   const [file, setFile] = useState<File | null>(null);
   const [compressed, setCompressed] = useState(true);
   const [t] = useTranslation("repos");
-  const { importRepositoryFromBundle, importedRepository, error, isLoading } =
-    useImportRepositoryFromBundle(repositoryType);
+  const { importRepositoryFromBundle, importedRepository, error, isLoading } = useImportRepositoryFromBundle(
+    repositoryType
+  );
+  const setContactValid = useCallback((contact: boolean) => setValid(currentValid => ({ ...currentValid, contact })), [
+    setValid
+  ]);
+  const setNamespaceAndNameValid = useCallback(
+    (namespaceAndName: boolean) => setValid(currentValid => ({ ...currentValid, namespaceAndName })),
+    [setValid]
+  );
+  const setFileValid = useCallback((file: boolean) => setValid(currentValid => ({ ...currentValid, file })), [
+    setValid
+  ]);
 
-  useEffect(() => setRepo({ ...repo, type: repositoryType.name }), [repositoryType]);
-  useEffect(() => setImportPending(isLoading), [isLoading]);
+  useEffect(() => setImportPending(isLoading), [isLoading, setImportPending]);
   useEffect(() => {
     if (importedRepository) {
       setImportedRepository(importedRepository);
     }
-  }, [importedRepository]);
+  }, [importedRepository, setImportedRepository]);
 
-  const isValid = () => Object.values(valid).every((v) => v);
+  const isValid = () => Object.values(valid).every(v => v);
 
   const submit = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
-    importRepositoryFromBundle(repo, file!, compressed, password);
+    if (!file) {
+      throw new Error("File is required for import");
+    }
+    importRepositoryFromBundle({ ...repo, type: repositoryType.name }, file, compressed, password);
   };
 
   return (
@@ -80,7 +92,7 @@ const ImportRepositoryFromBundle: FC<Props> = ({
       <ErrorNotification error={error} />
       <ImportFromBundleForm
         setFile={setFile}
-        setValid={(file: boolean) => setValid({ ...valid, file })}
+        setValid={setFileValid}
         compressed={compressed}
         setCompressed={setCompressed}
         password={password}
@@ -91,14 +103,14 @@ const ImportRepositoryFromBundle: FC<Props> = ({
       <NameForm
         repository={repo}
         onChange={setRepo as React.Dispatch<React.SetStateAction<RepositoryCreation>>}
-        setValid={(namespaceAndName: boolean) => setValid({ ...valid, namespaceAndName })}
+        setValid={setNamespaceAndNameValid}
         disabled={isLoading}
       />
       <InformationForm
         repository={repo}
         onChange={setRepo as React.Dispatch<React.SetStateAction<RepositoryCreation>>}
         disabled={isLoading}
-        setValid={(contact: boolean) => setValid({ ...valid, contact })}
+        setValid={setContactValid}
       />
       <Level
         right={<SubmitButton disabled={!isValid()} loading={isLoading} label={t("repositoryForm.submitImport")} />}
diff --git a/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromUrl.tsx b/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromUrl.tsx
index fd215d7f17..c603efcccd 100644
--- a/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromUrl.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromUrl.tsx
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React, { FC, FormEvent, useEffect, useState } from "react";
+import React, { FC, FormEvent, useCallback, useEffect, useState } from "react";
 import { Repository, RepositoryCreation, RepositoryType, RepositoryUrlImport } from "@scm-manager/ui-types";
 import ImportFromUrlForm from "./ImportFromUrlForm";
 import { ErrorNotification, Level, SubmitButton } from "@scm-manager/ui-components";
@@ -42,7 +42,7 @@ const ImportRepositoryFromUrl: FC<Props> = ({
   setImportPending,
   setImportedRepository,
   nameForm: NameForm,
-  informationForm: InformationForm,
+  informationForm: InformationForm
 }) => {
   const [repo, setRepo] = useState<RepositoryUrlImport>({
     name: "",
@@ -52,50 +52,54 @@ const ImportRepositoryFromUrl: FC<Props> = ({
     description: "",
     importUrl: "",
     username: "",
-    password: "",
-    contextEntries: [],
+    password: ""
   });
 
   const [valid, setValid] = useState({ namespaceAndName: false, contact: true, importUrl: false });
   const [t] = useTranslation("repos");
   const { importRepositoryFromUrl, importedRepository, error, isLoading } = useImportRepositoryFromUrl(repositoryType);
+  const setContactValid = useCallback((contact: boolean) => setValid(currentValid => ({ ...currentValid, contact })), [
+    setValid
+  ]);
+  const setNamespaceAndNameValid = useCallback(
+    (namespaceAndName: boolean) => setValid(currentValid => ({ ...currentValid, namespaceAndName })),
+    [setValid]
+  );
+  const setImportUrlValid = useCallback(
+    (importUrl: boolean) => setValid(currentValid => ({ ...currentValid, importUrl })),
+    [setValid]
+  );
 
-  useEffect(() => setRepo({ ...repo, type: repositoryType.name }), [repositoryType]);
-  useEffect(() => setImportPending(isLoading), [isLoading]);
+  useEffect(() => setImportPending(isLoading), [isLoading, setImportPending]);
   useEffect(() => {
     if (importedRepository) {
       setImportedRepository(importedRepository);
     }
-  }, [importedRepository]);
+  }, [importedRepository, setImportedRepository]);
 
-  const isValid = () => Object.values(valid).every((v) => v);
+  const isValid = () => Object.values(valid).every(v => v);
 
   const submit = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
-    importRepositoryFromUrl(repo);
+    importRepositoryFromUrl({ ...repo, type: repositoryType.name });
   };
 
   return (
     <form onSubmit={submit}>
       {error ? <ErrorNotification error={error} /> : null}
-      <ImportFromUrlForm
-        repository={repo}
-        onChange={setRepo}
-        setValid={(importUrl: boolean) => setValid({ ...valid, importUrl })}
-        disabled={isLoading}
-      />
+      <ImportFromUrlForm repository={repo} onChange={setRepo} setValid={setImportUrlValid} disabled={isLoading} />
       <hr />
       <NameForm
         repository={repo}
         onChange={setRepo as React.Dispatch<React.SetStateAction<RepositoryCreation>>}
-        setValid={(namespaceAndName: boolean) => setValid({ ...valid, namespaceAndName })}
+        setValid={setNamespaceAndNameValid}
         disabled={isLoading}
       />
       <InformationForm
         repository={repo}
         onChange={setRepo as React.Dispatch<React.SetStateAction<RepositoryCreation>>}
         disabled={isLoading}
-        setValid={(contact: boolean) => setValid({ ...valid, contact })}
+        setValid={setContactValid}
       />
       <Level
         right={<SubmitButton disabled={!isValid()} loading={isLoading} label={t("repositoryForm.submitImport")} />}
diff --git a/scm-ui/ui-webapp/src/repos/components/ImportRepositoryTypeSelect.tsx b/scm-ui/ui-webapp/src/repos/components/ImportRepositoryTypeSelect.tsx
index c6b2918a4d..22cdd3f1b3 100644
--- a/scm-ui/ui-webapp/src/repos/components/ImportRepositoryTypeSelect.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/ImportRepositoryTypeSelect.tsx
@@ -38,11 +38,11 @@ const ImportRepositoryTypeSelect: FC<Props> = ({ repositoryTypes, repositoryType
 
   const createSelectOptions = () => {
     const options = repositoryTypes
-      .filter((repoType) => !!repoType._links.import)
-      .map((repositoryType) => {
+      .filter(repoType => !!repoType._links.import)
+      .map(repositoryType => {
         return {
           label: repositoryType.displayName,
-          value: repositoryType.name,
+          value: repositoryType.name
         };
       });
     options.unshift({ label: "", value: "" });
@@ -50,7 +50,7 @@ const ImportRepositoryTypeSelect: FC<Props> = ({ repositoryTypes, repositoryType
   };
 
   const onChangeType = (type: string) => {
-    const repositoryType = repositoryTypes.filter((t) => t.name === type)[0];
+    const repositoryType = repositoryTypes.filter(t => t.name === type)[0];
     setRepositoryType(repositoryType);
   };
 
diff --git a/scm-ui/ui-webapp/src/repos/components/NamespaceAndNameFields.tsx b/scm-ui/ui-webapp/src/repos/components/NamespaceAndNameFields.tsx
index e4f28722f9..5dbd2a949f 100644
--- a/scm-ui/ui-webapp/src/repos/components/NamespaceAndNameFields.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/NamespaceAndNameFields.tsx
@@ -68,7 +68,7 @@ const NamespaceAndNameFields: FC<Props> = ({ repository, onChange, setValid, dis
     } else {
       setValid(false);
     }
-  }, [repository.name, repository.namespace]);
+  }, [repository.name, repository.namespace, namespaceStrategy, setValid]);
 
   const handleNamespaceChange = (namespace: string) => {
     const valid = validator.isNamespaceValid(namespace);
@@ -96,7 +96,7 @@ const NamespaceAndNameFields: FC<Props> = ({ repository, onChange, setValid, dis
       errorMessage: t("validation.namespace-invalid"),
       validationError: namespaceValidationError,
       disabled: disabled,
-      informationMessage,
+      informationMessage
     };
 
     if (namespaceStrategy === CUSTOM_NAMESPACE_STRATEGY) {
diff --git a/scm-ui/ui-webapp/src/repos/components/PermissionsNavLink.test.tsx b/scm-ui/ui-webapp/src/repos/components/PermissionsNavLink.test.tsx
index 8a62865433..959f8b4b07 100644
--- a/scm-ui/ui-webapp/src/repos/components/PermissionsNavLink.test.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/PermissionsNavLink.test.tsx
@@ -22,15 +22,14 @@
  * SOFTWARE.
  */
 import React from "react";
-import { mount, shallow } from "@scm-manager/ui-tests/enzyme-router";
-import "@scm-manager/ui-tests/enzyme";
-import "@scm-manager/ui-tests/i18n";
+import { mount, shallow } from "@scm-manager/ui-tests";
+import "@scm-manager/ui-tests";
 import PermissionsNavLink from "./PermissionsNavLink";
 
 describe("PermissionsNavLink", () => {
   it("should render nothing, if the modify link is missing", () => {
     const repository = {
-      _links: {},
+      _links: {}
     };
 
     const navLink = shallow(<PermissionsNavLink repository={repository} permissionUrl="" />);
@@ -41,9 +40,9 @@ describe("PermissionsNavLink", () => {
     const repository = {
       _links: {
         permissions: {
-          href: "/permissions",
-        },
-      },
+          href: "/permissions"
+        }
+      }
     };
 
     const navLink = mount(<PermissionsNavLink repository={repository} permissionUrl="" />);
diff --git a/scm-ui/ui-webapp/src/repos/components/RepositoryDetails.tsx b/scm-ui/ui-webapp/src/repos/components/RepositoryDetails.tsx
index 5b07b2d04c..9aa1fa2ba1 100644
--- a/scm-ui/ui-webapp/src/repos/components/RepositoryDetails.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/RepositoryDetails.tsx
@@ -42,7 +42,7 @@ class RepositoryDetails extends React.Component<Props> {
             name="repos.repository-details.information"
             renderAll={true}
             props={{
-              repository,
+              repository
             }}
           />
         </div>
diff --git a/scm-ui/ui-webapp/src/repos/components/RepositoryInformationForm.tsx b/scm-ui/ui-webapp/src/repos/components/RepositoryInformationForm.tsx
index d4b95a9d79..32f40ce766 100644
--- a/scm-ui/ui-webapp/src/repos/components/RepositoryInformationForm.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/RepositoryInformationForm.tsx
@@ -58,7 +58,7 @@ const RepositoryInformationForm: FC<Props> = ({ repository, onChange, disabled,
       />
       <Textarea
         label={t("repository.description")}
-        onChange={(description) => onChange({ ...repository, description })}
+        onChange={description => onChange({ ...repository, description })}
         value={repository ? repository.description : ""}
         helpText={t("help.descriptionHelpText")}
         disabled={disabled}
diff --git a/scm-ui/ui-webapp/src/repos/components/RepositoryNavLink.test.tsx b/scm-ui/ui-webapp/src/repos/components/RepositoryNavLink.test.tsx
index 3589775462..799fa2ff42 100644
--- a/scm-ui/ui-webapp/src/repos/components/RepositoryNavLink.test.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/RepositoryNavLink.test.tsx
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 import React from "react";
-import { mount, shallow } from "@scm-manager/ui-tests/enzyme-router";
-import "@scm-manager/ui-tests/i18n";
+import { mount, shallow } from "@scm-manager/ui-tests";
+import "@scm-manager/ui-tests";
 import RepositoryNavLink from "./RepositoryNavLink";
 
 describe("RepositoryNavLink", () => {
@@ -32,7 +32,7 @@ describe("RepositoryNavLink", () => {
       namespace: "Namespace",
       name: "Repo",
       type: "GIT",
-      _links: {},
+      _links: {}
     };
 
     const navLink = shallow(
@@ -54,9 +54,9 @@ describe("RepositoryNavLink", () => {
       type: "GIT",
       _links: {
         sources: {
-          href: "/sources",
-        },
-      },
+          href: "/sources"
+        }
+      }
     };
 
     const navLink = mount(
diff --git a/scm-ui/ui-webapp/src/repos/components/RepositoryNavLink.tsx b/scm-ui/ui-webapp/src/repos/components/RepositoryNavLink.tsx
index 20559b19e8..d6eec2f505 100644
--- a/scm-ui/ui-webapp/src/repos/components/RepositoryNavLink.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/RepositoryNavLink.tsx
@@ -24,13 +24,14 @@
 import React from "react";
 import { Repository } from "@scm-manager/ui-types";
 import { NavLink } from "@scm-manager/ui-components";
+import { RouteProps } from "react-router-dom";
 
 type Props = {
   repository: Repository;
   to: string;
   label: string;
   linkName: string;
-  activeWhenMatch?: (route: any) => boolean;
+  activeWhenMatch?: (route: RouteProps) => boolean;
   activeOnlyWhenExact: boolean;
   icon?: string;
   title?: string;
diff --git a/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx b/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx
index 3d5dcf7f64..3695bbc7ff 100644
--- a/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx
@@ -131,7 +131,7 @@ const ChangesetDetails: FC<Props> = ({ changeset, repository, fileControlFactory
   const description = changesets.parseDescription(changeset.description);
   const id = <ChangesetId repository={repository} changeset={changeset} link={false} />;
   const date = <DateFromNow date={changeset.date} />;
-  const parents = changeset._embedded.parents?.map((parent: ParentChangeset, index: number) => (
+  const parents = changeset._embedded?.parents?.map((parent: ParentChangeset, index: number) => (
     <ReactLink title={parent.id} to={parent.id} key={index}>
       {parent.id.substring(0, 7)}
     </ReactLink>
@@ -187,7 +187,7 @@ const ChangesetDetails: FC<Props> = ({ changeset, repository, fileControlFactory
                 <Button
                   color="success"
                   className="tag"
-                  label={(changeset._embedded["tags"]?.length === 0 && t("changeset.tag.create")) || ""}
+                  label={(changeset._embedded?.tags?.length === 0 && t("changeset.tag.create")) || ""}
                   icon="plus"
                   action={() => setTagCreationModalVisible(true)}
                 />
diff --git a/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetShortLink.tsx b/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetShortLink.tsx
index 68ab08f111..18dc873875 100644
--- a/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetShortLink.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetShortLink.tsx
@@ -40,7 +40,7 @@ const ChangesetShortLink: (changeset: Changeset, value: string) => Replacement[]
     const link = `/repo/${namespace}/${name}/code/changeset/${revision}`;
     replacements.push({
       textToReplace: m[0],
-      replacement: <Link to={link}>{m[0]}</Link>,
+      replacement: <Link to={link}>{m[0]}</Link>
     });
     m = regex.exec(value);
   }
diff --git a/scm-ui/ui-webapp/src/repos/components/changesets/ContributorTable.tsx b/scm-ui/ui-webapp/src/repos/components/changesets/ContributorTable.tsx
index 5cdb0faa18..44d853c2dc 100644
--- a/scm-ui/ui-webapp/src/repos/components/changesets/ContributorTable.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/changesets/ContributorTable.tsx
@@ -62,6 +62,16 @@ const Contributor: FC<{ person: Person }> = ({ person }) => {
   return <>{person.name}</>;
 };
 
+const getUnique = (items: string[]) =>
+  Object.keys(
+    items.reduce((result, item) => {
+      if (!(item in result)) {
+        result[item] = true;
+      }
+      return result;
+    }, {} as { [type: string]: boolean })
+  );
+
 const ContributorTable: FC<Props> = ({ changeset }) => {
   const [t] = useTranslation("plugins");
 
@@ -69,11 +79,11 @@ const ContributorTable: FC<Props> = ({ changeset }) => {
     if (!changeset.contributors) {
       return [];
     }
-    return new Set(changeset.contributors.map((contributor) => contributor.type));
+    return getUnique(changeset.contributors.map(contributor => contributor.type));
   };
 
   const getPersonsByContributorType = (type: string) => {
-    return changeset.contributors?.filter((contributor) => contributor.type === type).map((t) => t.person);
+    return changeset.contributors?.filter(contributor => contributor.type === type).map(t => t.person);
   };
 
   const getContributorsByType = () => {
@@ -94,12 +104,12 @@ const ContributorTable: FC<Props> = ({ changeset }) => {
           <Contributor person={changeset.author} />
         </td>
       </tr>
-      {getContributorsByType().map((contributor) => (
+      {getContributorsByType().map(contributor => (
         <tr key={contributor.type}>
           <SizedTd>{t("changeset.contributor.type." + contributor.type)}:</SizedTd>
           <td className="is-ellipsis-overflow m-0">
             <CommaSeparatedList>
-              {contributor.persons!.map((person) => (
+              {contributor.persons?.map(person => (
                 <Contributor key={person.name} person={person} />
               ))}
             </CommaSeparatedList>
diff --git a/scm-ui/ui-webapp/src/repos/components/changesets/CreateTagModal.tsx b/scm-ui/ui-webapp/src/repos/components/changesets/CreateTagModal.tsx
index c377979da0..66fdfdf8a3 100644
--- a/scm-ui/ui-webapp/src/repos/components/changesets/CreateTagModal.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/changesets/CreateTagModal.tsx
@@ -37,12 +37,10 @@ type Props = {
 
 const CreateTagModal: FC<Props> = ({ repository, changeset, onClose }) => {
   const { isLoading, error, data: tags } = useTags(repository);
-  const {
-    isLoading: isLoadingCreate,
-    error: errorCreate,
-    create,
-    tag: createdTag,
-  } = useCreateTag(repository, changeset);
+  const { isLoading: isLoadingCreate, error: errorCreate, create, tag: createdTag } = useCreateTag(
+    repository,
+    changeset
+  );
   const [t] = useTranslation("repos");
   const [newTagName, setNewTagName] = useState("");
   useEffect(() => {
@@ -51,7 +49,7 @@ const CreateTagModal: FC<Props> = ({ repository, changeset, onClose }) => {
     }
   }, [createdTag, onClose]);
 
-  const tagNames = tags?._embedded.tags.map((tag) => tag.name);
+  const tagNames = tags?._embedded.tags.map(tag => tag.name);
 
   let validationError = "";
 
@@ -76,7 +74,7 @@ const CreateTagModal: FC<Props> = ({ repository, changeset, onClose }) => {
         <InputField
           name="name"
           label={t("tags.create.form.field.name.label")}
-          onChange={(val) => setNewTagName(val)}
+          onChange={val => setNewTagName(val)}
           value={newTagName}
           validationError={!!validationError}
           errorMessage={t(validationError)}
diff --git a/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx b/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx
index 2e184ee316..9f37de5623 100644
--- a/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx
@@ -25,7 +25,14 @@ import React, { FC, useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import classNames from "classnames";
 import { ExtensionPoint } from "@scm-manager/ui-extensions";
-import { IndexResources, Repository, RepositoryType, CUSTOM_NAMESPACE_STRATEGY } from "@scm-manager/ui-types";
+import {
+  CUSTOM_NAMESPACE_STRATEGY,
+  IndexResources,
+  Repository,
+  RepositoryBase,
+  RepositoryCreation,
+  RepositoryType
+} from "@scm-manager/ui-types";
 import { Checkbox, Level, Select, SubmitButton } from "@scm-manager/ui-components";
 import NamespaceAndNameFields from "../NamespaceAndNameFields";
 import RepositoryInformationForm from "../RepositoryInformationForm";
@@ -40,10 +47,6 @@ type Props = {
   indexResources?: IndexResources;
 };
 
-type RepositoryCreation = Repository & {
-  contextEntries: object;
-};
-
 const RepositoryForm: FC<Props> = ({
   createRepository,
   modifyRepository,
@@ -51,29 +54,35 @@ const RepositoryForm: FC<Props> = ({
   repositoryTypes,
   namespaceStrategy,
   loading,
-  indexResources,
+  indexResources
 }) => {
-  const [repo, setRepo] = useState<Repository>({
+  const [repo, setRepo] = useState<RepositoryBase>({
     name: "",
     namespace: "",
     type: "",
     contact: "",
-    description: "",
-    _links: {},
+    description: ""
   });
   const [initRepository, setInitRepository] = useState(false);
   const [contextEntries, setContextEntries] = useState({});
   const setCreationContextEntry = useCallback(
-    (key: string, value: any) => {
-      setContextEntries((entries) => ({
+    (key: string, value: unknown) => {
+      setContextEntries(entries => ({
         ...entries,
-        [key]: value,
+        [key]: value
       }));
     },
     [setContextEntries]
   );
   const [valid, setValid] = useState({ namespaceAndName: true, contact: true });
   const [t] = useTranslation("repos");
+  const setContactValid = useCallback((contact: boolean) => setValid(currentValid => ({ ...currentValid, contact })), [
+    setValid
+  ]);
+  const setNamespaceAndNameValid = useCallback(
+    (namespaceAndName: boolean) => setValid(currentValid => ({ ...currentValid, namespaceAndName })),
+    [setValid]
+  );
 
   useEffect(() => {
     if (repository) {
@@ -88,7 +97,7 @@ const RepositoryForm: FC<Props> = ({
   const isValid = () => {
     return (
       !(!repo.name || (namespaceStrategy === CUSTOM_NAMESPACE_STRATEGY && !repo.namespace)) &&
-      Object.values(valid).every((v) => v)
+      Object.values(valid).every(v => v)
     );
   };
 
@@ -98,17 +107,21 @@ const RepositoryForm: FC<Props> = ({
       if (createRepository) {
         createRepository({ ...repo, contextEntries }, initRepository);
       } else if (modifyRepository) {
-        modifyRepository(repo);
+        if (!!repository && !!repository._links.update) {
+          modifyRepository({ ...repository, ...repo });
+        } else {
+          throw new Error("Repository has to be present and contain update link for modification");
+        }
       }
     }
   };
 
   const createSelectOptions = (repositoryTypes?: RepositoryType[]) => {
     if (repositoryTypes) {
-      return repositoryTypes.map((repositoryType) => {
+      return repositoryTypes.map(repositoryType => {
         return {
           label: repositoryType.displayName,
-          value: repositoryType.name,
+          value: repositoryType.name
         };
       });
     }
@@ -123,21 +136,21 @@ const RepositoryForm: FC<Props> = ({
     const extensionProps = {
       repository: repo,
       setCreationContextEntry: setCreationContextEntry,
-      indexResources: indexResourcesWithLinks,
+      indexResources: indexResourcesWithLinks
     };
     return (
       <>
         <NamespaceAndNameFields
           repository={repo}
           onChange={setRepo}
-          setValid={(namespaceAndName) => setValid({ ...valid, namespaceAndName })}
+          setValid={setNamespaceAndNameValid}
           disabled={disabled}
         />
         <div className="columns">
           <div className={classNames("column", "is-half")}>
             <Select
               label={t("repository.type")}
-              onChange={(type) => setRepo({ ...repo, type })}
+              onChange={type => setRepo({ ...repo, type })}
               value={repo ? repo.type : ""}
               options={createSelectOptions(repositoryTypes)}
               helpText={t("help.typeHelpText")}
@@ -181,12 +194,7 @@ const RepositoryForm: FC<Props> = ({
   return (
     <form onSubmit={submit}>
       {renderCreateOnlyFields()}
-      <RepositoryInformationForm
-        repository={repo}
-        onChange={setRepo}
-        disabled={disabled}
-        setValid={(contact) => setValid({ ...valid, contact })}
-      />
+      <RepositoryInformationForm repository={repo} onChange={setRepo} disabled={disabled} setValid={setContactValid} />
       {submitButton()}
     </form>
   );
diff --git a/scm-ui/ui-webapp/src/repos/components/form/RepositoryFormSwitcher.tsx b/scm-ui/ui-webapp/src/repos/components/form/RepositoryFormSwitcher.tsx
index ad29e72718..04e8611a7f 100644
--- a/scm-ui/ui-webapp/src/repos/components/form/RepositoryFormSwitcher.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/form/RepositoryFormSwitcher.tsx
@@ -71,7 +71,7 @@ const RepositoryFormSwitcher: FC<Props> = ({ forms }) => (
   <TopLevel
     right={
       <ButtonAddons>
-        {(forms || []).map((form) => (
+        {(forms || []).map(form => (
           <RepositoryFormButton key={form.path} {...form} />
         ))}
       </ButtonAddons>
diff --git a/scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.test.ts b/scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.test.ts
index cd1653e9c5..97a45aab2a 100644
--- a/scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.test.ts
+++ b/scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.test.ts
@@ -39,7 +39,7 @@ describe("repository name validation", () => {
   it("should allow same names as the backend", () => {
     const validPaths = ["scm", "scm.gitz", "s", "sc", ".hiddenrepo", "b.", "...", "..c", "d..", "a..c"];
 
-    validPaths.forEach((path) => expect(validator.isNameValid(path)).toBe(true));
+    validPaths.forEach(path => expect(validator.isNameValid(path)).toBe(true));
   });
 
   it("should deny same names as the backend", () => {
@@ -68,6 +68,7 @@ describe("repository name validation", () => {
       "scm//main",
       "scm\\main",
       "scm/main-$HOME",
+      // eslint-disable-next-line no-template-curly-in-string
       "scm/main-${HOME}-home",
       "scm/main-%HOME-home",
       "scm/main-%HOME%-home",
@@ -92,10 +93,10 @@ describe("repository name validation", () => {
       "scm/main",
       "scm/plugins/git-plugin",
       "scm/plugins/git-plugin",
-      "scm.git",
+      "scm.git"
     ];
 
-    invalidPaths.forEach((path) => expect(validator.isNameValid(path)).toBe(false));
+    invalidPaths.forEach(path => expect(validator.isNameValid(path)).toBe(false));
   });
 });
 
diff --git a/scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.ts b/scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.ts
index e4252a8a9b..f4f9b3e83f 100644
--- a/scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.ts
+++ b/scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.ts
@@ -25,6 +25,7 @@
 import { validation } from "@scm-manager/ui-components";
 import { isNameValid as isUserNameValid } from "../../../users/components/userValidation";
 
+// eslint-disable-next-line
 const nameRegex = /(?!^\.\.$)(?!^\.$)(?!.*[.]git$)(?!.*[\\\[\]])^[A-Za-z0-9\.][A-Za-z0-9\.\-_]*$/;
 const namespaceExceptionsRegex = /^(([0-9]{1,3})|(create)|(import))$/;
 
diff --git a/scm-ui/ui-webapp/src/repos/components/list/RepositoryList.tsx b/scm-ui/ui-webapp/src/repos/components/list/RepositoryList.tsx
index e8b52480e6..1115a07119 100644
--- a/scm-ui/ui-webapp/src/repos/components/list/RepositoryList.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/list/RepositoryList.tsx
@@ -50,10 +50,10 @@ class RepositoryList extends React.Component<Props> {
           props={{
             page,
             search,
-            namespace,
+            namespace
           }}
         />
-        {groups.map((group) => {
+        {groups.map(group => {
           return <RepositoryGroupEntry group={group} key={group.name} />;
         })}
       </div>
diff --git a/scm-ui/ui-webapp/src/repos/components/list/groupByNamespace.test.ts b/scm-ui/ui-webapp/src/repos/components/list/groupByNamespace.test.ts
index d9cd992bab..4a917d15e4 100644
--- a/scm-ui/ui-webapp/src/repos/components/list/groupByNamespace.test.ts
+++ b/scm-ui/ui-webapp/src/repos/components/list/groupByNamespace.test.ts
@@ -26,42 +26,42 @@ import groupByNamespace from "./groupByNamespace";
 
 const base = {
   type: "git",
-  _links: {},
+  _links: {}
 };
 
 const slartiBlueprintsFjords = {
   ...base,
   namespace: "slarti",
-  name: "fjords-blueprints",
+  name: "fjords-blueprints"
 };
 
 const slartiFjords = {
   ...base,
   namespace: "slarti",
-  name: "fjords",
+  name: "fjords"
 };
 
 const hitchhikerRestand = {
   ...base,
   namespace: "hitchhiker",
-  name: "restand",
+  name: "restand"
 };
 const hitchhikerPuzzle42 = {
   ...base,
   namespace: "hitchhiker",
-  name: "puzzle42",
+  name: "puzzle42"
 };
 
 const hitchhikerHeartOfGold = {
   ...base,
   namespace: "hitchhiker",
-  name: "heartOfGold",
+  name: "heartOfGold"
 };
 
 const zaphodMarvinFirmware = {
   ...base,
   namespace: "zaphod",
-  name: "marvin-firmware",
+  name: "marvin-firmware"
 };
 
 it("should group the repositories by their namespace", () => {
@@ -71,30 +71,30 @@ it("should group the repositories by their namespace", () => {
     hitchhikerRestand,
     slartiFjords,
     hitchhikerHeartOfGold,
-    hitchhikerPuzzle42,
+    hitchhikerPuzzle42
   ];
   const namespaces = {
     _embedded: {
-      namespaces: [{ namespace: "hitchhiker" }, { namespace: "slarti" }, { namespace: "zaphod" }],
-    },
+      namespaces: [{ namespace: "hitchhiker" }, { namespace: "slarti" }, { namespace: "zaphod" }]
+    }
   };
 
   const expected = [
     {
       name: "hitchhiker",
       namespace: { namespace: "hitchhiker" },
-      repositories: [hitchhikerHeartOfGold, hitchhikerPuzzle42, hitchhikerRestand],
+      repositories: [hitchhikerHeartOfGold, hitchhikerPuzzle42, hitchhikerRestand]
     },
     {
       name: "slarti",
       namespace: { namespace: "slarti" },
-      repositories: [slartiFjords, slartiBlueprintsFjords],
+      repositories: [slartiFjords, slartiBlueprintsFjords]
     },
     {
       name: "zaphod",
       namespace: { namespace: "zaphod" },
-      repositories: [zaphodMarvinFirmware],
-    },
+      repositories: [zaphodMarvinFirmware]
+    }
   ];
 
   expect(groupByNamespace(repositories, namespaces)).toEqual(expected);
diff --git a/scm-ui/ui-webapp/src/repos/components/list/groupByNamespace.ts b/scm-ui/ui-webapp/src/repos/components/list/groupByNamespace.ts
index 2a767e77c4..f8b04a51c2 100644
--- a/scm-ui/ui-webapp/src/repos/components/list/groupByNamespace.ts
+++ b/scm-ui/ui-webapp/src/repos/components/list/groupByNamespace.ts
@@ -38,7 +38,7 @@ export default function groupByNamespace(
       group = {
         name: groupName,
         namespace: namespace,
-        repositories: [],
+        repositories: []
       };
       groups[groupName] = group;
     }
@@ -65,5 +65,5 @@ function sortByName(a, b) {
 }
 
 function findNamespace(namespaces: NamespaceCollection, namespaceToFind: string) {
-  return namespaces._embedded.namespaces.find((namespace) => namespace.namespace === namespaceToFind);
+  return namespaces._embedded.namespaces.find(namespace => namespace.namespace === namespaceToFind);
 }
diff --git a/scm-ui/ui-webapp/src/repos/containers/Changesets.tsx b/scm-ui/ui-webapp/src/repos/containers/Changesets.tsx
index 135ca73fb0..8121489afa 100644
--- a/scm-ui/ui-webapp/src/repos/containers/Changesets.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/Changesets.tsx
@@ -31,7 +31,7 @@ import {
   urls,
   LinkPaginator,
   Loading,
-  Notification,
+  Notification
 } from "@scm-manager/ui-components";
 import { useChangesets } from "@scm-manager/ui-api";
 
diff --git a/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx b/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx
index a77d66eea4..8ebb000b43 100644
--- a/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx
@@ -44,10 +44,10 @@ const ChangesetRoot: FC<Props> = ({ repository, baseUrl, branches, selectedBranc
   }
 
   const url = urls.stripEndingSlash(match.url);
-  const defaultBranch = branches?.find((b) => b.defaultBranch === true);
+  const defaultBranch = branches?.find(b => b.defaultBranch === true);
 
   const isBranchAvailable = () => {
-    return branches?.filter((b) => b.name === selectedBranch).length === 0;
+    return branches?.filter(b => b.name === selectedBranch).length === 0;
   };
 
   const evaluateSwitchViewLink = () => {
@@ -76,7 +76,7 @@ const ChangesetRoot: FC<Props> = ({ repository, baseUrl, branches, selectedBranc
       />
       <div className="panel">
         <Route path={`${url}/:page?`}>
-          <Changesets repository={repository} branch={branches?.filter((b) => b.name === selectedBranch)[0]} />
+          <Changesets repository={repository} branch={branches?.filter(b => b.name === selectedBranch)[0]} />
         </Route>
       </div>
     </>
diff --git a/scm-ui/ui-webapp/src/repos/containers/CreateRepositoryRoot.tsx b/scm-ui/ui-webapp/src/repos/containers/CreateRepositoryRoot.tsx
index 7be6cbb135..641409bd96 100644
--- a/scm-ui/ui-webapp/src/repos/containers/CreateRepositoryRoot.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/CreateRepositoryRoot.tsx
@@ -49,7 +49,7 @@ const useCreateRepositoryData = () => {
     pageLoadingError: errorNS || errorRT || errorIdx || undefined,
     namespaceStrategies,
     repositoryTypes,
-    index,
+    index
   };
 };
 
@@ -90,15 +90,15 @@ const CreateRepositoryRoot: FC = () => {
       path: "",
       icon: "plus",
       label: t("repositoryForm.createButton"),
-      component: CreateRepository,
+      component: CreateRepository
     },
     {
       subtitle: t("import.subtitle"),
       path: "import",
       icon: "file-upload",
       label: t("repositoryForm.importButton"),
-      component: ImportRepository,
-    },
+      component: ImportRepository
+    }
   ];
 
   const extCreators = binder.getExtensions<extensionPoints.RepositoryCreator>("repos.creator");
@@ -108,7 +108,7 @@ const CreateRepositoryRoot: FC = () => {
 
   return (
     <Switch>
-      {creators.map((creator) => (
+      {creators.map(creator => (
         <Route key={creator.path} exact path={urls.concat("/repos/create", creator.path)}>
           <CreatorRoute creator={creator} creators={creators} />
         </Route>
diff --git a/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx b/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx
index 3b29788ad7..8efb46b489 100644
--- a/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx
@@ -50,7 +50,7 @@ const EditRepo: FC<Props> = ({ repository }) => {
   const url = urls.matchedUrlFromMatch(match);
   const extensionProps = {
     repository,
-    url,
+    url
   };
 
   return (
diff --git a/scm-ui/ui-webapp/src/repos/containers/ExportRepository.tsx b/scm-ui/ui-webapp/src/repos/containers/ExportRepository.tsx
index fb7615acf2..0dc4c31a3b 100644
--- a/scm-ui/ui-webapp/src/repos/containers/ExportRepository.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/ExportRepository.tsx
@@ -31,7 +31,7 @@ import {
   InputField,
   Level,
   Notification,
-  Subtitle,
+  Subtitle
 } from "@scm-manager/ui-components";
 import { useTranslation } from "react-i18next";
 import { ExportInfo, Link, Repository } from "@scm-manager/ui-types";
@@ -89,7 +89,7 @@ const ExportRepository: FC<Props> = ({ repository }) => {
     isLoading: isLoadingExport,
     error: errorExport,
     data: exportedInfo,
-    exportRepository,
+    exportRepository
   } = useExportRepository();
 
   useEffect(() => {
@@ -171,7 +171,7 @@ const ExportRepository: FC<Props> = ({ repository }) => {
                 exportRepository(repository, {
                   compressed,
                   password: encrypt ? password : "",
-                  withMetadata: fullExport,
+                  withMetadata: fullExport
                 })
               }
               loading={isLoadingInfo || isLoadingExport}
diff --git a/scm-ui/ui-webapp/src/repos/containers/ImportRepository.tsx b/scm-ui/ui-webapp/src/repos/containers/ImportRepository.tsx
index 3e01b0226f..c84516f2f2 100644
--- a/scm-ui/ui-webapp/src/repos/containers/ImportRepository.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/ImportRepository.tsx
@@ -53,7 +53,7 @@ const ImportPendingLoading = ({ importPending }: { importPending: boolean }) =>
 const ImportRepository: extensionPoints.RepositoryCreatorExtension["component"] = ({
   repositoryTypes,
   nameForm,
-  informationForm,
+  informationForm
 }) => {
   const [importPending, setImportPending] = useState(false);
   const [importedRepository, setImportedRepository] = useState<Repository>();
@@ -65,14 +65,17 @@ const ImportRepository: extensionPoints.RepositoryCreatorExtension["component"]
 
   const changeRepositoryType = (repositoryType: RepositoryType) => {
     setRepositoryType(repositoryType);
-    setImportType(repositoryType?._links ? ((repositoryType!._links?.import as Link[])[0] as Link).name! : "");
+    setImportType(((repositoryType._links?.import as Link[])[0] as Link)?.name || "");
   };
 
   const renderImportComponent = () => {
+    if (!repositoryType) {
+      throw new Error("Missing import type");
+    }
     if (importType === "url") {
       return (
         <ImportRepositoryFromUrl
-          repositoryType={repositoryType!}
+          repositoryType={repositoryType}
           setImportPending={setImportPending}
           setImportedRepository={setImportedRepository}
           nameForm={nameForm}
@@ -84,7 +87,7 @@ const ImportRepository: extensionPoints.RepositoryCreatorExtension["component"]
     if (importType === "bundle") {
       return (
         <ImportRepositoryFromBundle
-          repositoryType={repositoryType!}
+          repositoryType={repositoryType}
           setImportPending={setImportPending}
           setImportedRepository={setImportedRepository}
           nameForm={nameForm}
@@ -96,7 +99,7 @@ const ImportRepository: extensionPoints.RepositoryCreatorExtension["component"]
     if (importType === "fullImport") {
       return (
         <ImportFullRepository
-          repositoryType={repositoryType!}
+          repositoryType={repositoryType}
           setImportPending={setImportPending}
           setImportedRepository={setImportedRepository}
           nameForm={nameForm}
@@ -104,7 +107,6 @@ const ImportRepository: extensionPoints.RepositoryCreatorExtension["component"]
         />
       );
     }
-
     throw new Error("Unknown import type");
   };
 
@@ -117,7 +119,7 @@ const ImportRepository: extensionPoints.RepositoryCreatorExtension["component"]
       <Prompt when={importPending} message={t("import.navigationWarning")} />
       <ImportPendingLoading importPending={importPending} />
       <ImportRepositoryTypeSelect
-        repositoryTypes={repositoryTypes?._embedded.repositoryTypes || []}
+        repositoryTypes={repositoryTypes?._embedded?.repositoryTypes || []}
         repositoryType={repositoryType}
         setRepositoryType={changeRepositoryType}
         disabled={importPending}
diff --git a/scm-ui/ui-webapp/src/repos/containers/RenameRepository.tsx b/scm-ui/ui-webapp/src/repos/containers/RenameRepository.tsx
index e17e509600..28aa625a7f 100644
--- a/scm-ui/ui-webapp/src/repos/containers/RenameRepository.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/RenameRepository.tsx
@@ -86,7 +86,7 @@ const RenameRepository: FC<Props> = ({ repository }) => {
       validationError: namespaceValidationError
     };
 
-    if (namespaceStrategies!.current === CUSTOM_NAMESPACE_STRATEGY) {
+    if (namespaceStrategies?.current === CUSTOM_NAMESPACE_STRATEGY) {
       return <InputField {...props} />;
     }
 
diff --git a/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx b/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx
index fb946d5284..629cc776cc 100644
--- a/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx
@@ -22,7 +22,8 @@
  * SOFTWARE.
  */
 import React, { useState } from "react";
-import { Link as RouteLink, Redirect, Route, Switch, useRouteMatch } from "react-router-dom";
+import { match as Match } from "react-router";
+import { Link as RouteLink, Redirect, Route, RouteProps, Switch, useRouteMatch } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { binder, ExtensionPoint } from "@scm-manager/ui-extensions";
 import { Changeset, Link } from "@scm-manager/ui-types";
@@ -41,7 +42,7 @@ import {
   SecondaryNavigationColumn,
   StateMenuContextProvider,
   SubNavigation,
-  urls,
+  urls
 } from "@scm-manager/ui-components";
 import RepositoryDetails from "../components/RepositoryDetails";
 import EditRepo from "./EditRepo";
@@ -71,12 +72,12 @@ type UrlParams = {
   name: string;
 };
 
-const useRepositoryFromUrl = (match: match<UrlParams>) => {
+const useRepositoryFromUrl = (match: Match<UrlParams>) => {
   const { namespace, name } = match.params;
   const { data: repository, ...rest } = useRepository(namespace, name);
   return {
     repository,
-    ...rest,
+    ...rest
   };
 };
 
@@ -110,7 +111,7 @@ const RepositoryRoot = () => {
     error,
     repoLink: (indexLinks.repositories as Link)?.href,
     indexLinks,
-    match,
+    match
   };
 
   const redirectUrlFactory = binder.getExtension("repository.redirect", props);
@@ -121,16 +122,16 @@ const RepositoryRoot = () => {
     redirectedUrl = url + "/code/sources/";
   }
 
-  const fileControlFactoryFactory: (changeset: Changeset) => FileControlFactory = (changeset) => (file) => {
+  const fileControlFactoryFactory: (changeset: Changeset) => FileControlFactory = changeset => file => {
     const baseUrl = `${url}/code/sources`;
     const sourceLink = file.newPath && {
       url: `${baseUrl}/${changeset.id}/${file.newPath}/`,
-      label: t("diff.jumpToSource"),
+      label: t("diff.jumpToSource")
     };
     const targetLink = file.oldPath &&
       changeset._embedded?.parents?.length === 1 && {
         url: `${baseUrl}/${changeset._embedded.parents[0].id}/${file.oldPath}`,
-        label: t("diff.jumpToTarget"),
+        label: t("diff.jumpToTarget")
       };
 
     const links = [];
@@ -168,22 +169,31 @@ const RepositoryRoot = () => {
   const extensionProps = {
     repository,
     url,
-    indexLinks,
+    indexLinks
   };
 
-  const matchesBranches = (route: any) => {
+  const matchesBranches = (route: RouteProps) => {
     const regex = new RegExp(`${url}/branch/.+/info`);
-    return route.location.pathname.match(regex);
+    if (!route.location) {
+      return false;
+    }
+    return !!route.location.pathname.match(regex);
   };
 
-  const matchesTags = (route: any) => {
+  const matchesTags = (route: RouteProps) => {
     const regex = new RegExp(`${url}/tag/.+/info`);
-    return route.location.pathname.match(regex);
+    if (!route.location) {
+      return false;
+    }
+    return !!route.location.pathname.match(regex);
   };
 
-  const matchesCode = (route: any) => {
+  const matchesCode = (route: RouteProps) => {
     const regex = new RegExp(`${url}(/code)/.*`);
-    return route.location.pathname.match(regex);
+    if (!route.location) {
+      return false;
+    }
+    return !!route.location.pathname.match(regex);
   };
 
   const getCodeLinkname = () => {
diff --git a/scm-ui/ui-webapp/src/repos/importlog/ImportLog.tsx b/scm-ui/ui-webapp/src/repos/importlog/ImportLog.tsx
index cc67da59ed..d1286f8fba 100644
--- a/scm-ui/ui-webapp/src/repos/importlog/ImportLog.tsx
+++ b/scm-ui/ui-webapp/src/repos/importlog/ImportLog.tsx
@@ -23,7 +23,7 @@
  */
 
 import React, { FC } from "react";
-import { useImportLog, useIndex } from "@scm-manager/ui-api";
+import { useImportLog } from "@scm-manager/ui-api";
 import { useParams } from "react-router-dom";
 import { Page } from "@scm-manager/ui-components";
 import { useTranslation } from "react-i18next";
diff --git a/scm-ui/ui-webapp/src/repos/namespaces/containers/NamespaceRoot.tsx b/scm-ui/ui-webapp/src/repos/namespaces/containers/NamespaceRoot.tsx
index 362ed1ca7c..9d70f961de 100644
--- a/scm-ui/ui-webapp/src/repos/namespaces/containers/NamespaceRoot.tsx
+++ b/scm-ui/ui-webapp/src/repos/namespaces/containers/NamespaceRoot.tsx
@@ -34,7 +34,7 @@ import {
   SecondaryNavigation,
   SecondaryNavigationColumn,
   StateMenuContextProvider,
-  SubNavigation,
+  SubNavigation
 } from "@scm-manager/ui-components";
 import Permissions from "../../permissions/containers/Permissions";
 import { ExtensionPoint } from "@scm-manager/ui-extensions";
@@ -64,7 +64,7 @@ const NamespaceRoot: FC = () => {
 
   const extensionProps = {
     namespace,
-    url,
+    url
   };
 
   return (
diff --git a/scm-ui/ui-webapp/src/repos/permissions/components/DeletePermissionButton.tsx b/scm-ui/ui-webapp/src/repos/permissions/components/DeletePermissionButton.tsx
index 1cc8b1ab8d..a31f25dded 100644
--- a/scm-ui/ui-webapp/src/repos/permissions/components/DeletePermissionButton.tsx
+++ b/scm-ui/ui-webapp/src/repos/permissions/components/DeletePermissionButton.tsx
@@ -63,12 +63,12 @@ const DeletePermissionButton: FC<Props> = ({ namespaceOrRepository, permission,
             className: "is-outlined",
             label: t("permission.delete-permission-button.confirm-alert.submit"),
             isLoading,
-            onClick: () => deletePermission(),
+            onClick: () => deletePermission()
           },
           {
             label: t("permission.delete-permission-button.confirm-alert.cancel"),
-            onClick: () => null,
-          },
+            onClick: () => null
+          }
         ]}
         close={() => setShowConfirmAlert(false)}
       />
diff --git a/scm-ui/ui-webapp/src/repos/permissions/components/PermissionsTable.tsx b/scm-ui/ui-webapp/src/repos/permissions/components/PermissionsTable.tsx
index 73e9fe963e..e0c4828dff 100644
--- a/scm-ui/ui-webapp/src/repos/permissions/components/PermissionsTable.tsx
+++ b/scm-ui/ui-webapp/src/repos/permissions/components/PermissionsTable.tsx
@@ -39,7 +39,7 @@ const PermissionsTable: FC<Props> = ({
   availableRoles,
   availableVerbs,
   namespaceOrRepository,
-  permissions: permissionCollection,
+  permissions: permissionCollection
 }) => {
   const [t] = useTranslation("repos");
 
@@ -77,7 +77,7 @@ const PermissionsTable: FC<Props> = ({
         </tr>
       </thead>
       <tbody>
-        {permissionCollection?._embedded.permissions.map((permission) => {
+        {permissionCollection?._embedded.permissions.map(permission => {
           return (
             <SinglePermission
               availableRoles={availableRoles}
diff --git a/scm-ui/ui-webapp/src/repos/permissions/components/RoleSelector.tsx b/scm-ui/ui-webapp/src/repos/permissions/components/RoleSelector.tsx
index 39fcfca3a7..cf497c37f5 100644
--- a/scm-ui/ui-webapp/src/repos/permissions/components/RoleSelector.tsx
+++ b/scm-ui/ui-webapp/src/repos/permissions/components/RoleSelector.tsx
@@ -35,10 +35,10 @@ type Props = {
 };
 
 const createSelectOptions = (roles: string[]) => {
-  return roles.map((role) => {
+  return roles.map(role => {
     return {
       label: role,
-      value: role,
+      value: role
     };
   });
 };
diff --git a/scm-ui/ui-webapp/src/repos/permissions/containers/AdvancedPermissionsDialog.tsx b/scm-ui/ui-webapp/src/repos/permissions/containers/AdvancedPermissionsDialog.tsx
index 34ac6c709d..6e79bf5a79 100644
--- a/scm-ui/ui-webapp/src/repos/permissions/containers/AdvancedPermissionsDialog.tsx
+++ b/scm-ui/ui-webapp/src/repos/permissions/containers/AdvancedPermissionsDialog.tsx
@@ -38,7 +38,7 @@ type Props = {
 
 const createPreSelection = (availableVerbs: string[], selectedVerbs?: string[]): SelectedVerbs => {
   const verbs: SelectedVerbs = {};
-  availableVerbs.forEach((verb) => (verbs[verb] = selectedVerbs ? selectedVerbs.includes(verb) : false));
+  availableVerbs.forEach(verb => (verbs[verb] = selectedVerbs ? selectedVerbs.includes(verb) : false));
   return verbs;
 };
 
@@ -53,7 +53,7 @@ const AdvancedPermissionsDialog: FC<Props> = ({ availableVerbs, selectedVerbs, r
     if (name) {
       setVerbs({
         ...verbs,
-        [name]: value,
+        [name]: value
       });
     }
   };
diff --git a/scm-ui/ui-webapp/src/repos/permissions/containers/CreatePermissionForm.tsx b/scm-ui/ui-webapp/src/repos/permissions/containers/CreatePermissionForm.tsx
index e955eb4d38..b6549028c9 100644
--- a/scm-ui/ui-webapp/src/repos/permissions/containers/CreatePermissionForm.tsx
+++ b/scm-ui/ui-webapp/src/repos/permissions/containers/CreatePermissionForm.tsx
@@ -30,7 +30,7 @@ import {
   PermissionCreateEntry,
   Repository,
   RepositoryRole,
-  SelectValue,
+  SelectValue
 } from "@scm-manager/ui-types";
 import {
   Button,
@@ -41,7 +41,7 @@ import {
   Radio,
   SubmitButton,
   Subtitle,
-  UserAutocomplete,
+  UserAutocomplete
 } from "@scm-manager/ui-components";
 import * as validator from "../utils/permissionValidation";
 import RoleSelector from "../components/RoleSelector";
@@ -64,8 +64,8 @@ type PermissionState = PermissionCreateEntry & {
 const useAutoCompleteLinks = () => {
   const links = useIndexLinks()?.autocomplete as Link[];
   return {
-    groups: links?.find((l) => l.name === "groups"),
-    users: links?.find((l) => l.name === "users"),
+    groups: links?.find(l => l.name === "groups"),
+    users: links?.find(l => l.name === "users")
   };
 };
 
@@ -73,14 +73,14 @@ const CreatePermissionForm: FC<Props> = ({
   availableRoles,
   availableVerbs,
   currentPermissions,
-  namespaceOrRepository,
+  namespaceOrRepository
 }) => {
   const initialPermissionState = {
     name: "",
     role: availableRoles[0].name,
     verbs: [],
     groupPermission: false,
-    valid: false,
+    valid: false
   };
   const links = useAutoCompleteLinks();
   const { isLoading, error, create, permission: createdPermission } = useCreatePermission(namespaceOrRepository);
@@ -89,6 +89,7 @@ const CreatePermissionForm: FC<Props> = ({
   const [t] = useTranslation("repos");
   useEffect(() => {
     setPermission(initialPermissionState);
+    //eslint-disable-next-line
   }, [createdPermission]);
   const selectedVerbs = permission.role ? findVerbsForRole(availableRoles, permission.role) : permission.verbs;
 
@@ -100,8 +101,8 @@ const CreatePermissionForm: FC<Props> = ({
       valid: validator.isPermissionValid(
         value.value.id,
         permission.groupPermission,
-        currentPermissions._embedded.permissions
-      ),
+        currentPermissions._embedded?.permissions || []
+      )
     });
   };
 
@@ -120,7 +121,7 @@ const CreatePermissionForm: FC<Props> = ({
   const permissionScopeChanged = (groupPermission: boolean) => {
     setPermission({
       ...permission,
-      groupPermission,
+      groupPermission
     });
   };
 
@@ -132,7 +133,7 @@ const CreatePermissionForm: FC<Props> = ({
     setPermission({
       ...permission,
       verbs: [],
-      role,
+      role
     });
   };
 
@@ -140,7 +141,7 @@ const CreatePermissionForm: FC<Props> = ({
     setPermission({
       ...permission,
       role: undefined,
-      verbs,
+      verbs
     });
     setShowAdvancedDialog(false);
   };
@@ -151,9 +152,11 @@ const CreatePermissionForm: FC<Props> = ({
   };
 
   const findAvailableRole = (roleName: string) => {
-    return availableRoles.find((role) => role.name === roleName);
+    return availableRoles.find(role => role.name === roleName);
   };
 
+  const empty = { value: { id: "", displayName: "" }, label: "" };
+
   return (
     <>
       <hr />
@@ -193,14 +196,14 @@ const CreatePermissionForm: FC<Props> = ({
               <GroupAutocomplete
                 autocompleteLink={links.groups.href}
                 valueSelected={selectName}
-                value={permission.value || ""}
+                value={permission.value || empty}
               />
             ) : null}
             {!permission.groupPermission && links.users ? (
               <UserAutocomplete
                 autocompleteLink={links.users.href}
                 valueSelected={selectName}
-                value={permission.value || ""}
+                value={permission.value || empty}
               />
             ) : null}
           </div>
@@ -208,7 +211,7 @@ const CreatePermissionForm: FC<Props> = ({
             <div className="columns">
               <div className="column is-narrow">
                 <RoleSelector
-                  availableRoles={availableRoles.map((r) => r.name)}
+                  availableRoles={availableRoles.map(r => r.name)}
                   label={t("permission.role")}
                   helpText={t("permission.help.roleHelpText")}
                   handleRoleChange={handleRoleChange}
diff --git a/scm-ui/ui-webapp/src/repos/permissions/containers/Permissions.tsx b/scm-ui/ui-webapp/src/repos/permissions/containers/Permissions.tsx
index 0dc27cf441..3c8dc9c889 100644
--- a/scm-ui/ui-webapp/src/repos/permissions/containers/Permissions.tsx
+++ b/scm-ui/ui-webapp/src/repos/permissions/containers/Permissions.tsx
@@ -40,7 +40,7 @@ const usePermissionData = (namespaceOrRepository: Namespace | Repository) => {
     isLoading: permissions.isLoading || availablePermissions.isLoading,
     error: permissions.error || availablePermissions.error,
     permissions: permissions.data,
-    availablePermissions: availablePermissions.data,
+    availablePermissions: availablePermissions.data
   };
 };
 
diff --git a/scm-ui/ui-webapp/src/repos/permissions/containers/SinglePermission.tsx b/scm-ui/ui-webapp/src/repos/permissions/containers/SinglePermission.tsx
index 7410506ad2..0af6d342ce 100644
--- a/scm-ui/ui-webapp/src/repos/permissions/containers/SinglePermission.tsx
+++ b/scm-ui/ui-webapp/src/repos/permissions/containers/SinglePermission.tsx
@@ -61,7 +61,7 @@ const SinglePermission: FC<Props> = ({
   namespaceOrRepository,
   availableRoles,
   availableVerbs,
-  permission: defaultPermission,
+  permission: defaultPermission
 }) => {
   const [permission, setPermission] = useState(defaultPermission);
   const [showAdvancedDialog, setShowAdvancedDialog] = useState(false);
@@ -71,7 +71,7 @@ const SinglePermission: FC<Props> = ({
     setPermission(defaultPermission);
   }, [defaultPermission]);
 
-  const availableRoleNames = !!availableRoles && availableRoles.map((r) => r.name);
+  const availableRoleNames = !!availableRoles && availableRoles.map(r => r.name);
   const readOnly = !permission._links.update;
   const selectedVerbs = permission.role ? findVerbsForRole(availableRoles, permission.role) : permission.verbs;
 
@@ -79,7 +79,7 @@ const SinglePermission: FC<Props> = ({
     const newPermission = {
       ...permission,
       verbs: [],
-      role,
+      role
     };
     setPermission(newPermission);
     update(newPermission);
@@ -89,7 +89,7 @@ const SinglePermission: FC<Props> = ({
     const newPermission = {
       ...permission,
       role: undefined,
-      verbs,
+      verbs
     };
     setPermission(newPermission);
     update(newPermission);
diff --git a/scm-ui/ui-webapp/src/repos/permissions/utils/findVerbsForRole.ts b/scm-ui/ui-webapp/src/repos/permissions/utils/findVerbsForRole.ts
index 9c54d94ac6..4054d0bcdb 100644
--- a/scm-ui/ui-webapp/src/repos/permissions/utils/findVerbsForRole.ts
+++ b/scm-ui/ui-webapp/src/repos/permissions/utils/findVerbsForRole.ts
@@ -24,7 +24,7 @@
 import { RepositoryRole } from "@scm-manager/ui-types";
 
 const findVerbsForRole = (availableRepositoryRoles: RepositoryRole[], roleName: string) => {
-  const matchingRole = availableRepositoryRoles.find((role) => roleName === role.name);
+  const matchingRole = availableRepositoryRoles.find(role => roleName === role.name);
   if (matchingRole) {
     return matchingRole.verbs;
   } else {
diff --git a/scm-ui/ui-webapp/src/repos/permissions/utils/permissionValidation.test.ts b/scm-ui/ui-webapp/src/repos/permissions/utils/permissionValidation.test.ts
index f43170b4c6..7c5cf50391 100644
--- a/scm-ui/ui-webapp/src/repos/permissions/utils/permissionValidation.test.ts
+++ b/scm-ui/ui-webapp/src/repos/permissions/utils/permissionValidation.test.ts
@@ -40,8 +40,8 @@ describe("permission validation", () => {
         groupPermission: true,
         type: "READ",
         _links: {},
-        verbs: [],
-      },
+        verbs: []
+      }
     ];
     const name = "PermissionName";
     const groupPermission = false;
@@ -56,8 +56,8 @@ describe("permission validation", () => {
         groupPermission: false,
         type: "READ",
         _links: {},
-        verbs: [],
-      },
+        verbs: []
+      }
     ];
     const name = "PermissionName";
     const groupPermission = false;
diff --git a/scm-ui/ui-webapp/src/repos/sources/components/FileTree.tsx b/scm-ui/ui-webapp/src/repos/sources/components/FileTree.tsx
index 989952c943..139362c579 100644
--- a/scm-ui/ui-webapp/src/repos/sources/components/FileTree.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/components/FileTree.tsx
@@ -69,8 +69,8 @@ const FileTree: FC<Props> = ({ repository, directory, baseUrl, revision, fetchNe
       revision,
       _links: {},
       _embedded: {
-        children: [],
-      },
+        children: []
+      }
     });
   }
 
@@ -82,7 +82,7 @@ const FileTree: FC<Props> = ({ repository, directory, baseUrl, revision, fetchNe
     repository,
     directory,
     baseUrl,
-    revision,
+    revision
   };
 
   return (
diff --git a/scm-ui/ui-webapp/src/repos/sources/components/FileTreeLeaf.tsx b/scm-ui/ui-webapp/src/repos/sources/components/FileTreeLeaf.tsx
index a7e6bb758d..c48281f9c9 100644
--- a/scm-ui/ui-webapp/src/repos/sources/components/FileTreeLeaf.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/components/FileTreeLeaf.tsx
@@ -30,6 +30,7 @@ import { File, Repository } from "@scm-manager/ui-types";
 import { DateFromNow, FileSize, Icon, Tooltip } from "@scm-manager/ui-components";
 import FileIcon from "./FileIcon";
 import FileLink from "./content/FileLink";
+import { ReactElement } from "react";
 
 type Props = WithTranslation & {
   repository: Repository;
@@ -71,7 +72,7 @@ class FileTreeLeaf extends React.Component<Props> {
     );
   };
 
-  contentIfPresent = (file: File, attribute: string, content: (file: File) => any) => {
+  contentIfPresent = (file: File, attribute: string, content: (file: File) => ReactElement | string | undefined) => {
     const { t } = this.props;
     if (file.hasOwnProperty(attribute)) {
       return content(file);
@@ -100,7 +101,7 @@ class FileTreeLeaf extends React.Component<Props> {
 
     const extProps: extensionPoints.ReposSourcesTreeRowProps = {
       repository,
-      file,
+      file
     };
 
     return (
@@ -113,7 +114,7 @@ class FileTreeLeaf extends React.Component<Props> {
           </NoWrapTd>
           <td className="is-hidden-mobile">{this.contentIfPresent(file, "commitDate", renderCommitDate)}</td>
           <MinWidthTd className={classNames("is-word-break", "is-hidden-touch")}>
-            {this.contentIfPresent(file, "description", (file) => file.description)}
+            {this.contentIfPresent(file, "description", file => file.description)}
           </MinWidthTd>
           {binder.hasExtension("repos.sources.tree.row.right") && (
             <ExtensionTd className="is-hidden-mobile">
diff --git a/scm-ui/ui-webapp/src/repos/sources/components/TruncatedNotification.tsx b/scm-ui/ui-webapp/src/repos/sources/components/TruncatedNotification.tsx
index d410003edc..eff55f7942 100644
--- a/scm-ui/ui-webapp/src/repos/sources/components/TruncatedNotification.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/components/TruncatedNotification.tsx
@@ -38,7 +38,7 @@ const TruncatedNotification: FC<Props> = ({ directory, isFetchingNextPage, fetch
     return null;
   }
 
-  const fileCount = (directory._embedded.children || []).filter((file) => !file.directory).length;
+  const fileCount = (directory._embedded?.children || []).filter(file => !file.directory).length;
 
   return (
     <Notification type="info">
diff --git a/scm-ui/ui-webapp/src/repos/sources/components/content/FileLink.test.ts b/scm-ui/ui-webapp/src/repos/sources/components/content/FileLink.test.ts
index 34a30aa8f3..04707603db 100644
--- a/scm-ui/ui-webapp/src/repos/sources/components/content/FileLink.test.ts
+++ b/scm-ui/ui-webapp/src/repos/sources/components/content/FileLink.test.ts
@@ -48,8 +48,8 @@ describe("create folder link tests", () => {
       revision: "1a",
       _links: {},
       _embedded: {
-        children: [],
-      },
+        children: []
+      }
     };
   }
 
diff --git a/scm-ui/ui-webapp/src/repos/sources/components/content/FileLink.tsx b/scm-ui/ui-webapp/src/repos/sources/components/content/FileLink.tsx
index 43ceb26a24..1c139bd269 100644
--- a/scm-ui/ui-webapp/src/repos/sources/components/content/FileLink.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/components/content/FileLink.tsx
@@ -63,7 +63,10 @@ export const createRelativeLink = (repositoryUrl: string) => {
 export const createFolderLink = (base: string, file: File) => {
   let link = base;
   if (file.path) {
-    let path = file.path.split("/").map(encodePart).join("/");
+    let path = file.path
+      .split("/")
+      .map(encodePart)
+      .join("/");
     if (path.startsWith("/")) {
       path = path.substring(1);
     }
diff --git a/scm-ui/ui-webapp/src/repos/sources/containers/AnnotateView.tsx b/scm-ui/ui-webapp/src/repos/sources/containers/AnnotateView.tsx
index 789a82d45b..34cfd352b2 100644
--- a/scm-ui/ui-webapp/src/repos/sources/containers/AnnotateView.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/containers/AnnotateView.tsx
@@ -34,16 +34,14 @@ type Props = {
 };
 
 const AnnotateView: FC<Props> = ({ file, repository, revision }) => {
-  const {
-    data: annotation,
-    isLoading: isAnnotationLoading,
-    error: annotationLoadError,
-  } = useAnnotations(repository, revision, file);
-  const {
-    data: contentType,
-    isLoading: isContentTypeLoading,
-    error: contentTypeLoadError,
-  } = useContentType((file._links.self as Link).href);
+  const { data: annotation, isLoading: isAnnotationLoading, error: annotationLoadError } = useAnnotations(
+    repository,
+    revision,
+    file
+  );
+  const { data: contentType, isLoading: isContentTypeLoading, error: contentTypeLoadError } = useContentType(
+    (file._links.self as Link).href
+  );
   const error = annotationLoadError || contentTypeLoadError;
 
   if (error) {
diff --git a/scm-ui/ui-webapp/src/repos/sources/containers/Content.tsx b/scm-ui/ui-webapp/src/repos/sources/containers/Content.tsx
index 91038f39b6..c604285db5 100644
--- a/scm-ui/ui-webapp/src/repos/sources/containers/Content.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/containers/Content.tsx
@@ -142,7 +142,7 @@ const Content: FC<Props> = ({ file, repository, revision, breadcrumb, error }) =
                 repository,
                 file,
                 revision: revision ? encodeURIComponent(revision) : "",
-                handleExtensionError: setErrorFromExtension,
+                handleExtensionError: setErrorFromExtension
               }}
               renderAll={true}
             />
@@ -201,7 +201,7 @@ const Content: FC<Props> = ({ file, repository, revision, breadcrumb, error }) =
                   props={{
                     file,
                     repository,
-                    revision,
+                    revision
                   }}
                 />
               </tbody>
diff --git a/scm-ui/ui-webapp/src/repos/sources/containers/SourceExtensions.tsx b/scm-ui/ui-webapp/src/repos/sources/containers/SourceExtensions.tsx
index 1488d0dac0..de35f4009d 100644
--- a/scm-ui/ui-webapp/src/repos/sources/containers/SourceExtensions.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/containers/SourceExtensions.tsx
@@ -48,7 +48,7 @@ const useUrlParams = () => {
   return {
     revision: revision ? decodeURIComponent(revision) : undefined,
     path: path,
-    extension,
+    extension
   };
 };
 
@@ -81,7 +81,7 @@ const SourceExtensionsWithBranches: FC<PropsWithBranches> = ({
   revision,
   extension,
   sources,
-  path,
+  path
 }) => {
   const { isFetching, data: branch } = useBranch(repository, revision);
   const [t] = useTranslation("repos");
@@ -101,7 +101,7 @@ const SourceExtensionsWithBranches: FC<PropsWithBranches> = ({
     resolvedRevision,
     path,
     sources,
-    baseUrl,
+    baseUrl
   };
 
   if (!binder.hasExtension(extensionPointName, extprops)) {
@@ -117,7 +117,7 @@ const SourceExtensionsWithoutBranches: FC<PropsWithoutBranches> = ({
   revision,
   extension,
   sources,
-  path,
+  path
 }) => {
   const [t] = useTranslation("repos");
 
@@ -137,7 +137,7 @@ const SourceExtensionsWithoutBranches: FC<PropsWithoutBranches> = ({
     resolvedRevision,
     path,
     sources,
-    baseUrl,
+    baseUrl
   };
 
   if (!binder.hasExtension(extensionPointName, extprops)) {
diff --git a/scm-ui/ui-webapp/src/repos/sources/containers/Sources.tsx b/scm-ui/ui-webapp/src/repos/sources/containers/Sources.tsx
index fcaef265a8..c3145a1520 100644
--- a/scm-ui/ui-webapp/src/repos/sources/containers/Sources.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/containers/Sources.tsx
@@ -50,7 +50,7 @@ const useUrlParams = () => {
   const { revision, path } = useParams<Params>();
   return {
     revision: revision ? decodeURIComponent(revision) : undefined,
-    path: path || "",
+    path: path || ""
   };
 };
 
@@ -62,22 +62,16 @@ const Sources: FC<Props> = ({ repository, branches, selectedBranch, baseUrl }) =
   // redirect to default branch is non branch selected
   useEffect(() => {
     if (branches && branches.length > 0 && !selectedBranch) {
-      const defaultBranch = branches?.filter((b) => b.defaultBranch === true)[0];
+      const defaultBranch = branches?.filter(b => b.defaultBranch === true)[0];
       history.replace(`${baseUrl}/sources/${encodeURIComponent(defaultBranch.name)}/`);
     }
   }, [branches, selectedBranch, history, baseUrl]);
-  const {
-    isLoading,
-    error,
-    data: file,
-    isFetchingNextPage,
-    fetchNextPage,
-  } = useSources(repository, {
+  const { isLoading, error, data: file, isFetchingNextPage, fetchNextPage } = useSources(repository, {
     revision,
     path,
     // we have to wait until a branch is selected,
     // expect if we have no branches (svn)
-    enabled: !branches || !!selectedBranch,
+    enabled: !branches || !!selectedBranch
   });
 
   if (error) {
@@ -108,7 +102,7 @@ const Sources: FC<Props> = ({ repository, branches, selectedBranch, baseUrl }) =
   };
 
   const evaluateSwitchViewLink = () => {
-    if (branches && selectedBranch && branches?.filter((b) => b.name === selectedBranch).length !== 0) {
+    if (branches && selectedBranch && branches?.filter(b => b.name === selectedBranch).length !== 0) {
       return `${baseUrl}/branch/${encodeURIComponent(selectedBranch)}/changesets/`;
     }
     return `${baseUrl}/changesets/`;
@@ -129,8 +123,8 @@ const Sources: FC<Props> = ({ repository, branches, selectedBranch, baseUrl }) =
         revision={revision || file.revision}
         path={path || ""}
         baseUrl={baseUrl + "/sources"}
-        branch={branches?.filter((b) => b.name === selectedBranch)[0]}
-        defaultBranch={branches?.filter((b) => b.defaultBranch === true)[0]}
+        branch={branches?.filter(b => b.name === selectedBranch)[0]}
+        defaultBranch={branches?.filter(b => b.defaultBranch === true)[0]}
         sources={file}
         permalink={permalink}
       />
diff --git a/scm-ui/ui-webapp/src/repos/sources/containers/SourcesView.tsx b/scm-ui/ui-webapp/src/repos/sources/containers/SourcesView.tsx
index d526248d40..ead349bf0a 100644
--- a/scm-ui/ui-webapp/src/repos/sources/containers/SourcesView.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/containers/SourcesView.tsx
@@ -79,7 +79,7 @@ const SourcesView: FC<Props> = ({ file, repository, revision }) => {
           file,
           contentType,
           revision,
-          basePath,
+          basePath
         }}
       >
         <DownloadViewer repository={repository} file={file} />
diff --git a/scm-ui/ui-webapp/src/repos/sources/utils/files.test.ts b/scm-ui/ui-webapp/src/repos/sources/utils/files.test.ts
index 76fc3274c9..a81c649d91 100644
--- a/scm-ui/ui-webapp/src/repos/sources/utils/files.test.ts
+++ b/scm-ui/ui-webapp/src/repos/sources/utils/files.test.ts
@@ -33,8 +33,8 @@ describe("files tests", () => {
       directory: true,
       _links: {},
       _embedded: {
-        children: [],
-      },
+        children: []
+      }
     };
   };
 
@@ -43,7 +43,7 @@ describe("files tests", () => {
     path: "README.md",
     revision: "42",
     directory: false,
-    _links: {},
+    _links: {}
   };
 
   describe("isRootPath tests", () => {
diff --git a/scm-ui/ui-webapp/src/repos/tags/components/TagTable.tsx b/scm-ui/ui-webapp/src/repos/tags/components/TagTable.tsx
index 6baa00516d..1d4751319c 100644
--- a/scm-ui/ui-webapp/src/repos/tags/components/TagTable.tsx
+++ b/scm-ui/ui-webapp/src/repos/tags/components/TagTable.tsx
@@ -77,12 +77,12 @@ const TagTable: FC<Props> = ({ repository, baseUrl, tags }) => {
               className: "is-outlined",
               label: t("tag.delete.confirmAlert.submit"),
               isLoading,
-              onClick: () => deleteTag(),
+              onClick: () => deleteTag()
             },
             {
               label: t("tag.delete.confirmAlert.cancel"),
-              onClick: () => abortDelete(),
-            },
+              onClick: () => abortDelete()
+            }
           ]}
           close={() => abortDelete()}
         />
@@ -95,7 +95,7 @@ const TagTable: FC<Props> = ({ repository, baseUrl, tags }) => {
           </tr>
         </thead>
         <tbody>
-          {tags.map((tag) => (
+          {tags.map(tag => (
             <TagRow key={tag.name} baseUrl={baseUrl} tag={tag} onDelete={onDelete} />
           ))}
         </tbody>
diff --git a/scm-ui/ui-webapp/src/repos/tags/components/TagView.tsx b/scm-ui/ui-webapp/src/repos/tags/components/TagView.tsx
index 6cf3909014..6c94fb72e7 100644
--- a/scm-ui/ui-webapp/src/repos/tags/components/TagView.tsx
+++ b/scm-ui/ui-webapp/src/repos/tags/components/TagView.tsx
@@ -44,7 +44,7 @@ const TagView: FC<Props> = ({ repository, tag }) => {
           renderAll={true}
           props={{
             repository,
-            tag,
+            tag
           }}
         />
       </div>
diff --git a/scm-ui/ui-webapp/src/repos/tags/orderTags.test.ts b/scm-ui/ui-webapp/src/repos/tags/orderTags.test.ts
index 877f52c407..3b8667e21f 100644
--- a/scm-ui/ui-webapp/src/repos/tags/orderTags.test.ts
+++ b/scm-ui/ui-webapp/src/repos/tags/orderTags.test.ts
@@ -28,19 +28,19 @@ const tag1 = {
   name: "tag1",
   revision: "revision1",
   date: new Date(2020, 1, 1),
-  _links: {},
+  _links: {}
 };
 const tag2 = {
   name: "tag2",
   revision: "revision2",
   date: new Date(2020, 1, 3),
-  _links: {},
+  _links: {}
 };
 const tag3 = {
   name: "tag3",
   revision: "revision3",
   date: new Date(2020, 1, 2),
-  _links: {},
+  _links: {}
 };
 
 describe("order tags", () => {
diff --git a/scm-ui/ui-webapp/src/search/GenericHit.tsx b/scm-ui/ui-webapp/src/search/GenericHit.tsx
index bf3f4a8377..e11a8b335b 100644
--- a/scm-ui/ui-webapp/src/search/GenericHit.tsx
+++ b/scm-ui/ui-webapp/src/search/GenericHit.tsx
@@ -34,7 +34,7 @@ const GenericHit: FC<HitProps> = ({ hit }) => (
   <Hit>
     <Hit.Content>
       <table>
-        {Object.keys(hit.fields).map((field) => (
+        {Object.keys(hit.fields).map(field => (
           <tr key={field}>
             <LabelColumn>{field}:</LabelColumn>
             <td>
diff --git a/scm-ui/ui-webapp/src/search/GroupHit.tsx b/scm-ui/ui-webapp/src/search/GroupHit.tsx
index d962d4614e..3dd2ee54be 100644
--- a/scm-ui/ui-webapp/src/search/GroupHit.tsx
+++ b/scm-ui/ui-webapp/src/search/GroupHit.tsx
@@ -29,7 +29,7 @@ import {
   DateFromNow,
   TextHitField,
   useDateHitFieldValue,
-  useStringHitFieldValue,
+  useStringHitFieldValue
 } from "@scm-manager/ui-components";
 import { Link } from "react-router-dom";
 
diff --git a/scm-ui/ui-webapp/src/search/Hits.tsx b/scm-ui/ui-webapp/src/search/Hits.tsx
index 958b27835f..b2f1148a9d 100644
--- a/scm-ui/ui-webapp/src/search/Hits.tsx
+++ b/scm-ui/ui-webapp/src/search/Hits.tsx
@@ -40,7 +40,7 @@ type Props = {
 const hitComponents: { [name: string]: FC<HitProps> } = {
   repository: RepositoryHit,
   user: UserHit,
-  group: GroupHit,
+  group: GroupHit
 };
 
 const findComponent = (type: string) => {
diff --git a/scm-ui/ui-webapp/src/search/RepositoryHit.tsx b/scm-ui/ui-webapp/src/search/RepositoryHit.tsx
index a4eb491f6d..936d4599dc 100644
--- a/scm-ui/ui-webapp/src/search/RepositoryHit.tsx
+++ b/scm-ui/ui-webapp/src/search/RepositoryHit.tsx
@@ -31,7 +31,7 @@ import {
   RepositoryAvatar,
   TextHitField,
   Hit,
-  HitProps,
+  HitProps
 } from "@scm-manager/ui-components";
 
 const RepositoryHit: FC<HitProps> = ({ hit }) => {
diff --git a/scm-ui/ui-webapp/src/search/Search.tsx b/scm-ui/ui-webapp/src/search/Search.tsx
index cc1b6ff0ae..069a9e7dab 100644
--- a/scm-ui/ui-webapp/src/search/Search.tsx
+++ b/scm-ui/ui-webapp/src/search/Search.tsx
@@ -31,7 +31,7 @@ import {
   PrimaryContentColumn,
   SecondaryNavigation,
   Tag,
-  urls,
+  urls
 } from "@scm-manager/ui-components";
 import { Link, useLocation, useParams } from "react-router-dom";
 import { useSearch, useSearchCounts, useSearchTypes } from "@scm-manager/ui-api";
@@ -70,7 +70,7 @@ const usePageParams = () => {
   return {
     page,
     selectedType,
-    query,
+    query
   };
 };
 
@@ -100,7 +100,7 @@ const SearchSubTitle: FC<Props> = ({ selectedType, query }) => {
     <>
       {t("search.subtitle", {
         query,
-        type: t(`plugins:search.types.${selectedType}.subtitle`, selectedType),
+        type: t(`plugins:search.types.${selectedType}.subtitle`, selectedType)
       })}
       <br />
       <Trans i18nKey="search.syntaxHelp" components={[<SyntaxHelpLink />]} />
@@ -115,22 +115,22 @@ const Search: FC = () => {
   const { data, isLoading, error } = useSearch(query, {
     type: selectedType,
     page: page - 1,
-    pageSize: 25,
+    pageSize: 25
   });
   const types = useSearchTypes();
   types.sort(orderTypes);
 
   const searchCounts = useSearchCounts(
-    types.filter((t) => t !== selectedType),
+    types.filter(t => t !== selectedType),
     query
   );
   const counts = {
     [selectedType]: {
       isLoading,
       error,
-      data: data?.totalHits,
+      data: data?.totalHits
     },
-    ...searchCounts,
+    ...searchCounts
   };
 
   return (
@@ -147,7 +147,7 @@ const Search: FC = () => {
             <Results result={data} query={query} page={page} type={selectedType} />
           </PrimaryContentColumn>
           <SecondaryNavigation label={t("search.types")} collapsible={false}>
-            {types.map((type) => (
+            {types.map(type => (
               <NavLink key={type} to={`/search/${type}/?q=${query}`} label={type} activeOnlyWhenExact={false}>
                 <Level
                   left={t(`plugins:search.types.${type}.navItem`, type)}
diff --git a/scm-ui/ui-webapp/src/search/Syntax.tsx b/scm-ui/ui-webapp/src/search/Syntax.tsx
index 739d047b85..1eb61c224f 100644
--- a/scm-ui/ui-webapp/src/search/Syntax.tsx
+++ b/scm-ui/ui-webapp/src/search/Syntax.tsx
@@ -33,7 +33,7 @@ import {
   Loading,
   MarkdownView,
   Page,
-  Tooltip,
+  Tooltip
 } from "@scm-manager/ui-components";
 import { parse } from "date-fns";
 import styled from "styled-components";
@@ -83,7 +83,7 @@ const Examples: FC<ExampleProps> = ({ searchableType }) => {
   const [t] = useTranslation(["commons", "plugins"]);
   const examples = t<Example[]>(`plugins:search.types.${searchableType.name}.examples`, {
     returnObjects: true,
-    defaultValue: [],
+    defaultValue: []
   });
 
   if (examples.length === 0) {
@@ -126,7 +126,7 @@ const SearchableTypes: FC = () => {
 
   return (
     <>
-      {data.map((searchableType) => (
+      {data.map(searchableType => (
         <Expandable
           key={searchableType.name}
           className="mb-1"
@@ -139,18 +139,18 @@ const SearchableTypes: FC = () => {
               <th>{t("search.syntax.fields.exampleValue")}</th>
               <th>{t("search.syntax.fields.hints")}</th>
             </tr>
-            {searchableType.fields.map((searchableField) => (
+            {searchableType.fields.map(searchableField => (
               <tr>
                 <th>{searchableField.name}</th>
                 <td>{searchableField.type}</td>
                 <td>
                   {t(`plugins:search.types.${searchableType.name}.fields.${searchableField.name}.exampleValue`, {
-                    defaultValue: "",
+                    defaultValue: ""
                   })}
                 </td>
                 <td>
                   {t(`plugins:search.types.${searchableType.name}.fields.${searchableField.name}.hints`, {
-                    defaultValue: "",
+                    defaultValue: ""
                   })}
                 </td>
               </tr>
diff --git a/scm-ui/ui-webapp/src/search/UserHit.tsx b/scm-ui/ui-webapp/src/search/UserHit.tsx
index 865af47dcc..b3f131e46c 100644
--- a/scm-ui/ui-webapp/src/search/UserHit.tsx
+++ b/scm-ui/ui-webapp/src/search/UserHit.tsx
@@ -30,7 +30,7 @@ import {
   useStringHitFieldValue,
   TextHitField,
   Hit,
-  HitProps,
+  HitProps
 } from "@scm-manager/ui-components";
 
 const UserHit: FC<HitProps> = ({ hit }) => {
diff --git a/scm-ui/ui-webapp/src/tokenExpired.ts b/scm-ui/ui-webapp/src/tokenExpired.ts
index a906073d40..338cfb2e1a 100644
--- a/scm-ui/ui-webapp/src/tokenExpired.ts
+++ b/scm-ui/ui-webapp/src/tokenExpired.ts
@@ -29,7 +29,7 @@ let tokenExpired = false;
 // This error should be displayed with the state (e.g. navigation) of the previous logged in user.
 // But if the user navigates away, we want to reset the state to an anonymous one.
 
-apiClient.onError((error) => {
+apiClient.onError(error => {
   if (error instanceof TokenExpiredError) {
     tokenExpired = true;
   }
diff --git a/scm-ui/ui-webapp/src/users/components/SetUserPassword.tsx b/scm-ui/ui-webapp/src/users/components/SetUserPassword.tsx
index a3737ea721..d12fe3e160 100644
--- a/scm-ui/ui-webapp/src/users/components/SetUserPassword.tsx
+++ b/scm-ui/ui-webapp/src/users/components/SetUserPassword.tsx
@@ -30,7 +30,7 @@ import {
   Notification,
   PasswordConfirmation,
   SubmitButton,
-  Subtitle,
+  Subtitle
 } from "@scm-manager/ui-components";
 import { useSetUserPassword } from "@scm-manager/ui-api";
 
diff --git a/scm-ui/ui-webapp/src/users/components/UserConverter.tsx b/scm-ui/ui-webapp/src/users/components/UserConverter.tsx
index ee12ba96e0..fc0a6548cf 100644
--- a/scm-ui/ui-webapp/src/users/components/UserConverter.tsx
+++ b/scm-ui/ui-webapp/src/users/components/UserConverter.tsx
@@ -32,7 +32,7 @@ import {
   Level,
   Modal,
   PasswordConfirmation,
-  SubmitButton,
+  SubmitButton
 } from "@scm-manager/ui-components";
 
 type Props = {
@@ -47,12 +47,12 @@ const UserConverter: FC<Props> = ({ user }) => {
   const {
     isLoading: isConvertingToInternal,
     error: convertingToInternalError,
-    convertToInternal,
+    convertToInternal
   } = useConvertToInternal();
   const {
     isLoading: isConvertingToExternal,
     error: convertingToExternalError,
-    convertToExternal,
+    convertToExternal
   } = useConvertToExternal();
   const error = convertingToExternalError || convertingToInternalError || undefined;
   const isLoading = isConvertingToExternal || isConvertingToInternal;
diff --git a/scm-ui/ui-webapp/src/users/components/UserForm.tsx b/scm-ui/ui-webapp/src/users/components/UserForm.tsx
index a0d2bd3997..bbff4c856a 100644
--- a/scm-ui/ui-webapp/src/users/components/UserForm.tsx
+++ b/scm-ui/ui-webapp/src/users/components/UserForm.tsx
@@ -32,7 +32,7 @@ import {
   PasswordConfirmation,
   SubmitButton,
   Subtitle,
-  validation as validator,
+  validation as validator
 } from "@scm-manager/ui-components";
 import * as userValidator from "./userValidation";
 
@@ -63,12 +63,12 @@ class UserForm extends React.Component<Props, State> {
         password: "",
         active: true,
         external: false,
-        _links: {},
+        _links: {}
       },
       mailValidationError: false,
       displayNameValidationError: false,
       nameValidationError: false,
-      passwordValid: false,
+      passwordValid: false
     };
   }
 
@@ -77,8 +77,8 @@ class UserForm extends React.Component<Props, State> {
     if (user) {
       this.setState({
         user: {
-          ...user,
-        },
+          ...user
+        }
       });
     }
   }
@@ -222,8 +222,8 @@ class UserForm extends React.Component<Props, State> {
       nameValidationError: !validator.isNameValid(name),
       user: {
         ...this.state.user,
-        name,
-      },
+        name
+      }
     });
   };
 
@@ -232,8 +232,8 @@ class UserForm extends React.Component<Props, State> {
       displayNameValidationError: !userValidator.isDisplayNameValid(displayName),
       user: {
         ...this.state.user,
-        displayName,
-      },
+        displayName
+      }
     });
   };
 
@@ -242,8 +242,8 @@ class UserForm extends React.Component<Props, State> {
       mailValidationError: !!mail && !validator.isMailValid(mail),
       user: {
         ...this.state.user,
-        mail,
-      },
+        mail
+      }
     });
   };
 
@@ -251,9 +251,9 @@ class UserForm extends React.Component<Props, State> {
     this.setState({
       user: {
         ...this.state.user,
-        password,
+        password
       },
-      passwordValid: !!password && passwordValid,
+      passwordValid: !!password && passwordValid
     });
   };
 
@@ -261,8 +261,8 @@ class UserForm extends React.Component<Props, State> {
     this.setState({
       user: {
         ...this.state.user,
-        active,
-      },
+        active
+      }
     });
   };
 
@@ -270,8 +270,8 @@ class UserForm extends React.Component<Props, State> {
     this.setState({
       user: {
         ...this.state.user,
-        external,
-      },
+        external
+      }
     });
   };
 }
diff --git a/scm-ui/ui-webapp/src/users/components/apiKeys/AddApiKey.tsx b/scm-ui/ui-webapp/src/users/components/apiKeys/AddApiKey.tsx
index 908a692077..688ec40ab7 100644
--- a/scm-ui/ui-webapp/src/users/components/apiKeys/AddApiKey.tsx
+++ b/scm-ui/ui-webapp/src/users/components/apiKeys/AddApiKey.tsx
@@ -42,14 +42,14 @@ const AddApiKey: FC<Props> = ({ user, apiKeys }) => {
     error: errorAddingKey,
     apiKey: addedKey,
     create,
-    reset: resetCreationHook,
+    reset: resetCreationHook
   } = useCreateApiKey(user, apiKeys);
   const [displayName, setDisplayName] = useState("");
   const [permissionRole, setPermissionRole] = useState("");
   const {
     isLoading: isLoadingRepositoryRoles,
     data: availableRepositoryRoles,
-    error: errorLoadingRepositoryRoles,
+    error: errorLoadingRepositoryRoles
   } = useRepositoryRoles();
 
   const isValid = () => {
@@ -70,7 +70,7 @@ const AddApiKey: FC<Props> = ({ user, apiKeys }) => {
   }
 
   const availableRoleNames = availableRepositoryRoles
-    ? availableRepositoryRoles._embedded.repositoryRoles.map((r) => r.name)
+    ? availableRepositoryRoles._embedded?.repositoryRoles.map(r => r.name)
     : [];
 
   const closeModal = () => {
diff --git a/scm-ui/ui-webapp/src/users/components/apiKeys/ApiKeyCreatedModal.tsx b/scm-ui/ui-webapp/src/users/components/apiKeys/ApiKeyCreatedModal.tsx
index ed1d4c81b9..c756502e82 100644
--- a/scm-ui/ui-webapp/src/users/components/apiKeys/ApiKeyCreatedModal.tsx
+++ b/scm-ui/ui-webapp/src/users/components/apiKeys/ApiKeyCreatedModal.tsx
@@ -51,7 +51,7 @@ const ApiKeyCreatedModal: FC<Props> = ({ addedKey, close }) => {
   const keyRef = useRef<HTMLTextAreaElement>(null);
 
   const copy = () => {
-    keyRef.current!.select();
+    keyRef.current?.select();
     document.execCommand("copy");
     setCopied(true);
   };
diff --git a/scm-ui/ui-webapp/src/users/components/navLinks/EditUserNavLink.test.tsx b/scm-ui/ui-webapp/src/users/components/navLinks/EditUserNavLink.test.tsx
index 6206eca8fc..58c702747a 100644
--- a/scm-ui/ui-webapp/src/users/components/navLinks/EditUserNavLink.test.tsx
+++ b/scm-ui/ui-webapp/src/users/components/navLinks/EditUserNavLink.test.tsx
@@ -22,14 +22,13 @@
  * SOFTWARE.
  */
 import React from "react";
-import { shallow } from "enzyme";
-import "@scm-manager/ui-tests/enzyme";
-import "@scm-manager/ui-tests/i18n";
+import { shallow } from "@scm-manager/ui-tests";
+import "@scm-manager/ui-tests";
 import EditUserNavLink from "./EditUserNavLink";
 
 it("should render nothing, if the edit link is missing", () => {
   const user = {
-    _links: {},
+    _links: {}
   };
 
   const navLink = shallow(<EditUserNavLink user={user} editUrl="/user/edit" />);
@@ -40,9 +39,9 @@ it("should render the navLink", () => {
   const user = {
     _links: {
       update: {
-        href: "/users",
-      },
-    },
+        href: "/users"
+      }
+    }
   };
 
   const navLink = shallow(<EditUserNavLink user={user} editUrl="/user/edit" />);
diff --git a/scm-ui/ui-webapp/src/users/components/navLinks/SetPasswordNavLink.test.tsx b/scm-ui/ui-webapp/src/users/components/navLinks/SetPasswordNavLink.test.tsx
index 2a17334064..fa8d9e0ea1 100644
--- a/scm-ui/ui-webapp/src/users/components/navLinks/SetPasswordNavLink.test.tsx
+++ b/scm-ui/ui-webapp/src/users/components/navLinks/SetPasswordNavLink.test.tsx
@@ -23,13 +23,17 @@
  */
 import React from "react";
 import { shallow } from "enzyme";
-import "@scm-manager/ui-tests/enzyme";
-import "@scm-manager/ui-tests/i18n";
+import "@scm-manager/ui-tests";
 import ChangePasswordNavLink from "./SetPasswordNavLink";
 
 it("should render nothing, if the password link is missing", () => {
   const user = {
-    _links: {},
+    displayName: "User",
+    name: "User",
+    password: "hitchhiker",
+    external: true,
+    active: true,
+    _links: {}
   };
 
   const navLink = shallow(<ChangePasswordNavLink user={user} passwordUrl="/user/password" />);
@@ -38,11 +42,16 @@ it("should render nothing, if the password link is missing", () => {
 
 it("should render the navLink", () => {
   const user = {
+    displayName: "User",
+    name: "User",
+    password: "hitchhiker",
+    external: true,
+    active: true,
     _links: {
       password: {
-        href: "/password",
-      },
-    },
+        href: "/password"
+      }
+    }
   };
 
   const navLink = shallow(<ChangePasswordNavLink user={user} passwordUrl="/user/password" />);
diff --git a/scm-ui/ui-webapp/src/users/components/navLinks/SetPasswordNavLink.tsx b/scm-ui/ui-webapp/src/users/components/navLinks/SetPasswordNavLink.tsx
index d1970d8c1e..ec29723511 100644
--- a/scm-ui/ui-webapp/src/users/components/navLinks/SetPasswordNavLink.tsx
+++ b/scm-ui/ui-webapp/src/users/components/navLinks/SetPasswordNavLink.tsx
@@ -21,30 +21,23 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React from "react";
-import { WithTranslation, withTranslation } from "react-i18next";
+import React, { FC } from "react";
+import { useTranslation } from "react-i18next";
 import { User } from "@scm-manager/ui-types";
 import { NavLink } from "@scm-manager/ui-components";
 
-type Props = WithTranslation & {
+type Props = {
   user: User;
   passwordUrl: string;
 };
 
-class ChangePasswordNavLink extends React.Component<Props> {
-  render() {
-    const { t, passwordUrl } = this.props;
+const ChangePasswordNavLink: FC<Props> = ({ user, passwordUrl }) => {
+  const [t] = useTranslation("users");
 
-    if (!this.hasPermissionToSetPassword()) {
-      return null;
-    }
-    return <NavLink to={passwordUrl} label={t("singleUser.menu.setPasswordNavLink")} testId="user-password-link" />;
+  if (!user._links.password) {
+    return null;
   }
+  return <NavLink to={passwordUrl} label={t("singleUser.menu.setPasswordNavLink")} testId="user-password-link" />;
+};
 
-  hasPermissionToSetPassword = () => {
-    const { user } = this.props;
-    return user._links.password;
-  };
-}
-
-export default withTranslation("users")(ChangePasswordNavLink);
+export default ChangePasswordNavLink;
diff --git a/scm-ui/ui-webapp/src/users/components/navLinks/SetPermissionsNavLink.test.tsx b/scm-ui/ui-webapp/src/users/components/navLinks/SetPermissionsNavLink.test.tsx
index f682b80397..e1844ed77f 100644
--- a/scm-ui/ui-webapp/src/users/components/navLinks/SetPermissionsNavLink.test.tsx
+++ b/scm-ui/ui-webapp/src/users/components/navLinks/SetPermissionsNavLink.test.tsx
@@ -22,14 +22,18 @@
  * SOFTWARE.
  */
 import React from "react";
-import "@scm-manager/ui-tests/enzyme";
-import "@scm-manager/ui-tests/i18n";
+import "@scm-manager/ui-tests";
 import SetPermissionsNavLink from "./SetPermissionsNavLink";
 import { shallow } from "enzyme";
 
 it("should render nothing, if the permissions link is missing", () => {
   const user = {
-    _links: {},
+    displayName: "User",
+    name: "User",
+    password: "hitchhiker",
+    external: true,
+    active: true,
+    _links: {}
   };
 
   const navLink = shallow(<SetPermissionsNavLink user={user} permissionsUrl="/user/permissions" />);
@@ -38,11 +42,16 @@ it("should render nothing, if the permissions link is missing", () => {
 
 it("should render the navLink", () => {
   const user = {
+    displayName: "User",
+    name: "User",
+    password: "hitchhiker",
+    external: true,
+    active: true,
     _links: {
       permissions: {
-        href: "/permissions",
-      },
-    },
+        href: "/permissions"
+      }
+    }
   };
 
   const navLink = shallow(<SetPermissionsNavLink user={user} permissionsUrl="/user/permissions" />);
diff --git a/scm-ui/ui-webapp/src/users/components/navLinks/SetPermissionsNavLink.tsx b/scm-ui/ui-webapp/src/users/components/navLinks/SetPermissionsNavLink.tsx
index 8bc0ffd0a4..c58e8af81a 100644
--- a/scm-ui/ui-webapp/src/users/components/navLinks/SetPermissionsNavLink.tsx
+++ b/scm-ui/ui-webapp/src/users/components/navLinks/SetPermissionsNavLink.tsx
@@ -21,31 +21,26 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React from "react";
-import { WithTranslation, withTranslation } from "react-i18next";
+import React, { FC } from "react";
+import { useTranslation } from "react-i18next";
 import { User } from "@scm-manager/ui-types";
 import { NavLink } from "@scm-manager/ui-components";
 
-type Props = WithTranslation & {
+type Props = {
   user: User;
   permissionsUrl: string;
 };
 
-class ChangePermissionNavLink extends React.Component<Props> {
-  render() {
-    const { t, permissionsUrl } = this.props;
+const ChangePermissionNavLink: FC<Props> = ({ user, permissionsUrl }) => {
+  const [t] = useTranslation("users");
 
-    if (!this.hasPermissionToSetPermission()) {
-      return null;
-    }
-    return (
-      <NavLink to={permissionsUrl} label={t("singleUser.menu.setPermissionsNavLink")} testId="user-permissions-link" />
-    );
+  if (!user._links.permissions) {
+    return null;
   }
 
-  hasPermissionToSetPermission = () => {
-    return this.props.user._links.permissions;
-  };
-}
+  return (
+    <NavLink to={permissionsUrl} label={t("singleUser.menu.setPermissionsNavLink")} testId="user-permissions-link" />
+  );
+};
 
-export default withTranslation("users")(ChangePermissionNavLink);
+export default ChangePermissionNavLink;
diff --git a/scm-ui/ui-webapp/src/users/components/userValidation.test.ts b/scm-ui/ui-webapp/src/users/components/userValidation.test.ts
index c4b3cfd505..a0ba6dacc3 100644
--- a/scm-ui/ui-webapp/src/users/components/userValidation.test.ts
+++ b/scm-ui/ui-webapp/src/users/components/userValidation.test.ts
@@ -36,7 +36,7 @@ describe("test displayName validation", () => {
       "Tricia.McMillan@hitchhiker.com",
       "Ford Prefect (ford.prefect@hitchhiker.com)",
       "Zaphod Beeblebrox <zaphod.beeblebrox@hitchhiker.com>",
-      "Marvin, der depressive Roboter",
+      "Marvin, der depressive Roboter"
     ];
     for (const name of validNames) {
       expect(validator.isDisplayNameValid(name)).toBe(true);
diff --git a/scm-ui/ui-webapp/src/users/containers/DeleteUser.tsx b/scm-ui/ui-webapp/src/users/containers/DeleteUser.tsx
index ca6b6171c4..20c22b82c0 100644
--- a/scm-ui/ui-webapp/src/users/containers/DeleteUser.tsx
+++ b/scm-ui/ui-webapp/src/users/containers/DeleteUser.tsx
@@ -62,12 +62,12 @@ const DeleteUser: FC<Props> = ({ confirmDialog = true, user }) => {
           {
             className: "is-outlined",
             label: t("deleteUser.confirmAlert.submit"),
-            onClick: deleteUserCallback,
+            onClick: deleteUserCallback
           },
           {
             label: t("deleteUser.confirmAlert.cancel"),
-            onClick: () => null,
-          },
+            onClick: () => null
+          }
         ]}
         close={() => setShowConfirmAlert(false)}
       />
diff --git a/scm-ui/ui-webapp/src/users/containers/SingleUser.tsx b/scm-ui/ui-webapp/src/users/containers/SingleUser.tsx
index 1835ed5eb7..beddc3d838 100644
--- a/scm-ui/ui-webapp/src/users/containers/SingleUser.tsx
+++ b/scm-ui/ui-webapp/src/users/containers/SingleUser.tsx
@@ -35,7 +35,7 @@ import {
   SecondaryNavigationColumn,
   StateMenuContextProvider,
   SubNavigation,
-  urls,
+  urls
 } from "@scm-manager/ui-components";
 import { Details } from "./../components/table";
 import EditUser from "./EditUser";
@@ -44,7 +44,7 @@ import {
   SetApiKeysNavLink,
   SetPasswordNavLink,
   SetPermissionsNavLink,
-  SetPublicKeysNavLink,
+  SetPublicKeysNavLink
 } from "./../components/navLinks";
 import { useTranslation } from "react-i18next";
 import SetUserPassword from "../components/SetUserPassword";
@@ -71,7 +71,7 @@ const SingleUser: FC = () => {
 
   const extensionProps = {
     user,
-    url,
+    url
   };
 
   return (
diff --git a/scm-ui/ui-webapp/src/users/containers/Users.tsx b/scm-ui/ui-webapp/src/users/containers/Users.tsx
index 03785f5c7e..bdbb5e8875 100644
--- a/scm-ui/ui-webapp/src/users/containers/Users.tsx
+++ b/scm-ui/ui-webapp/src/users/containers/Users.tsx
@@ -31,7 +31,7 @@ import {
   OverviewPageActions,
   Page,
   PageActions,
-  urls,
+  urls
 } from "@scm-manager/ui-components";
 import { UserTable } from "./../components/table";
 import { useUsers } from "@scm-manager/ui-api";