feat(dashboard): restore email editor 'for' block #7483
+309
−188
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
✅ Deploy Preview for dev-web-novu ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
✅ Deploy Preview for dashboard-v2-novu-staging ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
ChmaraX
commented
Jan 10, 2025
Comment on lines
+43
to
+60
| private async traverseAndProcessNodes( | ||
| node: TipTapNode, | ||
| parentNode?: TipTapNode | ||
| ): Promise<TipTapNode> { | ||
| if (node.content) { | ||
| const processedContent: TipTapNode[] = []; | ||
| for (const innerNode of node.content) { | ||
| const processed = await this.processShowAndForControls(variables, innerNode, parentNode); | ||
| if (processed) { | ||
| processedContent.push(processed); | ||
| variables: Record<string, unknown>, | ||
| parent?: TipTapNode | ||
| ): Promise<void> { | ||
| const queue: Array<{ node: TipTapNode; parent?: TipTapNode }> = [{ node, parent }]; | ||
|
|
||
| while (queue.length > 0) { | ||
| const current = queue.shift()!; | ||
| await this.processNode(current.node, variables, current.parent); | ||
|
|
||
| if (current.node.content) { | ||
| for (const childNode of current.node.content) { | ||
| queue.push({ node: childNode, parent: current.node }); | ||
| } | ||
| } | ||
| node.content = processedContent; | ||
| } | ||
| } |
There was a problem hiding this comment.
Reworked the previously recursive function to something easier to read using queue.
ChmaraX
commented
Jan 10, 2025
Comment on lines
+185
to
+205
| private addIndexesToPlaceholders(nodes: TipTapNode[], iterablePath: string, index: number): TipTapNode[] { | ||
| return nodes.map((node) => { | ||
| const newNode: TipTapNode = { ...node }; | ||
|
|
||
| const parsedShowIfValue = await parseLiquid(showIfKey as string, variables); | ||
| const showIfValueBoolean = | ||
| typeof parsedShowIfValue === 'boolean' ? parsedShowIfValue : this.stringToBoolean(parsedShowIfValue); | ||
| if (this.isAVariableNode(newNode)) { | ||
| const nodePlaceholder = newNode.text as string; | ||
|
|
||
| /** | ||
| * example: | ||
| * iterablePath = payload.comments | ||
| * nodePlaceholder = {{ payload.comments.author }} | ||
| * text = {{ payload.comments[0].author }} | ||
| */ | ||
| newNode.text = nodePlaceholder.replace(iterablePath, `${iterablePath}[${index}]`); | ||
| newNode.type = 'text'; // set 'variable' to 'text' to for Liquid to recognize it | ||
| } else if (newNode.content) { | ||
| newNode.content = this.addIndexesToPlaceholders(newNode.content, iterablePath, index); | ||
| } | ||
|
|
||
| if (!showIfValueBoolean) { | ||
| this.removeNodeFromParent(node, parentNode); | ||
| } else { | ||
| delete node.attrs[MailyAttrsEnum.SHOW_IF_KEY]; | ||
| } | ||
| return newNode; | ||
| }); |
There was a problem hiding this comment.
Instead of replacing for loop values directly in this usecase as it was before, we create just placeholders {{ payload.comments[0].author }} and leave the actual value substitution for Liquid parser down the line
ChmaraX
commented
Jan 10, 2025
| @@ -157,27 +214,7 @@ export class ExpandEmailEditorSchemaUsecase { | |||
| } | |||
|
|
|||
| private isAVariableNode(newNode: TipTapNode): newNode is TipTapNode & { attrs: { id: string } } { | |||
| return newNode.type === 'payloadValue' && newNode.attrs?.id !== undefined; | |||
There was a problem hiding this comment.
No idea what is payloadValue but I was not able to find it anywhere in the TipTapNode
ChmaraX
commented
Jan 10, 2025
| @@ -132,10 +132,13 @@ export const Maily = (props: MailyProps) => { | |||
| return dedupAndSortVariables(filteredVariables, queryWithoutSuffix); | |||
| } | |||
|
|
|||
| const iterableName = editor?.getAttributes('for')?.each; | |||
There was a problem hiding this comment.
for now the iterable name is the full path, e.g. - we can polish this in separate PR, it was too difficult for me to change all that at once
for each "payload.comments"
{{payload.comments.id}}
ChmaraX
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changed? Why was the change needed?
{{payload.comments}}, item is{{payload.comments.id}}High-level overview of how the parsing flow goes so we can reference it later when refactoring:
for-loop.mov