Skip to content

fix: search ref problem #1602

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

Merged
merged 1 commit into from
Oct 23, 2024
Merged

Conversation

AMIRKHANEF
Copy link
Member

@AMIRKHANEF AMIRKHANEF commented Oct 23, 2024

close #1601

Summary by CodeRabbit

  • New Features

    • Introduced a dedicated search filter for referenda, enhancing the ability to filter based on various criteria such as titles and proposers.
  • Improvements

    • Enhanced modularity and maintainability of the search functionality by encapsulating filtering logic in a separate function.

Copy link
Contributor

coderabbitai bot commented Oct 23, 2024

Walkthrough

The pull request introduces a new function, applySearchFilter, to manage the filtering of referenda based on various criteria, including titles and proposers. The onSearch function is modified to only update the searchKeyword state, while filtering is now handled by applySearchFilter. Additionally, the useEffect hook has been updated to incorporate checks for searchKeyword and apply the new filtering logic accordingly. Minor formatting changes were also made to the JSX structure without altering the underlying logic.

Changes

File Path Change Summary
packages/extension-polkagate/src/fullscreen/governance/SearchBox.tsx Introduced applySearchFilter function for filtering logic; modified onSearch to update searchKeyword; updated useEffect for new filtering checks; made minor JSX formatting adjustments.

Possibly related PRs

  • fix: apply search after loading new batch of referenda  #1597: This PR modifies the onSearch function to manage the searchKeyword state, which is directly related to the changes made in the main PR where the filtering logic is encapsulated in the new applySearchFilter function. Both PRs focus on enhancing the search functionality within the SearchBox component.

Poem

In the fields where referenda bloom,
A search box now clears the gloom.
With filters set, the choices align,
Each keyword a path, a chance to shine.
Hopping through logic, neat and spry,
We celebrate changes, oh my, oh my! 🐇✨


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 9990189 and fb3a14d.

📒 Files selected for processing (1)
  • packages/extension-polkagate/src/fullscreen/governance/SearchBox.tsx (6 hunks)
🧰 Additional context used
🔇 Additional comments (3)
packages/extension-polkagate/src/fullscreen/governance/SearchBox.tsx (3)

93-94: LGTM! Good separation of concerns

The simplified onSearch function now properly focuses on state management, while delegating filtering logic to applySearchFilter.


Line range hint 177-186: LGTM! Clean formatting changes

The Grid component adjustments improve code readability while maintaining the same functionality.

Also applies to: 233-236


63-72: Verify the search reference fix

Let's verify that the search reference problem is properly fixed by checking the actual behavior.

Also applies to: 125-128

✅ Verification successful

Let me gather more information about the search functionality implementation to verify the fix.

The previous attempt with file type tsx failed, so I've modified the search to use glob patterns instead. This will help us understand:

  1. How SearchBox is used across the codebase
  2. If there are any existing tests for the search functionality
  3. Related filter implementations that might affect the search behavior

Let me gather one more piece of information to understand the filter implementation better.

This will help us understand:

  1. How the filter state is structured and used
  2. The type definitions for the filter object to verify the implementation matches the intended behavior

Based on the gathered information, I can now provide a final response about the search reference fix.

Search functionality implementation is correct and properly fixed

The implementation properly handles the search reference problem through:

  1. Correct string comparison for reference index: String(r.post_id) === keyword
  2. Proper case-insensitive search for titles and methods: .toLowerCase().includes(keyword.toLowerCase())
  3. Exact match for proposer addresses: r.proposer === keyword
  4. Clear separation of filter logic with proper dependency tracking in useCallback
  5. Consistent filter application order with proper state management

The search functionality is implemented as a composable filter system where:

  • Advanced filters (refIndex, titles, methods, proposers) are properly toggled
  • Status filters are correctly applied
  • Search keyword filtering is applied after other filters
  • Duplicates are properly handled via Set
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for any test files or specs that verify the search functionality
rg -t tsx -t ts "describe.*SearchBox" --glob "!node_modules"

# Look for any related issue discussions
gh issue view 1601

Length of output: 249


Script:

#!/bin/bash
# Search for SearchBox component usage and related tests
rg -g "*.{ts,tsx,test.ts,test.tsx}" "SearchBox" -A 5

# Look for any test files containing "search" related tests
rg -g "*.{test.ts,test.tsx,spec.ts,spec.tsx}" "test|describe|it.*search" -i

# Check for any related components or utilities that might be testing the search functionality
rg -g "*.{ts,tsx}" "applySearchFilter|filterReferenda" -A 5

Length of output: 9844


Script:

#!/bin/bash
# Check the filter state and implementation
rg -g "*.{ts,tsx}" "filter\.(advanced|status)" -B 3 -A 3

# Look for any related filter type definitions
ast-grep --pattern 'interface $_ {
  advanced?: $$$
}'

Length of output: 7815

Comment on lines +125 to +128
if (searchKeyword) {
filtered = applySearchFilter(filtered, searchKeyword);
}

Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Consider optimizing Set conversion

The current implementation correctly handles search filtering, but the Set conversion for removing duplicates could be optimized.

-    // to remove duplicates
-    const uniqueFiltered = [...new Set(filtered)];
+    // to remove duplicates using post_id as unique identifier
+    const uniqueFiltered = Array.from(
+      new Map(filtered.map(item => [item.post_id, item])).values()
+    );

This approach is more efficient as it:

  1. Uses a specific unique identifier (post_id)
  2. Avoids potential reference comparison issues

Also applies to: 132-132

Comment on lines +63 to +72
const applySearchFilter = useCallback((referendaToFilter: LatestReferenda[], keyword: string) => {
const filtered = referendaToFilter.filter((r) =>
(filter.advanced.refIndex && String(r.post_id) === keyword) ||
(filter.advanced.titles && r.title && r.title.toLowerCase().includes(keyword.toLowerCase())) ||
(filter.advanced.methods && r.method && r.method.toLowerCase().includes(keyword.toLowerCase())) ||
(filter.advanced.proposers && r.proposer === keyword)
);

return filtered;
}, [filter.advanced.methods, filter.advanced.proposers, filter.advanced.refIndex, filter.advanced.titles]);
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Improve search filter robustness

The filtering logic could be made more robust with the following improvements:

  1. Convert ref_id to string for comparison to handle potential type mismatches
  2. Consider case-insensitive comparison for proposer addresses
 const applySearchFilter = useCallback((referendaToFilter: LatestReferenda[], keyword: string) => {
   const filtered = referendaToFilter.filter((r) =>
-    (filter.advanced.refIndex && String(r.post_id) === keyword) ||
+    (filter.advanced.refIndex && String(r.post_id) === String(keyword)) ||
     (filter.advanced.titles && r.title && r.title.toLowerCase().includes(keyword.toLowerCase())) ||
     (filter.advanced.methods && r.method && r.method.toLowerCase().includes(keyword.toLowerCase())) ||
-    (filter.advanced.proposers && r.proposer === keyword)
+    (filter.advanced.proposers && r.proposer.toLowerCase() === keyword.toLowerCase())
   );

   return filtered;
 }, [filter.advanced.methods, filter.advanced.proposers, filter.advanced.refIndex, filter.advanced.titles]);
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const applySearchFilter = useCallback((referendaToFilter: LatestReferenda[], keyword: string) => {
const filtered = referendaToFilter.filter((r) =>
(filter.advanced.refIndex && String(r.post_id) === keyword) ||
(filter.advanced.titles && r.title && r.title.toLowerCase().includes(keyword.toLowerCase())) ||
(filter.advanced.methods && r.method && r.method.toLowerCase().includes(keyword.toLowerCase())) ||
(filter.advanced.proposers && r.proposer === keyword)
);
return filtered;
}, [filter.advanced.methods, filter.advanced.proposers, filter.advanced.refIndex, filter.advanced.titles]);
const applySearchFilter = useCallback((referendaToFilter: LatestReferenda[], keyword: string) => {
const filtered = referendaToFilter.filter((r) =>
(filter.advanced.refIndex && String(r.post_id) === String(keyword)) ||
(filter.advanced.titles && r.title && r.title.toLowerCase().includes(keyword.toLowerCase())) ||
(filter.advanced.methods && r.method && r.method.toLowerCase().includes(keyword.toLowerCase())) ||
(filter.advanced.proposers && r.proposer.toLowerCase() === keyword.toLowerCase())
);
return filtered;
}, [filter.advanced.methods, filter.advanced.proposers, filter.advanced.refIndex, filter.advanced.titles]);

@Nick-1979 Nick-1979 merged commit a43adba into PolkaGate:main Oct 23, 2024
8 checks passed
@AMIRKHANEF AMIRKHANEF deleted the fixSearchRefsProblem branch October 23, 2024 07:13
github-actions bot pushed a commit that referenced this pull request Oct 23, 2024
## [0.19.5](v0.19.4...v0.19.5) (2024-10-23)

### Bug Fixes

* search ref problem ([#1602](#1602)) ([a43adba](a43adba))
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.

search issue on Governance
2 participants