[MRF-9] PLU-520: MRF context and refactor #1349
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -7,6 +7,7 @@ import EditorRightDrawer from '@/components/EditorRightDrawer' | |||||||
| import FlowStepGroup from '@/components/FlowStepGroup' | ||||||||
| import { SortableList } from '@/components/SortableList' | ||||||||
| import { EditorContext } from '@/contexts/Editor' | ||||||||
| import { MrfContextProvider } from '@/contexts/MrfContext' | ||||||||
| import { StepExecutionsToIncludeProvider } from '@/contexts/StepExecutionsToInclude' | ||||||||
| import { StepEnumType } from '@/graphql/__generated__/graphql' | ||||||||
| import { extractBranchesWithSteps, TOOLBOX_ACTIONS } from '@/helpers/toolbox' | ||||||||
|
|
@@ -25,7 +26,7 @@ type EditorProps = { | |||||||
| export default function Editor(props: EditorProps): React.ReactElement { | ||||||||
| const { isNested } = props | ||||||||
|
|
||||||||
| const { allApps, isDrawerOpen, isMobile, flow, readOnly, currentStepId } = | ||||||||
| useContext(EditorContext) | ||||||||
|
|
||||||||
| const { handleReorderUpdate } = useReorderSteps(flow.id) | ||||||||
|
|
@@ -43,6 +44,10 @@ export default function Editor(props: EditorProps): React.ReactElement { | |||||||
| [flow, rawSteps], | ||||||||
| ) | ||||||||
|
|
||||||||
| const currentStep = useMemo(() => { | ||||||||
| return steps.find((step) => step.id === currentStepId) | ||||||||
| }, [currentStepId, steps]) | ||||||||
|
|
||||||||
| const appsWithActions: IApp[] = allApps.filter( | ||||||||
| (app: IApp) => !!app.actions?.length, | ||||||||
| ) | ||||||||
|
|
@@ -61,7 +66,7 @@ export default function Editor(props: EditorProps): React.ReactElement { | |||||||
| ) | ||||||||
| }, [appsWithActions]) | ||||||||
|
|
||||||||
| const [triggerStep, actionStepsBeforeGroup, groupedSteps] = useMemo(() => { | ||||||||
| if (!groupingActions) { | ||||||||
| return [null, [], []] | ||||||||
| } | ||||||||
|
|
@@ -92,42 +97,6 @@ export default function Editor(props: EditorProps): React.ReactElement { | |||||||
| : [triggerStep, steps.slice(1, groupStepIdx), branchesWithSteps] | ||||||||
| }, [groupingActions, steps]) | ||||||||
|
|
||||||||
| const handleReorderSteps = async (reorderedSteps: IStep[]) => { | ||||||||
| const stepPositions = reorderedSteps.map((step, index) => ({ | ||||||||
| id: step.id, | ||||||||
|
|
@@ -146,6 +115,21 @@ export default function Editor(props: EditorProps): React.ReactElement { | |||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| const nonIfThenActionSteps = actionStepsBeforeGroup.filter( | ||||||||
| (step) => step.key !== TOOLBOX_ACTIONS.IfThen, | ||||||||
| ) | ||||||||
|
|
||||||||
| // Disables last add step and hide in-between add step buttons | ||||||||
| const hasExactlyOneEmptyActionStep = | ||||||||
| nonIfThenActionSteps.length === 1 && !nonIfThenActionSteps[0].appKey | ||||||||
|
|
||||||||
| // Disables last add step button but show empty action instead | ||||||||
| const hasNoActionSteps = nonIfThenActionSteps.length === 0 | ||||||||
| const shouldShowEmptyAction = hasNoActionSteps && !groupedSteps.length | ||||||||
| // for backwards compatibility where empty step is created | ||||||||
| const shouldDisableAddButton = | ||||||||
| (hasExactlyOneEmptyActionStep || hasNoActionSteps) && !groupedSteps.length | ||||||||
|
|
||||||||
| if (!appsWithActions || !groupingActions) { | ||||||||
| return ( | ||||||||
| <Center height="100vh" position="fixed" width="full" top={0} left={0}> | ||||||||
|
|
@@ -172,80 +156,92 @@ export default function Editor(props: EditorProps): React.ReactElement { | |||||||
| backgroundSize: '30px 30px', | ||||||||
| }} | ||||||||
| > | ||||||||
| <MrfContextProvider steps={steps}> | ||||||||
| <StepExecutionsToIncludeProvider | ||||||||
| groupedSteps={groupedSteps} | ||||||||
| triggerStep={triggerStep} | ||||||||
| actionStepsBeforeGroup={actionStepsBeforeGroup} | ||||||||
| > | ||||||||
| <Flex | ||||||||
| {...editorStyles.stepHeaderContainer} | ||||||||
| flex={isDrawerOpen ? (isMobile ? 0 : 1) : undefined} | ||||||||
| px={leftStepPadding} | ||||||||
| maxWidth={`calc(100% - ${ | ||||||||
| isDrawerOpen ? EDITOR_RIGHT_DRAWER_WIDTH : '0px' | ||||||||
| })`} | ||||||||
| > | ||||||||
| {triggerStep && ( | ||||||||
| <FlowStepWithAddButton | ||||||||
| step={triggerStep} | ||||||||
| isLastStep={ | ||||||||
| actionStepsBeforeGroup.length === 0 && | ||||||||
| groupedSteps.length === 0 | ||||||||
| } | ||||||||
| isNested={isNested} | ||||||||
| stepsBeforeGroup={[]} // no reason to pass in for this | ||||||||
| groupedSteps={groupedSteps} | ||||||||
| addButtonProps={{ | ||||||||
| isHidden: readOnly, | ||||||||
| isDisabled: shouldDisableAddButton, | ||||||||
| showEmptyAction: shouldShowEmptyAction, | ||||||||
| }} | ||||||||
| /> | ||||||||
| )} | ||||||||
|
|
||||||||
| <SortableList | ||||||||
| items={actionStepsBeforeGroup} | ||||||||
| onChange={handleReorderSteps} | ||||||||
| renderItem={(step, isOverlay) => { | ||||||||
| const { id, position } = step | ||||||||
| return ( | ||||||||
| <SortableList.Item id={id}> | ||||||||
| <Flex | ||||||||
| key={`${id}-${position}`} | ||||||||
| width={isDrawerOpen || isMobile ? '100%' : 'auto'} | ||||||||
| flexDir="column" | ||||||||
| position="relative" | ||||||||
| > | ||||||||
| <FlowStepWithAddButton | ||||||||
| step={step} | ||||||||
| isLastStep={position === steps.length} | ||||||||
| isNested={isNested} | ||||||||
| stepsBeforeGroup={actionStepsBeforeGroup} | ||||||||
| groupedSteps={groupedSteps} | ||||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||||
| addButtonProps={{ | ||||||||
| isHidden: readOnly || !!isOverlay, | ||||||||
| isDisabled: shouldDisableAddButton, | ||||||||
| showEmptyAction: shouldShowEmptyAction, | ||||||||
| }} | ||||||||
| /> | ||||||||
| </Flex> | ||||||||
| </SortableList.Item> | ||||||||
| ) | ||||||||
| }} | ||||||||
| /> | ||||||||
| {groupedSteps.length > 0 && ( | ||||||||
| <FlowStepGroup | ||||||||
| stepsBeforeGroup={actionStepsBeforeGroup} | ||||||||
| groupedSteps={groupedSteps} | ||||||||
| /> | ||||||||
| )} | ||||||||
| </Flex> | ||||||||
| {/** HACKFIX (kevinkim-ogp): to ensure that the transitions are smooth */} | ||||||||
| <Flex | ||||||||
| {...editorStyles.dummyRightContainer} | ||||||||
| w={rightDrawerWidth} | ||||||||
| transform={rightDrawerTransform} | ||||||||
| /> | ||||||||
| <Flex | ||||||||
| {...editorStyles.rightDrawerContainer} | ||||||||
| w={rightDrawerWidth} | ||||||||
| visibility={isDrawerOpen ? 'visible' : 'hidden'} | ||||||||
| opacity={isDrawerOpen ? 1 : 0} | ||||||||
| transform={rightDrawerTransform} | ||||||||
| > | ||||||||
| <EditorRightDrawer step={currentStep} /> | ||||||||
| </Flex> | ||||||||
| </StepExecutionsToIncludeProvider> | ||||||||
| </MrfContextProvider> | ||||||||
| </Flex> | ||||||||
| ) | ||||||||
| } | ||||||||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.