refactor so that consolidated prefix is within the getLanguageFileName function

barrymun · barrymun · commit c0b3bff5ab80 · 2025-01-24T09:10:08.000Z
diff --git a/src/hooks/useCategories.ts b/src/hooks/useCategories.ts
@@ -14,9 +14,7 @@ export const useCategories = () => {
     [language.name, subLanguage]
   );
 
-  const { data, loading, error } = useFetch<CategoryType[]>(
-    `/consolidated/${fileName}`
-  );
+  const { data, loading, error } = useFetch<CategoryType[]>(fileName);
 
   const fetchedCategories = useMemo(() => {
     return data ? data.map((item) => item.name) : [];
diff --git a/src/hooks/useSnippets.ts b/src/hooks/useSnippets.ts
@@ -20,9 +20,7 @@ export const useSnippets = () => {
     [language.name, subLanguage]
   );
 
-  const { data, loading, error } = useFetch<CategoryType[]>(
-    `/consolidated/${fileName}`
-  );
+  const { data, loading, error } = useFetch<CategoryType[]>(fileName);
 
   const fetchedSnippets = useMemo(() => {
     if (!data) {
diff --git a/src/utils/languageUtils.ts b/src/utils/languageUtils.ts
@@ -26,6 +26,6 @@ export function getLanguageFileName(
   subLanguage: LanguageType["subLanguages"][number]["name"]
 ) {
   return slugify(subLanguage) !== defaultSlugifiedSubLanguageName
-    ? `${slugify(language)}--${slugify(subLanguage)}.json`
-    : `${slugify(language)}.json`;
+    ? `/consolidated/${slugify(language)}--${slugify(subLanguage)}.json`
+    : `/consolidated/${slugify(language)}.json`;
 }
diff --git a/tests/languageUtils.test.ts b/tests/languageUtils.test.ts
@@ -40,14 +40,14 @@ describe(getLanguageDisplayLogo.name, () => {
 describe(getLanguageFileName.name, () => {
   it("should return a concatenation of the language and subLanguage if subLanguage is not the default", () => {
     const result = getLanguageFileName("JAVASCRIPT", "React");
-    expect(result).toBe("javascript--react.json");
+    expect(result).toBe("/consolidated/javascript--react.json");
   });
 
   it("should return the language name only if subLanguage is the default", () => {
     const result = getLanguageFileName(
       "JAVASCRIPT",
       defaultSlugifiedSubLanguageName
     );
-    expect(result).toBe("javascript.json");
+    expect(result).toBe("/consolidated/javascript.json");
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ export function getLanguageFileName(`
`26`	`26`	`subLanguage: LanguageType["subLanguages"][number]["name"]`
`27`	`27`	`) {`
`28`	`28`	`return slugify(subLanguage) !== defaultSlugifiedSubLanguageName`
`29`		- ? `${slugify(language)}--${slugify(subLanguage)}.json`
`30`		- : `${slugify(language)}.json`;
	`29`	+ ? `/consolidated/${slugify(language)}--${slugify(subLanguage)}.json`
	`30`	+ : `/consolidated/${slugify(language)}.json`;
`31`	`31`	`}`