Skip to content

[RedisTimeseries] Convert class components to functional, add tests for utils, refactor hex to rgba #479

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

Merged
merged 5 commits into from
Apr 8, 2022
Merged

[RedisTimeseries] Convert class components to functional, add tests for utils, refactor hex to rgba #479

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
4ab5791
Address PR comments — Convert class components to functional
GnaneshKunal Mar 31, 2022
85a02fd
Remove semicolon
GnaneshKunal Apr 1, 2022
4bffaaf
Fix turnary operation style
GnaneshKunal Apr 8, 2022
01d8038
Relpace inline-styles with classes
GnaneshKunal Apr 8, 2022
c884df0
Change indent of less file
GnaneshKunal Apr 8, 2022
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
5 changes: 5 additions & 0 deletions redisinsight/ui/src/packages/redistimeseries-app/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
};
10 changes: 7 additions & 3 deletions redisinsight/ui/src/packages/redistimeseries-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
"version": "0.0.1",
"scripts": {
"start": "cross-env NODE_ENV=development parcel serve src/index.html",
"build": "rimraf dist && cross-env NODE_ENV=production concurrently \"yarn build:js && yarn minify:js && yarn build:css\" \"yarn build:assets\"",
"build": "rimraf dist && cross-env NODE_ENV=production concurrently \"yarn build:js && yarn minify:js\" \"yarn build:css\" \"yarn build:assets\"",
"build:js": "parcel build src/main.tsx --dist-dir dist",
"build:css": "parcel build src/styles/styles.less --dist-dir dist",
"build:assets": "parcel build src/assets/**/* --dist-dir dist",
"minify:js": "terser --compress --mangle -- dist/main.js > dist/index.js && rimraf dist/main.js"
"minify:js": "terser --compress --mangle -- dist/main.js > dist/index.js && rimraf dist/main.js",
"test": "jest"
},
"targets": {
"main": false,
Expand Down Expand Up @@ -48,12 +49,15 @@
"@parcel/transformer-less": "^2.0.1",
"@parcel/transformer-sass": "2.3.2",
"@types/file-saver": "^2.0.5",
"@types/jest": "^27.4.1",
"@types/plotly.js-dist-min": "^2.3.0",
"concurrently": "^6.3.0",
"cross-env": "^7.0.3",
"jest": "^27.5.1",
"parcel": "^2.0.0",
"rimraf": "^3.0.2",
"terser": "^5.9.0"
"terser": "^5.9.0",
"ts-jest": "^27.1.4"
},
"dependencies": {
"@elastic/eui": "34.6.0",
Expand Down
210 changes: 102 additions & 108 deletions redisinsight/ui/src/packages/redistimeseries-app/src/components/Chart/ChartConfigForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { CSSProperties } from 'react'
import React, { useState } from 'react'
import {
EuiFieldText,
EuiSwitch,
Expand All @@ -7,120 +7,114 @@ import {
EuiAccordion,
EuiButtonGroupProps,
} from '@elastic/eui'
import { AxisScale, GraphMode, ChartConfigFormProps, ChartConfigFormState } from './interfaces'
import { AxisScale, GraphMode, ChartConfigFormProps } from './interfaces'
import { X_LABEL_MAX_LENGTH, Y_LABEL_MAX_LENGTH, TITLE_MAX_LENGTH } from './constants'

export default class ChartConfigForm extends React.Component<ChartConfigFormProps, ChartConfigFormState> {
state = {
moreOptions: false,
}
export default function ChartConfigForm(props: ChartConfigFormProps) {
const [moreOptions, setMoreOptions] = useState(false)

render() {
const { onChange, value } = this.props
return (
<form className="chart-config-form">
<div className="chart-top-form">
<EnumSelect
inputLabel="mode"
onChange={(e: React.ChangeEvent<{ value: unknown }>) => onChange('mode', e.target.value)}
value={value.mode}
enumType={GraphMode}
/>
<EuiSwitch
compressed
label={<span style={{ paddingRight: '10px' }}>Staircase</span>}
checked={value.staircase}
onChange={(e) => onChange('staircase', e.target.checked)}
/>
<EuiSwitch
compressed
label="Fill"
checked={value.fill}
onChange={(e) => onChange('fill', e.target.checked)}
/>
<EuiAccordion
arrowDisplay='right'
forceState={this.state.moreOptions ? 'open' : 'closed'}
onToggle={isOpen => this.setState({ moreOptions: isOpen })}
buttonContent={this.state.moreOptions ? 'Less options' : 'More options'}
>
<span></span>
</EuiAccordion>
</div>
{
this.state.moreOptions &&
<div className="more-options">
<section>
<EuiFormFieldset legend={{ children: 'Title' }}>
<EuiFieldText
placeholder="Title"
value={value.title}
onChange={(e) => onChange('title', e.target.value)}
aria-label="Title"
maxLength={parseInt(TITLE_MAX_LENGTH)}
/>
</EuiFormFieldset>
<EuiFormFieldset legend={{ children: 'X axis Label' }}>
<EuiFieldText
placeholder="X axis label"
value={value.xlabel}
onChange={(e) => onChange('xlabel', e.target.value)}
aria-label="X Label"
maxLength={parseInt(X_LABEL_MAX_LENGTH)}
const { onChange, value } = props

return (
<form className="chart-config-form">
<div className="chart-top-form">
<EnumSelect
inputLabel="mode"
onChange={(e: React.ChangeEvent<{ value: unknown }>) => onChange('mode', e.target.value)}
value={value.mode}
enumType={GraphMode}
/>
<EuiSwitch
compressed
label={<span className="switch-staircase-label">Staircase</span>}
checked={value.staircase}
onChange={(e) => onChange('staircase', e.target.checked)}
/>
<EuiSwitch
compressed
label="Fill"
checked={value.fill}
onChange={(e) => onChange('fill', e.target.checked)}
/>
<EuiAccordion
arrowDisplay='right'
forceState={moreOptions ? 'open' : 'closed'}
onToggle={isOpen => setMoreOptions(isOpen)}
buttonContent={moreOptions ? 'Less options' : 'More options'}
>
<span></span>
</EuiAccordion>
</div>
{ moreOptions && (
<div className="more-options">
<section>
<EuiFormFieldset legend={{ children: 'Title' }}>
<EuiFieldText
placeholder="Title"
value={value.title}
onChange={(e) => onChange('title', e.target.value)}
aria-label="Title"
maxLength={parseInt(TITLE_MAX_LENGTH)}
/>
</EuiFormFieldset>
<EuiFormFieldset legend={{ children: 'X axis Label' }}>
<EuiFieldText
placeholder="X axis label"
value={value.xlabel}
onChange={(e) => onChange('xlabel', e.target.value)}
aria-label="X Label"
maxLength={parseInt(X_LABEL_MAX_LENGTH)}
/>
</EuiFormFieldset>
</section>
<section>
<div className="right-y-axis">
<div className="switch-wrapper">
<EuiSwitch
compressed
label="Use Right Y Axis"
checked={value.yAxis2}
onChange={(e) => onChange('yAxis2', e.target.checked)}
/>
</EuiFormFieldset>
</section>
<section>
<div className="right-y-axis">
<div style={{ width: '100%' }}>
<EuiSwitch
compressed
label="Use Right Y Axis"
checked={value.yAxis2}
onChange={(e) => onChange('yAxis2', e.target.checked)}
/>
</div>
{
value.yAxis2 &&
<div className="y-axis-2" style={{ width: '100%'}}>
{Object.keys(value.keyToY2Axis).map(key =>
<div className='y-axis-2-item'>
<div>{key}</div>
<EuiButtonGroup
buttonSize='compressed'
options={['left', 'right'].map((v: string) => ({ id: v, label: v }))}
onChange={id => onChange('keyToY2Axis', {...value.keyToY2Axis, [key]: id === 'right' })}
idSelected={value.keyToY2Axis[key] === true ? 'right' : 'left'}
isFullWidth
/>
</div>
)}
</div>
}
</div>
</section>
<section className="y-axis-config">
{ value.yAxis2 && (
<div className="y-axis-2">
{ Object.keys(value.keyToY2Axis).map(key =>
<div className='y-axis-2-item'>
<div>{key}</div>
<EuiButtonGroup
buttonSize='compressed'
options={['left', 'right'].map((v: string) => ({ id: v, label: v }))}
onChange={id => onChange('keyToY2Axis', { ...value.keyToY2Axis, [key]: id === 'right' })}
idSelected={value.keyToY2Axis[key] === true ? 'right' : 'left'}
isFullWidth
/>
</div>
)}
</div>
)}
</div>
</section>
<section className="y-axis-config">
<YAxisConfigForm
label="Left Y Axis"
onChange={(v: any) => onChange('yAxisConfig', v)}
isLeftYAxis={true}
value={value.yAxisConfig}
/>
{ value.yAxis2 && (
<YAxisConfigForm
label="Left Y Axis"
onChange={(v: any) => onChange('yAxisConfig', v)}
isLeftYAxis={true}
value={value.yAxisConfig}
label="Right Y Axis"
onChange={(v: any) => onChange('yAxis2Config', v)}
isLeftYAxis={false}
value={value.yAxis2Config}
/>
{
value.yAxis2 &&
<YAxisConfigForm
label="Right Y Axis"
onChange={(v: any) => onChange('yAxis2Config', v)}
isLeftYAxis={false}
value={value.yAxis2Config}
/>
}
</section>
</div>
}
</form >
)
}
)}
</section>
</div>
)}
</form >
)
}

const YAxisConfigForm = ({ value, onChange, label }: any) => (
Expand Down
Loading