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

feat: create, retrieve and delete skills of users from users tab #4455

Merged
merged 11 commits into from
Feb 3, 2023
Merged

feat: create, retrieve and delete skills of users from users tab #4455

merged 11 commits into from
Feb 3, 2023

Conversation

Pragati1610
Copy link
Contributor

fixes #4248

@Pragati1610 Pragati1610 requested a review from a team January 1, 2023 17:37
@Pragati1610 Pragati1610 requested a review from a team as a code owner January 1, 2023 17:37
@vercel
Copy link

vercel bot commented Jan 1, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated
care-storybook ✅ Ready (Inspect) Visit Preview 💬 Add your feedback Feb 3, 2023 at 7:16AM (UTC)

@netlify
Copy link

netlify bot commented Jan 1, 2023 •
edited
Loading

✅ Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit 4e54a54
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/63dcb453abc51e000ad1476c
😎 Deploy Preview https://deploy-preview-4455--care-egov-staging.netlify.app/
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@rithviknishad rithviknishad mentioned this pull request Jan 9, 2023
Closed
2 tasks
@nihal467
Copy link
Member

@Pragati1610
image

  • the UI is a little bit confusing because it looks similar to the old linked facility

image

  • the three skills are by default applied to all the users across the platform, it doesn't feel good
  • there is no data in the droplist, for user to select it

@nihal467
Copy link
Member

@Pragati1610 once its completely fixed, mark it for testing

@nihal467 nihal467 added the P1 breaking issue or vital feature label Jan 31, 2023
@khavinshankar
Copy link
Member

@nihal467 i have made some changes, I'll push it shortly (around 3pm today)

@khavinshankar
Copy link
Member

@Pragati1610 resolve the merge conflict

@github-actions github-actions bot removed the merge conflict pull requests with merge conflict label Feb 2, 2023
@nihal467
Copy link
Member

nihal467 commented Feb 2, 2023

@Pragati1610 @khavinshankar
image

when you add a skill for a user id, the skill is been added to all the users

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Feb 3, 2023
@github-actions
Copy link

github-actions bot commented Feb 3, 2023

👋 Hi, @Pragati1610,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.

This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

@khavinshankar
Copy link
Member

@Pragati1610 any reasons for force pushing?

@sonarcloud
Copy link

sonarcloud bot commented Feb 3, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@khavinshankar khavinshankar added needs testing and removed merge conflict pull requests with merge conflict work-in-progress labels Feb 3, 2023
@khavinshankar
Copy link
Member

@nihal467 can you retest this pr

@nihal467
Copy link
Member

nihal467 commented Feb 3, 2023

LGTM

@khavinshankar khavinshankar merged commit 07af954 into ohcnetwork:develop Feb 3, 2023
@Pragati1610
Copy link
Contributor Author

@Pragati1610 any reasons for force pushing?

Because of merge conflicts when rebased the branch

rabilrbl pushed a commit that referenced this pull request Feb 6, 2023
@Pragati1610 @khavinshankar @rabilrbl
feat: create, retrieve and delete skills of users from users tab (#4455)
be7c577 
* feat: create, retrieve and delete skills of users from users tab

* fix: action for getPermittedFacility

* fix: issues after rebasing

* convert skills to slideover

* clear comments

* show notifications only for errors

* reduced image size for no skills

* fix: href for linked skills

* fixed state issue in skills

* fixed delete skill issue

---------

Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>
@nihal467 nihal467 mentioned this pull request Mar 8, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@khavinshankar khavinshankar khavinshankar approved these changes

@mathew-alex mathew-alex Awaiting requested review from mathew-alex

Assignees
No one assigned
Labels
needs review P1 breaking issue or vital feature tested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Allow district admin to create, update and delete skills for users in User tab from care_fe UI
3 participants
@Pragati1610 @nihal467 @khavinshankar