Merge branch 'master' of https://github.com/apache/superset into hxgh…

…-ssh-dynamic-form

Dockerfile

@@ -58,6 +58,7 @@ RUN mkdir -p ${PYTHONPATH} \
  && apt-get update -y \
  && apt-get install -y --no-install-recommends \
  build-essential \
+ curl \
  default-libmysqlclient-dev \
  libsasl2-dev \
  libsasl2-modules-gssapi-mit \

RESOURCES/INTHEWILD.md

@@ -40,6 +40,7 @@ Join our growing community!
 - [Cape Crypto](https://capecrypto.com)
 - [Capital Service S.A.](http://capitalservice.pl) [@pkonarzewski]
 - [Clark.de](http://clark.de/)
+- [KarrotPay](https://www.daangnpay.com/)
 - [Wise](https://wise.com) [@koszti]
 - [Xendit](http://xendit.co/) [@LieAlbertTriAdrian]
 
@@ -72,6 +73,7 @@ Join our growing community!
 - [Apollo GraphQL](https://www.apollographql.com/) [@evans]
 - [Astronomer](https://www.astronomer.io) [@ryw]
 - [Avesta Technologies](https://avestatechnologies.com/) [@TheRum]
+- [Careem](https://www.careem.com/) [@SamraHanifCareem]
 - [Cloudsmith](https://cloudsmith.io) [@alancarson]
 - [CnOvit](http://www.cnovit.com/) [@xieshaohu]
 - [Deepomatic](https://deepomatic.com/) [@Zanoellia]

requirements/base.txt

@@ -32,7 +32,9 @@ cachelib==0.4.1
 celery==5.2.2
  # via apache-superset
 cffi==1.15.1
- # via cryptography
+ # via
+ # cryptography
+ # pynacl
 click==8.0.4
  # via
  # apache-superset
@@ -80,7 +82,7 @@ flask==2.1.3
  # flask-migrate
  # flask-sqlalchemy
  # flask-wtf
-flask-appbuilder==4.1.6
+flask-appbuilder==4.2.0
  # via apache-superset
 flask-babel==1.0.0
  # via flask-appbuilder

superset-embedded-sdk/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@superset-ui/embedded-sdk",
- "version": "0.1.0-alpha.7",
+ "version": "0.1.0-alpha.8",
  "description": "SDK for embedding resources from Superset into your own application",
  "access": "public",
  "keywords": [

superset-frontend/packages/superset-ui-chart-controls/src/sections/advancedAnalytics.tsx

@@ -108,20 +108,18 @@ export const advancedAnalyticsControls: ControlPanelSectionConfig = {
  multi: true,
  freeForm: true,
  label: t('Time shift'),
- choices: formatSelectOptions([
- '1 day ago',
- '1 week ago',
- '28 days ago',
- '30 days ago',
- '52 weeks ago',
- '1 year ago',
- '104 weeks ago',
- '2 years ago',
- '156 weeks ago',
- '3 years ago',
- '208 weeks ago',
- '4 years ago',
- ]),
+ choices: [
+ ['1 day ago', t('1 day ago')],
+ ['1 week ago', t('1 week ago')],
+ ['28 days ago', t('28 days ago')],
+ ['30 days ago', t('30 days ago')],
+ ['52 weeks ago', t('52 weeks ago')],
+ ['1 year ago', t('1 year ago')],
+ ['104 weeks ago', t('104 weeks ago')],
+ ['2 years ago', t('2 years ago')],
+ ['156 weeks ago', t('156 weeks ago')],
+ ['3 years ago', t('3 years ago')],
+ ],
  description: t(
  'Overlay one or more timeseries from a ' +
  'relative time period. Expects relative time deltas ' +
@@ -139,10 +137,10 @@ export const advancedAnalyticsControls: ControlPanelSectionConfig = {
  label: t('Calculation type'),
  default: 'values',
  choices: [
- [ComparisionType.Values, 'Actual values'],
- [ComparisionType.Difference, 'Difference'],
- [ComparisionType.Percentage, 'Percentage change'],
- [ComparisionType.Ratio, 'Ratio'],
+ [ComparisionType.Values, t('Actual values')],
+ [ComparisionType.Difference, t('Difference')],
+ [ComparisionType.Percentage, t('Percentage change')],
+ [ComparisionType.Ratio, t('Ratio')],
  ],
  description: t(
  'How to display time shifts: as individual lines; as the ' +
@@ -162,14 +160,14 @@ export const advancedAnalyticsControls: ControlPanelSectionConfig = {
  label: t('Rule'),
  default: null,
  choices: [
- ['1T', '1 minutely frequency'],
- ['1H', '1 hourly frequency'],
- ['1D', '1 calendar day frequency'],
- ['7D', '7 calendar day frequency'],
- ['1MS', '1 month start frequency'],
- ['1M', '1 month end frequency'],
- ['1AS', '1 year start frequency'],
- ['1A', '1 year end frequency'],
+ ['1T', t('1 minutely frequency')],
+ ['1H', t('1 hourly frequency')],
+ ['1D', t('1 calendar day frequency')],
+ ['7D', t('7 calendar day frequency')],
+ ['1MS', t('1 month start frequency')],
+ ['1M', t('1 month end frequency')],
+ ['1AS', t('1 year start frequency')],
+ ['1A', t('1 year end frequency')],
  ],
  description: t('Pandas resample rule'),
  },

superset-frontend/packages/superset-ui-chart-controls/src/sections/chartTitle.tsx

@@ -24,7 +24,10 @@ import { formatSelectOptions } from '../utils';
 export const TITLE_MARGIN_OPTIONS: number[] = [
  15, 30, 50, 75, 100, 125, 150, 200,
 ];
-export const TITLE_POSITION_OPTIONS: string[] = ['Left', 'Top'];
+export const TITLE_POSITION_OPTIONS: [string, string][] = [
+ ['Left', t('Left')],
+ ['Top', t('Top')],
+];
 export const titleControls: ControlPanelSectionConfig = {
  label: t('Chart Title'),
  tabOverride: 'customize',
@@ -95,8 +98,8 @@ export const titleControls: ControlPanelSectionConfig = {
  clearable: false,
  label: t('Y AXIS TITLE POSITION'),
  renderTrigger: true,
- default: TITLE_POSITION_OPTIONS[0],
- choices: formatSelectOptions(TITLE_POSITION_OPTIONS),
+ default: TITLE_POSITION_OPTIONS[0][0],
+ choices: TITLE_POSITION_OPTIONS,
  description: t('Changing this control takes effect instantly'),
  },
  },

superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx

@@ -157,22 +157,22 @@ const granularity: SharedControlConfig<'SelectControl'> = {
  label: TIME_FILTER_LABELS.granularity,
  default: 'one day',
  choices: [
- [null, 'all'],
- ['PT5S', '5 seconds'],
- ['PT30S', '30 seconds'],
- ['PT1M', '1 minute'],
- ['PT5M', '5 minutes'],
- ['PT30M', '30 minutes'],
- ['PT1H', '1 hour'],
- ['PT6H', '6 hour'],
- ['P1D', '1 day'],
- ['P7D', '7 days'],
- ['P1W', 'week'],
- ['week_starting_sunday', 'week starting Sunday'],
- ['week_ending_saturday', 'week ending Saturday'],
- ['P1M', 'month'],
- ['P3M', 'quarter'],
- ['P1Y', 'year'],
+ [null, t('all')],
+ ['PT5S', t('5 seconds')],
+ ['PT30S', t('30 seconds')],
+ ['PT1M', t('1 minute')],
+ ['PT5M', t('5 minutes')],
+ ['PT30M', t('30 minutes')],
+ ['PT1H', t('1 hour')],
+ ['PT6H', t('6 hour')],
+ ['P1D', t('1 day')],
+ ['P7D', t('7 days')],
+ ['P1W', t('week')],
+ ['week_starting_sunday', t('week starting Sunday')],
+ ['week_ending_saturday', t('week ending Saturday')],
+ ['P1M', t('month')],
+ ['P3M', t('quarter')],
+ ['P1Y', t('year')],
  ],
  description: t(
  'The time granularity for the visualization. Note that you ' +

superset-frontend/packages/superset-ui-core/src/chart/components/FallbackComponent.tsx

@@ -18,6 +18,7 @@
  */
 
 import React from 'react';
+import { t } from '@superset-ui/core';
 import { SupersetTheme } from '../../style';
 import { FallbackPropsWithDimension } from './SuperChart';
 
@@ -41,13 +42,13 @@ export default function FallbackComponent({
  >
  <div>
  <div>
- <b>Oops! An error occurred!</b>
+ <b>{t('Oops! An error occurred!')}</b>
  </div>
  <code>{error ? error.toString() : 'Unknown Error'}</code>
  </div>
  {componentStack && (
  <div>
- <b>Stack Trace:</b>
+ <b>{t('Stack Trace:')}</b>
  <code>
  {componentStack.split('\n').map((row: string) => (
  <div key={row}>{row}</div>

superset-frontend/packages/superset-ui-core/src/chart/components/SuperChartCore.tsx

@@ -19,6 +19,7 @@
 
 /* eslint-disable react/jsx-sort-default-props */
 import * as React from 'react';
+import { t } from '@superset-ui/core';
 import { createSelector } from 'reselect';
 import getChartComponentRegistry from '../registries/ChartComponentRegistrySingleton';
 import getChartTransformPropsRegistry from '../registries/ChartTransformPropsRegistrySingleton';
@@ -167,7 +168,7 @@ export default class SuperChartCore extends React.PureComponent<Props, {}> {
  if (error) {
  return (
  <div className="alert alert-warning" role="alert">
- <strong>ERROR</strong>&nbsp;
+ <strong>{t('ERROR')}</strong>&nbsp;
  <code>chartType=&quot;{chartType}&quot;</code> &mdash;
  {error.toString()}
  </div>

superset-frontend/packages/superset-ui-demo/storybook/shared/components/VerifyCORS.tsx

@@ -23,6 +23,7 @@ import {
  Method,
  makeApi,
  SupersetApiError,
+ t,
 } from '@superset-ui/core';
 import ErrorMessage from './ErrorMessage';
 
@@ -121,7 +122,7 @@ export default class VerifyCORS extends React.Component<Props, State> {
  className="btn btn-primary btn-sm"
  onClick={this.handleVerify}
  >
- Verify
+ {t('Verify')}
  </button>
  <br />
  <br />

superset-frontend/packages/superset-ui-switchboard/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@superset-ui/switchboard",
- "version": "0.18.26-0",
+ "version": "0.18.26-1",
  "description": "Switchboard is a library to make it easier to communicate across browser windows using the MessageChannel API",
  "sideEffects": false,
  "main": "lib/index.js",

superset-frontend/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts

@@ -21,7 +21,6 @@ import {
  ControlPanelConfig,
  D3_FORMAT_DOCS,
  D3_TIME_FORMAT_OPTIONS,
- formatSelectOptions,
  getStandardizedControls,
  sections,
 } from '@superset-ui/chart-controls';
@@ -40,13 +39,13 @@ const config: ControlPanelConfig = {
  type: 'SelectControl',
  label: t('Domain'),
  default: 'month',
- choices: formatSelectOptions([
- 'hour',
- 'day',
- 'week',
- 'month',
- 'year',
- ]),
+ choices: [
+ ['hour', t('hour')],
+ ['day', t('day')],
+ ['week', t('week')],
+ ['month', t('month')],
+ ['year', t('year')],
+ ],
  description: t('The time unit used for the grouping of blocks'),
  },
  },
@@ -56,13 +55,13 @@ const config: ControlPanelConfig = {
  type: 'SelectControl',
  label: t('Subdomain'),
  default: 'day',
- choices: formatSelectOptions([
- 'min',
- 'hour',
- 'day',
- 'week',
- 'month',
- ]),
+ choices: [
+ ['min', t('min')],
+ ['hour', t('hour')],
+ ['day', t('day')],
+ ['week', t('week')],
+ ['month', t('month')],
+ ],
  description: t(
  'The time unit for each block. Should be a smaller unit than ' +
  'domain_granularity. Should be larger or equal to Time Grain',