Merge branch 'main' into thulasizwe/en/panel

Author: czwe-01

shesha-reactjs/src/components/kanban/index.tsx

@@ -9,7 +9,7 @@ import { useKanbanActions } from './utils';
 import { addPx } from '@/designer-components/_settings/utils';
 
 const KanbanReactComponent: React.FC<IKanbanProps> = (props) => {
-  const { gap, groupingProperty, createFormId, items, componentName, editFormId, stylingBox } = props;
+  const { gap, groupingProperty, createFormId, items, componentName, editFormId } = props;
 
   const { tableData, modelType } = useDataTableStore();
   const { message } = App.useApp();
@@ -28,7 +28,7 @@ const KanbanReactComponent: React.FC<IKanbanProps> = (props) => {
   const { storeSettings } = useRefListItemGroupConfigurator();
   const { getMetadata } = useMetadataDispatcher();
 
-  const styling = JSON.parse(stylingBox || '{}');
+  const styling = JSON.parse(props.columnStyles.stylingBox || '{}');
   const stylingBoxAsCSS = pickStyleFromModel(styling);
 
   useEffect(() => {

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

@@ -33,7 +33,7 @@ export const getSettings = (data: IAlertComponentProps) => {
                       type: 'textField',
                       id: nanoid(),
                       propertyName: 'componentName',
-                      label: 'Component name',
+                      label: 'Component Name',
                       size: 'small',
                       jsSetting: true,
                     }
@@ -163,23 +163,6 @@ export const getSettings = (data: IAlertComponentProps) => {
                   ],
                 })
                 .toJson()]
-          }
-          ,
-          {
-            key: 'security',
-            title: 'Security',
-            id: securityTabId,
-            components: [...new DesignerToolbarSettings()
-              .addSettingsInput({
-                id: nanoid(),
-                inputType: 'permissions',
-                propertyName: 'permissions',
-                label: 'Permissions',
-                size: 'small',
-                parentId: securityTabId
-              })
-              .toJson()
-            ]
           },
           {
             key: 'appearance',
@@ -190,7 +173,7 @@ export const getSettings = (data: IAlertComponentProps) => {
                 .addCollapsiblePanel({
                   id: nanoid(),
                   propertyName: 'customStyle',
-                  label: 'Custom Style',
+                  label: 'Custom Styles',
                   labelAlign: 'right',
                   ghost: true,
                   parentId: appearanceTabId,
@@ -199,7 +182,7 @@ export const getSettings = (data: IAlertComponentProps) => {
                     id: nanoid(),
                     components: [...new DesignerToolbarSettings()
                       .addSettingsInput({
-    
+
                         id: nanoid(),
                         inputType: 'codeEditor',
                         propertyName: 'style',
@@ -213,6 +196,22 @@ export const getSettings = (data: IAlertComponentProps) => {
                 })
                 .toJson()
             ]
+          },
+          {
+            key: 'security',
+            title: 'Security',
+            id: securityTabId,
+            components: [...new DesignerToolbarSettings()
+              .addSettingsInput({
+                id: nanoid(),
+                inputType: 'permissions',
+                propertyName: 'permissions',
+                label: 'Permissions',
+                size: 'small',
+                parentId: securityTabId
+              })
+              .toJson()
+            ]
           }
         ]
       }).toJson(),