-
Notifications
You must be signed in to change notification settings - Fork 54
Flow builder UI #3689
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.
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
Open
akanshaaa19
wants to merge
61
commits into
whatsapp-forms-phase-2
Choose a base branch
from
whatsapp-forms-2/flow-builder-ui
base: whatsapp-forms-phase-2
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Flow builder UI #3689
Changes from all commits
Commits
Show all changes
61 commits
Select commit
Hold shift + click to select a range
484415d
feat: add Google Sheet URL support in WhatsAppForms and update GraphQ…
akanshaaa19 7092bac
feat: implement drag-and-drop functionality for form builder screens …
akanshaaa19 d1bb43f
feat: enhance FormBuilder with content management features including …
akanshaaa19 989b217
added todo comment
akanshaaa19 ca52a44
enhance WhatsAppForms configuration with JSON viewer and content mana…
akanshaaa19 8aeb584
feat: enhance WhatsAppForms configuration with variables management, …
akanshaaa19 f99e500
feat: implement auto-saving for WhatsApp form revisions and enhance p…
akanshaaa19 585fe38
feat: update WhatsAppForms configuration and queries to support form …
akanshaaa19 0cf8342
feat: improve default options for selection content
akanshaaa19 a9c7000
refactor: Update FormBuilder and related components for improved stat…
akanshaaa19 b46d7ef
feat: add version history functionality with revert capability for Wh…
akanshaaa19 7a870bd
feat: enhance media content handling with upload and preview function…
akanshaaa19 f3b2983
add GET_WHATSAPP_FORM_DEFINITIONS query to retrieve form definitions …
akanshaaa19 9ada6e2
add validation error handling for form fields and improve user feedba…
akanshaaa19 a75c708
feat: add confirmation dialog for publishing WhatsApp forms
akanshaaa19 848506d
update variable handling in WhatsApp forms to support variable names …
akanshaaa19 b9b357a
Merge branch 'whatsapp-forms-phase-2' of github.com:glific/glific-fro…
akanshaaa19 55bd1b4
fix: update image source handling to extract base64 data in WhatsApp …
akanshaaa19 6e12a7a
Fix CSS formatting and add trailing newlines
shijithkjayan 97d56f0
Fix CSS formatting and add missing newlines
shijithkjayan ce64f02
fix: null check
priyanshu6238 fb6ced3
test: add test case for configure button
priyanshu6238 0465185
Merge remote-tracking branch 'origin/whatsapp-forms-phase-2' into wha…
priyanshu6238 fa0e8e6
test : add test case for preview page
priyanshu6238 944d379
test: add test case for version file
priyanshu6238 14f3def
fix: merge conflict
priyanshu6238 a1139af
fix: revision history +remove meta link
priyanshu6238 199df50
refactor: flow builder ui + fix: deep scan
priyanshu6238 0d7a79f
fix: test case
priyanshu6238 4ab842c
fix: cypress
priyanshu6238 926a234
Merge remote-tracking branch 'origin/whatsapp-forms-phase-2' into wha…
priyanshu6238 abb2b77
fix: cypress branch
priyanshu6238 09361d2
fix: timeout error
priyanshu6238 96c80c4
add: test case
priyanshu6238 9c61fef
add: test case + fix: deep scan
priyanshu6238 10dc37b
fix: test case
priyanshu6238 e572c71
feat: add view-only mode to form builder components
akanshaaa19 35d4cf3
fix: update rendering logic for published badge in Configure component
akanshaaa19 ec07692
fix: format mock revisions for consistency and readability
akanshaaa19 9bf2553
test: enhance tests for form builder components with improved asserti…
akanshaaa19 2b7fc3d
test: add tests for screen toggle and content item deletion in Config…
akanshaaa19 ea4b60b
add tests for image upload and validation in MediaContent component
akanshaaa19 a39d863
add FileReader mock implementation for image upload tests
akanshaaa19 b3c40a3
test: update image upload tests to use new file input and improve ass…
akanshaaa19 9cbdb05
test: add data-testid attributes for file upload and image preview el…
akanshaaa19 cfb0548
test: enhance Configure component tests with JSON generation and vers…
akanshaaa19 f6119d2
feat: add validation error indicators for content items and screens i…
akanshaaa19 38cd752
test: add tests for variable renaming and error notification in Confi…
akanshaaa19 3369567
refactor: improve JSONViewer and Variables components for better read…
akanshaaa19 57c7b49
remove unused Dialog imports in JSONViewer component
akanshaaa19 5b8bb28
minor fixes
akanshaaa19 9d0d70f
refactor: reorganize imports and improve code structure in Configure,…
akanshaaa19 8fa3300
delete: remove Preview component test file
akanshaaa19 f620bed
added test cases and removed unused mocks
akanshaaa19 6a401c9
fix test cases
akanshaaa19 45f2818
fix: correct typos and improve error handling in WhatsAppForms and re…
akanshaaa19 a692d77
Merge branch 'whatsapp-forms-phase-2' of github.com:glific/glific-fro…
akanshaaa19 150f091
add back navigation button and update tests for WhatsApp Forms
akanshaaa19 5780ee8
Merge branch 'whatsapp-forms-phase-2' of github.com:glific/glific-fro…
akanshaaa19 11db481
Merge branch 'whatsapp-forms-phase-2' of github.com:glific/glific-fro…
akanshaaa19 d74147a
Merge branch 'whatsapp-forms-phase-2' of github.com:glific/glific-fro…
akanshaaa19 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,6 +65,7 @@ jobs: | |
| git clone https://github.com/glific/glific.git | ||
| echo done. go to dir. | ||
| cd glific | ||
| git checkout whatsapp-forms-phase-2 | ||
| echo done. start dev.secret.exs config | ||
| cd priv | ||
| mkdir cert | ||
|
|
@@ -96,6 +97,7 @@ jobs: | |
| git clone https://github.com/glific/cypress-testing.git | ||
| echo done. go to dir. | ||
| cd cypress-testing | ||
| git checkout refactor/wa_form | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same concern: hardcoded cypress feature branch. The 🛠️ Suggested fix with fallback cd cypress-testing
- git checkout refactor/wa_form
+ git checkout refactor/wa_form || echo "Feature branch not found, using default branch"
cd ..Or conditionally: cd cypress-testing
if [[ "${{ github.base_ref }}" == "whatsapp-forms-phase-2" ]]; then
git checkout refactor/wa_form
fi
cd ..🤖 Prompt for AI Agents |
||
| cd .. | ||
| cp -r cypress-testing/cypress cypress | ||
| yarn add [email protected] | ||
|
|
||
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
88 changes: 88 additions & 0 deletions
88
src/containers/WhatsAppForms/Configure/Configure.module.css
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 |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| .Header { | ||
| display: flex; | ||
| align-items: center; | ||
| padding: 1.5rem; | ||
| justify-content: space-between; | ||
| background: #f8faf5; | ||
| } | ||
|
|
||
| .Name { | ||
| display: flex; | ||
| align-items: center; | ||
| gap: 1rem; | ||
| } | ||
|
|
||
| .BackIcon { | ||
| cursor: pointer; | ||
| display: flex; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .Header p { | ||
| margin: 0; | ||
| font-size: 1.2rem; | ||
| font-weight: 600; | ||
| } | ||
|
|
||
| .ConfigureContainer { | ||
| display: flex; | ||
| height: calc(100vh - 80px); | ||
| gap: 20px; | ||
| padding: 20px; | ||
| background-color: #fff; | ||
| position: relative; | ||
| } | ||
|
|
||
| .FlowBuilder { | ||
| flex: 1; | ||
| background-color: white; | ||
| border-radius: 8px; | ||
| border: 1px solid #e0e0e0; | ||
| overflow: hidden; | ||
| } | ||
|
|
||
| .Preview { | ||
| width: 400px; | ||
| overflow: hidden; | ||
| } | ||
|
|
||
| .Toggle { | ||
| width: 100%; | ||
| display: flex; | ||
| justify-content: center; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| .PublishedBadge { | ||
| background-color: #d1fae5; | ||
| color: #065f46; | ||
| padding: 0.25rem 0.5rem; | ||
| border-radius: 0.375rem; | ||
| font-size: 0.875rem; | ||
| font-weight: 500; | ||
| margin-left: 1rem; | ||
| } | ||
|
|
||
| .SavingIndicator { | ||
| color: #119656; | ||
| font-size: 0.8rem; | ||
| font-weight: 500; | ||
| margin-right: 1rem; | ||
| display: flex; | ||
| align-items: center; | ||
| gap: 0.4rem; | ||
| position: absolute; | ||
| right: 0; | ||
| } | ||
|
|
||
| @media (max-width: 1024px) { | ||
| .ConfigureContainer { | ||
| flex-direction: column; | ||
| } | ||
|
|
||
| .Preview { | ||
| width: 100%; | ||
| height: 600px; | ||
| } | ||
| } |
Oops, something went wrong.
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.
Hardcoded feature branch will break CI on master.
This workflow runs on push to
masterand all PRs. Once merged, CI will fail ifwhatsapp-forms-phase-2is deleted or unavailable. This change should either:🛠️ Suggested approach using conditional checkout
Or better, parameterize based on the target branch:
📝 Committable suggestion
🤖 Prompt for AI Agents
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.
@akanshaaa19
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.