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

PR for [UX] Fixed merge conflict related issues from previous PR#1077 #1199

Open
wants to merge 2 commits into
base: features/ux
Choose a base branch
from
Open

PR for [UX] Fixed merge conflict related issues from previous PR#1077 #1199

wants to merge 2 commits into from
+2,388 −10,637

Conversation

jamelachahbar
Copy link
Contributor

🛠️ Description

Fixed merge conflict related issues from previous PR, including duplicate values, values that needed to be removed,etc...

Fixes #

📷 Screenshots

📋 Checklist

🔬 How did you test this change?

  • 🤏 Lint tests
  • 🤞 PS -WhatIf / az validate
  • 👍 Manually deployed + verified
  • 💪 Unit tests
  • 🙌 Integration tests

🙋‍♀️ Do any of the following that apply?

  • 🚨 This is a breaking change.
  • 🤏 The change is less than 20 lines of code.

📑 Did you update docs/changelog.md?

  • ✅ Updated changelog (required for dev PRs)
  • ➡️ Will add log in a future PR (feature branch PRs only)
  • ❎ Log not needed (small/internal change)

📖 Did you update documentation?

  • ✅ Public docs in docs (required for dev)
  • ✅ Internal dev docs in src (required for dev)
  • ➡️ Will add docs in a future PR (feature branch PRs only)
  • ❎ Docs not needed (small/internal change)

@jamelachahbar jamelachahbar self-assigned this Dec 9, 2024
@jamelachahbar jamelachahbar added the Tool: Web app Web app to learn about and manage toolkit resources. label Dec 9, 2024
@microsoft-github-policy-service microsoft-github-policy-service bot added the Needs: Review 👀 PR that is ready to be reviewed label Dec 9, 2024
jamelachahbar
jamelachahbar commented Dec 9, 2024
View reviewed changes
Copy link
Contributor Author

@jamelachahbar jamelachahbar left a comment

Choose a reason for hiding this comment

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

After this PR, I will start implementing incrementally, the suggestions collected from the previous PR and create specific issues for these.

@jamelachahbar jamelachahbar linked an issue Dec 9, 2024 that may be closed by this pull request
[UX] Fix merge related issues from previous PR #1200
Open
@jamelachahbar jamelachahbar changed the title Jachahbar-ux/fixmerges PR for [UX] Fixed merge conflict related issues from previous PR#1077 Dec 9, 2024
flanakin
flanakin approved these changes Dec 10, 2024
View reviewed changes
src/web/package.json Show resolved Hide resolved
src/web/pages/PowerBIReportsPage.tsx Show resolved Hide resolved
src/web/pages/App.tsx Show resolved Hide resolved
@flanakin flanakin added Status: ▶️ Ready Issue is ready for a dev to start work and removed Needs: Review 👀 PR that is ready to be reviewed labels Dec 10, 2024
@flanakin flanakin added this to the Web app milestone Dec 14, 2024
@jamelachahbar
Copy link
Contributor Author

@arthurclares , when you have time, can you merge this pr tin to the ux branch so I can continue the work. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arthurclares arthurclares Awaiting requested review from arthurclares

@flanakin flanakin Awaiting requested review from flanakin

Assignees

@flanakin flanakin

@arthurclares arthurclares

@jamelachahbar jamelachahbar

Labels
Status: ▶️ Ready Issue is ready for a dev to start work Tool: Web app Web app to learn about and manage toolkit resources.
Projects
None yet
Milestone
Web app
Development

Successfully merging this pull request may close these issues.

[UX] Fix merge related issues from previous PR
3 participants
@jamelachahbar @flanakin @arthurclares