From 0229adbb71ffb46d7e88c61092da241b465d4629 Mon Sep 17 00:00:00 2001 From: EsmeeIDEMS Date: Sat, 14 Dec 2024 16:22:37 +0100 Subject: [PATCH] content: 1.3.9 --- app_data/sheets/contents.json | 31 +- .../comp_radio_button_category_data.json | 8 +- .../component_demo/comp_task_card.json | 35 +- .../feat_app_layout_custom_header.json | 34 ++ .../template/feat_app_layout_footer.json | 3 +- .../template/feat_app_layout_no_header.json | 31 ++ .../sheets/template/feat_custom_footer.json | 2 +- .../sheets/template/feat_custom_header.json | 50 +++ .../template/feat_data_actions_edit.json | 404 ++++-------------- .../template/feat_data_actions_summary.json | 108 +++-- config.ts | 2 +- reports/summary.json | 34 +- reports/summary.md | 28 +- 13 files changed, 371 insertions(+), 399 deletions(-) create mode 100644 app_data/sheets/template/feat_app_layout_custom_header.json create mode 100644 app_data/sheets/template/feat_app_layout_no_header.json create mode 100644 app_data/sheets/template/feat_custom_header.json diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json index 765d99c..a4a8ba4 100644 --- a/app_data/sheets/contents.json +++ b/app_data/sheets/contents.json @@ -3404,13 +3404,27 @@ "flow_subtype": "example_sheet_defaults", "_xlsxPath": "example_sheets/to_be_sorted/example_sheet_defaults.xlsx" }, + "feat_app_layout_custom_header": { + "flow_type": "template", + "flow_name": "feat_app_layout_custom_header", + "parameter_list": { + "app_config": { + "APP_HEADER_DEFAULTS": { + "template": "feat_custom_header", + "should_show_back_button": "() => false" + } + } + }, + "_xlsxPath": "feature_sheets/feature_app_layout.xlsx" + }, "feat_app_layout_footer": { "flow_type": "template", "flow_name": "feat_app_layout_footer", "parameter_list": { "app_config": { "APP_FOOTER_DEFAULTS": { - "templateName": "feat_custom_footer" + "templateName": "feat_custom_footer", + "background": "none" } } }, @@ -3431,6 +3445,16 @@ }, "_xlsxPath": "feature_sheets/feature_app_layout.xlsx" }, + "feat_app_layout_no_header": { + "flow_type": "template", + "flow_name": "feat_app_layout_no_header", + "parameter_list": { + "app_config": { + "APP_HEADER_DEFAULTS": {} + } + }, + "_xlsxPath": "feature_sheets/feature_app_layout.xlsx" + }, "feat_app_layout_padding": { "flow_type": "template", "flow_name": "feat_app_layout_padding", @@ -3448,6 +3472,11 @@ "flow_name": "feat_custom_footer", "_xlsxPath": "feature_sheets/feature_app_layout.xlsx" }, + "feat_custom_header": { + "flow_type": "template", + "flow_name": "feat_custom_header", + "_xlsxPath": "feature_sheets/feature_app_layout.xlsx" + }, "feat_data_actions": { "flow_type": "template", "flow_name": "feat_data_actions", diff --git a/app_data/sheets/data_list/component_demo/comp_radio_button_category_data.json b/app_data/sheets/data_list/component_demo/comp_radio_button_category_data.json index db6fb22..0a035dc 100644 --- a/app_data/sheets/data_list/component_demo/comp_radio_button_category_data.json +++ b/app_data/sheets/data_list/component_demo/comp_radio_button_category_data.json @@ -9,19 +9,21 @@ "name": "option_1", "text": "All Activities", "image": "images/icons/reader_blue.svg", - "image_checked": "images/icons/reader_blue.svg" + "image_checked": "images/icons/tick.svg" }, { "id": "option_2", "name": "option_2", "text": "Played", - "image": "images/icons/star_blue.svg" + "image": "images/icons/star_blue.svg", + "image_checked": "images/icons/tick.svg" }, { "id": "option_3", "name": "option_3", "text": "Not Played", - "image": "images/icons/school_blue.svg" + "image": "images/icons/school_blue.svg", + "image_checked": "images/icons/tick.svg" } ], "_xlsxPath": "component_sheets/component_radio_button_grid.xlsx" diff --git a/app_data/sheets/template/component_demo/comp_task_card.json b/app_data/sheets/template/component_demo/comp_task_card.json index a3e532c..946cc85 100644 --- a/app_data/sheets/template/component_demo/comp_task_card.json +++ b/app_data/sheets/template/component_demo/comp_task_card.json @@ -1872,16 +1872,24 @@ "trigger": "click", "action_id": "set_field", "args": [ - "@local.task_completed_field", - true + "@local.task_completed_field = true" ], - "_raw": "click | set_field: @local.task_completed_field: true", - "_cleaned": "click | set_field: @local.task_completed_field: true" + "_raw": "click | set_field: @local.task_completed_field = true", + "_cleaned": "click | set_field: @local.task_completed_field = true" + }, + { + "trigger": "click", + "action_id": "emit", + "args": [ + "force_reload" + ], + "_raw": "click | emit: force_reload", + "_cleaned": "click | emit: force_reload" } ], "parameter_list": { "task_id": "@local.task_id", - "completed_field": "@local.task_completed_field", + "completed_field": "FALSE", "title": "Pellentesque quis lectus pharetra, dictum orci ut, aliquet elit", "style": "button", "variant": "block-button", @@ -1894,7 +1902,7 @@ "args": { "0": [ { - "fullExpression": "@local.task_completed_field", + "fullExpression": "@local.task_completed_field = true", "matchedExpression": "@local.task_completed_field", "type": "local", "fieldName": "task_completed_field" @@ -1903,7 +1911,7 @@ }, "_raw": [ { - "fullExpression": "click | set_field: @local.task_completed_field: true", + "fullExpression": "click | set_field: @local.task_completed_field = true", "matchedExpression": "@local.task_completed_field", "type": "local", "fieldName": "task_completed_field" @@ -1911,7 +1919,7 @@ ], "_cleaned": [ { - "fullExpression": "click | set_field: @local.task_completed_field: true", + "fullExpression": "click | set_field: @local.task_completed_field = true", "matchedExpression": "@local.task_completed_field", "type": "local", "fieldName": "task_completed_field" @@ -1928,14 +1936,6 @@ "fieldName": "task_id" } ], - "completed_field": [ - { - "fullExpression": "@local.task_completed_field", - "matchedExpression": "@local.task_completed_field", - "type": "local", - "fieldName": "task_completed_field" - } - ], "image": [ { "fullExpression": "@local.card_image", @@ -1950,8 +1950,7 @@ "@local.task_completed_field": [ "action_list.0.args.0", "action_list.0._raw", - "action_list.0._cleaned", - "parameter_list.completed_field" + "action_list.0._cleaned" ], "@local.task_id": [ "parameter_list.task_id" diff --git a/app_data/sheets/template/feat_app_layout_custom_header.json b/app_data/sheets/template/feat_app_layout_custom_header.json new file mode 100644 index 0000000..957ec69 --- /dev/null +++ b/app_data/sheets/template/feat_app_layout_custom_header.json @@ -0,0 +1,34 @@ +{ + "flow_type": "template", + "flow_name": "feat_app_layout_custom_header", + "status": "released", + "parameter_list": { + "app_config": { + "APP_HEADER_DEFAULTS": { + "template": "feat_custom_header", + "should_show_back_button": "() => false" + } + } + }, + "rows": [ + { + "type": "title", + "value": "Template-level app config overrides", + "_translations": { + "value": {} + }, + "name": "title_2", + "_nested_name": "title_2" + }, + { + "type": "text", + "value": "header template: feat_custom_header", + "_translations": { + "value": {} + }, + "name": "text_3", + "_nested_name": "text_3" + } + ], + "_xlsxPath": "feature_sheets/feature_app_layout.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/feat_app_layout_footer.json b/app_data/sheets/template/feat_app_layout_footer.json index 404a837..29d5db3 100644 --- a/app_data/sheets/template/feat_app_layout_footer.json +++ b/app_data/sheets/template/feat_app_layout_footer.json @@ -5,7 +5,8 @@ "parameter_list": { "app_config": { "APP_FOOTER_DEFAULTS": { - "templateName": "feat_custom_footer" + "templateName": "feat_custom_footer", + "background": "none" } } }, diff --git a/app_data/sheets/template/feat_app_layout_no_header.json b/app_data/sheets/template/feat_app_layout_no_header.json new file mode 100644 index 0000000..b08f71d --- /dev/null +++ b/app_data/sheets/template/feat_app_layout_no_header.json @@ -0,0 +1,31 @@ +{ + "flow_type": "template", + "flow_name": "feat_app_layout_no_header", + "status": "released", + "parameter_list": { + "app_config": { + "APP_HEADER_DEFAULTS": {} + } + }, + "rows": [ + { + "type": "title", + "value": "Template-level app config overrides", + "_translations": { + "value": {} + }, + "name": "title_2", + "_nested_name": "title_2" + }, + { + "type": "text", + "value": "Do not show header", + "_translations": { + "value": {} + }, + "name": "text_3", + "_nested_name": "text_3" + } + ], + "_xlsxPath": "feature_sheets/feature_app_layout.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/feat_custom_footer.json b/app_data/sheets/template/feat_custom_footer.json index d874657..9cea46d 100644 --- a/app_data/sheets/template/feat_custom_footer.json +++ b/app_data/sheets/template/feat_custom_footer.json @@ -10,7 +10,7 @@ "value": {} }, "parameter_list": { - "style": "alternative" + "text_align": "center" }, "name": "text_2", "_nested_name": "text_2" diff --git a/app_data/sheets/template/feat_custom_header.json b/app_data/sheets/template/feat_custom_header.json new file mode 100644 index 0000000..65b6dca --- /dev/null +++ b/app_data/sheets/template/feat_custom_header.json @@ -0,0 +1,50 @@ +{ + "flow_type": "template", + "flow_name": "feat_custom_header", + "status": "released", + "rows": [ + { + "type": "display_group", + "style_list": [ + "justify-content: center" + ], + "rows": [ + { + "type": "text", + "value": "Custom Header", + "_translations": { + "value": {} + }, + "parameter_list": { + "style": "alternative" + }, + "name": "text_1", + "_nested_name": "display_group_2.text_1" + }, + { + "type": "button", + "value": "Back", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "nav", + "args": [ + "back" + ], + "_raw": "click | nav: back", + "_cleaned": "click | nav: back" + } + ], + "name": "button_2", + "_nested_name": "display_group_2.button_2" + } + ], + "name": "display_group_2", + "_nested_name": "display_group_2" + } + ], + "_xlsxPath": "feature_sheets/feature_app_layout.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/feat_data_actions_edit.json b/app_data/sheets/template/feat_data_actions_edit.json index 07d067c..84ddae5 100644 --- a/app_data/sheets/template/feat_data_actions_edit.json +++ b/app_data/sheets/template/feat_data_actions_edit.json @@ -24,127 +24,93 @@ { "type": "template", "value": "feat_data_actions_summary", - "rows": [], + "rows": [ + { + "name": "show_number", + "value": false, + "type": "set_variable", + "_nested_name": "feat_data_actions_summary.show_number" + } + ], "name": "feat_data_actions_summary", "_nested_name": "feat_data_actions_summary" }, { - "type": "set_local", - "name": "next_item_number", - "value": "@calc(Object.keys(@data.feat_data_actions_list).length + 1)", - "_translations": { - "value": {} - }, - "_nested_name": "next_item_number", - "_dynamicFields": { - "value": [ - { - "fullExpression": "@calc(Object.keys(@data.feat_data_actions_list).length + 1)", - "matchedExpression": "@data.feat_data_actions_list", - "type": "data", - "fieldName": "feat_data_actions_list" + "type": "display_group", + "rows": [ + { + "type": "text_box", + "name": "input_label", + "parameter_list": { + "placeholder": "label" }, - { - "fullExpression": "@calc(Object.keys(@data.feat_data_actions_list).length + 1)", - "matchedExpression": "@calc(Object.keys(@data.feat_data_actions_list).length + 1)", - "type": "calc", - "fieldName": "Object.keys(@data.feat_data_actions_list).length + 1" - } - ] - }, - "_dynamicDependencies": { - "@data.feat_data_actions_list": [ - "value" - ], - "@calc(Object.keys(@data.feat_data_actions_list).length + 1)": [ - "value" - ] - } - }, - { - "type": "button", - "value": "Add Data (row @local.next_item_number)", - "_translations": { - "value": {} - }, - "action_list": [ + "_nested_name": "display_group_6.input_label" + }, { - "trigger": "click", - "action_id": "add_data", - "args": [], - "_raw": "click | add_data | \n\n_list_id: feat_data_actions_list,\ncompleted:false,\nnumber: @local.next_item_number\nlabel: Task {@local.next_item_number}", - "_cleaned": "click | add_data | \n\n_list_id: feat_data_actions_list,\ncompleted:false,\nnumber: @local.next_item_number\nlabel: Task {@local.next_item_number}", - "params": { - "_list_id": "feat_data_actions_list", - "completed": false, - "number": "@local.next_item_number\nlabel" - } - } - ], - "name": "button_7", - "_nested_name": "button_7", - "_dynamicFields": { - "value": [ - { - "fullExpression": "Add Data (row @local.next_item_number)", - "matchedExpression": "@local.next_item_number", - "type": "local", - "fieldName": "next_item_number" - } - ], - "action_list": { - "0": { - "_raw": [ - { - "fullExpression": "click | add_data | \n\n_list_id: feat_data_actions_list,\ncompleted:false,\nnumber: @local.next_item_number\nlabel: Task {@local.next_item_number}", - "matchedExpression": "@local.next_item_number", - "type": "local", - "fieldName": "next_item_number" - }, - { - "fullExpression": "click | add_data | \n\n_list_id: feat_data_actions_list,\ncompleted:false,\nnumber: @local.next_item_number\nlabel: Task {@local.next_item_number}", - "matchedExpression": "@local.next_item_number", - "type": "local", - "fieldName": "next_item_number" - } - ], - "_cleaned": [ - { - "fullExpression": "click | add_data | \n\n_list_id: feat_data_actions_list,\ncompleted:false,\nnumber: @local.next_item_number\nlabel: Task {@local.next_item_number}", - "matchedExpression": "@local.next_item_number", - "type": "local", - "fieldName": "next_item_number" - }, - { - "fullExpression": "click | add_data | \n\n_list_id: feat_data_actions_list,\ncompleted:false,\nnumber: @local.next_item_number\nlabel: Task {@local.next_item_number}", - "matchedExpression": "@local.next_item_number", - "type": "local", - "fieldName": "next_item_number" + "type": "button", + "value": "Add Data", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "add_data", + "args": [], + "_raw": "click | add_data | \n\n_list_id: feat_data_actions_list,\ncompleted:false,\nlabel: @local.input_label", + "_cleaned": "click | add_data | \n\n_list_id: feat_data_actions_list,\ncompleted:false,\nlabel: @local.input_label", + "params": { + "_list_id": "feat_data_actions_list", + "completed": false, + "label": "@local.input_label" } - ], - "params": { - "number": [ - { - "fullExpression": "@local.next_item_number\nlabel", - "matchedExpression": "@local.next_item_number", - "type": "local", - "fieldName": "next_item_number" + } + ], + "name": "button_2", + "_nested_name": "display_group_6.button_2", + "_dynamicFields": { + "action_list": { + "0": { + "_raw": [ + { + "fullExpression": "click | add_data | \n\n_list_id: feat_data_actions_list,\ncompleted:false,\nlabel: @local.input_label", + "matchedExpression": "@local.input_label", + "type": "local", + "fieldName": "input_label" + } + ], + "_cleaned": [ + { + "fullExpression": "click | add_data | \n\n_list_id: feat_data_actions_list,\ncompleted:false,\nlabel: @local.input_label", + "matchedExpression": "@local.input_label", + "type": "local", + "fieldName": "input_label" + } + ], + "params": { + "label": [ + { + "fullExpression": "@local.input_label", + "matchedExpression": "@local.input_label", + "type": "local", + "fieldName": "input_label" + } + ] } - ] + } } + }, + "_dynamicDependencies": { + "@local.input_label": [ + "action_list.0._raw", + "action_list.0._cleaned", + "action_list.0.params.label" + ] } } - }, - "_dynamicDependencies": { - "@local.next_item_number": [ - "value", - "action_list.0._raw", - "action_list.0._raw", - "action_list.0._cleaned", - "action_list.0._cleaned", - "action_list.0.params.number" - ] - } + ], + "name": "display_group_6", + "_nested_name": "display_group_6" }, { "type": "button", @@ -181,10 +147,16 @@ "value": "feat_data_actions_summary", "rows": [ { - "type": "set_local", - "name": "show_delete", + "name": "show_number", + "value": false, + "type": "set_variable", + "_nested_name": "feat_data_actions_summary.show_number" + }, + { + "name": "show_remove", "value": true, - "_nested_name": "feat_data_actions_summary.show_delete" + "type": "set_variable", + "_nested_name": "feat_data_actions_summary.show_remove" } ], "name": "feat_data_actions_summary", @@ -233,212 +205,6 @@ }, "name": "text_15", "_nested_name": "text_15" - }, - { - "type": "title", - "value": "Quality Assurance", - "_translations": { - "value": {} - }, - "name": "title_16", - "_nested_name": "title_16" - }, - { - "type": "template", - "value": "feat_data_actions_summary", - "rows": [], - "name": "feat_data_actions_summary", - "_nested_name": "feat_data_actions_summary" - }, - { - "type": "text", - "value": "Test setting number from string. It should automatically be converted to a number", - "_translations": { - "value": {} - }, - "name": "text_19", - "_nested_name": "text_19" - }, - { - "type": "button", - "value": "Set number from string", - "_translations": { - "value": {} - }, - "action_list": [ - { - "trigger": "click", - "action_id": "set_data", - "args": [], - "_raw": "click | set_data | \n\n_list_id: feat_data_actions_list,\nnumber: 20", - "_cleaned": "click | set_data | \n\n_list_id: feat_data_actions_list,\nnumber: 20", - "params": { - "_list_id": "feat_data_actions_list", - "number": 20 - } - } - ], - "name": "button_20", - "_nested_name": "button_20" - }, - { - "name": "number_field", - "value": "number", - "_translations": { - "value": {} - }, - "type": "set_variable", - "_nested_name": "number_field" - }, - { - "type": "button", - "value": "Set from variable field", - "_translations": { - "value": {} - }, - "action_list": [ - { - "trigger": "click", - "action_id": "set_data", - "args": [], - "_raw": "click | set_data | \n\n_list_id: feat_data_actions_list,\n@local.number_field: 20", - "_cleaned": "click | set_data | \n\n_list_id: feat_data_actions_list,\n@local.number_field: 20", - "params": { - "_list_id": "feat_data_actions_list", - "@local.number_field": 20 - } - } - ], - "name": "button_22", - "_nested_name": "button_22", - "_dynamicFields": { - "action_list": { - "0": { - "_raw": [ - { - "fullExpression": "click | set_data | \n\n_list_id: feat_data_actions_list,\n@local.number_field: 20", - "matchedExpression": "@local.number_field", - "type": "local", - "fieldName": "number_field" - } - ], - "_cleaned": [ - { - "fullExpression": "click | set_data | \n\n_list_id: feat_data_actions_list,\n@local.number_field: 20", - "matchedExpression": "@local.number_field", - "type": "local", - "fieldName": "number_field" - } - ] - } - } - }, - "_dynamicDependencies": { - "@local.number_field": [ - "action_list.0._raw", - "action_list.0._cleaned" - ] - } - }, - { - "type": "button", - "value": "Add 1 to number", - "_translations": { - "value": {} - }, - "action_list": [ - { - "trigger": "click", - "action_id": "set_data", - "args": [], - "_raw": "click | set_data | \n\n_list_id: feat_data_actions_list,\nnumber: @item.number+1", - "_cleaned": "click | set_data | \n\n_list_id: feat_data_actions_list,\nnumber: @item.number+1", - "params": { - "_list_id": "feat_data_actions_list", - "number": "@item.number+1" - } - } - ], - "name": "button_23", - "_nested_name": "button_23", - "_dynamicFields": { - "action_list": { - "0": { - "_raw": [ - { - "fullExpression": "click | set_data | \n\n_list_id: feat_data_actions_list,\nnumber: @item.number+1", - "matchedExpression": "@item.number", - "type": "item", - "fieldName": "number" - } - ], - "_cleaned": [ - { - "fullExpression": "click | set_data | \n\n_list_id: feat_data_actions_list,\nnumber: @item.number+1", - "matchedExpression": "@item.number", - "type": "item", - "fieldName": "number" - } - ], - "params": { - "number": [ - { - "fullExpression": "@item.number+1", - "matchedExpression": "@item.number", - "type": "item", - "fieldName": "number" - } - ] - } - } - } - }, - "_dynamicDependencies": { - "@item.number": [ - "action_list.0._raw", - "action_list.0._cleaned", - "action_list.0.params.number" - ] - } - }, - { - "type": "button", - "value": "Reset to original state", - "_translations": { - "value": {} - }, - "action_list": [ - { - "trigger": "click", - "action_id": "reset_data", - "args": [], - "_raw": "click | reset_data | \n\n_list_id: feat_data_actions_list", - "_cleaned": "click | reset_data | \n\n_list_id: feat_data_actions_list", - "params": { - "_list_id": "feat_data_actions_list" - } - } - ], - "name": "button_24", - "_nested_name": "button_24" - }, - { - "type": "title", - "value": "Filtered Actions", - "_translations": { - "value": {} - }, - "name": "title_25", - "_nested_name": "title_25" - }, - { - "type": "text", - "value": "(WiP)", - "_translations": { - "value": {} - }, - "name": "text_26", - "_nested_name": "text_26" } ], "_xlsxPath": "feature_sheets/feature_data_actions.xlsx" diff --git a/app_data/sheets/template/feat_data_actions_summary.json b/app_data/sheets/template/feat_data_actions_summary.json index 52e0fcc..77be963 100644 --- a/app_data/sheets/template/feat_data_actions_summary.json +++ b/app_data/sheets/template/feat_data_actions_summary.json @@ -5,9 +5,21 @@ "rows": [ { "type": "set_local", - "name": "show_delete", + "name": "show_number", + "value": true, + "_nested_name": "show_number" + }, + { + "type": "set_local", + "name": "show_label", + "value": true, + "_nested_name": "show_label" + }, + { + "type": "set_local", + "name": "show_remove", "value": false, - "_nested_name": "show_delete" + "_nested_name": "show_remove" }, { "type": "data_items", @@ -24,7 +36,7 @@ }, "condition": "@item.completed", "name": "text_1", - "_nested_name": "data_items_3.display_group_1.text_1", + "_nested_name": "data_items_5.display_group_1.text_1", "_dynamicFields": { "condition": [ { @@ -49,7 +61,7 @@ }, "condition": "!@item.completed", "name": "text_2", - "_nested_name": "data_items_3.display_group_1.text_2", + "_nested_name": "data_items_5.display_group_1.text_2", "_dynamicFields": { "condition": [ { @@ -73,7 +85,7 @@ "value": {} }, "name": "text_3", - "_nested_name": "data_items_3.display_group_1.text_3", + "_nested_name": "data_items_5.display_group_1.text_3", "_dynamicFields": { "value": [ { @@ -96,8 +108,9 @@ "_translations": { "value": {} }, + "condition": "@local.show_number", "name": "text_4", - "_nested_name": "data_items_3.display_group_1.text_4", + "_nested_name": "data_items_5.display_group_1.text_4", "_dynamicFields": { "value": [ { @@ -106,64 +119,111 @@ "type": "item", "fieldName": "number" } + ], + "condition": [ + { + "fullExpression": "@local.show_number", + "matchedExpression": "@local.show_number", + "type": "local", + "fieldName": "show_number" + } ] }, "_dynamicDependencies": { "@item.number": [ "value" + ], + "@local.show_number": [ + "condition" + ] + } + }, + { + "type": "text", + "value": "@item.label", + "_translations": { + "value": {} + }, + "condition": "@local.show_label", + "name": "text_5", + "_nested_name": "data_items_5.display_group_1.text_5", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@item.label", + "matchedExpression": "@item.label", + "type": "item", + "fieldName": "label" + } + ], + "condition": [ + { + "fullExpression": "@local.show_label", + "matchedExpression": "@local.show_label", + "type": "local", + "fieldName": "show_label" + } + ] + }, + "_dynamicDependencies": { + "@item.label": [ + "value" + ], + "@local.show_label": [ + "condition" ] } }, { "type": "button", - "value": "Delete", + "value": "Remove", "_translations": { "value": {} }, "action_list": [ { "trigger": "click", - "action_id": "delete_item", + "action_id": "remove_item", "args": [], - "_raw": "click | delete_item", - "_cleaned": "click | delete_item" + "_raw": "click | remove_item", + "_cleaned": "click | remove_item" } ], - "condition": "@local.show_delete && @item._user_generated", - "name": "button_5", - "_nested_name": "data_items_3.display_group_1.button_5", + "condition": "@local.show_remove && @item._user_created", + "name": "button_6", + "_nested_name": "data_items_5.display_group_1.button_6", "_dynamicFields": { "condition": [ { - "fullExpression": "@local.show_delete && @item._user_generated", - "matchedExpression": "@local.show_delete", + "fullExpression": "@local.show_remove && @item._user_created", + "matchedExpression": "@local.show_remove", "type": "local", - "fieldName": "show_delete" + "fieldName": "show_remove" }, { - "fullExpression": "@local.show_delete && @item._user_generated", - "matchedExpression": "@item._user_generated", + "fullExpression": "@local.show_remove && @item._user_created", + "matchedExpression": "@item._user_created", "type": "item", - "fieldName": "_user_generated" + "fieldName": "_user_created" } ] }, "_dynamicDependencies": { - "@local.show_delete": [ + "@local.show_remove": [ "condition" ], - "@item._user_generated": [ + "@item._user_created": [ "condition" ] } } ], "name": "display_group_1", - "_nested_name": "data_items_3.display_group_1" + "_nested_name": "data_items_5.display_group_1" } ], - "name": "data_items_3", - "_nested_name": "data_items_3", + "name": "data_items_5", + "_nested_name": "data_items_5", "_dynamicFields": { "value": [ { diff --git a/config.ts b/config.ts index b9d4c52..00ea91e 100644 --- a/config.ts +++ b/config.ts @@ -14,7 +14,7 @@ config.web.favicon_asset = "images/icons/favicon.svg"; config.git = { content_repo: "https://github.com/IDEMSInternational/app-debug-content.git", - content_tag_latest: "1.3.8", + content_tag_latest: "1.3.9", }; config.app_config.ASSET_PACKS = { diff --git a/reports/summary.json b/reports/summary.json index ed2358f..8c8ad1e 100644 --- a/reports/summary.json +++ b/reports/summary.json @@ -31,7 +31,7 @@ }, { "type": "button", - "count": 309 + "count": 306 }, { "type": "calendar", @@ -71,7 +71,7 @@ }, { "type": "display_group", - "count": 191 + "count": 193 }, { "type": "drawer", @@ -203,7 +203,7 @@ }, { "type": "set_variable", - "count": 738 + "count": 740 }, { "type": "simple_checkbox", @@ -231,11 +231,11 @@ }, { "type": "template", - "count": 131 + "count": 130 }, { "type": "text", - "count": 950 + "count": 952 }, { "type": "text_area", @@ -243,7 +243,7 @@ }, { "type": "text_box", - "count": 51 + "count": 52 }, { "type": "text_bubble", @@ -305,10 +305,6 @@ "type": "auth", "count": 2 }, - { - "type": "delete_item", - "count": 1 - }, { "type": "download_assets", "count": 1 @@ -323,7 +319,7 @@ }, { "type": "emit: force_reload", - "count": 28 + "count": 29 }, { "type": "emit: force_reprocess", @@ -375,7 +371,7 @@ }, { "type": "nav", - "count": 4 + "count": 5 }, { "type": "nav_stack", @@ -393,13 +389,17 @@ "type": "process_template", "count": 2 }, + { + "type": "remove_item", + "count": 1 + }, { "type": "reset_app", "count": 1 }, { "type": "reset_data", - "count": 5 + "count": 4 }, { "type": "save_to_device", @@ -411,7 +411,7 @@ }, { "type": "set_data", - "count": 14 + "count": 11 }, { "type": "set_field", @@ -793,7 +793,7 @@ }, { "path": "images/icons/reader_blue.svg", - "count": 8, + "count": 7, "size_kb": 1.4 }, { @@ -828,7 +828,7 @@ }, { "path": "images/icons/tick.svg", - "count": 10, + "count": 13, "size_kb": 0.3 }, { @@ -1028,7 +1028,7 @@ { "type": "template", "subtype": null, - "total": 89 + "total": 92 }, { "type": "template", diff --git a/reports/summary.md b/reports/summary.md index 21ee1fe..2c4029b 100644 --- a/reports/summary.md +++ b/reports/summary.md @@ -10,7 +10,7 @@ | animated_section | 9 | | animated_slides | 1 | | audio | 13 | -| button | 309 | +| button | 306 | | calendar | 1 | | carousel | 9 | | colour_palette | 1 | @@ -20,7 +20,7 @@ | debug_toggle | 1 | | demo_basic | 3 | | display_grid | 3 | -| display_group | 191 | +| display_group | 193 | | drawer | 1 | | form | 9 | | html | 4 | @@ -53,17 +53,17 @@ | set_default | 1 | | set_field | 28 | | set_local | 5 | -| set_variable | 738 | +| set_variable | 740 | | simple_checkbox | 41 | | slider | 32 | | square_button | 8 | | subtitle | 62 | | task_card | 25 | | task_progress_bar | 6 | -| template | 131 | -| text | 950 | +| template | 130 | +| text | 952 | | text_area | 13 | -| text_box | 51 | +| text_box | 52 | | text_bubble | 10 | | tile_component | 57 | | timer | 21 | @@ -85,11 +85,10 @@ | app_update | 3 | | asset_pack | 2 | | auth | 2 | -| delete_item | 1 | | download_assets | 1 | | emit: @local.child_local_variable | 1 | | emit: completed | 34 | -| emit: force_reload | 28 | +| emit: force_reload | 29 | | emit: force_reprocess | 28 | | emit: force_restart | 2 | | emit: server_sync | 7 | @@ -102,16 +101,17 @@ | go_to | 75 | | go_to_url | 5 | | invalid_action | 1 | -| nav | 4 | +| nav | 5 | | nav_stack | 10 | | open_external | 2 | | pop_up | 39 | | process_template | 2 | +| remove_item | 1 | | reset_app | 1 | -| reset_data | 5 | +| reset_data | 4 | | save_to_device | 2 | | screen_orientation | 3 | -| set_data | 14 | +| set_data | 11 | | set_field | 112 | | set_item | 24 | | set_items | 2 | @@ -223,14 +223,14 @@ Assets that are used within sheets and also can be found in the synced asset dat | images/icons/locked.png | 0.9 | 3 | | images/icons/notification_bell.png | 0.9 | 1 | | images/icons/question_mark.svg | 0.8 | 2 | -| images/icons/reader_blue.svg | 1.4 | 8 | +| images/icons/reader_blue.svg | 1.4 | 7 | | images/icons/school_blue.svg | 1.6 | 10 | | images/icons/settings.svg | 2.4 | 1 | | images/icons/settings_active.svg | 2.4 | 1 | | images/icons/star_blue.svg | 1.3 | 2 | | images/icons/star_white.svg | 1 | 21 | | images/icons/star_yellow.svg | 0.6 | 1 | -| images/icons/tick.svg | 0.3 | 10 | +| images/icons/tick.svg | 0.3 | 13 | | images/icons/tick_white.svg | 0.3 | 21 | | images/modal_bg.svg | 37.3 | 1 | | images/module-1.png | 28.2 | 5 | @@ -276,7 +276,7 @@ Assets that are used within sheets and also can be found in the synced asset dat | generator | example_generator | 2 | | global | | 2 | | global | debug | 10 | -| template | | 89 | +| template | | 92 | | template | component_demo | 55 | | template | debug | 260 | | template | example_generator | 2 |