Merge branch 'main' into feature/CDD-3162-popular-topics-grid-component

Author: tushortz

.github/workflows/actions.yml

@@ -195,6 +195,44 @@ jobs:
       - name: Build ingestion Docker image
         run: docker build -t be-ingestion-test -f Dockerfile-ingestion .
 
+      - name: Run main API container
+        run: docker run -d --name be-main-test-container be-main-test
+
+      - name: Health check main API container
+        run: |
+          echo "Waiting for main API container to start..."
+          sleep 10
+
+          if [ "$(docker inspect -f '{{.State.Running}}' be-main-test-container)" != "true" ]; then
+            echo "Main API container failed to start"
+            docker logs be-main-test-container
+            exit 1
+          fi
+
+          echo "Main API container is running successfully"
+
+      - name: Run ingestion container
+        run: docker run -d --name be-ingestion-test-container be-ingestion-test
+
+      - name: Health check ingestion container
+        run: |
+          echo "Waiting for ingestion container to start..."
+          sleep 10
+
+          if [ "$(docker inspect -f '{{.State.Running}}' be-ingestion-test-container)" != "true" ]; then
+            echo "Ingestion container failed to start"
+            docker logs be-ingestion-test-container
+            exit 1
+          fi
+
+          echo "Ingestion container is running successfully"
+
+      - name: Cleanup
+        if: always()
+        run: |
+          docker rm -f be-main-test-container || true
+          docker rm -f be-ingestion-test-container || true
+
   ###############################################################################
   # Build image
   ###############################################################################

cms/dynamic_content/cards.py

@@ -298,9 +298,9 @@ class ChartCard(blocks.StructBlock):
         required=False,
     )
     date_prefix = blocks.CharBlock(
-        required=True,
+        requried=True,
         default=CHART_CARD_DATE_PREFIX_DEFAULT_TEXT,
-        help_text=help_texts.CHART_DATE_PREFIX,
+        help_texts=help_texts.CHART_DATE_PREFIX,
     )
     show_timeseries_filter = blocks.BooleanBlock(
         help_text=help_texts.CHART_TIMESERIES_FILTER,
@@ -314,7 +314,16 @@ class Meta:
         icon = "standalone_chart"
 
 
-class ChartWithDescriptionCard(ChartCard):
+class ChartWithDescriptionCard(blocks.StructBlock):
+    title = blocks.TextBlock(required=True, help_text=help_texts.TITLE_FIELD)
+    sub_title = blocks.TextBlock(
+        required=False, help_text=help_texts.OPTIONAL_BODY_FIELD, label="Subtitle"
+    )
+    topic_page = PageLinkChooserBlock(
+        page_type="topic.TopicPage",
+        required=True,
+        help_text=help_texts.TOPIC_PAGE_FIELD,
+    )
     description = blocks.TextBlock(
         required=True,
         help_text=help_texts.CHART_DESCRIPTION,
@@ -323,6 +332,47 @@ class ChartWithDescriptionCard(ChartCard):
         required=False,
         help_text=help_texts.SOURCE_LINK_INTERNAL_OR_EXTERNAL,
     )
+    tag_manager_event_id = blocks.CharBlock(
+        required=False,
+        help_text=help_texts.TAG_MANAGER_EVENT_ID_FIELD,
+        label="Tag manager event ID",
+    )
+    x_axis = blocks.ChoiceBlock(
+        required=False,
+        choices=get_possible_axis_choices,
+        help_text=help_texts.CHART_X_AXIS,
+    )
+    x_axis_title = blocks.CharBlock(
+        required=False,
+        default="",
+        help_text=help_texts.CHART_X_AXIS_TITLE,
+    )
+    y_axis = blocks.ChoiceBlock(
+        required=False,
+        choices=get_possible_axis_choices,
+        help_text=help_texts.CHART_Y_AXIS,
+    )
+    y_axis_title = blocks.CharBlock(
+        required=False,
+        default="",
+        help_text=help_texts.CHART_Y_AXIS_TITLE,
+    )
+    y_axis_minimum_value = blocks.DecimalBlock(
+        required=False,
+        default=0,
+        help_text=help_texts.CHART_Y_AXIS_MINIMUM_VALUE,
+    )
+    y_axis_maximum_value = blocks.DecimalBlock(
+        required=False,
+        help_text=help_texts.CHART_Y_AXIS_MAXIMUM_VALUE,
+    )
+    show_tooltips = blocks.BooleanBlock(
+        help_text=help_texts.SHOW_TOOLTIPS_ON_CHARTS_FIELD,
+        default=False,
+        required=False,
+    )
+
+    chart = ChartComponent(help_text=help_texts.CHART_BLOCK_FIELD)
 
     class Meta:
         icon = "standalone_chart"
@@ -371,16 +421,52 @@ class Meta:
         icon = "standalone_chart"
 
 
-class HeadlineChartWithDescriptionCard(HeadlineChartCard):
+class HeadlineChartWithDescriptionCard(blocks.StructBlock):
+    title = blocks.TextBlock(required=True, help_text=help_texts.TITLE_FIELD)
+    sub_title = blocks.TextBlock(
+        required=False, help_text=help_texts.OPTIONAL_BODY_FIELD, label="Subtitle"
+    )
+    topic_page = PageLinkChooserBlock(
+        page_type="topic.TopicPage",
+        required=True,
+        help_text=help_texts.TOPIC_PAGE_FIELD,
+    )
     description = blocks.TextBlock(
         required=True,
         help_text=help_texts.HEADLINE_CHART_DESCRIPTION,
     )
+    tag_manager_event_id = blocks.CharBlock(
+        required=False,
+        help_text=help_texts.TAG_MANAGER_EVENT_ID_FIELD,
+        label="Tag manager event ID",
+    )
+    x_axis = blocks.ChoiceBlock(
+        required=True,
+        choices=get_possible_axis_choices,
+        help_text=help_texts.REQUIRED_CHART_X_AXIS,
+    )
+    x_axis_title = blocks.CharBlock(
+        required=False,
+        default="",
+        help_text=help_texts.CHART_X_AXIS_TITLE,
+    )
+    y_axis_title = blocks.CharBlock(
+        required=False,
+        default="",
+        help_text=help_texts.CHART_Y_AXIS_TITLE,
+    )
+    show_tooltips = blocks.BooleanBlock(
+        help_text=help_texts.SHOW_TOOLTIPS_ON_CHARTS_FIELD,
+        default=False,
+        required=False,
+    )
     source = SourceLinkBlock(
         required=False,
         help_text=help_texts.SOURCE_LINK_INTERNAL_OR_EXTERNAL,
     )
 
+    chart = HeadlineChartComponent(help_texts=help_texts.CHART_BLOCK_FIELD)
+
     class Meta:
         icon = "standalone_chart"
 
@@ -494,7 +580,6 @@ class ChartRowBlockTypes(blocks.StreamBlock):
     chart_card = ChartCard()
     chart_with_description_card = ChartWithDescriptionCard()
     headline_chart_card = HeadlineChartCard()
-    headline_chart_with_description_card = HeadlineChartWithDescriptionCard()
     chart_with_headline_and_trend_card = ChartWithHeadlineAndTrendCard()
     simplified_chart_with_link = SimplifiedChartWithLink()
     dual_category_chart_card = DualCategoryChartCard()
@@ -555,7 +640,6 @@ class Meta:
 
 
 class ChartCardSection(blocks.StructBlock):
-
     cards = ChartRowBlockTypes(
         min_num=MINIMUM_COLUMNS_CHART_COLUMNS_COUNT,
         help_text=help_texts.CHART_ROW_CARD_COLUMN_WIDTH_THREE,