hiding non-localized content

ajolipa · ajolipa · commit 73011424ac85 · 2025-09-15T19:20:42.000-04:00
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ Copy the `/public/config.json` file into your content repository to `/content/se
 |----------------------------------------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | content                                | Object  | TinaCMS content collections configuration                                                                                                                                          |
 | content.collections                    | Array   | Array of content keys to allow for data entry and routing: "posts", "paths"                                                                                                        |
-| content.localize_pages                 | Boolean | If `true` pages content will be pulled from a locale directory (e.g. `/en/My-Awesome-Page.mdx`)                                                                                    |
+| content.localize_content               | Boolean | If `true` pages and other content will be pulled from a locale directory (e.g. `/en/My-Awesome-Page.mdx`)                                                                                    |
 | core_data                              | Object  | Core Data configuration                                                                                                                                                            |
 | core_data.url                          | String  | URL of the Core Data application                                                                                                                                                   |
 | core_data.project_ids                  | Array   | Array of Core Data project IDs as strings                                                                                                                                          |
diff --git a/docs/configuration-schema.md b/docs/configuration-schema.md
@@ -18,7 +18,7 @@ Array<"paths" | "posts">
 
 Required: No
 
-### localize_pages
+### localize_content
 
 If set to `true`, pages will be nested within a localized directory (e.g `/pages/en/Home.mdx`). If `false`, pages will not be localized and placed in the root `/pages` directory.
 
diff --git a/src/backend/tina/i18n.ts b/src/backend/tina/i18n.ts
@@ -8,7 +8,7 @@ import _ from 'underscore';
  * @param items
  */
 export const filterAll = async (locale: string, items: Array<any>) => {
-  if (!config.content.localize_pages) {
+  if (!config.content.localize_content) {
     return items;
   }
 
@@ -35,11 +35,8 @@ export const filterAll = async (locale: string, items: Array<any>) => {
 
     if (localized[locale]) {
       filtered.push(localized[locale]);
-    } else if (localized[config.i18n.default_locale]) {
-      filtered.push(localized[config.i18n.default_locale])
     }
   });
-
   return filtered;
 };
 
@@ -53,7 +50,7 @@ export const filterAll = async (locale: string, items: Array<any>) => {
 export const fetchOne = async (locale: string, slug: string, query: any) => {
   let response;
 
-  if (!config.content.localize_pages) {
+  if (!config.content.localize_content) {
     response = await query({ relativePath: `${slug}.mdx` });
   } else {
     response = await query({ relativePath: `${locale}/${slug}.mdx` });
diff --git a/src/backend/tina/index.ts b/src/backend/tina/index.ts
@@ -28,22 +28,26 @@ export const fetchPages = async (locale: string, params?: any) => {
   return filterAll(locale, pages);
 };
 
-export const fetchPath = async (slug: string) => {
-  const response = await client.queries.path({ relativePath: `${slug}.mdx`});
+export const fetchPath = async (locale: string, slug: string) => {
+  const response = await fetchOne(locale, slug, client.queries.path);
   return response.data?.path;
 };
 
-export const fetchPaths = async () => {
+export const fetchPaths = async (locale: string) => {
   const response = await client.queries.pathConnection();
-  return response.data?.pathConnection?.edges?.map((item) => item?.node);
+  const paths = response.data?.pathConnection?.edges?.map((item) => item?.node);
+
+  return filterAll(locale, paths)
 };
 
-export const fetchPost = async (slug: string) => {
-  const response = await client.queries.post({ relativePath: `${slug}.mdx`});
+export const fetchPost = async (locale: string, slug: string) => {
+  const response = await fetchOne(locale, slug, client.queries.post);
   return response.data?.post;
 };
 
-export const fetchPosts = async () => {
+export const fetchPosts = async (locale: string) => {
   const response = await client.queries.postConnection();
-  return response.data?.postConnection?.edges?.map((item) => item?.node);
+  const posts = response.data?.postConnection?.edges?.map((item) => item?.node);
+  
+  return filterAll(locale, posts)
 };
diff --git a/src/pages/[lang]/paths/[slug].astro b/src/pages/[lang]/paths/[slug].astro
@@ -7,27 +7,24 @@ import Layout from "@layouts/Layout.astro";
 import _ from 'underscore';
 
 const { slug } = Astro.params;
-const path = await fetchPath(slug);
+const locale = Astro.currentLocale;
+const path = await fetchPath(locale, slug);
 
-const { t } = await getTranslations(Astro.currentLocale);
+const { t } = await getTranslations(locale);
 const title = path?.title || t('paths');
 
 export const getStaticPaths = async () => {
-  const staticPaths = [];
+  const paths = [];
 
-  const locales = config.i18n.locales;
-  const paths = await fetchPaths();
+  for (const lang of config.i18n.locales) {
+    const paths = await fetchPaths(lang);
 
-  _.each(locales, (lang) => {
-    _.each(paths, (path) => {
-      staticPaths.push({ params: {
-        lang,
-        slug: path?._sys.filename
-      }})
-    });
-  });
+    for (const path of paths) {
+      paths.push({ params: { lang, slug: path._sys.filename } });
+    }
+  }
 
-  return staticPaths;
+  return paths;
 };
 
 ---
diff --git a/src/pages/[lang]/paths/index.astro b/src/pages/[lang]/paths/index.astro
@@ -10,7 +10,7 @@ import { getRelativeLocaleUrl } from 'astro:i18n';
 import _ from 'underscore';
 
 const { t } = await getTranslations(Astro.currentLocale);
-const paths = await fetchPaths();
+const paths = await fetchPaths(Astro.currentLocale);
 
 export const getStaticPaths = () => _.map(config.i18n.locales, (lang) => ({ params: { lang }}));
 
@@ -31,15 +31,15 @@ export const getStaticPaths = () => _.map(config.i18n.locales, (lang) => ({ para
       { t('paths') }
     </h1>
     <Cards>
-      { _.map(paths, (path) => (
+      { paths?.length ? _.map(paths, (path) => (
         <Card
           imageUrl={path?.image}
           alt={path?.imageAlt}
           slug={getRelativeLocaleUrl(Astro.currentLocale, `/paths/${path?._sys.filename}` || '#')}
           t={t}
           title={path?.title || t('untitled')}
         />
-      ))}
+      )) : <p class="italic text-sm">({ t('none') })</p> }
     </Cards>
   </Container>
 </Layout>
diff --git a/src/pages/[lang]/posts/[slug].astro b/src/pages/[lang]/posts/[slug].astro
@@ -9,30 +9,24 @@ import Layout from '@layouts/Layout.astro';
 import _ from 'underscore';
 
 const { slug } = Astro.params;
-const post = await fetchPost(slug);
 
 const locale = Astro.currentLocale;
 
-const localePost = getLocalizedContent(post, locale.replaceAll('-', '_')) //this is to deal with Tina's field naming restrictions
-
+const post = await fetchPost(locale, slug);
 const { t } = await getTranslations(locale);
 
 export const getStaticPaths = async () => {
-  const staticPaths = [];
+  const paths = [];
 
-  const locales = config.i18n.locales;
-  const posts = await fetchPosts();
+  for (const lang of config.i18n.locales) {
+    const posts = await fetchPosts(lang);
 
-  _.each(locales, (lang) => {
-    _.each(posts, (post) => {
-      staticPaths.push({ params: {
-        lang,
-        slug: post?._sys.filename
-      }});
-    });
-  });
+    for (const post of posts) {
+      paths.push({ params: { lang, slug: post._sys.filename } });
+    }
+  }
 
-  return staticPaths;
+  return paths;
 };
 
 ---
@@ -41,14 +35,14 @@ export const getStaticPaths = async () => {
   footer
   t={t}
   tab='posts'
-  title={localePost?.title}
+  title={post?.title}
 >
   <Container
     className='pb-16 w-full'
   >
     <PostContent
-      content={localePost?.body}
-      title={localePost?.title}
+      content={post?.body}
+      title={post?.title}
       client:only='react'
     />
   </Container>
diff --git a/src/pages/[lang]/posts/index.astro b/src/pages/[lang]/posts/index.astro
@@ -5,20 +5,15 @@ import Card from '@components/Card.astro';
 import Cards from '@components/Cards.astro';
 import Container from '@components/Container.astro';
 import config from '@config';
-import { getLocalizedContent } from '@i18n/utils';
 import Layout from '@layouts/Layout.astro';
 import { getRelativeLocaleUrl } from 'astro:i18n';
 import _ from 'underscore';
 
 const { t } = await getTranslations(Astro.currentLocale);
-const posts = await fetchPosts();
+const posts = await fetchPosts(Astro.currentLocale);
 
 export const getStaticPaths = () => _.map(config.i18n.locales, (lang) => ({ params: { lang }}));
 
-//Localize the post titles
-const localeField = Astro.currentLocale.replaceAll('-', '_') //this is to deal with Tina's field naming conventions
-const localizedPosts = _.map(posts, (post: any) => (getLocalizedContent(post, localeField)))
-
 ---
 
 <Layout
@@ -36,15 +31,15 @@ const localizedPosts = _.map(posts, (post: any) => (getLocalizedContent(post, lo
       { t('posts') }
     </h1>
     <Cards>
-      { _.map(localizedPosts, (post) => (
+      { posts?.length ? _.map(posts, (post) => (
         <Card
           imageUrl={post?.cardImage}
           alt={post?.imageAlt}
           slug={getRelativeLocaleUrl(Astro.currentLocale, `posts/${post._sys.filename}`)}
           t={t}
           title={post.title}
         />
-      ))}
+      )) : <p class="italic text-sm">({ t('none') })</p>}
     </Cards>
   </Container>
 </Layout>
diff --git a/src/types.ts b/src/types.ts
@@ -52,7 +52,7 @@ export interface SearchConfig {
 export interface Configuration {
   content?: {
     collections?: Array<String>,
-    localize_pages?: boolean
+    localize_content?: boolean
   };
 
   core_data: {
diff --git a/src/utils/nav.ts b/src/utils/nav.ts
@@ -1,14 +1,23 @@
 import { fetchPages } from '@backend/tina';
+import config from '@config';
 import _ from 'underscore';
 
 /**
- * Returns the first page flagged as "home_page".
+ * Returns the first page flagged as "home_page". If none exists for the current locale, will default to the configured `default_locale` if possible.
  *
  * @param locale
  */
 export const getHomepage = async (locale: string) => {
   const pages = await fetchPages(locale, { filter: { home_page: { eq: true } } });
-  const [page, ] = pages;
+  let page: any;
+  if (pages && pages.length) {
+    page = pages[0];
+  } else if (config.i18n.default_locale) {
+    const defaultPages = await fetchPages(config.i18n.default_locale, { filter: { home_page: { eq: true } } });
+    if (defaultPages && defaultPages.length) {
+      page = defaultPages[0];
+    }
+  }
 
   return page;
 };
diff --git a/test/config.test.ts b/test/config.test.ts
@@ -42,8 +42,8 @@ describe('content', () => {
     expect(config.content?.collections).toBeArrayOfValues(collections);
   });
 
-  test('localize_pages matches allowed values', () => {
-    expect(config.content?.localize_pages).toBeBoolean();
+  test('localize_content matches allowed values', () => {
+    expect(config.content?.localize_content).toBeBoolean();
   });
 });
 
diff --git a/tina/config.ts b/tina/config.ts
@@ -5,7 +5,7 @@ import Branding from './content/branding';
 import I18n from './content/i18n';
 import PagesCollection from './content/pages';
 import PathsCollection from './content/paths';
-import { getPostsCollection } from './content/posts';
+import PostsCollection from './content/posts';
 import Settings from './content/settings';
 import { CustomAuthProvider } from './auth-provider';
 import { TinaUserCollection, UsernamePasswordAuthJSProvider } from 'tinacms-authjs/dist/tinacms';
@@ -14,11 +14,6 @@ const isLocal = process.env.TINA_PUBLIC_IS_LOCAL === 'true';
 const localContentPath = process.env.TINA_LOCAL_CONTENT_PATH;
 const useSSO = process.env.TINA_PUBLIC_AUTH_USE_KEYCLOAK === 'true';
 
-//deal with localizing the Posts collection
-const defaultLocale = config.i18n.default_locale;
-const otherLocales = config.i18n.locales.filter((loc) => (loc !== defaultLocale))
-const PostsCollection = getPostsCollection(otherLocales)
-
 export default defineConfig({
   authProvider: isLocal
     ? new LocalAuthProvider()
diff --git a/tina/content/pages.ts b/tina/content/pages.ts
@@ -34,6 +34,11 @@ const Pages: Collection = {
   label: 'Pages',
   path: 'content/pages',
   format: 'mdx',
+  ui: {
+    allowedActions: {
+      createNestedFolder: true
+    }
+  },
   fields: [{
     name: 'title',
     label: 'Title',
diff --git a/tina/content/paths.ts b/tina/content/paths.ts
@@ -8,6 +8,11 @@ const Paths: Collection = {
   label: 'Paths',
   path: 'content/paths',
   format: 'mdx',
+    ui: {
+    allowedActions: {
+      createNestedFolder: true
+    }
+  },
   fields: [
     {
       name: 'title',
diff --git a/tina/content/posts.ts b/tina/content/posts.ts
@@ -33,41 +33,11 @@ const Posts: Collection = {
       templates: postTemplates as RichTextTemplate<false>[],
     },
   ],
-};
-
-/**
- * Accepts an array of non-default locales and returns the appropriate posts collection schema
- * @param locales An array of the non-default locales for the project
- * @returns `Posts` collection with localized content fields
- */
-export const getPostsCollection = (locales: string[]) => {
-  if (!locales || !locales.length) {
-    return Posts;
+  ui: {
+    allowedActions: {
+      createNestedFolder: true
+    }
   }
-  const localizedContent = locales.map((key) => ({
-    type: 'object',
-    name: key.replaceAll('-', '_'),
-    label: key,
-    fields: [
-      {
-        type: 'string',
-        name: 'title',
-        label: 'Title',
-      },
-      {
-        type: 'rich-text',
-        name: 'body',
-        label: 'Body',
-      },
-    ],
-  }));
-  return {
-    name: Posts.name,
-    label: Posts.label,
-    path: Posts.path,
-    format: Posts.format,
-    fields: [...Posts.fields, ...localizedContent],
-  } as Collection;
 };
 
 export default Posts;
diff --git a/tina/content/settings.ts b/tina/content/settings.ts
@@ -18,8 +18,8 @@ const Settings: Collection = {
       type: 'string',
       list: true
     }, {
-      name: 'localize_pages',
-      label: 'Localize Pages',
+      name: 'localize_content',
+      label: 'Localize Content',
       type: 'boolean'
     }]
   }, {
diff --git a/tina/tina-lock.json b/tina/tina-lock.json
