-
+
-
diff --git a/client/src/containers/my-projects/sidebar.test.tsx b/client/src/containers/my-projects/sidebar.test.tsx
index cf328ac3..f5a7ee59 100644
--- a/client/src/containers/my-projects/sidebar.test.tsx
+++ b/client/src/containers/my-projects/sidebar.test.tsx
@@ -17,6 +17,7 @@ const TEST_SECTIONS: ComponentProps
['sections'] = [
{
label: 'Test label 3',
value: 'test-3',
+ disabled: true,
},
];
@@ -64,7 +65,7 @@ describe('sidebar', () => {
expect(sections[0].querySelector('a')).toHaveClass(ACTIVE_CLASS);
});
- it('expects other sections (not the selected one) to not have the active class applied ', () => {
+ it('expects other sections (not the selected one) to not have the active class applied', () => {
const { container } = render();
const sections = container.querySelectorAll('li');
@@ -80,4 +81,11 @@ describe('sidebar', () => {
expect(sections[0].querySelector('a')).toHaveClass(ACTIVE_CLASS);
});
+
+ it('if a section is disabled, the disabled styles should be applied', () => {
+ const { container } = render();
+ const sections = container.querySelectorAll('li');
+
+ expect(sections[2].querySelector('a')).toHaveClass('opacity-50 pointer-events-none');
+ });
});
diff --git a/client/src/containers/my-projects/sidebar.tsx b/client/src/containers/my-projects/sidebar.tsx
index 17f61e03..4f4e9315 100644
--- a/client/src/containers/my-projects/sidebar.tsx
+++ b/client/src/containers/my-projects/sidebar.tsx
@@ -10,6 +10,7 @@ export default function MyProjectsSidebar({
sections: {
label: string;
value: string;
+ disabled?: boolean;
}[];
}) {
const pathname = usePathname();
@@ -28,6 +29,7 @@ export default function MyProjectsSidebar({
queryParams.get('step')?.includes(step.value) ??
sections?.[0].value === step.value,
})}
+ disabled={step.disabled}
>
{step.label}
diff --git a/client/src/hooks/geographics/index.ts b/client/src/hooks/geographics/index.ts
index 3aad0dff..051ddc4e 100644
--- a/client/src/hooks/geographics/index.ts
+++ b/client/src/hooks/geographics/index.ts
@@ -4,7 +4,6 @@ import { jsonAPIAdapter } from 'lib/adapters/json-api-adapter';
import { ParamsProps } from 'lib/adapters/types';
import { useQuery, UseQueryOptions } from '@tanstack/react-query';
-import type { FeatureCollection } from 'geojson';
import { Geographic, SubGeographic } from 'types/geographics';
@@ -47,84 +46,26 @@ export function useGeographics(queryOptions: UseQueryOptions = {}
+ queryOptions: UseQueryOptions<{ data: SubGeographic[] }, unknown, SubGeographic[]> = {}
) {
const fetchSubgeographics = () =>
- API.request({
+ API.request<{ data: SubGeographic[] }>({
method: 'GET',
url: '/subgeographics',
params: jsonAPIAdapter(params),
}).then((response) => response.data);
- const query = useQuery(['subgeographics', JSON.stringify(params)], fetchSubgeographics, {
+ return useQuery(['subgeographics', JSON.stringify(params)], fetchSubgeographics, {
placeholderData: {
- data: [],
+ data: [] as SubGeographic[],
},
+ select: ({ data }) =>
+ data.map((subgeographic) => {
+ return {
+ ...subgeographic,
+ id: subgeographic.abbreviation,
+ };
+ }),
...queryOptions,
});
-
- const { data } = query;
-
- const DATA = useMemo(() => {
- if (!data) {
- return [];
- }
-
- // Work with abbreviations instead of ids
- return data.map((subgeographic) => {
- return {
- ...subgeographic,
- id: subgeographic.abbreviation,
- };
- });
- }, [data]);
-
- return useMemo(() => {
- return {
- ...query,
- data: DATA,
- };
- }, [query, DATA]);
-}
-
-export function useSubGeographicsGeojson(
- params: ParamsProps = {},
- queryOptions: UseQueryOptions = {}
-) {
- const fetchSubgeographicsGeojson = () =>
- API.request({
- method: 'GET',
- url: '/subgeographics/geojson',
- transformResponse: (data) => JSON.parse(data),
- params: jsonAPIAdapter(params),
- }).then((response) => response.data);
-
- const query = useQuery(
- ['subgeographics-geojson', JSON.stringify(params)],
- fetchSubgeographicsGeojson,
- {
- placeholderData: {
- type: 'FeatureCollection',
- features: [],
- },
- ...queryOptions,
- }
- );
-
- const { data } = query;
-
- const DATA = useMemo(() => {
- if (!data) {
- return {};
- }
-
- return data;
- }, [data]);
-
- return useMemo(() => {
- return {
- ...query,
- data: DATA,
- };
- }, [query, DATA]);
}
diff --git a/client/src/middleware.ts b/client/src/middleware.ts
new file mode 100644
index 00000000..c1791220
--- /dev/null
+++ b/client/src/middleware.ts
@@ -0,0 +1,3 @@
+export { default } from 'next-auth/middleware';
+
+export const config = { matcher: ['/my-details/:path*', '/my-projects/:path*', '/my-fundings'] };
diff --git a/client/src/svgs/ui/arrow-right.svg b/client/src/svgs/ui/arrow-right.svg
deleted file mode 100644
index 8ab8ad2f..00000000
--- a/client/src/svgs/ui/arrow-right.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file