From 90a3fdb8e2649c6364cef61b3ebf29f7547c20c9 Mon Sep 17 00:00:00 2001 From: cccs-Dustin <96579982+cccs-Dustin@users.noreply.github.com> Date: Wed, 14 Sep 2022 09:33:06 -0400 Subject: [PATCH 1/2] Fixed issue with Typescript --- .../packages/superset-ui-core/src/query/types/Column.ts | 1 + .../plugin-chart-cccs-grid/src/plugin/transformProps.ts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/superset-frontend/packages/superset-ui-core/src/query/types/Column.ts b/superset-frontend/packages/superset-ui-core/src/query/types/Column.ts index 78e4a301c960d..4e9a13651e4ab 100644 --- a/superset-frontend/packages/superset-ui-core/src/query/types/Column.ts +++ b/superset-frontend/packages/superset-ui-core/src/query/types/Column.ts @@ -37,6 +37,7 @@ export type PhysicalColumn = string; * Column information defined in datasource. */ export interface Column { + advanced_data_type?: string; id: number; type?: string; type_generic?: GenericDataType; diff --git a/superset-frontend/src/cccs-viz/plugins/plugin-chart-cccs-grid/src/plugin/transformProps.ts b/superset-frontend/src/cccs-viz/plugins/plugin-chart-cccs-grid/src/plugin/transformProps.ts index 59d1a60573a30..c60886f651b39 100644 --- a/superset-frontend/src/cccs-viz/plugins/plugin-chart-cccs-grid/src/plugin/transformProps.ts +++ b/superset-frontend/src/cccs-viz/plugins/plugin-chart-cccs-grid/src/plugin/transformProps.ts @@ -106,7 +106,9 @@ export default function transformProps(chartProps: CccsGridChartProps) { // @ts-ignore const name = column.column_name; // @ts-ignore - columnMap[name] = ((column.advanced_data_type as string) ?? '').toUpperCase(); + columnMap[name] = ( + (column.advanced_data_type as string) ?? '' + ).toUpperCase(); return columnMap; }, columnAdvancedTypeMap); From bb9ffe596e32095b1972270965bac35229312803 Mon Sep 17 00:00:00 2001 From: cccs-Dustin <96579982+cccs-Dustin@users.noreply.github.com> Date: Wed, 14 Sep 2022 10:25:30 -0400 Subject: [PATCH 2/2] Update image tag --- cccs-build/superset/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cccs-build/superset/Dockerfile b/cccs-build/superset/Dockerfile index 154aa121036ca..1f61ece92288a 100644 --- a/cccs-build/superset/Dockerfile +++ b/cccs-build/superset/Dockerfile @@ -1,7 +1,7 @@ # Vault CA container import ARG VAULT_CA_CONTAINER=uchimera.azurecr.io/cccs/hogwarts/vault-ca:master_2921_22315d60 FROM $VAULT_CA_CONTAINER AS vault_ca -FROM uchimera.azurecr.io/cccs/superset-base:cccs-2.0_20220912142906_b4831 +FROM uchimera.azurecr.io/cccs/superset-base:cccs-2.0_20220914141024_b4860 USER root