nextjs-cms 0.9.30 → 0.9.32

package/dist/api/lib/serverActions.d.ts.map

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

package/dist/api/lib/serverActions.js

@@ -1,26 +1,25 @@
 // import 'server-only'
-import { db } from '../../db/client.js';
-import { AdminPrivilegesTable, AdminsTable, EditorPhotosTable } from '../../db/schema.js';
-import { and, eq, sql } from 'drizzle-orm';
-import { TRPCError } from '@trpc/server';
-import { FieldFactory, SectionFactory } from '../../core/factories/index.js';
-import { SelectField } from '../../core/fields/index.js';
-import { MysqlTableChecker } from '../../core/db/index.js';
 import fs from 'fs';
-import { Readable } from 'stream';
 import path from 'path';
-import { sanitizeFileName, sanitizeFolderOrFileName } from '../../utils/index.js';
-import sharp from 'sharp';
-import { readChunk } from 'read-chunk';
+import { Readable } from 'stream';
+import { TRPCError } from '@trpc/server';
+import { and, eq, sql } from 'drizzle-orm';
 import { fileTypeFromBuffer } from 'file-type';
+import { readChunk } from 'read-chunk';
+import sharp from 'sharp';
+import through2 from 'through2';
 import { getCMSConfig } from '../../core/config/index.js';
+import { MysqlTableChecker } from '../../core/db/index.js';
+import { FieldFactory, SectionFactory } from '../../core/factories/index.js';
+import { SelectField } from '../../core/fields/index.js';
 import { resolveLocale } from '../../core/localization/index.js';
-import { getPluginRoutes } from '../../plugins/loader.js';
-import through2 from 'through2';
+import { db } from '../../db/client.js';
+import { AdminPrivilegesTable, AdminsTable, EditorPhotosTable } from '../../db/schema.js';
 import { recordLog } from '../../logging/index.js';
+import { getPluginRoutes } from '../../plugins/loader.js';
 import getString from '../../translations/index.js';
-import { resolveMultilingualString } from '../../translations/language-utils.js';
-import { resolveLanguage } from '../../translations/language-utils.js';
+import { resolveLanguage, resolveMultilingualString } from '../../translations/language-utils.js';
+import { sanitizeFileName, sanitizeFolderOrFileName } from '../../utils/index.js';
 export const isAccessAllowed = async ({ sectionName, role, userId, }) => {
     /**
      * Check admin privileges
@@ -39,6 +38,35 @@ export const isAccessAllowed = async ({ sectionName, role, userId, }) => {
     }
     return true;
 };
+async function deleteGalleryFiles({ uploadsFolder, sectionName, photos, }) {
+    for (const photo of photos) {
+        try {
+            await fs.promises.unlink(path.join(uploadsFolder, '.photos', sectionName, photo));
+            await fs.promises.unlink(path.join(uploadsFolder, '.thumbs', sectionName, photo));
+        }
+        catch (error) {
+            console.error('Error deleting gallery photo', error);
+        }
+    }
+}
+async function deleteLocalizedGalleryRows({ section, gallery, sectionItemId, locale, uploadsFolder, }) {
+    if (!gallery.localized)
+        return;
+    const { tableName, referenceIdentifierField, photoNameField } = gallery.db;
+    const columns = await MysqlTableChecker.getColumns(tableName);
+    if (!columns.includes(referenceIdentifierField) ||
+        !columns.includes(photoNameField) ||
+        !columns.includes('locale')) {
+        return;
+    }
+    const [rows] = await db.execute(sql `SELECT \`${sql.raw(photoNameField)}\` AS photo FROM \`${sql.raw(tableName)}\` WHERE \`${sql.raw(referenceIdentifierField)}\` = ${sectionItemId} AND \`locale\` = ${locale}`);
+    const photos = (rows ?? []).map((row) => row.photo).filter(Boolean);
+    await deleteGalleryFiles({ uploadsFolder, sectionName: section.name, photos });
+    await db.execute(sql `DELETE FROM \`${sql.raw(tableName)}\` WHERE \`${sql.raw(referenceIdentifierField)}\` = ${sectionItemId} AND \`locale\` = ${locale}`);
+}
+function sectionHasLocalizedContent(section) {
+    return section.hasLocalizedContent ?? section.hasLocalizedFields ?? false;
+}
 export const getDocument = async (session, input) => {
     const { name, sectionName, fieldName } = input;
     // Sanitize the inputs
@@ -273,11 +301,11 @@ export const getAllPrivileges = async (session) => {
     // Now, let's add the rest of the privileges to the list
     sections.forEach((section, index) => {
         let title;
-        if (typeof section.title === 'string') {
-            title = resolveMultilingualString(section.title, language, cmsConfig.i18n.fallbackLanguage);
+        if (section.type === 'has_items' || section.type === 'category') {
+            title = resolveMultilingualString(section.title.section, language, cmsConfig.i18n.fallbackLanguage);
         }
         else {
-            title = resolveMultilingualString(section.title.section, language, cmsConfig.i18n.fallbackLanguage);
+            title = resolveMultilingualString(section.title, language, cmsConfig.i18n.fallbackLanguage);
         }
         privilegesList.push({
             title,
@@ -380,7 +408,8 @@ export const createSimpleSectionPage = async (session, sectionName, locale) => {
         let localizationData = null;
         if (localeResult.localizationEnabled) {
             let existingTranslations = [];
-            if (sectionInfo.hasLocalizedFields) {
+            const hasLocalizedContent = sectionHasLocalizedContent(sectionInfo);
+            if (hasLocalizedContent) {
                 const localesTableName = sectionInfo.localesTableName;
                 const localeColumns = await MysqlTableChecker.getColumns(localesTableName);
                 const localeTableExists = localeColumns.length > 0;
@@ -428,6 +457,9 @@ export const createSimpleSectionPage = async (session, sectionName, locale) => {
                                     : [];
                                 field.setValue(tags.join(','));
                             }
+                            else if (field.type === 'date_range' && typeof f.setRangeValues === 'function') {
+                                f.setRangeValues(localeRow ? (localeRow[f.startName] ?? null) : null, localeRow ? (localeRow[f.endName] ?? null) : null);
+                            }
                             else {
                                 // Simple field: override from locale row
                                 field.setValue(localeRow ? (localeRow[field.name] ?? null) : null);
@@ -436,11 +468,22 @@ export const createSimpleSectionPage = async (session, sectionName, locale) => {
                     }
                 }
             }
+            // Show the locale switcher when multiple locales are configured AND either:
+            //   - the section has localized fields (production case), or
+            //   - the app is in development mode (so devs can preview the switcher
+            //     while wiring up localization on a section).
+            // The developer note is rendered in dev-mode only, when the switcher is
+            // visible but the section itself has no localized content yet.
+            const localeSwitcherEnabled = localeResult.availableLocales.length > 1 &&
+                (hasLocalizedContent === true || process.env.NODE_ENV === 'development');
+            const developerNoteEnabled = localeSwitcherEnabled && hasLocalizedContent === false;
             localizationData = {
                 defaultLocale: localeResult.defaultLocale,
                 currentLocale: localeResult.resolvedLocale ?? localeResult.defaultLocale,
                 existingTranslations,
                 locales: localeResult.availableLocales,
+                localeSwitcherEnabled,
+                developerNoteEnabled,
             };
         }
         return {
@@ -520,7 +563,7 @@ export const deleteSectionItem = async (session, sectionName, sectionItemId, rec
          * Use deleteLocaleTranslation per locale to ensure localized files are cleaned up from disk.
          */
         const cmsConfig = await getCMSConfig();
-        if (cmsConfig.localization?.enabled && section.hasLocalizedFields) {
+        if (cmsConfig.localization?.enabled && sectionHasLocalizedContent(section)) {
             const localesTableName = section.localesTableName;
             const localeColumns = await MysqlTableChecker.getColumns(localesTableName);
             if (localeColumns.length > 0) {
@@ -723,7 +766,7 @@ export const deleteLocaleTranslation = async (session, sectionName, sectionItemI
             };
         }
         const cmsConfig = await getCMSConfig();
-        if (!cmsConfig.localization?.enabled || !section.hasLocalizedFields) {
+        if (!cmsConfig.localization?.enabled || !sectionHasLocalizedContent(section)) {
             return {
                 error: {
                     message: getString('localizationNotEnabledForSection', session.user.language),
@@ -794,11 +837,21 @@ export const deleteLocaleTranslation = async (session, sectionName, sectionItemI
                 }
             }
         }
-        // Delete locale-scoped editor photos for localized rich_text fields
-        const editorPhotos = await db
-            .select()
-            .from(EditorPhotosTable)
-            .where(and(eq(EditorPhotosTable.section, sectionName), eq(EditorPhotosTable.itemId, sectionItemId.toString()), eq(EditorPhotosTable.locale, locale)));
+        const gallery = await section.getGallery();
+        if (gallery?.localized) {
+            await deleteLocalizedGalleryRows({
+                section,
+                gallery,
+                sectionItemId,
+                locale,
+                uploadsFolder: cmsConfig.media.upload.path,
+            });
+        }
+        // Delete locale-scoped editor photos for localized rich_text fields.
+        // Uses raw SQL because the `locale` column only exists on the DB table when
+        // localization is enabled; the Drizzle schema no longer declares it.
+        const [editorPhotoRows] = await db.execute(sql `SELECT \`photo\` as \`name\` FROM \`editor_photos\` WHERE \`section\` = ${sectionName} AND \`item_id\` = ${sectionItemId.toString()} AND \`locale\` = ${locale}`);
+        const editorPhotos = editorPhotoRows ?? [];
         if (editorPhotos.length > 0) {
             const uploadsFolder = cmsConfig.media.upload.path;
             for (const photo of editorPhotos) {
@@ -809,9 +862,7 @@ export const deleteLocaleTranslation = async (session, sectionName, sectionItemI
                     console.error('Error deleting editor photo', error);
                 }
             }
-            await db
-                .delete(EditorPhotosTable)
-                .where(and(eq(EditorPhotosTable.section, sectionName), eq(EditorPhotosTable.itemId, sectionItemId.toString()), eq(EditorPhotosTable.locale, locale)));
+            await db.execute(sql `DELETE FROM \`editor_photos\` WHERE \`section\` = ${sectionName} AND \`item_id\` = ${sectionItemId.toString()} AND \`locale\` = ${locale}`);
         }
         // Delete locale-scoped junction table rows for localized select/tags fields
         const localizedJunctionFields = section.fieldConfigs.filter((f) => f.localized === true &&
@@ -942,13 +993,19 @@ export const createEditPage = async (session, sectionName, sectionItemId, locale
             if (columns.includes(photoNameField) &&
                 columns.includes(referenceIdentifierField) &&
                 columns.includes(metaField)) {
-                const [items, fields] = await db.execute(sql `select * from \`${sql.raw(tableName)}\` where \`${sql.raw(referenceIdentifierField)}\` = ${sectionItemId}`);
+                const galleryIsLocalized = gallery.localized === true && localeResult.localizationEnabled;
+                const currentLocale = localeResult.resolvedLocale?.code;
+                const localeFilter = galleryIsLocalized && currentLocale && columns.includes('locale')
+                    ? sql ` AND \`locale\` = ${currentLocale}`
+                    : sql ``;
+                const [items] = await db.execute(sql `select * from \`${sql.raw(tableName)}\` where \`${sql.raw(referenceIdentifierField)}\` = ${sectionItemId}${localeFilter}`);
                 const galleryPhotos = items;
                 galleryPhotos?.map((item) => {
                     galleryItems.push({
                         referenceId: item[referenceIdentifierField],
                         photo: item[photoNameField],
                         meta: item[metaField],
+                        locale: item.locale,
                     });
                 });
             }
@@ -967,7 +1024,8 @@ export const createEditPage = async (session, sectionName, sectionItemId, locale
         let localizationData = null;
         if (localeResult.localizationEnabled) {
             let existingTranslations = [];
-            if (sectionInfo.hasLocalizedFields) {
+            const hasLocalizedContent = sectionHasLocalizedContent(sectionInfo);
+            if (hasLocalizedContent) {
                 const localesTableName = sectionInfo.localesTableName;
                 const localeColumns = await MysqlTableChecker.getColumns(localesTableName);
                 const localeTableExists = localeColumns.length > 0;
@@ -1013,6 +1071,9 @@ export const createEditPage = async (session, sectionName, sectionItemId, locale
                                     : [];
                                 field.setValue(tags.join(','));
                             }
+                            else if (field.type === 'date_range' && typeof f.setRangeValues === 'function') {
+                                f.setRangeValues(localeRow ? (localeRow[f.startName] ?? null) : null, localeRow ? (localeRow[f.endName] ?? null) : null);
+                            }
                             else {
                                 // Simple field: override from locale row
                                 field.setValue(localeRow ? (localeRow[field.name] ?? null) : null);
@@ -1021,11 +1082,22 @@ export const createEditPage = async (session, sectionName, sectionItemId, locale
                     }
                 }
             }
+            // Show the locale switcher when multiple locales are configured AND either:
+            //   - the section has localized fields (production case), or
+            //   - the app is in development mode (so devs can preview the switcher
+            //     while wiring up localization on a section).
+            // The developer note is rendered in dev-mode only, when the switcher is
+            // visible but the section itself has no localized content yet.
+            const localeSwitcherEnabled = localeResult.availableLocales.length > 1 &&
+                (hasLocalizedContent === true || process.env.NODE_ENV === 'development');
+            const developerNoteEnabled = localeSwitcherEnabled && hasLocalizedContent === false;
             localizationData = {
                 defaultLocale: localeResult.defaultLocale,
                 currentLocale: localeResult.resolvedLocale ?? localeResult.defaultLocale,
                 existingTranslations,
                 locales: localeResult.availableLocales,
+                localeSwitcherEnabled,
+                developerNoteEnabled,
             };
         }
         return {