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

Dev to main sync #917

Merged
merged 7 commits into from
Nov 22, 2024
Merged

Dev to main sync #917

merged 7 commits into from
Nov 22, 2024

Conversation

rishirishhh
Copy link
Member

@rishirishhh rishirishhh commented Nov 19, 2024

Date: 19 November 2024

Developer Name: @rishirishhh @DepayanMondal


Issue Ticket Number

Real-Dev-Squad/website-status#1282

PRs going in the sync

#916

#909
#873

Screenshots

Screen.Recording.2024-11-19.at.3.59.22.PM.mov
staging-test.mp4
Screencast_from_2024-11-22_12-56-12.mp4
Screenshot 1

AnujChhikara and others added 7 commits October 29, 2024 10:23
…ed (#900)

* Fix: Side panel data not updating when different user cards are clicked

* renamed the variable

* added tests

* using staging api url for testing
…o super_user only (#896)

* Restrict approve and reject buttons on the Task Request detail page to super users only

* fixes naming convention, button render logic

* fix: reject button should not be part of the dom if condition not met

* changed the superUser data, make the task-request/script.js type module

* added tests how buttons should render for non-super user

* Update task-requestDetails.test.js

removed unused variable

* using data-testid for the tests

* importing the superuser data

* removing reject button from dom after successful task update

* put the changes behind the feature flag

---------

Co-authored-by: Achintya Chatterjee <55826451+Achintya-Chatterjee@users.noreply.github.com>
* task-requestDetails test fix

* removed fixed delays
* UI changes for delete group feature under feature flag

* chore: Test cases

* fix: issue is no group found
* added dropdown

* draft: add dropdown on discord user page to combine 'linked account' and 'n discord' buttons

* added dropdown in the discord users page

* Added dropdown option in the Discord Users page

* used data test id for the tests and variable for css

* added a comment on react.js for future convenience

---------

Co-authored-by: Depayan Mondal <depayan008@gmail.com>
Co-authored-by: Achintya Chatterjee <55826451+Achintya-Chatterjee@users.noreply.github.com>
Co-authored-by: Satyam Bajpai <bajpai1973satyam@gmail.com>
Copy link

cloudflare-workers-and-pages bot commented Nov 21, 2024

Deploying dashboard-rds with  Cloudflare Pages  Cloudflare Pages

Latest commit: 2629ec5
Status: ✅  Deploy successful!
Preview URL: https://62766548.dashboard-rds.pages.dev
Branch Preview URL: https://develop.dashboard-rds.pages.dev

View logs

@iamitprakash iamitprakash merged commit e104786 into main Nov 22, 2024
6 checks passed
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