Merge branch 'main' into thulasizwe/en/button-group

Author: czwe-01

shesha-reactjs/src/designer-components/checkboxGroup/settingsForm.ts

@@ -118,7 +118,7 @@ export const getSettings = (data: any) => {
                       value: 'referenceList',
                     },
                     {
-                      label: 'Api url',
+                      label: 'Api URL',
                       value: 'url',
                     },
                   ],

shesha-reactjs/src/designer-components/dataList/settingsForm.ts

@@ -399,7 +399,8 @@ export const getSettings = (data: any) => {
                             version: 0,
                             modelType: "{{data.entityType}}",
                             validate: {},
-                            settingsValidationErrors: []
+                            settingsValidationErrors: [],
+                            jsSetting: true,
                           }
                         ]
                       })
@@ -429,6 +430,7 @@ export const getSettings = (data: any) => {
                             version: 0,
                             validate: {},
                             settingsValidationErrors: [],
+                            jsSetting: true,
                             modelType: "{{data.entityType}}"
                           }
                         ]

shesha-reactjs/src/designer-components/dataTable/tableContext/settingsForm.ts

@@ -334,7 +334,7 @@ export const InputComponent: FC<Omit<ISettingsInputProps, 'hidden'>> = (props) =
                 variant={variant}
                 placeholder={placeholder}
                 suffix={<span style={{ height: '20px' }}>{iconElement(icon, null, tooltip, {}, styles)}</span>}
-                value={value?.value ? value.value : value || defaultValue}
+                value={value}
                 type={textType}
             />;
     }

shesha-reactjs/src/designer-components/dropdown/settingsForm.ts

@@ -114,7 +114,7 @@ const LinkComponent: IToolboxComponent<ILinkProps> = {
             return containerHolder();
           }
           return (
-            <a href={href} target={target} className="sha-link" style={getStyle(style, data)}>
+            <a href={href} target={target} className="sha-link">
               {containerHolder()}
             </a>
           );

shesha-reactjs/src/designer-components/inputComponent/index.tsx

@@ -372,6 +372,17 @@ export const getSettings = (data: any) => {
                               },
                             ],
                           },
+                        ],
+                      })
+                      .addSettingsInputRow({
+                        id: 'type-default-value-s4gmBg31azZC0UjZjpfTm',
+                        parentId: 's4gmBg31azZC0UjZjpfTm',
+                        hidden: {
+                          _code: 'return  !getSettingValue(data?.hasChildren);',
+                          _mode: 'code',
+                          _value: false,
+                        } as any,
+                        inputs: [
                           {
                             type: 'dropdown',
                             id: 'justifyItems-s4gmBg31azZC0UjZjpfTm',
@@ -450,17 +461,6 @@ export const getSettings = (data: any) => {
                               },
                             ],
                           },
-                        ],
-                      })
-                      .addSettingsInputRow({
-                        id: 'type-default-value-s4gmBg31azZC0UjZjpfTm',
-                        parentId: 's4gmBg31azZC0UjZjpfTm',
-                        hidden: {
-                          _code: 'return  !getSettingValue(data?.hasChildren);',
-                          _mode: 'code',
-                          _value: false,
-                        } as any,
-                        inputs: [
                           {
                             type: 'textField',
                             id: 'customCss-s4gmBg31azZC0UjZjpfTm',

shesha-reactjs/src/designer-components/link/index.tsx

@@ -104,7 +104,7 @@ export const getSettings = (data: any) => {
                       value: 'values',
                     },
                     {
-                      label: 'Reference List',
+                      label: 'Reference list',
                       value: 'referenceList',
                     },
                     {