Commit Graph

464 Commits

Author SHA1 Message Date
Zac Ioannidis
e3276dfe8e Added against field 2020-10-28 19:02:22 +00:00
Zac Ioannidis
ac5565167e Merge branch 'develop' into feature/simplified-card-props 2020-10-28 18:25:16 +00:00
Zac Ioannidis
84c32ecf8d Adding color for categories 2020-10-28 18:23:41 +00:00
Zac Ioannidis
c382662093 Added new fields to the rendering of the Card Component 2020-10-28 17:19:28 +00:00
Lachlan Kermode
eff13c3d92 Feature/infopopup (#173)
* make intropopup possible

* aesthetic changes

* lint

* correct infopopup styles
2020-10-28 17:54:59 +01:00
Zac Ioannidis
3e20337b5e Using new Card API 2020-10-28 16:09:29 +00:00
Zac Ioannidis
029bc4a03e Importing <Card /> from NPM-published design-system library (#171)
* Importing cards from NPM

* Added an abstraction inside the store and config for creating layouts for cards

* Adding layout render order for Card

* Allowing lists in the reducer validation

* Added design system package to package.json

* Any version over 0.5.0

* fix lint

Co-authored-by: Lachlan Kermode <lachiekermode@gmail.com>
2020-10-28 11:09:02 +01:00
Lachlan Kermode
901100d756 Feature/add coloring algorithm (#172)
* Fixed bug: when all child filters unselected, turn off parent as well

* Refactored placement of onSelectFilter to be in Layout; working logic for updating coloring sets

* Linting fixes and removal of console logs

* Added separate component for colored markers which clusters and events will use; working calculation of color percentages based off of coloringset

* Working colors for clusters; need to implement for individual points as well

* Adding two new features to select whether to color by association or by category (can't do both)

* Working colors for filter list panel; text and checkbox change according to colorset groupings

* Working timeline events with coloring algorithm

* Handle select acts different on map when we don't render all points and only filter through clusters; can fix this by not filtering before passing in locations to events in map

* Removed extraneous prop

* Working point count on hover again; numbers were showing up below the colored markers

* Linting fixes and minor refactor of calculateColorPercentage for linting to ass

* Comments and more linting fixes

* add dev command for windows subsystem for linux

* return default styles for category toggles

* dynamically filter out timelines

* calibrate styling

* further calibrations

* correct contrast

* lint

* wip: fixing corner case

* Cluster opacity feature was out of date

* When deselecting a child, whose parent is on, you cant reselect the child; fixed that bug but replaced it with a bug where you deselect a child and then toggle the parent and the toggle of the child switches instead of toggling like the parent

* generalize isOn check when creating click handler

* rename vars, fix styling

* rm cherrpick

Co-authored-by: efarooqui <efarooqui@pandora.com>
2020-10-28 09:54:16 +01:00
efarooqui
e0cc5e1964 Merged in changes from develop 2020-10-27 08:15:55 -07:00
Lachlan Kermode
d38520ea3d fix corner case for toggling parents off 2020-10-27 15:34:46 +01:00
Lachlan Kermode
c1afd75cea fix recursive case
fix corner case for nested filters

cleanup
2020-10-27 14:52:45 +01:00
Ebrahem Farooqui
c454775fcb Feature/add coloring algorithm (#169)
* Fixed bug: when all child filters unselected, turn off parent as well

* Refactored placement of onSelectFilter to be in Layout; working logic for updating coloring sets

* Linting fixes and removal of console logs

* Added separate component for colored markers which clusters and events will use; working calculation of color percentages based off of coloringset

* Working colors for clusters; need to implement for individual points as well

* Adding two new features to select whether to color by association or by category (can't do both)

* Working colors for filter list panel; text and checkbox change according to colorset groupings

* Working timeline events with coloring algorithm

* Handle select acts different on map when we don't render all points and only filter through clusters; can fix this by not filtering before passing in locations to events in map

* Removed extraneous prop

* Working point count on hover again; numbers were showing up below the colored markers

* Linting fixes and minor refactor of calculateColorPercentage for linting to ass

* Comments and more linting fixes

* add dev command for windows subsystem for linux

* return default styles for category toggles

* dynamically filter out timelines

* calibrate styling

* further calibrations

* correct contrast

* lint

Co-authored-by: efarooqui <efarooqui@pandora.com>
Co-authored-by: Lachlan Kermode <lachiekermode@gmail.com>
2020-10-27 13:33:32 +01:00
Lachlan Kermode
411c39a209 fix check to render a dot or bar in timeline 2020-10-26 11:13:57 +01:00
Lachlan Kermode
ddbee03f50 Feature/ux fixes (#167)
* fix card toggle

* fix bug and bar marker

* reinstate timeline arrows

* adjust (hard to interpret) category y calculation

* shadows for markers as well

* return markers when there are no categories

* remove year in timeline

* make notifications optional

* WIP: render hovered counts

* show number on hover

* lint

* revert to filteredLocations

* linting

* return mapClustersToLocations

* 💄

* lint

Co-authored-by: efarooqui <efarooqui@pandora.com>
2020-10-22 20:09:13 +03:00
efarooqui
d7ddc80c5c Moved supercluster config outside of map; to set the lowest level at which clusters appear, set maxZoom in config 2020-10-21 20:52:59 -07:00
efarooqui
080102cd37 Working index load on initial map render; needed to add callback to set state function 2020-10-21 10:03:21 -07:00
Lachlan Kermode
57c7c3f96e lint 2020-10-21 18:33:51 +03:00
Lachlan Kermode
ceed82e4f3 fix corner case where clusters sometimes remain on screen without events 2020-10-21 18:33:06 +03:00
Lachlan Kermode
adb5d6f959 lint 2020-10-21 17:53:56 +03:00
Lachlan Kermode
3d010e4558 return reduce logic for when event shadows exist 2020-10-21 17:45:12 +03:00
Lachlan Kermode
9a1e2f6ad1 fix timeline render when there are no categories 2020-10-21 17:35:36 +03:00
Lachlan Kermode
59d2685879 check for USE_CATEGORIES 2020-10-21 16:57:26 +03:00
efarooqui
9bc9c6d9a2 Merging in develop branch 2020-10-20 15:26:15 -07:00
efarooqui
5e2982786f Linting fixes 2020-10-20 15:15:04 -07:00
efarooqui
cd19910b06 Loads index when locations are finally available in props; added through componentDidUpdate method 2020-10-20 13:28:58 -07:00
efarooqui
e03fc472e0 Removed line 2020-10-19 21:00:31 -07:00
efarooqui
70f89a2a5d Injecting loading overlay into map for cases where domain hasnt been loaded yet 2020-10-19 15:29:39 -07:00
efarooqui
7dee3dacd1 Some linting fixes 2020-10-19 13:33:42 -07:00
efarooqui
c310d15579 Created utility function isIdentical; moved DefsClusters into Clusters file 2020-10-19 13:32:35 -07:00
efarooqui
9200019d1e Linting fixes 2020-10-19 09:11:08 -07:00
efarooqui
6927ecc3ce Linting fixes 2020-10-19 09:05:54 -07:00
efarooqui
2cff35c3f2 Removed commented out logic 2020-10-16 11:23:00 -07:00
efarooqui
3bf80bce00 Modified clusters to take in radial gradient as input if specified 2020-10-15 09:23:19 -07:00
efarooqui
2aaa1752ad Changed back to normal opacities instead of radial gradients; could add a var that's read from the config to determine styling: radial gradient || normal opacity 2020-10-14 22:27:50 -07:00
efarooqui
32da7f0105 Modified cluster styling to have gradients 2020-10-14 21:05:58 -07:00
efarooqui
b5bb7472ac Rewrote opacity alg for clusters 2020-10-13 11:04:07 -07:00
efarooqui
b8b7c712de Ability to toggle categories on / off on timeline 2020-10-12 16:33:19 -07:00
efarooqui
cde94262be Events showing up on timeline after interpolating categories from associations and passing into getY 2020-10-12 14:54:45 -07:00
efarooqui
b35fb48860 Setting initial categories upon load; need to modify for timeline and related events 2020-10-12 11:15:34 -07:00
efarooqui
909307a6ae Bug with graph nonlocated and getY function; need to refactor toolbar so that it selects the categories on the timeline 2020-10-08 16:58:31 -07:00
efarooqui
d649ba99ed Configuring maxbounds in config to allow pan to not snap out of center 2020-10-07 17:41:09 -07:00
efarooqui
3dc13f334b Working filters with added check to make sure empty locations dont create clusters 2020-10-07 10:19:03 -07:00
efarooqui
67c336c131 Categories showing up on timeline with events; events are stacked on both and connected by a bar which looks like a UI bug somewhere 2020-10-06 17:22:47 -07:00
efarooqui
9dd5eabd3a Linting fixes 2020-10-06 10:31:17 -07:00
efarooqui
233ddbfc99 Removed logic for selecting all cards on cluster select; putting out PR to get feedback 2020-10-06 10:19:09 -07:00
efarooqui
47b9a66816 Working on select that selects all events in a cluster; need to configure UI to both zoom and select events 2020-10-05 09:45:17 -07:00
efarooqui
9357b5e281 Broken onClick clusters working after validating longitude and latitude and only allowing locations to contain valid coordinates 2020-10-01 15:35:46 -07:00
efarooqui
ed236e9716 Working onCluster select; zooming in and watching clusters break down into individual clusters and points 2020-09-30 14:01:08 -07:00
efarooqui
5333f492f8 Getting appropriate clusterZoom; flyto moving to incorrect location on map 2020-09-30 13:07:29 -07:00
efarooqui
5020e73811 Cluster sizes showing up appropriately and unclustering upon zoom; need to nail down styling and add onSelect for clusters 2020-09-30 11:21:37 -07:00