{
className="tag-container"
style={{ maxHeight: isExpanded ? '800px' : '200px' }}
>
- {displayInterviews.map((interview, index) => (
- {
- e.preventDefault();
- handleNavigation(serverUrl + interview.link);
- }}
- >
- {interview.metadata.title}
-
- ))}
+ {displayInterviews.map((interview, index) => {
+ if (interview.metadata && interview.metadata.title) {
+ return (
+ {
+ e.preventDefault();
+ handleNavigation(interview.serverUrl + interview.link);
+ }}
+ >
+ {interview.metadata.title}
+
+ );
+ }
+ return null;
+ })}
diff --git a/src/app/components/TopicsSection.tsx b/src/app/components/TopicsSection.tsx
new file mode 100644
index 0000000..522d83f
--- /dev/null
+++ b/src/app/components/TopicsSection.tsx
@@ -0,0 +1,44 @@
+import { legalTopics } from '../../config/topics.config';
+import { formSources } from '../../config/formSources.config';
+import TopicCard from './TopicCard';
+import ShowAllToggle from './ShowAllToggle';
+
+const TopicsSection = async ({ path, interviews, isError }) => {
+ if (isError) {
+ return
Error fetching data.
;
+ }
+
+ const server =
+ formSources.docassembleServers.find((server) => server.path === path) ||
+ formSources.docassembleServers[0];
+ const serverUrl = server.url;
+
+ const filteredTopics = legalTopics
+ .sort((a, b) => b.priority - a.priority)
+ .filter(
+ (topic) => topic.always_visible || interviews[topic.name].length > 0
+ );
+
+ return (
+
+
+
Browse court forms by category
+
+ {filteredTopics.map((topic, index) => (
+
+ ))}
+
+ {filteredTopics.length > 9 &&
}
+
+ );
+};
+
+export default TopicsSection;
diff --git a/src/app/globals.css b/src/app/globals.css
index eebb154..1668a8b 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -192,14 +192,6 @@ h5,
font-weight: 600;
}
-h1,
-h2,
-h3,
-h4,
-h5 {
- margin-top: 2em;
-}
-
body {
font-family: 'Inter';
}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 9ac97ae..a8ab847 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,52 +1,20 @@
-import HeroSection from './components/HeroSection';
import HowItWorksSection from './components/HowItWorksSection';
+import TopicsSection from './components/TopicsSection';
+import HeroSection from './components/HeroSection';
import { fetchInterviews } from '../data/fetchInterviewData';
-import TopicCard from './components/TopicCard';
-import { legalTopics } from '../config/topics.config';
-import ShowAllToggle from './components/ShowAllToggle';
-import { formSources } from '../config/formSources.config';
-
-export default async function TopicsPage() {
- const interviewsResult = await fetchInterviews();
- const { interviewsByTopic } = interviewsResult;
-
- // Modify this to account for various jurisdictions
- const serverKey = 'suffolkListLab';
- const server = formSources.docassembleServers.find(
- (server) => server.key === serverKey
- );
- const url = server ? server.url : 'https://apps.suffolklitlab.org';
- const filteredTopics = legalTopics
- .sort((a, b) => b.priority - a.priority)
- .filter(
- (topic, index) =>
- topic.always_visible ||
- (interviewsByTopic[topic.name] &&
- interviewsByTopic[topic.name].length > 0)
- );
+export default async function Page() {
+ const { interviewsByTopic, isError } = await fetchInterviews('ma');
return (
-
-
-
Browse court forms by category
-
- {filteredTopics.map((topic, index) => (
-
- ))}
-
- {filteredTopics.length > 9 &&
}
-
+
);
}
diff --git a/src/config/formSources.config.js b/src/config/formSources.config.js
index 131f802..5e68617 100644
--- a/src/config/formSources.config.js
+++ b/src/config/formSources.config.js
@@ -1,3 +1,14 @@
+export const pathToServerConfig = {
+ ma: {
+ path: 'ma',
+ servers: ['Suffolk LIT Lab', 'Greater Boston Legal Services'],
+ },
+ gb: {
+ path: 'gb',
+ servers: ['Greater Boston Legal Services'],
+ },
+};
+
export const formSources = {
docassembleServers: [
{
diff --git a/src/data/fetchInterviewData.ts b/src/data/fetchInterviewData.ts
index 2232d49..3b3a4ba 100644
--- a/src/data/fetchInterviewData.ts
+++ b/src/data/fetchInterviewData.ts
@@ -1,56 +1,73 @@
-import { formSources } from '../config/formSources.config';
+import { formSources, pathToServerConfig } from '../config/formSources.config';
import { legalTopics } from '../config/topics.config';
import { findClosestTopic } from './helpers';
-export const fetchInterviews = async () => {
- const serverUrl = formSources.docassembleServers[0].url;
- const url = new URL(`${serverUrl}/list`);
- url.search = 'json=1';
-
- try {
- const response = await fetch(url.toString());
- const data = await response.json();
- const interviewsByTopic = {};
- const titlesInTopics = {};
-
- legalTopics.forEach((topic) => {
- interviewsByTopic[topic.name] = [];
- titlesInTopics[topic.name] = new Set();
- });
-
- if (data && data.interviews) {
- data.interviews.forEach((interview) => {
- const uniqueTopics = new Set();
-
- // match topics to config by metadata.LIST_Topic, and tags values
- (interview.metadata.LIST_topics || [])
- .concat(interview.tags || [])
- .forEach((code) => {
- const topic = findClosestTopic(code, legalTopics);
- if (topic && !uniqueTopics.has(topic.name)) {
- uniqueTopics.add(topic.name);
- // check if the title already exists in the topic to avoid duplicated titles
- if (!titlesInTopics[topic.name].has(interview.title)) {
- interviewsByTopic[topic.name].push(interview);
- titlesInTopics[topic.name].add(interview.title);
- }
- }
- });
-
- // add to other if no matching topic in config
- if (uniqueTopics.size === 0) {
- interviewsByTopic['Other'] = interviewsByTopic['Other'] || [];
- if (!titlesInTopics['Other'].has(interview.title)) {
- interviewsByTopic['Other'].push(interview);
- titlesInTopics['Other'].add(interview.title);
+export const fetchInterviews = async (path) => {
+ const config = pathToServerConfig[path];
+ const serverNames = config
+ ? config.servers
+ : [formSources.docassembleServers[0].name];
+ const servers = formSources.docassembleServers.filter((server) =>
+ serverNames.includes(server.name)
+ );
+
+ let allInterviews = [];
+ for (const server of servers) {
+ const url = new URL(`${server.url}/list`);
+ url.search = 'json=1';
+
+ try {
+ const response = await fetch(url.toString());
+ const data = await response.json();
+ if (data && data.interviews) {
+ const taggedInterviews = data.interviews.map((interview) => ({
+ ...interview,
+ serverUrl: server.url,
+ }));
+ allInterviews = allInterviews.concat(taggedInterviews);
+ }
+ } catch (error) {
+ console.error(
+ 'Failed to fetch interviews from server:',
+ server.name,
+ error
+ );
+ }
+ }
+
+ const interviewsByTopic = {};
+ const titlesInTopics = {};
+ legalTopics.forEach((topic) => {
+ interviewsByTopic[topic.name] = [];
+ titlesInTopics[topic.name] = new Set();
+ });
+
+ allInterviews.forEach((interview) => {
+ const uniqueTopics = new Set();
+
+ // Match topics by metadata.LIST_topics and tags
+ (interview.metadata.LIST_topics || [])
+ .concat(interview.tags || [])
+ .forEach((code) => {
+ const topic = findClosestTopic(code, legalTopics);
+ if (topic && !uniqueTopics.has(topic.name)) {
+ uniqueTopics.add(topic.name);
+ if (!titlesInTopics[topic.name].has(interview.title)) {
+ interviewsByTopic[topic.name].push(interview);
+ titlesInTopics[topic.name].add(interview.title);
}
}
});
+
+ if (
+ uniqueTopics.size === 0 &&
+ !titlesInTopics['Other'].has(interview.title)
+ ) {
+ interviewsByTopic['Other'] = interviewsByTopic['Other'] || [];
+ interviewsByTopic['Other'].push(interview);
+ titlesInTopics['Other'].add(interview.title);
}
+ });
- return { interviewsByTopic, isError: false };
- } catch (error) {
- console.error('Failed to fetch interviews:', error);
- return { interviewsByTopic: {}, isError: true };
- }
+ return { interviewsByTopic, isError: false };
};
diff --git a/src/data/helpers/index.test.ts b/src/data/helpers/index.test.ts
new file mode 100644
index 0000000..cd1f399
--- /dev/null
+++ b/src/data/helpers/index.test.ts
@@ -0,0 +1,42 @@
+import { findClosestTopic } from './';
+
+describe('findClosestTopic', () => {
+ const legalTopics = [
+ {
+ name: 'Housing',
+ codes: ['HO-01-00-00-00', 'HO-02-00-00-00'],
+ },
+ {
+ name: 'Family',
+ codes: ['FA-00-00-00-00', 'FA-01-00-00-00'],
+ },
+ {
+ name: 'Employment',
+ codes: ['EM-01-00-00-00'],
+ },
+ ];
+
+ it('should return the exact matching topic', () => {
+ const topicCode = 'HO-02-00-00-00';
+ const result = findClosestTopic(topicCode, legalTopics);
+ expect(result.name).toBe('Housing');
+ });
+
+ it('should return the closest smaller match if exact match is not available', () => {
+ const topicCode = 'HO-01-50-00-00';
+ const result = findClosestTopic(topicCode, legalTopics);
+ expect(result.name).toBe('Housing');
+ });
+
+ it('should return undefined if no prefix matches', () => {
+ const topicCode = 'XX-01-00-00-00';
+ const result = findClosestTopic(topicCode, legalTopics);
+ expect(result).toBeUndefined();
+ });
+
+ it('handles cases with leading zeros in topic codes', () => {
+ const topicCode = 'FA-01-00-00-00';
+ const result = findClosestTopic(topicCode, legalTopics);
+ expect(result.name).toBe('Family');
+ });
+});