Skip to content

Allow displaying children on Chrono node subview #6117

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

Merged
CarolineDenis merged 3 commits into from
Jan 22, 2025
Merged

Allow displaying children on Chrono node subview #6117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd027bb
Allow displaying children on Chrono node subview
CarolineDenis Jan 17, 2025
4fb34be
Use a filter chronostrat prop to apply chrono filter to age picklist
sharadsw Jan 21, 2025
5991ee2
Fix unit tests
sharadsw Jan 21, 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
1 change: 1 addition & 0 deletions specifyweb/frontend/js_src/lib/components/DataModel/collection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ export const fetchRows = async <
readonly fields: FIELDS;
readonly distinct?: boolean;
readonly limit?: number;
readonly filterChronostrat?: boolean;
},
/**
* Advanced filters, not type-safe.
Expand Down
2 changes: 1 addition & 1 deletion specifyweb/frontend/js_src/lib/components/PickLists/__tests__/fetch.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ describe('fetchPickListItems', () => {
});

overrideAjax(
'/api/specify_rows/locality/?limit=0&domainfilter=true&distinct=true&fields=localityname',
'/api/specify_rows/locality/?limit=0&domainfilter=true&filterchronostrat=false&distinct=true&fields=localityname',
[['abc']]
);
test('entire column', async () => {
Expand Down
3 changes: 2 additions & 1 deletion specifyweb/frontend/js_src/lib/components/PickLists/fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
deserializeResource,
serializeResource,
} from '../DataModel/serializers';
import { strictGetTable } from '../DataModel/tables';
import { strictGetTable, tables } from '../DataModel/tables';
import type { PickList, PickListItem, Tables } from '../DataModel/types';
import { softFail } from '../Errors/Crash';
import { format } from '../Formatters/formatters';
Expand Down Expand Up @@ -159,6 +159,7 @@ async function fetchFromField(
fields: { [fieldName]: ['string', 'number', 'boolean', 'null'] },
distinct: true,
domainFilter: true,
filterChronostrat: tableName === tables.GeologicTimePeriod.name.toLowerCase() && fieldName === "name", // Prop for age filter in QueryBuilder
}).then((rows) =>
rows
.map((row) => row[fieldName] ?? '')
Expand Down
6 changes: 5 additions & 1 deletion specifyweb/specify/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,14 @@ class GetCollectionForm(forms.Form):

orderby = forms.CharField(required=False)

filterchronostrat = forms.BooleanField(required=False)

defaults = dict(
domainfilter=None,
limit=0,
offset=0,
orderby=None,
filterchronostrat=False,
)

def clean_limit(self):
Expand Down Expand Up @@ -1010,7 +1013,7 @@ def apply_filters(logged_in_collection, params, model, control_params=GetCollect

filters.update({param: val})

if model.__name__ == 'Geologictimeperiod':
if control_params['filterchronostrat'] == True:
# Filter out invalid chronostrats
filters.update({
'startperiod__isnull': False,
Expand Down Expand Up @@ -1081,6 +1084,7 @@ class RowsForm(GetCollectionForm):
orderby=None,
distinct=False,
fields=None,
filterchronostrat=False,
)

def rows(request, model_name: str) -> HttpResponse:
Expand Down