Skip to content

[Customer Portal MicroApp]: (fix) resolve unresolved merge conflict markers - #1058

Merged
Rashmika998 merged 1 commit into
wso2-open-operations:mainfrom
2003dinijay:dinijay/fix/merge-conflict-markers
Jul 6, 2026
Merged

Rashmika998 merged 1 commit into
wso2-open-operations:mainfrom
2003dinijay:dinijay/fix/merge-conflict-markers

Conversation

@2003dinijay

@2003dinijay 2003dinijay commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Removed leftover <<<<<<< v2 / ======= / >>>>>>> main conflict markers in PieChartWidget.tsx (empty-state block) and RichText.tsx (dark-mode styles), left behind from a prior merge and breaking the TypeScript build.

Test plan

  • npx eslint passes on both files
  • npx tsc -b --noEmit no longer reports parse errors for these files

Summary by CodeRabbit

  • Bug Fixes
    • Improved the dashboard chart empty state with a cleaner dashed “N/A” placeholder and consistent layout.
    • Fixed rich text styling so dark mode displays correctly and images now scale properly across themes.
    • Resolved stray layout inconsistencies from merged code, resulting in a more stable presentation.

PieChartWidget.tsx and RichText.tsx each had leftover <<<<<<< / ======= / >>>>>>>
conflict markers from a prior v2 merge, breaking the TypeScript build.
Copilot AI review requested due to automatic review settings July 6, 2026 10:22

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@coderabbitai

coderabbitai Bot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This PR resolves leftover merge-conflict artifacts and updates UI styling in two components: PieChartWidget's empty-state now shows a dashed-circle "N/A" instead of a text message, and RichText's dark-mode CSS rules are correctly scoped.

Changes

UI cleanup and merge-conflict resolution

Layer / File(s) Summary
PieChartWidget empty-state and item styling
apps/customer-portal/microapp/src/components/features/dashboard/PieChartWidget.tsx
Empty-state placeholder changed from "No {title} found" text to a dashed-circle "N/A" display; merge-conflict artifacts removed from container styling; CardActionArea wrapper reformatted with unchanged disabled/onClick behavior.
RichText dark-mode style fix
apps/customer-portal/microapp/src/components/shared/RichText.tsx
Merge-conflict markers resolved around applyStyles("dark", ...) block; dark-mode image filter rules kept inside the dark block, while image width rule is moved outside it.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Possibly related PRs

Suggested labels: Area/Frontend

Suggested reviewers: cloby99, Rashmika998

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Description check ⚠️ Warning Only Summary and Test plan are provided; most required template sections like Purpose, Goals, Release note, and Documentation are missing. Add the missing template sections and fill in Purpose, Goals, Approach, User stories, Release note, Documentation, and any other applicable items.
✅ Passed checks (4 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Title check ✅ Passed The title matches the main change: removing merge conflict markers in customer-portal files.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@2003dinijay 2003dinijay changed the title fix(customer-portal): resolve unresolved merge conflict markers [Customer Portal MicroApp]: (fix) resolve unresolved merge conflict markers Jul 6, 2026
@Rashmika998
Rashmika998 merged commit 48d9e96 into wso2-open-operations:main Jul 6, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants