mode releaseAccess logic into ReleaseAccessModal (#822)

openziti · Jan 24, 2025 · 7df7141 · 7df7141
1 parent a6bd682
commit 7df7141
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 25 deletions.
diff --git a/ui100/src/AccessPanel.tsx b/ui100/src/AccessPanel.tsx
@@ -25,24 +25,6 @@ const AccessPanel = ({ access }: AccessPanelProps) => {
         setReleaseAccessOpen(false);
     }
 
-    const releaseAccess = () => {
-        if(detail && detail.token) {
-            let cfg = new Configuration({
-                headers: {
-                    "X-TOKEN": user.token
-                }
-            });
-            let shareApi = new ShareApi(cfg);
-            shareApi.unaccess({body: {frontendToken: detail.token, envZId: access.data.envZId as string, shrToken: detail.shrToken}})
-                .then(d => {
-                    setReleaseAccessOpen(false);
-                })
-                .catch(e => {
-                    console.log("releaseAccess", e);
-                });
-        }
-    }
-
     useEffect(() => {
         let cfg = new Configuration({
             headers: {
@@ -98,7 +80,7 @@ const AccessPanel = ({ access }: AccessPanelProps) => {
                     </Grid2>
                 </Grid2>
             </Typography>
-            <ReleaseAccessModal close={closeReleaseAccess} isOpen={releaseAccessOpen} detail={detail} action={releaseAccess} />
+            <ReleaseAccessModal close={closeReleaseAccess} isOpen={releaseAccessOpen} user={user} access={access} detail={detail} />
         </>
     );
 }

diff --git a/ui100/src/ReleaseAccessModal.tsx b/ui100/src/ReleaseAccessModal.tsx
@@ -1,16 +1,19 @@
-import {Frontend} from "./api";
+import {Configuration, Frontend, ShareApi} from "./api";
 import {useEffect, useRef, useState} from "react";
 import {Box, Button, Checkbox, FormControlLabel, Grid2, Modal, Typography} from "@mui/material";
 import {modalStyle} from "./styling/theme.ts";
+import {User} from "./model/user.ts";
+import {Node} from "@xyflow/react";
 
 interface ReleaseAccessProps {
     close: () => void;
     isOpen: boolean;
+    user: User;
+    access: Node;
     detail: Frontend;
-    action: () => void;
 }
 
-const ReleaseAccessModal = ({ close, isOpen, detail, action }: ReleaseAccessProps) => {
+const ReleaseAccessModal = ({ close, isOpen, user, access, detail }: ReleaseAccessProps) => {
     const [feToken, setFeToken] = useState<String>("");
     const [checked, setChecked] = useState<boolean>(false);
     const checkedRef = useRef<boolean>(checked);
@@ -29,6 +32,26 @@ const ReleaseAccessModal = ({ close, isOpen, detail, action }: ReleaseAccessProp
         }
     }, [detail]);
 
+    const releaseAccess = () => {
+        if(detail && detail.token) {
+            let cfg = new Configuration({
+                headers: {
+                    "X-TOKEN": user.token
+                }
+            });
+            let shareApi = new ShareApi(cfg);
+            shareApi.unaccess({body: {frontendToken: detail.token, envZId: access.data.envZId as string, shrToken: detail.shrToken}})
+                .then(d => {
+                    close();
+                })
+                .catch(e => {
+                    e.response.json().then(ex => {
+                        console.log("releaseAccess", ex.message);
+                    });
+                });
+        }
+    }
+
     return (
         <Modal open={isOpen} onClose={close}>
             <Box sx={{ ...modalStyle }}>
@@ -42,7 +65,7 @@ const ReleaseAccessModal = ({ close, isOpen, detail, action }: ReleaseAccessProp
                     <FormControlLabel control={<Checkbox checked={checked} onChange={toggleChecked} />} label={<p>I confirm the release of <code>{feToken}</code></p>} sx={{ mt: 2 }} />
                 </Grid2>
                 <Grid2 container sx={{ flexGrow: 1 }} alignItems="center">
-                    <Button color="error" variant="contained" disabled={!checked} onClick={action}>Release</Button>
+                    <Button color="error" variant="contained" disabled={!checked} onClick={releaseAccess}>Release</Button>
                 </Grid2>
             </Box>
         </Modal>

diff --git a/ui100/src/ReleaseEnvironmentModal.tsx b/ui100/src/ReleaseEnvironmentModal.tsx
@@ -49,7 +49,7 @@ const ReleaseEnvironmentModal = ({ close, isOpen, user, environment, detail }: R
                 .catch(e => {
                     e.response.json().then(ex => {
                         console.log("releaseEnvironment", ex.message);
-                    })
+                    });
                 });
         }
     }

diff --git a/ui100/src/ReleaseShareModal.tsx b/ui100/src/ReleaseShareModal.tsx
@@ -46,7 +46,9 @@ const ReleaseShareModal = ({ close, isOpen, user, share, detail }: ReleaseShareP
                     close();
                 })
                 .catch(e => {
-                    console.log("releaseShare", e);
+                    e.response.json().then(ex => {
+                        console.log("releaseShare", ex.message);
+                    });
                 });
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     .catch(e => {
                         e.response.json().then(ex => {
                             console.log("releaseEnvironment", ex.message);
-                        })
+                        });
                     });
             }
         }
@@ Expand Down @@