-
Notifications
You must be signed in to change notification settings - Fork 36
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
Update default form definitions for Geo #5367
base: production
Are you sure you want to change the base?
Conversation
Restructures common.views.xml for the first time in years based on the linting done by Specify 7 Fixes #5311
Solves part of #1254
Removes `FishBase` and `WEBLINK`, adds `ORCID`, `Bionomia`, and `Wikidata`
Removes autogenereated forms for SpecifyUser, CollectionRelType, and SpViewSetObj
Also enables users to transfer ownership of a record set
Triggered by 5727f70 on branch refs/heads/issue-5311
I want to show only the name of the resource when a new one is created
Triggered by d8be687 on branch refs/heads/issue-5311
Folding in work from specify/specify6#1203
Also fixes issues with other tree def item form definitions
Haven't gone through all of the changes yet, but really nice so far!
From #4760 (comment) Now we can properly resolve this! 🥳 I've left a full breakdown of the Issue in the aforementioned comment (#4760 (comment)), but the important part in relation to this PR is the following:
It'd be great if we can go through and merge these separate views for the collapsed version of the Subview with the expanded "normal" views! We already have a list of viewnames in the following commit: 5c91a89 Which exist at the following locations:
Specifically: for each of these views, we need to add the I can make these changes if needed! Related lines of code: specify7/specifyweb/frontend/js_src/lib/components/FormParse/index.ts Lines 77 to 86 in dee374c
specify7/specifyweb/frontend/js_src/lib/components/FormParse/index.ts Lines 153 to 218 in dee374c
|
Fixes #5311, #5073, #3120, #2153, #1515, #584, #364, specify/specify6#1210, specify/specify6#1213, specify/specify6#1229, specify/specify6#1232, #4591, #5020, #2016 and specify/specify6#1223
This PR is intended to update underlying app resources necessary for the
geology
discipline as well as improve other defaults where possible.Geo-focused Improvements
CollectionObject
form for GeologyCommon Views
RelativeAge
Added
AbsoluteAge
formAdded
TectonicUnit
formAdded
TectonicUnitTreeDef
formAdded
TectonicUnitTreeDefItem
formMajor Improvements
Type Searches
Collection
,Institution
, andSpecifyUser
, improving a number of places around the app!Record Sets
Agent
Screen.Recording.2024-11-07.at.9.56.15.AM.mov
Person
is now the default value (huge improvement)Group
will themembers
subview displayTaxon
hybridFieldsConditional.mov
HybridParent
fields only whenIsHybrid
is checkedCollection Relationships
Old form:
New form:
App Resources
AppResource
Reports
jrxml/label
SpReport
form for the first timeSpViewSetObj
Pick List
Old form:
New form:
-1
Tree Definition
Old Tree Definition form:
New Tree Definition form:
Miscellaneous Improvements
countAmt
can no longer be set to a negative number by defaultDataObjFormatters
have finally been reformatted by the built-in Specify 7 systemTesting instructions
THIS MUST BE TESTED LOCALLY UNTIL THE TEST PANEL SUPPORTS STATIC FILES
Okay, so this PR is big, but it is almost entirely XML changes. This touches a lot of the default forms, so I have a big ask– please test the following XML resources in Specify. You are likely to find issues that aren't related to this PR which I am happy to resolve, so report them. If it grows outside the scope of this, I'll open another and we'll resolve it in the future.
Remember to delete any custom form definitions / app resources before testing this as those will be used first.
DataObjFormatters
app resource and verify that all table formats and aggregations appear as expected*property
,*attribute
,*groupjoin
) do not have a table format or aggregation defined as it is ambiguous as to which fields we should display.TypeSearches
app resource and verify that it is working as expected. Delete this resource after it is populated as you should be using the default.CollectionRelType
form and search for a collection. You should be able to type the name of a collection and select it. You will encounterHierarchyException
when loading Collectionreltype #4989, but that is not in the scope of this issue, and you can safely dismiss it.ExportFeed
app resource and verify that you can search for a user in the database by name. You should see the name appear correctly and you should be able to search for a user in the query combo box without the 🔍 QB function.WebLinks
app resource and verify that all web links (~5) appear and work as expected. See this guide for setting up a conditional form onAgentIdentifier
to leverage those new web links.geology.views.xml
can be used as the basis of a new form (create a new form definition and selectGeology
). Let me know what you think. This is subjective to some extent, and I welcome suggested changes (especially via XML snippets).production
):CollectionRelType
Agent
should default toPerson
instead ofOrganization
finally!Agent
conditional: If the agent is not aGroup
, theMembers
subview should not be shown.TectonicUnit
TectonicUnitTreeDef
TectonicUnitTreeDefItem
TaxonTreeDef
Taxon
Taxon
conditional: Verify that when you checkIsHybrid
the fieldsHybridParent1
andHybridParent2
appear. When it is not checked, they should not appear.GeographyTreeDef
StroageTreeDef
LithoStratTreeDef
GeologicTimePeriodTreeDef
RelativeAge
AbsoluteAge
PickList
-1
and verify that you can add any number of pick list items (>500– and you can use the workbench to add the first 500)PickListItem
SpAppResource
(click pencil next to the title of an app resource)SpAppResource
conditional (should showReports
subview button if the resource is a report/label)SpReport
form should show ownership, associated query, title, in a read-only viewSpViewSetObj
(click pencil next to the title of a form definition)SpQuery
(click pencil next to a query title)RecordSet
(click pencil next to a record set title)AgentIdentifier
– navigate directly to the form via the data entry menu or by modifying the URL. It should no longer be auto-generatedAccession
table does not have adeaccessions
field. specify6#1232, bug(default-forms): Form is named AgentIdentifiers, but table is named AgentIdentifier #4591, Visual Export Feed QCBX displays all users as <Formatter not defined.> #5020, Paleocontext should have an accepted field for lithostrat of chronostrat #2016, and common/common.views.xml: PHSub Form: Cell is missing proper closing element /> specify6#1223