Skip to content

Commit

Permalink
moving representation information related configs from core to wui co…
Browse files Browse the repository at this point in the history 
…nfig, fixes #1341
  • Loading branch information
@luis100
luis100 committed Oct 3, 2018
1 parent 37bf9e4 commit af8c376
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 94 deletions.
87 changes: 0 additions & 87 deletions roda-core/roda-core/src/main/resources/config/roda-core.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,93 +390,6 @@ core.representation_type.value: OTHER
core.aip_type.controlled_vocabulary: false
core.aip_type.value: MIXED

##########################################################################
# AIP, representation and file fields that relate with representation information
#
# Usage:
# * core.ri.rule.AIP: [<String>]
# Set all the fields for AIPs (link to roda-wui)
#
# Status: in use
##########################################################################
core.ri.rule.AIP: ui.search.fields.IndexedAIP.type
core.ri.rule.AIP: ui.search.fields.IndexedAIP.uuid
core.ri.rule.AIP: ui.search.fields.IndexedAIP.level
core.ri.rule.Representation: ui.search.fields.IndexedRepresentation.type
core.ri.rule.Representation: ui.search.fields.IndexedRepresentation.uuid
core.ri.rule.Representation: ui.search.fields.IndexedRepresentation.representationStates
core.ri.rule.File: ui.search.fields.IndexedFile.mimetype
core.ri.rule.File: ui.search.fields.IndexedFile.pronom
core.ri.rule.File: ui.search.fields.IndexedFile.formatDesignation
core.ri.rule.File: ui.search.fields.IndexedFile.extension
core.ri.rule.File: ui.search.fields.IndexedFile.uuid

##########################################################################
# RI relation types
#
# Usage:
# * core.ri.relation.object_type: [<String>]
# Set all the relation types for RIs (link to roda-wui)
#
# Status: in use
##########################################################################
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.conforms_to
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_created
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_format
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_part
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_version
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.references
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.replaces
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.requires
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_source

core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.affinity_to
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.component_of
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.contains
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.defined_via
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.equivalent_to
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.extension_of
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_earlier_version
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_modified_version
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.may_contain
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.may_have_component
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.modification_of
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.must_have_component
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.subtype_of
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.used_by
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.see_also
core.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.other

core.ri.relation.aip: ui.search.fields.RepresentationInformation.relation.rendered_by
core.ri.relation.aip: ui.search.fields.RepresentationInformation.relation.executed_by
core.ri.relation.aip: ui.search.fields.RepresentationInformation.relation.specified_by
core.ri.relation.aip: ui.search.fields.RepresentationInformation.relation.represents

core.ri.relation.text: ui.search.fields.RepresentationInformation.relation.conforms_to
core.ri.relation.text: ui.search.fields.RepresentationInformation.relation.has_created
core.ri.relation.text: ui.search.fields.RepresentationInformation.relation.has_format
core.ri.relation.text: ui.search.fields.RepresentationInformation.relation.references
core.ri.relation.text: ui.search.fields.RepresentationInformation.relation.has_source
core.ri.relation.text: ui.search.fields.RepresentationInformation.relation.subtype_of

core.ri.relation.web: ui.search.fields.RepresentationInformation.relation.references
core.ri.relation.web: ui.search.fields.RepresentationInformation.relation.has_source
core.ri.relation.web: ui.search.fields.RepresentationInformation.relation.specified_by

##########################################################################
# RI family types
#
# Usage:
# * core.ri.family: [<String>]
# Set all the family types for RIs
#
# Status: in use
##########################################################################
core.ri.family: fileformat
core.ri.family: software
core.ri.family: organisation
core.ri.family: data

##########################################################################
# Iterable index result settings
#
Expand Down
12 changes: 6 additions & 6 deletions roda-ui/roda-wui/src/main/java/org/roda/wui/api/controllers/BrowserHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ protected static BrowseAIPBundle retrieveBrowseAipBundle(User user, IndexedAIP a
}

if (UserUtility.hasPermissions(user, RodaConstants.PERMISSION_METHOD_FIND_REPRESENTATION_INFORMATION)) {
List<String> rodaConfigurationAsList = RodaCoreFactory.getRodaConfigurationAsList("core.ri.rule.AIP").stream()
List<String> rodaConfigurationAsList = RodaCoreFactory.getRodaConfigurationAsList("ui.ri.rule.AIP").stream()
.map(r -> RodaCoreFactory.getRodaConfigurationAsString(r, RodaConstants.SEARCH_FIELD_FIELDS))
.collect(Collectors.toList());
bundle.setRepresentationInformationFields(rodaConfigurationAsList);
Expand Down Expand Up @@ -339,7 +339,7 @@ public static BrowseRepresentationBundle retrieveBrowseRepresentationBundle(User
}

if (UserUtility.hasPermissions(user, RodaConstants.PERMISSION_METHOD_FIND_REPRESENTATION_INFORMATION)) {
List<String> rodaConfigurationAsList = RodaCoreFactory.getRodaConfigurationAsList("core.ri.rule.Representation")
List<String> rodaConfigurationAsList = RodaCoreFactory.getRodaConfigurationAsList("ui.ri.rule.Representation")
.stream().map(r -> RodaCoreFactory.getRodaConfigurationAsString(r, RodaConstants.SEARCH_FIELD_FIELDS))
.collect(Collectors.toList());
bundle.setRepresentationInformationFields(rodaConfigurationAsList);
Expand Down Expand Up @@ -412,7 +412,7 @@ public static BrowseFileBundle retrieveBrowseFileBundle(IndexedAIP aip, IndexedR
}

if (UserUtility.hasPermissions(user, RodaConstants.PERMISSION_METHOD_FIND_REPRESENTATION_INFORMATION)) {
List<String> rodaConfigurationAsList = RodaCoreFactory.getRodaConfigurationAsList("core.ri.rule.File").stream()
List<String> rodaConfigurationAsList = RodaCoreFactory.getRodaConfigurationAsList("ui.ri.rule.File").stream()
.map(r -> RodaCoreFactory.getRodaConfigurationAsString(r, RodaConstants.SEARCH_FIELD_FIELDS))
.collect(Collectors.toList());
bundle.setRepresentationInformationFields(rodaConfigurationAsList);
Expand Down Expand Up @@ -2922,7 +2922,7 @@ RepresentationInformation.class, filter, Sorter.NONE, new Sublist(0, 3),

public static RepresentationInformationFilterBundle retrieveObjectClassFields(Messages messages) {
RepresentationInformationFilterBundle newBundle = new RepresentationInformationFilterBundle();
Iterator<String> keys = RodaCoreFactory.getRodaConfiguration().getKeys("core.ri.rule");
Iterator<String> keys = RodaCoreFactory.getRodaConfiguration().getKeys("ui.ri.rule");
Map<String, List<String>> fieldsResult = new HashMap<>();
Map<String, String> translationsResult = new HashMap<>();

Expand Down Expand Up @@ -2977,7 +2977,7 @@ public static RelationTypeTranslationsBundle retrieveRelationTypeTranslations(Me
Map<String, String> inverseTranslations = new HashMap<>();

for (RelationObjectType relationType : RelationObjectType.values()) {
List<String> configs = RodaCoreFactory.getRodaConfigurationAsList("core.ri.relation",
List<String> configs = RodaCoreFactory.getRodaConfigurationAsList("ui.ri.relation",
relationType.toString().toLowerCase());
Map<String, String> translations = new HashMap<>();

Expand Down Expand Up @@ -3035,7 +3035,7 @@ public static RepresentationInformationExtraBundle retrieveRepresentationInforma
String representationInformationId, Locale locale)
throws NotFoundException, AuthorizationDeniedException, GenericException, RequestNotValidException {
List<SupportedMetadataTypeBundle> supportedMetadataTypeBundles = BrowserHelper
.retrieveExtraSupportedMetadata(RodaCoreFactory.getRodaConfigurationAsList("core.ri.family"), locale);
.retrieveExtraSupportedMetadata(RodaCoreFactory.getRodaConfigurationAsList("ui.ri.family"), locale);
Map<String, Set<MetadataValue>> familyValues = new HashMap<>();

RepresentationInformation ri = RodaCoreFactory.getModelService()
Expand Down
2 changes: 1 addition & 1 deletion roda-ui/roda-wui/src/main/java/org/roda/wui/server/browse/BrowserServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@ public Job deleteFormat(SelectedItems<Format> selected)
public Map<String, String> retrieveRepresentationInformationFamilyOptions(String localeString) {
Locale locale = ServerTools.parseLocale(localeString);
Messages messages = RodaCoreFactory.getI18NMessages(locale);
List<String> families = RodaCoreFactory.getRodaConfigurationAsList("core.ri.family");
List<String> families = RodaCoreFactory.getRodaConfigurationAsList("ui.ri.family");
Map<String, String> familyAndTranslation = new HashMap<>();

for (String family : families) {
Expand Down
88 changes: 88 additions & 0 deletions roda-ui/roda-wui/src/main/resources/config/roda-wui.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1357,3 +1357,91 @@ ui.dip.externalURL.showEmbedded = true
# cURL command skeleton for creating job settings
##########################################################################
ui.createJob.curl = curl -X POST --header "Content-Type: application/json" --header "Accept: application/json" -d "{{jsonObject}}" -u $RODA_USERNAME:$RODA_PASSWORD "http://$RODA_HOST/api/v1/jobs"


##########################################################################
# AIP, representation and file fields that relate with representation information
#
# Usage:
# * core.ri.rule.AIP: [<String>]
# Set all the fields for AIPs (link to roda-wui)
#
# Status: in use
##########################################################################
ui.ri.rule.AIP: ui.search.fields.IndexedAIP.type
ui.ri.rule.AIP: ui.search.fields.IndexedAIP.uuid
ui.ri.rule.AIP: ui.search.fields.IndexedAIP.level
ui.ri.rule.Representation: ui.search.fields.IndexedRepresentation.type
ui.ri.rule.Representation: ui.search.fields.IndexedRepresentation.uuid
ui.ri.rule.Representation: ui.search.fields.IndexedRepresentation.representationStates
ui.ri.rule.File: ui.search.fields.IndexedFile.mimetype
ui.ri.rule.File: ui.search.fields.IndexedFile.pronom
ui.ri.rule.File: ui.search.fields.IndexedFile.formatDesignation
ui.ri.rule.File: ui.search.fields.IndexedFile.extension
ui.ri.rule.File: ui.search.fields.IndexedFile.uuid

##########################################################################
# RI relation types
#
# Usage:
# * core.ri.relation.object_type: [<String>]
# Set all the relation types for RIs (link to roda-wui)
#
# Status: in use
##########################################################################
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.conforms_to
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_created
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_format
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_part
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_version
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.references
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.replaces
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.requires
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_source

ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.affinity_to
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.component_of
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.contains
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.defined_via
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.equivalent_to
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.extension_of
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_earlier_version
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.has_modified_version
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.may_contain
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.may_have_component
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.modification_of
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.must_have_component
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.subtype_of
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.used_by
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.see_also
ui.ri.relation.representation_information: ui.search.fields.RepresentationInformation.relation.other

ui.ri.relation.aip: ui.search.fields.RepresentationInformation.relation.rendered_by
ui.ri.relation.aip: ui.search.fields.RepresentationInformation.relation.executed_by
ui.ri.relation.aip: ui.search.fields.RepresentationInformation.relation.specified_by
ui.ri.relation.aip: ui.search.fields.RepresentationInformation.relation.represents

ui.ri.relation.text: ui.search.fields.RepresentationInformation.relation.conforms_to
ui.ri.relation.text: ui.search.fields.RepresentationInformation.relation.has_created
ui.ri.relation.text: ui.search.fields.RepresentationInformation.relation.has_format
ui.ri.relation.text: ui.search.fields.RepresentationInformation.relation.references
ui.ri.relation.text: ui.search.fields.RepresentationInformation.relation.has_source
ui.ri.relation.text: ui.search.fields.RepresentationInformation.relation.subtype_of

ui.ri.relation.web: ui.search.fields.RepresentationInformation.relation.references
ui.ri.relation.web: ui.search.fields.RepresentationInformation.relation.has_source
ui.ri.relation.web: ui.search.fields.RepresentationInformation.relation.specified_by

##########################################################################
# RI family types
#
# Usage:
# * core.ri.family: [<String>]
# Set all the family types for RIs
#
# Status: in use
##########################################################################
ui.ri.family: fileformat
ui.ri.family: software
ui.ri.family: organisation
ui.ri.family: data

0 comments on commit af8c376

Please sign in to comment.