Skip to content

Commit

Permalink
Merge branch 'bugfix/SHIBUI-2453-nameid' into feature/shibui-2393-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmathis
rmathis committed Nov 15, 2022
2 parents 070bdcd + 8a85f97 commit c43e797
Show file tree
Hide file tree
Showing 11 changed files with 252 additions and 65 deletions.
2 changes: 1 addition & 1 deletion ui/src/app/form/component/templates/ObjectFieldTemplate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const ObjectFieldTemplate = ({
<Row>{uiSchema.layout.groups.map((group, rIdx) => (
<React.Fragment key={rIdx}>
{properties.some(p => group.fields.indexOf(p.name) > -1) &&
<Col lg={group.size} key={rIdx} className={`d-empty-none ${group.classNames}`}>
<Col { ...group.sizes } key={rIdx} className={`d-empty-none ${group.classNames}`}>
{group.title && <legend><Translate value={group.title} /></legend>}
{properties.filter(p => group.fields.indexOf(p.name) > -1).map((element, eIdx) => (
<React.Fragment key={eIdx}>{element.content}</React.Fragment>
Expand Down
8 changes: 6 additions & 2 deletions ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ export const CustomAttributeDefinition = {
layout: {
groups: [
{
size: 6,
sizes: {
lg: 6
},
classNames: '',
fields: [
'name',
Expand All @@ -23,7 +25,9 @@ export const CustomAttributeDefinition = {
]
},
{
size: 6,
sizes: {
lg: 6
},
classNames: 'bg-light border rounded p-4',
fields: [
'defaultValue',
Expand Down
20 changes: 15 additions & 5 deletions ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,19 @@ export const HttpMetadataResolverAttributesSchema = {
{
title: 'label.http-security-attributes',
classNames: 'bg-light border rounded px-4 pt-4 pb-3 mb-4',
size: 12,
sizes: {
xs: 12
},
fields: [
'disregardTLSCertificate'
]
},
{
title: 'label.http-connection-attributes',
classNames: 'bg-light border rounded px-4 pt-4 pb-3 mb-4',
size: 12,
sizes: {
xs: 12
},
fields: [
'connectionRequestTimeout',
'connectionTimeout',
Expand All @@ -148,7 +152,9 @@ export const HttpMetadataResolverAttributesSchema = {
{
title: 'label.http-proxy-attributes',
classNames: 'bg-light border rounded px-4 pt-4 pb-3 mb-4',
size: 12,
sizes: {
xs: 12
},
fields: [
'proxyHost',
'proxyPort',
Expand All @@ -159,7 +165,9 @@ export const HttpMetadataResolverAttributesSchema = {
{
title: 'label.http-caching-attributes',
classNames: 'bg-light border rounded px-4 pt-4 pb-3 mb-4',
size: 12,
sizes: {
xs: 12
},
fields: [
'httpCaching',
'httpCacheDirectory',
Expand All @@ -169,7 +177,9 @@ export const HttpMetadataResolverAttributesSchema = {
},
{
classNames: 'd-none',
size: 12,
sizes: {
xs: 12
},
fields: [
'tlsTrustEngineRef',
'httpClientSecurityParametersRef',
Expand Down
36 changes: 30 additions & 6 deletions ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,21 +117,33 @@ export const DynamicHttpMetadataProviderWizard = {
layout: {
groups: [
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
classNames: 'bg-light border rounded px-4 pt-4 pb-3 mb-4',
fields: [
'name',
'@type'
]
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'enabled'
]
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'xmlId',
'requireValidMetadata',
Expand All @@ -140,19 +152,31 @@ export const DynamicHttpMetadataProviderWizard = {
]
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'dynamicMetadataResolverAttributes'
],
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'metadataFilters'
],
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'httpMetadataResolverAttributes'
]
Expand Down
12 changes: 10 additions & 2 deletions ui/src/app/metadata/domain/provider/definition/ExternalMetadataProviderDefinition.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,23 @@ export const ExternalMetadataProviderWizard = {
layout: {
groups: [
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
classNames: 'bg-light border rounded px-4 pt-4 pb-3 mb-4',
fields: [
'name',
'@type'
]
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'xmlId',
'description',
Expand Down
30 changes: 25 additions & 5 deletions ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,23 @@ export const FileBackedHttpMetadataProviderWizard = {
layout: {
groups: [
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
classNames: 'bg-light border rounded px-4 pt-4 pb-3 mb-4',
fields: [
'name',
'@type'
]
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'xmlId',
'metadataURL',
Expand All @@ -97,19 +105,31 @@ export const FileBackedHttpMetadataProviderWizard = {
]
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'reloadableMetadataResolverAttributes'
],
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'metadataFilters'
],
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'httpMetadataResolverAttributes'
]
Expand Down
18 changes: 15 additions & 3 deletions ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,35 @@ export const FileSystemMetadataProviderWizard = {
layout: {
groups: [
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
classNames: 'bg-light border rounded px-4 pt-4 pb-3 mb-4',
fields: [
'name',
'@type'
]
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'xmlId',
'metadataFile',
'doInitialization',
]
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'reloadableMetadataResolverAttributes'
]
Expand Down
18 changes: 15 additions & 3 deletions ui/src/app/metadata/domain/provider/definition/LocalDynamicMetadataProviderDefinition.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,34 @@ export const LocalDynamicMetadataProviderWizard = {
layout: {
groups: [
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
classNames: 'bg-light border rounded px-4 pt-4 pb-3 mb-4',
fields: [
'name',
'@type'
]
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'xmlId',
'sourceDirectory'
]
},
{
size: 8,
sizes: {
xs: 12,
lg: 8,
xxl: 6
},
fields: [
'dynamicMetadataResolverAttributes'
],
Expand Down
18 changes: 14 additions & 4 deletions ui/src/app/metadata/domain/source/definition/OidcSourceDefinition.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,19 @@ export const OidcSourceEditor = defaultsDeep({
groups: [
{
classNames: 'bg-light border rounded px-4 pt-4 mb-4',
size: 6,
sizes: {
xs: 12,
xxl: 9
},
fields: [
'protocolSupportEnum',
'nameIdFormats'
],
},
{
size: 12,
sizes: {
xs: 12
},
fields: [
'extensions'
],
Expand Down Expand Up @@ -93,14 +98,19 @@ export const OidcSourceWizard = defaultsDeep({
groups: [
{
classNames: 'bg-light border rounded px-4 pt-4 mb-4',
size: 6,
sizes: {
xs: 12,
lg: 6
},
fields: [
'protocolSupportEnum',
'nameIdFormats'
],
},
{
size: 12,
sizes: {
xs: 12
},
fields: [
'extensions'
],
Expand Down
Loading

0 comments on commit c43e797

Please sign in to comment.