Merge branch 'master' of https://github.com/intellica-tech/reporting-…

…tool into dev
intellica-tech · Nov 22, 2023 · 4f6935b · 4f6935b
2 parents 8714c01 + e792e4e
commit 4f6935b
Show file tree

Hide file tree

Showing 56 changed files with 1,484 additions and 1,093 deletions.
diff --git a/README.md b/README.md
@@ -130,6 +130,7 @@ Here are some of the major database solutions that are supported:
   <img src="superset-frontend/src/assets/images/yugabyte.png" alt="yugabyte" border="0" width="200" height="80"/>
   <img src="superset-frontend/src/assets/images/databend.png" alt="databend" border="0" width="200" height="80"/>
   <img src="superset-frontend/src/assets/images/starrocks.png" alt="starrocks" border="0" width="200" height="80"/>
+  <img src="superset-frontend/src/assets/images/doris.png" alt="doris" border="0" width="200" height="80"/>
 </p>
 
 **A more comprehensive list of supported databases** along with the configuration instructions can be found [here](https://superset.apache.org/docs/databases/installing-database-drivers).

diff --git a/docs/docs/databases/doris.mdx b/docs/docs/databases/doris.mdx
@@ -0,0 +1,26 @@
+---
+title: Apache Doris
+hide_title: true
+sidebar_position: 5
+version: 1
+---
+
+## Doris
+
+The [sqlalchemy-doris](https://pypi.org/project/pydoris/) library is the recommended way to connect to Apache Doris through SQLAlchemy.
+
+You'll need the following setting values to form the connection string:
+
+- **User**: User Name
+- **Password**: Password
+- **Host**: Doris FE Host
+- **Port**: Doris FE port
+- **Catalog**: Catalog Name
+- **Database**: Database Name
+
+
+Here's what the connection string looks like:
+
+```
+doris://<User>:<Password>@<Host>:<Port>/<Catalog>.<Database>
+```
diff --git a/docs/docs/databases/installing-database-drivers.mdx b/docs/docs/databases/installing-database-drivers.mdx
diff --git a/docs/docs/intro.mdx b/docs/docs/intro.mdx
@@ -15,7 +15,7 @@ Here are a **few different ways you can get started with Superset**:
 
 - Install Superset [from scratch](https://superset.apache.org/docs/installation/installing-superset-from-scratch/)
 - Deploy Superset locally with one command
-  [using Docker Compose](installation/installing-superset-using-docker-compose)
+  [using Docker Compose](https://superset.apache.org/docs/installation/installing-superset-using-docker-compose)
 - Deploy Superset [with Kubernetes](https://superset.apache.org/docs/installation/running-on-kubernetes)
 - Run a [Docker image](https://hub.docker.com/r/apache/superset) from Dockerhub
 - Download Superset [from Pypi here](https://pypi.org/project/apache-superset/)

diff --git a/docs/src/resources/data.js b/docs/src/resources/data.js
@@ -117,4 +117,9 @@ export const Databases = [
     href: 'https://www.microsoft.com/en-us/sql-server',
     imgName: 'msql.png',
   },
+  {
+    title: 'Apache Doris',
+    href: 'https://doris.apache.org/',
+    imgName: 'doris.png',
+  },
 ];
diff --git a/docs/static/img/databases/doris.png b/docs/static/img/databases/doris.png
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -18,7 +18,10 @@ apsw==3.42.0.1
 async-timeout==4.0.2
     # via redis
 attrs==23.1.0
-    # via jsonschema
+    # via
+    #   cattrs
+    #   jsonschema
+    #   requests-cache
 babel==2.9.1
     # via flask-babel
 backoff==1.11.1
@@ -35,6 +38,8 @@ cachelib==0.9.0
     # via
     #   flask-caching
     #   flask-session
+cattrs==23.2.1
+    # via requests-cache
 celery==5.2.2
     # via apache-superset
 certifi==2023.7.22
@@ -85,6 +90,8 @@ dnspython==2.1.0
     # via email-validator
 email-validator==1.1.3
     # via flask-appbuilder
+exceptiongroup==1.1.1
+    # via cattrs
 flask==2.2.5
     # via
     #   apache-superset
@@ -136,7 +143,9 @@ geographiclib==1.52
 geopy==2.2.0
     # via apache-superset
 greenlet==2.0.2
-    # via shillelagh
+    # via
+    #   shillelagh
+    #   sqlalchemy
 gunicorn==21.2.0
     # via apache-superset
 hashids==1.3.1
@@ -152,7 +161,10 @@ idna==3.2
     #   email-validator
     #   requests
 importlib-metadata==6.6.0
-    # via apache-superset
+    # via
+    #   apache-superset
+    #   flask
+    #   shillelagh
 importlib-resources==5.12.0
     # via limits
 isodate==0.6.0
@@ -232,6 +244,8 @@ parsedatetime==2.6
     # via apache-superset
 pgsanity==0.2.9
     # via apache-superset
+platformdirs==3.8.1
+    # via requests-cache
 polyline==2.0.0
     # via apache-superset
 prison==0.2.1
@@ -285,12 +299,16 @@ pyyaml==6.0.1
 redis==4.5.4
     # via apache-superset
 requests==2.31.0
+    # via
+    #   requests-cache
+    #   shillelagh
+requests-cache==1.1.1
     # via shillelagh
 rich==13.3.4
     # via flask-limiter
 selenium==3.141.0
     # via apache-superset
-shillelagh==1.2.6
+shillelagh==1.2.10
     # via apache-superset
 shortid==0.1.2
     # via apache-superset
@@ -303,6 +321,7 @@ six==1.16.0
     #   paramiko
     #   prison
     #   python-dateutil
+    #   url-normalize
     #   wtforms-json
 slack-sdk==3.21.3
     # via apache-superset
@@ -328,14 +347,18 @@ tabulate==0.8.9
 typing-extensions==4.4.0
     # via
     #   apache-superset
+    #   cattrs
     #   flask-limiter
     #   limits
     #   shillelagh
 tzdata==2023.3
     # via pandas
+url-normalize==1.4.3
+    # via requests-cache
 urllib3==1.26.6
     # via
     #   requests
+    #   requests-cache
     #   selenium
 vine==5.0.0
     # via
@@ -363,7 +386,9 @@ wtforms-json==0.3.5
 xlsxwriter==3.0.7
     # via apache-superset
 zipp==3.15.0
-    # via importlib-metadata
+    # via
+    #   importlib-metadata
+    #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/development.txt b/requirements/development.txt
@@ -74,8 +74,6 @@ pickleshare==0.7.5
     # via ipython
 pillow==9.5.0
     # via apache-superset
-platformdirs==3.8.1
-    # via pylint
 progress==1.6
     # via -r requirements/development.in
 psycopg2-binary==2.9.6

diff --git a/requirements/testing.txt b/requirements/testing.txt
@@ -26,8 +26,6 @@ docker==6.1.1
     # via -r requirements/testing.in
 ephem==4.1.4
     # via lunarcalendar
-exceptiongroup==1.1.1
-    # via pytest
 flask-testing==0.8.1
     # via -r requirements/testing.in
 fonttools==4.39.4
@@ -123,8 +121,6 @@ pyee==9.0.4
     # via playwright
 pyfakefs==5.2.2
     # via -r requirements/testing.in
-pyhive[presto]==0.7.0
-    # via apache-superset
 pytest==7.3.1
     # via
     #   -r requirements/testing.in
@@ -144,8 +140,6 @@ rsa==4.9
     # via google-auth
 setuptools-git==1.2
     # via prophet
-shillelagh[gsheetsapi]==1.2.6
-    # via apache-superset
 sqlalchemy-bigquery==1.6.1
     # via apache-superset
 statsd==4.0.1

diff --git a/setup.py b/setup.py
@@ -118,7 +118,7 @@ def get_git_sha() -> str:
         "PyJWT>=2.4.0, <3.0",
         "redis>=4.5.4, <5.0",
         "selenium>=3.141.0, <4.10.0",
-        "shillelagh>=1.2.6,<2.0",
+        "shillelagh>=1.2.10, <2.0",
         "shortid",
         "sshtunnel>=0.4.0, <0.5",
         "simplejson>=3.15.0",
@@ -162,7 +162,7 @@ def get_git_sha() -> str:
         "excel": ["xlrd>=1.2.0, <1.3"],
         "firebird": ["sqlalchemy-firebird>=0.7.0, <0.8"],
         "firebolt": ["firebolt-sqlalchemy>=0.0.1"],
-        "gsheets": ["shillelagh[gsheetsapi]>=1.2.6, <2"],
+        "gsheets": ["shillelagh[gsheetsapi]>=1.2.10, <2"],
         "hana": ["hdbcli==2.4.162", "sqlalchemy_hana==0.4.0"],
         "hive": [
             "pyhive[hive]>=0.6.5;python_version<'3.11'",
@@ -191,7 +191,7 @@ def get_git_sha() -> str:
         "redshift": ["sqlalchemy-redshift>=0.8.1, < 0.9"],
         "rockset": ["rockset-sqlalchemy>=0.0.1, <1.0.0"],
         "shillelagh": [
-            "shillelagh[datasetteapi,gsheetsapi,socrata,weatherapi]>=1.2.6,<2"
+            "shillelagh[datasetteapi,gsheetsapi,socrata,weatherapi]>=1.2.10, <2"
         ],
         "snowflake": ["snowflake-sqlalchemy>=1.2.4, <2"],
         "spark": [
@@ -205,6 +205,7 @@ def get_git_sha() -> str:
         "vertica": ["sqlalchemy-vertica-python>=0.5.9, < 0.6"],
         "netezza": ["nzalchemy>=11.0.2"],
         "starrocks": ["starrocks>=1.0.0"],
+        "doris": ["pydoris>=1.0.0, <2.0.0"],
     },
     python_requires="~=3.9",
     author="Apache Software Foundation",

diff --git a/superset-frontend/lerna.json b/superset-frontend/lerna.json
@@ -1,7 +1,7 @@
 {
   "lerna": "3.2.1",
   "npmClient": "npm",
-  "packages": ["packages/*", "plugins/*"],
+  "packages": ["packages/*", "plugins/*", "src/setup/*"],
   "useWorkspaces": true,
   "version": "0.18.25",
   "ignoreChanges": [

diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
@@ -33,7 +33,8 @@
   },
   "workspaces": [
     "packages/*",
-    "plugins/*"
+    "plugins/*",
+    "src/setup/*"
   ],
   "scripts": {
     "_lint": "eslint --ignore-path=.eslintignore --ext .js,.jsx,.ts,tsx .",

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/transformProps.ts
@@ -104,7 +104,7 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
 
   const colorFn = CategoricalColorNamespace.getScale(colorScheme as string);
 
-  const legends: string[] = [];
+  const legends = new Set<string>();
   const series: ScatterSeriesOption[] = [];
 
   const xAxisLabel: string = getMetricLabel(x);
@@ -114,9 +114,8 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
   const refs: Refs = {};
 
   data.forEach(datum => {
-    const name =
-      ((bubbleSeries ? datum[bubbleSeries] : datum[entity]) as string) ||
-      NULL_STRING;
+    const dataName = bubbleSeries ? datum[bubbleSeries] : datum[entity];
+    const name = dataName ? String(dataName) : NULL_STRING;
     const bubbleSeriesValue = bubbleSeries ? datum[bubbleSeries] : null;
 
     series.push({
@@ -133,7 +132,7 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
       type: 'scatter',
       itemStyle: { color: colorFn(name), opacity },
     });
-    legends.push(name);
+    legends.add(name);
   });
 
   normalizeSymbolSize(series, maxBubbleSize);
@@ -196,7 +195,7 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
     },
     legend: {
       ...getLegendProps(legendType, legendOrientation, showLegend, theme),
-      data: legends,
+      data: Array.from(legends),
     },
     tooltip: {
       show: !inContextMenu,

diff --git a/superset-frontend/src/assets/images/doris.png b/superset-frontend/src/assets/images/doris.png
diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
diff --git a/superset-websocket/package.json b/superset-websocket/package.json
@@ -31,9 +31,9 @@
     "@types/ioredis": "^4.27.8",
     "@types/jest": "^27.0.2",
     "@types/jsonwebtoken": "^9.0.5",
-    "@types/node": "^20.9.1",
+    "@types/node": "^20.9.3",
     "@types/uuid": "^9.0.7",
-    "@types/ws": "^8.5.9",
+    "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^5.61.0",
     "@typescript-eslint/parser": "^5.62.0",
     "eslint": "^8.54.0",

diff --git a/superset/charts/data/api.py b/superset/charts/data/api.py
@@ -42,7 +42,7 @@
 from superset.charts.post_processing import apply_post_process
 from superset.charts.schemas import ChartDataQueryContextSchema
 from superset.common.chart_data import ChartDataResultFormat, ChartDataResultType
-from superset.connectors.base.models import BaseDatasource
+from superset.connectors.sqla.models import BaseDatasource
 from superset.daos.exceptions import DatasourceNotFound
 from superset.exceptions import QueryObjectValidationError
 from superset.extensions import event_logger