Update field changes (#20425)

* update field changes

* fix sonar issue
This commit is contained in:
Sweta Agarwalla 2025-03-26 10:22:06 +05:30 committed by GitHub
parent 7e731648ab
commit a2804a8933
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 1 deletions

View File

@ -23,4 +23,5 @@
+ .rjsf .form-group.field { + .rjsf .form-group.field {
margin-top: 0px; margin-top: 0px;
} }
width: 100%;
} }

View File

@ -22,6 +22,7 @@ import { isEmpty, isUndefined } from 'lodash';
import React, { Fragment, FunctionComponent } from 'react'; import React, { Fragment, FunctionComponent } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { ADVANCED_PROPERTIES } from '../../../../../constants/Services.constant'; import { ADVANCED_PROPERTIES } from '../../../../../constants/Services.constant';
import serviceUtilClassBase from '../../../../../utils/ServiceUtilClassBase';
import './object-field-template.less'; import './object-field-template.less';
const { Panel } = Collapse; const { Panel } = Collapse;
@ -62,6 +63,12 @@ export const ObjectFieldTemplate: FunctionComponent<ObjectFieldTemplateProps> =
} as PropertyMap } as PropertyMap
); );
const {
properties: updatedNormalProperties,
additionalField: AdditionalField,
additionalFieldContent,
} = serviceUtilClassBase.getProperties(normalProperties);
const fieldElement = ( const fieldElement = (
<Fragment> <Fragment>
<Space className="w-full justify-between header-title-wrapper"> <Space className="w-full justify-between header-title-wrapper">
@ -94,7 +101,13 @@ export const ObjectFieldTemplate: FunctionComponent<ObjectFieldTemplateProps> =
/> />
)} )}
</Space> </Space>
{normalProperties.map((element, index) => (
{AdditionalField &&
React.createElement(AdditionalField, {
data: additionalFieldContent,
})}
{updatedNormalProperties.map((element, index) => (
<div <div
className={classNames('property-wrapper', { className={classNames('property-wrapper', {
'additional-fields': schema.additionalProperties, 'additional-fields': schema.additionalProperties,

View File

@ -11,6 +11,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { ObjectFieldTemplatePropertyType } from '@rjsf/utils';
import { capitalize, get, toLower } from 'lodash'; import { capitalize, get, toLower } from 'lodash';
import { ServiceTypes } from 'Models'; import { ServiceTypes } from 'Models';
import MetricIcon from '../assets/svg/metric.svg'; import MetricIcon from '../assets/svg/metric.svg';
@ -764,6 +765,14 @@ class ServiceUtilClassBase {
return widgets; return widgets;
} }
public getProperties(property: ObjectFieldTemplatePropertyType[]) {
return {
properties: property,
additionalField: '',
additionalFieldContent: null,
};
}
public getEditConfigData( public getEditConfigData(
serviceData?: ServicesType, serviceData?: ServicesType,
data?: ConfigData data?: ConfigData