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

Add a Drainage tree #6106

Draft
wants to merge 31 commits into
base: production
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
40433ba
Add Drainage tree to model
grantfitzsimmons Jan 17, 2025
50c92fb
Update treeRanks.ts
grantfitzsimmons Jan 17, 2025
9adad9b
Fix typo
grantfitzsimmons Jan 17, 2025
671d059
Update model_extras.py
grantfitzsimmons Jan 17, 2025
5860adf
Update datamodel.py
grantfitzsimmons Jan 17, 2025
7240e5d
Update build_models.py
grantfitzsimmons Jan 17, 2025
8062071
Update definitions.ts
grantfitzsimmons Jan 17, 2025
70d8919
Fix indentation
grantfitzsimmons Jan 17, 2025
d8e237d
Add link to discipline
grantfitzsimmons Jan 17, 2025
f1d3f4c
Add model and table IDs
grantfitzsimmons Jan 17, 2025
77c2215
Filter queries
grantfitzsimmons Jan 17, 2025
bb5111f
Remove duplicate tectonicunit def
grantfitzsimmons Jan 17, 2025
c775504
Add drainage to Discipline
grantfitzsimmons Jan 17, 2025
cea0bc0
Add migration tables and fields
grantfitzsimmons Jan 17, 2025
4f5339c
Add Drainage tree
grantfitzsimmons Jan 17, 2025
058edec
Add Drainage ranks
grantfitzsimmons Jan 17, 2025
016adbe
Add drainage to the trees
grantfitzsimmons Jan 17, 2025
a61d021
Add migration for Drainage trees, fields, and ranks
grantfitzsimmons Jan 17, 2025
fe15b84
Add link to Locality
grantfitzsimmons Jan 17, 2025
00060e9
Update sp7_schemaconfig.py
grantfitzsimmons Jan 17, 2025
a760c10
Fix query filter
grantfitzsimmons Jan 17, 2025
837dbdf
Add drainage to Locality's model
grantfitzsimmons Jan 17, 2025
47556cd
Update migration to include drainage field
grantfitzsimmons Jan 17, 2025
d29c4ac
Add tree pref for Drainage
grantfitzsimmons Jan 17, 2025
34843f3
Fix tree resource
grantfitzsimmons Jan 17, 2025
59c5407
Add Drainage schema overrides
grantfitzsimmons Jan 17, 2025
c4cd13c
Add preference to customize color
grantfitzsimmons Jan 17, 2025
25ae8df
Update tree color
grantfitzsimmons Jan 17, 2025
a8bd6de
Add fromTree query
grantfitzsimmons Jan 17, 2025
0d3210f
Update SvgIcon.tsx
grantfitzsimmons Jan 17, 2025
51c681a
Update types.ts
grantfitzsimmons Jan 17, 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
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ const tableOverwrites: Partial<RR<keyof Tables, TableConfigOverwrite>> = {
TaxonTreeDefItem: 'system',
TectonicUnitTreeDef: 'system',
TectonicUnitTreeDefItem: 'system',
DrainageTreeDef: 'system',
DrainageTreeDefItem: 'system',
};

// These field overrides apply to entire front-end
Expand Down Expand Up @@ -161,6 +163,12 @@ const globalFieldOverrides: {
acceptedTectonicUnit: { visibility: 'readOnly' },
fullName: { visibility: 'readOnly' },
},
Drainage: {
parent: { visibility: 'required' },
isAccepted: { visibility: 'readOnly' },
acceptedDrainage: { visibility: 'readOnly' },
fullName: { visibility: 'readOnly' },
},
Storage: {
parent: { visibility: 'required' },
isAccepted: { visibility: 'readOnly' },
Expand Down Expand Up @@ -207,6 +215,12 @@ const globalFieldOverrides: {
LithoStratTreeDefItem: {
fullNameSeparator: { whiteSpaceSensitive: true },
},
DrainageTreeDef: {
fullNameDirection: { visibility: 'readOnly' },
},
DrainageTreeDefItem: {
fullNameSeparator: { whiteSpaceSensitive: true },
},
};

/*
Expand Down
Loading
Loading