Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Update notice of inventory completion report
* Update notice of intent to repatriate report
* Update full object with place details report
* Add contentPlaces to ES mapping
* Add contentPlaces, materialTechniqueDescription to ES mappings
* Add blob alt text to media responses
* Remove cspace_english namespace search

Expand Down
6 changes: 3 additions & 3 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ host=127.0.0.1
#
# Release version info
#
release.version=8.3.0-RC.1
release.version=8.3.0-RC.2
cspace.release=${release.version}
cspace.instance.id=${env.CSPACE_INSTANCE_ID}

Expand All @@ -27,15 +27,15 @@ cspace.im.root=
# UI settings
cspace.ui.package.name=cspace-ui
cspace.ui.library.name=cspaceUI
cspace.ui.version=10.2.0-rc1.0
cspace.ui.version=10.2.0-rc2.0
cspace.ui.build.branch=develop
cspace.ui.build.node.ver=20
service.ui.library.name=${cspace.ui.library.name}-service

# Public browser settings
cspace.public.browser.package.name=@collectionspace/cspace-public-browser
cspace.public.browser.library.name=cspacePublicBrowser
cspace.public.browser.version=3.5.0-rc1.0
cspace.public.browser.version=3.5.0
cspace.public.browser.build.branch=main
cspace.public.browser.build.node.ver=20

Expand Down
2 changes: 1 addition & 1 deletion cspace-ui/anthro/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tenant.ui.basename=/cspace/${tenant.shortname}

tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-anthro
tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileAnthro
tenant.ui.profile.plugin.version=9.2.0-rc1.0
tenant.ui.profile.plugin.version=9.2.0
tenant.ui.profile.plugin.build.branch=main

# If not set, defaults to /gateway/${tenant.shortname} on the current host.
Expand Down
2 changes: 1 addition & 1 deletion cspace-ui/fcart/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tenant.ui.basename=/cspace/${tenant.shortname}

tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-fcart
tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileFCart
tenant.ui.profile.plugin.version=8.1.0
tenant.ui.profile.plugin.version=8.2.0
tenant.ui.profile.plugin.build.branch=main

# If not set, defaults to /gateway/${tenant.shortname} on the current host.
Expand Down
2 changes: 1 addition & 1 deletion cspace-ui/lhmc/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tenant.ui.basename=/cspace/${tenant.shortname}

tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-lhmc
tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileLHMC
tenant.ui.profile.plugin.version=8.1.0
tenant.ui.profile.plugin.version=8.2.0
tenant.ui.profile.plugin.build.branch=main

# If not set, defaults to /gateway/${tenant.shortname} on the current host.
Expand Down
2 changes: 1 addition & 1 deletion cspace-ui/materials/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tenant.ui.basename=/cspace/${tenant.shortname}

tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-materials
tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileMaterials
tenant.ui.profile.plugin.version=4.0.1
tenant.ui.profile.plugin.version=4.1.0
tenant.ui.profile.plugin.build.branch=main

# If not set, defaults to /gateway/${tenant.shortname} on the current host.
Expand Down
2 changes: 1 addition & 1 deletion cspace-ui/publicart/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tenant.ui.basename=/cspace/${tenant.shortname}

tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-publicart
tenant.ui.profile.plugin.library.name=cspaceUIPluginProfilePublicArt
tenant.ui.profile.plugin.version=7.0.1
tenant.ui.profile.plugin.version=7.1.0
tenant.ui.profile.plugin.build.branch=main

# If not set, defaults to /gateway/${tenant.shortname} on the current host.
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<name>services</name>

<properties>
<revision>8.3.0-RC.1</revision>
<revision>8.3.0-RC.2</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cspace.services.version>${revision}</cspace.services.version>
<cspace.services.client.version>${revision}</cspace.services.client.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"collectionobjects_common:techniqueGroupList",
"collectionobjects_common:titleGroupList",
"collectionobjects_common:viewersContributionNote",
"collectionobjects_anthro:materialTechniqueDescription",
"collectionobjects_naturalhistory_extension:taxonomicIdentGroupList",
"collectionspace_core:*",
"collectionspace_denorm:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<style name="Column header" fontName="SansSerif" fontSize="12" isBold="true"/>
<style name="Detail" fontName="SansSerif" fontSize="12"/>
<parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA["publicartproductiondatetype,responsibledepartment,publicartproductionpersons,publicartproductionpersonroles,publishto,installationtype,worktypes,materials,collections,owner,computedcurrentlocation,placementtype,placetype,placeowner,addressmunicipality,addressstateorprovince,addresscountry,addresstype,addresstype,broaderplace"]]></defaultValueExpression>
<defaultValueExpression><![CDATA["publicartproductiondatetype,responsibledepartment,publicartproductionpersons,publicartproductionpersonroles,publishto,installationtype,worktypes,materials,collections,owner,computedcurrentlocation,placementtypes,placetypes,placeowner,addressmunicipality,addressstateorprovince,addresscountry,addresstype,addresstype,broaderplace"]]></defaultValueExpression>
</parameter>
<parameter name="tenantid" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA["5000"]]></defaultValueExpression>
Expand Down Expand Up @@ -42,9 +42,9 @@
obj.computedcurrentlocation,
movement.currentlocationnote,
place.placenote,
placement.item AS placementtype,
coalesce(placementtype_agg.placementtypes, '{}') AS placementtypes,
place_pa.placementenvironment,
placetype.item AS placetype,
coalesce(placetype_agg.placetypes, '{}') AS placetypes,
placeowner.owner AS placeowner,
placeowner.ownershipnote,
placeowner.ownertype,
Expand Down Expand Up @@ -140,9 +140,23 @@ LEFT JOIN (
) movement ON movement.objectcsid = hier.name AND movement.currentlocation = obj.computedcurrentlocation
-- place and all place fields
LEFT JOIN places_common place on place.refname = obj.computedcurrentlocation
LEFT JOIN places_publicart_placementtypes placement on placement.id = place.id AND placement.pos = 0
-- AGGREGATE ALL PLACEMENTTYPES
LEFT JOIN (
SELECT
placementtypes.id AS place_id,
array_agg(placementtypes.item) AS placementtypes
FROM places_publicart_placementtypes placementtypes
GROUP BY placementtypes.id
) placementtype_agg ON placementtype_agg.place_id = place.id
LEFT JOIN places_publicart place_pa on place_pa.id = place.id
LEFT JOIN places_publicart_publicartplacetypes placetype on placetype.id = place.id AND placetype.pos = 0
-- AGGREGATE ALL PLACETYPES
LEFT JOIN (
SELECT
placetype.id AS place_id,
array_agg(placetype.item) AS placetypes
FROM places_publicart_publicartplacetypes placetype
GROUP BY placetype.id
) placetype_agg ON placetype_agg.place_id = place.id
LEFT JOIN hierarchy placeowner_hier on placeowner_hier.parentid = place.id and placeowner_hier.primarytype = 'publicartPlaceOwnerGroup' and placeowner_hier.pos = 0
LEFT JOIN hierarchy placeownerdate_hier on placeownerdate_hier.parentid = placeowner_hier.id
LEFT JOIN publicartplaceownergroup placeowner on placeowner.id = placeowner_hier.id
Expand Down Expand Up @@ -254,19 +268,19 @@ $P!{whereclause}]]>
<property name="com.jaspersoft.studio.field.label" value="currentlocationnote"/>
<property name="com.jaspersoft.studio.field.tree.path" value="movements_common"/>
</field>
<field name="placementtype" class="java.lang.String">
<property name="com.jaspersoft.studio.field.name" value="placementtype"/>
<property name="com.jaspersoft.studio.field.label" value="placementtype"/>
<field name="placementtypes" class="java.sql.Array">
<property name="com.jaspersoft.studio.field.name" value="placementtypes"/>
<property name="com.jaspersoft.studio.field.label" value="placementtypes"/>
<property name="com.jaspersoft.studio.field.tree.path" value="places_publicart_placementtypes"/>
</field>
<field name="placementenvironment" class="java.lang.String">
<property name="com.jaspersoft.studio.field.name" value="placementenvironment"/>
<property name="com.jaspersoft.studio.field.label" value="placementenvironment"/>
<property name="com.jaspersoft.studio.field.tree.path" value="places_publicart"/>
</field>
<field name="placetype" class="java.lang.String">
<property name="com.jaspersoft.studio.field.name" value="placetype"/>
<property name="com.jaspersoft.studio.field.label" value="placetype"/>
<field name="placetypes" class="java.sql.Array">
<property name="com.jaspersoft.studio.field.name" value="placetypes"/>
<property name="com.jaspersoft.studio.field.label" value="placetypes"/>
<property name="com.jaspersoft.studio.field.tree.path" value="places_publicart_publicartplacetypes"/>
</field>
<field name="placeowner" class="java.lang.String">
Expand Down Expand Up @@ -746,7 +760,7 @@ $P!{whereclause}]]>
<reportElement style="Detail" x="2000" y="0" width="100" height="30" uuid="52b33190-796b-42ba-990c-ab86d1d02950">
<property name="com.jaspersoft.studio.unit.y" value="px"/>
</reportElement>
<textFieldExpression><![CDATA[$F{placementtype}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{placementtypes}.getArray().join('; ')]]></textFieldExpression>
</textField>
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement style="Detail" x="2100" y="0" width="100" height="30" uuid="1ae3ea7d-79cd-4254-aa47-67dc138787f6">
Expand All @@ -758,7 +772,7 @@ $P!{whereclause}]]>
<reportElement style="Detail" x="2200" y="0" width="100" height="30" uuid="ff9d2e44-827c-43d9-9a79-b138a679019e">
<property name="com.jaspersoft.studio.unit.y" value="px"/>
</reportElement>
<textFieldExpression><![CDATA[$F{placetype}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{placetypes}.getArray().join('; ')]]></textFieldExpression>
</textField>
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement style="Detail" x="2300" y="0" width="100" height="30" uuid="f29bc0cb-c282-49fe-bc66-86b32da69ceb">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<style name="Column header" fontName="SansSerif" fontSize="12" isBold="true"/>
<style name="Detail" fontName="SansSerif" fontSize="12"/>
<parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA["publicartproductiondatetype,responsibledepartment,publicartproductionpersons,publicartproductionpersonroles,publishto,installationtype,worktypes,materials,collections,owner,computedcurrentlocation,placementtype,placetype,placeowner,addressmunicipality,addressstateorprovince,addresscountry,addresstype,addresstype,broaderplace"]]></defaultValueExpression>
<defaultValueExpression><![CDATA["publicartproductiondatetype,responsibledepartment,publicartproductionpersons,publicartproductionpersonroles,publishto,installationtype,worktypes,materials,collections,owner,computedcurrentlocation,placementtypes,placetypes,placeowner,addressmunicipality,addressstateorprovince,addresscountry,addresstype,addresstype,broaderplace"]]></defaultValueExpression>
</parameter>
<parameter name="tenantid" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA["5000"]]></defaultValueExpression>
Expand Down Expand Up @@ -42,9 +42,9 @@
obj.computedcurrentlocation,
movement.currentlocationnote,
place.placenote,
placement.item AS placementtype,
coalesce(placementtype_agg.placementtypes, '{}') AS placementtypes,
place_pa.placementenvironment,
placetype.item AS placetype,
coalesce(placetype_agg.placetypes, '{}') AS placetypes,
placeowner.owner AS placeowner,
placeowner.ownershipnote,
placeowner.ownertype,
Expand Down Expand Up @@ -140,9 +140,23 @@ LEFT JOIN (
) movement ON movement.objectcsid = hier.name AND movement.currentlocation = obj.computedcurrentlocation
-- place and all place fields
LEFT JOIN places_common place on place.refname = obj.computedcurrentlocation
LEFT JOIN places_publicart_placementtypes placement on placement.id = place.id AND placement.pos = 0
-- AGGREGATE ALL PLACEMENTTYPES
LEFT JOIN (
SELECT
placementtypes.id AS place_id,
array_agg(placementtypes.item) AS placementtypes
FROM places_publicart_placementtypes placementtypes
GROUP BY placementtypes.id
) placementtype_agg ON placementtype_agg.place_id = place.id
LEFT JOIN places_publicart place_pa on place_pa.id = place.id
LEFT JOIN places_publicart_publicartplacetypes placetype on placetype.id = place.id AND placetype.pos = 0
-- AGGREGATE ALL PLACETYPES
LEFT JOIN (
SELECT
placetype.id AS place_id,
array_agg(placetype.item) AS placetypes
FROM places_publicart_publicartplacetypes placetype
GROUP BY placetype.id
) placetype_agg ON placetype_agg.place_id = place.id
LEFT JOIN hierarchy placeowner_hier on placeowner_hier.parentid = place.id and placeowner_hier.primarytype = 'publicartPlaceOwnerGroup' and placeowner_hier.pos = 0
LEFT JOIN hierarchy placeownerdate_hier on placeownerdate_hier.parentid = placeowner_hier.id
LEFT JOIN publicartplaceownergroup placeowner on placeowner.id = placeowner_hier.id
Expand Down Expand Up @@ -254,19 +268,19 @@ $P!{whereclause}]]>
<property name="com.jaspersoft.studio.field.label" value="currentlocationnote"/>
<property name="com.jaspersoft.studio.field.tree.path" value="movements_common"/>
</field>
<field name="placementtype" class="java.lang.String">
<property name="com.jaspersoft.studio.field.name" value="placementtype"/>
<property name="com.jaspersoft.studio.field.label" value="placementtype"/>
<field name="placementtypes" class="java.sql.Array">
<property name="com.jaspersoft.studio.field.name" value="placementtypes"/>
<property name="com.jaspersoft.studio.field.label" value="placementtypes"/>
<property name="com.jaspersoft.studio.field.tree.path" value="places_publicart_placementtypes"/>
</field>
<field name="placementenvironment" class="java.lang.String">
<property name="com.jaspersoft.studio.field.name" value="placementenvironment"/>
<property name="com.jaspersoft.studio.field.label" value="placementenvironment"/>
<property name="com.jaspersoft.studio.field.tree.path" value="places_publicart"/>
</field>
<field name="placetype" class="java.lang.String">
<property name="com.jaspersoft.studio.field.name" value="placetype"/>
<property name="com.jaspersoft.studio.field.label" value="placetype"/>
<field name="placetypes" class="java.sql.Array">
<property name="com.jaspersoft.studio.field.name" value="placetypes"/>
<property name="com.jaspersoft.studio.field.label" value="placetypes"/>
<property name="com.jaspersoft.studio.field.tree.path" value="places_publicart_publicartplacetypes"/>
</field>
<field name="placeowner" class="java.lang.String">
Expand Down Expand Up @@ -746,7 +760,7 @@ $P!{whereclause}]]>
<reportElement style="Detail" x="2000" y="0" width="100" height="30" uuid="e703c8f3-255d-4e9b-86c2-6c3ff4a5d57c">
<property name="com.jaspersoft.studio.unit.y" value="px"/>
</reportElement>
<textFieldExpression><![CDATA[$F{placementtype}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{placementtypes}.getArray().join('; ')]]></textFieldExpression>
</textField>
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement style="Detail" x="2100" y="0" width="100" height="30" uuid="bf82c6ce-f8fa-4d71-975d-5aac2739aa36">
Expand All @@ -758,7 +772,7 @@ $P!{whereclause}]]>
<reportElement style="Detail" x="2200" y="0" width="100" height="30" uuid="d8b3cb62-ef05-4108-a4d1-91eb6b40daf4">
<property name="com.jaspersoft.studio.unit.y" value="px"/>
</reportElement>
<textFieldExpression><![CDATA[$F{placetype}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{placetypes}.getArray().join('; ')]]></textFieldExpression>
</textField>
<textField textAdjust="StretchHeight" isBlankWhenNull="true">
<reportElement style="Detail" x="2300" y="0" width="100" height="30" uuid="0d2aedb2-b30d-46e2-8127-a28616a502c2">
Expand Down