rename focus field (#1346)

* rename focus field

* changes for focus

* typo

* add changelog

Author: iakov-aws

changes/CHANGELOG-focus.md

@@ -1,5 +1,9 @@
 # What's new in FOCUS Dashboard
 
+## FOCUS Dashboard v1.0.1
+* Reverted to low case names to avoid issue when Amazon QuickSight does not process CamelCase field names on edit of DataSets.
+Recommended update via `cid-cmd update --force --recursive`
+
 ## FOCUS Dashboard v1.0.0
 * Add Taxonomy with Resource Tags
 

cid/common.py

@@ -1658,7 +1658,7 @@ def create_or_update_dataset(self, dataset_definition: dict, dataset_id: str=Non
         logger.debug(f'dataset {compiled_dataset.get("Name")} resource_tags = {resource_tags}')
         if cur_tags_json_required and resource_tags:
             custom_fields = {
-                name: f"parseJson(tags_json, '$.{name}')" # This syntax does not work:  $[\"{name}\"]
+                name: f"parseJson(tags_json, '$.{name.strip()}')" # This syntax does not work:  $[\"{name}\"]
                 for name in resource_tags
             }
         logger.debug(f'custom_fields = {custom_fields}')

cid/helpers/quicksight/dashboard_patching.py

@@ -35,7 +35,8 @@ def format_field_name(field_name: str, ignore_prefix: bool=False) -> str:
     """
     # Handle lowercase strings without underscores by inserting spaces at word boundaries (mainly for focus)
     if field_name.islower() and '_' not in field_name:
-        field_name = re.sub(r'(account|period|discount|unit|price|category|name|id|cost|quantity)', r'_\1', field_name)
+        field_name = re.sub( r'(zone|id|name|type|category|unit|price|cost|quantity|start|status|class|description|frequency|currency|period)$', r'_\1', field_name)
+        field_name = re.sub(r'^(availability|billing|charge|commitment|consumed|contracted|effective|invoice|list|pricing|provider|publisher|region|resource|service|sku|sub|tags)', r'\1_', field_name)
     # First, handle camelCase by inserting underscores before uppercase letters
     field_name = re.sub(r'([a-z])([A-Z])', r'\1_\2', field_name) # This converts "ServiceCode" to "Service_Code"
     field_name = field_name.lower()