Skip to content
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

188497528 case tile filter formula editor #1617

Merged
merged 11 commits into from
Nov 15, 2024

Conversation

eireland
Copy link
Contributor

Changes case table/card edit filter formula modal to use the regular formula editor modal.

Refactored Cypress formula-helper.ts to avoid circular reference between table and the helper.

@eireland eireland added the v3 CODAP v3 label Nov 14, 2024
Copy link

cypress bot commented Nov 14, 2024

codap-v3    Run #5210

Run Properties:  status check passed Passed #5210  •  git commit dc370b988e: 188497528 case tile filter formula editor (#1617)
Project codap-v3
Branch Review main
Run status status check passed Passed #5210
Run duration 01m 52s
Commit git commit dc370b988e: 188497528 case tile filter formula editor (#1617)
Committer Evangeline Ireland
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 3
View all changes introduced in this branch ↗︎

Copy link

codecov bot commented Nov 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.54%. Comparing base (e9fbc5b) to head (a795d36).
Report is 18 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1617      +/-   ##
==========================================
- Coverage   85.68%   85.54%   -0.14%     
==========================================
  Files         600      600              
  Lines       30332    30337       +5     
  Branches     7749     7760      +11     
==========================================
- Hits        25989    25951      -38     
+ Misses       4188     4004     -184     
- Partials      155      382     +227     
Flag Coverage Δ
cypress 74.88% <100.00%> (-0.25%) ⬇️
jest 52.65% <33.33%> (-0.01%) ⬇️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@eireland eireland marked this pull request as ready for review November 15, 2024 04:55
Copy link
Member

@kswenson kswenson left a comment

Choose a reason for hiding this comment

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

👍 Looks good -- nice cleanup

Comment on lines 16 to 55
// addNewAttribute(collectionIndex = 1) {
// table.addNewAttribute(collectionIndex)
// },
// renameAttribute(currentAttributeName: string, newAttributeName: string, collectionIndex = 1) {
// table.renameAttribute(currentAttributeName, newAttributeName, collectionIndex)
// },
// deleteAttribute(attributeName: string, collectionIndex = 1) {
// table.deleteAttribute(attributeName, collectionIndex)
// },
// addFormula(attributeName: string, formula: string, collectionIndex = 1) {
// table.addFormula(attributeName, formula, collectionIndex)
// },
// verifyValues(attributeName: string, values: Array<any>, collectionIndex = 1) {
// table.verifyFormulaValues(attributeName, values, collectionIndex)
// },
// checkFormulaExists(attributeName: string, formula: string, collectionIndex = 1) {
// table.checkFormulaExists(attributeName, formula, collectionIndex)
// },
// editFormula(attributeName: string, formula: string, collectionIndex = 1) {
// table.editFormula(attributeName, formula, collectionIndex)
// },
// createNewDataset() {
// table.createNewTableFromToolShelf()
// },
// insertCases(rowIndex: number, numOfCases: number) {
// table.openIndexMenuForRow(rowIndex)
// table.insertCases(numOfCases, "after")
// },
// changeSliderVariableName(sliderVariableName: string) {
// slider.changeVariableName(sliderVariableName)
// },
// changeSliderValue(sliderValue: string) {
// slider.changeVariableValue(sliderValue)
// },
// addSlider() {
// c.getIconFromToolShelf("slider").click()
// },
// deleteSlider() {
// c.closeComponent("slider")
// },
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// addNewAttribute(collectionIndex = 1) {
// table.addNewAttribute(collectionIndex)
// },
// renameAttribute(currentAttributeName: string, newAttributeName: string, collectionIndex = 1) {
// table.renameAttribute(currentAttributeName, newAttributeName, collectionIndex)
// },
// deleteAttribute(attributeName: string, collectionIndex = 1) {
// table.deleteAttribute(attributeName, collectionIndex)
// },
// addFormula(attributeName: string, formula: string, collectionIndex = 1) {
// table.addFormula(attributeName, formula, collectionIndex)
// },
// verifyValues(attributeName: string, values: Array<any>, collectionIndex = 1) {
// table.verifyFormulaValues(attributeName, values, collectionIndex)
// },
// checkFormulaExists(attributeName: string, formula: string, collectionIndex = 1) {
// table.checkFormulaExists(attributeName, formula, collectionIndex)
// },
// editFormula(attributeName: string, formula: string, collectionIndex = 1) {
// table.editFormula(attributeName, formula, collectionIndex)
// },
// createNewDataset() {
// table.createNewTableFromToolShelf()
// },
// insertCases(rowIndex: number, numOfCases: number) {
// table.openIndexMenuForRow(rowIndex)
// table.insertCases(numOfCases, "after")
// },
// changeSliderVariableName(sliderVariableName: string) {
// slider.changeVariableName(sliderVariableName)
// },
// changeSliderValue(sliderValue: string) {
// slider.changeVariableValue(sliderValue)
// },
// addSlider() {
// c.getIconFromToolShelf("slider").click()
// },
// deleteSlider() {
// c.closeComponent("slider")
// },

@eireland eireland merged commit dc370b9 into main Nov 15, 2024
13 of 17 checks passed
@eireland eireland deleted the 188497528-case-tile-filter-formula-editor branch November 15, 2024 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants