Skip to content

Commit

Permalink
SHIBUI-905 Updated paths to use jsonschema endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmathis
rmathis committed Oct 19, 2018
1 parent 7eed5ac commit 1303209
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 35 deletions.
35 changes: 18 additions & 17 deletions backend/src/main/resources/metadata-sources-ui-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"maxLength": 255
},
"serviceEnabled": {
"title": "label.enable-this-service-upon-saving",
"title": "label.enable-this-service",
"description": "tooltip.enable-this-service-upon-saving",
"type": "boolean",
"default": false
Expand Down Expand Up @@ -343,16 +343,16 @@
"description": "tooltip.omit-not-before-condition",
"default": false
},
"responderId": {
"title": "label.responder-id",
"description": "tooltip.responder-id",
"type": "string"
},
"nameIdFormats": {
"$ref": "#/definitions/NameIdFormatList"
},
"authenticationMethods": {
"$ref": "#/definitions/AuthenticationMethodList"
},
"responderId": {
"title": "label.responder-id",
"description": "tooltip.responder-id",
"type": "string"
}
}
},
Expand Down Expand Up @@ -429,9 +429,7 @@
},
"Certificate": {
"type": "object",
"widget": {
"id": "fieldset"
},
"title": "label.certificate",
"required": [
"name",
"type",
Expand All @@ -446,10 +444,13 @@
"maxLength": 255
},
"type": {
"title": "label.type",
"title": "label.certificate-type",
"description": "tooltip.certificate-type",
"type": "string",
"widget": "radio",
"widget": {
"id": "radio",
"class": "form-check-inline"
},
"oneOf": [
{
"enum": [
Expand All @@ -476,15 +477,17 @@
"title": "label.certificate",
"description": "tooltip.certificate",
"type": "string",
"widget": "textarea",
"minLength": 1
}
}
},
"AssertionConsumerService": {
"type": "object",
"title": "label.assertion-consumer-service-endpoint",
"properties": {
"locationUrl": {
"title": "label.assertion-consumer-services-location",
"title": "label.assertion-consumer-service-location",
"description": "tooltip.assertion-consumer-service-location",
"type": "string",
"widget": {
Expand All @@ -498,6 +501,7 @@
"title": "label.assertion-consumer-service-location-binding",
"description": "tooltip.assertion-consumer-service-location-binding",
"type": "string",
"widget": "select",
"oneOf": [
{
"enum": [
Expand All @@ -516,7 +520,8 @@
"makeDefault": {
"title": "label.mark-as-default",
"description": "tooltip.mark-as-default",
"type": "boolean"
"type": "boolean",
"default": false
}
}
},
Expand Down Expand Up @@ -568,12 +573,8 @@
"title": "label.new-endpoint",
"description": "tooltip.new-endpoint",
"type": "object",
"widget": {
"id": "fieldset"
},
"fieldsets": [
{
"type": "section",
"fields": [
"url",
"bindingType"
Expand Down
16 changes: 8 additions & 8 deletions ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export class MetadataSourceEditor extends MetadataSourceBase implements Wizard<
index: 1,
id: 'common',
label: 'label.sp-org-info',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'serviceProviderName',
'entityId',
Expand Down Expand Up @@ -38,7 +38,7 @@ export class MetadataSourceEditor extends MetadataSourceBase implements Wizard<
index: 3,
id: 'metadata-ui',
label: 'label.metadata-ui',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'mdui'
]
Expand All @@ -47,7 +47,7 @@ export class MetadataSourceEditor extends MetadataSourceBase implements Wizard<
index: 4,
id: 'descriptor-info',
label: 'label.descriptor-info',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'serviceProviderSsoDescriptor'
]
Expand All @@ -56,7 +56,7 @@ export class MetadataSourceEditor extends MetadataSourceBase implements Wizard<
index: 5,
id: 'logout-endpoints',
label: 'label.logout-endpoints',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'logoutEndpoints'
],
Expand All @@ -73,7 +73,7 @@ export class MetadataSourceEditor extends MetadataSourceBase implements Wizard<
index: 6,
id: 'key-info',
label: 'label.key-info',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'securityInfo'
]
Expand All @@ -82,7 +82,7 @@ export class MetadataSourceEditor extends MetadataSourceBase implements Wizard<
index: 7,
id: 'assertion',
label: 'label.assertion',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'assertionConsumerServices'
],
Expand All @@ -99,7 +99,7 @@ export class MetadataSourceEditor extends MetadataSourceBase implements Wizard<
index: 8,
id: 'relying-party',
label: 'label.relying-party',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'relyingPartyOverrides'
],
Expand All @@ -116,7 +116,7 @@ export class MetadataSourceEditor extends MetadataSourceBase implements Wizard<
index: 9,
id: 'attribute',
label: 'label.attribute-release',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'attributeRelease'
],
Expand Down
20 changes: 10 additions & 10 deletions ui/src/app/metadata/domain/model/wizards/metadata-source-wizard.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export class MetadataSourceWizard extends MetadataSourceBase implements Wizard<M
index: 1,
id: 'common',
label: 'label.name-and-entity-id',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'serviceProviderName',
'entityId'
Expand All @@ -28,7 +28,7 @@ export class MetadataSourceWizard extends MetadataSourceBase implements Wizard<M
index: 2,
id: 'org-info',
label: 'label.org-info',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'organization',
'contacts'
Expand All @@ -52,7 +52,7 @@ export class MetadataSourceWizard extends MetadataSourceBase implements Wizard<M
index: 3,
id: 'metadata-ui',
label: 'label.metadata-ui',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'mdui'
]
Expand All @@ -61,7 +61,7 @@ export class MetadataSourceWizard extends MetadataSourceBase implements Wizard<M
index: 4,
id: 'descriptor-info',
label: 'label.descriptor-info',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'serviceProviderSsoDescriptor'
]
Expand All @@ -70,7 +70,7 @@ export class MetadataSourceWizard extends MetadataSourceBase implements Wizard<M
index: 5,
id: 'logout-endpoints',
label: 'label.logout-endpoints',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'logoutEndpoints'
],
Expand All @@ -87,7 +87,7 @@ export class MetadataSourceWizard extends MetadataSourceBase implements Wizard<M
index: 6,
id: 'key-info',
label: 'label.key-info',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'securityInfo'
]
Expand All @@ -96,7 +96,7 @@ export class MetadataSourceWizard extends MetadataSourceBase implements Wizard<M
index: 7,
id: 'assertion',
label: 'label.assertion',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'assertionConsumerServices'
],
Expand All @@ -113,7 +113,7 @@ export class MetadataSourceWizard extends MetadataSourceBase implements Wizard<M
index: 8,
id: 'relying-party',
label: 'label.relying-party',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'relyingPartyOverrides'
],
Expand All @@ -130,7 +130,7 @@ export class MetadataSourceWizard extends MetadataSourceBase implements Wizard<M
index: 9,
id: 'attribute',
label: 'label.attribute-release',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'attributeRelease'
],
Expand All @@ -147,7 +147,7 @@ export class MetadataSourceWizard extends MetadataSourceBase implements Wizard<M
index: 10,
id: 'summary',
label: 'label.finished',
schema: 'assets/schema/source/metadata-source.json',
schema: '/api/ui/MetadataSources',
fields: [
'serviceEnabled'
],
Expand Down

0 comments on commit 1303209

Please sign in to comment.