Merge branch 'aarthy/version-fix' into 'enterprise'

Fix empty version + score display tweaks

See merge request dkinternal/testgen/dataops-testgen!168

Author: ci bot

deploy/docker-bake.hcl

@@ -1,11 +1,15 @@
 variable "TESTGEN_LABELS" {}
 variable "TESTGEN_BASE_LABEL" {}
 variable "TESTGEN_VERSION" {}
+variable "TESTGEN_DOCKER_HUB_REPO" {
+  "default": "datakitchen/dataops-testgen"
+}
 
 target "testgen-release" {
   args = {
     TESTGEN_VERSION = "${TESTGEN_VERSION}"
     TESTGEN_BASE_LABEL = "${TESTGEN_BASE_LABEL}"
+    TESTGEN_DOCKER_HUB_REPO = "${TESTGEN_DOCKER_HUB_REPO}"
   }
   context = "."
   dockerfile = "deploy/testgen.dockerfile"
@@ -17,6 +21,7 @@ target "testgen-qa" {
   args = {
     TESTGEN_VERSION = "${TESTGEN_VERSION}"
     TESTGEN_BASE_LABEL = "${TESTGEN_BASE_LABEL}"
+    TESTGEN_DOCKER_HUB_REPO = "${TESTGEN_DOCKER_HUB_REPO}"
   }
   context = "."
   dockerfile = "deploy/testgen.dockerfile"

deploy/testgen.dockerfile

@@ -1,14 +1,17 @@
-ARG TESTGEN_BASE_LABEL
-ARG TESTGEN_VERSION
+ARG TESTGEN_BASE_LABEL=v1
 
-FROM datakitchen/dataops-testgen-base:${TESTGEN_BASE_LABEL} as build-image
+FROM datakitchen/dataops-testgen-base:${TESTGEN_BASE_LABEL} AS build-image
 
 # Now install everything
 COPY . /tmp/dk/
 RUN python3 -m pip install --prefix=/dk /tmp/dk
 
 FROM python:3.12.7-alpine3.20 AS release-image
 
+# Args have to be set in current build stage: https://github.com/moby/moby/issues/37345
+ARG TESTGEN_VERSION
+ARG TESTGEN_DOCKER_HUB_REPO
+
 RUN addgroup -S testgen && adduser -S testgen -G testgen
 
 COPY --from=build-image --chown=testgen:testgen /dk/ /dk
@@ -25,7 +28,7 @@ ENV PATH="$PATH:/dk/bin:/opt/mssql-tools/bin/"
 
 ENV TESTGEN_VERSION=${TESTGEN_VERSION}
 ENV TG_RELEASE_CHECK=docker
-ENV TESTGEN_DOCKER_HUB_REPO=datakitchen/dataops-testgen-enterprise
+ENV TESTGEN_DOCKER_HUB_REPO=${TESTGEN_DOCKER_HUB_REPO}
 ENV STREAMLIT_SERVER_MAX_UPLOAD_SIZE=200
 
 RUN mkdir /var/lib/testgen && chown testgen:testgen /var/lib/testgen

testgen/ui/components/frontend/js/components/score_breakdown.js

@@ -28,11 +28,16 @@ const ScoreBreakdown = (score, breakdown, category, scoreType, onViewDetails) =>
                 },
                 span('for'),
                 () => {
+                    const scoreValue = getValue(score);
                     const selectedScoreType = getValue(scoreType);
+                    const scoreTypeOptions = ['score', 'cde_score'].filter((s) => scoreValue[s])
+                    if (!scoreTypeOptions.length) {
+                        scoreTypeOptions.push('score');
+                    }
                     return Select({
                         label: '',
                         value: selectedScoreType,
-                        options: ['score', 'cde_score'].map((s) => ({ label: SCORE_TYPE_LABEL[s], value: s, selected: s === scoreType })),
+                        options: scoreTypeOptions.map((s) => ({ label: SCORE_TYPE_LABEL[s], value: s, selected: s === scoreType })),
                         onChange: (value) => emitEvent('ScoreTypeChanged', { payload: value }),
                     });
                 },
@@ -41,7 +46,7 @@ const ScoreBreakdown = (score, breakdown, category, scoreType, onViewDetails) =>
         ),
         () => div(
             { class: 'table-header breakdown-columns flex-row' },
-            getValue(breakdown)?.columns?.map(column => span({ 
+            getValue(breakdown)?.columns?.map(column => span({
                 style: `flex: ${BREAKDOWN_COLUMNS_SIZES[column]};` },
                 getReadableColumn(column, getValue(scoreType)),
             )),
@@ -64,7 +69,7 @@ const ScoreBreakdown = (score, breakdown, category, scoreType, onViewDetails) =>
 
 /**
  * Translate the column names for the table.
- * 
+ *
  * @param {Array<string>} columns
  * @param {('table_name' | 'column_name' | 'semantic_data_type' | 'dq_dimension')} category
  * @param {('score' | 'cde_score')} scoreType
@@ -82,7 +87,7 @@ function getReadableColumn(column, scoreType) {
 }
 
 /**
- * 
+ *
  * @param {object} row
  * @param {string} column
  * @returns {<string>}
@@ -205,4 +210,4 @@ stylesheet.replace(`
 }
 `);
 
-export { ScoreBreakdown };
+export { ScoreBreakdown };

testgen/ui/views/quality_dashboard.py

@@ -31,7 +31,7 @@ def render(self, *, project_code: str, **_kwargs) -> None:
                     "table_groups_count": int(project_summary["table_groups_ct"]),
                     "profiling_runs_count": int(project_summary["profiling_runs_ct"]),
                 },
-                "scores": [format_score_card(score) for score in get_all_score_cards(project_code)],
+                "scores": [format_score_card(score) for score in get_all_score_cards(project_code) if score["score"] or score["cde_score"] or score["categories"]],
             },
             on_change_handlers={
                 "RefreshData": refresh_data,

testgen/ui/views/score_details.py

@@ -29,7 +29,7 @@ def render(
         *,
         definition_id: str,
         category: str = "table_name",
-        score_type: str = "score",
+        score_type: str | None = None,
         drilldown: str | None = None,
         **_kwargs
     ):
@@ -57,6 +57,8 @@ def render(
         with st.spinner(text="Loading data ..."):
             user_can_edit = authentication_service.current_user_has_edit_role()
             score_card = format_score_card(score_definition.as_score_card())
+            if not score_type:
+                score_type = "cde_score" if score_card["cde_score"] and not score_card["score"] else "score"
             if not drilldown:
                 score_breakdown = ScoreDefinitionBreakdownItem.filter(
                     definition_id=definition_id,