Skip to content

Commit d25555a

Browse files
authored
feat: expose stepBefore and stepAfter interpolation options (#4441)
* feat: expose stepBefore and stepAfter options * chore: resolve merge conflct * chore: update package.json to use latest sha
1 parent f97f23b commit d25555a

File tree

3 files changed

+35
-4
lines changed

3 files changed

+35
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"cy": "CYPRESS_dexUrl=https://$INGRESS_HOST:$PORT_HTTPS CYPRESS_baseUrl=http://localhost:9999 cypress open",
5353
"cy:dev": "source ../monitor-ci/.env && CYPRESS_dexUrl=CLOUD CYPRESS_baseUrl=https://$INGRESS_HOST:$PORT_HTTPS cypress open --config testFiles='{cloud,shared}/**/*.*'",
5454
"cy:dev-oss": "source ../monitor-ci/.env && CYPRESS_dexUrl=OSS CYPRESS_baseUrl=https://$INGRESS_HOST:$PORT_HTTPS cypress open --config testFiles='{oss,shared}/**/*.*'",
55-
"generate": "export SHA=4e27f5d5e552e962164d1455d5249ec2d6d0588b && export REMOTE=https://raw.githubusercontent.com/influxdata/openapi/${SHA}/ && yarn generate-meta",
55+
"generate": "export SHA=65ca23669c55b381acc585d9e5e688a635b81754 && export REMOTE=https://raw.githubusercontent.com/influxdata/openapi/${SHA}/ && yarn generate-meta",
5656
"generate-local": "export REMOTE=../openapi/ && yarn generate-meta",
5757
"generate-meta": "if [ -z \"${CLOUD_URL}\" ]; then yarn generate-meta-oss; else yarn generate-meta-cloud; fi",
5858
"generate-meta-oss": "yarn oss-api && yarn notebooks && yarn unity && yarn annotations-oss && yarn pinned && yarn mapsd-oss && yarn cloudPriv && yarn fluxdocs && yarn subscriptions-oss",

src/shared/utils/vis.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,16 @@ import {XYGeom, Axis} from 'src/types'
1313
export const HEX_DIGIT_PRECISION = 16
1414

1515
/*
16-
A geom may be stored as "line", "step", "monotoneX", "bar", or "stacked", but
17-
we currently only support the "line", "step", and "monotoneX" geoms.
16+
A geom may be stored as "line", "step", "monotoneX", "bar", "stacked", "stepBefore", or "stepAfter", but
17+
we currently only support the "line", "step", "stepBefore", "stepAfter", and "monotoneX" geoms.
1818
*/
1919
export const resolveGeom = (geom: XYGeom) => {
20-
if (geom === 'step' || geom === 'monotoneX') {
20+
if (
21+
geom === 'step' ||
22+
geom === 'monotoneX' ||
23+
geom === 'stepBefore' ||
24+
geom === 'stepAfter'
25+
) {
2126
return geom
2227
}
2328

@@ -32,6 +37,10 @@ export const geomToInterpolation = (geom: XYGeom): LineInterpolation => {
3237
return 'step'
3338
case 'monotoneX':
3439
return 'monotoneX'
40+
case 'stepBefore':
41+
return 'stepBefore'
42+
case 'stepAfter':
43+
return 'stepAfter'
3544
default:
3645
return 'linear'
3746
}

src/visualization/types/Graph/options.tsx

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ const GraphViewOptions: FC<Props> = ({properties, results, update}) => {
6767
return 'Smooth'
6868
case 'step':
6969
return 'Step'
70+
case 'stepBefore':
71+
return 'StepBefore'
72+
case 'stepAfter':
73+
return 'StepAfter'
7074
default:
7175
case 'line':
7276
return 'Linear'
@@ -197,6 +201,24 @@ const GraphViewOptions: FC<Props> = ({properties, results, update}) => {
197201
>
198202
Step
199203
</Dropdown.Item>
204+
<Dropdown.Item
205+
value="stepBefore"
206+
onClick={(geom: string) => {
207+
update({geom})
208+
}}
209+
selected={properties.geom === 'stepBefore'}
210+
>
211+
StepBefore
212+
</Dropdown.Item>
213+
<Dropdown.Item
214+
value="stepAfter"
215+
onClick={(geom: string) => {
216+
update({geom})
217+
}}
218+
selected={properties.geom === 'stepAfter'}
219+
>
220+
StepAfter
221+
</Dropdown.Item>
200222
</Dropdown.Menu>
201223
)}
202224
/>

0 commit comments

Comments
 (0)