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

Partitioning the individual tags page #5902

Closed
wants to merge 3 commits into from
Closed

Partitioning the individual tags page #5902

wants to merge 3 commits into from

Conversation

gautamig54
Copy link
Contributor

@gautamig54 gautamig54 commented Jun 14, 2019

Fixes #5890 (<=== Add issue number here)

Screen Shot 2019-06-14 at 9 57 59 AM

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!

@CleverFool77
Copy link
Member

Hi @gautamig54 Should I start the work on nav tabs to dropdown ? Coz I don't think that it's associated with other parts.

@gautamig54
Copy link
Contributor Author

Sure @CleverFool77. You can start creating that. We can position it once this PR gets merged. I have also started with the main tag card.

@gautamig54
Copy link
Contributor Author

@jywarren This PR is ready for merge.

@gautamig54
Copy link
Contributor Author

@CleverFool77 I would suggest that you start with the image first.It will be better if do things in order. What do you say?
After you resize and position the image, I can position the tags card as well.
What do you say?

@CleverFool77
Copy link
Member

CleverFool77 commented Jun 14, 2019

I'm not yet clear regarding the image.
So regarding the image, Should I remove all the data above nav tabs leaving only image and people following section ?
Ca you send me an example link for tag where there is a image.

@gautamig54
Copy link
Contributor Author

The data above the nav tabs will be divided into other segments like, related tags will go to the sidebar, the wiki info and the other options will go to the tag card.
I think you need to resize the image. Also, as discussed by @jywarren, the tags with no image, will display a light grey background in place of the image.
Sounds fine?

@CleverFool77
Copy link
Member

The data above the nav tabs will be divided into other segments like, related tags will go to the sidebar, the wiki info and the other options will go to the tag card.
I think you need to resize the image. Also, as discussed by @jywarren, the tags with no image, will display a light grey background in place of the image.
Sounds fine?

Exactly. So for now, Should I remove them, later we will add them in sidebar or wherever they are needed.

@gautamig54
Copy link
Contributor Author

Since it is not a shadow page, therefore I don't think removing them is a good idea. We can just change their location as we proceed to the tasks.

@CleverFool77
Copy link
Member

Since it is not a shadow page, therefore I don't think removing them is a good idea. We can just change their location as we proceed to the tasks.

Ohkk. I'll just let it remain like usual at it's position then. And for now I'll work on tag's wiki image adjustment to take full span and those with no wiki to have grey image. And over it to have people following data in right-bottom corner. Cool.

@gautamig54
Copy link
Contributor Author

That sounds great !

@jywarren
Copy link
Member

Ah but if we're not on a shadow page, should we be merging this with the Lorem Ipsum text on the side? Maybe best come up with a short term fix for that, or hold this and open PRs against it so we can merge to master only once it's ready for people to see? Thank you!

@gautamig54
Copy link
Contributor Author

@jywarren Can we add the related tags section on the right side, removing the Lorem Ipsum text. It will good to go as for now, until we add the map.
What do you think @CleverFool77 ?

@CleverFool77
Copy link
Member

Hi @gautamig54 Does UI as per new style guide have related tags section in second column ? If yes, then we can add it. Or else lorem ipsum text for now would be good. or how about combining two parts of the issue here and adding map here only ? So we won't have empty space ?
Thanks !!!

@CleverFool77 CleverFool77 added this to In progress PRs in UI improvements - Summer Of Code 2019 via automation Jun 19, 2019
@CleverFool77
Copy link
Member

Hi @gautamig54 Juts added your PR to project in-progress card.
Thanks !!

@gautamig54
Copy link
Contributor Author

There is no section for related tags in the new style guide. I thought it will be good to place them in the side section. This can be a temporary solution.
I also like your idea of adding a map in this PR itself. Let do that only. What do you say?

@CleverFool77
Copy link
Member

There is no section for related tags in the new style guide. I thought it will be good to place them in the side section. This can be a temporary solution.
I also like your idea of adding a map in this PR itself. Let do that only. What do you say?

great. 🎉

@jywarren
Copy link
Member

jywarren commented Jun 19, 2019 via email

@gautamig54
Copy link
Contributor Author

@jywarren I have placed the related tags on the sidebar. This PR is ready for merge.

@jywarren
Copy link
Member

Nice! We have some issue where the parallel tests are now overwriting each others comments so the screenshots are harder to find but you can get them in the "revisions" of the Dangerbot comment. Here's what yours looks like!

image

@jywarren
Copy link
Member

It looks great. Any idea why tests aren't passing? Thanks!

@gautamig54
Copy link
Contributor Author

gautamig54 commented Jun 21, 2019

I removed the conflicts and rebased the code, I am not able to understand why the tests aren't passing.

@asquare14
Copy link
Member

I saw that the tests are failing because the tests are not able to get the expected components. I think you will have tp rewrite the tests too. Additionally, please restart your Travis once to see which ones were flaky.

@gautamig54
Copy link
Contributor Author

@jywarren This issue is pending to be merged. Kindly look into this. Thanks!

@jywarren
Copy link
Member

Hmm. I've seen this before: https://travis-ci.org/publiclab/plots2/jobs/548813611#L4029

 FAIL["test_graph", #<Minitest::Reporters::Suite:0x0000559a12381380 @name="TagSelectionTest">, 0.3034094249999839]
 test_graph#TagSelectionTest (0.30s)
        Expected: 16
          Actual: 20
        test/unit/tag_selection_test.rb:12:in `block in <class:TagSelectionTest>'

I think it's unrelated. I'll restart this but we can also rebase if it fails again.

@jywarren
Copy link
Member

Here, on the other hand, i haven't seen this. But we aren't changing controllers, are we?

https://travis-ci.org/publiclab/plots2/jobs/548813612#L4029-L4077


 FAIL["test_should_have_a_active_asked_and_an_inactive_answered_tab_for_question", #<Minitest::Reporters::Suite:0x00005582b7d9e740 @name="TagControllerTest">, 51.05422450999998]
 test_should_have_a_active_asked_and_an_inactive_answered_tab_for_question#TagControllerTest (51.05s)
        Expected: 2
          Actual: 1
        test/functional/tag_controller_test.rb:577:in `block in <class:TagControllerTest>'
 FAIL["test_should_have_active_Research_tab_for_notes", #<Minitest::Reporters::Suite:0x00005582b7a5c140 @name="TagControllerTest">, 51.17118526999997]
 test_should_have_active_Research_tab_for_notes#TagControllerTest (51.17s)
        Expected: 2
          Actual: 1
        test/functional/tag_controller_test.rb:440:in `block in <class:TagControllerTest>'
 FAIL["test_should_have_active_question_tab_for_question", #<Minitest::Reporters::Suite:0x00005582b743b9f0 @name="TagControllerTest">, 51.31611122600003]
 test_should_have_active_question_tab_for_question#TagControllerTest (51.32s)
        Expected: 2
          Actual: 1
        test/functional/tag_controller_test.rb:450:in `block in <class:TagControllerTest>'
 FAIL["test_should_have_active_question_tab_for_question_for_show_for_author", #<Minitest::Reporters::Suite:0x00005582b704bf20 @name="TagControllerTest">, 51.426479293]
 test_should_have_active_question_tab_for_question_for_show_for_author#TagControllerTest (51.43s)
        Expected: 2
          Actual: 1
        test/functional/tag_controller_test.rb:566:in `block in <class:TagControllerTest>'
 FAIL["test_should_show_a_featured_wiki_page_at_top,_if_it_exists", #<Minitest::Reporters::Suite:0x00005582b5744c98 @name="TagControllerTest">, 51.897871684999984]
 test_should_show_a_featured_wiki_page_at_top,_if_it_exists#TagControllerTest (51.90s)
        Expected exactly 1 element matching "#wiki-content", found 2..
        Expected: 1
          Actual: 2
        test/functional/tag_controller_test.rb:289:in `block in <class:TagControllerTest>'
 FAIL["test_tag_contributors", #<Minitest::Reporters::Suite:0x00005582b8377590 @name="TagControllerTest">, 53.44871669599996]
 test_tag_contributors#TagControllerTest (53.45s)
        Expected: 2
          Actual: 1
        test/functional/tag_controller_test.rb:361:in `block in <class:TagControllerTest>'
 FAIL["test_tag_show", #<Minitest::Reporters::Suite:0x00005582b6d89210 @name="TagControllerTest">, 53.86620479599998]
 test_tag_show#TagControllerTest (53.87s)
        Expected exactly 1 element matching "#wiki-content", found 2..
        Expected: 1
          Actual: 2
        test/functional/tag_controller_test.rb:171:in `block in <class:TagControllerTest>'
 FAIL["test_wildcard_tag_should_have_a_active_asked_and_an_inactive_answered_tab_for_question", #<Minitest::Reporters::Suite:0x00005582b757ec18 @name="TagControllerTest">, 54.965742990000024]
 test_wildcard_tag_should_have_a_active_asked_and_an_inactive_answered_tab_for_question#TagControllerTest (54.97s)
        Expected: 2
          Actual: 1
        test/functional/tag_controller_test.rb:246:in `block in <class:TagControllerTest>'

@jywarren
Copy link
Member

OK - indeed, these functional tests are testing for things on the page:

test 'should have a active asked and an inactive answered tab for question' do
tag = tags(:question)
get :show_for_author, params: { id: tag.name, author: 'jeff' }
selector = css_select '#asked-tab.active'
assert_equal selector.size, 1
assert_select '#answered-tab', 1
end

So, here, some tabs, items have been removed, and we should go through them one by one by the line numbers of the failing tests, and update them to match the new design. Does that make sense?

Then we should be good to go!

@gautamig54
Copy link
Contributor Author

We are not making any changes in the controllers. Its just the view files.

@asquare14
Copy link
Member

asquare14 commented Jun 29, 2019

Yes, but the controller expects certain UI components for which it is testing.
Since the UI is changing, tests are failing. You'll need to update the tests. Feel free to ask for help, I have some experience with testing. Hope this makes sense :D

@gautamig54
Copy link
Contributor Author

I guess the issue is with the active tabs. That's where the cases are failing.
@CleverFool77 We still have the tabs after building a dropdown right?

@jywarren
Copy link
Member

jywarren commented Jul 1, 2019 via email

@CleverFool77
Copy link
Member

I guess the issue is with the active tabs. That's where the cases are failing.
@CleverFool77 We still have the tabs after building a dropdown right?

Yes but dropdown PR #5925 isn't merged yet.
Maybe your failing is because of divs you added for new UI. I didn't check the tests yet. But it might be.

@jywarren
Copy link
Member

jywarren commented Jul 5, 2019

#5925 is now merged, and 2 other related ones. Hopefully if this is rebased it'll now resolve? Thanks!

@gautamig54 gautamig54 closed this Jul 8, 2019
UI improvements - Summer Of Code 2019 automation moved this from In progress PRs to Done Jul 8, 2019
@gautamig54 gautamig54 reopened this Jul 8, 2019
UI improvements - Summer Of Code 2019 automation moved this from Done to In progress PRs Jul 8, 2019
@jywarren
Copy link
Member

jywarren commented Jul 8, 2019

Hmm, just checking in with some oddness from automated screenshots (i get them by mail even though they aren't showing here):

image

@gautamig54 gautamig54 closed this Jul 8, 2019
UI improvements - Summer Of Code 2019 automation moved this from In progress PRs to Done Jul 8, 2019
@CleverFool77 CleverFool77 moved this from Done to Closed Without Merge ( Not Done) in UI improvements - Summer Of Code 2019 Jul 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
UI improvements - Summer Of Code 2019
  
Closed Without Merge ( Not Done)
Development

Successfully merging this pull request may close these issues.

UI Improvements Planning Issue : Individual tags page
4 participants