From aabc0298007bbdaa83c3fbc6ca90b4d6d4485578 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Wed, 2 Oct 2024 20:18:00 +0300
Subject: [PATCH] Angular 18 migration

---
 .../components/json-form/react/json-form-date.tsx      |  5 +++++
 .../components/json-form/react/json-form-icon.tsx      | 10 +++++++---
 .../components/json-form/react/json-form-radios.tsx    |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-date.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-date.tsx
index 45403e23a2..868bbd5cb6 100644
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-date.tsx
+++ b/ui-ngx/src/app/shared/components/json-form/react/json-form-date.tsx
@@ -60,6 +60,11 @@ class ThingsboardDate extends React.Component<JsonFormFieldProps, ThingsboardDat
           <LocalizationProvider dateAdapter={AdapterMoment}>
             <div style={{width: '100%', display: 'block'}}>
                 <DatePicker
+                    slotProps={{
+                      textField: {
+                        variant: 'standard'
+                      }
+                    }}
                     format='MM/DD/YYYY'
                     className={fieldClass}
                     label={this.props.form.title}
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-icon.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-icon.tsx
index da3e19550a..fdbd402e95 100644
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-icon.tsx
+++ b/ui-ngx/src/app/shared/components/json-form/react/json-form-icon.tsx
@@ -31,6 +31,8 @@ interface ThingsboardIconState extends JsonFormFieldState {
 
 class ThingsboardIcon extends React.Component<JsonFormFieldProps, ThingsboardIconState> {
 
+    containerRef = React.createRef<HTMLDivElement>();
+
     constructor(props) {
         super(props);
         this.onBlur = this.onBlur.bind(this);
@@ -54,7 +56,7 @@ class ThingsboardIcon extends React.Component<JsonFormFieldProps, ThingsboardIco
     }
 
     componentDidMount() {
-        const node = ReactDOM.findDOMNode(this);
+        const node = this.containerRef.current;
         const iconContainer = $(node).children('#icon-container');
         iconContainer.click((event) => {
           if (!this.props.form.readonly) {
@@ -64,7 +66,7 @@ class ThingsboardIcon extends React.Component<JsonFormFieldProps, ThingsboardIco
     }
 
     componentWillUnmount() {
-        const node = ReactDOM.findDOMNode(this);
+        const node = this.containerRef.current;
         const iconContainer = $(node).children('#icon-container');
         iconContainer.off( 'click' );
     }
@@ -102,6 +104,7 @@ class ThingsboardIcon extends React.Component<JsonFormFieldProps, ThingsboardIco
                     alignItems: 'center'
                 },
                 icon: {
+                    padding: '12px',
                     marginRight: '10px',
                     marginBottom: 'auto',
                     cursor: 'pointer',
@@ -134,12 +137,13 @@ class ThingsboardIcon extends React.Component<JsonFormFieldProps, ThingsboardIco
         }
 
         return (
-            <div style={ styles.container }>
+            <div ref={this.containerRef} style={ styles.container }>
                  <div id='icon-container' style={ styles.iconContainer }>
                     <IconButton style={ styles.icon }>
                       <Icon>{pickedIcon}</Icon>
                     </IconButton>
                     <TextField
+                        variant={'standard'}
                         className={fieldClass}
                         label={this.props.form.title}
                         error={!this.props.valid}
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-radios.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-radios.tsx
index 68a13cdcd5..99031ff480 100644
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-radios.tsx
+++ b/ui-ngx/src/app/shared/components/json-form/react/json-form-radios.tsx
@@ -24,7 +24,7 @@ class ThingsboardRadios extends React.Component<JsonFormFieldProps, JsonFormFiel
   render() {
     const items = this.props.form.titleMap.map((item, index) => {
       return (
-          <FormControlLabel value={item.value} control={<Radio />} label={item.name} key={index} />
+          <FormControlLabel value={item.value} control={<Radio color={'secondary'} />} label={item.name} key={index} />
       );
     });