Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions superset/assets/src/explore/controls.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ const D3_FORMAT_OPTIONS = [
[',.3f', ',.3f (12345.432 => 12,345.432)'],
['+,', '+, (12345.432 => +12,345.432)'],
['$,.2f', '$,.2f (12345.432 => $12,345.43)'],
['DURATION_MS', 'Duration in ms (66000 => 1m 6s)'],
['DURATION_SEC', 'Duration in sec (66 => 1m 6s)'],
['DURATION_MIN', 'Duration in min (66 => 1h 6 min)'],
];

const ROW_LIMIT_OPTIONS = [10, 50, 100, 250, 500, 1000, 5000, 10000, 50000];
Expand Down
7 changes: 5 additions & 2 deletions superset/assets/src/setup/setupFormatters.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { getNumberFormatter, getNumberFormatterRegistry, NumberFormats } from '@superset-ui/number-format';
import { createDurationFormatter, getNumberFormatter, getNumberFormatterRegistry, NumberFormats } from '@superset-ui/number-format';
import { getTimeFormatterRegistry, smartDateFormatter, smartDateVerboseFormatter } from '@superset-ui/time-format';

export default function setupFormatters() {
Expand Down Expand Up @@ -54,7 +54,10 @@ export default function setupFormatters() {
.registerValue('.0%f', getNumberFormatter('.1%'))
.registerValue('$,0', getNumberFormatter('$,.4f'))
.registerValue('$,0f', getNumberFormatter('$,.4f'))
.registerValue('$,.f', getNumberFormatter('$,.4f'));
.registerValue('$,.f', getNumberFormatter('$,.4f'))
.registerValue('DURATION_MS', createDurationFormatter())
.registerValue('DURATION_SEC', createDurationFormatter({ multiplier: 1000 }))
.registerValue('DURATION_MIN', createDurationFormatter({ multiplier: 60000 }));

getTimeFormatterRegistry()
.registerValue('smart_date', smartDateFormatter)
Expand Down