-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'next' into nv-4932-redo-the-select-state-for-step-in-th…
…e-canvas
- Loading branch information
Showing
19 changed files
with
872 additions
and
49 deletions.
There are no files selected for viewing
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
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
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
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
37 changes: 37 additions & 0 deletions
37
apps/dashboard/src/components/workflow-editor/steps/push/configure-push-step-preview.tsx
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import { usePreviewStep } from '@/hooks/use-preview-step'; | ||
| import { PushPreview } from './push-preview'; | ||
| import * as Sentry from '@sentry/react'; | ||
| import { useWorkflow } from '../../workflow-provider'; | ||
| import { useParams } from 'react-router-dom'; | ||
| import { useEffect } from 'react'; | ||
|
|
||
| export function ConfigurePushStepPreview() { | ||
| const { | ||
| previewStep, | ||
| data: previewData, | ||
| isPending: isPreviewPending, | ||
| } = usePreviewStep({ | ||
| onError: (error) => { | ||
| Sentry.captureException(error); | ||
| }, | ||
| }); | ||
|
|
||
| const { step, isPending } = useWorkflow(); | ||
|
|
||
| const { workflowSlug, stepSlug } = useParams<{ | ||
| workflowSlug: string; | ||
| stepSlug: string; | ||
| }>(); | ||
|
|
||
| useEffect(() => { | ||
| if (!workflowSlug || !stepSlug || !step || isPending) return; | ||
|
|
||
| previewStep({ | ||
| workflowSlug, | ||
| stepSlug, | ||
| previewData: { controlValues: step.controls.values, previewPayload: {} }, | ||
| }); | ||
| }, [workflowSlug, stepSlug, previewStep, step, isPending]); | ||
|
|
||
| return <PushPreview previewData={previewData} isPreviewPending={isPreviewPending} />; | ||
| } |
116 changes: 116 additions & 0 deletions
116
apps/dashboard/src/components/workflow-editor/steps/push/push-editor-preview.tsx
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| import { CSSProperties, useEffect, useRef, useState } from 'react'; | ||
| import { type StepDataDto, type WorkflowResponseDto } from '@novu/shared'; | ||
| import { Code2 } from '@/components/icons/code-2'; | ||
| import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@/components/primitives/accordion'; | ||
| import { Button } from '@/components/primitives/button'; | ||
| import { Editor } from '@/components/primitives/editor'; | ||
| import { loadLanguage } from '@uiw/codemirror-extensions-langs'; | ||
| import { useEditorPreview } from '../use-editor-preview'; | ||
| import { PushPreview } from './push-preview'; | ||
| import { RiCellphoneFill } from 'react-icons/ri'; | ||
| import { PushTabsSection } from './push-tabs-section'; | ||
|
|
||
| const getInitialAccordionValue = (value: string) => { | ||
| try { | ||
| return Object.keys(JSON.parse(value)).length > 0 ? 'payload' : undefined; | ||
| } catch (e) { | ||
| return undefined; | ||
| } | ||
| }; | ||
|
|
||
| type PushEditorPreviewProps = { | ||
| workflow: WorkflowResponseDto; | ||
| step: StepDataDto; | ||
| formValues: Record<string, unknown>; | ||
| }; | ||
|
|
||
| const extensions = [loadLanguage('json')?.extension ?? []]; | ||
|
|
||
| export const PushEditorPreview = ({ workflow, step, formValues }: PushEditorPreviewProps) => { | ||
| const workflowSlug = workflow.workflowId; | ||
| const stepSlug = step.stepId; | ||
| const { editorValue, setEditorValue, previewStep, previewData, isPreviewPending } = useEditorPreview({ | ||
| workflowSlug, | ||
| stepSlug, | ||
| controlValues: formValues, | ||
| }); | ||
| const [accordionValue, setAccordionValue] = useState<string | undefined>(getInitialAccordionValue(editorValue)); | ||
| const [payloadError, setPayloadError] = useState(''); | ||
| const [height, setHeight] = useState(0); | ||
| const contentRef = useRef<HTMLDivElement>(null); | ||
|
|
||
| useEffect(() => { | ||
| setAccordionValue(getInitialAccordionValue(editorValue)); | ||
| }, [editorValue]); | ||
|
|
||
| useEffect(() => { | ||
| const timeout = setTimeout(() => { | ||
| if (contentRef.current) { | ||
| const rect = contentRef.current.getBoundingClientRect(); | ||
| setHeight(rect.height); | ||
| } | ||
| }, 0); | ||
|
|
||
| return () => clearTimeout(timeout); | ||
| }, [editorValue]); | ||
|
|
||
| return ( | ||
| <PushTabsSection> | ||
| <div className="relative flex flex-col gap-3"> | ||
| <div className="flex items-center gap-2.5 pb-2 text-sm font-medium"> | ||
| <RiCellphoneFill className="size-3" /> | ||
| <span>Push template editor</span> | ||
| </div> | ||
| <div className="flex flex-col items-center justify-center gap-4"> | ||
| <PushPreview isPreviewPending={isPreviewPending} previewData={previewData} /> | ||
| <div className="flex w-full items-center gap-3 rounded-md border border-neutral-100 bg-neutral-50 px-3 py-2.5"> | ||
| <span className="w-1 self-stretch rounded-full bg-neutral-500" /> | ||
| <span className="flex-1 text-xs font-medium text-neutral-600"> | ||
| This preview shows how your message will appear on mobile. Actual rendering may vary by device. | ||
| </span> | ||
| </div> | ||
| </div> | ||
| <Accordion type="single" collapsible value={accordionValue} onValueChange={setAccordionValue}> | ||
| <AccordionItem value="payload"> | ||
| <AccordionTrigger> | ||
| <div className="flex items-center gap-1"> | ||
| <Code2 className="size-5" /> | ||
| Configure preview | ||
| </div> | ||
| </AccordionTrigger> | ||
| <AccordionContent | ||
| ref={contentRef} | ||
| className="flex flex-col gap-2" | ||
| style={{ '--radix-collapsible-content-height': `${height}px` } as CSSProperties} | ||
| > | ||
| <Editor | ||
| value={editorValue} | ||
| onChange={setEditorValue} | ||
| lang="json" | ||
| extensions={extensions} | ||
| className="border-neutral-alpha-200 bg-background text-foreground-600 mx-0 mt-0 rounded-lg border border-dashed p-3" | ||
| /> | ||
| {payloadError && <p className="text-destructive text-xs">{payloadError}</p>} | ||
| <Button | ||
| size="xs" | ||
| type="button" | ||
| variant="outline" | ||
| className="self-end" | ||
| onClick={() => { | ||
| try { | ||
| previewStep(); | ||
| setPayloadError(''); | ||
| } catch (e) { | ||
| setPayloadError(String(e)); | ||
| } | ||
| }} | ||
| > | ||
| Apply | ||
| </Button> | ||
| </AccordionContent> | ||
| </AccordionItem> | ||
| </Accordion> | ||
| </div> | ||
| </PushTabsSection> | ||
| ); | ||
| }; |
Oops, something went wrong.