Skip to content

Commit

Permalink
Merge pull request #849 from Antonio-RiveroMartnez/fixes_pop_plugin
Browse files Browse the repository at this point in the history 
fix(plugins): Period over Period Plugin cleanup
  • Loading branch information
@Antonio-RiveroMartnez
Antonio-RiveroMartnez authored Jan 30, 2024
2 parents 68fe17f + 1956c5f commit d93f56e
Show file tree
Hide file tree
Showing 8 changed files with 147 additions and 121 deletions.
2 changes: 1 addition & 1 deletion superset-frontend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"@superset-ui/legacy-preset-chart-nvd3": "file:./plugins/legacy-preset-chart-nvd3",
"@superset-ui/plugin-chart-echarts": "file:./plugins/plugin-chart-echarts",
"@superset-ui/plugin-chart-handlebars": "file:./plugins/plugin-chart-handlebars",
"@superset-ui/plugin-chart-period-over-period-kpi": "file:./plugins/plugin-chart-period-over-period-kpi",
"@superset-ui/plugin-chart-pivot-table": "file:./plugins/plugin-chart-pivot-table",
"@superset-ui/plugin-chart-table": "file:./plugins/plugin-chart-table",
"@superset-ui/plugin-chart-word-cloud": "file:./plugins/plugin-chart-word-cloud",
"@superset-ui/plugin-chart-period-over-period-kpi": "file:./plugins/plugin-chart-period-over-period-kpi",
"@superset-ui/switchboard": "file:./packages/superset-ui-switchboard",
"@types/d3-format": "^3.0.1",
"@visx/axis": "^3.0.1",
Expand Down
2 changes: 2 additions & 0 deletions superset-frontend/plugins/plugin-chart-period-over-period-kpi/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ npm run dev
```

To add the package to Superset, go to the `superset-frontend` subdirectory in your Superset source folder (assuming both the `custom-viz` plugin and `superset` repos are in the same root directory) and run

```
npm i -S ../../custom-viz
```
Expand Down Expand Up @@ -54,6 +55,7 @@ import { CustomViz } from 'custom-viz';
```

to import the plugin and later add the following to the array that's passed to the `plugins` property:

```js
new CustomViz().configure({ key: 'custom-viz' }),
```
Expand Down
123 changes: 57 additions & 66 deletions superset-frontend/plugins/plugin-chart-period-over-period-kpi/src/PopKPI.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,53 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
import React, { useEffect, createRef } from 'react';
import {
styled,
} from '@superset-ui/core';
import { PopKPIProps, PopKPIStylesProps } from './types';
import React, { createRef } from 'react';
import { css, styled, useTheme } from '@superset-ui/core';
import { PopKPIComparisonValueStyleProps, PopKPIProps } from './types';

// The following Styles component is a <div> element, which has been styled using Emotion
// For docs, visit https://emotion.sh/docs/styled

// Theming variables are provided for your use via a ThemeProvider
// imported from @superset-ui/core. For variables available, please visit
// https://github.com/apache-superset/superset-ui/blob/master/packages/superset-ui-core/src/style/index.ts

const Styles = styled.div<PopKPIStylesProps>`
font-family: ${({ theme }) => theme.typography.families.sansSerif};
position: relative;
display: flex;
flex-direction: column;
justify-content: center;
padding: ${({ theme }) => theme.tdUnit * 4}px;
border-radius: ${({ theme }) => theme.tdUnit * 2}px;
height: ${({ height }) => height}px;
width: ${({ width }) => width}px;
`;

const BigValueContainer = styled.div`
font-size: ${props=> props.headerFontSize ? props.headerFontSize : 60}px;
font-weight: ${({ theme }) => theme.typography.weights.normal};
text-align: center;
`;

const TableContainer = styled.div`
width: 100%;
display: table;
`

const ComparisonContainer = styled.div`
display: table-row;
`;

const ComparisonValue = styled.div`
font-weight: ${({ theme }) => theme.typography.weights.light};
width: 33%;
display: table-cell;
font-size: ${props=> props.subheaderFontSize ? props.subheaderFontSize : 20}px;
text-align: center;
const ComparisonValue = styled.div<PopKPIComparisonValueStyleProps>`
${({ theme, subheaderFontSize }) => `
font-weight: ${theme.typography.weights.light};
width: 33%;
display: table-cell;
font-size: ${subheaderFontSize || 20}px;
text-align: center;
`}
`;

export default function PopKPI(props: PopKPIProps) {
Expand All @@ -78,28 +43,54 @@ export default function PopKPI(props: PopKPIProps) {
} = props;

const rootElem = createRef<HTMLDivElement>();
const theme = useTheme();

useEffect(() => {
const root = rootElem.current as HTMLElement;
});
const wrapperDivStyles = css`
font-family: ${theme.typography.families.sansSerif};
position: relative;
display: flex;
flex-direction: column;
justify-content: center;
padding: ${theme.gridUnit * 4}px;
border-radius: ${theme.gridUnit * 2}px;
height: ${height}px;
width: ${width}px;
`;

return (
<Styles
ref={rootElem}
boldText={props.boldText}
headerFontSize={props.headerFontSize}
height={height}
width={width}
>
const bigValueContainerStyles = css`
font-size: ${headerFontSize || 60}px;
font-weight: ${theme.typography.weights.normal};
text-align: center;
`;

<BigValueContainer headerFontSize={headerFontSize}>{bigNumber}</BigValueContainer>
<TableContainer>
<ComparisonContainer>
<ComparisonValue subheaderFontSize={subheaderFontSize}> #: {prevNumber}</ComparisonValue>
<ComparisonValue subheaderFontSize={subheaderFontSize}> Δ: {valueDifference}</ComparisonValue>
<ComparisonValue subheaderFontSize={subheaderFontSize}> %: {percentDifference}</ComparisonValue>
</ComparisonContainer>
</TableContainer>
</Styles>
return (
<div ref={rootElem} css={wrapperDivStyles}>
<div css={bigValueContainerStyles}>{bigNumber}</div>
<div
css={css`
width: 100%;
display: table;
`}
>
<div
css={css`
display: table-row;
`}
>
<ComparisonValue subheaderFontSize={subheaderFontSize}>
{' '}
#: {prevNumber}
</ComparisonValue>
<ComparisonValue subheaderFontSize={subheaderFontSize}>
{' '}
Δ: {valueDifference}
</ComparisonValue>
<ComparisonValue subheaderFontSize={subheaderFontSize}>
{' '}
%: {percentDifference}
</ComparisonValue>
</div>
</div>
</div>
);
}
104 changes: 60 additions & 44 deletions superset-frontend/plugins/plugin-chart-period-over-period-kpi/src/plugin/buildQuery.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
import { buildQueryContext, QueryFormData } from '@superset-ui/core';
import {
AdhocFilter,
buildQueryContext,
QueryFormData,
} from '@superset-ui/core';
import moment, { Moment } from 'moment';

/**
Expand All @@ -42,25 +46,25 @@ function getSinceUntil(
relativeEnd: string | null = null,
): MomentTuple {
const separator = ' : ';
const _relativeStart = relativeStart || "today";
const _relativeEnd = relativeEnd || "today";
const effectiveRelativeStart = relativeStart || 'today';
const effectiveRelativeEnd = relativeEnd || 'today';

if (!timeRange) {
return [null, null];
}

let modTimeRange: string | null = timeRange;

if (timeRange === 'NO_TIME_RANGE' || timeRange === '_(NO_TIME_RANGE)'){
if (timeRange === 'NO_TIME_RANGE' || timeRange === '_(NO_TIME_RANGE)') {
return [null, null];
}

if (timeRange?.startsWith('last') && !timeRange.includes(separator)) {
modTimeRange = timeRange + separator + _relativeEnd;
modTimeRange = timeRange + separator + effectiveRelativeEnd;
}

if (timeRange?.startsWith('next') && !timeRange.includes(separator)) {
modTimeRange = _relativeStart + separator + timeRange;
modTimeRange = effectiveRelativeStart + separator + timeRange;
}

if (
Expand Down Expand Up @@ -179,12 +183,15 @@ function getSinceUntil(
return [_since, _until];
}

function calculatePrev(startDate: Moment | null, endDate: Moment | null, calcType: String) {

if (!startDate || !endDate){
return [null, null]
function calculatePrev(
startDate: Moment | null,
endDate: Moment | null,
calcType: String,
) {
if (!startDate || !endDate) {
return [null, null];
}

const daysBetween = endDate.diff(startDate, 'days');

let startDatePrev = moment();
Expand Down Expand Up @@ -219,53 +226,63 @@ export default function buildQuery(formData: QueryFormData) {
},
]);

const timeFilterIndex: number =
formData.adhoc_filters?.findIndex(
filter => 'operator' in filter && filter.operator === 'TEMPORAL_RANGE',
) ?? -1;

const timeFilter: any = formData.adhoc_filters?.find(
({ operator }: { operator: string }) => operator === 'TEMPORAL_RANGE',
);
const timeFilter: AdhocFilter | null =
timeFilterIndex !== -1 && formData.adhoc_filters
? formData.adhoc_filters[timeFilterIndex]
: null;

const timeFilterIndex: any = formData.adhoc_filters?.findIndex(
({ operator }: { operator: string }) => operator === 'TEMPORAL_RANGE',
);
let testSince = null;
let testUntil = null;

const [testSince, testUntil] = getSinceUntil(
timeFilter.comparator.toLowerCase(),
);

let formDataB: QueryFormData;
if (
timeFilter &&
'comparator' in timeFilter &&
typeof timeFilter.comparator === 'string'
) {
[testSince, testUntil] = getSinceUntil(
timeFilter.comparator.toLocaleLowerCase(),
);
}

if (timeComparison!='c'){
let formDataB: QueryFormData;

const [prevStartDateMoment, prevEndDateMoment] = calculatePrev(
testSince,
testUntil,
timeComparison,
);
if (timeComparison !== 'c') {
const [prevStartDateMoment, prevEndDateMoment] = calculatePrev(
testSince,
testUntil,
timeComparison,
);

const queryBComparator = `${prevStartDateMoment?.format(
'YYYY-MM-DDTHH:mm:ss',
)} : ${prevEndDateMoment?.format('YYYY-MM-DDTHH:mm:ss')}`;
'YYYY-MM-DDTHH:mm:ss',
)} : ${prevEndDateMoment?.format('YYYY-MM-DDTHH:mm:ss')}`;

const queryBFilter = {
const queryBFilter: any = {
...timeFilter,
comparator: queryBComparator.replace(/Z/g, '')
}
comparator: queryBComparator.replace(/Z/g, ''),
};

const otherFilters = formData.adhoc_filters?.filter((_value: any, index: number) => timeFilterIndex !== index);
const queryBFilters = otherFilters ? [queryBFilter, ...otherFilters] : [queryBFilter];

formDataB= {
const otherFilters = formData.adhoc_filters?.filter(
(_value: any, index: number) => timeFilterIndex !== index,
);
const queryBFilters = otherFilters
? [queryBFilter, ...otherFilters]
: [queryBFilter];

formDataB = {
...formData,
adhoc_filters: queryBFilters,
}

};
} else {

formDataB= {
formDataB = {
...formData,
adhoc_filters: formData.adhoc_custom,
}

};
}

const queryContextB = buildQueryContext(formDataB, baseQueryObject => [
Expand All @@ -275,7 +292,6 @@ export default function buildQuery(formData: QueryFormData) {
},
]);


return {
...queryContextA,
queries: [...queryContextA.queries, ...queryContextB.queries],
Expand Down
27 changes: 20 additions & 7 deletions superset-frontend/plugins/plugin-chart-period-over-period-kpi/src/plugin/transformProps.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
import moment from 'moment';
import {
ChartProps,
TimeseriesDataRecord,
getMetricLabel,
getValueFormatter,
NumberFormats,
getNumberFormatter,
} from '@superset-ui/core';

export const parseMetricValue = (metricValue: number | string | null) => {
if (typeof metricValue === 'string') {
const dateObject = moment.utc(metricValue, moment.ISO_8601, true);
if (dateObject.isValid()) {
return dateObject.valueOf();
}
return 0;
}
return metricValue ?? 0;
};

export default function transformProps(chartProps: ChartProps) {
/**
* This function is called after a successful response has been
Expand Down Expand Up @@ -71,12 +82,14 @@ export default function transformProps(chartProps: ChartProps) {
currencyFormat,
subheaderFontSize,
} = formData;
const dataA = queriesData[0].data as TimeseriesDataRecord[];
const dataB = queriesData[1].data as TimeseriesDataRecord[];
const { data: dataA = [] } = queriesData[0];
const { data: dataB = [] } = queriesData[1];
const data = dataA;
const metricName = getMetricLabel(metrics[0]);
let bigNumber = data.length === 0 ? null : data[0][metricName];
let prevNumber = dataB.length === 0 ? null : dataB[0][metricName];
let bigNumber: number | string =
data.length === 0 ? 0 : parseMetricValue(data[0][metricName]);
let prevNumber: number | string =
data.length === 0 ? 0 : parseMetricValue(dataB[0][metricName]);

const numberFormatter = getValueFormatter(
metrics[0],
Expand All @@ -97,13 +110,13 @@ export default function transformProps(chartProps: ChartProps) {
NumberFormats.PERCENT_SIGNED_1_POINT,
);

let valueDifference = bigNumber - prevNumber;
let valueDifference: number | string = bigNumber - prevNumber;

const percentDifferenceNum = prevNumber
? (bigNumber - prevNumber) / Math.abs(prevNumber)
: 0;

const compType= compTitles[formData.timeComparison]
const compType = compTitles[formData.timeComparison];
bigNumber = numberFormatter(bigNumber);
prevNumber = numberFormatter(prevNumber);
valueDifference = numberFormatter(valueDifference);
Expand Down
Loading

0 comments on commit d93f56e

Please sign in to comment.