Skip to content

Commit

Permalink
Merge branch 'feature/SHIBUI-2270-property-list' into feature/shibui-…
Browse files Browse the repository at this point in the history
…2270
  • Loading branch information
chasegawa committed Aug 30, 2022
2 parents 61d0580 + 58fa445 commit 1fe37df
Show file tree
Hide file tree
Showing 27 changed files with 8,701 additions and 46 deletions.
14 changes: 1 addition & 13 deletions backend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,16 +162,4 @@ custom:
displayType: boolean
helpText: tooltip.ignore-request-signatures
attributeName: http://shibboleth.net/ns/profiles/ignoreRequestSignatures
attributeFriendlyName: ignoreRequestSignatures
# shibprops:
# - category: main # required
# configFile: random.properties # required
# defaultValue: foo
# description: whatever
# idpVersion: 4.1 # required
# module: some random module
# moduleVersion: 1
# note: this is an example for the application.yml file
# propertyName: example.property.name # required
# propertyType: SELECTION_LIST # required as one of: BOOLEAN, DURATION, INTEGER, SELECTION_LIST, SPRING_BEAN_ID, STRING
# selectionItems: dddd,eeee # required if propertyType is SELECTION_LIST - comma seperated values
attributeFriendlyName: ignoreRequestSignatures
13 changes: 11 additions & 2 deletions backend/src/main/resources/i18n/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ action.source-group=Group
action.enable=Enable
action.disable=Disable
action.get-latest=Get latest changes
action.download=Download

action.add-new-role=Add new role
action.roles=Roles
Expand All @@ -78,6 +79,9 @@ action.select-bundle=Select Bundle

action.get-latest=Get latest

action.configurations=Shibboleth configurations
action.create-new-configuration=Create Shibboleth configuration set

value.enabled=Enabled
value.disabled=Disabled
value.current=Current
Expand Down Expand Up @@ -293,7 +297,7 @@ label.or=or
label.name-and-upload-url=Name and Upload Url
label.service-resolver-file=Select Provider Metadata File
label.service-resolver-metadata-url=Service Provider Metadata URL
label.search-criteria-by=Search Criteria by { displayType }
label.search-criteria-by=The value used to search against, such as a regex pattern or entityID to match against.
label.entity-ids-added=Entity Ids Added
label.ui-mdui-info=User Interface / MDUI Information
label.sp-sso-descriptor-info=SP SSO Descriptor Information
Expand Down Expand Up @@ -531,6 +535,10 @@ label.role-name=Role Name
label.role-description=Role Description
label.role=Role

label.configuration-management=Manage Shibboleth configurations
label.configuration-name=Shibboleth configuration sets
label.new-configuration=Create new configuration set

message.delete-role-title=Delete Role?

message.delete-role-body=You are requesting to delete a role. If you complete this process the role will be removed. This cannot be undone. Do you wish to continue?
Expand Down Expand Up @@ -749,6 +757,7 @@ tooltip.role-description=A description of the purpose of the role.
tooltip.contact-information=Add a contact to organization information. Contacts provide information about how to contact the organization responsible for standing up the entity.

label.external-description=Description

tooltip.external-description=A brief description of the purpose of this filter.

label.algorithm=Algorithm
Expand All @@ -762,4 +771,4 @@ value.algorithm-cbc-256=CBC (256) - http://www.w3.org/2001/04/xmlenc#aes256-cbc
value.algorithm-cbc-192=CBC (192) - http://www.w3.org/2001/04/xmlenc#aes192-cbc
value.algorithm-cbc-128=CBC (128) - http://www.w3.org/2001/04/xmlenc#aes128-cbc
value.algorithm-cbc-tripledes=CBC (TRIPLEDES) - http://www.w3.org/2001/04/xmlenc#tripledes-cbc
message.algorithms-unique=Each algorithm may only be used once.
message.algorithms-unique=Each algorithm may only be used once.
14 changes: 7 additions & 7 deletions ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"react-bootstrap": "^2.3.0",
"react-bootstrap-typeahead": "^5.1.4",
"react-dom": "^18.0.0",
"react-hook-form": "^7.30.0",
"react-hook-form": "^7.34.0",
"react-infinite-scroll-component": "^6.1.0",
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
Expand Down
29 changes: 29 additions & 0 deletions ui/public/assets/data/configuration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"resourceId": 11,
"name": "setname1",
"properties": [
{
"resourceId":"577",
"category":"OPSubClaim",
"configFile":"oidc.properties",
"description":"The source attribute used in generating the sub claim",
"idpVersion":"4.1",
"module":"idp.oidc.OP",
"moduleVersion":"3",
"propertyName":"idp.oidc.subject.sourceAttribute",
"displayType":"string",
"propertyValue": "foo"
},
{
"resourceId": "393",
"category": "ReloadableServices",
"configFile": "services.properties",
"defaultValue": "false",
"description": "Fail at startup if MetadataConfiguration is invalid",
"idpVersion": "all",
"propertyName": "idp.service.metadata.failFast",
"displayType": "boolean",
"propertyValue": "true"
}
]
}
6 changes: 6 additions & 0 deletions ui/public/assets/data/configurations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"resourceId": "foo",
"name": "Configuration 1"
}
]
37 changes: 37 additions & 0 deletions ui/public/assets/schema/configuration/configuration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"type": "object",
"properties": {
"properties": {
"title": "label.configuration-properties",
"description": "label.configuration-properties",
"type": "array",
"required": ["property", "value"],
"items": {
"type": "object",
"properties": {
"property": {
"title": "label.property-key",
"description": "tooltip.property-key",
"type": "string",
"minLength": 1,
"maxLength": 255
},
"description": {
"title": "label.property-descr",
"description": "tooltip.property-descr",
"type": "string",
"minLength": 1,
"maxLength": 255
},
"value": {
"title": "label.property-value",
"description": "tooltip.property-value",
"type": "string",
"minLength": 1,
"maxLength": 255
}
}
}
}
}
}
Loading

0 comments on commit 1fe37df

Please sign in to comment.