diff --git a/packages/superset-ui-chart/package.json b/packages/superset-ui-chart/package.json index 78d5c2d46a..5a07ae395f 100644 --- a/packages/superset-ui-chart/package.json +++ b/packages/superset-ui-chart/package.json @@ -45,8 +45,6 @@ "@superset-ui/core": "^0.12.0", "@superset-ui/dimension": "^0.12.0", "@superset-ui/query": "^0.12.0", - "@superset-ui/translation": "0.x", - "@superset-ui/validator": "0.x", "react": "^16.13.1" } } diff --git a/packages/superset-ui-chart/src/controls/index.ts b/packages/superset-ui-chart/src/controls/index.ts deleted file mode 100644 index 41390cc153..0000000000 --- a/packages/superset-ui-chart/src/controls/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import * as sectionsModule from './sections'; - -export const sections = sectionsModule; -export * from './D3Formatting'; -export * from './selectOptions'; diff --git a/packages/superset-ui-chart/src/index.ts b/packages/superset-ui-chart/src/index.ts index 71d139dad8..a19e7bbfc0 100644 --- a/packages/superset-ui-chart/src/index.ts +++ b/packages/superset-ui-chart/src/index.ts @@ -15,7 +15,5 @@ export { default as getChartTransformPropsRegistry } from './registries/ChartTra export { default as ChartDataProvider } from './components/ChartDataProvider'; -export * from './controls/index'; - export * from './types/TransformFunction'; export * from './types/QueryResponse'; diff --git a/packages/superset-ui-control-utils/README.md b/packages/superset-ui-control-utils/README.md new file mode 100644 index 0000000000..072ba793cb --- /dev/null +++ b/packages/superset-ui-control-utils/README.md @@ -0,0 +1,23 @@ +## @superset-ui/control-utils + +[![Version](https://img.shields.io/npm/v/@superset-ui/control-utils.svg?style=flat)](https://img.shields.io/npm/v/@superset-ui/control-utils.svg?style=flat) +[![David (path)](https://img.shields.io/david/apache-superset/superset-ui.svg?path=packages%2Fsuperset-ui-control-utils&style=flat-square)](https://david-dm.org/apache-superset/superset-ui?path=packages/superset-ui-control-utils) + +Description + +#### Example usage + +```js +import { xxx } from '@superset-ui/control-utils'; +``` + +#### API + +`fn(args)` + +- Do something + +### Development + +`@data-ui/build-config` is used to manage the build configuration for this package including babel +builds, jest testing, eslint, and prettier. diff --git a/packages/superset-ui-control-utils/package.json b/packages/superset-ui-control-utils/package.json new file mode 100644 index 0000000000..78210c8062 --- /dev/null +++ b/packages/superset-ui-control-utils/package.json @@ -0,0 +1,30 @@ +{ + "name": "@superset-ui/control-utils", + "version": "0.0.0", + "description": "Superset UI control-utils", + "sideEffects": false, + "main": "lib/index.js", + "module": "esm/index.js", + "files": [ + "esm", + "lib" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/apache-superset/superset-ui.git" + }, + "keywords": ["superset"], + "author": "Superset", + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/apache-superset/superset-ui/issues" + }, + "homepage": "https://github.com/apache-superset/superset-ui#readme", + "publishConfig": { + "access": "public" + }, + "peerDependencies": { + "@superset-ui/translation": "^0.12", + "@superset-ui/validator": "^0.12" + } +} diff --git a/packages/superset-ui-chart/src/controls/D3Formatting.ts b/packages/superset-ui-control-utils/src/D3Formatting.ts similarity index 100% rename from packages/superset-ui-chart/src/controls/D3Formatting.ts rename to packages/superset-ui-control-utils/src/D3Formatting.ts diff --git a/packages/superset-ui-control-utils/src/index.ts b/packages/superset-ui-control-utils/src/index.ts new file mode 100644 index 0000000000..6e485f3577 --- /dev/null +++ b/packages/superset-ui-control-utils/src/index.ts @@ -0,0 +1,5 @@ +import * as sectionModules from './sections'; + +export const sections = sectionModules; +export { D3_FORMAT_DOCS, D3_FORMAT_OPTIONS, D3_TIME_FORMAT_OPTIONS } from './D3Formatting'; +export { formatSelectOptions, formatSelectOptionsForRange } from './selectOptions'; diff --git a/packages/superset-ui-chart/src/controls/sections.tsx b/packages/superset-ui-control-utils/src/sections.tsx similarity index 100% rename from packages/superset-ui-chart/src/controls/sections.tsx rename to packages/superset-ui-control-utils/src/sections.tsx diff --git a/packages/superset-ui-chart/src/controls/selectOptions.ts b/packages/superset-ui-control-utils/src/selectOptions.ts similarity index 97% rename from packages/superset-ui-chart/src/controls/selectOptions.ts rename to packages/superset-ui-control-utils/src/selectOptions.ts index a65e95cf15..6e075d3184 100644 --- a/packages/superset-ui-chart/src/controls/selectOptions.ts +++ b/packages/superset-ui-control-utils/src/selectOptions.ts @@ -35,7 +35,7 @@ export function formatSelectOptions(options: Formattable[]): Formatted[] { */ export function formatSelectOptionsForRange(start: number, end: number) { const options: Formatted[] = []; - for (let i = start; i <= end; i++) { + for (let i = start; i <= end; i += 1) { options.push([i, i.toString()]); } return options; diff --git a/packages/superset-ui-control-utils/test/index.test.ts b/packages/superset-ui-control-utils/test/index.test.ts new file mode 100644 index 0000000000..03fabd8c10 --- /dev/null +++ b/packages/superset-ui-control-utils/test/index.test.ts @@ -0,0 +1,8 @@ +import { sections } from '../src'; + +describe('@superset-ui/control-utils', () => { + it('exports sections', () => { + expect(sections).toBeDefined(); + expect(sections.datasourceAndVizType).toBeDefined(); + }); +}); diff --git a/packages/superset-ui-chart/test/controls/selectOptions.test.ts b/packages/superset-ui-control-utils/test/selectOptions.test.ts similarity index 97% rename from packages/superset-ui-chart/test/controls/selectOptions.test.ts rename to packages/superset-ui-control-utils/test/selectOptions.test.ts index b3fec3078c..62b0d9ded1 100644 --- a/packages/superset-ui-chart/test/controls/selectOptions.test.ts +++ b/packages/superset-ui-control-utils/test/selectOptions.test.ts @@ -1,4 +1,4 @@ -import { formatSelectOptions, formatSelectOptionsForRange } from '../../src'; +import { formatSelectOptions, formatSelectOptionsForRange } from '../src'; describe('formatSelectOptions', () => { it('formats an array of options', () => {