diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json index 0d5f8c1..2483c84 100644 --- a/app_data/sheets/contents.json +++ b/app_data/sheets/contents.json @@ -261,6 +261,12 @@ "flow_subtype": "component_demo", "_xlsxPath": "component_sheets/component_carousel.xlsx" }, + "comp_combo_box_items": { + "flow_type": "data_list", + "flow_name": "comp_combo_box_items", + "flow_subtype": "component_demo", + "_xlsxPath": "component_sheets/component_combo_box.xlsx" + }, "comp_data_items_list": { "flow_type": "data_list", "flow_name": "comp_data_items_list", @@ -486,17 +492,6 @@ "flow_name": "debug_lang_sort_data_list", "_xlsxPath": "debug_sheets/debug_translation_sort.xlsx" }, - "debug_launch_actions": { - "flow_type": "data_list", - "flow_subtype": "debug_lifecycle_actions", - "flow_name": "debug_launch_actions", - "_xlsxPath": "debug_sheets/debug_launch_actions.xlsx", - "_metadata": { - "priority": { - "type": "number" - } - } - }, "debug_nav_bar_data": { "flow_type": "data_list", "flow_name": "debug_nav_bar_data", @@ -882,6 +877,17 @@ "data_list_name": "goal", "_xlsxPath": "demo_sheets/article_data.xlsx" }, + "debug_launch_actions": { + "flow_type": "data_list", + "flow_subtype": "lifecycle_actions", + "flow_name": "debug_launch_actions", + "_xlsxPath": "debug_sheets/debug_launch_actions.xlsx", + "_metadata": { + "priority": { + "type": "number" + } + } + }, "task_cards_data": { "flow_type": "data_list", "flow_name": "task_cards_data", @@ -1424,6 +1430,14 @@ "flow_type": "template", "flow_name": "comp_plh_bottom_nav", "flow_subtype": "component_demo", + "parameter_list": { + "app_config": { + "APP_FOOTER_DEFAULTS": { + "templateName": "comp_plh_bottom_nav", + "background": "none" + } + } + }, "_xlsxPath": "component_sheets/component_plh_bottom_nav.xlsx" }, "comp_plh_completion_modal": { @@ -2757,6 +2771,12 @@ "flow_subtype": "debug", "_xlsxPath": "example_sheets/to_be_sorted/example_changed_action.xlsx" }, + "example_completion": { + "flow_type": "template", + "flow_name": "example_completion", + "flow_subtype": "debug", + "_xlsxPath": "example_sheets/to_be_sorted/example_actions.xlsx" + }, "example_condition_bottom": { "flow_type": "template", "flow_name": "example_condition_bottom", @@ -3413,7 +3433,9 @@ "app_config": { "APP_HEADER_DEFAULTS": { "template": "feat_custom_header", - "should_show_back_button": false + "back_button": { + "hidden": true + } } } }, @@ -3440,7 +3462,7 @@ "parameter_list": { "app_config": { "APP_HEADER_DEFAULTS": { - "show": false + "hidden": true } } }, diff --git a/app_data/sheets/data_list/component_demo/comp_combo_box_items.json b/app_data/sheets/data_list/component_demo/comp_combo_box_items.json new file mode 100644 index 0000000..066bca0 --- /dev/null +++ b/app_data/sheets/data_list/component_demo/comp_combo_box_items.json @@ -0,0 +1,24 @@ +{ + "flow_type": "data_list", + "flow_name": "comp_combo_box_items", + "status": "released", + "flow_subtype": "component_demo", + "rows": [ + { + "id": "id_1", + "name": "name_1", + "text": "Item 1" + }, + { + "id": "id_2", + "name": "name_2", + "text": "Item 2" + }, + { + "id": "id_3", + "name": "name_3", + "text": "Item 3" + } + ], + "_xlsxPath": "component_sheets/component_combo_box.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/data_list/debug_lifecycle_actions/debug_launch_actions.json b/app_data/sheets/data_list/debug_lifecycle_actions/debug_launch_actions.json deleted file mode 100644 index 86fb6b0..0000000 --- a/app_data/sheets/data_list/debug_lifecycle_actions/debug_launch_actions.json +++ /dev/null @@ -1,269 +0,0 @@ -{ - "flow_type": "data_list", - "flow_subtype": "debug_lifecycle_actions", - "flow_name": "debug_launch_actions", - "status": "released", - "rows": [ - { - "lifecycle_event": "app_start", - "id": "app_start_update_complete", - "priority": 1, - "condition_list": [ - "@fields._app_update_downloaded" - ], - "action_list": [ - { - "trigger": "click", - "action_id": "app_update", - "args": [ - "complete" - ], - "_raw": "app_update: complete", - "_cleaned": "click | app_update: complete" - } - ] - }, - { - "lifecycle_event": "app_start", - "id": "app_start_set_skin", - "priority": 2, - "condition_list": [ - "@fields._app_skin != \"modular\" && @fields.user_mode" - ], - "action_list": [ - { - "trigger": "click", - "action_id": "emit", - "args": [ - "set_skin", - "modular" - ], - "_raw": "emit: set_skin: modular", - "_cleaned": "click | emit: set_skin: modular" - } - ] - }, - { - "lifecycle_event": "app_start", - "id": "app_start_set_theme", - "priority": 3, - "condition_list": [ - "@fields._app_theme != \"professional\" && @fields.user_mode" - ], - "action_list": [ - { - "trigger": "click", - "action_id": "emit", - "args": [ - "set_theme", - "professional" - ], - "_raw": "emit: set_theme: professional", - "_cleaned": "click | emit: set_theme: professional" - } - ] - }, - { - "lifecycle_event": "app_start", - "id": "app_start_splash_screens", - "priority": 4, - "condition_list": [ - "!@fields.splash_screens_viewed && @fields.user_mode" - ], - "action_list": [ - { - "trigger": "click", - "action_id": "pop_up", - "args": [ - "splash_screens" - ], - "_raw": "pop_up: splash_screens | fullscreen: true, showCloseButton: false", - "_cleaned": "click | pop_up: splash_screens | fullscreen: true, showCloseButton: false", - "params": { - "fullscreen": true, - "showCloseButton": false - } - }, - { - "trigger": "click", - "action_id": "set_field", - "args": [ - "splash_screens_viewed", - true - ], - "_raw": "set_field: splash_screens_viewed: true", - "_cleaned": "click | set_field: splash_screens_viewed: true" - } - ] - }, - { - "lifecycle_event": "app_start", - "id": "app_start_language_select", - "priority": 5, - "condition_list": [ - "!@fields.language_selected && @fields.user_mode" - ], - "action_list": [ - { - "trigger": "click", - "action_id": "pop_up", - "args": [ - "language_select" - ], - "_raw": "pop_up: language_select | fullscreen: true, showCloseButton: false", - "_cleaned": "click | pop_up: language_select | fullscreen: true, showCloseButton: false", - "params": { - "fullscreen": true, - "showCloseButton": false - } - }, - { - "trigger": "click", - "action_id": "set_field", - "args": [ - "language_selected", - true - ], - "_raw": "set_field: language_selected: true", - "_cleaned": "click | set_field: language_selected: true" - } - ] - }, - { - "lifecycle_event": "app_start", - "id": "app_start_accept_terms", - "priority": 6, - "condition_list": [ - "!@fields.terms_v20230301_accepted && @fields.user_mode" - ], - "action_list": [ - { - "trigger": "click", - "action_id": "pop_up", - "args": [ - "accept_terms" - ], - "_raw": "pop_up: accept_terms | fullscreen: true, showCloseButton: false", - "_cleaned": "click | pop_up: accept_terms | fullscreen: true, showCloseButton: false", - "params": { - "fullscreen": true, - "showCloseButton": false - } - } - ] - }, - { - "lifecycle_event": "app_start", - "id": "app_start_user_info", - "priority": 7, - "condition_list": [ - "!@fields.user_info_submitted && @fields.user_mode" - ], - "action_list": [ - { - "trigger": "click", - "action_id": "pop_up", - "args": [ - "user_info" - ], - "_raw": "pop_up: user_info | fullscreen: true, showCloseButton: false", - "_cleaned": "click | pop_up: user_info | fullscreen: true, showCloseButton: false", - "params": { - "fullscreen": true, - "showCloseButton": false - } - }, - { - "trigger": "click", - "action_id": "set_field", - "args": [ - "user_info_submitted", - true - ], - "_raw": "set_field: user_info_submitted: true", - "_cleaned": "click | set_field: user_info_submitted: true" - } - ] - }, - { - "lifecycle_event": "app_start", - "id": "app_start_home_screen_tour", - "priority": 8, - "condition_list": [ - "!@fields.home_screen_tour_viewed && @fields._app_skin ==\"weekly_workshop\" && @fields.user_mode" - ], - "action_list": [ - { - "trigger": "click", - "action_id": "start_tour", - "args": [ - "home_screen_tour_intro" - ], - "_raw": "start_tour: home_screen_tour_intro", - "_cleaned": "click | start_tour: home_screen_tour_intro" - }, - { - "trigger": "click", - "action_id": "set_field", - "args": [ - "home_screen_tour_viewed", - true - ], - "_raw": "set_field: home_screen_tour_viewed: true", - "_cleaned": "click | set_field: home_screen_tour_viewed: true" - } - ] - }, - { - "lifecycle_event": "app_start", - "id": "app_start_home_screen_tour", - "priority": 9, - "condition_list": [ - "!@fields.home_screen_modular_tour_viewed && @fields._app_skin ==\"modular\" && @fields.user_mode" - ], - "action_list": [ - { - "trigger": "click", - "action_id": "start_tour", - "args": [ - "home_screen_modular_tour_intro" - ], - "_raw": "start_tour: home_screen_modular_tour_intro", - "_cleaned": "click | start_tour: home_screen_modular_tour_intro" - }, - { - "trigger": "click", - "action_id": "set_field", - "args": [ - "home_screen_modular_tour_viewed", - true - ], - "_raw": "set_field: home_screen_modular_tour_viewed: true", - "_cleaned": "click | set_field: home_screen_modular_tour_viewed: true" - } - ] - }, - { - "lifecycle_event": "app_start", - "id": "app_start_update_prompt", - "priority": 10, - "action_list": [ - { - "trigger": "click", - "action_id": "app_update", - "args": [ - "prompt" - ], - "_raw": "app_update: prompt", - "_cleaned": "click | app_update: prompt" - } - ] - } - ], - "_xlsxPath": "debug_sheets/debug_launch_actions.xlsx", - "_metadata": { - "priority": { - "type": "number" - } - } -} \ No newline at end of file diff --git a/app_data/sheets/data_list/lifecycle_actions/debug_launch_actions.json b/app_data/sheets/data_list/lifecycle_actions/debug_launch_actions.json new file mode 100644 index 0000000..b599167 --- /dev/null +++ b/app_data/sheets/data_list/lifecycle_actions/debug_launch_actions.json @@ -0,0 +1,82 @@ +{ + "flow_type": "data_list", + "flow_subtype": "lifecycle_actions", + "flow_name": "debug_launch_actions", + "status": "released", + "rows": [ + { + "lifecycle_event": "app_start", + "id": "app_start_update_complete", + "priority": 1, + "condition_list": [ + "@fields._app_update_downloaded" + ], + "action_list": [ + { + "trigger": "click", + "action_id": "app_update", + "args": [ + "complete" + ], + "_raw": "app_update: complete", + "_cleaned": "click | app_update: complete" + } + ] + }, + { + "lifecycle_event": "app_start", + "id": "app_start_language_select", + "priority": 2, + "condition_list": [ + "!@fields.language_selected" + ], + "action_list": [ + { + "trigger": "click", + "action_id": "pop_up", + "args": [ + "feature_rtl_language" + ], + "_raw": "pop_up: feature_rtl_language | fullscreen: true, showCloseButton: true", + "_cleaned": "click | pop_up: feature_rtl_language | fullscreen: true, showCloseButton: true", + "params": { + "fullscreen": true, + "showCloseButton": true + } + }, + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "language_selected", + true + ], + "_raw": "set_field: language_selected: true", + "_cleaned": "click | set_field: language_selected: true" + } + ] + }, + { + "lifecycle_event": "app_start", + "id": "app_start_update_prompt", + "priority": 3, + "action_list": [ + { + "trigger": "click", + "action_id": "app_update", + "args": [ + "prompt" + ], + "_raw": "app_update: prompt", + "_cleaned": "click | app_update: prompt" + } + ] + } + ], + "_xlsxPath": "debug_sheets/debug_launch_actions.xlsx", + "_metadata": { + "priority": { + "type": "number" + } + } +} \ No newline at end of file diff --git a/app_data/sheets/template/component_demo/comp_button.json b/app_data/sheets/template/component_demo/comp_button.json index b08d336..f201641 100644 --- a/app_data/sheets/template/component_demo/comp_button.json +++ b/app_data/sheets/template/component_demo/comp_button.json @@ -92,24 +92,16 @@ { "type": "button", "value": "Icon and Arrow", + "_translations": { + "value": {} + }, "parameter_list": { "variant": "card", "icon": "images/icons/globe_blue.svg", + "icon_secondary_asset": "images/icons/leaf_blue.svg", "style": "no-background", - "icon_position": "left", "text_align": "left" }, - "rows": [ - { - "type": "round_button", - "name": "full_button", - "parameter_list": { - "style": "no-background", - "icon_src": "images/icons/leaf_blue.svg" - }, - "_nested_name": "button_9.full_button" - } - ], "name": "button_9", "_nested_name": "button_9" }, @@ -119,8 +111,8 @@ "_translations": { "value": {} }, - "name": "title_11", - "_nested_name": "title_11" + "name": "title_10", + "_nested_name": "title_10" }, { "type": "button", @@ -133,11 +125,11 @@ { "type": "toggle_bar", "name": "toggle_bar_2", - "_nested_name": "button_12.toggle_bar_2" + "_nested_name": "button_11.toggle_bar_2" } ], - "name": "button_12", - "_nested_name": "button_12" + "name": "button_11", + "_nested_name": "button_11" }, { "type": "button", @@ -182,7 +174,7 @@ "icon_true_asset": "images/icons/heart_blue.svg", "icon_false_asset": "images/icons/heart_outline.svg" }, - "_nested_name": "button_14.toggle_bar_3", + "_nested_name": "button_13.toggle_bar_3", "_dynamicFields": { "value": [ { @@ -224,8 +216,8 @@ } } ], - "name": "button_14", - "_nested_name": "button_14" + "name": "button_13", + "_nested_name": "button_13" }, { "type": "title", diff --git a/app_data/sheets/template/component_demo/comp_combo_box.json b/app_data/sheets/template/component_demo/comp_combo_box.json index 6090ec0..1f49206 100644 --- a/app_data/sheets/template/component_demo/comp_combo_box.json +++ b/app_data/sheets/template/component_demo/comp_combo_box.json @@ -397,6 +397,55 @@ "value" ] } + }, + { + "type": "title", + "value": "Data_list options", + "_translations": { + "value": {} + }, + "name": "title_22", + "_nested_name": "title_22" + }, + { + "type": "combo_box", + "parameter_list": { + "placeholder": "Select from data_list" + }, + "rows": [ + { + "type": "data_items", + "value": "comp_combo_box_items", + "rows": [], + "name": "data_items_1", + "_nested_name": "combo_box_23.data_items_1" + } + ], + "name": "combo_box_23", + "_nested_name": "combo_box_23" + }, + { + "type": "button", + "name": "button_add", + "value": "Add data", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "add_data", + "args": [], + "_raw": "click | add_data | \n\n_list_id: comp_combo_box_items,\nname: added_data_name,\ntext: Added data", + "_cleaned": "click | add_data | \n\n_list_id: comp_combo_box_items,\nname: added_data_name,\ntext: Added data", + "params": { + "_list_id": "comp_combo_box_items", + "name": "added_data_name", + "text": "Added data" + } + } + ], + "_nested_name": "button_add" } ], "_xlsxPath": "component_sheets/component_combo_box.xlsx" diff --git a/app_data/sheets/template/component_demo/comp_display_grid.json b/app_data/sheets/template/component_demo/comp_display_grid.json index 983ad48..98bc484 100644 --- a/app_data/sheets/template/component_demo/comp_display_grid.json +++ b/app_data/sheets/template/component_demo/comp_display_grid.json @@ -706,6 +706,49 @@ ] } }, + { + "type": "button", + "name": "button_override", + "value": "Override text", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_data", + "args": [], + "_raw": "click | set_data | \n\n_list_id: comp_display_grid_data,\ntext: Text override", + "_cleaned": "click | set_data | \n\n_list_id: comp_display_grid_data,\ntext: Text override", + "params": { + "_list_id": "comp_display_grid_data", + "text": "Text override" + } + } + ], + "_nested_name": "button_override" + }, + { + "type": "button", + "name": "button_reset", + "value": "Reset to original state", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "reset_data", + "args": [], + "_raw": "click | reset_data | \n\n_list_id: comp_display_grid_data", + "_cleaned": "click | reset_data | \n\n_list_id: comp_display_grid_data", + "params": { + "_list_id": "comp_display_grid_data" + } + } + ], + "_nested_name": "button_reset" + }, { "type": "subtitle", "name": "example_2", diff --git a/app_data/sheets/template/component_demo/comp_plh_activity_check_in.json b/app_data/sheets/template/component_demo/comp_plh_activity_check_in.json index bb2d439..5d4eb1b 100644 --- a/app_data/sheets/template/component_demo/comp_plh_activity_check_in.json +++ b/app_data/sheets/template/component_demo/comp_plh_activity_check_in.json @@ -221,14 +221,35 @@ "name": "display_group_9", "_nested_name": "display_group_9" }, + { + "type": "button", + "value": "Unset", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "set_local", + "args": [ + "countdown_start_date", + "undefined" + ], + "_raw": "click | set_local: countdown_start_date: undefined", + "_cleaned": "click | set_local: countdown_start_date: undefined" + } + ], + "name": "button_11", + "_nested_name": "button_11" + }, { "type": "text", "value": "Start date: @local.countdown_start_date", "_translations": { "value": {} }, - "name": "text_11", - "_nested_name": "text_11", + "name": "text_12", + "_nested_name": "text_12", "_dynamicFields": { "value": [ { @@ -251,8 +272,8 @@ "_translations": { "value": {} }, - "name": "title_12", - "_nested_name": "title_12" + "name": "title_13", + "_nested_name": "title_13" }, { "type": "number_selector", @@ -287,8 +308,8 @@ "_translations": { "value": {} }, - "name": "text_14", - "_nested_name": "text_14", + "name": "text_15", + "_nested_name": "text_15", "_dynamicFields": { "value": [ { @@ -311,8 +332,8 @@ "_translations": { "value": {} }, - "name": "title_15", - "_nested_name": "title_15" + "name": "title_16", + "_nested_name": "title_16" }, { "type": "button", @@ -335,8 +356,8 @@ } } ], - "name": "button_16", - "_nested_name": "button_16", + "name": "button_17", + "_nested_name": "button_17", "_dynamicFields": { "action_list": { "0": { @@ -431,7 +452,7 @@ "countdown_text_list": "@local.countdown_text_list" }, "name": "plh_activity_check_in_1", - "_nested_name": "data_items_17.plh_activity_check_in_1", + "_nested_name": "data_items_18.plh_activity_check_in_1", "_dynamicFields": { "parameter_list": { "countdown_days": [ @@ -473,8 +494,8 @@ } } ], - "name": "data_items_17", - "_nested_name": "data_items_17" + "name": "data_items_18", + "_nested_name": "data_items_18" } ], "_xlsxPath": "component_sheets/component_plh_activity_check_in.xlsx" diff --git a/app_data/sheets/template/component_demo/comp_plh_bottom_nav.json b/app_data/sheets/template/component_demo/comp_plh_bottom_nav.json index 3f51432..efad6cf 100644 --- a/app_data/sheets/template/component_demo/comp_plh_bottom_nav.json +++ b/app_data/sheets/template/component_demo/comp_plh_bottom_nav.json @@ -3,6 +3,14 @@ "flow_name": "comp_plh_bottom_nav", "status": "released", "flow_subtype": "component_demo", + "parameter_list": { + "app_config": { + "APP_FOOTER_DEFAULTS": { + "templateName": "comp_plh_bottom_nav", + "background": "none" + } + } + }, "rows": [ { "name": "button_list", @@ -12,21 +20,21 @@ "label": "Home", "icon": "images/icons/home.svg", "active_icon": "images/icons/home_active.svg", - "target_template": "comp_button" + "target_template": "comp_plh_bottom_nav" }, { "name": "library_button", "label": "Library", "icon": "images/icons/local_library.svg", "active_icon": "images/icons/local_library_active.svg", - "target_template": "comp_text_bubble" + "target_template": "home_screen" }, { "name": "settings_button", "label": "Settings", "icon": "images/icons/settings.svg", "active_icon": "images/icons/settings_active.svg", - "target_template": "comp_audio" + "target_template": "home_screen" } ], "type": "set_variable", 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 2d90d70..bab07bc 100644 --- a/app_data/sheets/template/component_demo/comp_task_card.json +++ b/app_data/sheets/template/component_demo/comp_task_card.json @@ -1853,7 +1853,7 @@ }, { "type": "title", - "value": "Card for a block button", + "value": "Card for a block button - Facilitator Mexico theme", "_translations": { "value": {} }, @@ -1960,6 +1960,223 @@ "parameter_list.image" ] } + }, + { + "name": "kw_img", + "value": "https://img.youtube.com/vi/noyAxN4YG3g/hqdefault.jpg", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "kw_img" + }, + { + "type": "task_card", + "name": "card_activity_kw", + "action_list": [ + { + "trigger": "click", + "action_id": "set_field", + "args": [ + "@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" + }, + { + "trigger": "click", + "action_id": "go_to", + "args": [ + "@local.task_group_id@local.join@local.task_id" + ], + "_raw": "click | go_to:@local.task_group_id@local.join@local.task_id", + "_cleaned": "click | go_to:@local.task_group_id@local.join@local.task_id" + } + ], + "parameter_list": { + "title": "Fun with Food", + "image": "@local.kw_img", + "variant": "portrait" + }, + "rows": [ + { + "type": "toggle_bar", + "name": "toggle_@item.id", + "parameter_list": { + "variant": "icon", + "position": "right", + "icon_true_asset": "images/icons/heart_blue.svg", + "icon_false_asset": "images/icons/heart_outline.svg" + }, + "_nested_name": "card_activity_kw.toggle_@item.id", + "_dynamicFields": { + "name": [ + { + "fullExpression": "toggle_@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ], + "_nested_name": [ + { + "fullExpression": "card_activity_kw.toggle_@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ] + }, + "_dynamicDependencies": { + "@item.id": [ + "name", + "_nested_name" + ] + } + } + ], + "_nested_name": "card_activity_kw", + "_dynamicFields": { + "action_list": { + "0": { + "args": { + "0": [ + { + "fullExpression": "@local.task_completed_field", + "matchedExpression": "@local.task_completed_field", + "type": "local", + "fieldName": "task_completed_field" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | set_field: @local.task_completed_field: true", + "matchedExpression": "@local.task_completed_field", + "type": "local", + "fieldName": "task_completed_field" + } + ], + "_cleaned": [ + { + "fullExpression": "click | set_field: @local.task_completed_field: true", + "matchedExpression": "@local.task_completed_field", + "type": "local", + "fieldName": "task_completed_field" + } + ] + }, + "2": { + "args": { + "0": [ + { + "fullExpression": "@local.task_group_id@local.join@local.task_id", + "matchedExpression": "@local.task_group_id", + "type": "local", + "fieldName": "task_group_id" + }, + { + "fullExpression": "@local.task_group_id@local.join@local.task_id", + "matchedExpression": "@local.join", + "type": "local", + "fieldName": "join" + }, + { + "fullExpression": "@local.task_group_id@local.join@local.task_id", + "matchedExpression": "@local.task_id", + "type": "local", + "fieldName": "task_id" + } + ] + }, + "_raw": [ + { + "fullExpression": "click | go_to:@local.task_group_id@local.join@local.task_id", + "matchedExpression": "@local.task_group_id", + "type": "local", + "fieldName": "task_group_id" + }, + { + "fullExpression": "click | go_to:@local.task_group_id@local.join@local.task_id", + "matchedExpression": "@local.join", + "type": "local", + "fieldName": "join" + }, + { + "fullExpression": "click | go_to:@local.task_group_id@local.join@local.task_id", + "matchedExpression": "@local.task_id", + "type": "local", + "fieldName": "task_id" + } + ], + "_cleaned": [ + { + "fullExpression": "click | go_to:@local.task_group_id@local.join@local.task_id", + "matchedExpression": "@local.task_group_id", + "type": "local", + "fieldName": "task_group_id" + }, + { + "fullExpression": "click | go_to:@local.task_group_id@local.join@local.task_id", + "matchedExpression": "@local.join", + "type": "local", + "fieldName": "join" + }, + { + "fullExpression": "click | go_to:@local.task_group_id@local.join@local.task_id", + "matchedExpression": "@local.task_id", + "type": "local", + "fieldName": "task_id" + } + ] + } + }, + "parameter_list": { + "image": [ + { + "fullExpression": "@local.kw_img", + "matchedExpression": "@local.kw_img", + "type": "local", + "fieldName": "kw_img" + } + ] + } + }, + "_dynamicDependencies": { + "@local.task_completed_field": [ + "action_list.0.args.0", + "action_list.0._raw", + "action_list.0._cleaned" + ], + "@local.task_group_id": [ + "action_list.2.args.0", + "action_list.2._raw", + "action_list.2._cleaned" + ], + "@local.join": [ + "action_list.2.args.0", + "action_list.2._raw", + "action_list.2._cleaned" + ], + "@local.task_id": [ + "action_list.2.args.0", + "action_list.2._raw", + "action_list.2._cleaned" + ], + "@local.kw_img": [ + "parameter_list.image" + ] + } } ], "_xlsxPath": "component_sheets/component_task_card.xlsx" diff --git a/app_data/sheets/template/component_demo/comp_title.json b/app_data/sheets/template/component_demo/comp_title.json index ec00226..25fa2f8 100644 --- a/app_data/sheets/template/component_demo/comp_title.json +++ b/app_data/sheets/template/component_demo/comp_title.json @@ -13,6 +13,15 @@ "name": "title_2", "_nested_name": "title_2" }, + { + "type": "title", + "value": "Title with more text to wrap over multiple lines", + "_translations": { + "value": {} + }, + "name": "title_3", + "_nested_name": "title_3" + }, { "type": "title", "value": "Title with a tooltip", @@ -22,8 +31,8 @@ "parameter_list": { "help": "Hi, I'm a tooltip!" }, - "name": "title_3", - "_nested_name": "title_3" + "name": "title_4", + "_nested_name": "title_4" }, { "type": "title", @@ -34,8 +43,8 @@ "parameter_list": { "text_align": "center" }, - "name": "title_4", - "_nested_name": "title_4" + "name": "title_5", + "_nested_name": "title_5" }, { "type": "title", @@ -46,8 +55,8 @@ "parameter_list": { "text_align": "right" }, - "name": "title_5", - "_nested_name": "title_5" + "name": "title_6", + "_nested_name": "title_6" }, { "type": "title", @@ -58,8 +67,32 @@ "parameter_list": { "variant": "header" }, - "name": "title_6", - "_nested_name": "title_6" + "name": "title_7", + "_nested_name": "title_7" + }, + { + "type": "title", + "value": "Title as Page Banner", + "_translations": { + "value": {} + }, + "parameter_list": { + "variant": "page_banner" + }, + "name": "title_8", + "_nested_name": "title_8" + }, + { + "type": "title", + "value": "Title as Section Banner", + "_translations": { + "value": {} + }, + "parameter_list": { + "variant": "section_banner" + }, + "name": "title_9", + "_nested_name": "title_9" } ], "_xlsxPath": "component_sheets/component_title.xlsx" diff --git a/app_data/sheets/template/debug/example_accordion.json b/app_data/sheets/template/debug/example_accordion.json index 232426d..d2d95cf 100644 --- a/app_data/sheets/template/debug/example_accordion.json +++ b/app_data/sheets/template/debug/example_accordion.json @@ -60,7 +60,7 @@ }, { "name": "text_3", - "value": "Text 3", + "value": "Text 3 [With Link](https://www.idems.international/)", "_translations": { "value": {} }, diff --git a/app_data/sheets/template/debug/example_completion.json b/app_data/sheets/template/debug/example_completion.json new file mode 100644 index 0000000..ebeb79f --- /dev/null +++ b/app_data/sheets/template/debug/example_completion.json @@ -0,0 +1,48 @@ +{ + "flow_type": "template", + "flow_name": "example_completion", + "status": "released", + "flow_subtype": "debug", + "rows": [ + { + "type": "title", + "value": "Hurray!", + "_translations": { + "value": {} + }, + "name": "title_2", + "_nested_name": "title_2" + }, + { + "type": "text", + "name": "text", + "value": "This is the example text template used on pop-up components", + "_translations": { + "value": {} + }, + "exclude_from_translation": true, + "_nested_name": "text" + }, + { + "type": "button", + "name": "button", + "value": "Thank you for completing module", + "_translations": { + "value": {} + }, + "action_list": [ + { + "trigger": "click", + "action_id": "go_to", + "args": [ + "comp_accordion" + ], + "_raw": "click | go_to: comp_accordion", + "_cleaned": "click | go_to: comp_accordion" + } + ], + "_nested_name": "button" + } + ], + "_xlsxPath": "example_sheets/to_be_sorted/example_actions.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/debug/example_pop_ups.json b/app_data/sheets/template/debug/example_pop_ups.json index ae10110..f9f31e0 100644 --- a/app_data/sheets/template/debug/example_pop_ups.json +++ b/app_data/sheets/template/debug/example_pop_ups.json @@ -247,10 +247,10 @@ "trigger": "click", "action_id": "pop_up", "args": [ - "example_text" + "example_completion" ], - "_raw": "click | pop_up: example_text | variant:plh_completion", - "_cleaned": "click | pop_up: example_text | variant:plh_completion", + "_raw": "click | pop_up: example_completion | variant:plh_completion", + "_cleaned": "click | pop_up: example_completion | variant:plh_completion", "params": { "variant": "plh_completion" } diff --git a/config.ts b/config.ts index 940fdf4..26e564e 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.11", + content_tag_latest: "1.3.12", }; config.app_config.ASSET_PACKS = { diff --git a/reports/summary.json b/reports/summary.json index 1cd2ed8..839d097 100644 --- a/reports/summary.json +++ b/reports/summary.json @@ -31,7 +31,7 @@ }, { "type": "button", - "count": 337 + "count": 342 }, { "type": "calendar", @@ -47,7 +47,7 @@ }, { "type": "combo_box", - "count": 47 + "count": 48 }, { "type": "dashed_box", @@ -55,7 +55,7 @@ }, { "type": "data_items", - "count": 43 + "count": 44 }, { "type": "debug_toggle", @@ -183,7 +183,7 @@ }, { "type": "round_button", - "count": 26 + "count": 27 }, { "type": "select_text", @@ -203,7 +203,7 @@ }, { "type": "set_variable", - "count": 740 + "count": 741 }, { "type": "simple_checkbox", @@ -223,7 +223,7 @@ }, { "type": "task_card", - "count": 25 + "count": 26 }, { "type": "task_progress_bar", @@ -235,7 +235,7 @@ }, { "type": "text", - "count": 944 + "count": 945 }, { "type": "text_area", @@ -259,11 +259,11 @@ }, { "type": "title", - "count": 461 + "count": 465 }, { "type": "toggle_bar", - "count": 50 + "count": 51 }, { "type": "update_action_list", @@ -291,7 +291,7 @@ }, { "type": "add_data", - "count": 1 + "count": 2 }, { "type": "app_update", @@ -319,7 +319,7 @@ }, { "type": "emit: force_reload", - "count": 29 + "count": 30 }, { "type": "emit: force_reprocess", @@ -359,7 +359,7 @@ }, { "type": "go_to", - "count": 101 + "count": 103 }, { "type": "go_to_url", @@ -399,7 +399,7 @@ }, { "type": "reset_data", - "count": 5 + "count": 6 }, { "type": "save_to_device", @@ -411,11 +411,11 @@ }, { "type": "set_data", - "count": 12 + "count": 13 }, { "type": "set_field", - "count": 112 + "count": 113 }, { "type": "set_item", @@ -427,7 +427,7 @@ }, { "type": "set_local", - "count": 35 + "count": 36 }, { "type": "share", @@ -542,6 +542,11 @@ "count": 1, "missing": true }, + { + "path": "https://img.youtube.com/vi/noyAxN4YG3g/hqdefault.jpg", + "count": 1, + "missing": true + }, { "path": "https://www.w3schools.com/html/mov_bbb.mp4", "count": 1, @@ -728,17 +733,17 @@ }, { "path": "images/icons/globe_blue.svg", - "count": 16, + "count": 17, "size_kb": 3.9 }, { "path": "images/icons/heart_blue.svg", - "count": 34, + "count": 35, "size_kb": 1.4 }, { "path": "images/icons/heart_outline.svg", - "count": 10, + "count": 11, "size_kb": 0.6 }, { @@ -763,7 +768,7 @@ }, { "path": "images/icons/leaf_blue.svg", - "count": 12, + "count": 13, "size_kb": 1.7 }, { @@ -953,18 +958,13 @@ { "type": "data_list", "subtype": "component_demo", - "total": 7 + "total": 8 }, { "type": "data_list", "subtype": "debug", "total": 18 }, - { - "type": "data_list", - "subtype": "debug_lifecycle_actions", - "total": 1 - }, { "type": "data_list", "subtype": "example_generator", @@ -990,6 +990,11 @@ "subtype": "generated", "total": 13 }, + { + "type": "data_list", + "subtype": "lifecycle_actions", + "total": 1 + }, { "type": "data_pipe", "subtype": "debug", @@ -1038,7 +1043,7 @@ { "type": "template", "subtype": "debug", - "total": 260 + "total": 261 }, { "type": "template", diff --git a/reports/summary.md b/reports/summary.md index b2eb1cd..0ce1e75 100644 --- a/reports/summary.md +++ b/reports/summary.md @@ -10,13 +10,13 @@ | animated_section | 9 | | animated_slides | 1 | | audio | 13 | -| button | 337 | +| button | 342 | | calendar | 1 | | carousel | 9 | | colour_palette | 1 | -| combo_box | 47 | +| combo_box | 48 | | dashed_box | 19 | -| data_items | 43 | +| data_items | 44 | | debug_toggle | 1 | | demo_basic | 3 | | display_grid | 4 | @@ -48,27 +48,27 @@ | radio_button_grid | 10 | | radio_group | 56 | | radio_group_grid | 5 | -| round_button | 26 | +| round_button | 27 | | select_text | 6 | | set_default | 1 | | set_field | 28 | | set_local | 5 | -| set_variable | 740 | +| set_variable | 741 | | simple_checkbox | 41 | | slider | 32 | | square_button | 8 | | subtitle | 60 | -| task_card | 25 | +| task_card | 26 | | task_progress_bar | 6 | | template | 130 | -| text | 944 | +| text | 945 | | text_area | 13 | | text_box | 50 | | text_bubble | 10 | | tile_component | 57 | | timer | 21 | -| title | 461 | -| toggle_bar | 50 | +| title | 465 | +| toggle_bar | 51 | | update_action_list | 2 | | video | 4 | | workshops_accordion | 2 | @@ -81,14 +81,14 @@ | type | count | | --- | --- | | !@item.default_value | 1 | -| add_data | 1 | +| add_data | 2 | | app_update | 3 | | asset_pack | 2 | | auth | 2 | | download_assets | 1 | | emit: @local.child_local_variable | 1 | | emit: completed | 34 | -| emit: force_reload | 29 | +| emit: force_reload | 30 | | emit: force_reprocess | 26 | | emit: force_restart | 2 | | emit: server_sync | 7 | @@ -98,7 +98,7 @@ | emit: translator_mode_toggle | 1 | | emit: uncompleted | 18 | | feedback | 13 | -| go_to | 101 | +| go_to | 103 | | go_to_url | 5 | | invalid_action | 1 | | nav | 5 | @@ -108,14 +108,14 @@ | process_template | 2 | | remove_item | 1 | | reset_app | 1 | -| reset_data | 5 | +| reset_data | 6 | | save_to_device | 2 | | screen_orientation | 3 | -| set_data | 12 | -| set_field | 112 | +| set_data | 13 | +| set_field | 113 | | set_item | 24 | | set_items | 2 | -| set_local | 35 | +| set_local | 36 | | share | 6 | | start_tour | 2 | | task | 2 | @@ -165,6 +165,7 @@ Assets that have references within sheets but do not appear in app-data | click | pop_up: example_text | variant: plh_completion, background_image: confetti.svg | 2 | | confetti.svg | 1 | | debug_asset_pack_1/image_2.png | 1 | +| https://img.youtube.com/vi/noyAxN4YG3g/hqdefault.jpg | 1 | | https://www.w3schools.com/html/mov_bbb.mp4 | 1 | @@ -210,14 +211,14 @@ Assets that are used within sheets and also can be found in the synced asset dat | images/icons/audio/play-sharp.svg | 0.1 | 4 | | images/icons/book_white.svg | 0.7 | 12 | | images/icons/expand_circle_right.png | 0.9 | 2 | -| images/icons/globe_blue.svg | 3.9 | 16 | -| images/icons/heart_blue.svg | 1.4 | 34 | -| images/icons/heart_outline.svg | 0.6 | 10 | +| images/icons/globe_blue.svg | 3.9 | 17 | +| images/icons/heart_blue.svg | 1.4 | 35 | +| images/icons/heart_outline.svg | 0.6 | 11 | | images/icons/home.svg | 0.4 | 1 | | images/icons/home_active.svg | 0.4 | 1 | | images/icons/house_white.svg | 0.6 | 5 | | images/icons/in_progress.svg | 1.1 | 15 | -| images/icons/leaf_blue.svg | 1.7 | 12 | +| images/icons/leaf_blue.svg | 1.7 | 13 | | images/icons/local_library.svg | 1.6 | 1 | | images/icons/local_library_active.svg | 1.6 | 1 | | images/icons/locked.png | 0.9 | 3 | @@ -261,14 +262,14 @@ Assets that are used within sheets and also can be found in the synced asset dat | data_list | | 33 | | data_list | campaign_rows_debug | 6 | | data_list | campaign_schedule | 1 | -| data_list | component_demo | 7 | +| data_list | component_demo | 8 | | data_list | debug | 18 | -| data_list | debug_lifecycle_actions | 1 | | data_list | example_generator | 3 | | data_list | example_list_override | 2 | | data_list | example_pipe | 5 | | data_list | example_sheet_defaults | 1 | | data_list | generated | 13 | +| data_list | lifecycle_actions | 1 | | data_pipe | debug | 1 | | data_pipe | example_pipe | 6 | | data_pipe | generated | 2 | @@ -278,7 +279,7 @@ Assets that are used within sheets and also can be found in the synced asset dat | global | debug | 10 | | template | | 92 | | template | component_demo | 55 | -| template | debug | 260 | +| template | debug | 261 | | template | example_generator | 2 | | template | example_hardcoded | 1 | | template | example_list_override | 1 |