-
Notifications
You must be signed in to change notification settings - Fork 11
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.
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
#28 edit chart menu #315
Open
cameronjtoy
wants to merge
152
commits into
v2.1
Choose a base branch
from
#28-Edit-Chart-Menu
base: v2.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
#28 edit chart menu #315
Changes from all commits
Commits
Show all changes
152 commits
Select commit
Hold shift + click to select a range
7340ba6
Profiler Changes
JasonMai11 4567921
Profiler implementation
JasonMai11 03a1f0b
Updating profiler without changing updatedatasetProperty functionality
JasonMai11 85418f0
datasetProperty Function
JasonMai11 b156ef3
Update Artifact.scala
JasonMai11 eddea71
forceProfiler
JasonMai11 bd70602
Profiler Implementation and Testing
JasonMai11 17be764
Completion of Profiler
JasonMai11 0165187
Updated Param List
JasonMai11 ddb4595
#24 Temporary Change for frontend with new Parameter Encoding For nes…
cameronjtoy f789c8c
yIndex Change
JasonMai11 72dcb0a
ColIDListParameter working
cameronjtoy 279e2d6
Bar Chart Editor Changes
cameronjtoy 6c3805a
new bar chart editor
cameronjtoy c8ac19d
Update PlotUtils.scala
JasonMai11 e4b1c3b
empty min error but console has correct info
cameronjtoy 7f34306
button changes
cameronjtoy 65da900
scss changes
cameronjtoy 37d5dce
no more empty min
cameronjtoy f169b10
working frontend
cameronjtoy ff030be
Update PlotUtils.scala
JasonMai11 65d0b74
Merge branch 'Vizier-profiler-implementation' into New-Interface
JasonMai11 b25fb10
Artifact changes
JasonMai11 c9aded4
working frontend
cameronjtoy 4895727
slider and new scss
cameronjtoy baaeb9d
Bar Chart implementation
JasonMai11 9e14d40
Merge branch 'New-Interface' of https://github.com/VizierDB/vizier-sc…
JasonMai11 e1dc77a
Chart Plotting
JasonMai11 bd48fbd
Profile no longer double-nests keys.
okennedy 055b116
Resetting logging of catalog.Artifact
okennedy 0b1af5f
Bar Slider minior changes
cameronjtoy 77a9900
#26 made changes towards filter parameter bug for numerical_id numbers
cameronjtoy 9bb2264
#22 New scss changes
cameronjtoy e489e44
scss changes, filter update bug
cameronjtoy bba902e
Filter Parameter working and can plot
cameronjtoy 891fff6
set method work
cameronjtoy 5536edd
Bar Chart Grouping
JasonMai11 befb015
filter empty string
cameronjtoy c5e39c1
Streamline dataframe variable names (re: #297)
okennedy 8196fcb
Infer clean names in load dataset (closes #297).
okennedy be40699
Typo in the Python Snippets.
okennedy bc7b39b
Bump version to RC3.
okennedy 6cd2604
#268 updated jsass version
lyao4321 e91b9a1
Merge pull request #310 from VizierDB/jsass-version-change
okennedy 56040e0
#12 - Single Slider functionality working with consistent profiler ap…
cameronjtoy c42779d
12 - Reactive Filtering Object to change input box
cameronjtoy 842f850
closes #12 - Input Box and Filter changes based on dependency of the…
cameronjtoy 35c24f8
re:#20 - Created class for color parameter with surface level html sh…
cameronjtoy 57fc21b
#18 - flex additions to editor elements
eeeeemosewa 320725d
re:#20 Color Parameter Created with 6 basic colors assigned by radio …
cameronjtoy 4c4e28f
#18 - flex additions to table <th> elems
eeeeemosewa eaf6dbe
#18 - flex changes to parameter_list and all it's elements
eeeeemosewa cf07d3e
closes #18 - set width of last child of tr in param list to 0px
eeeeemosewa a1e8b6e
closes #18 - set width of last child of <td> and <th> in param list t…
eeeeemosewa 1ce64bb
#23 added bg colors to radio buttons
eeeeemosewa 86f706e
#18 added flex changes
eeeeemosewa c5aa442
closes #18 : added width to td elems
eeeeemosewa 4a44c1f
#18 editor tbody not flex
eeeeemosewa d760e00
closes #18 : editor tbody not flex
eeeeemosewa caf96e8
#23 color radio buttons css
eeeeemosewa e552cac
#23 delimiter + color radio buttons css
eeeeemosewa f04d243
#23 select and hover changes color param
eeeeemosewa 4d04fc5
#23 select and hover changes color para
eeeeemosewa 63e66c2
#23 label input width set
eeeeemosewa 4f25346
#23 radio buttons 15px
eeeeemosewa a2cba87
#23 checked css for radio button
eeeeemosewa 01ef8eb
#23 checked radio button changes
eeeeemosewa ae00650
#23 label and span for color param
eeeeemosewa ffdb1c3
#23 label and span changes
eeeeemosewa 6c90f8a
#23 label+span in color param
eeeeemosewa 596a8e2
#23 label,span,input changes color param
eeeeemosewa f097a7e
#23 final span changes in color_param
eeeeemosewa b181447
#23 final changes to radio buttons
eeeeemosewa 9902182
#23 check radio not working
eeeeemosewa a16adfa
#20 Add customized line details - New Editor Refactor Made into case …
cameronjtoy dc2b3c8
#20 Add customized line details - New Editor Refactor Made into case …
cameronjtoy be1f5d2
#20 Add customized line details - Dataset initialized as variable to …
cameronjtoy d3b8b54
added dataset summary information and ui component
lyao4321 bbe86d1
#20 Add customized line details - Encapsulated elements into tbody fo…
cameronjtoy 072234b
#24 scss changes for new editor
eeeeemosewa 44cb80c
#20 Add customized line details - Encapsulated side bar into Table
cameronjtoy b0f6506
Merge remote-tracking branch 'refs/remotes/origin/#20-Customized-line…
cameronjtoy b47de90
#24 table styling changes for sidemenu
eeeeemosewa eb5c5cc
cleaned code up and reworked summary button
lyao4321 6293806
merge into dev
cameronjtoy 436e923
Merge with dev
cameronjtoy 759a662
Merge remote-tracking branch 'origin/#22-profiler-dataset-info-UI' in…
cameronjtoy 4822f9b
#28 Edit Chart Menu - add parameters and Bar Chart Editor
cameronjtoy af689d2
re: #27-Scatter-Plot-Editor - Migrated BarChartEditor to Editor Class…
cameronjtoy 5d6dbf3
re:#27-Scatter-Plot-Editor - Got rid of Global Variables, Made One S…
cameronjtoy 18e255e
#33 editor changes for scatterplot
eeeeemosewa 82290a9
re: #31-Line-Chart-Editor - Line Chart Changes for Line Chart to work…
cameronjtoy 6a5b463
re: #32-CDF-Chart-Editor - CDF Chart Editor posts onto the screen
cameronjtoy 02e0b8b
#32 editor flex changes for CDF
eeeeemosewa c4f5b66
Merge remote-tracking branch 'origin/#32-CDF-Chart-Editor' into #28-E…
cameronjtoy 68c8415
#28-Edit-Chart-Menu - Made UI changes to reflect figma design linked …
cameronjtoy 78f22c4
#35 scss changes to match figma editor
eeeeemosewa 2fb89e0
#35 scss scatterplot editor width change
eeeeemosewa d195ec9
#35 td elem alignment for line config
eeeeemosewa 19e7491
#35 td elem alignment for line config
eeeeemosewa 2995351
#35 td elem alignment for line config
eeeeemosewa 6fea58b
#35 scss td elem alignment for line config
eeeeemosewa 376a126
#35 scss delimiter error fixed
eeeeemosewa 7d51535
#35 scss two td elem alignment line config
eeeeemosewa 7b46a43
#35 scss only child changes line config align
eeeeemosewa 10c6257
#35 scss input width reduced
eeeeemosewa 428f935
#35 scss td width set back to 100%
eeeeemosewa f516b87
#28-Edit-Chart-Menu - One Line Congifuration button, Filter update
cameronjtoy e5ecaa2
#35 scss line and chart config
eeeeemosewa 739aa51
#35 scss config button alignment
eeeeemosewa 163b741
#35 scss line and chart config buttons
eeeeemosewa 1f45812
#35 config button align and spacing
eeeeemosewa b2664e1
#35 config button align and spacing
eeeeemosewa f010c5a
#35 scss config buttons height change
eeeeemosewa c034124
#35 scss max width for drop downs
eeeeemosewa e37c39f
#35 scss component name error fix
eeeeemosewa 1ab524a
#35 scss removed static space for config menu
eeeeemosewa d37d529
#28-Edit-Chart-Menu - Add a + button for the Ys, Add a + button for t…
cameronjtoy c72a9ef
#28-Edit-Chart-Menu - Populate the line config with one row per line …
cameronjtoy 941ccf7
#35 scss add del y align
eeeeemosewa 6d6fb5c
#35 scss config menu block align
eeeeemosewa 49c343a
#35 scss margin changes
eeeeemosewa b80854e
#35 scss margin remove table elems
eeeeemosewa 43c950a
#35 scss config 32px margin added
eeeeemosewa 2d0e1c4
#35 scss margin for sidemenu div and table
eeeeemosewa 40a479d
#35 scss table sidemenu 32px margin
eeeeemosewa bb9f75e
#35 scss y add del button
eeeeemosewa f157b74
#28-Edit-Chart-Menu - Adding dataset needs the box and headers removed
cameronjtoy 51ba356
#28-Edit-Chart-Menu - added class names to add and delete buttons
cameronjtoy 45ab8b3
#35 scss button changes
eeeeemosewa e178fda
#28-Edit-Chart-Menu - moved icons in front of text
cameronjtoy 0892391
Merge branch '#28-Edit-Chart-Menu' of https://github.com/VizierDB/viz…
cameronjtoy 33f38f9
#28-Edit-Chart-Menu - removed text from the buttons
cameronjtoy e18afd4
#35 scss remove - y button for first y
eeeeemosewa cde685f
#28-Edit-Chart-Menu - populating with multiple ys and datasets
cameronjtoy bfb8927
#28-Edit-Chart-Menu - added class names to add/delete row buttons
cameronjtoy 85345dc
#35 scss to fix color param alignment
eeeeemosewa 2130871
#35 scss filter slider min and max width
eeeeemosewa 708f4a8
#35 scss command arg width changes
eeeeemosewa 89b272b
#35 scss set parameter width to 90px
eeeeemosewa 2300be5
#35 scss command arg width to 90px
eeeeemosewa 61b56d6
#35 scss text input width to 82px
eeeeemosewa a4836ed
#35 scss hide del row button for first row
eeeeemosewa b9394dc
#35 scss hide del row button for first row
eeeeemosewa 3c48d06
#28 - Delete .DS_Store
cameronjtoy 15b43c0
#28 - Delete .scalafmt.conf
cameronjtoy 7f13e1a
#28 - Migrated out Filter
cameronjtoy c51f611
#28 - Filter Parameter outside and has case class to differentiate ca…
cameronjtoy cd8d06b
#28 - color element fix
cameronjtoy 14a5d9d
#35 scss sizing changes for filter input
eeeeemosewa f531578
#28 label and color addition change
eeeeemosewa 6a06846
#28 Load State Fix for new editor
cameronjtoy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"files.watcherExclude": { | ||
"**/target": true | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
SAT,GPA | ||
1714,2.4 | ||
1664,2.52 | ||
1760,2.54 | ||
1685,2.74 | ||
1693,2.83 | ||
1670,2.91 | ||
1764,3 | ||
1764,3 | ||
1792,3.01 | ||
1850,3.01 | ||
1735,3.02 | ||
1775,3.07 | ||
1735,3.08 | ||
1712,3.08 | ||
1773,3.12 | ||
1872,3.17 | ||
1755,3.17 | ||
1674,3.17 | ||
1842,3.17 | ||
1786,3.19 | ||
1761,3.19 | ||
1722,3.19 | ||
1663,3.2 | ||
1687,3.21 | ||
1974,3.24 | ||
1826,3.28 | ||
1787,3.28 | ||
1821,3.28 | ||
2020,3.28 | ||
1794,3.28 | ||
1769,3.28 | ||
1934,3.28 | ||
1775,3.29 | ||
1855,3.29 | ||
1880,3.29 | ||
1849,3.31 | ||
1808,3.32 | ||
1954,3.34 | ||
1777,3.37 | ||
1831,3.37 | ||
1865,3.37 | ||
1850,3.38 | ||
1966,3.38 | ||
1702,3.39 | ||
1990,3.39 | ||
1925,3.4 | ||
1824,3.4 | ||
1956,3.4 | ||
1857,3.41 | ||
1979,3.41 | ||
1802,3.41 | ||
1855,3.42 | ||
1907,3.42 | ||
1634,3.42 | ||
1879,3.44 | ||
1887,3.47 | ||
1730,3.47 | ||
1953,3.47 | ||
1781,3.47 | ||
1891,3.48 | ||
1964,3.49 | ||
1808,3.49 | ||
1893,3.5 | ||
2041,3.51 | ||
1893,3.51 | ||
1832,3.52 | ||
1850,3.52 | ||
1934,3.54 | ||
1861,3.58 | ||
1931,3.58 | ||
1933,3.59 | ||
1778,3.59 | ||
1975,3.6 | ||
1934,3.6 | ||
2021,3.61 | ||
2015,3.62 | ||
1997,3.64 | ||
2020,3.65 | ||
1843,3.71 | ||
1936,3.71 | ||
1810,3.71 | ||
1987,3.73 | ||
1962,3.76 | ||
2050,3.81 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
title,description,date,quantity | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, | ||
,,, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,6 +35,7 @@ import info.vizierdb.spark.SparkSchema.fieldFormat | |
import org.apache.spark.sql.AnalysisException | ||
import com.typesafe.scalalogging.LazyLogging | ||
import info.vizierdb.api.akka.VizierServer | ||
import info.vizierdb.profiler.DataProfiler | ||
import info.vizierdb.util.ExperimentalOptions | ||
|
||
case class Artifact( | ||
|
@@ -183,12 +184,20 @@ case class Artifact( | |
|
||
val df = dataframe | ||
|
||
logger.trace("Dataset Properties: \n"+string) | ||
|
||
{ () => | ||
val data = dataConstructor() | ||
val data = dataConstructor() | ||
val rowCount: Long = | ||
data.properties | ||
.get("count") | ||
.map { _.as[Long] } | ||
data.properties | ||
.get("count") | ||
.flatMap { values => | ||
try { | ||
Some(values.as[Long]) | ||
} catch { | ||
case e: Exception => None | ||
} | ||
} | ||
.getOrElse { df().count() } | ||
|
||
Artifact.translateDatasetContainerToVizierClassic( | ||
|
@@ -251,6 +260,29 @@ case class Artifact( | |
) | ||
val computeCaveats = | ||
ExperimentalOptions.isEnabled("ENABLE-MIMIR") && includeCaveats | ||
|
||
val df = dataframe(session)() | ||
if (forceProfiler) { | ||
val updatedProperties = datasetDescriptor.properties.get("is_profiled") match { | ||
case Some(JsBoolean(true)) => | ||
// profiler has been generated so do nothing | ||
case _ => | ||
println("Profiler has been generated") | ||
// run the profiler | ||
val dataProfile: Map[String, JsValue] = DataProfiler.apply(df) | ||
// Transform the dataProfile into a sequence of tuples | ||
// Filter out the specified keys and transform the remaining dataProfile into a sequence of tuples | ||
val dynamicProperties: Seq[(String, JsValue)] = dataProfile | ||
.filterKeys(key => key != "is_profiled") | ||
.toSeq | ||
// Combine the static properties with the dynamic ones | ||
updateDatasetProperties( | ||
Seq("is_profiled" -> JsBoolean(true)) ++ dynamicProperties: _* | ||
) | ||
} | ||
} | ||
|
||
|
||
return { () => | ||
try { | ||
QueryWithCaveats( | ||
|
@@ -291,6 +323,7 @@ case class Artifact( | |
datasetDescriptor.properties.get(name) | ||
} | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. spurious extra space? |
||
|
||
/** | ||
* Retrieve or construct the specified dataset property. | ||
* @param name The name of a dataset property. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is a commit to the plotting tools making changes to Vizier.scala?