Skip to content

Conversation

@jonnyhork
Copy link
Contributor

What does this PR do?

This PR will use the custom-select component in the ORDER BY form.

What issues does this PR fix or reference?

@W-8616120@

@jonnyhork jonnyhork requested a review from amphro as a code owner January 28, 2021 21:19
@codecov
Copy link

codecov bot commented Jan 28, 2021

Codecov Report

Merging #134 (9dc6652) into feature/custom-select (e8f890d) will decrease coverage by 0.09%.
The diff coverage is 100.00%.

Impacted file tree graph

@@                    Coverage Diff                    @@
##           feature/custom-select     #134      +/-   ##
=========================================================
- Coverage                  88.11%   88.01%   -0.10%     
=========================================================
  Files                         47       47              
  Lines                       1666     1669       +3     
  Branches                     382      385       +3     
=========================================================
+ Hits                        1468     1469       +1     
- Misses                       196      198       +2     
  Partials                       2        2              
Flag Coverage Δ
language-server 98.65% <ø> (ø)
soql-builder-ui 91.95% <100.00%> (-0.28%) ⬇️
soql-model 80.32% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...der-ui/src/modules/querybuilder/orderBy/orderBy.ts 89.47% <100.00%> (-10.53%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e8f890d...9dc6652. Read the comment docs.

@dehru
Copy link
Contributor

dehru commented Jan 28, 2021

I think the value of order-by field needs to be cleared when the full order by statement is added. Right now it retains the value after the order by statement is added. This should probably be controlled by the order-by component.

order-by-value-clear.mov

Copy link
Contributor

@dehru dehru left a comment

Choose a reason for hiding this comment

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

i attached a movie that shows how i think the state should be cleared

@dehru
Copy link
Contributor

dehru commented Jan 28, 2021

OK. So i played with the implementation a bit and got it to reset back to 'Search fields' instead of holding state. It was a little big hacky. But after that, i'm not sure we should change the current behavior. I think it's fine as is.

@dehru dehru merged commit 082d191 into feature/custom-select Jan 28, 2021
@dehru dehru deleted the jhork/custom-select-order-by branch January 28, 2021 22:26
dehru added a commit that referenced this pull request Feb 1, 2021
* Jhork/custom select fields (#111)
* Jhork/custom select from (#130)
* Jhork/custom select order by (#134)
jgellin-sf pushed a commit that referenced this pull request Feb 2, 2021
* Fix preview not updating when autosave is off - issue 120 (#125)

* add soql-statement to model
* verify that we include the soql statement in the model
* update the package version so we can publish and consume

* Add smarter completion on GROUP BY clause and WHERE literals (#126)

* Initial support for Aggregate functions.

Also:
 * Fix: Propose "COUNT()" only if right after "SELECT"
 * Remove special-case for "SELECT (SELECT ), | FROM Foo". Not worth it

* Add completion inside function expression

Example: SELECT AVG(|) FROM

Also:
 * Improve ANTLR error recovery to better extract FROM expresssions

* Make completions inside function expression type-aware

* Add smarter completion on GROUP BY clause

Also:
 * Complete only with "groupable" fields.
 * Give priority to complete GROUP BY with fields which appear
   on SELECT and are not aggregated or groupped.
 * On ORDER BY: Complete only with "sortable" fields
 * Add completion on semi-join SELECTs (in WHERE clauses)
 * Fix defect when cursor is around multiple newlines
 * Improve query analysis impl
 * Pre-select "WHERE" option if provided

* Improve support for queries with semi-joins

* Refactor: move soql operator semantics to LSP server-side

* Add more code-completion proposals for literal values

Including:

* Range date literals (LAST_YEAR, YESTERDAY, LAST_N_DAYS:n, etc.)
* Simple templates for: int, double, string, currency

* Quiet completion on HAVING clause

* Add a space before opening parenthesis after INCLUDES/EXCLUDES

* New soql lsp version 0.3.3 (#140)

* Feature/custom select (#148)

* Jhork/custom select fields (#111)
* Jhork/custom select from (#130)
* Jhork/custom select order by (#134)

* set the error overlay to be on top of all other form elements (#150)

* set the error overlay to be on top of all other form elements
* add z-index to .unsupported-syntax

* prepare to publish 0 .0.30 (#151)

Co-authored-by: Fernando Dobladez <fernandodobladez@salesforce.com>
Co-authored-by: Jonny Hork <jhork@salesforce.com>
dehru added a commit that referenced this pull request Feb 5, 2021
* Jhork: Support for Simple WHERE Expressions (#101)
* move rule to css common (#108)
* Preventing webview re-rendering when soql statement has not changed (#105)
* Revert "Disable WHERE in model (#113)"
* Type-aware where (#109)
* Fix preview not updating when autosave is off - issue 120 (#125)
* Recognize recoverable where errors (#116)
* Operator and Criteria Error Tooltips (#122)
* Support IN, NOT IN, INCLUDES, EXCLUDE operators (#123)
* Add smarter completin on GROUP BY clause and WHERE literals (#126)
* Feature/custom select (#148)
* Jhork/custom select fields (#111)
* Jhork/custom select from (#130)
* Jhork/custom select order by (#134)
* set the error overlay to be on top of all other form elements (#150)
* prepare to publish 0 .0.30 (#151)
* Feature/where (#154)
* Jhork: Support for Simple WHERE Expressions (#101)
* move rule to css common (#108)
* Preventing webview re-rendering when soql statement has not changed (#105)
* Revert "Disable WHERE in model (#113)"
* Type-aware where (#109)
* Recognize recoverable where errors (#116)
* Operator and Criteria Error Tooltips (#122)
* Support IN, NOT IN, INCLUDES, EXCLUDE operators (#123)
* Revert "Feature/where (#154)" (#157)
* Add support for line comments ( `//` ) at the top of SOQL files (#132)
* Jhork/where custom select (#161)
* Fix: 'undefined' in SOQL string (#162)
* Clear tooltip when object changes, fix empty soql statement error blocker (#165)
* Track to force render on condition change - fix rebase conflict (#166)
* do not send event when user still adding input' (#169)
* Jhork/clear modifier field bug fix (#168)
* handle a option selection event (#178)
* cler tooltip error when X is clicked (#180)
* Jhork/workflow updates (#163)
* Bump versions for release (#181)

Co-authored-by: Jonny Hork <jhork@salesforce.com>
Co-authored-by: dehru <599418+dehru@users.noreply.github.com>
Co-authored-by: Dehru Cromer <dehru.cromer@salesforce.com>
Co-authored-by: Fernando Dobladez <fernandodobladez@salesforce.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants