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

renamed currentFacilityId #10807

Closed
wants to merge 0 commits into from
Closed

renamed currentFacilityId #10807

wants to merge 0 commits into from

Conversation

Ghat0tkach
Copy link
Contributor

Summary

This PR fixes #10763
Renamed the currentFacilityId to userFacilityId as instructed all with the help of @thanksameeelian

References

…

Reviewer guidance

…

Testing checklist

  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Critical and brittle code paths are covered by unit tests

PR process

  • PR has the correct target branch and milestone
  • PR has 'needs review' or 'work-in-progress' label
  • If PR is ready for review, a reviewer has been added. (Don't use 'Assignees')
  • If this is an important user-facing change, PR or related issue has a 'changelog' label
  • If this includes an internal dependency change, a link to the diff is provided

Reviewer checklist

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

@github-actions github-actions bot added APP: Coach Re: Coach App (lessons, quizzes, groups, reports, etc.) APP: Device Re: Device App (content import/export, facility-syncing, user permissions, etc.) APP: Facility Re: Facility App (user/class management, facility settings, csv import/export, etc.) APP: Learn Re: Learn App (content, quizzes, lessons, etc.) APP: User Re: User app (sign-in, sign-up, user profile, etc.) SIZE: small labels Jun 8, 2023
thanksameeelian
thanksameeelian reviewed Jun 8, 2023
View reviewed changes
kolibri/plugins/coach/assets/src/modules/pluginModule.js Outdated
@@ -66,7 +66,7 @@ export default {
store.commit('SET_DATA_LOADING', true);
store.commit('SET_CLASS_LIST', []); // Reset the list if we're loading a new one
return ClassroomResource.fetchCollection({
getParams: { parent: facilityId || store.getters.currentFacilityId, role: 'coach' },
getParams: { parent: facilityId || store.getters.userFacilityId, role: 'coach' },
Copy link
Contributor

Choose a reason for hiding this comment

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

hi there @Ghat0tkach! my apologies if this is something you're already aware of, but i wanted to be sure that you saw there is a slight merge conflict in your PR files that will need to get resolved before this can be reviewed.

while you were working on your PR, we changed the underlying code here in pluginModule.js in Coach to be
getParams: { parent: activeFacilityId, role: 'coach' } and removed the reference to currentFacilityId, so this file no longer requires the changes you introduced. you can see that change reflected in the latest version of develop.

once you remove your change here & allow this line to reflect the current state of develop, i think this PR should be all ready for review! at that point, please feel free to add me (and/or @MisRob) as reviewers in the "Reviewers" section on the righthand side, and we'll get to the review as soon as possible 🙂
Screen Shot 2023-06-08 at 10 39 08 AM

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes i saw but had no idea how to resolve them . Thanks again!!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i do apologise in order to resolve conflicts , i tried to fetch and ultimately it closed this PR .

Copy link
Contributor

Choose a reason for hiding this comment

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

it looks like you may have force-pushed your branch to be completely match develop, rather than just the pluginModule.js file, which means the changes you intended to introduce here might have gotten lost. you can reopen this PR from its new base, but you may have to reapply the changes you made.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes ,will fix this asap

@Ghat0tkach Ghat0tkach closed this Jun 8, 2023
@Ghat0tkach Ghat0tkach force-pushed the current-facility-id branch 2 times, most recently from 32911fd to 726134e Compare June 8, 2023 16:40
@github-actions github-actions bot added SIZE: very small and removed APP: Learn Re: Learn App (content, quizzes, lessons, etc.) APP: Device Re: Device App (content import/export, facility-syncing, user permissions, etc.) APP: Facility Re: Facility App (user/class management, facility settings, csv import/export, etc.) APP: User Re: User app (sign-in, sign-up, user profile, etc.) APP: Coach Re: Coach App (lessons, quizzes, groups, reports, etc.) labels Jun 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thanksameeelian thanksameeelian thanksameeelian left review comments

Assignees
No one assigned
Labels
SIZE: small SIZE: very small
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

change name of "currentFacilityId" in core state
2 participants
@Ghat0tkach @thanksameeelian