Add new param syntax to evaluate against the server #740
Conversation
pe4cey
force-pushed
the
param-fn
branch
2 times, most recently
from
2e95d17 to
db1788c
Compare
| @@ -137,6 +144,12 @@ describe('commandsDuck', () => { | |||
| const cmdString = cmd + ' x: 2' | |||
| const id = 1 | |||
| const action = commands.executeCommand(cmdString, id) | |||
| bolt.routedWriteTransaction = jest.fn(() => | |||
There was a problem hiding this comment.
This is needed here, because this should not call that function.
| @@ -175,6 +189,7 @@ describe('commandsDuck', () => { | |||
| { type: commands.KNOWN_COMMAND }, | |||
| replaceParams({ x: 2, y: 3 }), | |||
| frames.add({ ...action, success: true, type: 'params', params: {} }), | |||
| { type: 'meta/FORCE_FETCH' }, | |||
There was a problem hiding this comment.
We shouldn't force fetch on param setting
| return reject( | ||
| new Error('Could not parse input. Usage: `:param "x": 2`. ' + e) | ||
| ) | ||
| reject(new Error('Could not parse input. Usage: `:param "x": 2`. ' + e)) |
There was a problem hiding this comment.
I think we should promote the new format here
There was a problem hiding this comment.
Display both usages or only the new => approach?
| @@ -44,6 +50,8 @@ describe('commandsDuck params helper', () => { | |||
| }) | |||
| test('handles :param "x": 2 and calls the update action creator', () => { | |||
| // Given | |||
| // jest.spyOn(params, , accessType?) | |||
| @@ -90,7 +91,7 @@ const availableCommands = [ | |||
| name: 'set-params', | |||
| match: cmd => /^params?\s/.test(cmd), | |||
| exec: function (action, cmdchar, put, store) { | |||
| handleParamsCommand(action, cmdchar, put) | |||
| return handleParamsCommand(action, cmdchar, put, bolt) | |||
There was a problem hiding this comment.
It looks like handleParamsCommand isn't using the 'bolt argument so it can be skipped here (and also the import up top)
e2e_tests/integration/index.spec.js
Outdated
| it('will add parameter using `:param` command', () => { | ||
| // add cypher evalutated param function | ||
| const command = ':param foo => 1 + 1' | ||
| cy.get(Editor).type(command, { force: true }) |
There was a problem hiding this comment.
Nice with e2e test!
You could use cy.executeCommand(command) here instead to clean up a bit.
| @@ -28,7 +28,9 @@ const ParamsFrame = ({ frame, params }) => { | |||
| const contents = ( | |||
| <PaddedDiv> | |||
| <Render if={frame.success !== false}> | |||
| <pre>{JSON.stringify(frame.params, null, 2)}</pre> | |||
| <pre data-test-id='rawParamData'> | |||
| {JSON.stringify(frame.params, null, 2)} | |||
There was a problem hiding this comment.
I think we want a nicer output for the new types. Might be in a separate PR, let's chat about it.
| @@ -43,6 +43,10 @@ import { | |||
| replace as replaceSettings | |||
| } from 'shared/modules/settings/settingsDuck' | |||
| import { cleanCommand, getInterpreter } from 'services/commandUtils' | |||
| import bolt from 'services/bolt/bolt' | |||
There was a problem hiding this comment.
Bolt should not be needed in this file since we're not testing the new format, right?
There was a problem hiding this comment.
I've just added a test in the latest commit that requires this.
|
PR updated @oskarhane |
|
In #735 I've added a new function that formats all types in a nice way. It'd be great if that could be used when printing the params as well. |
| test('does the right thing for :param x => 2', done => { | ||
| // Given | ||
| const cmd = store.getState().settings.cmdchar + 'param' | ||
| const cmdString = cmd + ' x: 2' |
There was a problem hiding this comment.
This doesn't test what the test title says it should test.
- Copy cypher result object and remove bolt proptypes - Return new object when re-applying graph types
Add new param syntax to evaluate against the server
Summary
Introduces additional
:paramsyntax that evaluates the expression against neo4j serverMore info
The statement to the right of
=>will be evaluated against neo4j server (as cypher) and the resulting value stored against the param name to be used in future cypher statements (e.g. RETURN$name).NOTE: Setting params using
:param foo: "bar"is still supported but will not be executed against the neo4j serverExamples
Browser command - return value (type)
:param foo => "bar"->"bar"(string):param foo => 1 + 1->2(bolt int):param foo => date()->"2018-04-23"(bolt date string)Fixes #705