diff --git a/package-lock.json b/package-lock.json index 7cdc00424..90fef4ee5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "dependencies": { "@apollo/client": "^3.8.5", - "@edsc/metadata-preview": "^1.5.1", + "@edsc/metadata-preview": "^1.5.2", "@node-saml/node-saml": "^5.1.0", "@rjsf/core": "^5.15.0", "@rjsf/utils": "^5.15.0", @@ -9354,9 +9354,9 @@ } }, "node_modules/@edsc/metadata-preview": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@edsc/metadata-preview/-/metadata-preview-1.5.1.tgz", - "integrity": "sha512-k6OPzYCYWGZonnocc+bQkjlYPaGmkJ1+m+3XTJV1K/GBkTuB6WrvoNC1qjh2EknGMfqYg/ue6YTrA9u0o7lO1w==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@edsc/metadata-preview/-/metadata-preview-1.5.2.tgz", + "integrity": "sha512-t7EXdNVk+lvIMrymoQa81Li5pQ+J3RFQ7VmKdHB7UoU9EY3vBLnW0qWuI7ZJ0AVtLkW87zw6QA0l7CFgy+vD+Q==", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 15d6fc78a..9b26ccb84 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@apollo/client": "^3.8.5", - "@edsc/metadata-preview": "^1.5.1", + "@edsc/metadata-preview": "^1.5.2", "@node-saml/node-saml": "^5.1.0", "@rjsf/core": "^5.15.0", "@rjsf/utils": "^5.15.0", diff --git a/static/src/js/schemas/uiSchemas/services/serviceOptions.js b/static/src/js/schemas/uiSchemas/services/serviceOptions.js index 38aeab41e..02eddf1dc 100644 --- a/static/src/js/schemas/uiSchemas/services/serviceOptions.js +++ b/static/src/js/schemas/uiSchemas/services/serviceOptions.js @@ -21,6 +21,13 @@ const serviceOptionsUiSchema = { children: ['Subset'] } }, + { + 'ui:col': { + className: 'grid-layout__field-left-border', + md: 12, + children: ['Aggregation'] + } + }, { 'ui:col': { md: 12, @@ -165,6 +172,33 @@ const serviceOptionsUiSchema = { } } }, + Aggregation: { + 'ui:fieldReplacesAnyOrOneOf': true, + 'ui:heading-level': 'h4', + 'ui:field': 'layout', + 'ui:layout_grid': { + 'ui:row': [ + { + 'ui:group': 'Aggregation', + 'ui:group-description': true, + 'ui:col': { + md: 12, + children: [ + { + 'ui:row': [ + { + 'ui:col': { + md: 12, + children: ['Concatenate'] + } + } + ] + } + ] + } + }] + } + }, SupportedOutputProjections: { 'ui:heading-level': 'h4', items: {