Compare commits
21 Commits
5d49ce17a6
...
20250409
| Author | SHA1 | Date | |
|---|---|---|---|
| 3c636406af | |||
| 578f1432a0 | |||
| f403c85f0a | |||
| db25c7e426 | |||
| 98b67534cb | |||
| 09d3cf08f3 | |||
| 9b3d32811f | |||
| 26d391ea96 | |||
| c044996014 | |||
| 34b04968b2 | |||
| c44a3f2673 | |||
| e46adcd1da | |||
| d1506f26ab | |||
| 23194d13d2 | |||
| 131dec892d | |||
| c2e6105aff | |||
| f5202f596d | |||
| 3bf8859ff9 | |||
| 9a905e83f7 | |||
| 4b9df95721 | |||
| e14f51ef7e |
23
.drone.yml
23
.drone.yml
@@ -12,6 +12,7 @@ steps:
|
||||
commands:
|
||||
- cd virtweb_frontend
|
||||
- npm install --legacy-peer-deps # TODO : remove when mui-file-input is updated
|
||||
- npm run lint
|
||||
- npm run build
|
||||
- mv dist /tmp/web_build
|
||||
|
||||
@@ -35,6 +36,8 @@ steps:
|
||||
path: /usr/local/cargo/registry
|
||||
- name: web_app
|
||||
path: /tmp/web_build
|
||||
- name: release
|
||||
path: /tmp/release
|
||||
depends_on:
|
||||
- backend_check
|
||||
- web_build
|
||||
@@ -44,10 +47,30 @@ steps:
|
||||
- mv /tmp/web_build/dist static
|
||||
- cargo build --release
|
||||
- ls -lah target/release/virtweb_backend
|
||||
- cp target/release/virtweb_backend /tmp/release
|
||||
|
||||
- name: gitea_release
|
||||
image: plugins/gitea-release
|
||||
depends_on:
|
||||
- backend_compile
|
||||
when:
|
||||
event:
|
||||
- tag
|
||||
volumes:
|
||||
- name: release
|
||||
path: /tmp/release
|
||||
environment:
|
||||
PLUGIN_API_KEY:
|
||||
from_secret: API_KEY
|
||||
settings:
|
||||
base_url: https://gitea.communiquons.org
|
||||
files: /tmp/release/*
|
||||
checksum: sha512
|
||||
|
||||
volumes:
|
||||
- name: rust_registry
|
||||
temp: {}
|
||||
- name: web_app
|
||||
temp: {}
|
||||
- name: release
|
||||
temp: {}
|
||||
|
||||
@@ -1,9 +1,3 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"packageRules": [
|
||||
{
|
||||
"matchUpdateTypes": ["major", "minor", "patch"],
|
||||
"automerge": true
|
||||
}
|
||||
]
|
||||
"extends": ["local>renovate/presets"]
|
||||
}
|
||||
10
virtweb_backend/Cargo.lock
generated
10
virtweb_backend/Cargo.lock
generated
@@ -590,15 +590,15 @@ checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
|
||||
|
||||
[[package]]
|
||||
name = "basic-jwt"
|
||||
version = "0.2.0"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "741afb780192f091b1ceebdc794540a956f3eb96628939f83c5d15e0cb98fa71"
|
||||
checksum = "1b87da415ea2a5c22d90143d39a2db6c0c910d3d01bfd19d0f50369de91215f0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"elliptic-curve",
|
||||
"jsonwebtoken",
|
||||
"p384",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"serde",
|
||||
]
|
||||
|
||||
@@ -3261,9 +3261,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sysinfo"
|
||||
version = "0.34.0"
|
||||
version = "0.34.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "36913edff7a70c19d204c379e484b2a04d121fbb4e68bebc9fea651eb4386397"
|
||||
checksum = "a4b93974b3d3aeaa036504b8eefd4c039dced109171c1ae973f1dc63b2c7e4b2"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"memchr",
|
||||
|
||||
@@ -6,7 +6,7 @@ edition = "2024"
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
log = "0.4.26"
|
||||
log = "0.4.27"
|
||||
env_logger = "0.11.7"
|
||||
clap = { version = "4.5.34", features = ["derive", "env"] }
|
||||
light-openid = { version = "1.0.4", features = ["crypto-wrapper"] }
|
||||
@@ -22,7 +22,7 @@ actix-ws = "0.3.0"
|
||||
actix-http = "3.10.0"
|
||||
serde = { version = "1.0.219", features = ["derive"] }
|
||||
serde_json = "1.0.140"
|
||||
quick-xml = { version = "0.37.2", features = ["serialize", "overlapped-lists"] }
|
||||
quick-xml = { version = "0.37.3", features = ["serialize", "overlapped-lists"] }
|
||||
futures-util = "0.3.31"
|
||||
anyhow = "1.0.97"
|
||||
actix-multipart = "0.7.2"
|
||||
@@ -30,19 +30,19 @@ tempfile = "3.19.1"
|
||||
reqwest = { version = "0.12.15", features = ["stream"] }
|
||||
url = "2.5.4"
|
||||
virt = "0.4.2"
|
||||
sysinfo = { version = "0.34.0", features = ["serde"] }
|
||||
sysinfo = { version = "0.34.2", features = ["serde"] }
|
||||
uuid = { version = "1.16.0", features = ["v4", "serde"] }
|
||||
lazy-regex = "3.4.1"
|
||||
thiserror = "2.0.12"
|
||||
image = "0.25.5"
|
||||
image = "0.25.6"
|
||||
rand = "0.9.0"
|
||||
bytes = "1.10.1"
|
||||
tokio = { version = "1.44.1", features = ["rt", "time", "macros"] }
|
||||
futures = "0.3.31"
|
||||
ipnetwork = { version = "0.21.1", features = ["serde"] }
|
||||
num = "0.4.2"
|
||||
rust-embed = { version = "8.5.0" }
|
||||
num = "0.4.3"
|
||||
rust-embed = { version = "8.6.0" }
|
||||
mime_guess = "2.0.5"
|
||||
dotenvy = "0.15.7"
|
||||
nix = { version = "0.29.0", features = ["net"] }
|
||||
basic-jwt = "0.2.0"
|
||||
basic-jwt = "0.3.0"
|
||||
|
||||
@@ -17,10 +17,11 @@ pub const ROUTES_WITHOUT_AUTH: [&str; 5] = [
|
||||
];
|
||||
|
||||
/// Allowed ISO mimetypes
|
||||
pub const ALLOWED_ISO_MIME_TYPES: [&str; 3] = [
|
||||
pub const ALLOWED_ISO_MIME_TYPES: [&str; 4] = [
|
||||
"application/x-cd-image",
|
||||
"application/x-iso9660-image",
|
||||
"application/octet-stream",
|
||||
"application/vnd.efi.iso",
|
||||
];
|
||||
|
||||
/// ISO max size
|
||||
|
||||
@@ -61,7 +61,7 @@ STORAGE=/home/virtweb/storage
|
||||
HYPERVISOR_URI=qemu:///system
|
||||
```
|
||||
|
||||
> Note: `HYPERVISOR_URI=qemu:///system` is used to sepcify that we want to use the main hypervisor.
|
||||
> Note: `HYPERVISOR_URI=qemu:///system` is used to specify that we want to use the main hypervisor.
|
||||
|
||||
## Register Virtweb service
|
||||
Before registering service, check that the configuration works correctly:
|
||||
|
||||
@@ -1,46 +1,12 @@
|
||||
# Getting Started with Create React App
|
||||
# Virtweb frontend
|
||||
Built with Vite + React + TypeScript
|
||||
|
||||
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
|
||||
## Get dependencies
|
||||
```bash
|
||||
npm install
|
||||
```
|
||||
|
||||
## Available Scripts
|
||||
|
||||
In the project directory, you can run:
|
||||
|
||||
### `npm start`
|
||||
|
||||
Runs the app in the development mode.\
|
||||
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
|
||||
|
||||
The page will reload if you make edits.\
|
||||
You will also see any lint errors in the console.
|
||||
|
||||
### `npm test`
|
||||
|
||||
Launches the test runner in the interactive watch mode.\
|
||||
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
|
||||
|
||||
### `npm run build`
|
||||
|
||||
Builds the app for production to the `build` folder.\
|
||||
It correctly bundles React in production mode and optimizes the build for the best performance.
|
||||
|
||||
The build is minified and the filenames include the hashes.\
|
||||
Your app is ready to be deployed!
|
||||
|
||||
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
|
||||
|
||||
### `npm run eject`
|
||||
|
||||
**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
|
||||
|
||||
If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
|
||||
|
||||
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
|
||||
|
||||
You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
|
||||
|
||||
## Learn More
|
||||
|
||||
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
|
||||
|
||||
To learn React, check out the [React documentation](https://reactjs.org/).
|
||||
# Run for developpment
|
||||
```bash
|
||||
npm run dev
|
||||
```
|
||||
54
virtweb_frontend/eslint.config.js
Normal file
54
virtweb_frontend/eslint.config.js
Normal file
@@ -0,0 +1,54 @@
|
||||
import js from "@eslint/js";
|
||||
import reactDom from "eslint-plugin-react-dom";
|
||||
import reactHooks from "eslint-plugin-react-hooks";
|
||||
import reactRefresh from "eslint-plugin-react-refresh";
|
||||
import reactX from "eslint-plugin-react-x";
|
||||
import globals from "globals";
|
||||
import tseslint from "typescript-eslint";
|
||||
|
||||
export default tseslint.config(
|
||||
{ ignores: ["dist"] },
|
||||
{
|
||||
extends: [
|
||||
js.configs.recommended,
|
||||
...tseslint.configs.strictTypeChecked,
|
||||
...tseslint.configs.stylisticTypeChecked,
|
||||
],
|
||||
files: ["**/*.{ts,tsx}"],
|
||||
languageOptions: {
|
||||
ecmaVersion: 2020,
|
||||
globals: globals.browser,
|
||||
parserOptions: {
|
||||
project: ["./tsconfig.node.json", "./tsconfig.app.json"],
|
||||
tsconfigRootDir: import.meta.dirname,
|
||||
},
|
||||
},
|
||||
plugins: {
|
||||
"react-hooks": reactHooks,
|
||||
"react-refresh": reactRefresh,
|
||||
"react-x": reactX,
|
||||
"react-dom": reactDom,
|
||||
},
|
||||
rules: {
|
||||
...reactHooks.configs.recommended.rules,
|
||||
"react-refresh/only-export-components": [
|
||||
"warn",
|
||||
{ allowConstantExport: true },
|
||||
],
|
||||
...reactX.configs["recommended-typescript"].rules,
|
||||
...reactDom.configs.recommended.rules,
|
||||
"@typescript-eslint/no-non-null-assertion": "off",
|
||||
"@typescript-eslint/no-misused-promises": "off",
|
||||
"@typescript-eslint/no-floating-promises": "off",
|
||||
"@typescript-eslint/restrict-template-expressions": "off",
|
||||
"@typescript-eslint/no-extraneous-class": "off",
|
||||
"@typescript-eslint/no-explicit-any": "off",
|
||||
"@typescript-eslint/no-unsafe-assignment": "off",
|
||||
"@typescript-eslint/no-unsafe-return": "off",
|
||||
"@typescript-eslint/no-unsafe-call": "off",
|
||||
"@typescript-eslint/no-unsafe-member-access": "off",
|
||||
"@typescript-eslint/no-unsafe-argument": "off",
|
||||
"react-refresh/only-export-components": "off",
|
||||
},
|
||||
}
|
||||
);
|
||||
2260
virtweb_frontend/package-lock.json
generated
2260
virtweb_frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -3,6 +3,12 @@
|
||||
"version": "0.1.0",
|
||||
"type": "module",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc -b && vite build",
|
||||
"lint": "eslint .",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.14.0",
|
||||
"@emotion/styled": "^11.14.0",
|
||||
@@ -13,16 +19,6 @@
|
||||
"@mui/material": "^7.0.0",
|
||||
"@mui/x-charts": "^7.28.0",
|
||||
"@mui/x-data-grid": "^7.28.1",
|
||||
"@testing-library/jest-dom": "^6.6.3",
|
||||
"@testing-library/react": "^16.2.0",
|
||||
"@testing-library/user-event": "^14.5.2",
|
||||
"@types/humanize-duration": "^3.27.1",
|
||||
"@types/jest": "^29.5.14",
|
||||
"@types/react": "^19.0.12",
|
||||
"@types/react-dom": "^19.0.4",
|
||||
"@types/react-syntax-highlighter": "^15.5.13",
|
||||
"@types/uuid": "^10.0.0",
|
||||
"@vitejs/plugin-react": "^4.3.3",
|
||||
"date-and-time": "^3.6.0",
|
||||
"filesize": "^10.1.6",
|
||||
"humanize-duration": "^3.29.0",
|
||||
@@ -32,33 +28,26 @@
|
||||
"react-router-dom": "^7.4.0",
|
||||
"react-syntax-highlighter": "^15.6.1",
|
||||
"react-vnc": "^3.0.7",
|
||||
"typescript": "^5.8.2",
|
||||
"uuid": "^11.1.0",
|
||||
"vite": "^6.2.3",
|
||||
"vite-tsconfig-paths": "^5.1.3",
|
||||
"xml-formatter": "^3.6.0"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "vite",
|
||||
"build": "tsc && vite build",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": [
|
||||
"react-app",
|
||||
"react-app/jest"
|
||||
]
|
||||
},
|
||||
"browserslist": {
|
||||
"production": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not op_mini all"
|
||||
],
|
||||
"development": [
|
||||
"last 1 chrome version",
|
||||
"last 1 firefox version",
|
||||
"last 1 safari version"
|
||||
]
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.21.0",
|
||||
"@types/humanize-duration": "^3.27.1",
|
||||
"@types/jest": "^29.5.14",
|
||||
"@types/react": "^19.0.12",
|
||||
"@types/react-dom": "^19.0.4",
|
||||
"@types/react-syntax-highlighter": "^15.5.13",
|
||||
"@types/uuid": "^10.0.0",
|
||||
"@vitejs/plugin-react": "^4.3.4",
|
||||
"eslint": "^9.21.0",
|
||||
"eslint-plugin-react-dom": "^1.38.3",
|
||||
"eslint-plugin-react-hooks": "^5.1.0",
|
||||
"eslint-plugin-react-refresh": "^0.4.19",
|
||||
"eslint-plugin-react-x": "^1.38.3",
|
||||
"globals": "^15.15.0",
|
||||
"typescript": "^5.8.2",
|
||||
"typescript-eslint": "^8.24.1",
|
||||
"vite": "^6.2.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,7 +51,10 @@ export function App() {
|
||||
|
||||
const context: AuthContext = {
|
||||
signedIn: signedIn,
|
||||
setSignedIn: (s) => setSignedIn(s),
|
||||
setSignedIn: (s) => {
|
||||
setSignedIn(s);
|
||||
location.reload();
|
||||
},
|
||||
};
|
||||
|
||||
const router = createBrowserRouter(
|
||||
@@ -97,12 +100,12 @@ export function App() {
|
||||
);
|
||||
|
||||
return (
|
||||
<AuthContextK.Provider value={context}>
|
||||
<AuthContextK value={context}>
|
||||
<RouterProvider router={router} />
|
||||
</AuthContextK.Provider>
|
||||
</AuthContextK>
|
||||
);
|
||||
}
|
||||
|
||||
export function useAuth(): AuthContext {
|
||||
return React.useContext(AuthContextK)!;
|
||||
return React.use(AuthContextK)!;
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ export class APIClient {
|
||||
* Get backend URL
|
||||
*/
|
||||
static backendURL(): string {
|
||||
const URL = import.meta.env.VITE_APP_BACKEND ?? "";
|
||||
const URL = String(import.meta.env.VITE_APP_BACKEND ?? "");
|
||||
if (URL.length === 0) throw new Error("Backend URL undefined!");
|
||||
return URL;
|
||||
}
|
||||
@@ -44,7 +44,7 @@ export class APIClient {
|
||||
*/
|
||||
static async exec(args: RequestParams): Promise<APIResponse> {
|
||||
let body: string | undefined | FormData = undefined;
|
||||
let headers: any = {};
|
||||
const headers: any = {};
|
||||
|
||||
// JSON request
|
||||
if (args.jsonData) {
|
||||
@@ -66,22 +66,25 @@ export class APIClient {
|
||||
if (args.upProgress) {
|
||||
const res: XMLHttpRequest = await new Promise((resolve, reject) => {
|
||||
const xhr = new XMLHttpRequest();
|
||||
xhr.upload.addEventListener("progress", (e) =>
|
||||
args.upProgress!(e.loaded / e.total)
|
||||
);
|
||||
xhr.addEventListener("load", () => resolve(xhr));
|
||||
xhr.addEventListener("error", () =>
|
||||
reject(new Error("File upload failed"))
|
||||
);
|
||||
xhr.addEventListener("abort", () =>
|
||||
reject(new Error("File upload aborted"))
|
||||
);
|
||||
xhr.addEventListener("timeout", () =>
|
||||
reject(new Error("File upload timeout"))
|
||||
);
|
||||
xhr.upload.addEventListener("progress", (e) => {
|
||||
args.upProgress!(e.loaded / e.total);
|
||||
});
|
||||
xhr.addEventListener("load", () => {
|
||||
resolve(xhr);
|
||||
});
|
||||
xhr.addEventListener("error", () => {
|
||||
reject(new Error("File upload failed"));
|
||||
});
|
||||
xhr.addEventListener("abort", () => {
|
||||
reject(new Error("File upload aborted"));
|
||||
});
|
||||
xhr.addEventListener("timeout", () => {
|
||||
reject(new Error("File upload timeout"));
|
||||
});
|
||||
xhr.open(args.method, url, true);
|
||||
xhr.withCredentials = true;
|
||||
for (const key in headers) {
|
||||
// eslint-disable-next-line no-prototype-builtins
|
||||
if (headers.hasOwnProperty(key))
|
||||
xhr.setRequestHeader(key, headers[key]);
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ export interface NWFilter {
|
||||
rules: NWFilterRule[];
|
||||
}
|
||||
|
||||
export function NWFilterURL(n: NWFilter, edit: boolean = false): string {
|
||||
export function NWFilterURL(n: NWFilter, edit = false): string {
|
||||
return `/nwfilter/${n.uuid}${edit ? "/edit" : ""}`;
|
||||
}
|
||||
|
||||
@@ -221,7 +221,7 @@ export class NWFilterApi {
|
||||
static async Delete(n: NWFilter): Promise<void> {
|
||||
await APIClient.exec({
|
||||
method: "DELETE",
|
||||
uri: `/nwfilter/${n.uuid}`,
|
||||
uri: `/nwfilter/${n.uuid!}`,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ export interface NetworkInfo {
|
||||
|
||||
export type NetworkStatus = "Started" | "Stopped";
|
||||
|
||||
export function NetworkURL(n: NetworkInfo, edit: boolean = false): string {
|
||||
export function NetworkURL(n: NetworkInfo, edit = false): string {
|
||||
return `/net/${n.uuid}${edit ? "/edit" : ""}`;
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ export interface APIToken {
|
||||
max_inactivity?: number;
|
||||
}
|
||||
|
||||
export function APITokenURL(t: APIToken, edit: boolean = false): string {
|
||||
export function APITokenURL(t: APIToken, edit = false): string {
|
||||
return `/token/${t.id}${edit ? "/edit" : ""}`;
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ export function AlertDialogProvider(p: PropsWithChildren): React.ReactElement {
|
||||
|
||||
return (
|
||||
<>
|
||||
<AlertContextK.Provider value={hook}>{p.children}</AlertContextK.Provider>
|
||||
<AlertContextK value={hook}>{p.children}</AlertContextK>
|
||||
|
||||
<Dialog
|
||||
open={open}
|
||||
@@ -67,5 +67,5 @@ export function AlertDialogProvider(p: PropsWithChildren): React.ReactElement {
|
||||
}
|
||||
|
||||
export function useAlert(): AlertContext {
|
||||
return React.useContext(AlertContextK)!;
|
||||
return React.use(AlertContextK)!;
|
||||
}
|
||||
|
||||
@@ -59,13 +59,13 @@ export function ConfirmDialogProvider(
|
||||
|
||||
return (
|
||||
<>
|
||||
<ConfirmContextK.Provider value={hook}>
|
||||
<ConfirmContextK value={hook}>
|
||||
{p.children}
|
||||
</ConfirmContextK.Provider>
|
||||
</ConfirmContextK>
|
||||
|
||||
<Dialog
|
||||
open={open}
|
||||
onClose={() => handleClose(false)}
|
||||
onClose={() => { handleClose(false); }}
|
||||
aria-labelledby="alert-dialog-title"
|
||||
aria-describedby="alert-dialog-description"
|
||||
>
|
||||
@@ -76,10 +76,10 @@ export function ConfirmDialogProvider(
|
||||
</DialogContentText>
|
||||
</DialogContent>
|
||||
<DialogActions>
|
||||
<Button onClick={() => handleClose(false)} autoFocus>
|
||||
<Button onClick={() => { handleClose(false); }} autoFocus>
|
||||
{cancelButton ?? "Cancel"}
|
||||
</Button>
|
||||
<Button onClick={() => handleClose(true)} color="error">
|
||||
<Button onClick={() => { handleClose(true); }} color="error">
|
||||
{confirmButton ?? "Confirm"}
|
||||
</Button>
|
||||
</DialogActions>
|
||||
@@ -89,5 +89,5 @@ export function ConfirmDialogProvider(
|
||||
}
|
||||
|
||||
export function useConfirm(): ConfirmContext {
|
||||
return React.useContext(ConfirmContextK)!;
|
||||
return React.use(ConfirmContextK)!;
|
||||
}
|
||||
|
||||
@@ -6,10 +6,10 @@ import {
|
||||
} from "@mui/material";
|
||||
import React, { PropsWithChildren } from "react";
|
||||
|
||||
type LoadingMessageContext = {
|
||||
interface LoadingMessageContext {
|
||||
show: (message: string) => void;
|
||||
hide: () => void;
|
||||
};
|
||||
}
|
||||
|
||||
const LoadingMessageContextK =
|
||||
React.createContext<LoadingMessageContext | null>(null);
|
||||
@@ -34,9 +34,9 @@ export function LoadingMessageProvider(
|
||||
|
||||
return (
|
||||
<>
|
||||
<LoadingMessageContextK.Provider value={hook}>
|
||||
<LoadingMessageContextK value={hook}>
|
||||
{p.children}
|
||||
</LoadingMessageContextK.Provider>
|
||||
</LoadingMessageContextK>
|
||||
|
||||
<Dialog open={open}>
|
||||
<DialogContent>
|
||||
@@ -60,5 +60,5 @@ export function LoadingMessageProvider(
|
||||
}
|
||||
|
||||
export function useLoadingMessage(): LoadingMessageContext {
|
||||
return React.useContext(LoadingMessageContextK)!;
|
||||
return React.use(LoadingMessageContextK)!;
|
||||
}
|
||||
|
||||
@@ -24,9 +24,9 @@ export function SnackbarProvider(p: PropsWithChildren): React.ReactElement {
|
||||
|
||||
return (
|
||||
<>
|
||||
<SnackbarContextK.Provider value={hook}>
|
||||
<SnackbarContextK value={hook}>
|
||||
{p.children}
|
||||
</SnackbarContextK.Provider>
|
||||
</SnackbarContextK>
|
||||
|
||||
<Snackbar
|
||||
open={open}
|
||||
@@ -39,5 +39,5 @@ export function SnackbarProvider(p: PropsWithChildren): React.ReactElement {
|
||||
}
|
||||
|
||||
export function useSnackbar(): SnackbarContext {
|
||||
return React.useContext(SnackbarContextK)!;
|
||||
return React.use(SnackbarContextK)!;
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ const darkTheme = createTheme({
|
||||
});
|
||||
|
||||
const root = ReactDOM.createRoot(
|
||||
document.getElementById("root") as HTMLElement
|
||||
document.getElementById("root")!
|
||||
);
|
||||
root.render(
|
||||
<React.StrictMode>
|
||||
|
||||
@@ -116,7 +116,7 @@ function EditApiTokenRouteInner(p: {
|
||||
const [changed, setChanged] = React.useState(false);
|
||||
|
||||
const [, updateState] = React.useState<any>();
|
||||
const forceUpdate = React.useCallback(() => updateState({}), []);
|
||||
const forceUpdate = React.useCallback(() => { updateState({}); }, []);
|
||||
|
||||
const valueChanged = () => {
|
||||
setChanged(true);
|
||||
|
||||
@@ -99,7 +99,7 @@ function EditNetworkFilterRouteInner(p: {
|
||||
const [changed, setChanged] = React.useState(false);
|
||||
|
||||
const [, updateState] = React.useState<any>();
|
||||
const forceUpdate = React.useCallback(() => updateState({}), []);
|
||||
const forceUpdate = React.useCallback(() => { updateState({}); }, []);
|
||||
|
||||
const valueChanged = () => {
|
||||
setChanged(true);
|
||||
|
||||
@@ -97,7 +97,7 @@ function EditNetworkRouteInner(p: {
|
||||
const [changed, setChanged] = React.useState(false);
|
||||
|
||||
const [, updateState] = React.useState<any>();
|
||||
const forceUpdate = React.useCallback(() => updateState({}), []);
|
||||
const forceUpdate = React.useCallback(() => { updateState({}); }, []);
|
||||
|
||||
const valueChanged = () => {
|
||||
setChanged(true);
|
||||
|
||||
@@ -15,7 +15,7 @@ export function CreateVMRoute(): React.ReactElement {
|
||||
const alert = useAlert();
|
||||
const navigate = useNavigate();
|
||||
|
||||
const [vm, setVM] = React.useState(VMInfo.NewEmpty);
|
||||
const [vm, setVM] = React.useState(VMInfo.NewEmpty());
|
||||
|
||||
const create = async (v: VMInfo) => {
|
||||
try {
|
||||
@@ -103,7 +103,9 @@ function EditVMInner(p: {
|
||||
const [changed, setChanged] = React.useState(false);
|
||||
|
||||
const [, updateState] = React.useState<any>();
|
||||
const forceUpdate = React.useCallback(() => updateState({}), []);
|
||||
const forceUpdate = React.useCallback(() => {
|
||||
updateState({});
|
||||
}, []);
|
||||
|
||||
const valueChanged = () => {
|
||||
setChanged(true);
|
||||
|
||||
@@ -96,7 +96,7 @@ function UploadIsoFileCard(p: {
|
||||
p.onFileUploaded();
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
await alert("Failed to perform file upload! " + e);
|
||||
await alert(`Failed to perform file upload! ${e}`);
|
||||
}
|
||||
|
||||
setUploadProgress(null);
|
||||
@@ -120,7 +120,9 @@ function UploadIsoFileCard(p: {
|
||||
value={value}
|
||||
onChange={handleChange}
|
||||
style={{ flex: 1 }}
|
||||
inputProps={{ accept: ServerApi.Config.iso_mimetypes.join(",") }}
|
||||
slotProps={{
|
||||
htmlInput: { accept: ServerApi.Config.iso_mimetypes.join(",") },
|
||||
}}
|
||||
/>
|
||||
|
||||
{value && <Button onClick={upload}>Upload file</Button>}
|
||||
@@ -147,6 +149,8 @@ function UploadIsoFileFromUrlCard(p: {
|
||||
loadingMessage.show("Downloading file from URL...");
|
||||
await IsoFilesApi.UploadFromURL(url, actualFileName);
|
||||
|
||||
p.onFileUploaded();
|
||||
|
||||
setURL("");
|
||||
setFilename(null);
|
||||
snackbar("Successfully downloaded file!");
|
||||
@@ -164,14 +168,18 @@ function UploadIsoFileFromUrlCard(p: {
|
||||
label="URL"
|
||||
value={url}
|
||||
style={{ flex: 3 }}
|
||||
onChange={(e) => setURL(e.target.value)}
|
||||
onChange={(e) => {
|
||||
setURL(e.target.value);
|
||||
}}
|
||||
/>
|
||||
<span style={{ width: "10px" }}></span>
|
||||
<TextField
|
||||
label="Filename"
|
||||
value={actualFileName}
|
||||
style={{ flex: 2 }}
|
||||
onChange={(e) => setFilename(e.target.value)}
|
||||
onChange={(e) => {
|
||||
setFilename(e.target.value);
|
||||
}}
|
||||
/>
|
||||
{url !== "" && actualFileName !== "" && (
|
||||
<Button onClick={upload}>Upload file</Button>
|
||||
@@ -198,7 +206,7 @@ function IsoFilesList(p: {
|
||||
try {
|
||||
const blob = await IsoFilesApi.Download(entry, setDlProgress);
|
||||
|
||||
await downloadBlob(blob, entry.filename);
|
||||
downloadBlob(blob, entry.filename);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
alert("Failed to download iso file!");
|
||||
@@ -236,7 +244,7 @@ function IsoFilesList(p: {
|
||||
</Typography>
|
||||
);
|
||||
|
||||
const columns: GridColDef[] = [
|
||||
const columns: GridColDef<IsoFile>[] = [
|
||||
{ field: "filename", headerName: "File name", flex: 3 },
|
||||
{
|
||||
field: "size",
|
||||
@@ -301,7 +309,6 @@ function IsoFilesList(p: {
|
||||
getRowId={(c) => c.filename}
|
||||
rows={p.list}
|
||||
columns={columns}
|
||||
autoHeight={true}
|
||||
/>
|
||||
</VirtWebPaper>
|
||||
</>
|
||||
|
||||
@@ -66,7 +66,7 @@ function NetworkFiltersListRouteInner(p: {
|
||||
const onlyBuiltin = visibleFilters === VisibleFilters.Builtin;
|
||||
|
||||
return p.list.filter((f) => NWFilterIsBuiltin(f) === onlyBuiltin);
|
||||
}, [visibleFilters]);
|
||||
}, [visibleFilters, p.list]);
|
||||
|
||||
return (
|
||||
<VirtWebRouteContainer
|
||||
@@ -78,7 +78,9 @@ function NetworkFiltersListRouteInner(p: {
|
||||
size="small"
|
||||
value={visibleFilters}
|
||||
exclusive
|
||||
onChange={(_ev, v) => setVisibleFilters(v)}
|
||||
onChange={(_ev, v) => {
|
||||
setVisibleFilters(v);
|
||||
}}
|
||||
aria-label="visible filters"
|
||||
>
|
||||
<ToggleButton value={VisibleFilters.All}>All</ToggleButton>
|
||||
@@ -130,8 +132,8 @@ function NetworkFiltersListRouteInner(p: {
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<ul>
|
||||
{t.join_filters.map((f, n) => (
|
||||
<li key={n}>{f}</li>
|
||||
{t.join_filters.map((f) => (
|
||||
<li key={f}>{f}</li>
|
||||
))}
|
||||
</ul>
|
||||
</TableCell>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable react-x/no-array-index-key */
|
||||
import {
|
||||
mdiHarddisk,
|
||||
mdiInformation,
|
||||
@@ -236,7 +237,7 @@ export function SysInfoRouteInner(p: {
|
||||
function SysInfoDetailsTable(p: {
|
||||
label: string;
|
||||
icon: React.ReactElement;
|
||||
entries: Array<{ label: string; value: string | number }>;
|
||||
entries: { label: string; value: string | number }[];
|
||||
}): React.ReactElement {
|
||||
return (
|
||||
<VirtWebPaper
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable react-x/no-array-index-key */
|
||||
import VisibilityIcon from "@mui/icons-material/Visibility";
|
||||
import {
|
||||
Button,
|
||||
@@ -99,9 +100,9 @@ export function TokensListRouteInner(p: {
|
||||
{t.max_inactivity && timeDiff(0, t.max_inactivity)}
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
{t.rights.map((r) => {
|
||||
{t.rights.map((r, n) => {
|
||||
return (
|
||||
<div>
|
||||
<div key={n}>
|
||||
{r.verb} {r.path}
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -25,13 +25,13 @@ import { VirtWebRouteContainer } from "../widgets/VirtWebRouteContainer";
|
||||
import { VMStatusWidget } from "../widgets/vms/VMStatusWidget";
|
||||
|
||||
export function VMListRoute(): React.ReactElement {
|
||||
const [groups, setGroups] = React.useState<Array<string | undefined>>();
|
||||
const [groups, setGroups] = React.useState<(string | undefined)[]>();
|
||||
const [list, setList] = React.useState<VMInfo[] | undefined>();
|
||||
|
||||
const loadKey = React.useRef(1);
|
||||
|
||||
const load = async () => {
|
||||
const groups: Array<string | undefined> = await GroupApi.GetList();
|
||||
const groups: (string | undefined)[] = await GroupApi.GetList();
|
||||
const list = await VMApi.GetList();
|
||||
|
||||
if (list.find((v) => !v.group) !== undefined) groups.push(undefined);
|
||||
@@ -70,7 +70,7 @@ export function VMListRoute(): React.ReactElement {
|
||||
}
|
||||
|
||||
function VMListWidget(p: {
|
||||
groups: Array<string | undefined>;
|
||||
groups: (string | undefined)[];
|
||||
list: VMInfo[];
|
||||
onReload: () => void;
|
||||
}): React.ReactElement {
|
||||
@@ -115,8 +115,8 @@ function VMListWidget(p: {
|
||||
</TableRow>
|
||||
</TableHead>
|
||||
<TableBody>
|
||||
{p.groups.map((g, num) => (
|
||||
<React.Fragment key={num}>
|
||||
{p.groups.map((g) => (
|
||||
<React.Fragment key={g}>
|
||||
{p.groups.length > 1 && (
|
||||
<TableRow>
|
||||
<TableCell
|
||||
@@ -125,9 +125,11 @@ function VMListWidget(p: {
|
||||
>
|
||||
<IconButton
|
||||
size="small"
|
||||
onClick={() => toggleHiddenGroup(g)}
|
||||
onClick={() => {
|
||||
toggleHiddenGroup(g);
|
||||
}}
|
||||
>
|
||||
{!hiddenGroups?.has(g) ? (
|
||||
{!hiddenGroups.has(g) ? (
|
||||
<KeyboardArrowUpIcon />
|
||||
) : (
|
||||
<KeyboardArrowDownIcon />
|
||||
@@ -157,7 +159,9 @@ function VMListWidget(p: {
|
||||
<TableCell>
|
||||
<VMStatusWidget
|
||||
vm={row}
|
||||
onChange={(s) => updateVMState(row, s)}
|
||||
onChange={(s) => {
|
||||
updateVMState(row, s);
|
||||
}}
|
||||
/>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
|
||||
@@ -44,8 +44,8 @@ function VNCInner(p: { vm: VMInfo }): React.ReactElement {
|
||||
const [counter, setCounter] = React.useState(1);
|
||||
const [connected, setConnected] = React.useState(false);
|
||||
|
||||
const vncRef = React.createRef<HTMLDivElement>();
|
||||
const vncScreenRef = React.createRef<VncScreenHandle>();
|
||||
const vncRef = React.useRef<HTMLDivElement>(null);
|
||||
const vncScreenRef = React.useRef<VncScreenHandle>(null);
|
||||
|
||||
const connect = async (force: boolean) => {
|
||||
try {
|
||||
@@ -91,7 +91,9 @@ function VNCInner(p: { vm: VMInfo }): React.ReactElement {
|
||||
connect(false);
|
||||
|
||||
if (vncRef.current) {
|
||||
vncRef.current.onfullscreenchange = () => setCounter(counter + 1);
|
||||
vncRef.current.onfullscreenchange = () => {
|
||||
setCounter(counter + 1);
|
||||
};
|
||||
}
|
||||
});
|
||||
|
||||
@@ -140,10 +142,12 @@ function VNCInner(p: { vm: VMInfo }): React.ReactElement {
|
||||
ref={vncScreenRef}
|
||||
url={token.url}
|
||||
onDisconnect={() => {
|
||||
console.info("VNC disconnected " + token?.url);
|
||||
console.info("VNC disconnected " + token.url);
|
||||
disconnected();
|
||||
}}
|
||||
onConnect={() => setConnected(true)}
|
||||
onConnect={() => {
|
||||
setConnected(true);
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -36,7 +36,7 @@ export function LoginRoute(): React.ReactElement {
|
||||
const canSubmit = username.length > 0 && password.length > 0;
|
||||
|
||||
const [showPassword, setShowPassword] = React.useState(false);
|
||||
const handleClickShowPassword = () => setShowPassword((show) => !show);
|
||||
const handleClickShowPassword = () => { setShowPassword((show) => !show); };
|
||||
|
||||
const handleMouseDownPassword = (
|
||||
event: React.MouseEvent<HTMLButtonElement>
|
||||
@@ -105,7 +105,7 @@ export function LoginRoute(): React.ReactElement {
|
||||
label="Username"
|
||||
name="username"
|
||||
value={username}
|
||||
onChange={(e) => setUsername(e.target.value)}
|
||||
onChange={(e) => { setUsername(e.target.value); }}
|
||||
autoComplete="username"
|
||||
autoFocus
|
||||
/>
|
||||
@@ -120,7 +120,7 @@ export function LoginRoute(): React.ReactElement {
|
||||
type={showPassword ? "text" : "password"}
|
||||
id="password"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
onChange={(e) => { setPassword(e.target.value); }}
|
||||
autoComplete="current-password"
|
||||
endAdornment={
|
||||
<InputAdornment position="end">
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
// jest-dom adds custom jest matchers for asserting on DOM nodes.
|
||||
// allows you to do things like:
|
||||
// expect(element).toHaveTextContent(/react/i)
|
||||
// learn more: https://github.com/testing-library/jest-dom
|
||||
import '@testing-library/jest-dom';
|
||||
@@ -1,4 +1,4 @@
|
||||
export async function downloadBlob(blob: Blob, filename: string) {
|
||||
export function downloadBlob(blob: Blob, filename: string) {
|
||||
const url = URL.createObjectURL(blob);
|
||||
|
||||
const link = document.createElement("a");
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
* Generate a random MAC address
|
||||
*/
|
||||
export function randomMacAddress(prefix: string | undefined): string {
|
||||
prefix = prefix ?? "";
|
||||
let mac = "XX:XX:XX:XX:XX:XX";
|
||||
mac = prefix + mac.slice(prefix?.length);
|
||||
mac = prefix + mac.slice(prefix.length);
|
||||
|
||||
return mac.replace(/X/g, () =>
|
||||
"0123456789abcdef".charAt(Math.floor(Math.random() * 16))
|
||||
|
||||
@@ -19,7 +19,7 @@ export function AsyncWidget(p: {
|
||||
}): React.ReactElement {
|
||||
const [state, setState] = useState(State.Loading);
|
||||
|
||||
const counter = useRef<any | null>(null);
|
||||
const counter = useRef<any>(null);
|
||||
|
||||
const load = async () => {
|
||||
try {
|
||||
@@ -67,7 +67,7 @@ export function AsyncWidget(p: {
|
||||
|
||||
<Button onClick={load}>Try again</Button>
|
||||
|
||||
{p.errAdditionalElement && p.errAdditionalElement()}
|
||||
{p.errAdditionalElement?.()}
|
||||
</Box>
|
||||
)
|
||||
);
|
||||
|
||||
@@ -13,11 +13,9 @@ import {
|
||||
List,
|
||||
ListItemButton,
|
||||
ListItemIcon,
|
||||
ListItemSecondaryAction,
|
||||
ListItemText,
|
||||
ListItemText
|
||||
} from "@mui/material";
|
||||
import { Outlet, useLocation } from "react-router-dom";
|
||||
import { isDebug } from "../utils/DebugUtils";
|
||||
import { RouterLink } from "./RouterLink";
|
||||
import { VirtWebAppBar } from "./VirtWebAppBar";
|
||||
|
||||
@@ -96,7 +94,6 @@ function NavLink(p: {
|
||||
icon: React.ReactElement;
|
||||
uri: string;
|
||||
label: string;
|
||||
secondaryAction?: React.ReactElement;
|
||||
}): React.ReactElement {
|
||||
const location = useLocation();
|
||||
return (
|
||||
@@ -104,9 +101,6 @@ function NavLink(p: {
|
||||
<ListItemButton selected={p.uri === location.pathname}>
|
||||
<ListItemIcon>{p.icon}</ListItemIcon>
|
||||
<ListItemText primary={p.label} />
|
||||
{p.secondaryAction && (
|
||||
<ListItemSecondaryAction>{p.secondaryAction}</ListItemSecondaryAction>
|
||||
)}
|
||||
</ListItemButton>
|
||||
</RouterLink>
|
||||
);
|
||||
|
||||
@@ -31,14 +31,16 @@ export function ConfigImportExportButtons(p: {
|
||||
fileEl.click();
|
||||
|
||||
// Wait for a file to be chosen
|
||||
await new Promise((res, _rej) =>
|
||||
fileEl.addEventListener("change", () => res(null))
|
||||
);
|
||||
await new Promise((res) => {
|
||||
fileEl.addEventListener("change", () => {
|
||||
res(null);
|
||||
});
|
||||
});
|
||||
|
||||
if ((fileEl.files?.length ?? 0) === 0) return null;
|
||||
|
||||
// Import conf
|
||||
let file = fileEl.files![0];
|
||||
const file = fileEl.files![0];
|
||||
const content = await file.text();
|
||||
p.importConf?.(JSON.parse(content));
|
||||
} catch (e) {
|
||||
|
||||
@@ -23,7 +23,7 @@ export function StateActionButton<S>(p: {
|
||||
p.onExecuted();
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
alert("Failed to perform action! " + e);
|
||||
alert(`Failed to perform action! ${e}`);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable react-x/no-array-index-key */
|
||||
import { Box, Tab, Tabs } from "@mui/material";
|
||||
|
||||
export interface TabWidgetOption<E> {
|
||||
@@ -24,7 +25,9 @@ export function TabsWidget<E>(p: {
|
||||
<Box sx={{ borderBottom: 1, borderColor: "divider" }}>
|
||||
<Tabs
|
||||
value={currTabIndex}
|
||||
onChange={(_ev, newVal) => updateActiveTab(newVal)}
|
||||
onChange={(_ev, newVal) => {
|
||||
updateActiveTab(newVal);
|
||||
}}
|
||||
>
|
||||
{activeOptions.map((o, index) => (
|
||||
<Tab key={index} label={o.label} style={{ color: o.color }} />
|
||||
|
||||
@@ -17,7 +17,7 @@ export function CheckboxInput(p: {
|
||||
<Checkbox
|
||||
disabled={!p.editable}
|
||||
checked={p.checked}
|
||||
onChange={(e) => p.onValueChange(e.target.checked)}
|
||||
onChange={(e) => { p.onValueChange(e.target.checked); }}
|
||||
/>
|
||||
}
|
||||
label={p.label}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
|
||||
import { Paper, Typography } from "@mui/material";
|
||||
import React, { PropsWithChildren } from "react";
|
||||
import Grid from "@mui/material/Grid";
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable @typescript-eslint/no-unnecessary-condition */
|
||||
import React from "react";
|
||||
import { TextInput } from "./TextInput";
|
||||
|
||||
@@ -32,7 +33,7 @@ export function IPInputWithMask(p: {
|
||||
|
||||
const currValue =
|
||||
p.ipAndMask ??
|
||||
(p.ip ?? "") + (p.mask || showSlash.current ? "/" : "") + (p.mask ?? "");
|
||||
`${p.ip ?? ""}${p.mask || showSlash.current ? "/" : ""}${p.mask ?? ""}`;
|
||||
|
||||
const { onValueChange, ...props } = p;
|
||||
return (
|
||||
@@ -44,7 +45,7 @@ export function IPInputWithMask(p: {
|
||||
return;
|
||||
}
|
||||
|
||||
const split = v?.split("/");
|
||||
const split = v.split("/");
|
||||
const ip =
|
||||
p.version === 4 ? sanitizeIpV4(split[0]) : sanitizeIpV6(split[0]);
|
||||
let mask = undefined;
|
||||
@@ -69,7 +70,7 @@ export function IPInputWithMask(p: {
|
||||
function sanitizeIpV4(s: string | undefined): string | undefined {
|
||||
if (s === "" || s === undefined) return s;
|
||||
|
||||
let split = s.split(".");
|
||||
const split = s.split(".");
|
||||
if (split.length > 4) split.splice(4);
|
||||
|
||||
let needAnotherIteration = false;
|
||||
@@ -106,7 +107,7 @@ function sanitizeIpV6(s: string | undefined): string | undefined {
|
||||
const num = parseInt(e, 16);
|
||||
if (isNaN(num)) return "0";
|
||||
|
||||
let s = num.toString(16);
|
||||
const s = num.toString(16);
|
||||
if (num > 0xffff) {
|
||||
needAnotherIteration = true;
|
||||
return s.slice(0, 4) + ":" + s.slice(4);
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable @typescript-eslint/no-unnecessary-condition */
|
||||
import { TextInput } from "./TextInput";
|
||||
|
||||
export function MACInput(p: {
|
||||
@@ -32,7 +33,7 @@ function sanitizeMacAddress(s: string | undefined): string | undefined {
|
||||
const num = parseInt(e, 16);
|
||||
if (isNaN(num)) return "0";
|
||||
|
||||
let s = num.toString(16).padStart(2, "0");
|
||||
const s = num.toString(16).padStart(2, "0");
|
||||
if (num > 0xff) {
|
||||
needAnotherIteration = true;
|
||||
return s.slice(0, 2) + ":" + s.slice(2);
|
||||
|
||||
@@ -12,7 +12,7 @@ export function NWFConnStateInput(p: {
|
||||
label="Connection state"
|
||||
value={p.value}
|
||||
onValueChange={(s) => {
|
||||
p.onChange?.(s as any);
|
||||
p.onChange(s as any);
|
||||
}}
|
||||
options={[
|
||||
{ label: "None", value: undefined },
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
/* eslint-disable react-x/no-array-index-key */
|
||||
/* eslint-disable react-hooks/exhaustive-deps */
|
||||
import React from "react";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { NWFilter, NWFilterURL } from "../../api/NWFilterApi";
|
||||
|
||||
@@ -13,7 +13,7 @@ export function NWFilterPriorityInput(p: {
|
||||
value={p.value?.toString()}
|
||||
type="number"
|
||||
onValueChange={(v) => {
|
||||
p.onChange?.(v && v !== "" ? Number(v) : undefined);
|
||||
p.onChange(v && v !== "" ? Number(v) : undefined);
|
||||
}}
|
||||
size={ServerApi.Config.constraints.nwfilter_priority}
|
||||
helperText="A lower priority value is accessed before one with a higher value"
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable react-x/no-array-index-key */
|
||||
import ArrowDownwardIcon from "@mui/icons-material/ArrowDownward";
|
||||
import ArrowUpwardIcon from "@mui/icons-material/ArrowUpward";
|
||||
import DeleteIcon from "@mui/icons-material/Delete";
|
||||
@@ -66,9 +67,19 @@ export function NWFilterRules(p: {
|
||||
deleteRule(n);
|
||||
}}
|
||||
onGoDown={
|
||||
n < p.rules.length - 1 ? () => swapRules(n, n + 1) : undefined
|
||||
n < p.rules.length - 1
|
||||
? () => {
|
||||
swapRules(n, n + 1);
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
onGoUp={
|
||||
n > 0
|
||||
? () => {
|
||||
swapRules(n, n - 1);
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
onGoUp={n > 0 ? () => swapRules(n, n - 1) : undefined}
|
||||
{...p}
|
||||
/>
|
||||
))}
|
||||
@@ -153,7 +164,9 @@ function NWRuleEdit(p: {
|
||||
editable={p.editable}
|
||||
onChange={p.onChange}
|
||||
selector={s}
|
||||
onDelete={() => deleteSelector(n)}
|
||||
onDelete={() => {
|
||||
deleteSelector(n);
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
</CardContent>
|
||||
|
||||
@@ -25,9 +25,7 @@ export function NWFilterSelectInput(p: {
|
||||
value={selectedValue}
|
||||
onDelete={p.editable ? () => p.onChange?.(undefined) : undefined}
|
||||
onClick={
|
||||
!p.editable && selectedValue
|
||||
? () => navigate(NWFilterURL(selectedValue))
|
||||
: undefined
|
||||
!p.editable ? () => navigate(NWFilterURL(selectedValue)) : undefined
|
||||
}
|
||||
/>
|
||||
);
|
||||
@@ -48,7 +46,7 @@ export function NWFilterSelectInput(p: {
|
||||
renderInput={(params) => (
|
||||
<TextField {...params} variant="standard" label={p.label} />
|
||||
)}
|
||||
renderOption={(_props, option, _state) => (
|
||||
renderOption={(_props, option) => (
|
||||
<NWFilterItem
|
||||
dense
|
||||
onClick={() => {
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable react-x/no-array-index-key */
|
||||
import { mdiIp } from "@mdi/js";
|
||||
import Icon from "@mdi/react";
|
||||
import DeleteIcon from "@mui/icons-material/Delete";
|
||||
@@ -130,7 +131,7 @@ function HostReservationWidget(p: {
|
||||
value={p.host.mac}
|
||||
onValueChange={(v) => {
|
||||
p.host.mac = v!;
|
||||
p.onChange?.();
|
||||
p.onChange();
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
@@ -142,7 +143,7 @@ function HostReservationWidget(p: {
|
||||
value={p.host.ip}
|
||||
onValueChange={(v) => {
|
||||
p.host.ip = v!;
|
||||
p.onChange?.();
|
||||
p.onChange();
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -54,6 +54,7 @@ export function NetNatConfiguration(p: {
|
||||
<>
|
||||
{p.nat.map((e, num) => (
|
||||
<NatEntryForm
|
||||
// eslint-disable-next-line react-x/no-array-index-key
|
||||
key={num}
|
||||
{...p}
|
||||
entry={e}
|
||||
|
||||
@@ -12,7 +12,7 @@ export function PortInput(p: {
|
||||
value={p.value?.toString() ?? ""}
|
||||
type="number"
|
||||
onValueChange={(v) => {
|
||||
p.onChange?.(sanitizePort(v));
|
||||
p.onChange(sanitizePort(v));
|
||||
}}
|
||||
checkValue={(v) => Number(v) <= 65535}
|
||||
/>
|
||||
|
||||
@@ -24,10 +24,13 @@ export function RadioGroupInput(p: {
|
||||
<RadioGroup
|
||||
row
|
||||
value={p.value}
|
||||
onChange={(_ev, v) => p.onValueChange?.(v)}
|
||||
onChange={(_ev, v) => {
|
||||
p.onValueChange(v);
|
||||
}}
|
||||
>
|
||||
{p.options.map((o) => (
|
||||
<FormControlLabel
|
||||
key={o.value}
|
||||
disabled={!p.editable}
|
||||
value={o.value}
|
||||
control={<Radio />}
|
||||
|
||||
@@ -33,7 +33,7 @@ export function SelectInput(p: {
|
||||
<Select
|
||||
value={p.value ?? ""}
|
||||
label={p.label}
|
||||
onChange={(e) => p.onValueChange(e.target.value)}
|
||||
onChange={(e) => { p.onValueChange(e.target.value); }}
|
||||
>
|
||||
{p.options.map((e) => (
|
||||
<MenuItem
|
||||
|
||||
@@ -2,7 +2,7 @@ import { TextField } from "@mui/material";
|
||||
import { LenConstraint } from "../../api/ServerApi";
|
||||
|
||||
/**
|
||||
* Couple / Member property edition
|
||||
* Text input property edition
|
||||
*/
|
||||
export function TextInput(p: {
|
||||
label?: string;
|
||||
@@ -42,12 +42,14 @@ export function TextInput(p: {
|
||||
e.target.value.length === 0 ? undefined : e.target.value
|
||||
)
|
||||
}
|
||||
inputProps={{
|
||||
slotProps={{
|
||||
htmlInput: {
|
||||
maxLength: p.size?.max,
|
||||
}}
|
||||
InputProps={{
|
||||
},
|
||||
input: {
|
||||
readOnly: !p.editable,
|
||||
type: p.type,
|
||||
},
|
||||
}}
|
||||
variant={"standard"}
|
||||
style={p.style ?? { width: "100%", marginBottom: "15px" }}
|
||||
|
||||
@@ -40,6 +40,7 @@ export function VMDisksList(p: {
|
||||
{/* disks list */}
|
||||
{p.vm.disks.map((d, num) => (
|
||||
<DiskInfo
|
||||
// eslint-disable-next-line react-x/no-array-index-key
|
||||
key={num}
|
||||
editable={p.editable}
|
||||
disk={d}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable react-x/no-array-index-key */
|
||||
import DeleteIcon from "@mui/icons-material/Delete";
|
||||
import {
|
||||
Button,
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable react-x/no-array-index-key */
|
||||
import { mdiNetworkOutline } from "@mdi/js";
|
||||
import Icon from "@mdi/react";
|
||||
import DeleteIcon from "@mui/icons-material/Delete";
|
||||
@@ -51,7 +52,6 @@ export function VMNetworksList(p: {
|
||||
{p.vm.networks.map((n, num) => (
|
||||
<EditSection key={num}>
|
||||
<NetworkInfoWidget
|
||||
key={num}
|
||||
network={n}
|
||||
removeFromList={() => {
|
||||
p.vm.networks.splice(num, 1);
|
||||
|
||||
@@ -19,7 +19,7 @@ export function VMSelectIsoInput(p: {
|
||||
attachedISOs: string[];
|
||||
onChange: (newVal: string[]) => void;
|
||||
}): React.ReactElement {
|
||||
if (!p.attachedISOs && !p.editable) return <></>;
|
||||
if (p.attachedISOs.length === 0 && !p.editable) return <></>;
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -27,7 +27,7 @@ export function VMSelectIsoInput(p: {
|
||||
const iso = p.isoList.find((d) => d.filename === isoName);
|
||||
return (
|
||||
<ListItem
|
||||
key={num}
|
||||
key={isoName}
|
||||
secondaryAction={
|
||||
p.editable && (
|
||||
<IconButton
|
||||
@@ -73,8 +73,7 @@ export function VMSelectIsoInput(p: {
|
||||
label: `${i.filename} ${filesize(i.size)}`,
|
||||
value: i.filename,
|
||||
};
|
||||
})
|
||||
}
|
||||
})}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -25,7 +25,7 @@ interface DetailsProps {
|
||||
}
|
||||
|
||||
export function NetworkDetails(p: DetailsProps): React.ReactElement {
|
||||
const [nicsList, setNicsList] = React.useState<string[] | any>();
|
||||
const [nicsList, setNicsList] = React.useState<string[] | undefined>();
|
||||
|
||||
const load = async () => {
|
||||
setNicsList(await ServerApi.GetNetworksList());
|
||||
@@ -36,7 +36,7 @@ export function NetworkDetails(p: DetailsProps): React.ReactElement {
|
||||
loadKey={"1"}
|
||||
load={load}
|
||||
errMsg="Failed to load the list of host network cards!"
|
||||
build={() => <NetworkDetailsInner nicsList={nicsList} {...p} />}
|
||||
build={() => <NetworkDetailsInner nicsList={nicsList!} {...p} />}
|
||||
/>
|
||||
);
|
||||
}
|
||||
@@ -260,7 +260,7 @@ function IPSection(p: {
|
||||
const confirm = useConfirm();
|
||||
|
||||
const toggleNetwork = async () => {
|
||||
if (!!p.config) {
|
||||
if (p.config) {
|
||||
if (
|
||||
!(await confirm(
|
||||
`Do you really want to disable IPv${p.version} on this network? Specific configuration will be deleted!`
|
||||
@@ -268,11 +268,11 @@ function IPSection(p: {
|
||||
)
|
||||
return;
|
||||
|
||||
p.onChange?.(undefined);
|
||||
p.onChange(undefined);
|
||||
return;
|
||||
}
|
||||
|
||||
p.onChange?.({
|
||||
p.onChange({
|
||||
bridge_address: p.version === 4 ? "192.168.1.1" : "fd00::1",
|
||||
prefix: p.version === 4 ? 24 : 8,
|
||||
});
|
||||
@@ -298,7 +298,7 @@ function IPSection(p: {
|
||||
p.config!.dhcp = undefined;
|
||||
}
|
||||
|
||||
p.onChange?.(p.config);
|
||||
p.onChange(p.config);
|
||||
};
|
||||
|
||||
const toggleNAT = async (v: boolean) => {
|
||||
@@ -306,7 +306,7 @@ function IPSection(p: {
|
||||
p.config!.nat = [];
|
||||
} else {
|
||||
if (
|
||||
(p.config?.nat?.length ?? 0 > 0) &&
|
||||
(p.config?.nat?.length ?? 0) > 0 &&
|
||||
!(await confirm(
|
||||
`Do you really want to disable IPv${p.version} NAT port forwarding on this network? Specific configuration will be deleted!`
|
||||
))
|
||||
@@ -315,7 +315,7 @@ function IPSection(p: {
|
||||
p.config!.nat = undefined;
|
||||
}
|
||||
|
||||
p.onChange?.(p.config);
|
||||
p.onChange(p.config);
|
||||
};
|
||||
|
||||
if (!p.config && !p.editable) return <></>;
|
||||
@@ -338,10 +338,10 @@ function IPSection(p: {
|
||||
editable={p.editable}
|
||||
label="Bridge address"
|
||||
version={p.version}
|
||||
value={p.config?.bridge_address}
|
||||
value={p.config.bridge_address}
|
||||
onValueChange={(v) => {
|
||||
p.config!.bridge_address = v ?? "";
|
||||
p.onChange?.(p.config);
|
||||
p.onChange(p.config);
|
||||
}}
|
||||
/>
|
||||
|
||||
@@ -352,7 +352,7 @@ function IPSection(p: {
|
||||
type="number"
|
||||
onValueChange={(v) => {
|
||||
p.config!.prefix = Number(v);
|
||||
p.onChange?.(p.config);
|
||||
p.onChange(p.config);
|
||||
}}
|
||||
size={
|
||||
p.version === 4 ? { min: 0, max: 32 } : { min: 0, max: 128 }
|
||||
@@ -407,7 +407,7 @@ function IPSection(p: {
|
||||
dhcp={p.config.dhcp}
|
||||
onChange={(d) => {
|
||||
p.config!.dhcp = d;
|
||||
p.onChange?.(p.config);
|
||||
p.onChange(p.config);
|
||||
}}
|
||||
/>
|
||||
</EditSection>
|
||||
@@ -431,7 +431,7 @@ function IPSection(p: {
|
||||
nat={p.config.nat}
|
||||
onChange={(n) => {
|
||||
p.config!.nat = n;
|
||||
p.onChange?.(p.config);
|
||||
p.onChange(p.config);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
|
||||
@@ -29,13 +29,13 @@ export function NetworkStatusWidget(p: {
|
||||
}
|
||||
};
|
||||
|
||||
const changedAction = () => setState(undefined);
|
||||
const changedAction = () => { setState(undefined); };
|
||||
|
||||
React.useEffect(() => {
|
||||
refresh();
|
||||
const i = setInterval(() => refresh(), 3000);
|
||||
|
||||
return () => clearInterval(i);
|
||||
return () => { clearInterval(i); };
|
||||
});
|
||||
|
||||
if (state === undefined)
|
||||
|
||||
@@ -28,7 +28,9 @@ interface DetailsProps {
|
||||
}
|
||||
|
||||
export function NWFilterDetails(p: DetailsProps): ReactElement {
|
||||
const [nwFiltersList, setNwFiltersList] = React.useState<NWFilter[] | any>();
|
||||
const [nwFiltersList, setNwFiltersList] = React.useState<
|
||||
NWFilter[] | undefined
|
||||
>();
|
||||
|
||||
const load = async () => {
|
||||
setNwFiltersList(await NWFilterApi.GetList());
|
||||
@@ -40,7 +42,7 @@ export function NWFilterDetails(p: DetailsProps): ReactElement {
|
||||
load={load}
|
||||
errMsg="Failed to load the list of network filters!"
|
||||
build={() => (
|
||||
<NetworkFilterDetailsInner nwFiltersList={nwFiltersList} {...p} />
|
||||
<NetworkFilterDetailsInner nwFiltersList={nwFiltersList!} {...p} />
|
||||
)}
|
||||
/>
|
||||
);
|
||||
@@ -116,7 +118,7 @@ function NetworkFilterDetailsTabGeneral(
|
||||
p.nwfilter.name = v ?? "";
|
||||
p.onChange?.();
|
||||
}}
|
||||
checkValue={(v) => /^[a-zA-Z0-9\_\-]+$/.test(v)}
|
||||
checkValue={(v) => /^[a-zA-Z0-9_-]+$/.test(v)}
|
||||
size={ServerApi.Config.constraints.nwfilter_name_size}
|
||||
/>
|
||||
|
||||
|
||||
@@ -161,14 +161,14 @@ function APITokenTabGeneral(p: DetailsInnerProps): React.ReactElement {
|
||||
{p.status === TokenWidgetStatus.Create && (
|
||||
<RadioGroupInput
|
||||
{...p}
|
||||
editable={p.status === TokenWidgetStatus.Create}
|
||||
editable={true}
|
||||
options={[
|
||||
{ label: "IPv4", value: "4" },
|
||||
{ label: "IPv6", value: "6" },
|
||||
]}
|
||||
value={ipVersion.toString()}
|
||||
onValueChange={(v) => {
|
||||
setIpVersion(Number(v) as any);
|
||||
setIpVersion(Number(v) as 4 | 6);
|
||||
}}
|
||||
label="Token IP restriction version"
|
||||
/>
|
||||
|
||||
@@ -63,6 +63,7 @@ export function TokenRawRightsEditor(p: {
|
||||
</TableHead>
|
||||
<TableBody>
|
||||
{p.token.rights.map((r, num) => (
|
||||
// eslint-disable-next-line react-x/no-array-index-key
|
||||
<TableRow key={num} hover>
|
||||
<TableCell style={{ width: "100px" }}>
|
||||
<SelectInput
|
||||
@@ -95,7 +96,11 @@ export function TokenRawRightsEditor(p: {
|
||||
</TableCell>
|
||||
{p.editable && (
|
||||
<TableCell style={{ width: "100px" }}>
|
||||
<IconButton onClick={() => deleteRule(num)}>
|
||||
<IconButton
|
||||
onClick={() => {
|
||||
deleteRule(num);
|
||||
}}
|
||||
>
|
||||
<Tooltip title="Remove the rule">
|
||||
<DeleteIcon />
|
||||
</Tooltip>
|
||||
|
||||
@@ -85,8 +85,8 @@ export function TokenRightsEditor(p: {
|
||||
</TableRow>
|
||||
|
||||
{/* Per VM operations */}
|
||||
{p.vms.map((v, n) => (
|
||||
<TableRow hover key={n}>
|
||||
{p.vms.map((v) => (
|
||||
<TableRow hover key={v.uuid}>
|
||||
<TableCell>{v.name}</TableCell>
|
||||
<CellRight
|
||||
{...p}
|
||||
@@ -185,8 +185,8 @@ export function TokenRightsEditor(p: {
|
||||
</TableRow>
|
||||
|
||||
{/* Per VM operations */}
|
||||
{p.vms.map((v, n) => (
|
||||
<TableRow hover key={n}>
|
||||
{p.vms.map((v) => (
|
||||
<TableRow hover key={v.uuid}>
|
||||
<TableCell>{v.name}</TableCell>
|
||||
<CellRight
|
||||
{...p}
|
||||
@@ -306,8 +306,8 @@ export function TokenRightsEditor(p: {
|
||||
</TableRow>
|
||||
|
||||
{/* Per VM operations */}
|
||||
{p.groups.map((v, n) => (
|
||||
<TableRow hover key={n}>
|
||||
{p.groups.map((v) => (
|
||||
<TableRow hover key={v}>
|
||||
<TableCell>{v}</TableCell>
|
||||
<CellRight
|
||||
{...p}
|
||||
@@ -448,8 +448,8 @@ export function TokenRightsEditor(p: {
|
||||
</TableRow>
|
||||
|
||||
{/* Per network operations */}
|
||||
{p.networks.map((v, n) => (
|
||||
<TableRow hover key={n}>
|
||||
{p.networks.map((v) => (
|
||||
<TableRow hover key={v.uuid}>
|
||||
<TableCell>{v.name}</TableCell>
|
||||
<CellRight
|
||||
{...p}
|
||||
@@ -568,15 +568,15 @@ export function TokenRightsEditor(p: {
|
||||
</TableRow>
|
||||
|
||||
{/* Per network filter operations */}
|
||||
{p.nwFilters.map((v, n) => (
|
||||
<TableRow hover key={n}>
|
||||
{p.nwFilters.map((v) => (
|
||||
<TableRow hover key={v.uuid}>
|
||||
<TableCell>{v.name}</TableCell>
|
||||
<CellRight
|
||||
{...p}
|
||||
right={{ verb: "GET", path: `/api/nwfilter/${v.uuid}` }}
|
||||
parent={{ verb: "GET", path: "/api/nwfilter/*" }}
|
||||
/>
|
||||
{ServerApi.Config.builtin_nwfilter_rules.includes(v.name!) ? (
|
||||
{ServerApi.Config.builtin_nwfilter_rules.includes(v.name) ? (
|
||||
<TableCell></TableCell>
|
||||
) : (
|
||||
<CellRight
|
||||
@@ -585,7 +585,7 @@ export function TokenRightsEditor(p: {
|
||||
parent={{ verb: "PUT", path: "/api/nwfilter/*" }}
|
||||
/>
|
||||
)}
|
||||
{ServerApi.Config.builtin_nwfilter_rules.includes(v.name!) ? (
|
||||
{ServerApi.Config.builtin_nwfilter_rules.includes(v.name) ? (
|
||||
<TableCell></TableCell>
|
||||
) : (
|
||||
<CellRight
|
||||
@@ -645,8 +645,8 @@ export function TokenRightsEditor(p: {
|
||||
</TableRow>
|
||||
|
||||
{/* Per API token operations */}
|
||||
{p.tokens.map((v, n) => (
|
||||
<TableRow hover key={n}>
|
||||
{p.tokens.map((v) => (
|
||||
<TableRow hover key={v.id}>
|
||||
<TableCell>{v.name}</TableCell>
|
||||
<CellRight
|
||||
{...p}
|
||||
@@ -767,7 +767,7 @@ function RouteRight(p: RightOpts): React.ReactElement {
|
||||
const parentActivated =
|
||||
!!p.parent &&
|
||||
p.token.rights.findIndex(
|
||||
(r) => r.verb === p.parent?.verb && r.path === p.parent?.path
|
||||
(r) => r.verb === p.parent?.verb && r.path === p.parent.path
|
||||
) !== -1;
|
||||
|
||||
const toggle = (a: boolean) => {
|
||||
@@ -804,7 +804,9 @@ function RouteRight(p: RightOpts): React.ReactElement {
|
||||
<Checkbox
|
||||
checked={activated || parentActivated}
|
||||
disabled={!p.editable || parentActivated}
|
||||
onChange={(_e, a) => toggle(a)}
|
||||
onChange={(_e, a) => {
|
||||
toggle(a);
|
||||
}}
|
||||
/>
|
||||
}
|
||||
label={p.label}
|
||||
@@ -814,7 +816,9 @@ function RouteRight(p: RightOpts): React.ReactElement {
|
||||
<Checkbox
|
||||
checked={activated || parentActivated}
|
||||
disabled={!p.editable || parentActivated}
|
||||
onChange={(_e, a) => toggle(a)}
|
||||
onChange={(_e, a) => {
|
||||
toggle(a);
|
||||
}}
|
||||
/>
|
||||
</span>
|
||||
)}
|
||||
|
||||
@@ -35,14 +35,16 @@ interface DetailsProps {
|
||||
}
|
||||
|
||||
export function VMDetails(p: DetailsProps): React.ReactElement {
|
||||
const [groupsList, setGroupsList] = React.useState<string[] | any>();
|
||||
const [isoList, setIsoList] = React.useState<IsoFile[] | any>();
|
||||
const [groupsList, setGroupsList] = React.useState<string[] | undefined>();
|
||||
const [isoList, setIsoList] = React.useState<IsoFile[] | undefined>();
|
||||
const [vcpuCombinations, setVCPUCombinations] = React.useState<
|
||||
number[] | any
|
||||
number[] | undefined
|
||||
>();
|
||||
const [networksList, setNetworksList] = React.useState<
|
||||
NetworkInfo[] | undefined
|
||||
>();
|
||||
const [networksList, setNetworksList] = React.useState<NetworkInfo[] | any>();
|
||||
const [networkFiltersList, setNetworkFiltersList] = React.useState<
|
||||
NWFilter[] | any
|
||||
NWFilter[] | undefined
|
||||
>();
|
||||
|
||||
const load = async () => {
|
||||
@@ -60,11 +62,11 @@ export function VMDetails(p: DetailsProps): React.ReactElement {
|
||||
errMsg="Failed to load the list of ISO files"
|
||||
build={() => (
|
||||
<VMDetailsInner
|
||||
groupsList={groupsList}
|
||||
isoList={isoList}
|
||||
vcpuCombinations={vcpuCombinations}
|
||||
networksList={networksList}
|
||||
networkFiltersList={networkFiltersList}
|
||||
groupsList={groupsList!}
|
||||
isoList={isoList!}
|
||||
vcpuCombinations={vcpuCombinations!}
|
||||
networksList={networksList!}
|
||||
networkFiltersList={networkFiltersList!}
|
||||
{...p}
|
||||
/>
|
||||
)}
|
||||
@@ -202,7 +204,7 @@ function VMDetailsTabGeneral(p: DetailsInnerProps): React.ReactElement {
|
||||
editable={p.editable}
|
||||
label="Group"
|
||||
onValueChange={(v) => {
|
||||
p.vm.group = v! as any;
|
||||
p.vm.group = v!;
|
||||
p.onChange?.();
|
||||
}}
|
||||
value={p.vm.group}
|
||||
@@ -222,7 +224,11 @@ function VMDetailsTabGeneral(p: DetailsInnerProps): React.ReactElement {
|
||||
: "Add a new group instead of using existing one"
|
||||
}
|
||||
>
|
||||
<IconButton onClick={() => setAddGroup(!addGroup)}>
|
||||
<IconButton
|
||||
onClick={() => {
|
||||
setAddGroup(!addGroup);
|
||||
}}
|
||||
>
|
||||
{addGroup ? <ListIcon /> : <AddIcon />}
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
|
||||
@@ -9,7 +9,7 @@ export function VMScreenshot(p: { vm: VMInfo }): React.ReactElement {
|
||||
string | undefined
|
||||
>();
|
||||
|
||||
const int = React.useRef<number | undefined>(undefined);
|
||||
const int = React.useRef<NodeJS.Timeout | undefined>(undefined);
|
||||
|
||||
React.useEffect(() => {
|
||||
const refresh = async () => {
|
||||
@@ -25,7 +25,9 @@ export function VMScreenshot(p: { vm: VMInfo }): React.ReactElement {
|
||||
|
||||
if (int.current === undefined) {
|
||||
refresh();
|
||||
int.current = setInterval(() => refresh(), 5000);
|
||||
int.current = setInterval(() => {
|
||||
refresh();
|
||||
}, 5000);
|
||||
}
|
||||
|
||||
return () => {
|
||||
|
||||
@@ -31,13 +31,19 @@ export function VMStatusWidget(p: {
|
||||
}
|
||||
};
|
||||
|
||||
const changedAction = () => setState(undefined);
|
||||
const changedAction = () => {
|
||||
setState(undefined);
|
||||
};
|
||||
|
||||
React.useEffect(() => {
|
||||
refresh();
|
||||
const i = setInterval(() => refresh(), 3000);
|
||||
const i = setInterval(() => {
|
||||
refresh();
|
||||
}, 3000);
|
||||
|
||||
return () => clearInterval(i);
|
||||
return () => {
|
||||
clearInterval(i);
|
||||
};
|
||||
});
|
||||
|
||||
if (state === undefined)
|
||||
@@ -59,6 +65,7 @@ export function VMStatusWidget(p: {
|
||||
icon={<PersonalVideoIcon />}
|
||||
tooltip="Graphical remote control over the VM"
|
||||
performAction={async () => navigate(p.vm.VNCURL)}
|
||||
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
||||
onExecuted={() => {}}
|
||||
/>
|
||||
)
|
||||
|
||||
26
virtweb_frontend/tsconfig.app.json
Normal file
26
virtweb_frontend/tsconfig.app.json
Normal file
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||
"target": "ES2020",
|
||||
"useDefineForClassFields": true,
|
||||
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
||||
"module": "ESNext",
|
||||
"skipLibCheck": true,
|
||||
|
||||
/* Bundler mode */
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"isolatedModules": true,
|
||||
"moduleDetection": "force",
|
||||
"noEmit": true,
|
||||
"jsx": "react-jsx",
|
||||
|
||||
/* Linting */
|
||||
"strict": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"noUncheckedSideEffectImports": true
|
||||
},
|
||||
"include": ["src"]
|
||||
}
|
||||
@@ -1,27 +1,7 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"lib": [
|
||||
"dom",
|
||||
"dom.iterable",
|
||||
"esnext"
|
||||
],
|
||||
"target": "ESNext",
|
||||
"types": ["vite/client"],
|
||||
"allowJs": true,
|
||||
"skipLibCheck": true,
|
||||
"esModuleInterop": true,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"strict": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"module": "esnext",
|
||||
"moduleResolution": "bundler",
|
||||
"resolveJsonModule": true,
|
||||
"isolatedModules": true,
|
||||
"noEmit": true,
|
||||
"jsx": "react-jsx"
|
||||
},
|
||||
"include": [
|
||||
"src"
|
||||
"files": [],
|
||||
"references": [
|
||||
{ "path": "./tsconfig.app.json" },
|
||||
{ "path": "./tsconfig.node.json" }
|
||||
]
|
||||
}
|
||||
|
||||
24
virtweb_frontend/tsconfig.node.json
Normal file
24
virtweb_frontend/tsconfig.node.json
Normal file
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
|
||||
"target": "ES2022",
|
||||
"lib": ["ES2023"],
|
||||
"module": "ESNext",
|
||||
"skipLibCheck": true,
|
||||
|
||||
/* Bundler mode */
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"isolatedModules": true,
|
||||
"moduleDetection": "force",
|
||||
"noEmit": true,
|
||||
|
||||
/* Linting */
|
||||
"strict": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"noUncheckedSideEffectImports": true
|
||||
},
|
||||
"include": ["vite.config.ts"]
|
||||
}
|
||||
@@ -1,15 +1,7 @@
|
||||
import { defineConfig } from "vite";
|
||||
import react from "@vitejs/plugin-react";
|
||||
import viteTsconfigPaths from "vite-tsconfig-paths";
|
||||
import { defineConfig } from 'vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
|
||||
// https://vite.dev/config/
|
||||
export default defineConfig({
|
||||
// depending on your application, base can also be "/"
|
||||
base: "/",
|
||||
plugins: [react(), viteTsconfigPaths()],
|
||||
server: {
|
||||
// this ensures that the browser opens upon server start
|
||||
open: true,
|
||||
// this sets a default port to 3000
|
||||
port: 3000,
|
||||
},
|
||||
});
|
||||
plugins: [react()],
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user