@portaki/module-sections 1.2.6 → 1.3.0

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@portaki/module-sections",
-  "version": "1.2.6",
+  "version": "1.3.0",
   "description": "Portaki module — editorial sections (TipTap)",
   "license": "AGPL-3.0",
   "type": "module",
   "main": "./src/index.tsx",
   "dependencies": {
-    "@portaki/sdk": "^2.0.6",
+    "@portaki/sdk": "^3.0.0",
     "@tiptap/core": "^3.0.0",
     "@tiptap/html": "^3.0.0",
     "@tiptap/starter-kit": "^3.0.0",
@@ -14,8 +14,8 @@
     "react-dom": "^19.1.0"
   },
   "devDependencies": {
-    "@portaki/cli": "^0.1.5",
-    "@portaki/sdk-test-support": "^2.0.7",
+    "@portaki/cli": "^1.0.0",
+    "@portaki/sdk-test-support": "^3.0.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@types/react": "^19",

package/portaki.catalog.json

@@ -9,7 +9,7 @@
     "fr": "Blocs de contenu riches (TipTap) pour le carnet d’accueil invité.",
     "en": "Rich content blocks (TipTap) for the guest welcome book."
   },
-  "version": "1.2.6",
+  "version": "1.3.0",
   "releaseNotesUrl": "https://github.com/PortakiApp/portaki-modules/releases",
   "changelog": [
     {
@@ -42,7 +42,7 @@
     "sections"
   ],
   "portakiVersionMin": "1.0.0",
-  "requiresHostSdk": "2.0.6",
+  "requiresHostSdk": "3.0.0",
   "database": {
     "schemaVersion": "1.0.1"
   },
@@ -122,6 +122,6 @@
   },
   "artifacts": {
     "wasmUrl": "oci://ghcr.io/portakiapp/portaki-module-sections",
-    "guestEsmUrl": "https://esm.sh/@portaki/module-sections@1.2.6"
+    "guestEsmUrl": "https://esm.sh/@portaki/module-sections@1.3.0"
   }
 }

package/portaki.module.json

@@ -9,7 +9,7 @@
     "fr": "Blocs de contenu riches (TipTap) pour le carnet d’accueil invité.",
     "en": "Rich content blocks (TipTap) for the guest welcome book."
   },
-  "version": "1.2.6",
+  "version": "1.3.0",
   "releaseNotesUrl": "https://github.com/PortakiApp/portaki-modules/releases",
   "changelog": [
     {
@@ -42,9 +42,9 @@
     "sections"
   ],
   "portakiVersionMin": "1.0.0",
-  "requiresHostSdk": "2.0.6",
+  "requiresHostSdk": "3.0.0",
   "database": {
-    "schemaVersion": "1.0.1"
+    "schemaVersion": "1.0.2"
   },
   "license": "AGPL-3.0",
   "repository": "https://github.com/PortakiApp/portaki-modules",
@@ -122,6 +122,6 @@
   },
   "artifacts": {
     "wasmUrl": "oci://ghcr.io/portakiapp/portaki-module-sections",
-    "guestEsmUrl": "https://esm.sh/@portaki/module-sections@1.2.6"
+    "guestEsmUrl": "https://esm.sh/@portaki/module-sections@1.3.0"
   }
 }

package/src/components/SectionsGuestView.tsx

@@ -16,10 +16,6 @@ type SectionRow = {
   contentEn: unknown
 }
 
-type ListResponse = {
-  sections: SectionRow[]
-}
-
 const htmlExtensions = [StarterKit]
 
 function contentToHtml(raw: unknown): string {
@@ -33,7 +29,7 @@ function contentToHtml(raw: unknown): string {
 }
 
 export function SectionsGuestView({ lang }: { lang: LangCode }) {
-  const { data, loading, error } = usePortakiQuery<ListResponse>('sections.list', {})
+  const { data, loading, error } = usePortakiQuery<SectionRow[]>('sections.list', {})
 
   if (loading) {
     return (
@@ -43,13 +39,13 @@ export function SectionsGuestView({ lang }: { lang: LangCode }) {
     )
   }
 
-  if (error != null || !data?.sections?.length) {
+  if (error != null || !data?.length) {
     return null
   }
 
   return (
     <div className="space-y-10">
-      {data.sections.map((section) => {
+      {data.map((section) => {
         const title = lang === 'en' ? section.titleEn || section.titleFr : section.titleFr
         const html = contentToHtml(lang === 'en' ? section.contentEn : section.contentFr)
         return (

package/src/sections-module-definition.ts

@@ -1,12 +1,11 @@
 import {
   defineModule,
-  index,
   int,
   jsonb,
   moduleSchema,
   table,
-  tenantId,
-  tenantPropertyIndex,
+  workspaceId,
+  workspacePropertyIndex,
   text,
   timestamptz,
   uuid,
@@ -21,19 +20,30 @@ const sectionsSchema = moduleSchema([
     columns: [
       uuidPrimaryKey(),
       uuid('propertyId'),
-      tenantId(),
+      workspaceId(),
       int('sortOrder', { defaultSql: '0' }),
-      text('titleFr', { defaultSql: "''" }),
-      text('titleEn', { defaultSql: "''" }),
-      jsonb('contentFr', { nullable: true }),
-      jsonb('contentEn', { nullable: true }),
       timestamptz('createdAt', { nullable: false, defaultSql: 'now()' }),
       timestamptz('updatedAt', { nullable: false, defaultSql: 'now()' }),
     ],
-    indexes: [tenantPropertyIndex()],
+    indexes: [workspacePropertyIndex()],
+  }),
+  table('itemLocales', 't_e_module_sections_item_locale', {
+    columns: [
+      uuid('sectionId', { primaryKey: true }),
+      text('lang', { primaryKey: true }),
+      workspaceId(),
+      uuid('propertyId'),
+      text('title', { defaultSql: "''" }),
+      jsonb('content', { nullable: true }),
+    ],
+    indexes: [workspacePropertyIndex()],
   }),
 ])
 
+const SECTION_LANGS = ['fr', 'en'] as const
+
+type SectionLang = (typeof SECTION_LANGS)[number]
+
 function stringParam(params: Record<string, unknown>, key: string): string | null {
   const value = params[key]
   if (value == null) {
@@ -53,6 +63,75 @@ function intParam(params: Record<string, unknown>, key: string, defaultValue: nu
   return Number.parseInt(String(value), 10)
 }
 
+function localeTitleForLang(
+  lang: SectionLang,
+  titleFr: string,
+  titleEn: string,
+): string {
+  if (lang === 'fr') {
+    return titleFr
+  }
+  return titleEn.trim() === '' ? titleFr : titleEn
+}
+
+function localeContentForLang(
+  lang: SectionLang,
+  contentFr: unknown,
+  contentEn: unknown,
+): unknown {
+  if (lang === 'fr') {
+    return contentFr ?? null
+  }
+  return contentEn ?? null
+}
+
+async function upsertSectionLocale(
+  ctx: ModuleContext,
+  filters: { workspaceId: string; propertyId: string },
+  sectionId: string,
+  lang: SectionLang,
+  title: string,
+  content: unknown,
+): Promise<void> {
+  const where = { ...filters, sectionId, lang }
+  const existing = await ctx.db.from('itemLocales').where(where).one()
+  const payload = { title, content }
+  if (existing != null) {
+    await ctx.db.from('itemLocales').where(where).update(payload)
+    return
+  }
+  await ctx.db.from('itemLocales').insert({
+    ...where,
+    ...payload,
+  })
+}
+
+function sectionDtoFromLocales(
+  item: Record<string, unknown>,
+  locales: Record<string, unknown>[],
+): Record<string, unknown> {
+  const byLang = new Map<string, Record<string, unknown>>()
+  for (const row of locales) {
+    byLang.set(String(row.lang), row)
+  }
+  const fr = byLang.get('fr')
+  const en = byLang.get('en')
+  const titleFr = String(fr?.title ?? '')
+  const titleEnRaw = String(en?.title ?? '')
+  const section: Record<string, unknown> = {
+    id: item.id,
+    sortOrder: item.sortOrder,
+    titleFr,
+    titleEn: titleEnRaw.trim() === '' ? titleFr : titleEnRaw,
+    contentFr: fr?.content ?? null,
+    contentEn: en?.content ?? null,
+  }
+  if (item.updatedAt != null) {
+    section.updatedAt = item.updatedAt
+  }
+  return section
+}
+
 export function defineSectionsModule(render: (ctx: ModuleContext) => ReactNode): PortakiFullModule {
   return defineModule({
     id: 'sections',
@@ -62,8 +141,8 @@ export function defineSectionsModule(render: (ctx: ModuleContext) => ReactNode):
       en: 'Welcome book editorial content.',
     },
     icon: 'file-text',
-    version: '1.2.4',
-    schemaVersion: '1.0.1',
+    version: '1.2.7',
+    schemaVersion: '1.0.2',
     schema: sectionsSchema,
     navSlot: 'section',
 
@@ -75,10 +154,16 @@ export function defineSectionsModule(render: (ctx: ModuleContext) => ReactNode):
           en: 'Property editorial sections.',
         },
         async handler(ctx) {
-          const rows = await ctx.db
-            .from('items')
-            .where({ tenantId: ctx.tenantId, propertyId: ctx.propertyId })
-            .many()
+          const filters = { workspaceId: ctx.workspaceId, propertyId: ctx.propertyId }
+          const rows = await ctx.db.from('items').where(filters).many()
+          const locales = await ctx.db.from('itemLocales').where(filters).many()
+          const localesBySection = new Map<string, Record<string, unknown>[]>()
+          for (const locale of locales) {
+            const sectionId = String(locale.sectionId)
+            const bucket = localesBySection.get(sectionId) ?? []
+            bucket.push(locale)
+            localesBySection.set(sectionId, bucket)
+          }
           rows.sort((a, b) => {
             const orderA = Number(a.sortOrder ?? 0)
             const orderB = Number(b.sortOrder ?? 0)
@@ -89,21 +174,9 @@ export function defineSectionsModule(render: (ctx: ModuleContext) => ReactNode):
             const createdB = String(b.createdAt ?? '')
             return createdA.localeCompare(createdB)
           })
-          const sections = rows.map((row) => {
-            const section: Record<string, unknown> = {
-              id: row.id,
-              sortOrder: row.sortOrder,
-              titleFr: row.titleFr,
-              titleEn: row.titleEn,
-              contentFr: row.contentFr ?? null,
-              contentEn: row.contentEn ?? null,
-            }
-            if (row.updatedAt != null) {
-              section.updatedAt = row.updatedAt
-            }
-            return section
-          })
-          return { sections }
+          return rows.map((row) =>
+            sectionDtoFromLocales(row, localesBySection.get(String(row.id)) ?? []),
+          )
         },
       },
     },
@@ -116,7 +189,7 @@ export function defineSectionsModule(render: (ctx: ModuleContext) => ReactNode):
           en: 'Create or update a section.',
         },
         async handler(ctx, params) {
-          const filters = { tenantId: ctx.tenantId, propertyId: ctx.propertyId }
+          const filters = { workspaceId: ctx.workspaceId, propertyId: ctx.propertyId }
           const idRaw = stringParam(params, 'id')
           const id =
             idRaw == null || idRaw.trim() === '' ? crypto.randomUUID() : idRaw.trim()
@@ -146,24 +219,30 @@ export function defineSectionsModule(render: (ctx: ModuleContext) => ReactNode):
             sortOrder = max + 1
           }
           const now = new Date().toISOString()
-          const payload = {
-            titleFr,
-            titleEn,
-            contentFr,
-            contentEn,
+          const itemPayload = {
             sortOrder,
             updatedAt: now,
           }
           if (existing != null) {
-            await ctx.db.from('items').where({ ...filters, id }).update(payload)
-            return
+            await ctx.db.from('items').where({ ...filters, id }).update(itemPayload)
+          } else {
+            await ctx.db.from('items').insert({
+              id,
+              ...filters,
+              ...itemPayload,
+              createdAt: now,
+            })
+          }
+          for (const lang of SECTION_LANGS) {
+            await upsertSectionLocale(
+              ctx,
+              filters,
+              id,
+              lang,
+              localeTitleForLang(lang, titleFr, titleEn),
+              localeContentForLang(lang, contentFr, contentEn),
+            )
           }
-          await ctx.db.from('items').insert({
-            id,
-            ...filters,
-            ...payload,
-            createdAt: now,
-          })
         },
       },
       'sections.section.delete': {
@@ -177,14 +256,13 @@ export function defineSectionsModule(render: (ctx: ModuleContext) => ReactNode):
           if (idRaw == null || idRaw.trim() === '') {
             throw new Error('id_required')
           }
-          const deleted = await ctx.db
-            .from('items')
-            .where({
-              id: idRaw.trim(),
-              tenantId: ctx.tenantId,
-              propertyId: ctx.propertyId,
-            })
-            .delete()
+          const id = idRaw.trim()
+          const filters = {
+            id,
+            workspaceId: ctx.workspaceId,
+            propertyId: ctx.propertyId,
+          }
+          const deleted = await ctx.db.from('items').where(filters).delete()
           if (deleted === 0) {
             throw new Error('section_not_found')
           }
@@ -201,17 +279,17 @@ export function defineSectionsModule(render: (ctx: ModuleContext) => ReactNode):
           if (!Array.isArray(raw) || raw.length === 0) {
             throw new Error('ordered_ids_required')
           }
-          const filters = { tenantId: ctx.tenantId, propertyId: ctx.propertyId }
+          const filters = { workspaceId: ctx.workspaceId, propertyId: ctx.propertyId }
           const now = new Date().toISOString()
           let order = 0
           for (const item of raw) {
             if (item == null) {
               continue
             }
-            const id = String(item)
+            const sectionId = String(item)
             await ctx.db
               .from('items')
-              .where({ ...filters, id })
+              .where({ ...filters, id: sectionId })
               .update({ sortOrder: order++, updatedAt: now })
           }
         },