Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions application/frontend/src/hooks/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export { useEnvironment } from './useEnvironment';
export { useLocationFromOutsideRoute } from './useLocationFromOutsideRoute';
export { useCapabilities } from './useCapabilities';
25 changes: 25 additions & 0 deletions application/frontend/src/hooks/useCapabilities.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { useEffect, useState } from 'react';

import { useEnvironment } from './useEnvironment';

export type Capabilities = {
myopencre: boolean;
};

export const useCapabilities = () => {
const { apiUrl } = useEnvironment();
const [capabilities, setCapabilities] = useState<Capabilities | null>(null);
const [loading, setLoading] = useState(true);

useEffect(() => {
const baseUrl = apiUrl.replace('/rest/v1', '');

fetch(`${baseUrl}/api/capabilities`)
.then((res) => res.json())
.then(setCapabilities)
.catch(() => setCapabilities({ myopencre: false }))
.finally(() => setLoading(false));
}, [apiUrl]);

return { capabilities, loading };
};
30 changes: 22 additions & 8 deletions application/frontend/src/hooks/useLocationFromOutsideRoute.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,36 @@
import { matchPath } from 'react-router';
import { useLocation } from 'react-router-dom';

import { ROUTES } from '../routes';
import { IRoute } from '../routes';

interface UseLocationFromOutsideRouteReturn {
params: Record<string, string>;
url: string;
showFilter: boolean;
}

export const useLocationFromOutsideRoute = (): UseLocationFromOutsideRouteReturn => {
// The current URL
/**
* Determines route metadata (params, url, showFilter)
* based on the currently active route.
*
* NOTE:
* - This hook no longer imports ROUTES directly
* - Routes must be passed in (already capability-resolved)
*/
export const useLocationFromOutsideRoute = (routes: IRoute[]): UseLocationFromOutsideRouteReturn => {
const { pathname } = useLocation();
// The current ROUTE, from our URL
const currentRoute = ROUTES.map(({ path, showFilter }) => ({
...matchPath(pathname, path),
showFilter,
})).find((matchedPath) => matchedPath?.isExact);

const currentRoute = routes
.map(({ path, showFilter }) => ({
...matchPath(pathname, {
path,
exact: true,
strict: false,
}),
showFilter,
}))
.find((matchedPath) => matchedPath?.isExact);

return {
params: currentRoute?.params || {},
url: currentRoute?.url || '',
Expand Down
20 changes: 13 additions & 7 deletions application/frontend/src/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,19 @@ export interface IRoute {
component: ReactNode | ReactNode[];
showFilter: boolean;
}

export const ROUTES: IRoute[] = [
{
path: '/myopencre',
component: MyOpenCRE,
showFilter: false,
},
export interface Capabilities {
myopencre: boolean;
}
export const ROUTES = (capabilities: Capabilities): IRoute[] => [
...(capabilities.myopencre
? [
{
path: '/myopencre',
component: MyOpenCRE,
showFilter: false,
},
]
: []),

{
path: INDEX,
Expand Down
38 changes: 24 additions & 14 deletions application/frontend/src/scaffolding/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,24 @@ import { NavLink } from 'react-router-dom';
import { Button } from 'semantic-ui-react';

import { ClearFilterButton } from '../../components/FilterButton/FilterButton';
import { Capabilities } from '../../hooks/useCapabilities';
import { useLocationFromOutsideRoute } from '../../hooks/useLocationFromOutsideRoute';
import { MyOpenCRE } from '../../pages/MyOpenCRE/MyOpenCRE';
import { SearchBar } from '../../pages/Search/components/SearchBar';
import { ROUTES } from '../../routes';

interface HeaderProps {
capabilities: Capabilities;
}
export const Header = ({ capabilities }: HeaderProps) => {
const routes = ROUTES(capabilities);

export const Header = () => {
let currentUrlParams = new URLSearchParams(window.location.search);
const history = useHistory();
const HandleDoFilter = () => {
currentUrlParams.set('applyFilters', 'true');
history.push(window.location.pathname + '?' + currentUrlParams.toString());
};
const { showFilter } = useLocationFromOutsideRoute();
const { showFilter } = useLocationFromOutsideRoute(routes);

const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
useEffect(() => {
Expand Down Expand Up @@ -69,9 +75,11 @@ export const Header = () => {
<NavLink to="/explorer" className="nav-link" activeClassName="nav-link--active">
Explorer
</NavLink>
<NavLink to="/myopencre" className="nav-link" activeClassName="nav-link--active">
MyOpenCRE
</NavLink>
{capabilities.myopencre && (
<NavLink to="/myopencre" className="nav-link" activeClassName="nav-link--active">
MyOpenCRE
</NavLink>
)}
</div>

<div>
Expand Down Expand Up @@ -190,14 +198,16 @@ export const Header = () => {
>
Explorer
</NavLink>
<NavLink
to="/myopencre"
className="nav-link"
activeClassName="nav-link--active"
onClick={closeMobileMenu}
>
MyOpenCRE
</NavLink>
{capabilities.myopencre && (
<NavLink
to="/myopencre"
className="nav-link"
activeClassName="nav-link--active"
onClick={closeMobileMenu}
>
MyOpenCRE
</NavLink>
)}
</div>

<div className="mobile-auth">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
import React from 'react';

import { useCapabilities } from '../../hooks/useCapabilities';
import { Header, Router } from '../index';

export const MainContentArea = () => {
const { capabilities, loading } = useCapabilities();

if (loading || !capabilities) {
return null; // or spinner
}

return (
<>
<Header />
<Router />
<Header capabilities={capabilities} />
<Router capabilities={capabilities} />
</>
);
};
32 changes: 20 additions & 12 deletions application/frontend/src/scaffolding/Router/Router.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
import React from 'react';
import { Route, Switch } from 'react-router-dom';

import { Capabilities } from '../../hooks/useCapabilities';
import { ROUTES } from '../../routes';
import { NoRoute } from '../index';

export const Router = () => (
<Switch>
{ROUTES.map(({ path, component: Component }) => {
if (!Component) {
return null;
}
const TypedComponent = Component as React.ElementType;
interface RouterProps {
capabilities: Capabilities;
}

return <Route key={path} path={path} exact={path === '/'} render={() => <TypedComponent />} />;
})}
<Route component={NoRoute} />
</Switch>
);
export const Router = ({ capabilities }: RouterProps) => {
const routes = ROUTES(capabilities);

return (
<Switch>
{routes.map(({ path, component: Component }) => {
if (!Component) return null;

const TypedComponent = Component as React.ElementType;

return <Route key={path} path={path} exact={path === '/'} render={() => <TypedComponent />} />;
})}
<Route component={NoRoute} />
</Switch>
);
};