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

Change order of filters in the filters section #4095

Closed
wants to merge 13 commits into from
Closed

Change order of filters in the filters section #4095

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
97b8aff
added truncate to the filter select and changed filters order
sharath-1517 Dec 19, 2024
977bb3d
code linting
sharath-1517 Dec 19, 2024
823e4ed
code linting fixed
sharath-1517 Dec 19, 2024
eb0fd03
Merge branch 'develop' into change-order-of-filters
seancolsen Jan 3, 2025
ba5f06c
changed filtering dropdown to look like grouping dropdown
sharath-1517 Jan 7, 2025
3fa7aca
Merge branch 'develop' of https://github.com/Sharath-1517/mathesar in…
sharath-1517 Jan 7, 2025
1c56c58
Merge branch 'develop' of https://github.com/mathesar-foundation/math…
sharath-1517 Jan 7, 2025
cf185ca
Merge branch 'change-order-of-filters' of https://github.com/Sharath-…
sharath-1517 Jan 7, 2025
ffa07c7
Merge branch 'develop' into change-order-of-filters
seancolsen Jan 8, 2025
c67e7e7
changed sorting dropdown to look like grouping dropdown
sharath-1517 Jan 10, 2025
2cdee23
linting fix in sorting and filtering components
sharath-1517 Jan 10, 2025
7f210c2
Merge branch 'develop' of https://github.com/mathesar-foundation/math…
sharath-1517 Jan 10, 2025
58c9c80
Merge branch 'change-order-of-filters' of https://github.com/Sharath-…
sharath-1517 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion mathesar_ui/src/component-library/select/Select.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
} from '@mathesar-component-library-dir/list-box';

import StringOrComponent from '../string-or-component/StringOrComponent.svelte';
import Truncate from '../truncate/Truncate.svelte';

import type { SelectProps } from './SelectTypes';

Expand Down Expand Up @@ -172,7 +173,9 @@
{:else if $$slots.default}
<slot option={value} label={getLabel(value)} />
{:else}
<StringOrComponent arg={getLabel(value)} />
<Truncate>
<StringOrComponent arg={getLabel(value)} />
</Truncate>
{/if}
</svelte:fragment>

Expand Down
8 changes: 4 additions & 4 deletions mathesar_ui/src/stores/abstract-types/operations/filtering.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function constructParamMapForAllTypes(
const equalityFiltersResponse: AbstractTypeFilterDefinitionResponse[] = [
{
id: 'equal',
name: 'equals',
name: 'equals (case sensitive)',
aliases: constructAliasMapForTypes(allDateTimeTypes, 'is same as'),
uiTypeParameterMap: constructParamMapForAllTypes((category) => [category]),
hasParams: true,
Expand All @@ -79,20 +79,20 @@ const equalityFiltersResponse: AbstractTypeFilterDefinitionResponse[] = [
// This is the API response expected from the server
// Might be better if we can have this with the types endpoint
const filterResponse: AbstractTypeFilterDefinitionResponse[] = [
...equalityFiltersResponse,
{
id: 'contains_case_insensitive',
name: 'contains',
name: 'contains (case insensitive)',
uiTypeParameterMap: {
[abstractTypeCategory.Text]: [abstractTypeCategory.Text],
[abstractTypeCategory.Email]: [abstractTypeCategory.Text],
[abstractTypeCategory.Uri]: [abstractTypeCategory.Text],
},
hasParams: true,
},
...equalityFiltersResponse,
{
id: 'starts_with_case_insensitive',
name: 'starts with',
name: 'starts with (case insensitive)',
uiTypeParameterMap: {
[abstractTypeCategory.Text]: [abstractTypeCategory.Text],
[abstractTypeCategory.Email]: [abstractTypeCategory.Text],
Expand Down
Loading