Skip to content

Commit

Permalink
Remove no longer used waiting_exits from flow inspection
Browse files Browse the repository at this point in the history
  • Loading branch information
@rowanseymour
rowanseymour committed Dec 16, 2024
1 parent 75dc1d0 commit 3c2df86
Show file tree
Hide file tree
Showing 6 changed files with 157 additions and 167 deletions.
303 changes: 151 additions & 152 deletions media/test_flows/mixed_versions.json
View file
Original file line number Diff line number Diff line change
@@ -1,162 +1,161 @@
{
"version": "11.12",
"site": "https://app.rapidpro.io",
"flows": [
{
"uuid": "b4af4237-3a0d-4ee2-9ef3-01658c9215e4",
"name": "New Child",
"spec_version": "13.0.0",
"language": "eng",
"type": "messaging",
"revision": 5,
"expire_after_minutes": 10080,
"localization": {},
"nodes": [
"version": "11.12",
"site": "https://app.rapidpro.io",
"flows": [
{
"uuid": "54393466-b5a3-4cba-a032-920b62a377bb",
"actions": [
{
"type": "send_msg",
"uuid": "c6a26419-37d0-47c8-9785-c99f1ce83644",
"text": "Welcome to the child flow"
},
{
"type": "add_input_labels",
"uuid": "0d04cd6b-de35-4077-83be-7b1b8a2b056b",
"labels": [
"uuid": "b4af4237-3a0d-4ee2-9ef3-01658c9215e4",
"name": "New Child",
"spec_version": "13.0.0",
"language": "eng",
"type": "messaging",
"revision": 5,
"expire_after_minutes": 10080,
"localization": {},
"nodes": [
{
"uuid": "a8a6d847-0785-4f97-a8f8-3af98ed111a0",
"name": "Interesting"
"uuid": "54393466-b5a3-4cba-a032-920b62a377bb",
"actions": [
{
"type": "send_msg",
"uuid": "c6a26419-37d0-47c8-9785-c99f1ce83644",
"text": "Welcome to the child flow"
},
{
"type": "add_input_labels",
"uuid": "0d04cd6b-de35-4077-83be-7b1b8a2b056b",
"labels": [
{
"uuid": "a8a6d847-0785-4f97-a8f8-3af98ed111a0",
"name": "Interesting"
}
]
},
{
"type": "add_contact_groups",
"uuid": "22cb0ec6-c915-4a9f-9256-bcab549dabe0",
"groups": [
{
"uuid": "7faadc84-73f6-49c4-812a-d49ed1c8c1ce",
"name": "Survey Audience"
}
]
}
],
"exits": [
{
"uuid": "c8b7ac23-9d47-45b8-aa34-49297de44c84"
}
]
}
]
},
{
"type": "add_contact_groups",
"uuid": "22cb0ec6-c915-4a9f-9256-bcab549dabe0",
"groups": [
{
"uuid": "7faadc84-73f6-49c4-812a-d49ed1c8c1ce",
"name": "Survey Audience"
],
"_ui": {
"nodes": {
"54393466-b5a3-4cba-a032-920b62a377bb": {
"position": {
"left": 0,
"top": 0
},
"type": "execute_actions"
}
}
]
}
],
"exits": [
{
"uuid": "c8b7ac23-9d47-45b8-aa34-49297de44c84"
}
]
}
],
"_ui": {
"nodes": {
"54393466-b5a3-4cba-a032-920b62a377bb": {
"position": {
"left": 0,
"top": 0
},
"type": "execute_actions"
}
}
},
"_dependencies": {
"groups": [
{
"uuid": "7faadc84-73f6-49c4-812a-d49ed1c8c1ce",
"name": "Survey Audience"
}
],
"labels": [
{
"uuid": "a8a6d847-0785-4f97-a8f8-3af98ed111a0",
"name": "Interesting"
}
]
},
"_results": [],
"_waiting_exits": []
},
{
"entry": "ab20858a-5fcd-492a-9a9d-208d6d4d9593",
"action_sets": [
{
"uuid": "ab20858a-5fcd-492a-9a9d-208d6d4d9593",
"x": 100,
"y": 0,
"destination": "67c3e969-fe81-43cd-9f9d-059935874379",
"actions": [
{
"type": "reply",
"uuid": "185c454f-0617-45eb-bbf2-59d1bb8fb500",
"msg": {
"eng": "Welcome to the parent flow"
},
"media": {},
"quick_replies": [],
"send_all": false
}
],
"exit_uuid": "4671b83f-8a1a-450c-8b8d-31dffc461d41"
}
],
"rule_sets": [
{
"uuid": "67c3e969-fe81-43cd-9f9d-059935874379",
"x": 275,
"y": 95,
"label": "Subflow",
"rules": [
{
"uuid": "0fea6668-f1c5-4a70-a99b-290d55f15633",
"category": {
"eng": "Completed"
},
"destination": null,
"destination_type": null,
"test": {
"type": "subflow",
"exit_type": "completed"
},
"label": null
"_dependencies": {
"groups": [
{
"uuid": "7faadc84-73f6-49c4-812a-d49ed1c8c1ce",
"name": "Survey Audience"
}
],
"labels": [
{
"uuid": "a8a6d847-0785-4f97-a8f8-3af98ed111a0",
"name": "Interesting"
}
]
},
{
"uuid": "e7337d15-93e2-46ce-ae51-8cc96c9f5387",
"category": {
"eng": "Expired"
},
"destination": null,
"destination_type": null,
"test": {
"type": "subflow",
"exit_type": "expired"
},
"label": null
}
],
"finished_key": null,
"ruleset_type": "subflow",
"response_type": "",
"operand": "@step.value",
"config": {
"flow": {
"name": "New Child",
"uuid": "b4af4237-3a0d-4ee2-9ef3-01658c9215e4"
"_results": []
},
{
"entry": "ab20858a-5fcd-492a-9a9d-208d6d4d9593",
"action_sets": [
{
"uuid": "ab20858a-5fcd-492a-9a9d-208d6d4d9593",
"x": 100,
"y": 0,
"destination": "67c3e969-fe81-43cd-9f9d-059935874379",
"actions": [
{
"type": "reply",
"uuid": "185c454f-0617-45eb-bbf2-59d1bb8fb500",
"msg": {
"eng": "Welcome to the parent flow"
},
"media": {},
"quick_replies": [],
"send_all": false
}
],
"exit_uuid": "4671b83f-8a1a-450c-8b8d-31dffc461d41"
}
],
"rule_sets": [
{
"uuid": "67c3e969-fe81-43cd-9f9d-059935874379",
"x": 275,
"y": 95,
"label": "Subflow",
"rules": [
{
"uuid": "0fea6668-f1c5-4a70-a99b-290d55f15633",
"category": {
"eng": "Completed"
},
"destination": null,
"destination_type": null,
"test": {
"type": "subflow",
"exit_type": "completed"
},
"label": null
},
{
"uuid": "e7337d15-93e2-46ce-ae51-8cc96c9f5387",
"category": {
"eng": "Expired"
},
"destination": null,
"destination_type": null,
"test": {
"type": "subflow",
"exit_type": "expired"
},
"label": null
}
],
"finished_key": null,
"ruleset_type": "subflow",
"response_type": "",
"operand": "@step.value",
"config": {
"flow": {
"name": "New Child",
"uuid": "b4af4237-3a0d-4ee2-9ef3-01658c9215e4"
}
}
}
],
"base_language": "eng",
"flow_type": "M",
"version": "11.12",
"metadata": {
"uuid": "70212996-6bea-4229-bbd3-55e5cd607049",
"name": "Legacy Parent",
"saved_on": "2019-05-30T20:11:49.587074Z",
"revision": 5,
"expires": 10080
}
}
}
],
"base_language": "eng",
"flow_type": "M",
"version": "11.12",
"metadata": {
"uuid": "70212996-6bea-4229-bbd3-55e5cd607049",
"name": "Legacy Parent",
"saved_on": "2019-05-30T20:11:49.587074Z",
"revision": 5,
"expires": 10080
}
}
],
"campaigns": [],
"triggers": []
],
"campaigns": [],
"triggers": []
}
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"dependencies": {
"@nyaruka/flow-editor": "1.37.0",
"@nyaruka/flow-editor": "1.37.1",
"@nyaruka/temba-components": "0.113.0",
"codemirror": "5.18.2",
"colorette": "1.2.2",
Expand Down
3 changes: 0 additions & 3 deletions temba/flows/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,12 @@ class Flow(LegacyUUIDMixin, TembaModel, DependencyMixin):
# items in metadata
METADATA_RESULTS = "results"
METADATA_DEPENDENCIES = "dependencies"
METADATA_WAITING_EXIT_UUIDS = "waiting_exit_uuids"
METADATA_PARENT_REFS = "parent_refs"
METADATA_IVR_RETRY = "ivr_retry"

# items in the response from mailroom flow inspection
INSPECT_RESULTS = "results"
INSPECT_DEPENDENCIES = "dependencies"
INSPECT_WAITING_EXITS = "waiting_exits"
INSPECT_PARENT_REFS = "parent_refs"
INSPECT_ISSUES = "issues"

Expand Down Expand Up @@ -696,7 +694,6 @@ def get_metadata(cls, flow_info) -> dict:
return {
Flow.METADATA_RESULTS: flow_info[Flow.INSPECT_RESULTS],
Flow.METADATA_DEPENDENCIES: flow_info[Flow.INSPECT_DEPENDENCIES],
Flow.METADATA_WAITING_EXIT_UUIDS: flow_info[Flow.INSPECT_WAITING_EXITS],
Flow.METADATA_PARENT_REFS: flow_info[Flow.INSPECT_PARENT_REFS],
}

Expand Down
5 changes: 0 additions & 5 deletions temba/flows/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,6 @@ def test_flow_metadata(self):
},
],
)
self.assertEqual(len(flow.metadata["waiting_exit_uuids"]), 11)
self.assertEqual(len(flow.metadata["parent_refs"]), 0)

def test_group_send(self):
Expand Down Expand Up @@ -2480,10 +2479,6 @@ def test_engagement(self, mock_now):
response.json(),
)

# simulate having some very recent data
flow1.metadata["waiting_exit_uuids"] = ["326354b3-1086-4add-8b0e-abf4a9a6aef3"]
flow1.save(update_fields=("metadata",))

def engagement(flow, when, count):
flow.counts.create(scope=f"msgsin:hour:{when.hour}", count=count)
flow.counts.create(scope=f"msgsin:dow:{when.isoweekday()}", count=count)
Expand Down
3 changes: 1 addition & 2 deletions temba/tests/mailroom.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,12 @@ def contact_export_preview(self, total: int):
def contact_urns(self, urns: dict):
self._contact_urns.append(urns)

def flow_inspect(self, *, dependencies=(), issues=(), results=(), waiting_exits=(), parent_refs=()):
def flow_inspect(self, *, dependencies=(), issues=(), results=(), parent_refs=()):
self._flow_inspect.append(
{
"dependencies": dependencies,
"issues": issues,
"results": results,
"waiting_exits": waiting_exits,
"parent_refs": parent_refs,
}
)
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"

"@nyaruka/[email protected].0":
version "1.37.0"
resolved "https://registry.yarnpkg.com/@nyaruka/flow-editor/-/flow-editor-1.37.0.tgz#96c2573b47fdbdfa9a907af184899adaccd31a0c"
integrity sha512-/giIpuVSV/4OHyXCUbYZKuNe9MFryvo+4qoZ70UTDrymxLgEIO151pugkBkV45bKfwv2u1Jjyyk7N/PFhHAoyA==
"@nyaruka/[email protected].1":
version "1.37.1"
resolved "https://registry.yarnpkg.com/@nyaruka/flow-editor/-/flow-editor-1.37.1.tgz#cea0d853c5a83540254a694329cf896445ddbbb7"
integrity sha512-aaxish/VL+sGv5XMU8kHAxgccVPUCrgNqaDBMmmvVsSH9RdDjUFar0ZuOfLkNma30JvdcB8KkH8VSx1GXeFm4g==
dependencies:
"@nyaruka/temba-components" "0.101.0"
react "^16.8.6"
Expand Down

0 comments on commit 3c2df86

Please sign in to comment.