Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(v2/logic): render empty and populated logic page, add mobile variant of builder sidebar #3390

Merged
merged 42 commits into from
Mar 9, 2022
Merged

feat(v2/logic): render empty and populated logic page, add mobile variant of builder sidebar #3390

merged 42 commits into from
Mar 9, 2022

Conversation

karrui
Copy link
Contributor

@karrui karrui commented Feb 8, 2022 •
edited
Loading

Don't get shooketh by line changes... ~900 of those lines are for a single .svg file T_T

Problem

This PR adds components required to render the empty and populated logic pages.
Note that:

In addition, a few new improvements snuck in:

  • feat: add mobile variant of builder sidebar (bottom bar?)
  • feat: add mobile styling to builder design view
  • feat(theme): add Divider custom theme

Related to #3365

Solution

Features:

  • Add components required to render initial admin form logic page
    • LogicContent, with subcomponents
      • NewLogicBlock: wip component (pending dropdown/multiselect) to render creation of new logic block
      • LogicBlock to render current form logic blocks
    • EmptyLogic component to render page when there are no form logic blocks to display yet.

Screenshots

New stories have been added to show various states, along with mobile/desktop divide.

karrui added 20 commits February 7, 2022 17:51
@karrui
refactor: use BasicField to human readable strings and icon gen fns
f21b36d
@karrui
feat: add initial EmptyLogic component
4ea7b8f 
no business logic yet
@karrui
feat: add initial stories for logic
9ecdc96
@karrui
feat: add mobile variant of builder sidebar (bottom bar?)
71ab371
@karrui
feat: add mobile styling to builder design view
c4d0af1
@karrui
feat: add BuilderLogicContext to store logic state
25a2414
@karrui
feat(theme): add Divider custom theme
926279b
@karrui
feat(NewLogicBlock): add (dumb) new logic component
83d52f8
@karrui
feat: update story to be wrapped with BuilderLogicProvider
329de2a 
so the page can render
@karrui
fix(shared/types): update form_logics type to LogicDto
74da140
@karrui
feat: return form logics and id map in BuilderLogicContext
630a6b7
@karrui
feat: add LogicBlock and related subcomponents to render each block
b0dc971
@karrui
feat: render LogicBlocks in LogicContent component
f6fb7c3
@karrui
feat(story): update story to render logic page when there is logic
419ba9d
@karrui
feat: add non-working Add logic button
fad9cef
@karrui
feat: add mobile styling to BuilderLogic page (and add stories)
1cf16f3
@karrui
feat: add mobile styling for NewLogicBlock component
e664ce0
@karrui
feat(NewLogicBlock): add mobile (and focus) styling
385af7a
@karrui
feat: trigger new logic block on add logic button click
e1cea35
@karrui
fix(LogicBlock): add index to mapped components
47c5aba
@karrui karrui changed the title feat(v2/logic): render empty and populated logic page feat(v2/logic): render empty and populated logic page, add mobile variant of builder sidebar Feb 8, 2022
@karrui karrui requested review from mantariksh and tshuli February 8, 2022 10:13
@karrui
Copy link
Contributor Author

karrui commented Feb 23, 2022

Will update to fix file renames

@karrui
Merge branch 'form-v2/develop' into form-v2/logic/logic-layout-1
9c5c7b6
@karrui
Merge branch 'form-v2/develop' into form-v2/logic/logic-layout-1
b537083 
# Conflicts:
#	frontend/src/features/admin-form-builder/FormBuilderPage.tsx
#	frontend/src/features/admin-form-builder/common/components/BuilderContent.tsx
#	frontend/src/features/admin-form-builder/logic/BuilderLogic.tsx
#	frontend/src/features/admin-form/create/builder-and-design/components/BuilderAndDesignDrawer/BuilderAndDesignDrawer.tsx
#	frontend/src/features/admin-form/create/builder-and-design/components/BuilderAndDesignDrawer/EditFieldDrawer/EditFieldDrawer.tsx
#	frontend/src/features/admin-form/create/common/components/BuilderSidebar/MobileBuilderSidebar.tsx
#	frontend/src/features/admin-form/create/common/components/BuilderSidebar/SidebarMobileTab.tsx
#	frontend/src/features/admin-form/create/constants.ts
#	frontend/src/features/admin-form/create/logic/BuilderLogic.stories.tsx
#	frontend/src/features/admin-form/create/logic/BuilderLogicContext.tsx
#	frontend/src/features/admin-form/create/logic/components/EmptyLogic.tsx
#	frontend/src/features/admin-form/create/logic/components/LogicContent/LogicBlock/FieldLogicBadge.tsx
#	frontend/src/features/admin-form/create/logic/components/LogicContent/LogicBlock/LogicBadge.tsx
#	frontend/src/features/admin-form/create/logic/components/LogicContent/LogicBlock/LogicBlock.tsx
#	frontend/src/features/admin-form/create/logic/components/LogicContent/LogicBlock/LogicConditionValues.tsx
#	frontend/src/features/admin-form/create/logic/components/LogicContent/LogicBlock/index.ts
#	frontend/src/features/admin-form/create/logic/components/LogicContent/LogicContent.tsx
#	frontend/src/features/admin-form/create/logic/components/LogicContent/NewLogicBlock/NewLogicBlock.tsx
#	frontend/src/features/admin-form/create/logic/components/LogicContent/NewLogicBlock/index.ts
#	frontend/src/features/admin-form/create/logic/components/LogicContent/index.ts
#	frontend/src/features/admin-form/create/logic/components/LogicSvgr.tsx
#	frontend/src/features/admin-form/create/logic/constants.ts
#	frontend/src/features/admin-form/create/logic/utils.ts
@karrui
fix: update logic imports to account for folder rename
8593393
@karrui
feat: extract MobileCreatePageBottomBar from CreatePageSidebar
e0d2e28
@karrui
style: update container element styling to accommodate sticky scroll
58192c4
@karrui
Merge branch 'form-v2/develop' into form-v2/logic/logic-layout-1
f27ca5b 
# Conflicts:
#	frontend/src/features/admin-form/create/builder-and-design/utils.ts
mantariksh
mantariksh reviewed Mar 1, 2022
View reviewed changes
Copy link
Contributor

@mantariksh mantariksh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some thoughts

frontend/src/features/admin-form/create/constants.ts Outdated Show resolved Hide resolved
frontend/src/features/admin-form/create/common/components/CreatePageContent.tsx Outdated Show resolved Hide resolved
frontend/src/features/admin-form/create/logic/BuilderLogicContext.tsx Outdated Show resolved Hide resolved
frontend/src/features/admin-form/create/logic/BuilderLogicContext.tsx Outdated Show resolved Hide resolved
@karrui karrui requested a review from mantariksh March 1, 2022 07:33
@karrui karrui merged commit c5fd13c into form-v2/develop Mar 9, 2022
@karrui karrui deleted the form-v2/logic/logic-layout-1 branch March 9, 2022 02:39
This was referenced Oct 4, 2022
Closed
Merged
@justynoh justynoh mentioned this pull request Oct 5, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mantariksh mantariksh mantariksh approved these changes

@tshuli tshuli Awaiting requested review from tshuli

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@karrui @mantariksh @pearlyong