astro-tractstack 2.0.29 → 2.0.31

package/templates/src/utils/auth.ts

@@ -78,7 +78,8 @@ export function getUserRole(astro: any): 'admin' | 'editor' | null {
  */
 export function requireAdmin(astro: any): Response | undefined {
   if (!isAdmin(astro)) {
-    return astro.redirect('/storykeep/login');
+    const target = encodeURIComponent(astro.url.pathname + astro.url.search);
+    return astro.redirect(`/storykeep/login?redirect=${target}`);
   }
 }
 
@@ -88,7 +89,8 @@ export function requireAdmin(astro: any): Response | undefined {
  */
 export function requireEditor(astro: any): Response | undefined {
   if (!isEditor(astro)) {
-    return astro.redirect('/storykeep/login');
+    const target = encodeURIComponent(astro.url.pathname + astro.url.search);
+    return astro.redirect(`/storykeep/login?redirect=${target}`);
   }
 }
 
@@ -98,7 +100,8 @@ export function requireEditor(astro: any): Response | undefined {
  */
 export function requireAdminOrEditor(astro: any): Response | undefined {
   if (!isAuthenticated(astro)) {
-    return astro.redirect('/storykeep/login');
+    const target = encodeURIComponent(astro.url.pathname + astro.url.search);
+    return astro.redirect(`/storykeep/login?redirect=${target}`);
   }
 }
 

package/templates/src/utils/compositor/designLibraryHelper.ts

@@ -62,7 +62,7 @@ function convertLiveNodeToStorageNode(
     fileId: copyMode === 'retain' ? node.fileId : undefined,
     buttonPayload: copyMode === 'retain' ? node.buttonPayload : undefined,
     codeHookParams: copyMode === 'retain' ? node.codeHookParams : undefined,
-    elementCss: copyMode === 'retain' ? node.elementCss : undefined,
+    copy: copyMode === 'retain' ? node.copy : undefined,
   };
 
   const childIds = ctx.getChildNodeIDs(node.id);
@@ -500,7 +500,8 @@ function convertLivePaneToStoragePane(
           : [],
     };
   } else if (gridLayoutNode) {
-    const { id, parentId, isChanged, ...restOfGrid } = gridLayoutNode;
+    const { id, parentId, isChanged, parentCss, gridCss, ...restOfGrid } =
+      gridLayoutNode;
     storageGridLayout = {
       ...restOfGrid,
       nodes: ctx
@@ -517,6 +518,7 @@ function convertLivePaneToStoragePane(
             isChanged,
             markdownId,
             parentCss,
+            gridCss,
             ...restOfColumn
           } = columnNode;
 
@@ -584,10 +586,11 @@ export async function savePaneToLibrary(
     title: string;
     category: string;
     copyMode: CopyMode;
+    locked?: boolean;
   }
 ): Promise<BrandConfigState | null> {
   const ctx = getCtx();
-  const { title, category, copyMode } = formData;
+  const { title, category, copyMode, locked } = formData;
 
   const newStoragePane = convertLivePaneToStoragePane(paneId, ctx, {
     title,
@@ -613,6 +616,8 @@ export async function savePaneToLibrary(
     title: title,
     markdownCount: actualMarkdownCount,
     template: newStoragePane,
+    retain: copyMode === 'retain',
+    locked: !!locked,
   };
 
   const currentState: BrandConfigState = convertToLocalState(config);

package/templates/src/utils/compositor/typeGuards.ts

@@ -93,24 +93,6 @@ export const isMarkdownPaneFragmentNode = (
   );
 };
 
-interface WidgetNode extends FlatNode {
-  tagName: 'code';
-  codeHookParams: (string | string[])[];
-  copy: string;
-}
-
-export const isWidgetNode = (
-  node: BaseNode | FlatNode | null
-): node is WidgetNode => {
-  return (
-    node !== null &&
-    'tagName' in node &&
-    node.tagName === 'code' &&
-    'codeHookParams' in node &&
-    Array.isArray(node.codeHookParams)
-  );
-};
-
 export function hasTagName(
   node: BaseNode | null | undefined
 ): node is FlatNode {