Skip to content

Add support for authority display names #325

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
mikejritter merged 15 commits into from
Nov 4, 2025
Merged

Add support for authority display names #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3612a20
Add support for authority display names
mikejritter Oct 14, 2025
4d12da9
Update location to serve as an example for the display name
mikejritter Oct 15, 2025
7760e8c
Update location instances for example alignment with ui
mikejritter Oct 15, 2025
83227ad
Update core authority vocab titles
mikejritter Oct 17, 2025
9fd77e0
Update anthro authority vocab titles
mikejritter Oct 17, 2025
a4145d0
Update herbarium authority vocab titles
mikejritter Oct 17, 2025
23f5563
Update material authority vocab titles
mikejritter Oct 17, 2025
6315309
Update publicart authority vocab titles
mikejritter Oct 17, 2025
6127bce
Update taxon vocab titles for herbarium
mikejritter Oct 17, 2025
5e856af
Remove pluralization
mikejritter Oct 17, 2025
bc0f15a
Formatting
mikejritter Oct 20, 2025
d9410e0
Update FCART concept authority vocabs
mikejritter Oct 20, 2025
8d26a2d
Update herbarium concep vocab titles
mikejritter Oct 20, 2025
872a611
Remove unused tag
mikejritter Oct 31, 2025
c6754bc
Add display-name to all authorities
mikejritter Nov 4, 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
4 changes: 2 additions & 2 deletions ...ation/src/main/java/org/collectionspace/chain/installation/ServiceBindingsGeneration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,6 @@ private void doRefnameDisplayNameField(Record record, Element ele, Namespace thi
* @param thisns
* @param isAuthority
*/

private void doDocHandlerParams(Record r, Element el, Namespace nsservices2, Boolean isAuthority) {
//<service:DocHandlerParams>
Element dhele = el.addElement(new QName("DocHandlerParams", nsservices2));
Expand Down Expand Up @@ -902,6 +901,7 @@ private void addAuthorities(Record r, Element el, String serviceBindingVersion)
bindingsForAuthority.addAttribute("id", r.getServicesTenantAuthPl());
bindingsForAuthority.addAttribute("type", RECORD_TYPE_UTILITY);
bindingsForAuthority.addAttribute("version", serviceBindingVersion);
bindingsForAuthority.addAttribute("displayName", r.getServicesTenantAuthDisplayName());
bindingsForAuthority.addAttribute(Record.SUPPORTS_REPLICATING, Boolean.toString(r.supportsReplicating()));
bindingsForAuthority.addAttribute(Record.REQUIRES_UNIQUE_SHORTID, Boolean.TRUE.toString());
String remoteClientConfigName = r.getRemoteClientConfigName();
Expand Down Expand Up @@ -952,7 +952,7 @@ private void addServiceBinding(Record r, Element el, Namespace nameSpace, Boolea
doDocHandlerParams(r, el, this.nsservices, isAuthority);

//<service:AuthorityInstanceList>
if (isAuthority == true || r.isType(RECORD_TYPE_VOCABULARY) == true) {
if (isAuthority || r.isType(RECORD_TYPE_VOCABULARY)) {
doAuthorityInstanceList(r, el, this.nsservices);
}

Expand Down
8 changes: 8 additions & 0 deletions cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Record.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public class Record implements FieldParent {
private static final String TYPE_AUTHORITY = "Authority";
private static final String TYPE_AUTHORITY_LOWERCASE = TYPE_AUTHORITY.toLowerCase();

public static final String AUTH_DISPLAY_NAME = "services-tenant-auth-display-name";

public static final String ELASTICSEARCH_INDEXED = "elasticsearchIndexed";
public static final String SUPPORTS_LOCKING = "supportslocking";
public static final String SUPPORTS_REPLICATING = "supportsReplicating";
Expand Down Expand Up @@ -257,6 +259,7 @@ public void setLastAuthorityProxy(Record lastAuthoriyProxy) {
utils.initStrings(section, "services-tenant-plural", utils.getString("services-tenant-singular") + "s");
utils.initStrings(section, "services-tenant-auth-singular", utils.getString("services-url"));
utils.initStrings(section, "services-tenant-auth-plural", utils.getString("services-tenant-singular") + "s");
utils.initStrings(section, AUTH_DISPLAY_NAME, utils.getString("services-tenant-singular"));

utils.initStrings(section, "services-schema-location", "http://services.collectionspace.org");

Expand Down Expand Up @@ -827,6 +830,10 @@ public String getServicesTenantAuthSg() {
return utils.getString("services-tenant-auth-singular");
}

public String getServicesTenantAuthDisplayName() {
return utils.getString(AUTH_DISPLAY_NAME);
}

/*
* By convention, the value from getServicesTenantSg() is the Nuxeo doctype
* name. However, if the record explicitly declares a doctype using the
Expand Down Expand Up @@ -1442,4 +1449,5 @@ public void setSortKey(String fieldId, String sortFieldId) {
public String getSortKey(String fieldId) {
return sortKeys.get(fieldId);
}

}
7 changes: 4 additions & 3 deletions tomcat-main/src/main/resources/defaults/base-authority-chronology.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<services-tenant-auth-plural>Chronologyauthorities</services-tenant-auth-plural>
<services-tenant-auth-singular>Chronologyauthority</services-tenant-auth-singular>
<services-tenant-auth-display-name>Chronology</services-tenant-auth-display-name>
<services-tenant-singular>Chronology</services-tenant-singular>
<services-tenant-plural>Chronologies</services-tenant-plural>

Expand Down Expand Up @@ -31,12 +32,12 @@
<instance id="chronology-era">
<web-url>era</web-url>
<title-ref>era</title-ref>
<title>Era Chronologies</title>
<title>Era</title>
</instance>
<instance id="chronology-event">
<web-url>event</web-url>
<title-ref>event</title-ref>
<title>Event Chronologies</title>
<title>Event</title>
</instance>
</instances>

Expand Down Expand Up @@ -91,4 +92,4 @@
<field id="proposed" mini="list" datatype="boolean" />
<field id="deprecated" mini="list" datatype="boolean" />
</section>
</record>
</record>
5 changes: 3 additions & 2 deletions tomcat-main/src/main/resources/defaults/base-authority-citation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<services-tenant-auth-singular>Citationauthority</services-tenant-auth-singular>
<services-tenant-auth-plural>Citationauthorities</services-tenant-auth-plural>
<services-tenant-auth-display-name>Citation</services-tenant-auth-display-name>
<services-tenant-singular>Citation</services-tenant-singular>

<services-instances-path>citationauthorities_common:http://collectionspace.org/services/citation,abstract-common-list/list-item</services-instances-path>
Expand All @@ -30,12 +31,12 @@
<instance id="citation-citation">
<web-url>citation</web-url>
<title-ref>citation</title-ref>
<title>Local Citations</title>
<title>Local</title>
</instance>
<instance id="citation-worldcat">
<web-url>worldcat</web-url>
<title-ref>worldcat</title-ref>
<title>WorldCat Citations</title>
<title>WorldCat</title>
</instance>
</instances>

Expand Down
13 changes: 7 additions & 6 deletions tomcat-main/src/main/resources/defaults/base-authority-concept.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<services-tenant-auth-singular>Conceptauthority</services-tenant-auth-singular>
<services-tenant-auth-plural>Conceptauthorities</services-tenant-auth-plural>
<services-tenant-auth-display-name>Concept</services-tenant-auth-display-name>
<services-tenant-singular>Concept</services-tenant-singular>
<services-tenant-doctype>Conceptitem</services-tenant-doctype>

Expand Down Expand Up @@ -33,17 +34,17 @@
<instance id="concept-concept">
<web-url>concept</web-url>
<title-ref>concept</title-ref>
<title>Associated Concepts</title>
<title>Associated</title>
</instance>
<instance id="concept-material_ca">
<web-url>material_ca</web-url>
<title-ref>material_ca</title-ref>
<title>Material Concepts</title>
<title>Material</title>
</instance>
<instance id="concept-activity">
<web-url>activity</web-url>
<title-ref>activity</title-ref>
<title>Activity Concepts</title>
<title>Activity</title>
</instance>
<instance id="concept-nomenclature">
<web-url>nomenclature</web-url>
Expand All @@ -65,18 +66,18 @@
<instance id="concept-occasion">
<web-url>occasion</web-url>
<title-ref>occasion</title-ref>
<title>Occasion Concepts</title>
<title>Occasion</title>
</instance>
<!-- NAGPRA Culture fields -->
<instance id="concept-ethculture">
<web-url>ethculture</web-url>
<title-ref>ethculture</title-ref>
<title>Ethnographic Cultures</title>
<title>Cultural Group</title>
</instance>
<instance id="concept-archculture">
<web-url>archculture</web-url>
<title-ref>archculture</title-ref>
<title>Archaeological Cultures</title>
<title>Archaeological Culture</title>
</instance>
</instances>

Expand Down
5 changes: 3 additions & 2 deletions tomcat-main/src/main/resources/defaults/base-authority-location.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<services-tenant-auth-singular>Locationauthority</services-tenant-auth-singular>
<services-tenant-auth-plural>Locationauthorities</services-tenant-auth-plural>
<services-tenant-auth-display-name>Storage Location</services-tenant-auth-display-name>
Copy link
Contributor Author

@mikejritter mikejritter Oct 31, 2025

Choose a reason for hiding this comment

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

@spirosdi I was considering adding this to every authority to be explicit about what the name is. It's a little redundant for the others, but not much work to do. Thoughts?

Copy link

@spirosdi spirosdi Nov 4, 2025

Choose a reason for hiding this comment

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

I think it makes sense to add it to every authority. We might also need to change the value set at any time, so it is good to have the property already set. To easily spot what should be changed.

<services-tenant-singular>Location</services-tenant-singular>
<services-tenant-doctype>Locationitem</services-tenant-doctype>

Expand All @@ -30,12 +31,12 @@
<instance id="location-location">
<web-url>location</web-url>
<title-ref>location</title-ref>
<title>Local Storage Locations</title>
<title>Local</title>
</instance>
<instance id="location-offsite_sla">
<web-url>offsite_sla</web-url>
<title-ref>offsite_sla</title-ref>
<title>Offsite Storage Locations</title>
<title>Offsite</title>
</instance>
</instances>

Expand Down
1 change: 1 addition & 0 deletions tomcat-main/src/main/resources/defaults/base-authority-material.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<services-tenant-auth-singular>Materialauthority</services-tenant-auth-singular>
<services-tenant-auth-plural>Materialauthorities</services-tenant-auth-plural>
<services-tenant-auth-display-name>Material</services-tenant-auth-display-name>
<services-tenant-singular>Material</services-tenant-singular>
<services-tenant-doctype>Materialitem</services-tenant-doctype>

Expand Down
5 changes: 3 additions & 2 deletions tomcat-main/src/main/resources/defaults/base-authority-organization.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<services-tenant-auth-plural>Orgauthorities</services-tenant-auth-plural>
<services-tenant-auth-singular>Orgauthority</services-tenant-auth-singular>
<services-tenant-auth-display-name>Organization</services-tenant-auth-display-name>
<services-tenant-singular>Organization</services-tenant-singular>

<services-instances-path>orgauthorities_common:http://collectionspace.org/services/organization,abstract-common-list/list-item</services-instances-path>
Expand Down Expand Up @@ -31,12 +32,12 @@
<instance id="organization-organization">
<web-url>organization</web-url>
<title-ref>organization</title-ref>
<title>Local Organizations</title>
<title>Local</title>
</instance>
<instance id="organization-ulan_oa">
<web-url>ulan_oa</web-url>
<title-ref>ulan_oa</title-ref>
<title>ULAN Organizations</title>
<title>ULAN</title>
</instance>
</instances>

Expand Down
5 changes: 3 additions & 2 deletions tomcat-main/src/main/resources/defaults/base-authority-person.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<services-tenant-auth-singular>Personauthority</services-tenant-auth-singular>
<services-tenant-auth-plural>Personauthorities</services-tenant-auth-plural>
<services-tenant-auth-display-name>Person</services-tenant-auth-display-name>
<services-tenant-singular>Person</services-tenant-singular>

<services-instances-path>personauthorities_common:http://collectionspace.org/services/person,abstract-common-list/list-item</services-instances-path>
Expand Down Expand Up @@ -32,12 +33,12 @@
<instance id="person-person">
<web-url>person</web-url>
<title-ref>person</title-ref>
<title>Local Persons</title>
<title>Local</title>
</instance>
<instance id="person-ulan_pa">
<web-url>ulan_pa</web-url>
<title-ref>ulan_pa</title-ref>
<title>ULAN Persons</title>
<title>ULAN</title>
</instance>
</instances>

Expand Down
7 changes: 4 additions & 3 deletions tomcat-main/src/main/resources/defaults/base-authority-place.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<services-tenant-auth-singular>Placeauthority</services-tenant-auth-singular>
<services-tenant-auth-plural>Placeauthorities</services-tenant-auth-plural>
<services-tenant-auth-display-name>Place</services-tenant-auth-display-name>
<services-tenant-singular>Place</services-tenant-singular>
<services-tenant-doctype>Placeitem</services-tenant-doctype>

Expand Down Expand Up @@ -33,17 +34,17 @@
<instance id="place-place">
<web-url>place</web-url>
<title-ref>place</title-ref>
<title>Local Places</title>
<title>Local</title>
</instance>
<instance id="place-tgn_place">
<web-url>tgn_place</web-url>
<title-ref>tgn_place</title-ref>
<title>Thesaurus of Geographic Names</title>
<title>TGN</title>
</instance>
<instance id="place-archaeological">
<web-url>archaeological</web-url>
<title-ref>archaeological</title-ref>
<title>Archaeological Site</title>
<title>Archaeological</title>
</instance>
</instances>

Expand Down
5 changes: 3 additions & 2 deletions tomcat-main/src/main/resources/defaults/base-authority-taxon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<services-tenant-auth-singular>Taxonomyauthority</services-tenant-auth-singular>
<services-tenant-auth-plural>Taxonomyauthority</services-tenant-auth-plural>
<services-tenant-auth-display-name>Taxon</services-tenant-auth-display-name>
<services-tenant-singular>Taxon</services-tenant-singular>
<services-tenant-plural>Taxon</services-tenant-plural>

Expand Down Expand Up @@ -31,12 +32,12 @@
<instance id="taxon-taxon">
<web-url>taxon</web-url>
<title-ref>taxon</title-ref>
<title>Local Taxa</title>
<title>Local</title>
</instance>
<instance id="taxon-common_ta">
<web-url>common_ta</web-url>
<title-ref>common_ta</title-ref>
<title>Common Taxa</title>
<title>Common</title>
</instance>
</instances>

Expand Down
5 changes: 3 additions & 2 deletions tomcat-main/src/main/resources/defaults/base-authority-work.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

<services-tenant-auth-singular>Workauthority</services-tenant-auth-singular>
<services-tenant-auth-plural>Workauthorities</services-tenant-auth-plural>
<services-tenant-auth-display-name>Work</services-tenant-auth-display-name>
<services-tenant-singular>Work</services-tenant-singular>
<services-tenant-doctype>Workitem</services-tenant-doctype>

Expand All @@ -33,12 +34,12 @@
<instance id="work-work" create-unreferenced="true">
<web-url>work</web-url>
<title-ref>work</title-ref>
<title>Local Works</title>
<title>Local</title>
</instance>
<instance id="work-cona_work" create-unreferenced="true">
<web-url>cona_work</web-url>
<title-ref>cona_work</title-ref>
<title>CONA Works</title>
<title>CONA</title>
</instance>
</instances>

Expand Down
8 changes: 4 additions & 4 deletions tomcat-main/src/main/resources/defaults/extensions/fineart-authority-concept.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
<instance id="concept-concept">
<web-url>concept</web-url>
<title-ref>concept</title-ref>
<title>Associated Concepts</title>
<title>Associated</title>
</instance>
<instance id="concept-material_ca">
<web-url>material_ca</web-url>
<title-ref>material_ca</title-ref>
<title>Material Concepts</title>
<title>Material</title>
</instance>
<instance id="concept-activity">
<web-url>activity</web-url>
<title-ref>activity</title-ref>
<title>Activity Concepts</title>
<title>Activity</title>
</instance>
<!-- Add ethculture -->
<instance id="concept-ethculture">
Expand All @@ -34,7 +34,7 @@
<instance id="concept-occasion">
<web-url>occasion</web-url>
<title-ref>occasion</title-ref>
<title>Occasion Concepts</title>
<title>Occasion</title>
</instance>
</instances>

Expand Down
6 changes: 3 additions & 3 deletions tomcat-main/src/main/resources/tenants/anthro/anthro-authority-chronology.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<instance id="chronology-era">
<web-url>era</web-url>
<title-ref>era</title-ref>
<title>Era Chronologies</title>
<title>Era</title>
</instance>
<instance id="chronology-event">
<web-url>event</web-url>
<title-ref>event</title-ref>
<title>Event Chronologies</title>
<title>Event</title>
</instance>
<instance id="chronology-field_collection">
<web-url>field_collection</web-url>
<title-ref>field_collection</title-ref>
<title>Field Collection Chronologies</title>
<title>Field Collection</title>
</instance>
</instances>
</record>
Loading