Merge branch 'apache:master' into master

.github/workflows/ephemeral-env.yml

@@ -4,11 +4,6 @@ on:
   issue_comment:
     types: [created]
 
-# cancel previous workflow jobs for PRs
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}
-  cancel-in-progress: true
-
 jobs:
   config:
     runs-on: "ubuntu-latest"
@@ -25,6 +20,9 @@ jobs:
           fi
 
   ephemeral-env-comment:
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}-comment
+      cancel-in-progress: true
     needs: config
     if: needs.config.outputs.has-secrets
     name: Evaluate ephemeral env comment trigger (/testenv)
@@ -85,6 +83,9 @@ jobs:
           core.setFailed(errMsg)
 
   ephemeral-docker-build:
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}-build
+      cancel-in-progress: true
     needs: ephemeral-env-comment
     name: ephemeral-docker-build
     runs-on: ubuntu-latest

RESOURCES/FEATURE_FLAGS.md

@@ -45,6 +45,7 @@ These features are **finished** but currently being tested. They are usable, but
 - CONFIRM_DASHBOARD_DIFF
 - DRILL_TO_DETAIL
 - DYNAMIC_PLUGINS: [(docs)](https://superset.apache.org/docs/installation/running-on-kubernetes)
+- ENABLE_SUPERSET_META_DB: [(docs)](https://superset.apache.org/docs/databases/meta-database/)
 - ESTIMATE_QUERY_COST
 - GLOBAL_ASYNC_QUERIES [(docs)](https://github.com/apache/superset/blob/master/CONTRIBUTING.md#async-chart-queries)
 - HORIZONTAL_FILTER_BAR

helm/superset/Chart.yaml

@@ -29,7 +29,7 @@ maintainers:
   - name: craig-rueda
     email: craig@craigrueda.com
     url: https://github.com/craig-rueda
-version: 0.12.4
+version: 0.12.5
 dependencies:
   - name: postgresql
     version: 12.1.6

helm/superset/README.md

@@ -23,7 +23,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs
 
 # superset
 
-![Version: 0.12.4](https://img.shields.io/badge/Version-0.12.4-informational?style=flat-square)
+![Version: 0.12.5](https://img.shields.io/badge/Version-0.12.5-informational?style=flat-square)
 
 Apache Superset is a modern, enterprise-ready business intelligence web application
 

helm/superset/templates/_helpers.tpl

@@ -78,7 +78,7 @@ REDIS_BASE_URL=f"{env('REDIS_PROTO')}://{env('REDIS_HOST')}:{env('REDIS_PORT')}"
 
 # Redis URL Params
 {{- if .Values.supersetNode.connections.redis_ssl.enabled }}
-REDIS_URL_PARAMS = f"?ssl_cert_req={env('REDIS_SSL_CERT_REQS')}"
+REDIS_URL_PARAMS = f"?ssl_cert_reqs={env('REDIS_SSL_CERT_REQS')}"
 {{- else }}
 REDIS_URL_PARAMS = ""
 {{- end}}

scripts/build_docker.py

@@ -28,7 +28,7 @@
 BASE_PY_IMAGE = "3.9-slim-bookworm"
 
 
-def run_cmd(command: str) -> str:
+def run_cmd(command: str, raise_on_failure: bool = True) -> str:
     process = subprocess.Popen(
         command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True
     )
@@ -41,9 +41,8 @@ def run_cmd(command: str) -> str:
 
     process.wait()  # Wait for the subprocess to finish
 
-    if process.returncode != 0:
+    if process.returncode != 0 and raise_on_failure:
         raise subprocess.CalledProcessError(process.returncode, command, output)
-
     return output
 
 
@@ -73,7 +72,13 @@ def get_build_context_ref(build_context: str) -> str:
 
 
 def is_latest_release(release: str) -> bool:
-    output = run_cmd(f"./scripts/tag_latest_release.sh {release} --dry-run") or ""
+    output = (
+        run_cmd(
+            f"./scripts/tag_latest_release.sh {release} --dry-run",
+            raise_on_failure=False,
+        )
+        or ""
+    )
     return "SKIP_TAG::false" in output
 
 

setup.py

@@ -154,7 +154,7 @@ def get_git_sha() -> str:
         ],
         "db2": ["ibm-db-sa>0.3.8, <=0.4.0"],
         "dremio": ["sqlalchemy-dremio>=1.1.5, <1.3"],
-        "drill": ["sqlalchemy-drill==0.1.dev"],
+        "drill": ["sqlalchemy-drill>=1.1.4, <2"],
         "druid": ["pydruid>=0.6.5,<0.7"],
         "duckdb": ["duckdb-engine>=0.9.5, <0.10"],
         "dynamodb": ["pydynamodb>=0.4.2"],

superset-frontend/package.json

@@ -134,7 +134,7 @@
     "core-js": "^3.6.5",
     "d3-scale": "^2.1.2",
     "dom-to-image-more": "^3.2.0",
-    "dom-to-pdf": "^0.3.2",
+    "dom-to-pdf": "^0.3.1",
     "emotion-rgba": "0.0.12",
     "fast-glob": "^3.2.7",
     "fontsource-fira-code": "^4.0.0",

superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx

@@ -354,6 +354,7 @@ export default styled(BigNumberVis)`
     .header-line {
       position: relative;
       line-height: 1em;
+      white-space: nowrap;
       span {
         position: absolute;
         bottom: 0;

superset-frontend/plugins/plugin-chart-period-over-period-kpi/src/PopKPI.tsx

@@ -16,9 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { createRef } from 'react';
+import React, { createRef, useMemo } from 'react';
 import { css, styled, useTheme } from '@superset-ui/core';
-import { PopKPIComparisonValueStyleProps, PopKPIProps } from './types';
+import {
+  PopKPIComparisonSymbolStyleProps,
+  PopKPIComparisonValueStyleProps,
+  PopKPIProps,
+} from './types';
 
 const ComparisonValue = styled.div<PopKPIComparisonValueStyleProps>`
   ${({ theme, subheaderFontSize }) => `
@@ -30,16 +34,29 @@ const ComparisonValue = styled.div<PopKPIComparisonValueStyleProps>`
   `}
 `;
 
+const SymbolWrapper = styled.div<PopKPIComparisonSymbolStyleProps>`
+  ${({ theme, backgroundColor, textColor }) => `
+    background-color: ${backgroundColor};
+    color: ${textColor};
+    padding: ${theme.gridUnit}px ${theme.gridUnit * 2}px;
+    border-radius: ${theme.gridUnit * 2}px;
+    display: inline-block;
+    margin-right: ${theme.gridUnit}px;
+  `}
+`;
+
 export default function PopKPI(props: PopKPIProps) {
   const {
     height,
     width,
     bigNumber,
     prevNumber,
     valueDifference,
-    percentDifference,
+    percentDifferenceFormattedString,
     headerFontSize,
     subheaderFontSize,
+    comparisonColorEnabled,
+    percentDifferenceNumber,
   } = props;
 
   const rootElem = createRef<HTMLDivElement>();
@@ -63,9 +80,60 @@ export default function PopKPI(props: PopKPIProps) {
     text-align: center;
   `;
 
+  const getArrowIndicatorColor = () => {
+    if (!comparisonColorEnabled) return theme.colors.grayscale.base;
+    return percentDifferenceNumber > 0
+      ? theme.colors.success.base
+      : theme.colors.error.base;
+  };
+
+  const arrowIndicatorStyle = css`
+    color: ${getArrowIndicatorColor()};
+    margin-left: ${theme.gridUnit}px;
+  `;
+
+  const defaultBackgroundColor = theme.colors.grayscale.light4;
+  const defaultTextColor = theme.colors.grayscale.base;
+  const { backgroundColor, textColor } = useMemo(() => {
+    let bgColor = defaultBackgroundColor;
+    let txtColor = defaultTextColor;
+    if (percentDifferenceNumber > 0) {
+      if (comparisonColorEnabled) {
+        bgColor = theme.colors.success.light2;
+        txtColor = theme.colors.success.base;
+      }
+    } else if (percentDifferenceNumber < 0) {
+      if (comparisonColorEnabled) {
+        bgColor = theme.colors.error.light2;
+        txtColor = theme.colors.error.base;
+      }
+    }
+
+    return {
+      backgroundColor: bgColor,
+      textColor: txtColor,
+    };
+  }, [theme, comparisonColorEnabled, percentDifferenceNumber]);
+
+  const SYMBOLS_WITH_VALUES = useMemo(
+    () => [
+      ['#', prevNumber],
+      ['△', valueDifference],
+      ['%', percentDifferenceFormattedString],
+    ],
+    [prevNumber, valueDifference, percentDifferenceFormattedString],
+  );
+
   return (
     <div ref={rootElem} css={wrapperDivStyles}>
-      <div css={bigValueContainerStyles}>{bigNumber}</div>
+      <div css={bigValueContainerStyles}>
+        {bigNumber}
+        {percentDifferenceNumber !== 0 && (
+          <span css={arrowIndicatorStyle}>
+            {percentDifferenceNumber > 0 ? '↑' : '↓'}
+          </span>
+        )}
+      </div>
       <div
         css={css`
           width: 100%;
@@ -77,18 +145,22 @@ export default function PopKPI(props: PopKPIProps) {
             display: table-row;
           `}
         >
-          <ComparisonValue subheaderFontSize={subheaderFontSize}>
-            {' '}
-            #: {prevNumber}
-          </ComparisonValue>
-          <ComparisonValue subheaderFontSize={subheaderFontSize}>
-            {' '}
-            Δ: {valueDifference}
-          </ComparisonValue>
-          <ComparisonValue subheaderFontSize={subheaderFontSize}>
-            {' '}
-            %: {percentDifference}
-          </ComparisonValue>
+          {SYMBOLS_WITH_VALUES.map((symbol_with_value, index) => (
+            <ComparisonValue
+              key={`comparison-symbol-${symbol_with_value[0]}`}
+              subheaderFontSize={subheaderFontSize}
+            >
+              <SymbolWrapper
+                backgroundColor={
+                  index > 0 ? backgroundColor : defaultBackgroundColor
+                }
+                textColor={index > 0 ? textColor : defaultTextColor}
+              >
+                {symbol_with_value[0]}
+              </SymbolWrapper>
+              {symbol_with_value[1]}
+            </ComparisonValue>
+          ))}
         </div>
       </div>
     </div>