From b6091735a05833552801b934b195700f9571bdba Mon Sep 17 00:00:00 2001 From: Johnny McQuade Date: Tue, 30 Jan 2024 09:38:49 +0000 Subject: [PATCH 1/2] content: 1.2.8 --- app_data/sheets/contents.json | 42 +++--- .../data_list/debug/debug_data_list.json | 51 ------- .../data_list/feat_task_group_1_data.json | 8 +- .../data_list/feat_task_group_2_data.json | 8 +- .../data_list/feat_task_group_3_data.json | 8 +- .../data_list/generated/debug_filtered.json | 21 --- .../debug/debug_data_pipe_translate.json | 17 --- .../comp_task_prog_bar_dynamic.json | 3 +- .../debug/example_task_group_content.json | 99 +++++++++++++ .../debug/example_task_group_stepper.json | 131 ++++++++++++++++++ .../sheets/template/debug/tg_1_subtask_1.json | 27 ++++ .../sheets/template/debug/tg_1_subtask_2.json | 27 ++++ config.ts | 11 +- 13 files changed, 335 insertions(+), 118 deletions(-) delete mode 100644 app_data/sheets/data_list/debug/debug_data_list.json delete mode 100644 app_data/sheets/data_list/generated/debug_filtered.json delete mode 100644 app_data/sheets/data_pipe/debug/debug_data_pipe_translate.json create mode 100644 app_data/sheets/template/debug/example_task_group_content.json create mode 100644 app_data/sheets/template/debug/example_task_group_stepper.json create mode 100644 app_data/sheets/template/debug/tg_1_subtask_1.json create mode 100644 app_data/sheets/template/debug/tg_1_subtask_2.json diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json index 0730d67..7585ffe 100644 --- a/app_data/sheets/contents.json +++ b/app_data/sheets/contents.json @@ -104,13 +104,6 @@ "flow_subtype": "debug", "_xlsxPath": "debug_sheets/to_be_sorted/debug_accordion.xlsx" }, - "debug_data_list": { - "flow_type": "data_list", - "flow_name": "debug_data_list", - "data_list_name": "debug", - "flow_subtype": "debug", - "_xlsxPath": "debug_sheets/debug_data_lists.xlsx" - }, "debug_delimiters_list": { "flow_type": "data_list", "flow_name": "debug_delimiters_list", @@ -310,11 +303,6 @@ "data_list_name": "feat_task_groups", "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx" }, - "debug_filtered": { - "flow_name": "debug_filtered", - "flow_subtype": "generated", - "flow_type": "data_list" - }, "double_example_data_pipe_list": { "flow_name": "double_example_data_pipe_list", "flow_subtype": "generated", @@ -363,12 +351,6 @@ } }, "data_pipe": { - "debug_data_pipe_translate": { - "flow_type": "data_pipe", - "flow_name": "debug_data_pipe_translate", - "flow_subtype": "debug", - "_xlsxPath": "debug_sheets/debug_data_lists.xlsx" - }, "example_data_pipe": { "flow_type": "data_pipe", "flow_subtype": "example_pipe", @@ -2174,6 +2156,18 @@ "flow_name": "example_startup_trigger", "_xlsxPath": "example_sheets/to_be_sorted/example_startup.xlsx" }, + "example_task_group_content": { + "flow_type": "template", + "flow_name": "example_task_group_content", + "flow_subtype": "debug", + "_xlsxPath": "example_sheets/example_task_group_stepper.xlsx" + }, + "example_task_group_stepper": { + "flow_type": "template", + "flow_name": "example_task_group_stepper", + "flow_subtype": "debug", + "_xlsxPath": "example_sheets/example_task_group_stepper.xlsx" + }, "example_temp_override_default": { "flow_type": "template", "flow_name": "example_temp_override_default", @@ -2462,6 +2456,18 @@ "flow_subtype": "debug", "_xlsxPath": "example_sheets/example_footer.xlsx" }, + "tg_1_subtask_1": { + "flow_type": "template", + "flow_name": "tg_1_subtask_1", + "flow_subtype": "debug", + "_xlsxPath": "example_sheets/example_task_group_stepper.xlsx" + }, + "tg_1_subtask_2": { + "flow_type": "template", + "flow_name": "tg_1_subtask_2", + "flow_subtype": "debug", + "_xlsxPath": "example_sheets/example_task_group_stepper.xlsx" + }, "w_example_ending": { "flow_type": "template", "flow_subtype": "debug", diff --git a/app_data/sheets/data_list/debug/debug_data_list.json b/app_data/sheets/data_list/debug/debug_data_list.json deleted file mode 100644 index beabe3e..0000000 --- a/app_data/sheets/data_list/debug/debug_data_list.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "flow_type": "data_list", - "flow_name": "debug_data_list", - "status": "released", - "data_list_name": "debug", - "flow_subtype": "debug", - "rows": [ - { - "id": "item_1", - "text": "Item 1 text", - "image_asset": "images/example/jasper_1.jpg", - "to_translate": "Hello", - "_translations": { - "to_translate": {} - }, - "_translatedFields": { - "to_translate": { - "eng": "Hello" - } - } - }, - { - "id": "item_2", - "text": "Item 2 text", - "image_asset": "images/example/circular.png", - "to_translate": "Hello", - "_translations": { - "to_translate": {} - }, - "_translatedFields": { - "to_translate": { - "eng": "Hello" - } - } - }, - { - "id": "item_3", - "text": "Item 3 text", - "to_translate": "Hello", - "_translations": { - "to_translate": {} - }, - "_translatedFields": { - "to_translate": { - "eng": "Hello" - } - } - } - ], - "_xlsxPath": "debug_sheets/debug_data_lists.xlsx" -} \ No newline at end of file diff --git a/app_data/sheets/data_list/feat_task_group_1_data.json b/app_data/sheets/data_list/feat_task_group_1_data.json index 6738b8b..bc800f9 100644 --- a/app_data/sheets/data_list/feat_task_group_1_data.json +++ b/app_data/sheets/data_list/feat_task_group_1_data.json @@ -6,11 +6,15 @@ "rows": [ { "id": "subtask_1", - "completed_field": "task_group_1_subtask_1_completed" + "completed_field": "task_group_1_subtask_1_completed", + "title": "Subtask 1 Title", + "description": "Subtask 1 in Task Group 1" }, { "id": "subtask_2", - "completed_field": "task_group_1_subtask_2_completed" + "completed_field": "task_group_1_subtask_2_completed", + "title": "Subtask 2 Title", + "description": "Subtask 2 in Task Group 1" } ], "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx" diff --git a/app_data/sheets/data_list/feat_task_group_2_data.json b/app_data/sheets/data_list/feat_task_group_2_data.json index fa734a8..3e202ef 100644 --- a/app_data/sheets/data_list/feat_task_group_2_data.json +++ b/app_data/sheets/data_list/feat_task_group_2_data.json @@ -6,11 +6,15 @@ "rows": [ { "id": "subtask_1", - "completed_field": "task_group_2_subtask_1_completed" + "completed_field": "task_group_2_subtask_1_completed", + "title": "Subtask 1 Title", + "description": "Subtask 1 in Task Group 2" }, { "id": "subtask_2", - "completed_field": "task_group_2_subtask_2_completed" + "completed_field": "task_group_2_subtask_2_completed", + "title": "Subtask 2 Title", + "description": "Subtask 2 in Task Group 2" } ], "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx" diff --git a/app_data/sheets/data_list/feat_task_group_3_data.json b/app_data/sheets/data_list/feat_task_group_3_data.json index db8b755..9e15427 100644 --- a/app_data/sheets/data_list/feat_task_group_3_data.json +++ b/app_data/sheets/data_list/feat_task_group_3_data.json @@ -6,11 +6,15 @@ "rows": [ { "id": "subtask_1", - "completed_field": "task_group_3_subtask_1_completed" + "completed_field": "task_group_3_subtask_1_completed", + "title": "Subtask 1 Title", + "description": "Subtask 1 in Task Group 3" }, { "id": "subtask_2", - "completed_field": "task_group_3_subtask_2_completed" + "completed_field": "task_group_3_subtask_2_completed", + "title": "Subtask 2 Title", + "description": "Subtask 2 in Task Group 3" } ], "_xlsxPath": "feature_sheets/to_be_sorted/feature_task_group.xlsx" diff --git a/app_data/sheets/data_list/generated/debug_filtered.json b/app_data/sheets/data_list/generated/debug_filtered.json deleted file mode 100644 index 8198716..0000000 --- a/app_data/sheets/data_list/generated/debug_filtered.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "flow_name": "debug_filtered", - "flow_subtype": "generated", - "flow_type": "data_list", - "rows": [ - { - "id": "item_1", - "text": "Item 1 text", - "image_asset": "images/example/jasper_1.jpg", - "to_translate": "Hello", - "_translations": { - "to_translate": {} - }, - "_translatedFields": { - "to_translate": { - "eng": "Hello" - } - } - } - ] -} \ No newline at end of file diff --git a/app_data/sheets/data_pipe/debug/debug_data_pipe_translate.json b/app_data/sheets/data_pipe/debug/debug_data_pipe_translate.json deleted file mode 100644 index bd83de5..0000000 --- a/app_data/sheets/data_pipe/debug/debug_data_pipe_translate.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "flow_type": "data_pipe", - "flow_name": "debug_data_pipe_translate", - "status": "released", - "flow_subtype": "debug", - "rows": [ - { - "operation": "filter", - "args_list": [ - "id == \"item_1\"" - ], - "input_source": "debug_data_list", - "output_target": "debug_filtered" - } - ], - "_xlsxPath": "debug_sheets/debug_data_lists.xlsx" -} \ No newline at end of file diff --git a/app_data/sheets/template/component_demo/comp_task_prog_bar_dynamic.json b/app_data/sheets/template/component_demo/comp_task_prog_bar_dynamic.json index b15b42a..816e06a 100644 --- a/app_data/sheets/template/component_demo/comp_task_prog_bar_dynamic.json +++ b/app_data/sheets/template/component_demo/comp_task_prog_bar_dynamic.json @@ -26,8 +26,7 @@ "type": "task_progress_bar", "parameter_list": { "task_group_data": "@local.task_group", - "completed_field": "comp_task_progress_bar_completed", - "dynamic": "true" + "completed_field": "comp_task_progress_bar_completed" }, "name": "task_progress_bar", "_nested_name": "task_progress_bar", diff --git a/app_data/sheets/template/debug/example_task_group_content.json b/app_data/sheets/template/debug/example_task_group_content.json new file mode 100644 index 0000000..76b330f --- /dev/null +++ b/app_data/sheets/template/debug/example_task_group_content.json @@ -0,0 +1,99 @@ +{ + "flow_type": "template", + "flow_name": "example_task_group_content", + "status": "released", + "flow_subtype": "debug", + "rows": [ + { + "name": "task_row", + "value": "task_row", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "task_row" + }, + { + "type": "title", + "value": "@local.task_row.title", + "_translations": { + "value": {} + }, + "name": "title", + "_nested_name": "title", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.task_row.title", + "matchedExpression": "@local.task_row.title", + "type": "local", + "fieldName": "task_row" + } + ] + }, + "_dynamicDependencies": { + "@local.task_row.title": [ + "value" + ] + } + }, + { + "type": "text", + "value": "@local.task_row.description", + "_translations": { + "value": {} + }, + "name": "text", + "_nested_name": "text", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.task_row.description", + "matchedExpression": "@local.task_row.description", + "type": "local", + "fieldName": "task_row" + } + ] + }, + "_dynamicDependencies": { + "@local.task_row.description": [ + "value" + ] + } + }, + { + "type": "text", + "value": "example text", + "_translations": { + "value": {} + }, + "name": "text", + "_nested_name": "text" + }, + { + "type": "text", + "value": "@local.task_row", + "_translations": { + "value": {} + }, + "name": "text", + "_nested_name": "text", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.task_row", + "matchedExpression": "@local.task_row", + "type": "local", + "fieldName": "task_row" + } + ] + }, + "_dynamicDependencies": { + "@local.task_row": [ + "value" + ] + } + } + ], + "_xlsxPath": "example_sheets/example_task_group_stepper.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/debug/example_task_group_stepper.json b/app_data/sheets/template/debug/example_task_group_stepper.json new file mode 100644 index 0000000..02760c0 --- /dev/null +++ b/app_data/sheets/template/debug/example_task_group_stepper.json @@ -0,0 +1,131 @@ +{ + "flow_type": "template", + "flow_name": "example_task_group_stepper", + "status": "released", + "flow_subtype": "debug", + "rows": [ + { + "name": "task_group", + "value": "feat_task_group_1_data", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "task_group" + }, + { + "type": "task_progress_bar", + "parameter_list": { + "task_group_data": "@local.task_group", + "completed_field": "comp_task_progress_bar_completed" + }, + "name": "task_progress_bar", + "_nested_name": "task_progress_bar", + "_dynamicFields": { + "parameter_list": { + "task_group_data": [ + { + "fullExpression": "@local.task_group", + "matchedExpression": "@local.task_group", + "type": "local", + "fieldName": "task_group" + } + ] + } + }, + "_dynamicDependencies": { + "@local.task_group": [ + "parameter_list.task_group_data" + ] + } + }, + { + "type": "data_items", + "value": "@local.task_group", + "rows": [ + { + "name": "template_name", + "value": "tg_1_@item.id", + "_translations": { + "value": {} + }, + "type": "set_variable", + "_nested_name": "data_items.template_name", + "_dynamicFields": { + "value": [ + { + "fullExpression": "tg_1_@item.id", + "matchedExpression": "@item.id", + "type": "item", + "fieldName": "id" + } + ] + }, + "_dynamicDependencies": { + "@item.id": [ + "value" + ] + } + }, + { + "type": "template", + "value": "@local.template_name", + "rows": [], + "name": "@local.template_name", + "_nested_name": "data_items.@local.template_name", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.template_name", + "matchedExpression": "@local.template_name", + "type": "local", + "fieldName": "template_name" + } + ], + "name": [ + { + "fullExpression": "@local.template_name", + "matchedExpression": "@local.template_name", + "type": "local", + "fieldName": "template_name" + } + ], + "_nested_name": [ + { + "fullExpression": "data_items.@local.template_name", + "matchedExpression": "@local.template_name", + "type": "local", + "fieldName": "template_name" + } + ] + }, + "_dynamicDependencies": { + "@local.template_name": [ + "value", + "name", + "_nested_name" + ] + } + } + ], + "name": "data_items", + "_nested_name": "data_items", + "_dynamicFields": { + "value": [ + { + "fullExpression": "@local.task_group", + "matchedExpression": "@local.task_group", + "type": "local", + "fieldName": "task_group" + } + ] + }, + "_dynamicDependencies": { + "@local.task_group": [ + "value" + ] + } + } + ], + "_xlsxPath": "example_sheets/example_task_group_stepper.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/debug/tg_1_subtask_1.json b/app_data/sheets/template/debug/tg_1_subtask_1.json new file mode 100644 index 0000000..4d10efc --- /dev/null +++ b/app_data/sheets/template/debug/tg_1_subtask_1.json @@ -0,0 +1,27 @@ +{ + "flow_type": "template", + "flow_name": "tg_1_subtask_1", + "status": "released", + "flow_subtype": "debug", + "rows": [ + { + "type": "title", + "value": "Task Group 1, Subtask 1", + "_translations": { + "value": {} + }, + "name": "title", + "_nested_name": "title" + }, + { + "type": "text", + "value": "Custom content for Task Group 1, Subtask 1", + "_translations": { + "value": {} + }, + "name": "text", + "_nested_name": "text" + } + ], + "_xlsxPath": "example_sheets/example_task_group_stepper.xlsx" +} \ No newline at end of file diff --git a/app_data/sheets/template/debug/tg_1_subtask_2.json b/app_data/sheets/template/debug/tg_1_subtask_2.json new file mode 100644 index 0000000..4d4a301 --- /dev/null +++ b/app_data/sheets/template/debug/tg_1_subtask_2.json @@ -0,0 +1,27 @@ +{ + "flow_type": "template", + "flow_name": "tg_1_subtask_2", + "status": "released", + "flow_subtype": "debug", + "rows": [ + { + "type": "title", + "value": "Task Group 1, Subtask 2", + "_translations": { + "value": {} + }, + "name": "title", + "_nested_name": "title" + }, + { + "type": "image", + "value": "images/example/jasper_1.jpg", + "_translations": { + "value": {} + }, + "name": "image", + "_nested_name": "image" + } + ], + "_xlsxPath": "example_sheets/example_task_group_stepper.xlsx" +} \ No newline at end of file diff --git a/config.ts b/config.ts index 90525a8..f90b8be 100644 --- a/config.ts +++ b/config.ts @@ -13,7 +13,7 @@ config.google_drive = { config.git = { content_repo: "https://github.com/IDEMSInternational/app-debug-content.git", - content_tag_latest: "1.2.7", + content_tag_latest: "1.2.8", }; config.app_data.output_path = "./app_data"; @@ -46,8 +46,13 @@ config.app_config.APP_SKINS.defaultSkinName = SKINS.defaultSkin.name config.app_config.APP_SKINS.available = [SKINS.defaultSkin, SKINS.debug] config.app_config.APP_THEMES.available = ["default", "professional"] config.app_config.APP_THEMES.defaultThemeName = "default" -config.app_config.TASKS.enabled = true -config.app_config.TASKS.taskGroupsListName = "feat_task_groups" + +// TODO: replace with property assignment syntax after merge of #2176 on code repo +config.app_config.TASKS = { + enabled: true, + taskGroupsListName: "feat_task_groups", + highlightedTaskField: "_task_highlighted_group_id" +} config.app_config.APP_UPDATES.enabled = true config.app_config.APP_UPDATES.completeUpdateTemplate = "app_update_complete" config.app_config.APP_AUTHENTICATION_DEFAULTS.enforceLogin = false From 056b0cec2fd0280e28196e8c9256dd661b96a356 Mon Sep 17 00:00:00 2001 From: Johnny McQuade Date: Tue, 30 Jan 2024 09:45:38 +0000 Subject: [PATCH 2/2] chore: include old syntax as commnets --- config.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config.ts b/config.ts index f90b8be..666ff05 100644 --- a/config.ts +++ b/config.ts @@ -53,6 +53,9 @@ config.app_config.TASKS = { taskGroupsListName: "feat_task_groups", highlightedTaskField: "_task_highlighted_group_id" } +// config.app_config.TASKS.enabled = true +// config.app_config.TASKS.taskGroupsListName = "feat_task_groups" + config.app_config.APP_UPDATES.enabled = true config.app_config.APP_UPDATES.completeUpdateTemplate = "app_update_complete" config.app_config.APP_AUTHENTICATION_DEFAULTS.enforceLogin = false