Merging

datahub-frontend/run/frontend.env

@@ -1,5 +1,5 @@
 # Server Port
-PORT=9001
+PORT=9002
 
 # Secret Key
 DATAHUB_SECRET="YouKnowNothing"

datahub-web-react/src/app/shared/NoPageFound.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import { useReactiveVar } from '@apollo/client';
 import { Redirect } from 'react-router';
-
 import { isLoggedInVar } from '../auth/checkAuthStatus';
 import { PageRoutes } from '../../conf/Global';
 

datahub-web-react/src/utils/test-utils/TestPageContainer.tsx

@@ -9,6 +9,7 @@ import { EntityRegistryContext } from '../../entityRegistryContext';
 import { TagEntity } from '../../app/entity/tag/Tag';
 
 import defaultThemeConfig from '../../conf/theme/theme_light.config.json';
+import { Theme } from '../../conf/theme/types';
 
 type Props = {
     children: React.ReactNode;
@@ -25,8 +26,23 @@ export function getTestEntityRegistry() {
 
 export default ({ children, initialEntries }: Props) => {
     const entityRegistry = useMemo(() => getTestEntityRegistry(), []);
+
+    const theme: Theme = useMemo(() => {
+        const overridesWithoutPrefix: { [key: string]: any } = {};
+        const themeConfig = defaultThemeConfig;
+        Object.assign(overridesWithoutPrefix, themeConfig.styles);
+        Object.keys(overridesWithoutPrefix).forEach((key) => {
+            overridesWithoutPrefix[key.substring(1)] = overridesWithoutPrefix[key];
+            delete overridesWithoutPrefix[key];
+        });
+        return {
+            ...themeConfig,
+            styles: overridesWithoutPrefix as Theme['styles'],
+        };
+    }, []);
+
     return (
-        <ThemeProvider theme={defaultThemeConfig}>
+        <ThemeProvider theme={theme}>
             <MemoryRouter initialEntries={initialEntries}>
                 <EntityRegistryContext.Provider value={entityRegistry}>{children}</EntityRegistryContext.Provider>
             </MemoryRouter>