Merge branch 'cccs-3.1' into bug/cldn-2053

CybercentreCanada · Jul 5, 2024 · d843994 · d843994
2 parents 020d3d2 + 8ac9bb3
commit d843994
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/cccs-build/superset/Dockerfile b/cccs-build/superset/Dockerfile
@@ -1,6 +1,7 @@
 # Vault CA container import
 ARG VAULT_CA_CONTAINER=uchimera.azurecr.io/cccs/hogwarts/vault-ca:master_11376_a25c34e1
 FROM $VAULT_CA_CONTAINER AS vault_ca
+
 FROM uchimera.azurecr.io/cccs/superset-base:bug_cldn-2053_20240612222439_b10314
 
 USER root

diff --git a/superset-frontend/src/cccs-viz/plugins/plugin-chart-ag-grid/src/ag-grid/AGGridViz.tsx b/superset-frontend/src/cccs-viz/plugins/plugin-chart-ag-grid/src/ag-grid/AGGridViz.tsx
@@ -9,7 +9,6 @@ import React, {
 
 import 'ag-grid-enterprise';
 
-import { theme } from 'src/preamble';
 import { AgGridReact, AgGridReact as AgGridReactType } from 'ag-grid-react';
 
 import { ClientSideRowModelModule } from '@ag-grid-community/client-side-row-model';
@@ -77,10 +76,6 @@ const paginationStyles = css`
   margin-right: 0.5rem;
 `;
 
-const highlightedCell = css`
-  background-color: ${theme.colors.primary.light3};
-`;
-
 export default function AGGridViz({
   columnDefs,
   rowData,
@@ -104,22 +99,6 @@ export default function AGGridViz({
   const crossFilterValue = useSelector<RootState, any>(
     state => state.dataMask[formData.sliceId]?.filterState?.value,
   );
-
-  const getCellClass = useCallback(
-    params => {
-      if (crossFilterValue?.includes(params.value)) {
-        return highlightedCell;
-      }
-      return '';
-    },
-    [crossFilterValue],
-  );
-
-  const updatedColumnDefs = columnDefs.map(colDef => ({
-    ...colDef,
-    cellClass: getCellClass,
-  }));
-
   const dispatch = useDispatch();
   const emitGlobalFilter = useEmitGlobalFilter();
 
@@ -711,7 +690,7 @@ export default function AGGridViz({
         <AgGridReact
           ref={gridRef}
           className="ag-theme-balham"
-          columnDefs={updatedColumnDefs}
+          columnDefs={columnDefs}
           defaultColDef={DEFAULT_COL_DEF}
           enableRangeSelection
           rowData={rowData}