Skip to content
This repository has been archived by the owner on Dec 10, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:apache-superset/superset-ui into …
Browse files Browse the repository at this point in the history
…erik-ritter--upgrade-d3-time-format
  • Loading branch information
erik_ritter committed Nov 11, 2019
2 parents d5ffbfb + 5b104ea commit 6cd2a4c
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 27 deletions.
5 changes: 3 additions & 2 deletions packages/superset-ui-chart/src/components/SuperChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,9 @@ export default class SuperChart extends React.PureComponent<Props, {}> {
}

render() {
const { heightInfo, widthInfo, BoundingBox } = this.parseDimension(this
.props as PropsWithDefault);
const { heightInfo, widthInfo, BoundingBox } = this.parseDimension(
this.props as PropsWithDefault,
);

// If any of the dimension is dynamic, get parent's dimension
if (widthInfo.isDynamic || heightInfo.isDynamic) {
Expand Down
12 changes: 3 additions & 9 deletions packages/superset-ui-chart/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,11 @@ export { default as createLoadableRenderer } from './components/createLoadableRe
export { default as reactify } from './components/reactify';
export { default as SuperChart } from './components/SuperChart';

export {
default as getChartBuildQueryRegistry,
} from './registries/ChartBuildQueryRegistrySingleton';
export { default as getChartBuildQueryRegistry } from './registries/ChartBuildQueryRegistrySingleton';
export { default as getChartComponentRegistry } from './registries/ChartComponentRegistrySingleton';
export {
default as getChartControlPanelRegistry,
} from './registries/ChartControlPanelRegistrySingleton';
export { default as getChartControlPanelRegistry } from './registries/ChartControlPanelRegistrySingleton';
export { default as getChartMetadataRegistry } from './registries/ChartMetadataRegistrySingleton';
export {
default as getChartTransformPropsRegistry,
} from './registries/ChartTransformPropsRegistrySingleton';
export { default as getChartTransformPropsRegistry } from './registries/ChartTransformPropsRegistrySingleton';

export { default as ChartDataProvider } from './components/ChartDataProvider';

Expand Down
16 changes: 7 additions & 9 deletions packages/superset-ui-core/test/models/Registry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -252,15 +252,13 @@ describe('Registry', () => {
registry.registerLoader('b', () => 'test2');
registry.registerLoader('c', () => Promise.resolve('test3'));

return registry
.entriesAsPromise()
.then(entries =>
expect(entries).toEqual([
{ key: 'a', value: 'test1' },
{ key: 'b', value: 'test2' },
{ key: 'c', value: 'test3' },
]),
);
return registry.entriesAsPromise().then(entries =>
expect(entries).toEqual([
{ key: 'a', value: 'test1' },
{ key: 'b', value: 'test2' },
{ key: 'c', value: 'test3' },
]),
);
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ type CreateEncoderFactoryParams<Config extends EncodingConfig> = {
* if there are missing fields
*/
completeEncoding: (e: Partial<DeriveEncoding<Config>>) => DeriveEncoding<Config>;
});
}
);

export default function createEncoderFactory<Config extends EncodingConfig>(
params: CreateEncoderFactoryParams<Config>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function isChannelDefWithAxisSupport(

export type CompleteAxisConfig =
| false
| RequiredSome<
| (RequiredSome<
Omit<AxisConfig, 'labelOverlap'>,
| 'labelAngle'
| 'labelFlush'
Expand All @@ -29,7 +29,7 @@ export type CompleteAxisConfig =
| 'titlePadding'
> & {
labelOverlap: LabelOverlapStrategy;
};
});

export default function completeAxisConfig(
channelType: ChannelType,
Expand Down
4 changes: 1 addition & 3 deletions packages/superset-ui-number-format/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ export {

export { default as createD3NumberFormatter } from './factories/createD3NumberFormatter';
export { default as createDurationFormatter } from './factories/createDurationFormatter';
export {
default as createSiAtMostNDigitFormatter,
} from './factories/createSiAtMostNDigitFormatter';
export { default as createSiAtMostNDigitFormatter } from './factories/createSiAtMostNDigitFormatter';
3 changes: 2 additions & 1 deletion packages/superset-ui-query/src/types/Query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export type QueryObjectFilterClause = {
}
| {
op: UnaryOperator;
});
}
);

export type QueryObjectMetric = {
label: string;
Expand Down

0 comments on commit 6cd2a4c

Please sign in to comment.