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

Add additional related "subtags" upon adding new tags #9401

Merged
merged 13 commits into from
Apr 9, 2021

Conversation

aliciapaz
Copy link
Contributor

@aliciapaz aliciapaz commented Mar 31, 2021

Fixes #9398

Added more subtags in node.rb.

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@welcome
Copy link

welcome bot commented Mar 31, 2021

Thanks for opening this pull request! This space is protected by our Code of Conduct - and we're here to help.
Dangerbot will test out your code and reply in a bit with some pointers and requests.
Also please refer here for installation help 💿
There may be some errors, but don't worry! We'll work through them with you! 👍🎉😄

@gitpod-io
Copy link

gitpod-io bot commented Mar 31, 2021

@codecov
Copy link

codecov bot commented Mar 31, 2021

Codecov Report

❗ No coverage uploaded for pull request base (main@04bb121). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head e82357d differs from pull request most recent head f80182d. Consider uploading reports for the commit f80182d to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##             main    #9401   +/-   ##
=======================================
  Coverage        ?   79.70%           
=======================================
  Files           ?       98           
  Lines           ?     5958           
  Branches        ?        0           
=======================================
  Hits            ?     4749           
  Misses          ?     1209           
  Partials        ?        0           

@aliciapaz
Copy link
Contributor Author

I'm sorry I made so many commits to change just one file...I followed the git-flow on this article, but for some reason, other files were modified during the process of solving the conflicts so I had to edit them back to the way they are in the upstream main.
I was expecting that changing these files back would make the tests pass, but still no luck :P
@jywarren, @cesswairimu I would appreciate some help to improve this PR , please.
Thank you!

app/models/node.rb Outdated Show resolved Hide resolved
@jywarren jywarren closed this Apr 6, 2021
@jywarren
Copy link
Member

jywarren commented Apr 6, 2021

apologies, did this on the wrong issue 😅

@jywarren jywarren reopened this Apr 6, 2021
@gitpod-io
Copy link

gitpod-io bot commented Apr 6, 2021

@jywarren
Copy link
Member

jywarren commented Apr 6, 2021

What i meant to say was that you can check the exact test that failed by clicking "Details" on the right side of the test box, like shown here:

image

Then it's a bit hard to read but you can scroll through to find the exact error:

Progress: |================= FAIL NodeTest#test_adding_a_question:FOO_style_tag_adds_FOO_tag_as_well;_also_for_subtags (1.97s)
        Expected false to be truthy.
        test/unit/node_test.rb:48:in `block in <class:NodeTest>'

So, something must've gone wrong with test/unit/node_test.rb on line 48; let's take a look:

assert node.has_tag('particulate-matter')

Ahhhhhhh of course...

what happened here is that we overwrote the same key twice. It was my fault in the original proposed changes:

            subtags['pm'] = 'particulate-matter'
            subtags['pm'] = 'air-quality'

Thank you @cwils021 for seeing that!

Let's just remove that one line - the 2nd time, where we replace pm with air-quality.

Also wanted to note that i'm sorry you had some trouble with the git process, but in the end everything in https://github.com/publiclab/plots2/pull/9401/files looks good, so you got it right, @aliciapaz!!!

I think if we make this one small change everything should work. Thanks for your patience and apologies for the error I introduced!!!

Co-authored-by: Jeffrey Warren <[email protected]>
@codeclimate
Copy link

codeclimate bot commented Apr 6, 2021

Code Climate has analyzed commit f80182d and detected 0 issues on this pull request.

View more on Code Climate.

@aliciapaz
Copy link
Contributor Author

Thank you @jywarren and @cwils021 for the help. I'm happy to see that everything works now 🎉 🌞

Copy link
Collaborator

@Tlazypanda Tlazypanda left a comment

Choose a reason for hiding this comment

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

@aliciapaz LGTM 🎉

@jywarren jywarren merged commit db27577 into publiclab:main Apr 9, 2021
@welcome
Copy link

welcome bot commented Apr 9, 2021

Congrats on merging your first pull request! 🙌🎉⚡️
Your code will likely be published to PublicLab.org in the next few days, but first it will be published to https://stable.publiclab.org/ (it will take some minutes for this to load, and until then you may see logs from the build process). Please test out your work on this testing server and report back with a comment that all has gone well!
Do join our weekly check-in to share your this week goal and the awesome work you did 😃. Please find the link to our latest check-in here 📝
Now that you've completed this, you can help someone else take their first step!
Reach out to someone else working on theirs on Public Lab's code welcome page (where you'll now be featured as a recent contributor!). Thanks!

Help others take their first step

Now that you've merged your first pull request, you're the perfect person to help someone else out with this challenging first step. 🙌

https://code.publiclab.org

Try looking at this list of `first-timers-only` issues, and see if someone else is waiting for feedback, or even stuck! 😕

People often get stuck at the same steps, so you might be able to help someone get unstuck, or help lead them to some documentation that'd help. Reach out and be encouraging and friendly! 😄 🎉

Read about how to help support another newcomer here, or find other ways to offer mutual support here.

@jywarren
Copy link
Member

jywarren commented Apr 9, 2021

Awesome, thank you @aliciapaz and thank you @Tlazypanda !!!!

reginaalyssa pushed a commit to reginaalyssa/plots2 that referenced this pull request Oct 16, 2021
* Update _node_meta.html.erb (publiclab#8097)

* Delete GCI_MENTOR_GUIDELINES.md

GCI discontinued

* add additional related subtags

* Update _node_meta.html.erb

* Update babel.config.js

* Update webpacker.yml

* Update babel.config.js

* Update babel.config.js

* Update babel.config.js

* Update babel.config.js

* Update babel.config.js

* Update app/models/node.rb

Co-authored-by: Jeffrey Warren <[email protected]>

Co-authored-by: Pranav Addepalli <[email protected]>
Co-authored-by: Sasha Boginsky <[email protected]>
Co-authored-by: Jeffrey Warren <[email protected]>
billymoroney1 pushed a commit to billymoroney1/plots2 that referenced this pull request Dec 28, 2021
* Update _node_meta.html.erb (publiclab#8097)

* Delete GCI_MENTOR_GUIDELINES.md

GCI discontinued

* add additional related subtags

* Update _node_meta.html.erb

* Update babel.config.js

* Update webpacker.yml

* Update babel.config.js

* Update babel.config.js

* Update babel.config.js

* Update babel.config.js

* Update babel.config.js

* Update app/models/node.rb

Co-authored-by: Jeffrey Warren <[email protected]>

Co-authored-by: Pranav Addepalli <[email protected]>
Co-authored-by: Sasha Boginsky <[email protected]>
Co-authored-by: Jeffrey Warren <[email protected]>
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.

6 participants