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.

Sign up for GitHub

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

Jump to bottom

Fixes 7939: Admin navbar misplaced fix #7940

Merged
merged 3 commits into from
Nov 14, 2019
Merged

Fixes 7939: Admin navbar misplaced fix #7940

merged 3 commits into from
Nov 14, 2019

Conversation

Showtim3
Copy link
Contributor

@Showtim3 Showtim3 commented Nov 7, 2019 •
edited
Loading

Explanation

Fixes #7939 Admin Navbar position.
I have verified that the navbar is not breaking at other pages. The file that contains this navbar is admin-navbar.directive.html but the css that it is getting is from the oppia.css

Screenshot 2019-11-08 at 1 17 11 AM

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The linter/Karma presubmit checks have passed.
    • These should run automatically, but if not, you can manually trigger them locally using python -m scripts.pre_commit_linter and python -m scripts.run_frontend_tests.
  • The PR is made from a branch that's not called "develop".
  • The PR has an appropriate "PROJECT: ..." label (Please add this label for the first-pass review of the PR).
  • The PR has an appropriate "CHANGELOG: ..." label (If you are unsure of which label to add, ask the reviewers for guidance).
  • The PR follows the style guide.
  • The PR addresses the points mentioned in the codeowner checks for the files/folders changed. (See the codeowner's wiki page.)
  • The PR is assigned to an appropriate reviewer.
    • If you're a new contributor, please ask on Gitter for someone to assign a reviewer and don't tick this checkbox.
    • If you're not sure who the appropriate reviewer is, please assign to the issue's "owner" -- see the "talk-to" label on the issue. Do not only request the review but also add the reviewer as an assignee.

@oppiabot
Copy link

oppiabot bot commented Nov 8, 2019

Assigning @nithusha21 for the first-pass review of this pull request. Thanks!

@codecov
Copy link

codecov bot commented Nov 8, 2019 •
edited
Loading

Codecov Report

Merging #7940 into develop will increase coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop    #7940      +/-   ##
===========================================
+ Coverage    83.97%   83.98%   +0.01%     
===========================================
  Files         1150     1131      -19     
  Lines        68617    68087     -530     
  Branches      3913     3828      -85     
===========================================
- Hits         57621    57180     -441     
+ Misses        9660     9617      -43     
+ Partials      1336     1290      -46
Flag Coverage Δ
#backend 100% <ø> (ø) ⬆️
#frontend 73.6% <ø> (-0.05%) ⬇️
Impacted Files Coverage Δ
...e/templates/dev/head/services/debouncer.service.ts 5% <0%> (-26.25%) ⬇️
...re/templates/dev/head/services/UpgradedServices.ts 86.67% <0%> (-1.21%) ⬇️
...es/dev/head/services/assets-backend-api.service.ts 61.82% <0%> (-0.57%) ⬇️
...editor-page/services/exploration-states.service.ts 61.97% <0%> (-0.18%) ⬇️
...tate-responses-editor/state-responses.directive.ts 11.97% <0%> (ø) ⬆️
core/domain/prod_validation_jobs_one_off.py 100% <0%> (ø) ⬆️
core/storage/suggestion/gae_models.py 100% <0%> (ø) ⬆️
core/domain/suggestion_services.py 100% <0%> (ø) ⬆️
scripts/build.py 100% <0%> (ø) ⬆️
core/domain/suggestion_registry.py 100% <0%> (ø) ⬆️
... and 27 more

@nithusha21 nithusha21 removed their assignment Nov 10, 2019
ankita240796
ankita240796 approved these changes Nov 11, 2019
View reviewed changes
Copy link
Contributor

@ankita240796 ankita240796 left a comment

Choose a reason for hiding this comment

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

LGTM, Thanks @Showtim3!

Please address @DubeySandeep's comment before merging. Also, I have just checked the admin page and it is working correctly. Since you have changed oppia-navbar class, please ensure that this change does not break any other navbars which use this class.

@Showtim3 Showtim3 requested a review from seanlip as a code owner November 12, 2019 06:49
@Showtim3
Copy link
Contributor Author

@DubeySandeep PTAL!

seanlip
seanlip approved these changes Nov 12, 2019
View reviewed changes
Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

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

Thanks @Showtim3! I don't have concerns about the fix itself but I do have a question. How did this error get introduced into the codebase?

@Showtim3
Copy link
Contributor Author

@seanlip I am not sure about it either, I just started the dev server after a long time(since the migration stuff doesnt require that) and encountered this bug. Not sure how it got in the first place.

@seanlip
Copy link
Member

seanlip commented Nov 12, 2019

Could you please do some bisection to check? I.e. look at the commit history and binary search to find the first commit which introduced the bug. (We should try and analyze that so that things like this don't recur in the future.)

@Showtim3
Copy link
Contributor Author

@seanlip I couln't find any code change that might have caused the navbar to broke. So m pretty sure it is caused by the bootstrap upgrade since the admin navbar has a class navbar navbar-default and navbar-light which are all bootstrap classes.

@seanlip
Copy link
Member

seanlip commented Nov 12, 2019

You should be able to identify the commit that caused the breakage, though. See https://git-scm.com/docs/git-bisect -- basically, check out historical commits and start the server on each one until you find two consecutive commits where the navbar works correctly for the earlier one, and breaks for the later one.

@Showtim3
Copy link
Contributor Author

@seanlip Hey Sean, I tried using the git bisect but at a point of time our dev scripts started colliding like I reached a particular commit and the scripts were back to being start.sh so the server started working and I was unable to find a commit.

@seanlip
Copy link
Member

seanlip commented Nov 14, 2019

Ah, OK. Let's leave it then. Thank you for investigating!

@seanlip
Copy link
Member

seanlip commented Nov 14, 2019

Merging :) Thanks @Showtim3!

@ankita240796 does this need to be merged into the current release? If not please feel free to remove the "PR: for current release" label. Thanks!

@seanlip seanlip merged commit e2dc196 into oppia:develop Nov 14, 2019
@ankita240796
Copy link
Contributor

Yes, it needs to be cherry-picked. Thanks for the ping!

ankita240796 pushed a commit that referenced this pull request Nov 14, 2019
@Showtim3 @ankita240796
Fixes 7939: Admin navbar misplaced fix (#7940)
824fb5e 
* fixing admin navbar

* Removing property from oppia.css
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DubeySandeep DubeySandeep DubeySandeep left review comments

@ankita240796 ankita240796 ankita240796 approved these changes

@nithusha21 nithusha21 nithusha21 approved these changes

@seanlip seanlip seanlip approved these changes

Assignees

@Showtim3 Showtim3

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

The navbar at the admin page in development server is misplaced.
6 participants
@Showtim3 @seanlip @ankita240796 @nithusha21 @DubeySandeep @kevinlee12