nextjs-cms 0.9.38 → 0.9.39

package/dist/api/actions/pages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../../../src/api/actions/pages.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../../../src/api/actions/pages.ts"],"names":[],"mappings":"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"}

package/dist/api/actions/pages.js

@@ -1012,7 +1012,7 @@ export const getCategorySection = async (session, sectionName) => {
         // publisher: privileges.publisher,
     };
 };
-export const getBrowsePage = async (session, sectionName, page = 1, q) => {
+export const getBrowsePage = async (session, sectionName, page = 1, q, locale) => {
     // Let's fetch the section items and admin privileges for the section
     const _s = (await SectionFactory.getSectionForAdmin({
         name: sectionName,
@@ -1031,40 +1031,69 @@ export const getBrowsePage = async (session, sectionName, page = 1, q) => {
     const limit = 12;
     const offset = (page - 1) * limit;
     const tableName = section.db.table;
+    const identifierName = section.db.identifier.name;
+    const localesTable = section.localesTableName;
     const orderByFieldName = section.db.orderByField?.name || 'created_at';
     const sqlChunks = [];
     const totalRowsSqlChunks = [];
     const sectionSearch = section.search?.searchFields ? section.search?.searchFields.length > 0 : false;
-    // Check if we need to JOIN _locales for search
     const cmsConfig = await getCMSConfig();
     const hasLocalization = !!cmsConfig.localization?.enabled;
-    const hasLocalizedSearchFields = hasLocalization && q && q.trim().length > 0 && section.search?.searchFields?.some((f) => f.localized);
-    const localesTable = hasLocalizedSearchFields ? section.localesTableName : null;
-    if (localesTable) {
-        // Use DISTINCT to avoid duplicate rows from the LEFT JOIN
-        sqlChunks.push(sql `select distinct ${sql.raw(`\`${tableName}\``)}.* from ${sql.raw(`\`${tableName}\``)} left join ${sql.raw(`\`${localesTable}\``)} on ${sql.raw(`\`${localesTable}\``)}.parent_id = ${sql.raw(`\`${tableName}\``)}.${sql.raw(`\`${section.db.identifier.name}\``)}`);
-        totalRowsSqlChunks.push(sql `select count(distinct ${sql.raw(`\`${tableName}\``)}.${sql.raw(`\`${section.db.identifier.name}\``)} ) as total from ${sql.raw(`\`${tableName}\``)} left join ${sql.raw(`\`${localesTable}\``)} on ${sql.raw(`\`${localesTable}\``)}.parent_id = ${sql.raw(`\`${tableName}\``)}.${sql.raw(`\`${section.db.identifier.name}\``)}`);
+    // Resolve the requested browse locale. A non-default, resolvable locale on a section
+    // with localized content switches the browse view to that locale: localized fields are
+    // rendered from the locale row (base value as fallback) and search is scoped to that same
+    // locale. The default locale (or none) keeps the plain base-table behavior.
+    const localeResult = resolveLocale({ localization: cmsConfig.localization, locale });
+    const browseLocale = localeResult.localizationEnabled &&
+        localeResult.resolvedLocale &&
+        localeResult.isDefault === false &&
+        section.hasLocalizedContent
+        ? localeResult.resolvedLocale.code
+        : null;
+    // Display fields whose value should come from the locale row when browsing a non-default locale.
+    const localizedDisplayFieldNames = new Set();
+    if (browseLocale) {
+        if (section.headingField?.localized)
+            localizedDisplayFieldNames.add(section.headingField.name);
+        if (section.coverPhotoField?.localized)
+            localizedDisplayFieldNames.add(section.coverPhotoField.name);
+        if (section.browse?.fields) {
+            for (const f of section.browse.fields) {
+                const field = section.fields.find((sf) => sf.name === f.name);
+                if (field?.localized)
+                    localizedDisplayFieldNames.add(f.name);
+            }
+        }
+    }
+    const trimmedQuery = q && q.trim().length > 0 ? q.trim() : null;
+    if (browseLocale) {
+        // 1:1 LEFT JOIN via the (parent_id, locale) unique key — at most one locale row per
+        // item, so no DISTINCT is needed. Items without a translation still appear (locale
+        // columns NULL → base fallback). Localized display columns are aliased `__loc_<name>`.
+        const localeJoin = sql `from ${sql.raw(`\`${tableName}\``)} left join ${sql.raw(`\`${localesTable}\``)} on ${sql.raw(`\`${localesTable}\``)}.parent_id = ${sql.raw(`\`${tableName}\``)}.${sql.raw(`\`${identifierName}\``)} and ${sql.raw(`\`${localesTable}\``)}.locale = ${browseLocale}`;
+        const selectParts = [sql `${sql.raw(`\`${tableName}\``)}.*`];
+        for (const fieldName of localizedDisplayFieldNames) {
+            selectParts.push(sql `${sql.raw(`\`${localesTable}\``)}.${sql.raw(`\`${fieldName}\``)} AS ${sql.raw(`\`__loc_${fieldName}\``)}`);
+        }
+        sqlChunks.push(sql `select`, sql.join(selectParts, sql `, `), localeJoin);
+        totalRowsSqlChunks.push(sql `select count(*) as total`, localeJoin);
     }
     else {
         sqlChunks.push(sql `select * from ${sql.raw(`\`${tableName}\``)}`);
         totalRowsSqlChunks.push(sql `select count(*) as total from ${sql.raw(`\`${tableName}\``)}`);
     }
-    if (q && q.trim().length > 0) {
-        if (section.search?.searchFields.length) {
-            const whereParts = [];
-            for (const field of section.search.searchFields) {
-                // Search in main table
-                whereParts.push(sql `${sql.raw(`\`${tableName}\``)}.${sql.raw(`\`${field.name}\``)} LIKE CONCAT('%',${sql `${q.trim()}`},'%')`);
-                // Also search in _locales table for localized fields
-                if (localesTable && field.localized) {
-                    whereParts.push(sql `${sql.raw(`\`${localesTable}\``)}.${sql.raw(`\`${field.name}\``)} LIKE CONCAT('%',${sql `${q.trim()}`},'%')`);
-                }
+    if (trimmedQuery && section.search?.searchFields.length) {
+        const whereParts = [];
+        for (const field of section.search.searchFields) {
+            // Base-table column (this is also the default-locale content)
+            whereParts.push(sql `${sql.raw(`\`${tableName}\``)}.${sql.raw(`\`${field.name}\``)} LIKE CONCAT('%',${trimmedQuery},'%')`);
+            // Current locale's column — scoped to the browsed locale only, not all locales
+            if (browseLocale && field.localized) {
+                whereParts.push(sql `${sql.raw(`\`${localesTable}\``)}.${sql.raw(`\`${field.name}\``)} LIKE CONCAT('%',${trimmedQuery},'%')`);
             }
-            sqlChunks.push(sql `where`);
-            sqlChunks.push(sql.join(whereParts, sql ` or `));
-            totalRowsSqlChunks.push(sql `where`);
-            totalRowsSqlChunks.push(sql.join(whereParts, sql ` or `));
         }
+        sqlChunks.push(sql `where`, sql.join(whereParts, sql ` or `));
+        totalRowsSqlChunks.push(sql `where`, sql.join(whereParts, sql ` or `));
     }
     sqlChunks.push(sql `ORDER BY ${sql.raw(`\`${tableName}\``)}.${sql.raw(`\`${orderByFieldName}\``)} DESC LIMIT ${limit} OFFSET ${offset}`);
     const finalSql = sql.join(sqlChunks, sql.raw(' '));
@@ -1074,9 +1103,61 @@ export const getBrowsePage = async (session, sectionName, page = 1, q) => {
     const totalCountResult = await db.execute(totalRowsSql);
     const totalCountRows = totalCountResult[0];
     const rows = sectionItems[0];
+    // Existing translations per item, keyed by parent id.
+    // Only the current page's rows are looked up, and the query is covered by the
+    // `(parent_id, locale)` unique index on the _locales table, so it's an index-only
+    // scan of at most `limit` groups — negligible cost. Skipped entirely for
+    // non-localized sections.
+    const localesByItemId = new Map();
+    if (hasLocalization && section.hasLocalizedContent && rows.length > 0) {
+        const itemIds = rows
+            .map((row) => row[identifierName])
+            .filter((id) => id !== null && id !== undefined);
+        if (itemIds.length > 0) {
+            // Configured order, so badges render consistently regardless of GROUP_CONCAT order.
+            const localeOrder = cmsConfig.localization?.locales?.map((l) => l.code) ?? [];
+            const idList = sql.join(itemIds.map((id) => sql `${id}`), sql `, `);
+            const localesSql = sql `SELECT parent_id, GROUP_CONCAT(locale) AS locales FROM ${sql.raw(`\`${section.localesTableName}\``)} WHERE parent_id IN (${idList}) GROUP BY parent_id`;
+            try {
+                const localesResult = await db.execute(localesSql);
+                const localeRows = localesResult[0];
+                for (const localeRow of localeRows) {
+                    const existing = String(localeRow.locales ?? '')
+                        .split(',')
+                        .filter(Boolean);
+                    const ordered = localeOrder.filter((code) => existing.includes(code));
+                    localesByItemId.set(String(localeRow.parent_id), ordered);
+                }
+            }
+            catch (e) {
+                console.error('Failed to load existing locales for browse page items:', e);
+            }
+        }
+    }
     // Resolve localized section title for the browse page header
     const language = resolveLanguage(session.user.language, cmsConfig.i18n.supportedLanguages, cmsConfig.i18n.fallbackLanguage);
     const resolvedTitle = resolveMultilingualString(section.title.section, language, cmsConfig.i18n.fallbackLanguage);
+    // Returns a field's display value, preferring the localized (`__loc_<name>`) column when
+    // browsing a non-default locale and a translation exists, falling back to the base value.
+    const displayValue = (row, fieldName) => {
+        if (localizedDisplayFieldNames.has(fieldName)) {
+            const localized = row[`__loc_${fieldName}`];
+            if (localized !== null && localized !== undefined)
+                return localized;
+        }
+        return row[fieldName];
+    };
+    // Locale switcher metadata for the browse page. `currentLocale` reflects the resolved
+    // browse locale (defaulting to the base locale when none/invalid was requested).
+    const browseLocalization = localeResult.localizationEnabled
+        ? {
+            locales: localeResult.availableLocales,
+            defaultLocale: localeResult.defaultLocale,
+            currentLocale: localeResult.resolvedLocale ?? localeResult.defaultLocale,
+            localeSwitcherEnabled: localeResult.availableLocales.length > 1 &&
+                (section.hasLocalizedContent === true || process.env.NODE_ENV === 'development'),
+        }
+        : null;
     return {
         section: {
             // tableName: tableName,
@@ -1087,6 +1168,7 @@ export const getBrowsePage = async (session, sectionName, page = 1, q) => {
             name: section.name,
             title: resolvedTitle,
         },
+        localization: browseLocalization,
         items: rows.map((row) => {
             // Custom browse page implementation: if browse.fields is configured,
             // return the specified fields plus default fields (id, headingTitle, coverPhoto, createdAt, createdBy, permission).
@@ -1096,26 +1178,28 @@ export const getBrowsePage = async (session, sectionName, page = 1, q) => {
                 const item = {
                     // Always include default fields
                     id: row[section.db.identifier.name],
-                    headingTitle: row[section.headingField.name],
-                    coverPhoto: section.coverPhotoField ? row[section.coverPhotoField?.name] : null,
+                    headingTitle: displayValue(row, section.headingField.name),
+                    coverPhoto: section.coverPhotoField ? displayValue(row, section.coverPhotoField.name) : null,
                     createdAt: row['created_at'],
                     createdBy: row['created_by'],
                     permission: row.permission,
+                    locales: localesByItemId.get(String(row[section.db.identifier.name])) ?? [],
                 };
                 // Add configured browse fields
                 for (const field of section.browse.fields) {
-                    item[field.name] = row[field.name] ?? null;
+                    item[field.name] = displayValue(row, field.name) ?? null;
                 }
                 return item;
             }
             // Default browse page fields (used by the standard CMS browse page)
             return {
                 id: row[section.db.identifier.name],
-                headingTitle: row[section.headingField.name],
-                coverPhoto: section.coverPhotoField ? row[section.coverPhotoField?.name] : null,
+                headingTitle: displayValue(row, section.headingField.name),
+                coverPhoto: section.coverPhotoField ? displayValue(row, section.coverPhotoField.name) : null,
                 createdAt: row['created_at'],
                 createdBy: row['created_by'],
                 permission: row.permission,
+                locales: localesByItemId.get(String(row[section.db.identifier.name])) ?? [],
             };
         }),
         totalCount: totalCountRows[0].total,