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(editor): Overhaul expression editor modal #4631

Merged
merged 37 commits into from
Dec 1, 2022
Merged

feat(editor): Overhaul expression editor modal #4631

merged 37 commits into from
Dec 1, 2022

Conversation

ivov
Copy link
Contributor

@ivov ivov commented Nov 17, 2022

No description provided.

@ivov
feat(editor): Integrate CodeMirror into expression editor modal (#4563)
ec4c011 
* ✨ Initial setup

* 👕 Fix lint

* ⚡ Extract segments

* ⚡ Implement var insertion

* 👕 Ignore `.d.cts`

* ⚡ Refactor to simplify

* ✨ Add brace handler

* ✨ Fully replace input and output
@ivov
🔀 Merge master
1b0797f
@ivov
feat(editor): Adjust resolved expression to match parameter input hint (
f9f2a2a 
#4600)

* ✨ Initial adjustments

* 🐛 Prevent empty decorations

* ⚡ Adjust resolved expression to match param input hint

* ✏️ Improve comment

* 👕 Remove lint rule

* ✏️ Fix typo

* ✏️ Fix closing brace

* ⚡ Clean up `displayableSegments()`
@ivov
feat(editor): Apply styling to expression editor modal (#4607)
2a763ce 
🎨 Apply styling
@ivov
feat(core): Improve errors in evaluated expression (#4619)
6c09797 
* 🐛 Fix env var access for FE

* 🔥 Remove excess closing bracket

* 🚧 Set up TODO

* ✏️ Update copy

* ⚡ Deny env vars access to FE

* 👕 Remove unneeded lint exception

* 📘 Remove unneeded typing
@ivov
🔀 Merge master
5e288b4
@ivov
feat(editor): Dynamically delay evaluation resolution (#4625)
2405b33 
* ✏️ Update copy

* ⚡ Dynamically delay evaluation resolution

* 🔥 Remove unneeded computed property
@ivov
refactor(editor): Pre-review cleanup (#4627)
77d69da 
* 🔥 Remove `ExpressionInput` component

* 🔥 Remove Quill

* ✏️ Rename i18n key

* 🎨 Place border on correct element

* 🐛 Handle syntax errors

* ⚡ Add sample autocompletions

* 🐛 Fix auto-extending behavior
@ivov
🔀 Merge master
c743021
@n8n-assistant n8n-assistant bot added core Enhancement outside /nodes-base and /editor-ui n8n team Authored by the n8n team ui Enhancement in /editor-ui or /design-system labels Nov 17, 2022
@ivov
feat(editor): Improve escaping behavior (#4641)
60bddf9 
* 🎨 Hide hint on small screen

* ⚡ Improve escaping
@ivov
refactor(editor): Apply styling feedback to expression editor modal (#…
e79081a 
…4660)

* 🎨 Restyle hint

* 🎨 Restyle param input hint

* 🔥 Remove `e.g.`

* ⚡ Tweak delay

* 🎨 Restyle output

* 🎨 Tweak theme

* ✏️ Tweak copy
@ivov
🔀 Merge master
5e183d6
@ivov
🔀 Merge master again
2b76cee
@ivov
🔀 Merge master
9de9179
@ivov
refactor(editor): Apply feedback 2022.11.22 (#4697)
add8b0a 
* 🎨 Change background color

* ⚡ Focus on mount

* ⚡ Account for preexisting braces on injection

* 🐛 Fix `$workflow` showing as not saved

* ✏️ Tweak copy

* 🐛 Fix readonly focus

* ⚡ Focus input on paste

* ⚡ Sync inputs with modal

* ✏️ Tweak copy
@ivov
refactor(editor): Apply feedback 2022.11.23 (#4705)
80ed82b 
* ⚡ Allow newlines

* ⚡ Set cursor at end of content

* ⚡ Do not defocus on paste on Chrome
@ivov
🔀 Merge master
fb3c06d
@ivov
⚡ Fix import
5db61bd
@ivov
🔀 Merge master
892e91e
@ivov
🧪 Add e2e tests
c49593c
mutdmour
mutdmour reviewed Nov 30, 2022
View reviewed changes
Copy link
Contributor

@mutdmour mutdmour left a comment

Choose a reason for hiding this comment

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

not done reviewing but please take a look

cypress/e2e/9-expression-editor-modal.cy.ts Outdated Show resolved Hide resolved
packages/workflow/src/Expression.ts Show resolved Hide resolved
packages/editor-ui/src/components/ParameterInputHint.vue Outdated Show resolved Hide resolved
packages/editor-ui/src/components/NodeDetailsView.vue Outdated Show resolved Hide resolved
packages/editor-ui/src/components/ParameterInputWrapper.vue Show resolved Hide resolved
mutdmour
mutdmour reviewed Nov 30, 2022
View reviewed changes
packages/editor-ui/src/components/VariableSelectorItem.vue Show resolved Hide resolved
packages/editor-ui/src/components/ExpressionEditorModal/theme.ts Outdated Show resolved Hide resolved
packages/editor-ui/src/components/ExpressionEditorModal/theme.ts Outdated Show resolved Hide resolved
packages/editor-ui/src/components/ExpressionEditorModal/resolvable.completions.ts Show resolved Hide resolved
packages/editor-ui/src/components/ExpressionEdit.vue Outdated Show resolved Hide resolved
packages/editor-ui/src/components/ExpressionEdit.vue Outdated Show resolved Hide resolved
packages/editor-ui/src/components/ExpressionEditorModal/ExpressionModalOutput.vue Show resolved Hide resolved
packages/editor-ui/src/components/ExpressionEditorModal/ExpressionModalInput.vue Outdated Show resolved Hide resolved
mutdmour
mutdmour reviewed Dec 1, 2022
View reviewed changes
Copy link
Contributor

@mutdmour mutdmour left a comment

Choose a reason for hiding this comment

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

Looks good. just one last question

packages/editor-ui/src/components/ExpressionEditorModal/ExpressionModalInput.vue Outdated Show resolved Hide resolved
mutdmour
mutdmour previously approved these changes Dec 1, 2022
View reviewed changes
@ivov ivov merged commit 59771c8 into master Dec 1, 2022
@ivov ivov deleted the overhaul-expression-editor-modal branch December 1, 2022 12:26
@n8n-assistant n8n-assistant bot added the Upcoming Release Will be part of the upcoming release label Dec 1, 2022
MiloradFilipovic added a commit that referenced this pull request Dec 1, 2022
@MiloradFilipovic
Merge branch 'master' into feature/undo-redo
dc167da 
* master:
  feat(Postmark Trigger Node): Update credentials so they can be used with the HTTP Request Node (#4790)
  fix(editor): Remove unnecessary closing tag in CanvasControls (no-changelog) (#4792)
  feat(Facebook Graph API Node): Update to support api version 15 (#4791)
  fix(Pipedrive Node): Resolve properties not working
  fix(editor): Remove excess `isReadOnly` prop (no-changelog) (#4786)
  fix(core): OAuth2 scope saved to DB fix
  feat(editor): Overhaul expression editor modal (#4631)
  test(editor): Intercept credentials save and test request and wait for them in e2e test (#4778)
  fix(Google Sheets  Node): Fix for append operation if no empty rows in sheet
@janober
Copy link
Member

janober commented Dec 7, 2022

Got released with [email protected]

@janober janober removed the Upcoming Release Will be part of the upcoming release label Dec 7, 2022
@netroy netroy mentioned this pull request Jan 26, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mutdmour mutdmour mutdmour approved these changes

Assignees
No one assigned
Labels
core Enhancement outside /nodes-base and /editor-ui n8n team Authored by the n8n team ui Enhancement in /editor-ui or /design-system
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ivov @janober @mutdmour