Skip to content

Commit 3973876

Browse files
committed
Merge branch 'release/1.1.0-RC1' into main
2 parents 1652609 + 6caa166 commit 3973876

File tree

2 files changed

+151
-1
lines changed

2 files changed

+151
-1
lines changed

composer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,9 @@
33
"description": "JSON Schema Definitions for Evalanche Campaigns",
44
"type": "library",
55
"license": "proprietary",
6-
"require": {}
6+
"extra": {
7+
"branch-alias": {
8+
"dev-develop": "1.1.x-dev"
9+
}
10+
}
711
}

schema.json

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
{
3131
"$ref": "#/definitions/nodes/starts/passiveStart"
3232
},
33+
{
34+
"$ref": "#/definitions/nodes/starts/webTouchPointStart"
35+
},
3336
{
3437
"$ref": "#/definitions/nodes/actions/copyToWorkflowAction"
3538
},
@@ -54,6 +57,12 @@
5457
{
5558
"$ref": "#/definitions/nodes/actions/setMilestoneAction"
5659
},
60+
{
61+
"$ref": "#/definitions/nodes/actions/triggerWebhookAction"
62+
},
63+
{
64+
"$ref": "#/definitions/nodes/actions/sendShortMessageAction"
65+
},
5766
{
5867
"$ref": "#/definitions/nodes/conditions/dateTimeCondition"
5968
},
@@ -442,6 +451,63 @@
442451
"meta",
443452
"connections"
444453
]
454+
},
455+
"webTouchPointStart": {
456+
"title": "webTouchPointStart",
457+
"type": "object",
458+
"properties": {
459+
"id": {
460+
"$ref": "#/definitions/types/uuid"
461+
},
462+
"type": {
463+
"const": "webTouchPointStart"
464+
},
465+
"config": {
466+
"type": "object",
467+
"properties": {
468+
"webTouchPointId": {
469+
"$ref": "#/definitions/types/evalancheId"
470+
},
471+
"linkId": {
472+
"$ref": "#/definitions/types/evalancheId"
473+
},
474+
"multipass": {
475+
"$ref": "#/definitions/types/multipass"
476+
},
477+
"startTime": {
478+
"oneOf": [
479+
{
480+
"$ref": "#/definitions/types/dateTime"
481+
},
482+
{
483+
"type": "null"
484+
}
485+
]
486+
}
487+
},
488+
"additionalProperties": false,
489+
"required": [
490+
"webTouchPointId",
491+
"linkId",
492+
"startTime",
493+
"multipass"
494+
]
495+
},
496+
"meta": {
497+
"$ref": "#/definitions/meta/node"
498+
},
499+
"connections": {
500+
"$ref": "#/definitions/connections/singleOutput"
501+
}
502+
},
503+
"additionalProperties": false,
504+
"required": [
505+
"id",
506+
"type",
507+
"config",
508+
"meta",
509+
"connections"
510+
]
445511
}
446512
},
447513
"actions": {
@@ -796,6 +862,86 @@
796862
"meta",
797863
"connections"
798864
]
865+
},
866+
"triggerWebhookAction": {
867+
"title": "triggerWebhookAction",
868+
"type": "object",
869+
"properties": {
870+
"id": {
871+
"$ref": "#/definitions/types/uuid"
872+
},
873+
"type": {
874+
"const": "triggerWebhookAction"
875+
},
876+
"config": {
877+
"type": "object",
878+
"properties": {
879+
"webhookId": {
880+
"$ref": "#/definitions/types/evalancheId"
881+
}
882+
},
883+
"additionalProperties": false,
884+
"required": [
885+
"webhookId"
886+
]
887+
},
888+
"meta": {
889+
"$ref": "#/definitions/meta/node"
890+
},
891+
"connections": {
892+
"$ref": "#/definitions/connections/singleOutput"
893+
}
894+
},
895+
"additionalProperties": false,
896+
"required": [
897+
"id",
898+
"type",
899+
"config",
900+
"meta",
901+
"connections"
902+
]
903+
},
904+
"sendShortMessageAction": {
905+
"title": "sendShortMessageAction",
906+
"type": "object",
907+
"properties": {
908+
"id": {
909+
"$ref": "#/definitions/types/uuid"
910+
},
911+
"type": {
912+
"const": "sendShortMessageAction"
913+
},
914+
"config": {
915+
"type": "object",
916+
"properties": {
917+
"shortMessageId": {
918+
"$ref": "#/definitions/types/evalancheId"
919+
},
920+
"ignorePermission": {
921+
"type": "boolean"
922+
}
923+
},
924+
"additionalProperties": false,
925+
"required": [
926+
"shortMessageId",
927+
"ignorePermission"
928+
]
929+
},
930+
"meta": {
931+
"$ref": "#/definitions/meta/node"
932+
},
933+
"connections": {
934+
"$ref": "#/definitions/connections/singleOutput"
935+
}
936+
},
937+
"additionalProperties": false,
938+
"required": [
939+
"id",
940+
"type",
941+
"config",
942+
"meta",
943+
"connections"
944+
]
799945
}
800946
},
801947
"conditions": {

0 commit comments

Comments
 (0)