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

[ENH] Merging dev branch into master post-refactor #437

Merged
merged 112 commits into from
Jun 2, 2023

Conversation

jarmoza
Copy link
Contributor

@jarmoza jarmoza commented Jun 1, 2023

Closes #305
See also #251

Changes proposed in this pull request:

  • Merging with master all changes and tests implemented for the second phase of the annotation tool refactor - for its pages, components, and store methods

surchs and others added 30 commits November 7, 2022 11:30
* Explanation component test added

- added component test to illustrate prop behavior
minor refactoring:
- use uuid package to ensure random ID instead of passing unique ID as prop
- minor refactor of variable names

closes #211
* Refactored input data

- receives active category via prop (from parent)
- receives missing values via getter
- receives descriptions for values via getter

* Component test for store mutation

- mocked store mutation
- listen to mocked mutation being called via spy
- implement the mutation call in the component

* keep store mocks in store object
- test_e2e: end to end tests
- test_component: component tests
* Enable transformations

The continuous values component now displays
possible transformation heuristics it gets
from the store in a dropdown.

The user can select the correct transformation heuristic

* Sync heuristic from store

- the component displays the heuristic selected for the active category in the store
- component displays a preview of the transformed values from the store
- the selected heuristic is emitted to the store with the active Category
* Streamline and IO refactor

* Component test for refactored category table

* Removing remaining line from new categories UI

* selectedCategory no longer a duplicate local var

* Store vars as getters, no factory methods, cleanup
* Streamline IO for data dict refactor

* Component test for linking table - almost working

* Explicit mocks + working simple link test

* Remove debug messages

* Fix for first test and addition of second.

* Component now works with store directly

* Now checking for store link/unlink dispatch

* PR changes for simplifying component and test

* Remove emit to categpage for store/layout refactor
- refactored the component to get the data directly from the store
- has missing value button

Co-authored-by: Sebastian Urchs <surchs@users.noreply.github.com>
- annot-discrete-choices.vue
- annot-vocabulary.vue
- removed annot-discrete-choices.cy.js test component
- functionality now exists in annot-categorical vue component

Co-authored-by: Sebastian Urchs <surchs@users.noreply.github.com>
- Added annot-columns.cy.js file
- Component now displays mapped columns and their descriptions
- Component now informs the store when a column is removed/unlinked
- Modified the component alias to annotColumns
- Added activeCategory as input to the removeColumn mutation
Next page accessibility/navbar/layout refactor + All page refactor
* remove deprecated input from annot-tab
* implemented new input data

- prop (passed from parent page) to set own category (activeCategory)
- store getter to get the correct annotation component for the activeCategory
Removal of nextPageAccessible getter
The mutation changes the mapping of an already mapped column to a different category

Co-authored-by: Sebastian Urchs <surchs@users.noreply.github.com>
Mutation:
- removes the mapping of column to category if they're already mapped
- changes the mapping of column to category if they're not already mapped
Component reflects the changes following the implementation of alterColumnCategoryMapping mutation
Component and its test reflect the changes following the implementation of alterColumnCategoryMapping mutation
jarmoza and others added 9 commits April 19, 2023 15:18
* Remove table code, add comments for future impl

* Cleanup and updated comments for future impl
* Refactor dataSetMeetsCriteria and loadAppState

* Progress thus far

* Some fixes

* Added `Diagnosis` options

* Refactored `annotation-pagetests.cy.js` e2e test

- Updated `data-cy` references in `cy.get` statements
- Removed use of `Save Annotation` button as the button itself
has been removed
- Commented out `tool group` test cases

* Re-enabled `annotation-pagetests.cy.js` e2e test

* Refactored `simple-e2etest.cy.js` e2e test

* Re-enabled all e2e tests

* Addressed requested changes from PR

* Removing old, commented out tests for tool groups

---------

Co-authored-by: Jonathan Armoza <jarmoza@gmail.com>
- Updated `Diagnosis` options

- Updated annotation page e2e test

- Alphabetized the `Diagnosis` options
* Categ values column output getter + termURLPrefix

* Updated getter

* Initial getter unit test

* In progress unit tests

* Getter 'Levels' fix

* Unit test formatting

* Reworked `IsAbout.TermURL` assignment in `getCategoricalJsonOutput` getter

* Fixed the condition for adding `Levels` to the output JSON

* Implemented `MissingValues` in `getCategoricalJsonOutput` getter

Added a test case for `MissingValues` in `getCategoricalJsonOutput`
getter's unit test

* Reworked `MissingValues` in `getCategoricalJsonOutput` getter

* Addressed the requested changes from PR review

---------

Co-authored-by: rmanaem <rmanaem@protonmail.ch>
…column (#430)

* Modified `transformationHeuristics` to an object with heuristics as properties

* Updated `getTransformOptions` getter

* Updated store-getter-getTransformOptions.cy.js

* Implemented `getContinuousJsonOutpus` getter

* Implemented unit test for `getContinuousJsonOutput` getter

* Cleaned up `getCategoricalJsonOutput`

* Addressed the requested changes from the PR review

* Updated `getTransformationOptions` getter's unit test
@jarmoza
Copy link
Contributor Author

jarmoza commented Jun 2, 2023

After merging master's changes into dev and then dev's changes back into master, we encountered a problem with running e2e tests on github.

The issue was that there was no dist/ folder. When gh pages was set up, target: static was introduced into the nuxt.config.js, prompting the app to look for static html pages in a dist folder upon npm run build. With this flag, we now need to use npm run generate as a command in the test_e2e.yml for GitHub actions. This will generate the static pages for the app beyond its index.html.

@jarmoza jarmoza merged commit e027280 into master Jun 2, 2023
@jarmoza jarmoza deleted the dev_components_talk_to_store_directly branch June 2, 2023 16:53
@jarmoza jarmoza changed the title [WIP] Merging dev branch into master post-refactor Merging dev branch into master post-refactor Jun 2, 2023
@jarmoza jarmoza changed the title Merging dev branch into master post-refactor [ENH] Merging dev branch into master post-refactor Jun 2, 2023
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.

Refactoring the store to use the data dictionary: Phase 2
3 participants