Skip to content

feat: Color Map pass the colorMapping object to giraffe #3473

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
ChitlangeSahas merged 15 commits into from
Dec 20, 2021
Merged

feat: Color Map pass the colorMapping object to giraffe #3473

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
539c3d6
feat: adding colorMapping utils
ChitlangeSahas Dec 17, 2021
c71f238
chore: minor cleanup of variable names
ChitlangeSahas Dec 17, 2021
00ad1bd
chore: prettier
ChitlangeSahas Dec 17, 2021
d4bbdfc
test: added tests for the colorMappingUtils.ts
ChitlangeSahas Dec 17, 2021
91a40a9
chore: prettier
ChitlangeSahas Dec 17, 2021
54bc75e
chore: openAPI SHA
ChitlangeSahas Dec 17, 2021
7c319cd
chore: prettier
ChitlangeSahas Dec 17, 2021
a1ebcae
feat: add feature flag
ChitlangeSahas Dec 17, 2021
71f7be5
fix: address PR comments
ChitlangeSahas Dec 20, 2021
4d203cc
test: more tests
ChitlangeSahas Dec 20, 2021
c04bb10
chore: prettier
ChitlangeSahas Dec 20, 2021
fe0c4cc
fix: better feature flag use
ChitlangeSahas Dec 20, 2021
89a4ac1
chore: prettier
ChitlangeSahas Dec 20, 2021
192bb99
chore: ✂️
ChitlangeSahas Dec 20, 2021
eac7e40
chore: openAPI SHA
ChitlangeSahas Dec 20, 2021
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"cy": "CYPRESS_dexUrl=https://$INGRESS_HOST:$PORT_HTTPS CYPRESS_baseUrl=http://localhost:9999 cypress open",
"cy:dev": "source ../monitor-ci/.env && CYPRESS_dexUrl=CLOUD CYPRESS_baseUrl=https://$INGRESS_HOST:$PORT_HTTPS cypress open --config testFiles='{cloud,shared}/**/*.*'",
"cy:dev-oss": "source ../monitor-ci/.env && CYPRESS_dexUrl=OSS CYPRESS_baseUrl=https://$INGRESS_HOST:$PORT_HTTPS cypress open --config testFiles='{oss,shared}/**/*.*'",
"generate": "export SHA=2da36d4beb7fc22dd8d037c3398c91c7ca2c346d && export REMOTE=https://raw.githubusercontent.com/influxdata/openapi/${SHA}/ && yarn generate-meta",
"generate": "export SHA=018d2381f78e52acbe1deaaff4c9512adf5e3703 && export REMOTE=https://raw.githubusercontent.com/influxdata/openapi/${SHA}/ && yarn generate-meta",
Copy link
Contributor Author

@ChitlangeSahas ChitlangeSahas Dec 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this SHA lives in a branch, maybe we should wait for this PR influxdata/openapi#248

"generate-local": "export REMOTE=../openapi/ && yarn generate-meta",
"generate-meta": "if [ -z \"${CLOUD_URL}\" ]; then yarn generate-meta-oss; else yarn generate-meta-cloud; fi",
"generate-meta-oss": "yarn oss-api && yarn notebooks && yarn unity && yarn annotations-oss && yarn pinned && yarn mapsd-oss && yarn cloudPriv",
Expand Down
14 changes: 14 additions & 0 deletions src/visualization/types/Graph/view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ import {

// Annotations
import {addAnnotationLayer} from 'src/visualization/utils/annotationUtils'
import {getColorMappingObjects} from 'src/visualization/utils/colorMappingUtils'
import {isFlagEnabled} from '../../../shared/utils/featureFlag'

interface Props extends VisualizationProps {
properties: XYViewProperties
Expand Down Expand Up @@ -179,6 +181,17 @@ const XYPlot: FC<Props> = ({
return <EmptyGraphMessage message={INVALID_DATA_COPY} />
}

let colorMapping = null

if (isFlagEnabled('graphColorMapping')) {
const [, fillColumnMap] = createGroupIDColumn(result.table, groupKey)
const {colorMappingForGiraffe} = getColorMappingObjects(
fillColumnMap,
properties
)
colorMapping = colorMappingForGiraffe
}

const config: Config = {
...currentTheme,
table: result.table,
Expand Down Expand Up @@ -210,6 +223,7 @@ const XYPlot: FC<Props> = ({
interpolation,
position: properties.position,
colors: colorHexes,
colorMapping,
Copy link
Contributor

@hoorayimhelping hoorayimhelping Dec 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

an alternative to passing in colorMapping: null when the flag is off is doing something like:

remove this line in the definition of config, and then below where config is defined, doing this:

if (isFlagEnabled('graphColorMapping')) {
  config.colorMapping = colorMapping
}

to make sure this is truly 'dark' in the sense that it makes no changes to production code if the flag is off.

shadeBelow: !!properties.shadeBelow,
shadeBelowOpacity: 0.08,
hoverDimension: properties.hoverDimension,
Expand Down
Loading