banquise/intra-front
13
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

WIP: update: adaptations to use the new backend #1

Draft
arthur.wambst wants to merge 21 commits from dev into master
pull from: dev
merge into: banquise:master
Conversation 0 Commits 21 Files Changed 18 +22 -2
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e0b950f1c4 - Show all commits

24
src/pages/Immersion.tsx
View File

@ -13,6 +13,7 @@ function Immersion() {
const [allInstances, setAllInstances] = useState<Instance[]>([]); const [allInstances, setAllInstances] = useState<Instance[]>([]);
const [instancesStatus, setInstancesStatus] = useState<Record<number, string>>({}); const [instancesStatus, setInstancesStatus] = useState<Record<number, string>>({});
const [containerStatus, setContainerStatus] = useState<string>(""); const [containerStatus, setContainerStatus] = useState<string>("");
const [instancesOwner, setInstancesOwner] = useState<string>("");
const username = localStorage.getItem("username"); const username = localStorage.getItem("username");
const copyText = (copy: string) => { const copyText = (copy: string) => {
@ -35,6 +36,21 @@ function Immersion() {
}); });
}, [id]); }, [id]);
useEffect(() => {
axios.get(`/api/ji/${id}/all-instances`).then((res) => {
setAllInstances(res.data);
// Récupérer l owner de chaque instance
res.data.forEach((inst: Instance) => {
axios.get(`/api/ji/${id}/instance-owner?instId=${inst.id}`).then((ownerRes) => {
setInstancesOwner(prev => ({
...prev,
[inst.id]: ownerRes.data
}));
});
});
});
}, [id]);
useEffect(() => { useEffect(() => {
axios.get(`/api/ji/${id}/all-instances`).then((res) => { axios.get(`/api/ji/${id}/all-instances`).then((res) => {
setAllInstances(res.data); setAllInstances(res.data);
@ -328,7 +344,11 @@ function Immersion() {
<td className="p-4">{index + 1}</td> <td className="p-4">{index + 1}</td>
<td className="p-4">{inst.name}</td> <td className="p-4">{inst.name}</td>
<td className="p-4">{inst.port}</td> <td className="p-4">{inst.port}</td>
<td className="p-4">{username}</td> <td className="p-4">
<span className="badge badge-primary">
{instancesOwner[inst.id] || "Loading..."}
</span>
</td>
<td className="p-4"> <td className="p-4">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<span className="font-mono">{inst.password}</span> <span className="font-mono">{inst.password}</span>
@ -349,7 +369,7 @@ function Immersion() {
<div className="flex gap-2"> <div className="flex gap-2">
<button <button
className="btn btn-sm btn-primary" className="btn btn-sm btn-primary"
onClick={() => copyText(`ssh -p ${inst.port} ${username}@la-banquise.fr`)} onClick={() => copyText(`ssh -p ${inst.port} ${instancesOwner[inst.id] || "Loading..."}@la-banquise.fr`)}
> >
Copy SSH Copy SSH
</button> </button>