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

[#2355] Part 1- Fixes for Icon type in filter, sort and group #2750

Conversation

hemant-hc
Copy link
Contributor

@hemant-hc hemant-hc commented Mar 27, 2023

Related to issue #2355

This PR fixes the icon type issues for Filter, Sort and Group functionality.

In Part 2 - The following changes will be included:

  1. Fix icon type for Append Column dropdown in record summary.
  2. Fix icon type for New Foreign Key Constraint dropdown.

Technical details

I previously created a draft PR with the changes in only the filter functionality to get an approval on the approach.

I made the necessary change as suggested from the comment on the draft PR to the code: Changing [ConstraintType] (tuple) to ConstraintType[] (array). And implemented this approach to further solve the icon issues for sort and and partially for group functionality.

Screenshots

For Filter functionality:

image

For Sort functionality:

image

For Group functionality when a group is already selected:

image

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the develop branch of the repository
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no
    visible errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

In FilterEntry.svelte:
Add a new prop getColumnConstraintType to get the column constraint type, which when passed to the ColumnName component sets the correct icon.

In FilterEntries.svelte we can pass the constraint type using $processedColumns.
In FilterTransformation.svelte we get $processedColumns from $tabularData first.
@seancolsen seancolsen self-assigned this Mar 27, 2023
@seancolsen seancolsen added the pr-status: review A PR awaiting review label Mar 27, 2023
@seancolsen seancolsen added this to the Backlog milestone Mar 27, 2023
Copy link
Contributor

@seancolsen seancolsen left a comment

Choose a reason for hiding this comment

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

Your changes to FilterEntry.svelte, GroupEntry.svelte, and SortEntry.svelte look good.

We'll need fix the files within src/systems/data-explorer so that they don't call getTabularDataStoreFromContext as noted by @pavish in your other PR. You can work on that within this PR by pushing more changes here to address that problem. Or you can revert those changes within this PR, leaving only the filtering/sorting/grouping changes, and you can work on the Data Explorer stuff in a subsequent PR.

As a general note, it's a bit confusing to have the same work split across two separate PRs. If you intend for this PR to supersede the first, then please close the first and link to the first PR within the this PR so that readers like me don't need to go searching for it. Better yet (and this is more of a note for future PRs you open), continue pushing more changes to the first PR so that all the discussion is consolidated in one place. Now that we have discussion within two PRs I'll leave it to you to decide which one to keep open.

@seancolsen seancolsen assigned hemant-hc and unassigned seancolsen Mar 27, 2023
@seancolsen seancolsen added pr-status: revision A PR awaiting follow-up work from its author after review and removed pr-status: review A PR awaiting review labels Mar 27, 2023
@hemant-hc
Copy link
Contributor Author

Thanks for the reminder @seancolsen. I have closed the previous draft PR, and will push the required changes to this PR.

@hemant-hc
Copy link
Contributor Author

@seancolsen I have reverted back the changes to data-explorer/* files for the time being. I will take it up in a subsequent PR.

@seancolsen seancolsen assigned seancolsen and unassigned hemant-hc Mar 28, 2023
@seancolsen seancolsen added pr-status: review A PR awaiting review and removed pr-status: revision A PR awaiting follow-up work from its author after review labels Mar 28, 2023
Copy link
Contributor

@seancolsen seancolsen left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks @hemant-hc

Merged via the queue into mathesar-foundation:develop with commit 67aaef0 Mar 28, 2023
@seancolsen seancolsen mentioned this pull request Apr 20, 2023
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-status: review A PR awaiting review
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants