[pull] master from apache:master

superset-frontend/packages/superset-core/package.json

@@ -43,7 +43,8 @@
     "react-loadable": "^5.5.0",
     "tinycolor2": "*",
     "lodash": "^4.17.21",
-    "antd": "^5.26.0"
+    "antd": "^5.26.0",
+    "jed": "^1.1.1"
   },
   "scripts": {
     "clean": "rm -rf lib tsconfig.tsbuildinfo",

superset-frontend/packages/superset-core/src/index.ts

@@ -18,3 +18,4 @@
  */
 export * from './api';
 export * from './ui';
+export * from './utils';

superset-frontend/packages/superset-core/src/spec/utils/logging.test.ts

@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+beforeEach(() => {
+  jest.resetModules();
+  jest.resetAllMocks();
+});
+
+it('should pipe to `console` methods', () => {
+  const { logging } = require('@apache-superset/core');
+
+  jest.spyOn(logging, 'debug').mockImplementation();
+  jest.spyOn(logging, 'log').mockImplementation();
+  jest.spyOn(logging, 'info').mockImplementation();
+  expect(() => {
+    logging.debug();
+    logging.log();
+    logging.info();
+  }).not.toThrow();
+
+  jest.spyOn(logging, 'warn').mockImplementation(() => {
+    throw new Error('warn');
+  });
+  expect(() => logging.warn()).toThrow('warn');
+
+  jest.spyOn(logging, 'error').mockImplementation(() => {
+    throw new Error('error');
+  });
+  expect(() => logging.error()).toThrow('error');
+
+  jest.spyOn(logging, 'trace').mockImplementation(() => {
+    throw new Error('Trace:');
+  });
+  expect(() => logging.trace()).toThrow('Trace:');
+});
+
+it('should use noop functions when console unavailable', () => {
+  Object.assign(window, { console: undefined });
+  const { logging } = require('@apache-superset/core');
+
+  expect(() => {
+    logging.debug();
+    logging.log();
+    logging.info();
+    logging.warn('warn');
+    logging.error('error');
+    logging.trace();
+    logging.table([
+      [1, 2],
+      [3, 4],
+    ]);
+  }).not.toThrow();
+  Object.assign(window, { console });
+});

superset-frontend/packages/superset-core/src/ui/index.ts

@@ -18,3 +18,4 @@
  */
 export * from './theme';
 export * from './components';
+export * from './translation';

superset-frontend/packages/superset-ui-core/src/translation/Translator.ts → superset-frontend/packages/superset-core/src/ui/translation/Translator.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 import UntypedJed from 'jed';
-import logging from '../utils/logging';
+import logging from '../../utils/logging';
 import {
   Jed,
   TranslatorConfig,

superset-frontend/packages/superset-ui-core/src/translation/index.ts → superset-frontend/packages/superset-core/src/ui/translation/index.ts

@@ -19,6 +19,7 @@
 
 export * from './TranslatorSingleton';
 export * from './types';
+export { default as Translator } from './Translator';
 
 export default {};
 

superset-frontend/packages/superset-ui-core/test/translation/languagePacks/zh.ts → superset-frontend/packages/superset-core/src/utils/index.ts

@@ -1,4 +1,4 @@
-/*
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -17,21 +17,4 @@
  * under the License.
  */
 
-import { LanguagePack } from '@superset-ui/core';
-
-const languagePack: LanguagePack = {
-  domain: 'superset',
-  locale_data: {
-    superset: {
-      '': {
-        domain: 'superset',
-        plural_forms: 'nplurals=1; plural=0;',
-        lang: 'zh',
-      },
-      second: ['秒'],
-      'Copy of %s': ['%s 的副本'],
-    },
-  },
-};
-
-export default languagePack;
+export { default as logging } from './logging';

superset-frontend/packages/superset-ui-core/src/utils/logging.ts → superset-frontend/packages/superset-core/src/utils/logging.ts

@@ -31,7 +31,7 @@ const logger = {
 };
 
 /**
- * Superset frontend logger, currently just an alias to console.
+ * Superset logger, currently just an alias to console.
  * This may be extended to support numerous console operations safely
  * i.e.: https://developer.mozilla.org/en-US/docs/Web/API/Console
  */

superset-frontend/packages/superset-ui-chart-controls/src/components/CertifiedIconWithTooltip.tsx

@@ -17,7 +17,7 @@
  * under the License.
  */
 import { kebabCase } from 'lodash';
-import { t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
 import { useTheme, styled } from '@apache-superset/core/ui';
 import { Tooltip } from '@superset-ui/core/components';
 

superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnTypeLabel/ColumnTypeLabel.tsx

@@ -18,7 +18,7 @@
  * under the License.
  */
 import { ReactNode } from 'react';
-import { t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
 import { css, styled } from '@apache-superset/core/ui';
 import { GenericDataType } from '@apache-superset/core/api/core';
 import {

superset-frontend/packages/superset-ui-chart-controls/src/components/ControlHeader.tsx

@@ -17,7 +17,7 @@
  * under the License.
  */
 import { ReactNode } from 'react';
-import { t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
 import { css } from '@apache-superset/core/ui';
 import { InfoTooltip, Tooltip, Icons } from '@superset-ui/core/components';
 

superset-frontend/packages/superset-ui-chart-controls/src/components/SQLPopover.tsx

@@ -22,7 +22,7 @@ import {
   SQLEditor,
 } from '@superset-ui/core/components';
 import { CalculatorOutlined } from '@ant-design/icons';
-import { t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
 import { css, styled, useTheme } from '@apache-superset/core/ui';
 
 const StyledCalculatorIcon = styled(CalculatorOutlined)`

superset-frontend/packages/superset-ui-chart-controls/src/components/labelUtils.tsx

@@ -18,7 +18,7 @@
  */
 import { ReactNode, RefObject } from 'react';
 
-import { t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
 import { css, styled } from '@apache-superset/core/ui';
 import { ColumnMeta, Metric } from '@superset-ui/chart-controls';
 

superset-frontend/packages/superset-ui-chart-controls/src/constants.ts

@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { DTTM_ALIAS, QueryColumn, QueryMode, t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
+import { DTTM_ALIAS, QueryColumn, QueryMode } from '@superset-ui/core';
 import { GenericDataType } from '@apache-superset/core/api/core';
 import { ColumnMeta, SortSeriesData, SortSeriesType } from './types';
 

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

@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t, RollingType, ComparisonType } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
+import { RollingType, ComparisonType } from '@superset-ui/core';
 
 import { ControlSubSectionHeader } from '../components/ControlSubSectionHeader';
 import { ControlPanelSectionConfig } from '../types';

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

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
 import { ControlPanelSectionConfig } from '../types';
 
 export const annotationLayers = [];

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

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
 
 import { ControlSubSectionHeader } from '../components/ControlSubSectionHeader';
 import { ControlPanelSectionConfig } from '../types';

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

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
 import { ControlPanelSectionConfig, ControlSetRow } from '../types';
 import {
   contributionModeControl,

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

@@ -16,11 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  legacyValidateInteger,
-  legacyValidateNumber,
-  t,
-} from '@superset-ui/core';
+import { t } from '@apache-superset/core';
+import { legacyValidateInteger, legacyValidateNumber } from '@superset-ui/core';
 import { ControlPanelSectionConfig } from '../types';
 import { displayTimeRelatedControls } from '../utils';
 

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

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
 import { ControlPanelSectionConfig } from '../types';
 
 export const matrixifyEnableSection: ControlPanelSectionConfig = {

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

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
 import { ControlPanelSectionConfig } from '../types';
 
 // A few standard controls sections that are used internally.

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

@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t, ComparisonType } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
+import { ComparisonType } from '@superset-ui/core';
 
 import {
   ControlPanelSectionConfig,

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

@@ -17,7 +17,8 @@
  * under the License.
  */
 import { ReactNode } from 'react';
-import { JsonValue, t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
+import { JsonValue } from '@superset-ui/core';
 import { Radio } from '@superset-ui/core/components';
 import { ControlHeader } from '../../components/ControlHeader';
 

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

@@ -17,14 +17,14 @@
  * under the License.
  */
 
+import { t } from '@apache-superset/core';
 import {
   ContributionType,
   ensureIsArray,
   getColumnLabel,
   getMetricLabel,
   QueryFormColumn,
   QueryFormMetric,
-  t,
 } from '@superset-ui/core';
 import { GenericDataType } from '@apache-superset/core/api/core';
 import {

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

@@ -17,7 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { QueryColumn, t, validateNonEmpty } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
+import { QueryColumn, validateNonEmpty } from '@superset-ui/core';
 import { GenericDataType } from '@apache-superset/core/api/core';
 import {
   ExtraControlProps,

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

@@ -18,7 +18,8 @@
  * under the License.
  */
 
-import { t, validateNonEmpty } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
+import { validateNonEmpty } from '@superset-ui/core';
 import { SharedControlConfig } from '../types';
 import { dndAdhocMetricControl } from './dndControls';
 import { defineSavedMetrics } from '../utils';

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

@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { t } from '@apache-superset/core';
 import {
   ensureIsArray,
   NO_TIME_RANGE,
   QueryFormData,
-  t,
   validateNonEmpty,
 } from '@superset-ui/core';
 import {

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

@@ -33,8 +33,8 @@
  * control interface.
  */
 import { isEmpty } from 'lodash';
+import { t } from '@apache-superset/core';
 import {
-  t,
   getCategoricalSchemeRegistry,
   getSequentialSchemeRegistry,
   SequentialScheme,

superset-frontend/packages/superset-ui-chart-controls/src/utils/D3Formatting.ts

@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { t } from '@apache-superset/core';
 import {
-  t,
   SMART_DATE_ID,
   NumberFormats,
   getNumberFormatter,

superset-frontend/packages/superset-ui-chart-controls/test/utils/getColorFormatters.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { configure } from '@superset-ui/core';
+import { configure } from '@apache-superset/core';
 import {
   Comparator,
   getOpacity,

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

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
 import { SupersetTheme } from '@apache-superset/core/ui';
 import { FallbackPropsWithDimension } from './SuperChart';
 

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

@@ -18,8 +18,7 @@
  */
 
 import { CSSProperties } from 'react';
-import { css, styled } from '@apache-superset/core/ui';
-import { t } from '../../translation';
+import { css, styled, t } from '@apache-superset/core/ui';
 
 const MESSAGE_STYLES: CSSProperties = { maxWidth: 800 };
 const MIN_WIDTH_FOR_BODY = 250;

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

@@ -19,7 +19,7 @@
 
 /* eslint-disable react/jsx-sort-default-props */
 import { PureComponent } from 'react';
-import { t } from '@superset-ui/core';
+import { t } from '@apache-superset/core';
 import { createSelector } from 'reselect';
 import getChartComponentRegistry from '../registries/ChartComponentRegistrySingleton';
 import getChartTransformPropsRegistry from '../registries/ChartTransformPropsRegistrySingleton';