rimelight-components 2.2.6 → 2.2.8

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "rimelight-components",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "docs": "https://rimelight.com/tools/rimelight-components",
   "configKey": "rimelightComponents",
   "compatibility": {

package/dist/module.mjs

@@ -4,7 +4,7 @@ import { readdirSync } from 'node:fs';
 import { basename } from 'node:path';
 
 const name = "rimelight-components";
-const version = "2.2.6";
+const version = "2.2.8";
 const homepage = "https://rimelight.com/tools/rimelight-components";
 
 const defaultOptions = {

package/dist/runtime/components/content/Callout.vue

@@ -35,7 +35,7 @@ const tooltip = computed(() => config.value.tooltip);
 </script>
 
 <template>
-  <component :is="to ? 'NuxtLink' : 'div'" :to="to" :target="target">
+  <NuxtLink :to="to" :target="target">
     <UAlert
       :title="t(title)"
       :color="variant"
@@ -61,5 +61,5 @@ const tooltip = computed(() => config.value.tooltip);
         </UTooltip>
       </template>
     </UAlert>
-  </component>
+  </NuxtLink>
 </template>

package/dist/runtime/components/modals/ConfirmModal.vue

@@ -15,6 +15,7 @@ const isOpen = computed({
     v-model:open="isOpen"
     :title="state.options.title"
     :description="state.options.description"
+    class="z-9999"
   >
     <template #body>
       <div class="flex flex-row justify-between gap-sm">

package/dist/runtime/components/page/PageEditor.vue

@@ -3,7 +3,7 @@ import { ref, computed, useTemplateRef, provide } from "vue";
 import { navigateTo } from "#imports";
 import {} from "../../types";
 import { usePageEditor, usePageRegistry, useRC, useHeaderStack, useConfirm } from "../../composables";
-import { getLocalizedContent } from "../../utils";
+import { getLocalizedContent, syncPageWithDefinition } from "../../utils";
 import { useI18n } from "vue-i18n";
 import { tv } from "../../internal/tv";
 const {
@@ -85,6 +85,13 @@ const { getTypeLabelKey } = usePageRegistry();
 const { t, locale } = useI18n();
 const { undo, redo, canUndo, canRedo, captureSnapshot, resetHistory, pauseHistory, resumeHistory } = usePageEditor(page);
 const { confirm } = useConfirm();
+const currentDefinition = computed(() => pageDefinitions[page.value.type]);
+watch([() => page.value.id, () => versionId.value, () => page.value.type], () => {
+  if (page.value && currentDefinition.value) {
+    console.log("[PageEditor] Syncing page with definition", page.value.id, versionId.value);
+    syncPageWithDefinition(page.value, currentDefinition.value);
+  }
+}, { immediate: true });
 const handleViewPage = async () => {
   if (canUndo.value) {
     const confirmed = await confirm({
@@ -103,6 +110,9 @@ const handleViewPage = async () => {
   }
 };
 const handleSave = () => {
+  if (currentDefinition.value) {
+    syncPageWithDefinition(page.value, currentDefinition.value);
+  }
   const dataToPersist = JSON.parse(JSON.stringify(page.value));
   emit("save", dataToPersist);
 };
@@ -114,6 +124,9 @@ const handlePublish = async () => {
     cancelLabel: t("common.cancel", "Cancel")
   });
   if (confirmed) {
+    if (currentDefinition.value) {
+      syncPageWithDefinition(page.value, currentDefinition.value);
+    }
     const dataToPersist = JSON.parse(JSON.stringify(page.value));
     emit("publish", dataToPersist);
   }

package/dist/runtime/components/page/PagePropertiesEditor.vue

@@ -41,7 +41,7 @@ const {
   links
 } = pagePropertiesEditorStyles();
 const { getTypeLabelKey } = usePageRegistry();
-const { isFieldVisible, shouldRenderGroup, getSortedFields, getSortedGroups } = useInfobox(page.value.properties);
+const { isFieldVisible, shouldRenderGroup, getSortedFields, getSortedGroups } = useInfobox(() => page.value.properties);
 const { locale, t } = useI18n();
 const imageTabs = computed(() => {
   if (!page.value.images?.length) return [];

package/dist/runtime/components/page/PagePropertiesRenderer.vue

@@ -61,7 +61,7 @@ const {
   links
 } = pagePropertiesRendererStyles();
 const { getTypeLabelKey } = usePageRegistry();
-const { isFieldVisible, shouldRenderGroup, getSortedFields, getSortedGroups } = useInfobox(page.value.properties);
+const { isFieldVisible, shouldRenderGroup, getSortedFields, getSortedGroups } = useInfobox(() => page.value.properties);
 const { t, locale } = useI18n();
 const { share } = useShare();
 const { copy } = useClipboard();

package/dist/runtime/components/page/modals/CreatePageModal.vue

@@ -53,9 +53,12 @@ const handleConfirm = () => {
   }
   const properties = {};
   Object.entries(definition.properties).forEach(([groupKey, group]) => {
-    properties[groupKey] = {};
+    properties[groupKey] = {
+      ...group,
+      fields: {}
+    };
     Object.entries(group.fields).forEach(([fieldKey, field2]) => {
-      properties[groupKey][fieldKey] = field2.value;
+      properties[groupKey].fields[fieldKey] = { ...field2 };
     });
   });
   const newPage = {
@@ -63,7 +66,9 @@ const handleConfirm = () => {
     title: { en: title.value },
     slug: slug.value,
     properties,
-    blocks: definition.initialBlocks ? definition.initialBlocks() : []
+    blocks: definition.initialBlocks ? definition.initialBlocks() : [],
+    createdAt: /* @__PURE__ */ new Date(),
+    updatedAt: /* @__PURE__ */ new Date()
   };
   emit("confirm", newPage);
 };

package/dist/runtime/composables/pages/useInfobox.d.ts

@@ -1,8 +1,9 @@
+import { type MaybeRefOrGetter } from "vue";
 import type { Property, PropertyGroup, BasePageProperties } from "../../types/index.js";
-export declare const useInfobox: (properties: BasePageProperties) => {
+export declare const useInfobox: (propertiesRef: MaybeRefOrGetter<BasePageProperties>) => {
     isFieldVisible: (schema: Property, isReadOnly: boolean) => boolean;
     shouldRenderGroup: (group: PropertyGroup, isReadOnly: boolean) => boolean;
     getSortedFields: (fields: Record<string, Property>) => [string, Property<any>][];
-    getSortedGroups: (props: BasePageProperties) => [string, PropertyGroup][];
+    getSortedGroups: (props: MaybeRefOrGetter<BasePageProperties>) => [string, PropertyGroup][];
     locale: import("vue").WritableComputedRef<string, string>;
 };

package/dist/runtime/composables/pages/useInfobox.js

@@ -1,7 +1,9 @@
 import { useI18n } from "vue-i18n";
-export const useInfobox = (properties) => {
+import { toValue } from "vue";
+export const useInfobox = (propertiesRef) => {
   const { locale } = useI18n();
   const isFieldVisible = (schema, isReadOnly) => {
+    const properties = toValue(propertiesRef);
     const passesLogic = !schema.visibleIf || schema.visibleIf(properties);
     if (!passesLogic) return false;
     if (isReadOnly) {
@@ -19,7 +21,8 @@ export const useInfobox = (properties) => {
     return Object.entries(fields).sort(([, a], [, b]) => (a.order ?? 0) - (b.order ?? 0));
   };
   const getSortedGroups = (props) => {
-    return Object.entries(props).sort(
+    const p = toValue(props);
+    return Object.entries(p).sort(
       ([, a], [, b]) => (a.order ?? 0) - (b.order ?? 0)
     );
   };

package/dist/runtime/composables/pages/useInfobox.mjs

@@ -1,7 +1,9 @@
 import { useI18n } from "vue-i18n";
-export const useInfobox = (properties) => {
+import { toValue } from "vue";
+export const useInfobox = (propertiesRef) => {
   const { locale } = useI18n();
   const isFieldVisible = (schema, isReadOnly) => {
+    const properties = toValue(propertiesRef);
     const passesLogic = !schema.visibleIf || schema.visibleIf(properties);
     if (!passesLogic) return false;
     if (isReadOnly) {
@@ -19,7 +21,8 @@ export const useInfobox = (properties) => {
     return Object.entries(fields).sort(([, a], [, b]) => (a.order ?? 0) - (b.order ?? 0));
   };
   const getSortedGroups = (props) => {
-    return Object.entries(props).sort(
+    const p = toValue(props);
+    return Object.entries(p).sort(
       ([, a], [, b]) => (a.order ?? 0) - (b.order ?? 0)
     );
   };

package/dist/runtime/db/auth.d.ts

@@ -2215,6 +2215,7 @@ export declare const userRelations: import("drizzle-orm").Relations<"user", {
     notes: import("drizzle-orm").Many<"note">;
     noteLabels: import("drizzle-orm").Many<"noteLabel">;
     todos: import("drizzle-orm").Many<"todo">;
+    teamMembers: import("drizzle-orm").Many<"team_member">;
 }>;
 export declare const sessionRelations: import("drizzle-orm").Relations<"session", {
     user: import("drizzle-orm").One<"user", true>;

package/dist/runtime/db/auth.js

@@ -144,8 +144,8 @@ export const team = pgTable(
 );
 export const teamMember = pgTable("team_member", {
   id: id.primaryKey(),
-  teamId: uuid("team_id").notNull(),
-  userId: uuid("user_id").notNull(),
+  teamId: uuid("team_id").notNull().references(() => team.id, { onDelete: "cascade" }),
+  userId: uuid("user_id").notNull().references(() => user.id, { onDelete: "cascade" }),
   role: text("role").notNull(),
   ...timestamps
 });
@@ -191,7 +191,8 @@ export const userRelations = relations(user, ({ many }) => ({
   invitations: many(invitation),
   notes: many(note),
   noteLabels: many(noteLabel),
-  todos: many(todo)
+  todos: many(todo),
+  teamMembers: many(teamMember)
 }));
 export const sessionRelations = relations(session, ({ one }) => ({
   user: one(user, {

package/dist/runtime/db/auth.mjs

@@ -144,8 +144,8 @@ export const team = pgTable(
 );
 export const teamMember = pgTable("team_member", {
   id: id.primaryKey(),
-  teamId: uuid("team_id").notNull(),
-  userId: uuid("user_id").notNull(),
+  teamId: uuid("team_id").notNull().references(() => team.id, { onDelete: "cascade" }),
+  userId: uuid("user_id").notNull().references(() => user.id, { onDelete: "cascade" }),
   role: text("role").notNull(),
   ...timestamps
 });
@@ -191,7 +191,8 @@ export const userRelations = relations(user, ({ many }) => ({
   invitations: many(invitation),
   notes: many(note),
   noteLabels: many(noteLabel),
-  todos: many(todo)
+  todos: many(todo),
+  teamMembers: many(teamMember)
 }));
 export const sessionRelations = relations(session, ({ one }) => ({
   user: one(user, {

package/dist/runtime/utils/page.js

@@ -21,11 +21,11 @@ export function syncPageWithDefinition(page, definition) {
       const existingField = existingGroup?.fields ? existingGroup.fields[fieldId] : void 0;
       if (existingField !== void 0) {
         updatedGroupFields[fieldId] = {
-          ...definitionField,
+          ...JSON.parse(JSON.stringify(definitionField)),
           value: existingField.value
         };
       } else {
-        updatedGroupFields[fieldId] = { ...definitionField };
+        updatedGroupFields[fieldId] = JSON.parse(JSON.stringify(definitionField));
         hasChanged = true;
       }
     }
@@ -69,7 +69,7 @@ export function syncPageWithDefinition(page, definition) {
       if (existingIndex !== -1) {
         lastExistingIdealIndex = existingIndex;
       } else {
-        filteredCurrent.splice(lastExistingIdealIndex + 1, 0, { ...idealBlock });
+        filteredCurrent.splice(lastExistingIdealIndex + 1, 0, JSON.parse(JSON.stringify(idealBlock)));
         lastExistingIdealIndex++;
         hasChanged = true;
       }
@@ -94,6 +94,17 @@ export function convertVersionToPage(version) {
     blocks: JSON.parse(JSON.stringify(blocks)),
     // Deep copy to avoid reference issues
     properties: properties ? JSON.parse(JSON.stringify(properties)) : {},
-    authorsIds: version.authorsIds || []
+    authorsIds: version.authorsIds || [],
+    createdAt: version.createdAt ? new Date(version.createdAt) : /* @__PURE__ */ new Date(),
+    updatedAt: version.updatedAt ? new Date(version.updatedAt) : /* @__PURE__ */ new Date(),
+    postedAt: version.postedAt ? new Date(version.postedAt) : null,
+    banner: version.banner,
+    icon: version.icon,
+    images: version.images || [],
+    title: version.title || { en: "" },
+    slug: version.slug || "",
+    description: version.description || { en: "" },
+    tags: version.tags || [],
+    links: version.links || []
   };
 }

package/dist/runtime/utils/page.mjs

@@ -21,11 +21,11 @@ export function syncPageWithDefinition(page, definition) {
       const existingField = existingGroup?.fields ? existingGroup.fields[fieldId] : void 0;
       if (existingField !== void 0) {
         updatedGroupFields[fieldId] = {
-          ...definitionField,
+          ...JSON.parse(JSON.stringify(definitionField)),
           value: existingField.value
         };
       } else {
-        updatedGroupFields[fieldId] = { ...definitionField };
+        updatedGroupFields[fieldId] = JSON.parse(JSON.stringify(definitionField));
         hasChanged = true;
       }
     }
@@ -69,7 +69,7 @@ export function syncPageWithDefinition(page, definition) {
       if (existingIndex !== -1) {
         lastExistingIdealIndex = existingIndex;
       } else {
-        filteredCurrent.splice(lastExistingIdealIndex + 1, 0, { ...idealBlock });
+        filteredCurrent.splice(lastExistingIdealIndex + 1, 0, JSON.parse(JSON.stringify(idealBlock)));
         lastExistingIdealIndex++;
         hasChanged = true;
       }
@@ -94,6 +94,17 @@ export function convertVersionToPage(version) {
     blocks: JSON.parse(JSON.stringify(blocks)),
     // Deep copy to avoid reference issues
     properties: properties ? JSON.parse(JSON.stringify(properties)) : {},
-    authorsIds: version.authorsIds || []
+    authorsIds: version.authorsIds || [],
+    createdAt: version.createdAt ? new Date(version.createdAt) : /* @__PURE__ */ new Date(),
+    updatedAt: version.updatedAt ? new Date(version.updatedAt) : /* @__PURE__ */ new Date(),
+    postedAt: version.postedAt ? new Date(version.postedAt) : null,
+    banner: version.banner,
+    icon: version.icon,
+    images: version.images || [],
+    title: version.title || { en: "" },
+    slug: version.slug || "",
+    description: version.description || { en: "" },
+    tags: version.tags || [],
+    links: version.links || []
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rimelight-components",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "description": "A component library by Rimelight Entertainment.",
   "keywords": [
     "nuxt",