@axelor/aos-mobile-core 7.0.2 → 7.0.4

package/lib/screens/LoginScreen.js

@@ -16,34 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { ActivityIndicator, StyleSheet, View, Dimensions } from 'react-native';
+import { StyleSheet, View, Dimensions } from 'react-native';
 import { useDispatch, useSelector } from 'react-redux';
-import { useThemeColor, Text, Screen, KeyboardAvoidingScrollView, } from '@axelor/aos-mobile-ui';
-import { ErrorText, LoginButton, LogoImage, PasswordInput, UrlInput, UsernameInput, } from '../components';
-import { isUrlValid, login } from '../features/authSlice';
-import { useScannedValueByKey, useScannerSelector, } from '../features/scannerSlice';
-import { useCameraScannerValueByKey } from '../features/cameraScannerSlice';
-import { useScanActivator, useScannerDeviceActivator, } from '../hooks/use-scan-activator';
-import { checkNullString } from '../utils';
-import { sessionStorage, useSessions, getStorageUrl } from '../sessions';
 import DeviceInfo from 'react-native-device-info';
-const urlScanKey = 'login_url';
+import { Text, Screen, KeyboardAvoidingScrollView } from '@axelor/aos-mobile-ui';
+import { login } from '../features/authSlice';
+import { sessionStorage, getStorageUrl, ErrorText, LogoImage, SessionInputs, } from '../sessions';
 const LoginScreen = ({ route }) => {
     const appVersion = route?.params?.version;
     const testInstanceConfig = route?.params?.testInstanceConfig;
     const releaseInstanceConfig = route?.params?.releaseInstanceConfig;
     const logoFile = route?.params?.logoFile;
-    const Colors = useThemeColor();
     const dispatch = useDispatch();
     const { loading, error, baseUrl } = useSelector(state => state.auth);
-    const { isEnabled, scanKey } = useScannerSelector();
-    const scannedValue = useScannedValueByKey(urlScanKey);
-    const scanData = useCameraScannerValueByKey(urlScanKey);
-    const { enable: onScanPress } = useScanActivator(urlScanKey);
-    const { enable: enableScanner } = useScannerDeviceActivator(urlScanKey);
-    const { sessionActive } = useSessions();
     const urlStorage = useMemo(() => getStorageUrl(), []);
     const modeDebug = useMemo(() => __DEV__, []);
+    const sessionList = sessionStorage.getSessionList();
     const showUrlInput = useMemo(() => {
         if (modeDebug) {
             return true;
@@ -70,70 +58,52 @@ const LoginScreen = ({ route }) => {
         releaseInstanceConfig?.url,
         testInstanceConfig?.defaultUrl,
     ]);
-    const [showRequiredFields, setShowRequiredFields] = useState(false);
-    const [url, setUrl] = useState(defaultUrl || '');
-    const [username, setUsername] = useState(modeDebug ? testInstanceConfig?.defaultUsername : '');
-    const [password, setPassword] = useState(modeDebug ? testInstanceConfig?.defaultPassword : '');
-    const parseQrCode = useCallback(scanValue => {
-        if (scanValue.includes('username') === true) {
-            const parseScannnedData = JSON.parse(scanValue);
-            setUrl(parseScannnedData.url);
-            setUsername(parseScannnedData.username);
-        }
-        else {
-            setUrl(scanValue);
-        }
-    }, []);
-    const disabledLogin = useMemo(() => checkNullString(url) ||
-        checkNullString(username) ||
-        checkNullString(password) ||
-        loading, [loading, password, url, username]);
+    const [isMounted, setIsMounted] = useState(false);
     useEffect(() => {
-        if (scannedValue) {
-            parseQrCode(scannedValue);
-        }
-        else if (scanData?.value != null) {
-            parseQrCode(scanData?.value);
-        }
-    }, [parseQrCode, scanData, scannedValue]);
-    const onPressLogin = useCallback(() => {
-        dispatch(login({ url, username, password }));
-        sessionStorage.addSession({
-            session: {
-                id: DeviceInfo.getApplicationName(),
-                url: url,
-                username: username,
-                isActive: true,
-            },
+        setIsMounted(true);
+        return () => {
+            setIsMounted(false);
+        };
+    }, []);
+    const onPressLogin = useCallback(({ url, username, password }) => {
+        dispatch(login({
+            url,
+            username,
+            password,
+        })).then(res => {
+            if (res.error == null && isMounted) {
+                sessionStorage.saveHiddenSession({
+                    name: DeviceInfo.getApplicationName(),
+                    url: url,
+                    username: username,
+                    isDefault: true,
+                });
+            }
         });
-    }, [dispatch, password, url, username]);
-    const handleTestUrl = useCallback(() => {
-        dispatch(isUrlValid({ url }));
-    }, [dispatch, url]);
-    useEffect(() => {
-        if (sessionActive != null) {
-            setUrl(sessionActive.url);
-            setUsername(sessionActive.username);
-            setPassword(modeDebug ? testInstanceConfig?.defaultPassword : '');
-        }
-    }, [modeDebug, sessionActive, testInstanceConfig?.defaultPassword]);
+    }, [dispatch, isMounted]);
     return (<Screen>
       <KeyboardAvoidingScrollView keyboardOffset={{ ios: 0, android: 0 }} style={styles.scroll}>
         <View style={styles.container}>
           <View style={styles.imageContainer}>
-            <LogoImage url={url} logoFile={logoFile}/>
+            <LogoImage logoFile={logoFile}/>
           </View>
           <ErrorText error={error} style={styles.card}/>
-          {showUrlInput && (<UrlInput value={url} onChange={setUrl} readOnly={loading} onScanPress={onScanPress} onSelection={enableScanner} onEndFocus={handleTestUrl} scanIconColor={isEnabled && scanKey === urlScanKey
-                ? Colors.primaryColor.background
-                : Colors.secondaryColor_dark.background} showRequiredFields={showRequiredFields}/>)}
-          <UsernameInput value={username} onChange={setUsername} readOnly={loading} showScanIcon={!showUrlInput} onScanPress={onScanPress} onSelection={enableScanner} scanIconColor={isEnabled && scanKey === urlScanKey
-            ? Colors.primaryColor.background
-            : Colors.secondaryColor_dark.background} showRequiredFields={showRequiredFields}/>
-          <PasswordInput value={password} onChange={setPassword} readOnly={loading} showRequiredFields={showRequiredFields}/>
-          <View>
-            {loading ? (<ActivityIndicator size="large"/>) : (<LoginButton onPress={onPressLogin} onDisabledPress={() => setShowRequiredFields(true)} disabled={disabledLogin}/>)}
-          </View>
+          <SessionInputs style={styles.card} sessionList={[]} session={sessionList.length > 0
+            ? {
+                ...sessionList[0],
+                password: modeDebug
+                    ? testInstanceConfig?.defaultPassword
+                    : '',
+            }
+            : {
+                url: defaultUrl,
+                username: modeDebug
+                    ? testInstanceConfig?.defaultUsername
+                    : '',
+                password: modeDebug
+                    ? testInstanceConfig?.defaultPassword
+                    : '',
+            }} showUrlInput={showUrlInput} loading={loading} mode="unique" showPopup={() => { }} onValidation={onPressLogin}/>
           <View style={styles.copyright}>
             <Text>{`© 2005 - ${new Date().getFullYear()} Axelor. All rights reserved.`}</Text>
             <Text>{`Version ${appVersion}`}</Text>
@@ -162,6 +132,10 @@ const styles = StyleSheet.create({
         bottom: 0,
     },
     card: {
+        flexDirection: 'column',
+        justifyContent: 'center',
+        alignItems: 'center',
+        alignContent: 'center',
         width: '90%',
     },
     scroll: {

package/lib/screens/LoginScreen.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoginScreen.js","sourceRoot":"","sources":["../../src/screens/LoginScreen.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"LoginScreen.js","sourceRoot":"","sources":["../../src/screens/LoginScreen.js"],"names":[],"mappings":"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"}

package/lib/screens/SessionManagementScreen.js

@@ -15,12 +15,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { StyleSheet, View, Dimensions } from 'react-native';
 import { useDispatch } from 'react-redux';
 import { Text, KeyboardAvoidingScrollView, Screen } from '@axelor/aos-mobile-ui';
-import { LogoImage, PopupSessionList, PopupCreateSession, PopupSession, ConnectSessionButton, NoActiveSessionButton, ChooseSessionButton, CreateSessionButton, } from '../components';
-import { useSessions } from '../sessions';
+import { LogoImage, PopupCreateSession, PopupSession, SessionListCard, PopupEditSession, useSessions, } from '../sessions';
 import { clearError } from '../features/authSlice';
 const SessionManagementScreen = ({ route }) => {
     const appVersion = route?.params?.version;
@@ -29,7 +28,7 @@ const SessionManagementScreen = ({ route }) => {
     const logoFile = route?.params?.logoFile;
     const dispatch = useDispatch();
     const modeDebug = useMemo(() => __DEV__, []);
-    const { sessionList, sessionActive } = useSessions();
+    const { sessionList, sessionDefault } = useSessions();
     const showUrlInput = useMemo(() => {
         if (modeDebug) {
             return true;
@@ -38,29 +37,48 @@ const SessionManagementScreen = ({ route }) => {
             return releaseInstanceConfig?.showUrlInput || true;
         }
     }, [modeDebug, releaseInstanceConfig?.showUrlInput]);
+    const [isMounted, setIsMounted] = useState(false);
     const [popupCreateIsOpen, setPopupCreateIsOpen] = useState(false);
     const [popupConnectionIsOpen, setPopupConnectionIsOpen] = useState(false);
-    const [popupSessionListIsOpen, setPopupSessionListIsOpen] = useState(false);
+    const [popupEditIsOpen, setPopupEditIsOpen] = useState(false);
+    const [session, setSession] = useState(sessionDefault != null ? sessionDefault : null);
     useEffect(() => {
         if (!popupCreateIsOpen && !popupConnectionIsOpen) {
             dispatch(clearError());
         }
     }, [dispatch, popupConnectionIsOpen, popupCreateIsOpen]);
+    useEffect(() => {
+        setIsMounted(true);
+        return () => {
+            setIsMounted(false);
+        };
+    }, []);
+    useEffect(() => {
+        if (sessionDefault != null && isMounted) {
+            setPopupConnectionIsOpen(true);
+        }
+    }, [isMounted, sessionDefault]);
+    useEffect(() => {
+        if (!Array.isArray(sessionList) || sessionList.length === 0) {
+            setPopupCreateIsOpen(true);
+        }
+    }, [sessionList]);
+    const changeActiveSession = useCallback(_session => {
+        setSession(_session);
+    }, []);
     return (<Screen>
       <KeyboardAvoidingScrollView keyboardOffset={{ ios: 0, android: 180 }}>
         <View style={styles.container}>
           <View style={styles.imageContainer}>
-            <LogoImage logoFile={logoFile} url={sessionActive?.url}/>
-          </View>
-          <View style={styles.buttonContainer}>
-            <ConnectSessionButton sessionActive={sessionActive} onPress={() => setPopupConnectionIsOpen(true)}/>
-            <NoActiveSessionButton numberSessions={sessionList?.length} sessionActive={sessionActive}/>
-            <ChooseSessionButton sessionActive={sessionActive} numberSessions={sessionList?.length} onPress={() => setPopupSessionListIsOpen(true)}/>
-            <CreateSessionButton numberSessions={sessionList?.length} onPress={() => setPopupCreateIsOpen(true)}/>
+            <LogoImage logoFile={logoFile} url={session?.url}/>
           </View>
-          <PopupCreateSession sessionList={sessionList} modeDebug={modeDebug} popupIsOpen={popupCreateIsOpen} setPopupIsOpen={setPopupCreateIsOpen} showUrlInput={showUrlInput} testInstanceConfig={testInstanceConfig} releaseInstanceConfig={releaseInstanceConfig}/>
-          <PopupSession sessionActive={sessionActive} popupIsOpen={popupConnectionIsOpen} setPopupIsOpen={setPopupConnectionIsOpen} showUrlInput={showUrlInput} testInstanceConfig={testInstanceConfig}/>
-          <PopupSessionList sessionList={sessionList} popupIsOpen={popupSessionListIsOpen} setPopupIsOpen={setPopupSessionListIsOpen} setPopupSessionIsOpen={setPopupConnectionIsOpen}/>
+          <SessionListCard logoFile={logoFile} sessionList={sessionList} changeActiveSession={changeActiveSession} openConnection={() => setPopupConnectionIsOpen(true)} openEdition={() => setPopupEditIsOpen(true)} openCreation={() => setPopupCreateIsOpen(true)} session={session}/>
+          <PopupCreateSession sessionList={sessionList} popupIsOpen={popupCreateIsOpen} handleClose={() => setPopupCreateIsOpen(false)} showUrlInput={showUrlInput} modeDebug={modeDebug} testInstanceConfig={testInstanceConfig} releaseInstanceConfig={releaseInstanceConfig}/>
+          <PopupSession sessionActive={session} popupIsOpen={!popupEditIsOpen && popupConnectionIsOpen} handleClose={() => setPopupConnectionIsOpen(false)} showUrlInput={showUrlInput} testInstanceConfig={testInstanceConfig}/>
+          <PopupEditSession session={session} sessionList={sessionList} popupIsOpen={popupEditIsOpen} showUrlInput={showUrlInput} handleClose={() => {
+            setPopupConnectionIsOpen(false);
+            setPopupEditIsOpen(false);
+        }} modeDebug={modeDebug}/>
           <View style={styles.copyright}>
             <Text>{`© 2005 - ${new Date().getFullYear()} Axelor. All rights reserved.`}</Text>
             <Text>{`Version ${appVersion}`}</Text>
@@ -73,19 +91,21 @@ const styles = StyleSheet.create({
     container: {
         marginTop: '15%',
         alignItems: 'center',
-        height: Dimensions.get('window').height * 0.9,
+        height: Dimensions.get('window').height < 950
+            ? Dimensions.get('window').height * 0.9
+            : Dimensions.get('window').height * 0.85,
     },
     imageContainer: {
         alignItems: 'center',
         width: '100%',
         height: '15%',
-        marginTop: Dimensions.get('window').height < 500 ? '10%' : '40%',
+        marginTop: Dimensions.get('window').height < 500
+            ? '10%'
+            : Dimensions.get('window').height > 950
+                ? '15%'
+                : '40%',
         marginBottom: 10,
     },
-    buttonContainer: {
-        width: '70%',
-        marginTop: Dimensions.get('window').height < 500 ? '15%' : '35%',
-    },
     copyright: {
         position: 'absolute',
         alignItems: 'center',

package/lib/screens/SessionManagementScreen.js.map

@@ -1 +1 @@
-{"version":3,"file":"SessionManagementScreen.js","sourceRoot":"","sources":["../../src/screens/SessionManagementScreen.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"SessionManagementScreen.js","sourceRoot":"","sources":["../../src/screens/SessionManagementScreen.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAE,IAAI,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,IAAI,EAAE,0BAA0B,EAAE,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,WAAW,GACZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,MAAM,uBAAuB,GAAG,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE;IAC1C,MAAM,UAAU,GAAG,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC;IAC1C,MAAM,kBAAkB,GAAG,KAAK,EAAE,MAAM,EAAE,kBAAkB,CAAC;IAC7D,MAAM,qBAAqB,GAAG,KAAK,EAAE,MAAM,EAAE,qBAAqB,CAAC;IACnE,MAAM,QAAQ,GAAG,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC;IACzC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAE7C,MAAM,EAAC,WAAW,EAAE,cAAc,EAAC,GAAG,WAAW,EAAE,CAAC;IAEpD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,IAAI,SAAS,EAAE;YACb,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,qBAAqB,EAAE,YAAY,IAAI,IAAI,CAAC;SACpD;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,qBAAqB,EAAE,YAAY,CAAC,CAAC,CAAC;IAErD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1E,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CACpC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAC/C,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,iBAAiB,IAAI,CAAC,qBAAqB,EAAE;YAChD,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,qBAAqB,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAEzD,SAAS,CAAC,GAAG,EAAE;QACb,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO,GAAG,EAAE;YACV,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,cAAc,IAAI,IAAI,IAAI,SAAS,EAAE;YACvC,wBAAwB,CAAC,IAAI,CAAC,CAAC;SAChC;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC;IAEhC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3D,oBAAoB,CAAC,IAAI,CAAC,CAAC;SAC5B;IACH,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,MAAM,mBAAmB,GAAG,WAAW,CAAC,QAAQ,CAAC,EAAE;QACjD,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,CAAC,MAAM,CACL;MAAA,CAAC,0BAA0B,CAAC,cAAc,CAAC,CAAC,EAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAC,CAAC,CACjE;QAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;UAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CACjC;YAAA,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,EACnD;UAAA,EAAE,IAAI,CACN;UAAA,CAAC,eAAe,CACd,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,mBAAmB,CAAC,CAAC,mBAAmB,CAAC,CACzC,cAAc,CAAC,CAAC,GAAG,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,CACrD,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAC5C,YAAY,CAAC,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAC/C,OAAO,CAAC,CAAC,OAAO,CAAC,EAEnB;UAAA,CAAC,kBAAkB,CACjB,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,WAAW,CAAC,CAAC,iBAAiB,CAAC,CAC/B,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAC/C,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,kBAAkB,CAAC,CAAC,kBAAkB,CAAC,CACvC,qBAAqB,CAAC,CAAC,qBAAqB,CAAC,EAE/C;UAAA,CAAC,YAAY,CACX,aAAa,CAAC,CAAC,OAAO,CAAC,CACvB,WAAW,CAAC,CAAC,CAAC,eAAe,IAAI,qBAAqB,CAAC,CACvD,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CACnD,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,kBAAkB,CAAC,CAAC,kBAAkB,CAAC,EAEzC;UAAA,CAAC,gBAAgB,CACf,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,WAAW,CAAC,CAAC,eAAe,CAAC,CAC7B,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,WAAW,CAAC,CAAC,GAAG,EAAE;YAChB,wBAAwB,CAAC,KAAK,CAAC,CAAC;YAChC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC,CAAC,CACF,SAAS,CAAC,CAAC,SAAS,CAAC,EAEvB;UAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;YAAA,CAAC,IAAI,CAAC,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,+BAA+B,CAAC,EAAE,IAAI,CACjF;YAAA,CAAC,IAAI,CAAC,CAAC,WAAW,UAAU,EAAE,CAAC,EAAE,IAAI,CACvC;UAAA,EAAE,IAAI,CACR;QAAA,EAAE,IAAI,CACR;MAAA,EAAE,0BAA0B,CAC9B;IAAA,EAAE,MAAM,CAAC,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,SAAS,EAAE,KAAK;QAChB,UAAU,EAAE,QAAQ;QACpB,MAAM,EACJ,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,GAAG;YACnC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,GAAG;YACvC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,IAAI;KAC7C;IACD,cAAc,EAAE;QACd,UAAU,EAAE,QAAQ;QACpB,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,KAAK;QACb,SAAS,EACP,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,GAAG;YACnC,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,GAAG;gBACvC,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,KAAK;QACX,YAAY,EAAE,EAAE;KACjB;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,UAAU;QACpB,UAAU,EAAE,QAAQ;QACpB,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,CAAC;KACV;CACF,CAAC,CAAC;AAEH,eAAe,uBAAuB,CAAC"}

package/lib/sessions/SessionStorage.d.ts

@@ -7,13 +7,12 @@ declare class SessionStorage {
     register(callBack: any): void;
     private updateState;
     getSessionList(): Session[];
-    getActiveSession(): Session;
-    addSession({ session }: {
+    getDefaultSession(): Session;
+    private saveSession;
+    saveHiddenSession(session: Session): void;
+    registerSession({ session }: {
         session: Session;
     }): void;
-    changeActiveSession({ sessionId }: {
-        sessionId: string;
-    }): void;
     removeSession({ sessionId }: {
         sessionId: string;
     }): void;

package/lib/sessions/SessionStorage.js

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { storage } from '../storage/Storage';
-import { setActiveSession } from './utils';
+import { manageDefaultSession, migrateOldSessionToNewSystem } from './utils';
 const SESSION_KEY = 'ConnectionSessions';
 class SessionStorage {
     localStorage;
@@ -31,29 +31,33 @@ class SessionStorage {
         if (this.refreshCallBack != null) {
             this.refreshCallBack({
                 sessionList: this.getSessionList(),
-                activeSession: this.getActiveSession(),
+                defaultSession: this.getDefaultSession(),
             });
         }
     }
     getSessionList() {
-        const item = this.localStorage.getItem(SESSION_KEY);
-        return item;
+        const storageData = this.localStorage.getItem(SESSION_KEY) || [];
+        if (storageData.some(_item => _item?.name == null)) {
+            this.localStorage.setItem(SESSION_KEY, migrateOldSessionToNewSystem(storageData));
+            return this.getSessionList();
+        }
+        return storageData;
     }
-    getActiveSession() {
+    getDefaultSession() {
         const sessionList = this.getSessionList();
         if (!Array.isArray(sessionList) || sessionList.length === 0) {
             return null;
         }
-        return sessionList.find(_session => _session.isActive === true);
+        return sessionList.find(_session => _session.isDefault === true);
     }
-    addSession({ session }) {
-        let sessionList = this.getSessionList();
-        if (!Array.isArray(sessionList) || sessionList.length === 0) {
-            this.localStorage.setItem(SESSION_KEY, [session]);
-            return;
+    saveSession(session, list) {
+        const id = session?.id || `session-${Date.now()}`;
+        const _session = { ...session, id };
+        if (!Array.isArray(list) || list.length === 0) {
+            list = [];
         }
-        if (sessionList.find(_item => _item.id === session.id)) {
-            sessionList = sessionList.map(_item => {
+        if (session.id != null && list.find(_item => _item.id === session.id)) {
+            list = list.map(_item => {
                 if (_item.id === session.id) {
                     return { ..._item, ...session };
                 }
@@ -61,19 +65,23 @@ class SessionStorage {
             });
         }
         else {
-            sessionList.push(session);
+            list.push(_session);
         }
-        const activeSessionList = setActiveSession(sessionList, session.id);
-        this.localStorage.setItem(SESSION_KEY, activeSessionList);
-        this.updateState();
+        list = manageDefaultSession(list, _session);
+        this.localStorage.setItem(SESSION_KEY, list);
     }
-    changeActiveSession({ sessionId }) {
-        const sessionList = this.getSessionList();
-        if (!Array.isArray(sessionList) || sessionList.length === 0) {
+    saveHiddenSession(session) {
+        if (session == null) {
             return;
         }
-        const activeSessionList = setActiveSession(sessionList, sessionId);
-        this.localStorage.setItem(SESSION_KEY, activeSessionList);
+        this.saveSession(session, []);
+    }
+    registerSession({ session }) {
+        if (session == null) {
+            return;
+        }
+        let sessionList = this.getSessionList();
+        this.saveSession(session, sessionList);
         this.updateState();
     }
     removeSession({ sessionId }) {

package/lib/sessions/SessionStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"SessionStorage.js","sourceRoot":"","sources":["../../src/sessions/SessionStorage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,EAAU,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAEzC,MAAM,WAAW,GAAG,oBAAoB,CAAC;AAEzC,MAAM,cAAc;IASE;IARZ,eAAe,CAMZ;IAEX,YAAoB,YAAqB;QAArB,iBAAY,GAAZ,YAAY,CAAS;IAAG,CAAC;IAE7C,QAAQ,CAAC,QAAQ;QACf,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC;IAClC,CAAC;IAEO,WAAW;QACjB,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,EAAE;YAChC,IAAI,CAAC,eAAe,CAAC;gBACnB,WAAW,EAAE,IAAI,CAAC,cAAc,EAAE;gBAClC,aAAa,EAAE,IAAI,CAAC,gBAAgB,EAAE;aACvC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,cAAc;QACZ,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,gBAAgB;QACd,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAE1C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3D,OAAO,IAAI,CAAC;SACb;QAED,OAAO,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;IAClE,CAAC;IAED,UAAU,CAAC,EAAC,OAAO,EAAqB;QACtC,IAAI,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAExC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3D,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;YAClD,OAAO;SACR;QAED,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,EAAE;YACtD,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBACpC,IAAI,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,EAAE;oBAC3B,OAAO,EAAC,GAAG,KAAK,EAAE,GAAG,OAAO,EAAC,CAAC;iBAC/B;gBAED,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC3B;QAED,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAE1D,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED,mBAAmB,CAAC,EAAC,SAAS,EAAsB;QAClD,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAE1C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3D,OAAO;SACR;QAED,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAE1D,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED,aAAa,CAAC,EAAC,SAAS,EAAsB;QAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAE1C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3D,OAAO;SACR;QAED,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;QAE3E,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SAC9B;QAED,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAEpD,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"SessionStorage.js","sourceRoot":"","sources":["../../src/sessions/SessionStorage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,EAAU,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAC,oBAAoB,EAAE,4BAA4B,EAAC,MAAM,SAAS,CAAC;AAE3E,MAAM,WAAW,GAAG,oBAAoB,CAAC;AAEzC,MAAM,cAAc;IASE;IARZ,eAAe,CAMZ;IAEX,YAAoB,YAAqB;QAArB,iBAAY,GAAZ,YAAY,CAAS;IAAG,CAAC;IAE7C,QAAQ,CAAC,QAAQ;QACf,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC;IAClC,CAAC;IAEO,WAAW;QACjB,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,EAAE;YAChC,IAAI,CAAC,eAAe,CAAC;gBACnB,WAAW,EAAE,IAAI,CAAC,cAAc,EAAE;gBAClC,cAAc,EAAE,IAAI,CAAC,iBAAiB,EAAE;aACzC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,cAAc;QACZ,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAEjE,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,IAAI,IAAI,CAAC,EAAE;YAClD,IAAI,CAAC,YAAY,CAAC,OAAO,CACvB,WAAW,EACX,4BAA4B,CAAC,WAAW,CAAC,CAC1C,CAAC;YACF,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;SAC9B;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,iBAAiB;QACf,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAE1C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3D,OAAO,IAAI,CAAC;SACb;QAED,OAAO,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;IACnE,CAAC;IAEO,WAAW,CAAC,OAAgB,EAAE,IAAe;QACnD,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,IAAI,WAAW,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,EAAC,GAAG,OAAO,EAAE,EAAE,EAAC,CAAC;QAElC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7C,IAAI,GAAG,EAAE,CAAC;SACX;QAED,IAAI,OAAO,CAAC,EAAE,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,EAAE;YACrE,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBACtB,IAAI,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,EAAE;oBAC3B,OAAO,EAAC,GAAG,KAAK,EAAE,GAAG,OAAO,EAAC,CAAC;iBAC/B;gBAED,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACrB;QAED,IAAI,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAE5C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,iBAAiB,CAAC,OAAgB;QAChC,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,OAAO;SACR;QAED,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,eAAe,CAAC,EAAC,OAAO,EAAqB;QAC3C,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,OAAO;SACR;QAED,IAAI,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACxC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAEvC,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED,aAAa,CAAC,EAAC,SAAS,EAAsB;QAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAE1C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3D,OAAO;SACR;QAED,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;QAE3E,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SAC9B;QAED,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAEpD,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC"}

package/lib/{components/templates/PopupCreateSession → sessions/components/alerts}/PopupCreateSession.d.ts

@@ -1,8 +1,8 @@
 export default PopupCreateSession;
-declare function PopupCreateSession({ sessionList, popupIsOpen, setPopupIsOpen, showUrlInput, modeDebug, testInstanceConfig, releaseInstanceConfig, }: {
+declare function PopupCreateSession({ sessionList, popupIsOpen, handleClose, showUrlInput, modeDebug, testInstanceConfig, releaseInstanceConfig, }: {
     sessionList: any;
     popupIsOpen: any;
-    setPopupIsOpen: any;
+    handleClose: any;
     showUrlInput: any;
     modeDebug: any;
     testInstanceConfig: any;

package/lib/sessions/components/alerts/PopupCreateSession.js

@@ -0,0 +1,128 @@
+/*
+ * Axelor Business Solutions
+ *
+ * Copyright (C) 2023 Axelor (<http://axelor.com>).
+ *
+ * This program is free software: you can redistribute it and/or  modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { StyleSheet, View } from 'react-native';
+import { useDispatch, useSelector } from 'react-redux';
+import { Icon, PopUp } from '@axelor/aos-mobile-ui';
+import { useTranslator } from '../../../i18n';
+import { ErrorText, SessionInputs } from '../../components';
+import { login } from '../../../features/authSlice';
+import { getStorageUrl, sessionStorage } from '../..';
+import DeviceInfo from 'react-native-device-info';
+const PopupCreateSession = ({ sessionList, popupIsOpen, handleClose, showUrlInput, modeDebug, testInstanceConfig, releaseInstanceConfig, }) => {
+    const I18n = useTranslator();
+    const dispatch = useDispatch();
+    const { loading, error, baseUrl } = useSelector(state => state.auth);
+    const urlStorage = useMemo(() => getStorageUrl(), []);
+    const defaultUrl = useMemo(() => {
+        if (urlStorage != null) {
+            return urlStorage;
+        }
+        if (baseUrl != null) {
+            return baseUrl;
+        }
+        if (modeDebug) {
+            return testInstanceConfig?.defaultUrl;
+        }
+        return releaseInstanceConfig?.url;
+    }, [
+        baseUrl,
+        modeDebug,
+        releaseInstanceConfig?.url,
+        testInstanceConfig?.defaultUrl,
+        urlStorage,
+    ]);
+    const [isBackground, setIsBackground] = useState(false);
+    const [isMounted, setIsMounted] = useState(false);
+    useEffect(() => {
+        setIsMounted(true);
+        return () => {
+            setIsMounted(false);
+        };
+    }, []);
+    const onPressLogin = useCallback(session => {
+        dispatch(login({ ...session })).then(res => {
+            if (res.error == null && isMounted) {
+                sessionStorage.registerSession({
+                    session,
+                });
+            }
+        });
+    }, [dispatch, isMounted]);
+    useEffect(() => {
+        if (popupIsOpen != null) {
+            setIsBackground(false);
+        }
+    }, [popupIsOpen]);
+    const inputProps = useMemo(() => ({
+        sessionList,
+        session: modeDebug
+            ? {
+                name: DeviceInfo.getApplicationName(),
+                url: defaultUrl,
+                username: testInstanceConfig?.defaultUsername,
+                password: testInstanceConfig?.defaultPassword,
+                isDefault: false,
+            }
+            : { url: defaultUrl, isDefault: false },
+        showUrlInput,
+        loading,
+        mode: 'creation',
+        showPopup: value => setIsBackground(!value),
+        onValidation: onPressLogin,
+    }), [
+        defaultUrl,
+        loading,
+        modeDebug,
+        onPressLogin,
+        sessionList,
+        showUrlInput,
+        testInstanceConfig?.defaultPassword,
+        testInstanceConfig?.defaultUsername,
+    ]);
+    if (isBackground) {
+        return <SessionInputs hidden={true} {...inputProps}/>;
+    }
+    return (<PopUp visible={popupIsOpen} title={I18n.t('Base_Connection_CreateSession')} style={styles.popup}>
+      <View style={styles.popupContainer}>
+        {sessionList?.length > 0 && (<Icon name="times" size={20} touchable={true} onPress={handleClose} style={styles.closeIcon}/>)}
+        <ErrorText error={error}/>
+        <SessionInputs {...inputProps}/>
+      </View>
+    </PopUp>);
+};
+const styles = StyleSheet.create({
+    popup: {
+        width: '90%',
+        paddingHorizontal: 15,
+        paddingRight: 15,
+        paddingVertical: 15,
+    },
+    popupContainer: {
+        flexDirection: 'column',
+        alignItems: 'center',
+        width: '120%',
+    },
+    closeIcon: {
+        position: 'absolute',
+        right: 0,
+        top: -30,
+    },
+});
+export default PopupCreateSession;
+//# sourceMappingURL=PopupCreateSession.js.map

package/lib/sessions/components/alerts/PopupCreateSession.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PopupCreateSession.js","sourceRoot":"","sources":["../../../../src/sessions/components/alerts/PopupCreateSession.js"],"names":[],"mappings":"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"}

package/lib/sessions/components/alerts/PopupEditSession.d.ts

@@ -0,0 +1,8 @@
+export default PopupEditSession;
+declare function PopupEditSession({ session, sessionList, popupIsOpen, handleClose, showUrlInput, }: {
+    session: any;
+    sessionList: any;
+    popupIsOpen: any;
+    handleClose: any;
+    showUrlInput: any;
+}): JSX.Element;