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

refactor: merges TaxonomyCardMenu and TaxonomyDetailMenu #13

Conversation

rpenido
Copy link
Member

@rpenido rpenido commented Nov 28, 2023

This PR merges the TaxonomyCardMenu and TaxonomyDetailMenu since both contain the same items.

Copy link

codecov bot commented Nov 28, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (rpenido/fal-3532-import-taxonomy@4202c27). Click here to learn what that means.

Additional details and impacted files
@@                         Coverage Diff                         @@
##             rpenido/fal-3532-import-taxonomy      #13   +/-   ##
===================================================================
  Coverage                                    ?   88.82%           
===================================================================
  Files                                       ?      449           
  Lines                                       ?     6938           
  Branches                                    ?     1473           
===================================================================
  Hits                                        ?     6163           
  Misses                                      ?      750           
  Partials                                    ?       25           

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

import messages from './messages';

const TaxonomyMenu = ({
id, name, iconMenu, disabled,
Copy link
Member

Choose a reason for hiding this comment

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

@rpenido Would you add a menuItems like I added here. It's cleaner, and I used that to enable some menus for the system defined taxonomies.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure @ChrisChV!

Copy link
Member Author

@rpenido rpenido Nov 29, 2023

Choose a reason for hiding this comment

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

Done 0fe4b3c

I moved the logic to run inside the menu (to avoid duplication). Let me know what you think.

@rpenido rpenido force-pushed the rpenido/fal-3539-refactor-taxonomy-menu branch from ee3cb0f to 73dbd0d Compare November 29, 2023 15:12
@rpenido rpenido force-pushed the rpenido/fal-3539-refactor-taxonomy-menu branch from 73dbd0d to 0fe4b3c Compare November 29, 2023 15:12
Copy link
Member

@ChrisChV ChrisChV left a comment

Choose a reason for hiding this comment

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

@rpenido Looks good to me 👍 My concern is that there are going to be conflicts with openedx#684. Won't be long until that PR is merged. So, depending on which PR is merged, one will have to fix the conflicts.

  • I tested this: I tested that the menu works.
  • I read through the code and considered the security, stability and performance implications of the changes.
  • I tested that the UI can be used with a keyboard only (tab order, keyboard controls).
  • Includes tests for bugfixes and/or features added.
  • Includes documentation

@rpenido
Copy link
Member Author

rpenido commented Nov 29, 2023

@rpenido Looks good to me 👍 My concern is that there are going to be conflicts with openedx#684. Won't be long until that PR is merged. So, depending on which PR is merged, one will have to fix the conflicts.

* [x]  I tested this: I tested that the menu works.

* [x]  I read through the code and considered the security, stability and performance implications of the changes.

* [x]  I tested that the UI can be used with a keyboard only (tab order, keyboard controls).

* [x]  Includes tests for bugfixes and/or features added.

* [x]  Includes documentation

Sure @ChrisChV!

As openedx#684 is on CC review, I think it is better to merge to openedx#675.

@bradenmacdonald What do you think about merging this refactor to openedx#675? It seems like they didn't start the external review.

@bradenmacdonald
Copy link
Member

@rpenido Good point. I don't want to slow down the CC review, so it does make sense to merge this to openedx#675 . Just make sure to update that PR with master once openedx#684 merges, so we resolve all the conflicts.

@rpenido rpenido marked this pull request as ready for review November 30, 2023 23:57
@rpenido rpenido merged commit 6bcd924 into rpenido/fal-3532-import-taxonomy Nov 30, 2023
5 checks passed
@rpenido rpenido deleted the rpenido/fal-3539-refactor-taxonomy-menu branch November 30, 2023 23:58
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.

3 participants