Merge branch 'develop' into deep-element

src/components/browser/BrowserWindow.tsx

@@ -1159,10 +1159,6 @@ export const BrowserWindow = () => {
         setShowAttributeModal(false);
         setSelectedElement(null);
         setAttributeOptions([]);
-
-        setTimeout(() => {
-        setShowAttributeModal(false);
-        }, 0);
     };
 
     const resetPaginationSelector = useCallback(() => {

src/components/dashboard/NavBar.tsx

@@ -267,7 +267,7 @@ export const NavBar: React.FC<NavBarProps> = ({
                         top: "50%",
                         left: "50%",
                         transform: "translate(-50%, -50%)",
-                        width: 500,
+                        width: 700,
                         bgcolor: "background.paper",
                         boxShadow: 24,
                         p: 4,
@@ -291,8 +291,7 @@ export const NavBar: React.FC<NavBarProps> = ({
                           <Tabs
                             value={tab}
                             onChange={handleUpdateTabChange}
-                            sx={{ marginTop: 2, marginBottom: 2 }}
-                            centered
+                            sx={{ marginTop: 2, marginBottom: 2, marginLeft: '30px' }}
                           >
                             <Tab label={t('navbar.upgrade.modal.tabs.manual_setup')} />
                             <Tab label={t('navbar.upgrade.modal.tabs.docker_setup')} />
@@ -335,10 +334,15 @@ export const NavBar: React.FC<NavBarProps> = ({
                                 <br />
                                 docker-compose down
                                 <br />
+                                <br />
+                                 # Remove existing backend and frontend images
+                                <br />
+                                docker rmi getmaxun/maxun-frontend:latest getmaxun/maxun-backend:latest
+                                <br />
                                 <br />
                                 # pull latest docker images
                                 <br />
-                                docker-compose pull
+                                docker-compose pull backend frontend
                                 <br />
                                 <br />
                                 # start maxun

src/components/recorder/AddWhereCondModal.tsx

@@ -140,7 +140,7 @@ export const AddWhereCondModal = ({ isOpen, onClose, pair, index }: AddWhereCond
 }
 
 export const modalStyle = {
-  top: '40%',
+  top: '45%',
   left: '50%',
   transform: 'translate(-50%, -50%)',
   width: '30%',

src/components/ui/GenericModal.tsx

@@ -15,7 +15,7 @@ export const GenericModal: FC<ModalProps> = (
 
   return (
     <Modal open={isOpen} onClose={canBeClosed ? onClose : () => { }} >
-      <Box sx={modalStyle ? { ...modalStyle, boxShadow: 24, position: 'absolute', borderRadius: 5 } : defaultModalStyle}>
+      <Box sx={modalStyle ? { ...modalStyle, boxShadow: 24, position: 'absolute', borderRadius: 5 } : defaultModalStyle} onClick={(e) => e.stopPropagation()}>
         {canBeClosed ?
           <IconButton onClick={onClose} sx={{ float: "right" }}>
             <Clear sx={{ fontSize: 20 }} />

src/helpers/clientSelectorGenerator.ts

@@ -3761,7 +3761,6 @@ class ClientSelectorGenerator {
       ) {
         continue;
       }
-
       attrMap[attr.name] = attr.value;
     }