Merge pull request #165 from WeryZebra-Yue/d3-color-dependency

dependency(nivo): updated d3-color dependency
datachecks · Jan 4, 2024 · 223beeb · 223beeb
2 parents 2bae2a7 + 2eefd5a
commit 223beeb
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 65 deletions.
diff --git a/datachecks/report/dashboard.py b/datachecks/report/dashboard.py
@@ -141,7 +141,7 @@ def build(self):
         [dashboard, metrics] = self.__build_params()
         return DashboardInfo(name="test", metrics=metrics, dashboard=dashboard)
 
-    def __build_params(self) -> DashboardMetricOverview:
+    def __build_params(self):
         data = self.inspect_data
 
         self.metrics = []
@@ -170,12 +170,11 @@ def __build_params(self) -> DashboardMetricOverview:
             else:
                 for metric_identifier, metric in ds_metrics.metrics.items():
                     self._insert_value(metric)
-
         self.calculate_health_score()
         return [self.dashboard, self.metrics]
 
     def _insert_value(self, metric):
-        for metric_type in GroupedMetricsType.__dataclass_fields__.keys():
+        for metric_type in GroupedMetricsType.__members__.keys():
             if metric.metric_type in GroupedMetricsType[metric_type].value:
                 current = getattr(self.dashboard, metric_type)
                 overall = getattr(self.dashboard, "overall")

diff --git a/datachecks/report/models.py b/datachecks/report/models.py
@@ -64,26 +64,17 @@ class DashboardInfo:
     dashboard: DashboardMetricOverview
 
 
-@dataclass
-class GroupedMetricsType(str, Enum):
-    reliability: List[str] = dataclasses.field(
-        default_factory=lambda: ["row_count", "document_count", "freshness"]
-    )
-    numeric: List[str] = dataclasses.field(
-        default_factory=lambda: ["min", "max", "avg", "sum", "stddev", "variance"]
-    )
-    uniqueness: List[str] = dataclasses.field(
-        default_factory=lambda: ["distinct_count", "duplicate_count"]
-    )
-    completeness: List[str] = dataclasses.field(
-        default_factory=lambda: [
-            "null_count",
-            "null_percentage",
-            "empty_string_count",
-            "empty_string_percentage",
-        ]
-    )
-    custom: List[str] = dataclasses.field(default_factory=lambda: ["combined"])
+class GroupedMetricsType(List[str], Enum):
+    reliability = ["row_count", "document_count", "freshness"]
+    numeric = ["min", "max", "avg", "sum", "stddev", "variance"]
+    uniqueness = ["distinct_count", "duplicate_count"]
+    completeness = [
+        "null_count",
+        "null_percentage",
+        "empty_string_count",
+        "empty_string_percentage",
+    ]
+    custom = ["combined"]
 
 
 @dataclass

diff --git a/datachecks/report/static/index.js b/datachecks/report/static/index.js
diff --git a/datachecks/report/static/index.js.LICENSE.txt b/datachecks/report/static/index.js.LICENSE.txt
@@ -3034,10 +3034,6 @@
   !*** ./node_modules/@tanstack/match-sorter-utils/build/lib/index.mjs ***!
   \***********************************************************************/
 
-/*!***********************************************************************!*\
-  !*** ./node_modules/d3-interpolate/node_modules/d3-color/src/math.js ***!
-  \***********************************************************************/
-
 /*!***********************************************************************!*\
   !*** ./node_modules/d3-scale-chromatic/src/categorical/category10.js ***!
   \***********************************************************************/
@@ -3102,10 +3098,6 @@
   !*** ./node_modules/@popperjs/core/lib/dom-utils/listScrollParents.js ***!
   \************************************************************************/
 
-/*!************************************************************************!*\
-  !*** ./node_modules/d3-interpolate/node_modules/d3-color/src/color.js ***!
-  \************************************************************************/
-
 /*!************************************************************************!*\
   !*** ./node_modules/d3-scale-chromatic/src/sequential-multi/PuBuGn.js ***!
   \************************************************************************/
@@ -3178,10 +3170,6 @@
   !*** ./node_modules/@react-spring/web/dist/react-spring_web.modern.mjs ***!
   \*************************************************************************/
 
-/*!*************************************************************************!*\
-  !*** ./node_modules/d3-interpolate/node_modules/d3-color/src/define.js ***!
-  \*************************************************************************/
-
 /*!*************************************************************************!*\
   !*** ./node_modules/d3-scale-chromatic/src/sequential-multi/cividis.js ***!
   \*************************************************************************/
@@ -3310,10 +3298,6 @@
   !*** ./node_modules/@react-spring/core/dist/react-spring_core.modern.mjs ***!
   \***************************************************************************/
 
-/*!***************************************************************************!*\
-  !*** ./node_modules/d3-scale-chromatic/node_modules/d3-color/src/math.js ***!
-  \***************************************************************************/
-
 /*!***************************************************************************!*\
   !*** ./node_modules/d3-scale-chromatic/src/sequential-multi/cubehelix.js ***!
   \***************************************************************************/
@@ -3394,14 +3378,6 @@
   !*** ./node_modules/@popperjs/core/lib/dom-utils/getBoundingClientRect.js ***!
   \****************************************************************************/
 
-/*!****************************************************************************!*\
-  !*** ./node_modules/d3-interpolate/node_modules/d3-color/src/cubehelix.js ***!
-  \****************************************************************************/
-
-/*!****************************************************************************!*\
-  !*** ./node_modules/d3-scale-chromatic/node_modules/d3-color/src/color.js ***!
-  \****************************************************************************/
-
 /*!****************************************************************************!*\
   !*** ./node_modules/d3-scale/node_modules/d3-format/src/formatNumerals.js ***!
   \****************************************************************************/
@@ -3454,10 +3430,6 @@
   !*** ./node_modules/@react-spring/types/dist/react-spring_types.modern.mjs ***!
   \*****************************************************************************/
 
-/*!*****************************************************************************!*\
-  !*** ./node_modules/d3-scale-chromatic/node_modules/d3-color/src/define.js ***!
-  \*****************************************************************************/
-
 /*!*****************************************************************************!*\
   !*** ./node_modules/d3-scale/node_modules/d3-format/src/formatSpecifier.js ***!
   \*****************************************************************************/
@@ -3578,10 +3550,6 @@
   !*** ./node_modules/@popperjs/core/lib/utils/getOppositeVariationPlacement.js ***!
   \********************************************************************************/
 
-/*!********************************************************************************!*\
-  !*** ./node_modules/d3-scale-chromatic/node_modules/d3-color/src/cubehelix.js ***!
-  \********************************************************************************/
-
 /*!********************************************************************************!*\
   !*** ./src/components/Preview/Overview/MetricContent/MetricContent.module.css ***!
   \********************************************************************************/

diff --git a/examples/configurations/example_postgres_config.yaml b/examples/configurations/example_postgres_config.yaml
@@ -1,6 +1,6 @@
 # Data sources to query
 data_sources:
-  - name: iris_pgsql
+  - name: iris
     type: postgres
     connection:
       host: 127.0.0.1
@@ -132,4 +132,4 @@ metrics:
 storage:
   type: local_file|s3|elastic|postgres|clickhouse
   params:
-    path: /Users/subhankar/Work/datageek00/dcs_metrics
+    path: /Users/subhankar/Work/datageek00/dcs_metrics
diff --git a/ui/package.json b/ui/package.json
@@ -37,7 +37,9 @@
     "ts-loader": "^9.5.1",
     "webpack": "^5.89.0"
   },
-  "resolutions": {},
+  "resolutions": {
+    "d3-color": "^3.1.0"
+  },
   "devDependencies": {
     "source-map-explorer": "^2.5.0",
     "terser-webpack-plugin": "^5.3.1",

diff --git a/ui/src/types/component.type.ts b/ui/src/types/component.type.ts
@@ -27,6 +27,10 @@ export interface MetricHeader {
 export const TabsProps: TabsOwnProps = {
   sx: {
     borderColor: "divider",
+    "& .MuiTouchRipple-root": {
+      color: "rgba(163, 229, 246, 0.376)",
+      borderRadius: "10px",
+    },
   },
   variant: "scrollable",
   textColor: "inherit",
@@ -42,6 +46,10 @@ export const TabsProps: TabsOwnProps = {
 export const VerticalTabsProps: TabsOwnProps = {
   sx: {
     borderColor: "divider",
+    "& .MuiTouchRipple-root": {
+      color: "rgba(163, 229, 246, 0.376)",
+      borderRadius: "10px",
+    },
   },
   orientation: "vertical",
   variant: "scrollable",

diff --git a/ui/yarn.lock b/ui/yarn.lock
@@ -1905,12 +1905,7 @@ d3-array@2, d3-array@^2.3.0:
   dependencies:
     internmap "^1.0.0"
 
-"d3-color@1 - 2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e"
-  integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==
-
-"d3-color@1 - 3", d3-color@^3.1.0:
+"d3-color@1 - 2", "d3-color@1 - 3", d3-color@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
   integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==