Merge to preprod #565
There are no files selected for viewing
This file contains 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 @@ stopproxeus=pkill proxeus | |
| startds=curl -s http://localhost:2115 > /dev/null || ( PROXEUS_DATA_DIR=$(1) docker-compose up -d document-service && touch $(1)/ds-started ) | ||
| startnodes=curl -s http://localhost:8011 > /dev/null || (PROXEUS_PLATFORM_DOMAIN=http://$(DOCKER_GATEWAY):1323 NODE_CRYPTO_RATES_URL=http://localhost:8011 REGISTER_RETRY_INTERVAL=1 docker-compose -f docker-compose.yml -f docker-compose-extra.override.yml up -d node-crypto-forex-rates && touch $(1)/nodes-started ) | ||
| startmongo=nc -z localhost 27017 2> /dev/null || (docker run -d -p 27017:27017 -p 27018:27018 -p 27019:27019 proxeus/mongo-dev-cluster && sleep 10 && touch $(1)/mongo-started) | ||
| waitforproxeus=echo "Waiting for Proxeus to start" ; curl --head -X GET --retry 120 --retry-connrefused --retry-delay 1 --silent -o /dev/null http://localhost:1323 && echo "Proxeus started" || echo "Unable to start Proxeus" | ||
|
|
||
| ifeq ($(coverage),true) | ||
| COVERAGE_OPTS=-coverprofile artifacts/[email protected] -coverpkg="$(coverpkg)" | ||
|
|
@@ -197,6 +198,7 @@ test-ui: server ui | |
| $(call startds,$(testdir)) | ||
| $(call startnodes,$(testdir)) | ||
| $(call startproxeus,$(testdir)) | ||
| $(call waitforproxeus,$(testdir)) | ||
| $(MAKE) -C test/e2e test; ret=$$?; \ | ||
| $(stopproxeus); \ | ||
| [ -e $(testdir)/ds-started ] && docker-compose down; \ | ||
|
|
||
This file contains 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 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 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 |
|---|---|---|
|
|
@@ -446,7 +446,7 @@ export default { | |
| item.icon = 'view_quilt' | ||
| } | ||
| if (item.type === 'template') { | ||
| item.iconFa = 'mdi mdi-code-block-tags' | ||
| } | ||
| item.error = response.data[key].Error | ||
| elements.push(item) | ||
|
|
@@ -1133,7 +1133,7 @@ function condition(){ | |
| // enable inertial throwing | ||
| inertia: false, | ||
| onstart: function (event) { | ||
| if (event?.interaction?.downEvent?.button === 2) { | ||
| return false | ||
| } | ||
| _.dragActive = true | ||
|
|
@@ -1181,17 +1181,16 @@ function condition(){ | |
| _.dragCompPosition.left = (_.bcr.left) - _.dim.ml | ||
| }, | ||
| onmove: function (event, a, b, c, d) { | ||
| if (event?.interaction?.downEvent?.button === 2) { | ||
| return false | ||
| } | ||
| _.mousePos.y = event.pageY | ||
| _.mousePos.x = event.pageX | ||
| _.tl.x += event.dx | ||
| _.tl.y += event.dy | ||
| const translatePos = 'translate(' + _.tl.x + 'px, ' + _.tl.y + 'px)' | ||
| _.$dragComp[0].style.webkitTransform = translatePos | ||
| _.$dragComp[0].setAttribute('style', 'transform: ' + translatePos) | ||
|
There was a problem hiding this comment. Looks like you're improving the way nodes are being moved. Please document the change in the Pull Request. There was a problem hiding this comment. The original code prevents us from moving the nodes. I approve Slava's code with the disclaimer above. |
||
| }, | ||
| onend: function (e, a, b, c, d) { | ||
| _.wasInside = false | ||
|
|
@@ -1292,7 +1291,7 @@ function condition(){ | |
| user: 'fcn-usr node-icon mdi mdi-account', | ||
| form: 'fcn-form node-icon mdi mdi-view-quilt', | ||
| workflow: 'fcn-wflow node-icon mdi mdi-source-branch', | ||
| template: 'fcn-tmpl node-icon mdi mdi-code-block-tags' | ||
| }, | ||
| // d={name:"name", detail:"detail", kind:"condition|user|form|workflow|template"}; | ||
| _createFinderItem: function (d) { | ||
|
|
@@ -1569,7 +1568,7 @@ function condition(){ | |
| }, | ||
| icon: { | ||
| face: 'Material Design Icons', | ||
| code: '', | ||
|
There was a problem hiding this comment. It looks like you're using the Unicode character here instead of the code-string. Why? There was a problem hiding this comment. @slavas490 says he tried to use the hexadecimal string, but it did not work. There seems to be a problem with an unsupported library. |
||
| color: '#5353c0' | ||
| }, | ||
| events: { | ||
|
|
@@ -1622,7 +1621,7 @@ function condition(){ | |
| }, | ||
| icon: { | ||
| face: 'Material Design Icons', | ||
| code: '', | ||
| color: '#5150c0' | ||
| }, | ||
| events: { | ||
|
|
@@ -1675,7 +1674,7 @@ function condition(){ | |
| }, | ||
| icon: { | ||
| face: 'Material Design Icons', | ||
| code: '', | ||
| color: '#5150c0' | ||
| }, | ||
| events: { | ||
|
|
@@ -1710,7 +1709,7 @@ function condition(){ | |
| }, | ||
| icon: { | ||
| face: 'Material Design Icons', | ||
| code: '', | ||
| color: '#f0a30a' | ||
| }, | ||
| events: { | ||
|
|
@@ -1771,7 +1770,7 @@ function condition(){ | |
| }, | ||
| icon: { | ||
| face: 'Material Design Icons', | ||
| code: '', | ||
| color: '#e40070' | ||
| }, | ||
| events: { | ||
|
|
@@ -1834,7 +1833,7 @@ function condition(){ | |
| }, | ||
| icon: { | ||
| face: 'Material Design Icons', | ||
| code: '', | ||
| color: '#ff30ec' | ||
| }, | ||
| events: { | ||
|
|
||
This file contains 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 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
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.
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.
Is there some problem with this event?
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.
Slava says the specs for the third party library we use for drag-and-drop (Interact.js) was changed some time ago, and we should ideally rewrite this piece of code. E.g.
startandstopnotonstartandonstop