Skip to content

Commit 2c4cf1c

Browse files
josvanroosmalenjosvanroosmalen
authored
Merge pull request #347 from marklogic-community/release/release-2.0.3-candidate
Release/release 2.0.3 candidate
2 parents 6872ddb + 56cce4d commit 2c4cf1c

File tree

9 files changed

+229
-9
lines changed

9 files changed

+229
-9
lines changed

‎java-middle-tier/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ task runLocal(type: JavaExec) {
206206
description = "Run the main class with JavaExecTask"
207207
classpath = sourceSets.main.runtimeClasspath
208208
main = "com.marklogic.pipes.ui.Application"
209+
args "--spring.config.location=local-env.properties"
209210
}
210211

211212

‎java-middle-tier/local-env.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
server.port=9081

‎java-middle-tier/src/test/resources/ExecuteGraphTests/StringTemplateUndefined/expectedResponse.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"output": ""
3+
}

‎java-middle-tier/src/test/resources/ExecuteGraphTests/StringTemplateUndefined/graph.json

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
{
2+
"pipesFileVersion": 2,
3+
"models": [],
4+
"executionGraph": {
5+
"last_node_id": 4,
6+
"last_link_id": 3,
7+
"nodes": [
8+
{
9+
"id": 1,
10+
"type": "DHF/input",
11+
"pos": [
12+
248,
13+
489
14+
],
15+
"size": [
16+
180,
17+
100
18+
],
19+
"flags": {},
20+
"order": 0,
21+
"mode": 0,
22+
"outputs": [
23+
{
24+
"name": "input",
25+
"type": "",
26+
"links": null
27+
},
28+
{
29+
"name": "uri",
30+
"type": "",
31+
"links": null
32+
},
33+
{
34+
"name": "collections",
35+
"type": "",
36+
"links": null
37+
},
38+
{
39+
"name": "permissions",
40+
"type": "",
41+
"links": null
42+
}
43+
],
44+
"properties": {}
45+
},
46+
{
47+
"id": 2,
48+
"type": "DHF/output",
49+
"pos": [
50+
1307,
51+
433
52+
],
53+
"size": [
54+
180,
55+
60
56+
],
57+
"flags": {},
58+
"order": 3,
59+
"mode": 0,
60+
"inputs": [
61+
{
62+
"name": "output",
63+
"type": 0,
64+
"link": 3
65+
}
66+
],
67+
"properties": {}
68+
},
69+
{
70+
"id": 4,
71+
"type": "Enrich/AddProperty",
72+
"pos": [
73+
1097,
74+
526
75+
],
76+
"size": {
77+
"0": 170,
78+
"1": 46
79+
},
80+
"flags": {},
81+
"order": 2,
82+
"mode": 0,
83+
"inputs": [
84+
{
85+
"name": "doc",
86+
"type": 0,
87+
"link": null
88+
},
89+
{
90+
"name": "value",
91+
"type": 0,
92+
"link": 2
93+
}
94+
],
95+
"outputs": [
96+
{
97+
"name": "doc",
98+
"links": [
99+
3
100+
]
101+
}
102+
],
103+
"properties": {
104+
"propertyName": "output"
105+
}
106+
},
107+
{
108+
"id": 3,
109+
"type": "Generate/Templating",
110+
"pos": [
111+
571.8000030517578,
112+
407.6000061035156
113+
],
114+
"size": {
115+
"0": 255,
116+
"1": 146
117+
},
118+
"flags": {},
119+
"order": 1,
120+
"mode": 0,
121+
"inputs": [
122+
{
123+
"name": "v1",
124+
"type": 0,
125+
"link": null
126+
},
127+
{
128+
"name": "v2",
129+
"type": 0,
130+
"link": null
131+
},
132+
{
133+
"name": "v3",
134+
"type": 0,
135+
"link": null
136+
}
137+
],
138+
"outputs": [
139+
{
140+
"name": "newString",
141+
"links": [
142+
2
143+
]
144+
}
145+
],
146+
"properties": {},
147+
"widgets_values": [
148+
"",
149+
"",
150+
"${v1}${v2}${v3}"
151+
]
152+
}
153+
],
154+
"links": [
155+
[
156+
2,
157+
3,
158+
0,
159+
4,
160+
1,
161+
0
162+
],
163+
[
164+
3,
165+
4,
166+
0,
167+
2,
168+
0,
169+
0
170+
]
171+
],
172+
"groups": [],
173+
"config": {},
174+
"version": 0.4
175+
},
176+
"name": "UndefinedStringTemplate",
177+
"metadata": {
178+
"version": "00.01",
179+
"author": "",
180+
"title": "UndefinedStringTemplate",
181+
"dateExported": "13/11/2020, 10:04:55"
182+
}
183+
}

‎java-middle-tier/src/test/resources/ExecuteGraphTests/StringTemplateUndefined/input.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"data": [
3+
{
4+
"type": "A",
5+
"value": "C"
6+
},
7+
{
8+
"type": "A",
9+
"value": "D"
10+
},
11+
{
12+
"type": "B",
13+
"value": "E"
14+
}
15+
]
16+
}

‎ml-backend/src/main/ml-modules/root/custom-modules/pipes/runtime/coreFunctions.sjs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,21 @@ function executeNormalizeSpace(propertiesAndWidgets,input) {
908908
function executeTemplating(propertiesAndWidgets,v1,v2,v3) {
909909
let v4 = propertiesAndWidgets.widgets.v4;
910910
let v5 = propertiesAndWidgets.widgets.v5;
911+
if ( !v1 ) {
912+
v1 = "";
913+
}
914+
if ( !v2 ) {
915+
v2 = "";
916+
}
917+
if ( !v3 ) {
918+
v3 = "";
919+
}
920+
if ( !v4 ) {
921+
v4 = "";
922+
}
923+
if ( !v5 ) {
924+
v5 = "";
925+
}
911926
let template = "`" + propertiesAndWidgets.widgets.template + "`";
912927
let result = eval(template);
913928
return result;

‎ml-backend/src/main/ml-modules/services/vppBackendServices.sjs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,14 +296,14 @@ function getDHFEntityProperties (entity) {
296296
}
297297

298298
entityModel.children = sem.sparql(
299-
"PREFIX es: <http://marklogic.com/entity-services#>\
300-
SELECT * WHERE {\
301-
?entity <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> es:EntityType.\
302-
?entity es:property ?property.\
303-
?property es:title ?label.\
304-
OPTIONAL {?property es:datatype|es:ref ?type.}\
305-
OPTIONAL { ?property es:description ?description }\
306-
}",
299+
`PREFIX es: <http://marklogic.com/entity-services#>
300+
SELECT * WHERE {
301+
?entity <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> es:EntityType.
302+
?entity es:property ?property.
303+
?property es:title ?label.
304+
OPTIONAL {?property es:datatype|es:ref ?type.}
305+
OPTIONAL { ?property es:description ?description }
306+
} ORDER BY ASC(?property)`,
307307
{ "entity": sem.iri(entityModel.label) }).toArray()
308308
return entityModel
309309
}

‎node_modules_override/litegraph.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5932,7 +5932,7 @@ LGraphNode.prototype.executeAction = function(action)
59325932
var block_default = false;
59335933
//console.log(e); //debug
59345934

5935-
if (e.target.localName == "input") {
5935+
if (e.target.localName == "input" || e.target.localName == "textarea") {
59365936
return;
59375937
}
59385938

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"vue-json-pretty": "^1.6.0",
2323
"vue-query-builder": "^0.8.2",
2424
"vue-shortkey": "^3.1.7",
25+
"vue-template-compiler": "^2.6.12",
2526
"vue2-dropzone": "^3.6.0",
2627
"vuex": "^3.1.2",
2728
"vuex-persistedstate": "^3.0.1",

0 commit comments

Comments
 (0)