Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Srv 820 #20

Merged
merged 5 commits into from
Oct 30, 2024
Merged

Srv 820 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f2b09c3
SRV-820: Better position of dropdown for results x page
davidriverapericas Oct 29, 2024
4ecb97a
SRV-820: Adding titles to comparison tables
davidriverapericas Oct 29, 2024
d61f886
SRV-820 chore - changing main to current value
nyohasstium Oct 30, 2024
081732c
SRV-820 chore - removing special triangle character
nyohasstium Oct 30, 2024
4a77fcb
SRV-820 chore - removing # and renaming main
nyohasstium Oct 30, 2024
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
6 changes: 2 additions & 4 deletions superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,7 @@
{hasGlobalControl ? (
<div ref={globalControlRef} className="form-inline dt-controls">
<div className="row">
<div
className={renderTimeComparisonDropdown ? 'col-sm-5' : 'col-sm-6'}
>
<div className="col-sm-1">
{hasPagination ? (
<SelectPageSize
total={resultsSize}
Expand All @@ -381,7 +379,7 @@
) : null}
</div>
{searchInput ? (
<div className="col-sm-6">
<div className={renderTimeComparisonDropdown ? 'col-sm-10' : 'col-sm-11'}>

Check failure on line 382 in superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx

View workflow job for this annotation

GitHub Actions / frontend-build 

Replace `·className={renderTimeComparisonDropdown·?·'col-sm-10'·:·'col-sm-11'}` with `⏎················className={⏎··················renderTimeComparisonDropdown·?·'col-sm-10'·:·'col-sm-11'⏎················}⏎··············`
<GlobalFilter<D>
searchInput={
typeof searchInput === 'boolean' ? undefined : searchInput
Expand Down
8 changes: 4 additions & 4 deletions superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,9 @@
} = props;
const comparisonColumns = [
{ key: 'all', label: t('Display all') },
{ key: '#', label: '#' },
{ key: '△', label: '△' },
{ key: '%', label: '%' },
{ key: '#', label: t('Previous value') },
{ key: '△', label: t('Difference') },
{ key: '%', label: t('% Difference') },
];
const timestampFormatter = useCallback(
value => getTimeFormatterForGranularity(timeGrain)(value),
Expand Down Expand Up @@ -404,7 +404,7 @@
};
};

const comparisonLabels = [t('Main'), '#', '△', '%'];
const comparisonLabels = [t('Current value'), t('Previous value'), t('Difference'), t('% Difference')];

Check failure on line 407 in superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx

View workflow job for this annotation

GitHub Actions / frontend-build 

Replace `t('Current·value'),·t('Previous·value'),·t('Difference'),·t('%·Difference')` with `⏎····t('Current·value'),⏎····t('Previous·value'),⏎····t('Difference'),⏎····t('%·Difference'),⏎··`
const filteredColumnsMeta = useMemo(() => {
if (!isUsingTimeComparison) {
return columnsMeta;
Expand Down
8 changes: 4 additions & 4 deletions superset-frontend/plugins/plugin-chart-table/src/transformProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ const processComparisonColumns = (
return [
{
...col,
label: t('Main'),
label: t('Current value'),
key: `${t('Main')} ${col.key}`,
config: getComparisonColConfig(t('Main'), col.key, columnConfig),
formatter: getComparisonColFormatter(
Expand All @@ -368,7 +368,7 @@ const processComparisonColumns = (
},
{
...col,
label: `#`,
label: t('Previous value'),
key: `# ${col.key}`,
config: getComparisonColConfig(`#`, col.key, columnConfig),
formatter: getComparisonColFormatter(
Expand All @@ -381,7 +381,7 @@ const processComparisonColumns = (
},
{
...col,
label: `△`,
label: t('Difference'),
key: `△ ${col.key}`,
config: getComparisonColConfig(`△`, col.key, columnConfig),
formatter: getComparisonColFormatter(
Expand All @@ -394,7 +394,7 @@ const processComparisonColumns = (
},
{
...col,
label: `%`,
label: t('% Difference'),
key: `% ${col.key}`,
config: getComparisonColConfig(`%`, col.key, columnConfig),
formatter: getComparisonColFormatter(
Expand Down
Loading