diff --git a/backend/src/main/resources/metadata-sources-ui-schema.json b/backend/src/main/resources/metadata-sources-ui-schema.json index 4784deeea..c06e299a6 100644 --- a/backend/src/main/resources/metadata-sources-ui-schema.json +++ b/backend/src/main/resources/metadata-sources-ui-schema.json @@ -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 @@ -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" } } }, @@ -429,9 +429,7 @@ }, "Certificate": { "type": "object", - "widget": { - "id": "fieldset" - }, + "title": "label.certificate", "required": [ "name", "type", @@ -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": [ @@ -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": { @@ -498,6 +501,7 @@ "title": "label.assertion-consumer-service-location-binding", "description": "tooltip.assertion-consumer-service-location-binding", "type": "string", + "widget": "select", "oneOf": [ { "enum": [ @@ -516,7 +520,8 @@ "makeDefault": { "title": "label.mark-as-default", "description": "tooltip.mark-as-default", - "type": "boolean" + "type": "boolean", + "default": false } } }, @@ -568,12 +573,8 @@ "title": "label.new-endpoint", "description": "tooltip.new-endpoint", "type": "object", - "widget": { - "id": "fieldset" - }, "fieldsets": [ { - "type": "section", "fields": [ "url", "bindingType" diff --git a/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts b/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts index b73a1adff..cbe98d5de 100644 --- a/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts +++ b/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts @@ -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', @@ -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' ] @@ -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' ] @@ -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' ], @@ -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' ] @@ -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' ], @@ -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' ], @@ -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' ], diff --git a/ui/src/app/metadata/domain/model/wizards/metadata-source-wizard.ts b/ui/src/app/metadata/domain/model/wizards/metadata-source-wizard.ts index dbe6ca1db..bd7ad9fd9 100644 --- a/ui/src/app/metadata/domain/model/wizards/metadata-source-wizard.ts +++ b/ui/src/app/metadata/domain/model/wizards/metadata-source-wizard.ts @@ -8,7 +8,7 @@ export class MetadataSourceWizard extends MetadataSourceBase implements Wizard