Compare commits
122
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f3de9e064 | ||
|
|
a1c54997bb | ||
|
|
5657d39589 | ||
|
|
cdd4953e03 | ||
|
|
786c803847 | ||
|
|
56153b38a5 | ||
|
|
f85ed902e4 | ||
|
|
8ccc7cbe9a | ||
|
|
d347e29a28 | ||
|
|
f10fb452ba | ||
|
|
fc9d2fe69d | ||
|
|
ca896fa22f | ||
|
|
a7ee90e1ee | ||
|
|
06190a885a | ||
|
|
5f07860217 | ||
|
|
073635d786 | ||
|
|
af1d964e44 | ||
|
|
3b6b7a1e5d | ||
|
|
bc44a3baeb | ||
|
|
4e4bc5f319 | ||
|
|
2fec09df62 | ||
|
|
13e49c518d | ||
|
|
a1f9c0304f | ||
|
|
d158bcdce1 | ||
|
|
c45a21b4c8 | ||
|
|
a0738dff63 | ||
|
|
3cc4db9af5 | ||
|
|
94ecbfe365 | ||
|
|
5343241036 | ||
|
|
261fdd08f1 | ||
|
|
5470f44ebb | ||
|
|
b24e42e516 | ||
|
|
09d20c1bc7 | ||
|
|
d59bdf6c0c | ||
|
|
9d0f0116f3 | ||
|
|
3e56dc63a9 | ||
|
|
30881a0af1 | ||
|
|
ebbf1a8b1e | ||
|
|
9a6602b9e1 | ||
|
|
46211ac61d | ||
|
|
791a0c8483 | ||
|
|
e964234f54 | ||
|
|
e60bfd18ff | ||
|
|
560d64a482 | ||
|
|
c8826d90d5 | ||
|
|
cacedfd7d8 | ||
|
|
4ec03dfd04 | ||
|
|
78d3b23e93 | ||
|
|
1a1dc7d807 | ||
|
|
03174d98dd | ||
|
|
686ded2137 | ||
|
|
9c8bf4bb05 | ||
|
|
8f6c909acd | ||
|
|
1ca38a31c9 | ||
|
|
9ffcbd1242 | ||
|
|
840e12eb9a | ||
|
|
96b2266a9d | ||
|
|
80073af80a | ||
|
|
0c9334071f | ||
|
|
e444d5fbe6 | ||
|
|
e9dca23664 | ||
|
|
7fb0e9dc70 | ||
|
|
de148f9773 | ||
|
|
54ffd74048 | ||
|
|
4bc71a3d18 | ||
|
|
d03765c5fd | ||
|
|
f30085bae3 | ||
|
|
c24440f8c9 | ||
|
|
d8ce2dfdc8 | ||
|
|
28f8542bce | ||
|
|
2e258fa39a | ||
|
|
7dedcca41d | ||
|
|
97d6222297 | ||
|
|
14ddfc97b0 | ||
|
|
b23dbfeae0 | ||
|
|
68679bc0bf | ||
|
|
959a434d21 | ||
|
|
4298397e3e | ||
|
|
fc3fab4905 | ||
|
|
0b54b5c6cd | ||
|
|
358b1deec7 | ||
|
|
9839d48ca0 | ||
|
|
83c2df4390 | ||
|
|
31f6727519 | ||
|
|
96f8bf4a66 | ||
|
|
06bf5e45f5 | ||
|
|
d0fc402683 | ||
|
|
b922654cfc | ||
|
|
d7dce5d7a3 | ||
|
|
5d2aa28570 | ||
|
|
af3c72b055 | ||
|
|
b3e98ac95d | ||
|
|
3f62c8ec6a | ||
|
|
b2dca7b62f | ||
|
|
f731648007 | ||
|
|
a1199f957d | ||
|
|
ea8ad88ae9 | ||
|
|
6e271f834c | ||
|
|
0c21dcdd2a | ||
|
|
9bb95e1f0c | ||
|
|
ccfda938d5 | ||
|
|
cc137e1d06 | ||
|
|
41859f241a | ||
|
|
252067142e | ||
|
|
1152a70afb | ||
|
|
ffd7ea7517 | ||
|
|
a56bff2305 | ||
|
|
db05db0c0c | ||
|
|
cd520dacc5 | ||
|
|
637bb5cca9 | ||
|
|
ede93add64 | ||
|
|
4443a53a23 | ||
|
|
1b2d2887af | ||
|
|
54690fc73c | ||
|
|
6e3252aec8 | ||
|
|
edd9335e96 | ||
|
|
cf13bc329e | ||
|
|
80097afb71 | ||
|
|
5435167e73 | ||
|
|
059dc2737b | ||
|
|
158f2fffbe | ||
|
|
68c1f2e281 |
No files matched your search
@@ -0,0 +1,22 @@
|
|||||||
|
name: Lockfile Check (Client & Server)
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
check-lockfiles:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
# Validate with the same node image the production build uses, so a lock
|
||||||
|
# that passes here cannot fail the image build's npm ci.
|
||||||
|
- name: Resolve node image from Dockerfile
|
||||||
|
id: node-image
|
||||||
|
run: echo "image=$(grep -m1 -o 'node:[^ ]*' docker/Dockerfile)" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Check server lockfile
|
||||||
|
run: docker run --rm -v "$PWD/server":/w -w /w ${{ steps.node-image.outputs.image }} npm ci --dry-run
|
||||||
|
|
||||||
|
- name: Check client lockfile
|
||||||
|
run: docker run --rm -v "$PWD/client":/w -w /w ${{ steps.node-image.outputs.image }} npm ci --dry-run
|
||||||
@@ -1,138 +0,0 @@
|
|||||||
name: POEditor Translation Synchronization (disabled)
|
|
||||||
|
|
||||||
# This workflow is intentionally disabled — kept for reference only.
|
|
||||||
# The full definition is preserved commented-out below. To re-enable,
|
|
||||||
# delete the stub job and uncomment the section starting at `on:`.
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
disabled:
|
|
||||||
if: false
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- run: echo "This workflow is disabled. See comments below for the original definition."
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Original (disabled) workflow below. Do not uncomment if you don't know what you're doing.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# on:
|
|
||||||
# # For manual triggering
|
|
||||||
# workflow_dispatch:
|
|
||||||
# inputs:
|
|
||||||
# languages:
|
|
||||||
# description: "Languages to synchronize (comma separated, e.g.: tr,en,es)"
|
|
||||||
# required: false
|
|
||||||
# default: "ar,zh-tw,cs,en,fi,fr,de,pt-br,ru,es,tr,ja,zh-cn,th"
|
|
||||||
# format:
|
|
||||||
# description: "Export format (key_value_json or json)"
|
|
||||||
# required: false
|
|
||||||
# default: "key_value_json"
|
|
||||||
|
|
||||||
# permissions:
|
|
||||||
# contents: write
|
|
||||||
# pull-requests: write
|
|
||||||
|
|
||||||
# jobs:
|
|
||||||
# sync-translations:
|
|
||||||
# runs-on: ubuntu-latest
|
|
||||||
# permissions:
|
|
||||||
# contents: write
|
|
||||||
# issues: write
|
|
||||||
# pull-requests: write
|
|
||||||
|
|
||||||
# steps:
|
|
||||||
# - name: Checkout code
|
|
||||||
# uses: actions/checkout@v3
|
|
||||||
# with:
|
|
||||||
# token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
# fetch-depth: 0
|
|
||||||
|
|
||||||
# - name: Setup Node.js
|
|
||||||
# uses: actions/setup-node@v3
|
|
||||||
# with:
|
|
||||||
# node-version: "22"
|
|
||||||
|
|
||||||
# - name: Create package.json for scripts
|
|
||||||
# run: |
|
|
||||||
# mkdir -p .github/scripts
|
|
||||||
# cat > .github/scripts/package.json << EOF
|
|
||||||
# {
|
|
||||||
# "name": "poeditor-scripts",
|
|
||||||
# "version": "1.0.0",
|
|
||||||
# "private": true,
|
|
||||||
# "type": "module",
|
|
||||||
# "dependencies": {
|
|
||||||
# "axios": "^1.6.0",
|
|
||||||
# "fs-extra": "^11.1.1"
|
|
||||||
# }
|
|
||||||
# }
|
|
||||||
# EOF
|
|
||||||
|
|
||||||
# - name: Install dependencies
|
|
||||||
# run: |
|
|
||||||
# cd .github/scripts
|
|
||||||
# npm install
|
|
||||||
|
|
||||||
# - name: Download translations from POEditor
|
|
||||||
# env:
|
|
||||||
# POEDITOR_API: ${{ secrets.POEDITOR_API }}
|
|
||||||
# POEDITOR_PROJECT_ID: ${{ secrets.POEDITOR_PROJECT_ID }}
|
|
||||||
# LANGUAGES: ${{ github.event.inputs.languages || 'tr,en' }}
|
|
||||||
# EXPORT_FORMAT: ${{ github.event.inputs.format || 'key_value_json' }}
|
|
||||||
# run: |
|
|
||||||
# mkdir -p temp
|
|
||||||
# node .github/scripts/download-translations.js
|
|
||||||
|
|
||||||
# - name: Verify translation files
|
|
||||||
# run: |
|
|
||||||
# echo "Verifying translation files..."
|
|
||||||
# for file in temp/*.json; do
|
|
||||||
# echo "Checking $file"
|
|
||||||
# if [ ! -s "$file" ]; then
|
|
||||||
# echo "Error: $file is empty or does not exist"
|
|
||||||
# exit 1
|
|
||||||
# fi
|
|
||||||
# # Validate JSON format
|
|
||||||
# cat "$file" | jq . > /dev/null || { echo "Error: $file is not valid JSON"; exit 1; }
|
|
||||||
# done
|
|
||||||
# echo "All translation files are valid"
|
|
||||||
|
|
||||||
# - name: Copy translations to project
|
|
||||||
# run: |
|
|
||||||
# mkdir -p client/src/locales
|
|
||||||
# cp -r temp/* client/src/locales/
|
|
||||||
# echo "Translation files copied to client/src/locales/"
|
|
||||||
|
|
||||||
# - name: Get current date
|
|
||||||
# id: date
|
|
||||||
# run: echo "date=$(date +'%Y-%m-%d %H:%M:%S')" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
# - name: Format client code
|
|
||||||
# run: |
|
|
||||||
# cd client
|
|
||||||
# npm ci
|
|
||||||
# npm run format
|
|
||||||
|
|
||||||
# - name: Create Pull Request
|
|
||||||
# uses: peter-evans/create-pull-request@v7
|
|
||||||
# with:
|
|
||||||
# token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
# commit-message: "feat: translations updated from POEditor"
|
|
||||||
# title: "🌐 Updated Translations from POEditor"
|
|
||||||
# body: |
|
|
||||||
# This PR contains the latest translations from POEditor.
|
|
||||||
|
|
||||||
# 📅 Update Date: ${{ steps.date.outputs.date }}
|
|
||||||
# 🔄 Updated Languages: ${{ github.event.inputs.languages || 'tr,en' }}
|
|
||||||
|
|
||||||
# ⚠️ Please review the translations and approve the PR if everything looks correct.
|
|
||||||
# branch: translation-update-${{ github.run_number }}
|
|
||||||
# delete-branch: true
|
|
||||||
# base: develop
|
|
||||||
# add-paths: |
|
|
||||||
# client/src/locales/*.json
|
|
||||||
# committer: GitHub Action <github-actions[bot]@users.noreply.github.com>
|
|
||||||
# author: GitHub Action <github-actions[bot]@users.noreply.github.com>
|
|
||||||
@@ -1,113 +0,0 @@
|
|||||||
name: Upload Translations to POEditor on PR Merge
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
types: [closed]
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
paths:
|
|
||||||
- "client/src/locales/**"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
upload-translations:
|
|
||||||
# Only run if the PR was merged (not just closed) or manually triggered
|
|
||||||
if: github.event.pull_request.merged == true
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
fetch-depth: 0 # Fetch all history to get changed files
|
|
||||||
|
|
||||||
- name: Setup Node.js
|
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: "22"
|
|
||||||
|
|
||||||
- name: Create package.json for scripts
|
|
||||||
run: |
|
|
||||||
mkdir -p .github/scripts
|
|
||||||
cat > .github/scripts/package.json << EOF
|
|
||||||
{
|
|
||||||
"name": "poeditor-scripts",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"private": true,
|
|
||||||
"type": "module",
|
|
||||||
"dependencies": {
|
|
||||||
"axios": "^1.6.0",
|
|
||||||
"fs-extra": "^11.1.1",
|
|
||||||
"form-data": "^4.0.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
cd .github/scripts
|
|
||||||
npm install
|
|
||||||
|
|
||||||
- name: Get changed locale files
|
|
||||||
id: changed-files
|
|
||||||
if: github.event_name == 'pull_request'
|
|
||||||
run: |
|
|
||||||
# Get base and head commits
|
|
||||||
BASE_SHA=${{ github.event.pull_request.base.sha }}
|
|
||||||
HEAD_SHA=${{ github.event.pull_request.head.sha }}
|
|
||||||
|
|
||||||
echo "Base SHA: $BASE_SHA"
|
|
||||||
echo "Head SHA: $HEAD_SHA"
|
|
||||||
|
|
||||||
# Get list of changed files in client/src/locales directory
|
|
||||||
CHANGED_FILES=$(git diff --name-only $BASE_SHA..$HEAD_SHA -- 'client/src/locales/*.json' || git ls-files 'client/src/locales/*.json')
|
|
||||||
|
|
||||||
if [ -z "$CHANGED_FILES" ]; then
|
|
||||||
echo "No changes detected in locale files"
|
|
||||||
echo "CHANGED_FILES=" >> $GITHUB_ENV
|
|
||||||
else
|
|
||||||
echo "Changed files:"
|
|
||||||
echo "$CHANGED_FILES"
|
|
||||||
echo "CHANGED_FILES<<EOF" >> $GITHUB_ENV
|
|
||||||
echo "$CHANGED_FILES" >> $GITHUB_ENV
|
|
||||||
echo "EOF" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Upload changed translations to POEditor
|
|
||||||
if: env.CHANGED_FILES != ''
|
|
||||||
env:
|
|
||||||
POEDITOR_API: ${{ secrets.POEDITOR_API }}
|
|
||||||
POEDITOR_PROJECT_ID: ${{ secrets.POEDITOR_PROJECT_ID }}
|
|
||||||
run: |
|
|
||||||
# Process each changed file
|
|
||||||
for FILE in $CHANGED_FILES; do
|
|
||||||
if [[ -f "$FILE" ]]; then
|
|
||||||
# Extract language code from filename (e.g., client/src/locales/en.json -> en)
|
|
||||||
FILENAME=$(basename "$FILE")
|
|
||||||
|
|
||||||
# Special case: map gb.json to en language code
|
|
||||||
if [ "$FILENAME" == "gb.json" ]; then
|
|
||||||
LANG="en"
|
|
||||||
echo "Found gb.json, mapping to language code 'en'"
|
|
||||||
else
|
|
||||||
LANG=$(basename "$FILE" .json)
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Processing $FILE for language $LANG"
|
|
||||||
|
|
||||||
# Upload to POEditor
|
|
||||||
LANGUAGE=$LANG FILE_PATH=$FILE node .github/scripts/upload-translations.js
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
- name: Notify on success
|
|
||||||
if: success() && env.CHANGED_FILES != ''
|
|
||||||
run: |
|
|
||||||
echo "Successfully uploaded translation files to POEditor."
|
|
||||||
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
|
|
||||||
echo "Manual trigger comment: ${{ github.event.inputs.comment }}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Notify on no changes
|
|
||||||
if: env.CHANGED_FILES == ''
|
|
||||||
run: |
|
|
||||||
echo "No translation files were found to upload."
|
|
||||||
@@ -109,7 +109,7 @@ client/src/
|
|||||||
- **Data Fetching**: SWR + Axios
|
- **Data Fetching**: SWR + Axios
|
||||||
- **Database**: MongoDB with Mongoose ODM
|
- **Database**: MongoDB with Mongoose ODM
|
||||||
- **Queue/Cache**: Redis + BullMQ + Pulse (cron scheduling)
|
- **Queue/Cache**: Redis + BullMQ + Pulse (cron scheduling)
|
||||||
- **i18n**: i18next + react-i18next (translations via PoEditor)
|
- **i18n**: i18next + react-i18next (non-English locales are machine translated, not managed through a translation service)
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -32,12 +32,13 @@
|
|||||||
|
|
||||||
<h1 align="center"><a href="https://bluewavelabs.ca" target="_blank">Checkmate</a></h1>
|
<h1 align="center"><a href="https://bluewavelabs.ca" target="_blank">Checkmate</a></h1>
|
||||||
|
|
||||||
<p align="center"><strong>An open source uptime and infrastructure monitoring application</strong></p>
|
<p align="center"><strong>An open source uptime and infrastructure monitoring application</strong>
|
||||||
|
|
||||||
[](https://www.pikapods.com/pods?run=checkmate)
|
[](https://www.pikapods.com/pods?run=checkmate)
|
||||||
|
|
||||||
<img width="1703" height="1041" alt="image" src="https://github.com/user-attachments/assets/0f4dcf38-9b42-4b84-8633-ff34778df1a8" />
|
|
||||||
|
|
||||||
|
<img width="1703" height="1041" alt="image" src="https://github.com/user-attachments/assets/0f4dcf38-9b42-4b84-8633-ff34778df1a8" />
|
||||||
|
</p>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
|
|
||||||
@@ -91,6 +92,10 @@ JWT_SECRET="$(openssl rand -hex 32)" docker compose up -d
|
|||||||
|
|
||||||
Then open http://localhost:52345. If the app is reached at another origin (domain or LAN IP), set `CLIENT_HOST` accordingly. To build the image yourself, run `docker build -f docker/Dockerfile -t checkmate .` from a checkout. For TLS, put any reverse proxy (Caddy, Traefik, nginx) in front of port 52345.
|
Then open http://localhost:52345. If the app is reached at another origin (domain or LAN IP), set `CLIENT_HOST` accordingly. To build the image yourself, run `docker build -f docker/Dockerfile -t checkmate .` from a checkout. For TLS, put any reverse proxy (Caddy, Traefik, nginx) in front of port 52345.
|
||||||
|
|
||||||
|
There are also 1-click installation options like [Repocloud](https://repocloud.io/details/Checkmate),
|
||||||
|
[Pikapods](https://www.pikapods.com/), [Coolify](https://coolify.io/), [Elestio](https://elest.io/open-source/checkmate), [K8s](../../charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) or [Cloudzy](https://cloudzy.com/marketplace/checkmate).
|
||||||
|
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
|
|
||||||
The image is configured entirely through environment variables on the server container:
|
The image is configured entirely through environment variables on the server container:
|
||||||
@@ -118,9 +123,9 @@ Alternatively, you can also use [Coolify](https://coolify.io/), [Elestio](https:
|
|||||||
|
|
||||||
### Using a Custom CA
|
### Using a Custom CA
|
||||||
|
|
||||||
If you need to monitor internal HTTPS endpoints with certificates from private Certificate Authorities (like Smallstep), see our [Custom CA Trust Guide](./docs/custom-ca-trust.md) for Docker configuration options.
|
If you need to monitor internal HTTPS endpoints with certificates from private Certificate Authorities (like Smallstep), see our [Custom CA Trust Guide](https://checkmate.so/docs/settings/custom-ca-trust) for Docker configuration options.
|
||||||
|
|
||||||
For more documentation, see the [docs directory](./docs/).
|
For more documentation, see the [Checkmate documentation](https://checkmate.so/docs).
|
||||||
|
|
||||||
<a id="performance"></a>
|
<a id="performance"></a>
|
||||||
## Performance
|
## Performance
|
||||||
@@ -207,9 +212,9 @@ Feel free to ask questions or share your ideas - we'd love to hear from you!
|
|||||||
<a id="contributing"></a>
|
<a id="contributing"></a>
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
We are [Alex](http://github.com/ajhollid) (team lead), [Gorkem](http://github.com/gorkem-bwl/), [Aryaman](https://github.com/Br0wnHammer), [Mert](https://github.com/mertssmnoglu) and [Karen](https://github.com/karenvicent) helping individuals and businesses monitor their infra and servers.
|
We are [Alex](http://github.com/ajhollid) (team lead), [Gorkem](http://github.com/gorkem-bwl/), [Aryaman](https://github.com/Br0wnHammer) and [Mert](https://github.com/mertssmnoglu) helping individuals and businesses monitor their infra and servers.
|
||||||
|
|
||||||
We pride ourselves on building strong connections with contributors at every level. Despite being a young project, Checkmate has already earned 7000+ stars and attracted 90+ contributors from around the globe.
|
We pride ourselves on building strong connections with contributors at every level. Despite being a young project, Checkmate has already earned almost 11K+ stars and attracted 150+ contributors from around the globe.
|
||||||
|
|
||||||
Our repo is starred by employees from **Google, Microsoft, Intel, Cisco, Tencent, Electronic Arts, ByteDance, JP Morgan Chase, Deloitte, Accenture, Foxconn, Broadcom, China Telecom, Barclays, Capgemini, Wipro, Cloudflare, Dassault Systèmes and NEC**, so don’t hold back — jump in, contribute and learn with us!
|
Our repo is starred by employees from **Google, Microsoft, Intel, Cisco, Tencent, Electronic Arts, ByteDance, JP Morgan Chase, Deloitte, Accenture, Foxconn, Broadcom, China Telecom, Barclays, Capgemini, Wipro, Cloudflare, Dassault Systèmes and NEC**, so don’t hold back — jump in, contribute and learn with us!
|
||||||
|
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "client",
|
"name": "client",
|
||||||
"version": "3.10.0",
|
"version": "3.11.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "client",
|
"name": "client",
|
||||||
"version": "3.10.0",
|
"version": "3.11.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@csstools/css-tokenizer": "^3.0.4",
|
"@csstools/css-tokenizer": "^3.0.4",
|
||||||
"@emotion/react": "^11.13.3",
|
"@emotion/react": "^11.13.3",
|
||||||
|
|||||||
+2
-1
@@ -1,9 +1,10 @@
|
|||||||
{
|
{
|
||||||
"name": "client",
|
"name": "client",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "3.10.0",
|
"version": "3.11.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
"lockfile": "docker run --rm -v \"$PWD\":/w -w /w $(grep -m1 -o 'node:[^ ]*' ../docker/Dockerfile) npm install --package-lock-only",
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "tsc -b && vite build",
|
"build": "tsc -b && vite build",
|
||||||
"build-dev": "tsc -b && vite build --mode development",
|
"build-dev": "tsc -b && vite build --mode development",
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import Menu from "@mui/material/Menu";
|
|||||||
import MenuItem from "@mui/material/MenuItem";
|
import MenuItem from "@mui/material/MenuItem";
|
||||||
import IconButton from "@mui/material/IconButton";
|
import IconButton from "@mui/material/IconButton";
|
||||||
import { Settings } from "lucide-react";
|
import { Settings } from "lucide-react";
|
||||||
|
import { useTheme } from "@mui/material/styles";
|
||||||
|
|
||||||
export type ActionMenuItem = {
|
export type ActionMenuItem = {
|
||||||
id: number | string;
|
id: number | string;
|
||||||
@@ -12,6 +13,7 @@ export type ActionMenuItem = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const ActionsMenu = ({ items }: { items: ActionMenuItem[] }) => {
|
export const ActionsMenu = ({ items }: { items: ActionMenuItem[] }) => {
|
||||||
|
const theme = useTheme();
|
||||||
const [anchorEl, setAnchorEl] = useState<null | any>(null);
|
const [anchorEl, setAnchorEl] = useState<null | any>(null);
|
||||||
const open = Boolean(anchorEl);
|
const open = Boolean(anchorEl);
|
||||||
|
|
||||||
@@ -27,7 +29,14 @@ export const ActionsMenu = ({ items }: { items: ActionMenuItem[] }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<IconButton onClick={handleClick}>
|
<IconButton
|
||||||
|
onClick={handleClick}
|
||||||
|
sx={{
|
||||||
|
"&:hover": {
|
||||||
|
backgroundColor: theme.palette.action.controlHover,
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
>
|
||||||
<Settings
|
<Settings
|
||||||
size={20}
|
size={20}
|
||||||
strokeWidth={1.5}
|
strokeWidth={1.5}
|
||||||
|
|||||||
@@ -6,12 +6,13 @@ import { useTheme } from "@mui/material/styles";
|
|||||||
import CircularProgress from "@mui/material/CircularProgress";
|
import CircularProgress from "@mui/material/CircularProgress";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { useMediaQuery } from "@mui/material";
|
import { useMediaQuery } from "@mui/material";
|
||||||
|
import type { DateRange } from "@/Types/Query";
|
||||||
|
|
||||||
interface MonitorTimeFrameHeaderProps {
|
interface MonitorTimeFrameHeaderProps {
|
||||||
isLoading?: boolean;
|
isLoading?: boolean;
|
||||||
hasDateRange?: boolean;
|
hasDateRange?: boolean;
|
||||||
dateRange: string;
|
dateRange: DateRange;
|
||||||
setDateRange: (dateRange: string) => void;
|
setDateRange: (dateRange: DateRange) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const HeaderTimeRange = ({
|
export const HeaderTimeRange = ({
|
||||||
@@ -25,7 +26,7 @@ export const HeaderTimeRange = ({
|
|||||||
const isSmallScreen = useMediaQuery(theme.breakpoints.down("md"));
|
const isSmallScreen = useMediaQuery(theme.breakpoints.down("md"));
|
||||||
const handleChange = (
|
const handleChange = (
|
||||||
_event: React.MouseEvent<HTMLElement>,
|
_event: React.MouseEvent<HTMLElement>,
|
||||||
newValue: string | null
|
newValue: DateRange | null
|
||||||
) => {
|
) => {
|
||||||
if (newValue !== null) {
|
if (newValue !== null) {
|
||||||
setDateRange(newValue);
|
setDateRange(newValue);
|
||||||
|
|||||||
@@ -10,8 +10,10 @@ import { useTheme } from "@mui/material/styles";
|
|||||||
type BaseChartProps = React.PropsWithChildren<{
|
type BaseChartProps = React.PropsWithChildren<{
|
||||||
icon?: React.ReactNode;
|
icon?: React.ReactNode;
|
||||||
title: string;
|
title: string;
|
||||||
|
rightTitle?: string;
|
||||||
width?: number | string;
|
width?: number | string;
|
||||||
maxWidth?: number | string;
|
maxWidth?: number | string;
|
||||||
|
flexBasis?: number | string;
|
||||||
padding?: number | string | ResponsiveStyleValue<number | string>;
|
padding?: number | string | ResponsiveStyleValue<number | string>;
|
||||||
onClick?: () => void;
|
onClick?: () => void;
|
||||||
}>;
|
}>;
|
||||||
@@ -19,8 +21,10 @@ type BaseChartProps = React.PropsWithChildren<{
|
|||||||
export const BaseChart = ({
|
export const BaseChart = ({
|
||||||
children,
|
children,
|
||||||
title,
|
title,
|
||||||
|
rightTitle,
|
||||||
width = "100%",
|
width = "100%",
|
||||||
maxWidth = "100%",
|
maxWidth = "100%",
|
||||||
|
flexBasis = "0%",
|
||||||
padding,
|
padding,
|
||||||
onClick,
|
onClick,
|
||||||
}: BaseChartProps) => {
|
}: BaseChartProps) => {
|
||||||
@@ -32,6 +36,7 @@ export const BaseChart = ({
|
|||||||
padding: padding ?? theme.spacing(LAYOUT.MD),
|
padding: padding ?? theme.spacing(LAYOUT.MD),
|
||||||
display: "flex",
|
display: "flex",
|
||||||
flex: 1,
|
flex: 1,
|
||||||
|
flexBasis,
|
||||||
width: width,
|
width: width,
|
||||||
maxWidth: maxWidth,
|
maxWidth: maxWidth,
|
||||||
...(onClick && {
|
...(onClick && {
|
||||||
@@ -44,13 +49,27 @@ export const BaseChart = ({
|
|||||||
gap={theme.spacing(LAYOUT.MD)}
|
gap={theme.spacing(LAYOUT.MD)}
|
||||||
flex={1}
|
flex={1}
|
||||||
>
|
>
|
||||||
<Typography
|
<Stack
|
||||||
variant="eyebrow"
|
direction="row"
|
||||||
color="text.secondary"
|
justifyContent={"space-between"}
|
||||||
sx={{ overflowWrap: "anywhere" }}
|
|
||||||
>
|
>
|
||||||
{title}
|
<Typography
|
||||||
</Typography>
|
variant="eyebrow"
|
||||||
|
color="text.secondary"
|
||||||
|
sx={{ overflowWrap: "anywhere" }}
|
||||||
|
>
|
||||||
|
{title}
|
||||||
|
</Typography>
|
||||||
|
{rightTitle && (
|
||||||
|
<Typography
|
||||||
|
variant="eyebrow"
|
||||||
|
color="text.secondary"
|
||||||
|
sx={{ overflowWrap: "anywhere" }}
|
||||||
|
>
|
||||||
|
{rightTitle}
|
||||||
|
</Typography>
|
||||||
|
)}
|
||||||
|
</Stack>
|
||||||
<Box flex={1}>{children}</Box>
|
<Box flex={1}>{children}</Box>
|
||||||
</Stack>
|
</Stack>
|
||||||
</BaseBox>
|
</BaseBox>
|
||||||
|
|||||||
@@ -83,12 +83,17 @@ export const Breadcrumb = ({
|
|||||||
const basePage = segments[0] || t("common.breadcrumbs.home");
|
const basePage = segments[0] || t("common.breadcrumbs.home");
|
||||||
|
|
||||||
const secondSegment = segments[1];
|
const secondSegment = segments[1];
|
||||||
|
const thirdSegment = segments[2];
|
||||||
const isActionPage = secondSegment && actionSegments.includes(secondSegment);
|
const isActionPage = secondSegment && actionSegments.includes(secondSegment);
|
||||||
const isDetailsPage = secondSegment && isId(secondSegment);
|
const isDetailsPage = secondSegment && isId(secondSegment);
|
||||||
const hasSubPage = isActionPage || isDetailsPage;
|
// page/section/:id routes such as docker/host/:monitorId
|
||||||
|
const isSectionDetailsPage = Boolean(
|
||||||
|
secondSegment && !isId(secondSegment) && thirdSegment && isId(thirdSegment)
|
||||||
|
);
|
||||||
|
const hasSubPage = isActionPage || isDetailsPage || isSectionDetailsPage;
|
||||||
|
|
||||||
const getSubPageLabel = (): string => {
|
const getSubPageLabel = (): string => {
|
||||||
if (isActionPage) {
|
if (isActionPage || isSectionDetailsPage) {
|
||||||
return secondSegment.charAt(0).toUpperCase() + secondSegment.slice(1);
|
return secondSegment.charAt(0).toUpperCase() + secondSegment.slice(1);
|
||||||
}
|
}
|
||||||
return t("common.breadcrumbs.details");
|
return t("common.breadcrumbs.details");
|
||||||
|
|||||||
@@ -39,9 +39,9 @@ export const Gauge = forwardRef<HTMLDivElement, GaugeProps>(function Gauge(
|
|||||||
() => ({
|
() => ({
|
||||||
circumference: 2 * Math.PI * radius,
|
circumference: 2 * Math.PI * radius,
|
||||||
totalSize: radius * 2 + strokeWidth * 2,
|
totalSize: radius * 2 + strokeWidth * 2,
|
||||||
strokeLength: (progress / 100) * (2 * Math.PI * radius),
|
strokeLength: (progressWithinRange / 100) * (2 * Math.PI * radius),
|
||||||
}),
|
}),
|
||||||
[radius, strokeWidth, progress]
|
[radius, strokeWidth, progressWithinRange]
|
||||||
);
|
);
|
||||||
|
|
||||||
const [offset, setOffset] = useState(circumference);
|
const [offset, setOffset] = useState(circumference);
|
||||||
@@ -52,7 +52,7 @@ export const Gauge = forwardRef<HTMLDivElement, GaugeProps>(function Gauge(
|
|||||||
}, 100);
|
}, 100);
|
||||||
|
|
||||||
return () => clearTimeout(timer);
|
return () => clearTimeout(timer);
|
||||||
}, [progress, circumference, strokeLength]);
|
}, [circumference, strokeLength]);
|
||||||
|
|
||||||
const fillColor = getInfraGaugeColor(progressWithinRange, theme);
|
const fillColor = getInfraGaugeColor(progressWithinRange, theme);
|
||||||
|
|
||||||
@@ -123,6 +123,7 @@ export const DetailGauge = ({
|
|||||||
lowerLabel,
|
lowerLabel,
|
||||||
lowerValue,
|
lowerValue,
|
||||||
maxWidth = 225,
|
maxWidth = 225,
|
||||||
|
flexBasis = "0%",
|
||||||
}: {
|
}: {
|
||||||
title: string;
|
title: string;
|
||||||
progress: number;
|
progress: number;
|
||||||
@@ -131,6 +132,7 @@ export const DetailGauge = ({
|
|||||||
lowerLabel?: string;
|
lowerLabel?: string;
|
||||||
lowerValue?: string | number;
|
lowerValue?: string | number;
|
||||||
maxWidth?: number;
|
maxWidth?: number;
|
||||||
|
flexBasis?: number | string;
|
||||||
}) => {
|
}) => {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
return (
|
return (
|
||||||
@@ -138,6 +140,7 @@ export const DetailGauge = ({
|
|||||||
icon={null}
|
icon={null}
|
||||||
title={title}
|
title={title}
|
||||||
maxWidth={maxWidth}
|
maxWidth={maxWidth}
|
||||||
|
flexBasis={flexBasis}
|
||||||
>
|
>
|
||||||
<Stack
|
<Stack
|
||||||
alignItems={"center"}
|
alignItems={"center"}
|
||||||
|
|||||||
@@ -11,9 +11,10 @@ import type { SxProps } from "@mui/material";
|
|||||||
type GradientBox = React.PropsWithChildren<{
|
type GradientBox = React.PropsWithChildren<{
|
||||||
palette?: PaletteKey;
|
palette?: PaletteKey;
|
||||||
sx?: SxProps;
|
sx?: SxProps;
|
||||||
|
interactive?: boolean;
|
||||||
}>;
|
}>;
|
||||||
|
|
||||||
export const GradientBox = ({ children, palette, sx }: GradientBox) => {
|
export const GradientBox = ({ children, palette, sx, interactive }: GradientBox) => {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
||||||
const isLight = theme.palette.mode === "light";
|
const isLight = theme.palette.mode === "light";
|
||||||
@@ -30,6 +31,12 @@ export const GradientBox = ({ children, palette, sx }: GradientBox) => {
|
|||||||
padding: `${theme.spacing(4)} ${theme.spacing(8)}`,
|
padding: `${theme.spacing(4)} ${theme.spacing(8)}`,
|
||||||
width: isSmall ? `100%` : `calc(25% - (3 * ${theme.spacing(8)} / 4))`,
|
width: isSmall ? `100%` : `calc(25% - (3 * ${theme.spacing(8)} / 4))`,
|
||||||
background: bg,
|
background: bg,
|
||||||
|
...(interactive && {
|
||||||
|
cursor: "pointer",
|
||||||
|
"&:hover": {
|
||||||
|
backgroundImage: `linear-gradient(${theme.palette.action.rowHover}, ${theme.palette.action.rowHover}), ${bg}`,
|
||||||
|
},
|
||||||
|
}),
|
||||||
...sx,
|
...sx,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@@ -62,10 +69,8 @@ export const StatBox = ({
|
|||||||
return (
|
return (
|
||||||
<GradientBox
|
<GradientBox
|
||||||
palette={palette}
|
palette={palette}
|
||||||
sx={{
|
interactive={Boolean(onClick)}
|
||||||
...(sx as object),
|
sx={{ ...(sx as object) }}
|
||||||
...(onClick ? { cursor: "pointer", "&:hover": { opacity: 0.95 } } : {}),
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
<Stack onClick={onClick}>
|
<Stack onClick={onClick}>
|
||||||
<Box sx={{ display: "flex", alignItems: "center", gap: theme.spacing(2) }}>
|
<Box sx={{ display: "flex", alignItems: "center", gap: theme.spacing(2) }}>
|
||||||
|
|||||||
@@ -1,12 +1,19 @@
|
|||||||
import Box from "@mui/material/Box";
|
import Box from "@mui/material/Box";
|
||||||
import { BaseBox } from "@/Components/design-elements";
|
import { BaseBox } from "@/Components/design-elements";
|
||||||
import Typography from "@mui/material/Typography";
|
import Typography from "@mui/material/Typography";
|
||||||
|
import Stack from "@mui/material/Stack";
|
||||||
|
|
||||||
import type { MonitorStatus } from "@/Types/Monitor";
|
import type { MonitorStatus } from "@/Types/Monitor";
|
||||||
import type { SxProps } from "@mui/material/styles";
|
import type { SxProps } from "@mui/material/styles";
|
||||||
import { getStatusPalette, getValuePalette } from "@/Utils/MonitorUtils";
|
import {
|
||||||
|
getDockerStatePalette,
|
||||||
|
getStatusPalette,
|
||||||
|
getValuePalette,
|
||||||
|
} from "@/Utils/MonitorUtils";
|
||||||
import { useTheme } from "@mui/material/styles";
|
import { useTheme } from "@mui/material/styles";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
|
import type { DockerContainerState } from "@/Types/Check";
|
||||||
|
import { SPACING } from "@/Utils/Theme/constants";
|
||||||
|
|
||||||
export const ValueTypes = ["positive", "negative", "neutral"] as const;
|
export const ValueTypes = ["positive", "negative", "neutral"] as const;
|
||||||
export type ValueType = (typeof ValueTypes)[number];
|
export type ValueType = (typeof ValueTypes)[number];
|
||||||
@@ -110,3 +117,36 @@ export const ColoredLabel = ({ text, color }: { text: string; color: string }) =
|
|||||||
</BaseBox>
|
</BaseBox>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const DockerStateLabel = ({
|
||||||
|
state,
|
||||||
|
name,
|
||||||
|
image,
|
||||||
|
}: {
|
||||||
|
state: DockerContainerState;
|
||||||
|
name: string;
|
||||||
|
image: string;
|
||||||
|
}) => {
|
||||||
|
const palette = getDockerStatePalette(state);
|
||||||
|
const theme = useTheme();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Stack
|
||||||
|
direction="row"
|
||||||
|
gap={SPACING.LG}
|
||||||
|
alignItems={"center"}
|
||||||
|
>
|
||||||
|
<Box
|
||||||
|
width={7}
|
||||||
|
height={7}
|
||||||
|
bgcolor={theme.palette[palette].light}
|
||||||
|
borderRadius="50%"
|
||||||
|
marginRight="5px"
|
||||||
|
/>
|
||||||
|
<Stack>
|
||||||
|
<Typography>{name}</Typography>
|
||||||
|
<Typography variant="body2">{image}</Typography>
|
||||||
|
</Stack>
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -79,6 +79,7 @@ export function DataTable<
|
|||||||
};
|
};
|
||||||
|
|
||||||
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
||||||
|
const isInteractive = Boolean(onRowClick) || expandableRows;
|
||||||
|
|
||||||
if (data.length === 0 || headers.length === 0) {
|
if (data.length === 0 || headers.length === 0) {
|
||||||
return (
|
return (
|
||||||
@@ -108,6 +109,11 @@ export function DataTable<
|
|||||||
borderRadius: theme.shape.borderRadius,
|
borderRadius: theme.shape.borderRadius,
|
||||||
padding: theme.spacing(LAYOUT.XS),
|
padding: theme.spacing(LAYOUT.XS),
|
||||||
cursor: onRowClick ? "pointer" : "default",
|
cursor: onRowClick ? "pointer" : "default",
|
||||||
|
...(onRowClick && {
|
||||||
|
"&:hover": {
|
||||||
|
backgroundColor: theme.palette.action.rowHover,
|
||||||
|
},
|
||||||
|
}),
|
||||||
}}
|
}}
|
||||||
key={key}
|
key={key}
|
||||||
>
|
>
|
||||||
@@ -207,6 +213,10 @@ export function DataTable<
|
|||||||
"& .MuiTableBody-root .MuiTableRow-root:last-child .MuiTableCell-root": {
|
"& .MuiTableBody-root .MuiTableRow-root:last-child .MuiTableCell-root": {
|
||||||
borderBottom: "none",
|
borderBottom: "none",
|
||||||
},
|
},
|
||||||
|
"& .MuiTableBody-root .MuiTableRow-root.is-clickable:hover .MuiTableCell-root":
|
||||||
|
{
|
||||||
|
backgroundColor: theme.palette.action.rowHover,
|
||||||
|
},
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<TableHead>
|
<TableHead>
|
||||||
@@ -231,8 +241,9 @@ export function DataTable<
|
|||||||
return (
|
return (
|
||||||
<Fragment key={key}>
|
<Fragment key={key}>
|
||||||
<TableRow
|
<TableRow
|
||||||
|
className={isInteractive ? "is-clickable" : undefined}
|
||||||
sx={{
|
sx={{
|
||||||
cursor: onRowClick ? "pointer" : "default",
|
cursor: isInteractive ? "pointer" : "default",
|
||||||
...(getRowSx?.(row) as object),
|
...(getRowSx?.(row) as object),
|
||||||
}}
|
}}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
@@ -292,6 +303,12 @@ interface TablePaginationActionsProps {
|
|||||||
onPageChange: (event: React.MouseEvent<HTMLButtonElement>, newPage: number) => void;
|
onPageChange: (event: React.MouseEvent<HTMLButtonElement>, newPage: number) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const controlHoverSx = (theme: Theme): SxProps<Theme> => ({
|
||||||
|
"&:hover": {
|
||||||
|
backgroundColor: theme.palette.action.controlHover,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
function TablePaginationActions(props: TablePaginationActionsProps) {
|
function TablePaginationActions(props: TablePaginationActionsProps) {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const { count, page, rowsPerPage, onPageChange } = props;
|
const { count, page, rowsPerPage, onPageChange } = props;
|
||||||
@@ -321,6 +338,7 @@ function TablePaginationActions(props: TablePaginationActionsProps) {
|
|||||||
onClick={handleFirstPageButtonClick}
|
onClick={handleFirstPageButtonClick}
|
||||||
disabled={page === 0}
|
disabled={page === 0}
|
||||||
aria-label="first page"
|
aria-label="first page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronsRight
|
<ChevronsRight
|
||||||
@@ -338,6 +356,7 @@ function TablePaginationActions(props: TablePaginationActionsProps) {
|
|||||||
onClick={handleBackButtonClick}
|
onClick={handleBackButtonClick}
|
||||||
disabled={page === 0}
|
disabled={page === 0}
|
||||||
aria-label="previous page"
|
aria-label="previous page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronRight
|
<ChevronRight
|
||||||
@@ -355,6 +374,7 @@ function TablePaginationActions(props: TablePaginationActionsProps) {
|
|||||||
onClick={handleNextButtonClick}
|
onClick={handleNextButtonClick}
|
||||||
disabled={page >= Math.ceil(count / rowsPerPage) - 1}
|
disabled={page >= Math.ceil(count / rowsPerPage) - 1}
|
||||||
aria-label="next page"
|
aria-label="next page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronLeft
|
<ChevronLeft
|
||||||
@@ -372,6 +392,7 @@ function TablePaginationActions(props: TablePaginationActionsProps) {
|
|||||||
onClick={handleLastPageButtonClick}
|
onClick={handleLastPageButtonClick}
|
||||||
disabled={page >= Math.ceil(count / rowsPerPage) - 1}
|
disabled={page >= Math.ceil(count / rowsPerPage) - 1}
|
||||||
aria-label="last page"
|
aria-label="last page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronsLeft
|
<ChevronsLeft
|
||||||
@@ -419,6 +440,7 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
|
|||||||
onClick={handleFirstPageButtonClick}
|
onClick={handleFirstPageButtonClick}
|
||||||
disabled={page === 0}
|
disabled={page === 0}
|
||||||
aria-label="first page"
|
aria-label="first page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronsRight
|
<ChevronsRight
|
||||||
@@ -436,6 +458,7 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
|
|||||||
onClick={handleBackButtonClick}
|
onClick={handleBackButtonClick}
|
||||||
disabled={page === 0}
|
disabled={page === 0}
|
||||||
aria-label="previous page"
|
aria-label="previous page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronRight
|
<ChevronRight
|
||||||
@@ -453,6 +476,7 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
|
|||||||
onClick={handleNextButtonClick}
|
onClick={handleNextButtonClick}
|
||||||
disabled={hasMore === false}
|
disabled={hasMore === false}
|
||||||
aria-label="next page"
|
aria-label="next page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronLeft
|
<ChevronLeft
|
||||||
@@ -470,6 +494,7 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
|
|||||||
<IconButton
|
<IconButton
|
||||||
disabled={hasMore === false}
|
disabled={hasMore === false}
|
||||||
aria-label="next page"
|
aria-label="next page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
<Ellipsis
|
<Ellipsis
|
||||||
size={20}
|
size={20}
|
||||||
|
|||||||
@@ -11,10 +11,11 @@ interface SelectInputProps<T> extends Omit<SelectProps<T>, "label"> {
|
|||||||
fieldLabel?: string;
|
fieldLabel?: string;
|
||||||
required?: boolean;
|
required?: boolean;
|
||||||
placeholder?: string;
|
placeholder?: string;
|
||||||
|
helperText?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const SelectInputInner = <T,>(
|
const SelectInputInner = <T,>(
|
||||||
{ fieldLabel, required, placeholder, ...props }: SelectInputProps<T>,
|
{ fieldLabel, required, placeholder, helperText, ...props }: SelectInputProps<T>,
|
||||||
ref: React.ForwardedRef<HTMLDivElement>
|
ref: React.ForwardedRef<HTMLDivElement>
|
||||||
) => {
|
) => {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
@@ -27,7 +28,7 @@ const SelectInputInner = <T,>(
|
|||||||
: selected === undefined || selected === null || selected === "";
|
: selected === undefined || selected === null || selected === "";
|
||||||
|
|
||||||
if (isEmpty && placeholder) {
|
if (isEmpty && placeholder) {
|
||||||
return <Typography sx={{ color: emptyPlaceholderColor }}>{placeholder}</Typography>;
|
return <Typography color={emptyPlaceholderColor}>{placeholder}</Typography>;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isMultiple) {
|
if (isMultiple) {
|
||||||
@@ -92,11 +93,21 @@ const SelectInputInner = <T,>(
|
|||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
if (fieldLabel) {
|
const helper = helperText ? (
|
||||||
|
<Typography
|
||||||
|
variant="caption"
|
||||||
|
color={props.error ? theme.palette.error.main : theme.palette.text.secondary}
|
||||||
|
>
|
||||||
|
{helperText}
|
||||||
|
</Typography>
|
||||||
|
) : null;
|
||||||
|
|
||||||
|
if (fieldLabel || helper) {
|
||||||
return (
|
return (
|
||||||
<Stack spacing={theme.spacing(2)}>
|
<Stack spacing={theme.spacing(2)}>
|
||||||
<FieldLabel required={required}>{fieldLabel}</FieldLabel>
|
{fieldLabel && <FieldLabel required={required}>{fieldLabel}</FieldLabel>}
|
||||||
{select}
|
{select}
|
||||||
|
{helper}
|
||||||
</Stack>
|
</Stack>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
} from "react-hook-form";
|
} from "react-hook-form";
|
||||||
import { LAYOUT } from "@/Utils/Theme/constants";
|
import { LAYOUT } from "@/Utils/Theme/constants";
|
||||||
import { RadioWithDescription } from "@/Components/inputs/Radio";
|
import { RadioWithDescription } from "@/Components/inputs/Radio";
|
||||||
|
import { FieldLabel } from "@/Components/inputs/FieldLabel";
|
||||||
export interface FormRadioOption {
|
export interface FormRadioOption {
|
||||||
value: string;
|
value: string;
|
||||||
label: string;
|
label: string;
|
||||||
@@ -17,10 +18,12 @@ export interface FormRadioOption {
|
|||||||
interface FormRadioGroupProps<T extends FieldValues> {
|
interface FormRadioGroupProps<T extends FieldValues> {
|
||||||
name: FieldPath<T>;
|
name: FieldPath<T>;
|
||||||
options: FormRadioOption[];
|
options: FormRadioOption[];
|
||||||
|
fieldLabel?: string;
|
||||||
}
|
}
|
||||||
export const FormRadioGroup = <T extends FieldValues>({
|
export const FormRadioGroup = <T extends FieldValues>({
|
||||||
name,
|
name,
|
||||||
options,
|
options,
|
||||||
|
fieldLabel,
|
||||||
}: FormRadioGroupProps<T>) => {
|
}: FormRadioGroupProps<T>) => {
|
||||||
const { control } = useFormContext<T>();
|
const { control } = useFormContext<T>();
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
@@ -30,6 +33,7 @@ export const FormRadioGroup = <T extends FieldValues>({
|
|||||||
control={control}
|
control={control}
|
||||||
render={({ field, fieldState }) => (
|
render={({ field, fieldState }) => (
|
||||||
<FormControl error={!!fieldState.error}>
|
<FormControl error={!!fieldState.error}>
|
||||||
|
{fieldLabel && <FieldLabel>{fieldLabel}</FieldLabel>}
|
||||||
<RadioGroup
|
<RadioGroup
|
||||||
{...field}
|
{...field}
|
||||||
sx={{ gap: theme.spacing(LAYOUT.MD) }}
|
sx={{ gap: theme.spacing(LAYOUT.MD) }}
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ export const FormSelectField = <T extends FieldValues>({
|
|||||||
}}
|
}}
|
||||||
error={!!fieldState.error}
|
error={!!fieldState.error}
|
||||||
{...rest}
|
{...rest}
|
||||||
|
helperText={fieldState.error?.message ?? rest.helperText}
|
||||||
>
|
>
|
||||||
{options.map((option) => (
|
{options.map((option) => (
|
||||||
<MenuItem
|
<MenuItem
|
||||||
|
|||||||
@@ -9,12 +9,11 @@ import type { Tag } from "@/Types/Tag";
|
|||||||
import { Typography, useTheme } from "@mui/material";
|
import { Typography, useTheme } from "@mui/material";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
const types = ["http", "ping", "port", "docker", "game", "grpc", "websocket"];
|
const types = ["http", "ping", "port", "game", "grpc", "websocket"];
|
||||||
const typeDisplayNames: Record<string, string> = {
|
const typeDisplayNames: Record<string, string> = {
|
||||||
http: "HTTP",
|
http: "HTTP",
|
||||||
ping: "Ping",
|
ping: "Ping",
|
||||||
port: "Port",
|
port: "Port",
|
||||||
docker: "Docker",
|
|
||||||
game: "Game",
|
game: "Game",
|
||||||
grpc: "gRPC",
|
grpc: "gRPC",
|
||||||
websocket: "WebSocket",
|
websocket: "WebSocket",
|
||||||
|
|||||||
@@ -0,0 +1,156 @@
|
|||||||
|
import { HeaderCreate } from "@/Components/common";
|
||||||
|
import { ColoredLabel, MonitorBasePageWithStates } from "@/Components/design-elements";
|
||||||
|
import { BulkActionsBar } from "@/Components/monitors/BulkActionsBar";
|
||||||
|
import { ControlsFilter } from "@/Components/monitors/ControlsFilter";
|
||||||
|
import { HeaderMonitorsSummary } from "@/Components/monitors/HeaderMonitorsSummary";
|
||||||
|
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
||||||
|
import type { MonitorListController } from "@/Hooks/useMonitorListController";
|
||||||
|
import { useMediaQuery, useTheme } from "@mui/material";
|
||||||
|
import { SPACING } from "@/Utils/Theme/constants";
|
||||||
|
|
||||||
|
import Stack from "@mui/material/Stack";
|
||||||
|
import Typography from "@mui/material/Typography";
|
||||||
|
import { TextField, Button, Dialog } from "@/Components/inputs";
|
||||||
|
import type { ReactNode } from "react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { Pause, Play } from "lucide-react";
|
||||||
|
|
||||||
|
interface MonitorListPageProps {
|
||||||
|
headerKey: string;
|
||||||
|
page: string;
|
||||||
|
actionLink: string;
|
||||||
|
controller: MonitorListController;
|
||||||
|
bulkActions?: boolean;
|
||||||
|
showTypeFilter?: boolean;
|
||||||
|
summaryProps?: { showBreached?: boolean };
|
||||||
|
priorityFallback?: ReactNode;
|
||||||
|
extraLoading?: boolean;
|
||||||
|
extraError?: unknown;
|
||||||
|
children: ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Base monitor list page, all monitors pages are nearly identical, but with different tables.
|
||||||
|
|
||||||
|
export const MonitorListPage = ({
|
||||||
|
headerKey,
|
||||||
|
page,
|
||||||
|
actionLink,
|
||||||
|
controller: c,
|
||||||
|
bulkActions,
|
||||||
|
showTypeFilter,
|
||||||
|
summaryProps,
|
||||||
|
priorityFallback,
|
||||||
|
extraLoading,
|
||||||
|
extraError,
|
||||||
|
children,
|
||||||
|
}: MonitorListPageProps) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const theme = useTheme();
|
||||||
|
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
||||||
|
const isAdmin = useIsAdmin();
|
||||||
|
const isLoading = c.isLoading || Boolean(extraLoading);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<MonitorBasePageWithStates
|
||||||
|
headerKey={headerKey}
|
||||||
|
loading={isLoading}
|
||||||
|
error={c.error || extraError}
|
||||||
|
totalCount={c.effectiveTotalCount}
|
||||||
|
page={page}
|
||||||
|
actionLink={actionLink}
|
||||||
|
priorityFallback={priorityFallback}
|
||||||
|
>
|
||||||
|
<HeaderCreate
|
||||||
|
path={actionLink}
|
||||||
|
isLoading={isLoading}
|
||||||
|
isAdmin={isAdmin}
|
||||||
|
/>
|
||||||
|
<HeaderMonitorsSummary
|
||||||
|
summary={c.summary}
|
||||||
|
{...summaryProps}
|
||||||
|
/>
|
||||||
|
<Stack
|
||||||
|
direction={isSmall ? "column" : "row"}
|
||||||
|
justifyContent={isSmall ? "flex-start" : "space-between"}
|
||||||
|
gap={theme.spacing(4)}
|
||||||
|
>
|
||||||
|
<ControlsFilter
|
||||||
|
{...(showTypeFilter === false
|
||||||
|
? { showTypes: false }
|
||||||
|
: {
|
||||||
|
selectedTypes: c.selectedTypes,
|
||||||
|
setSelectedTypes: c.setSelectedTypes,
|
||||||
|
})}
|
||||||
|
selectedStatus={c.selectedStatus}
|
||||||
|
setSelectedStatus={c.setSelectedStatus}
|
||||||
|
selectedState={c.selectedState}
|
||||||
|
setSelectedState={c.setSelectedState}
|
||||||
|
tagOptions={c.tags ?? []}
|
||||||
|
selectedTags={c.selectedTags}
|
||||||
|
setSelectedTags={c.setSelectedTags}
|
||||||
|
onClearFilters={c.handleClearFilters}
|
||||||
|
/>
|
||||||
|
<TextField
|
||||||
|
placeholder={t("pages.uptime.filters.search.placeholder")}
|
||||||
|
value={c.search}
|
||||||
|
onChange={(event) => {
|
||||||
|
c.setSearch(event.target.value);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
{c.selectedTags.length > 0 && (
|
||||||
|
<Stack
|
||||||
|
direction={isSmall ? "column" : "row"}
|
||||||
|
alignItems={isSmall ? "flex-start" : "center"}
|
||||||
|
flexWrap="wrap"
|
||||||
|
gap={theme.spacing(SPACING.XL)}
|
||||||
|
>
|
||||||
|
<Typography color={theme.palette.text.secondary}>
|
||||||
|
{t("pages.uptime.filters.activeTags")}
|
||||||
|
</Typography>
|
||||||
|
{c.selectedTags.map((tagId) => {
|
||||||
|
const tag = c.tags?.find((t) => t.id === tagId);
|
||||||
|
if (!tag) return null;
|
||||||
|
return (
|
||||||
|
<ColoredLabel
|
||||||
|
key={tag.id}
|
||||||
|
text={tag.name}
|
||||||
|
color={tag.color}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Stack>
|
||||||
|
)}
|
||||||
|
{bulkActions && !isLoading && (
|
||||||
|
<BulkActionsBar
|
||||||
|
selectedCount={c.selectedRows.length}
|
||||||
|
onCancel={c.handleCancelSelection}
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
startIcon={<Play size={16} />}
|
||||||
|
onClick={c.handleBulkResume}
|
||||||
|
>
|
||||||
|
{t("common.buttons.resume")}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
startIcon={<Pause size={16} />}
|
||||||
|
onClick={c.handleBulkPause}
|
||||||
|
>
|
||||||
|
{t("common.buttons.pause")}
|
||||||
|
</Button>
|
||||||
|
</BulkActionsBar>
|
||||||
|
)}
|
||||||
|
{children}
|
||||||
|
<Dialog
|
||||||
|
open={c.isDialogOpen}
|
||||||
|
title={t("common.dialogs.delete.title")}
|
||||||
|
content={t("common.dialogs.delete.description")}
|
||||||
|
onConfirm={c.handleConfirmDelete}
|
||||||
|
onCancel={c.handleCancelDelete}
|
||||||
|
loading={c.isDeleting}
|
||||||
|
/>
|
||||||
|
</MonitorBasePageWithStates>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
export const computeYAxisCap = (values: number[]): number | undefined => {
|
|
||||||
const sorted = values.slice().sort((a, b) => a - b);
|
|
||||||
if (sorted.length < 2) return undefined;
|
|
||||||
const p95 = sorted[Math.min(sorted.length - 1, Math.floor(sorted.length * 0.95))];
|
|
||||||
return p95 > 0 ? Math.ceil(p95 * 2) : undefined;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const PHASE_KEYS = [
|
|
||||||
"avgDns",
|
|
||||||
"avgTcp",
|
|
||||||
"avgTls",
|
|
||||||
"avgRequest",
|
|
||||||
"avgFirstByte",
|
|
||||||
"avgDownload",
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
export const PHASE_COLOR_KEYS = {
|
|
||||||
avgDns: "dns",
|
|
||||||
avgTcp: "tcp",
|
|
||||||
avgTls: "tls",
|
|
||||||
avgRequest: "request",
|
|
||||||
avgFirstByte: "firstByte",
|
|
||||||
avgDownload: "download",
|
|
||||||
} as const;
|
|
||||||
|
|
||||||
// i18n keys, resolved with t() at render
|
|
||||||
export const PHASE_LABEL_KEYS: Record<(typeof PHASE_KEYS)[number], string> = {
|
|
||||||
avgDns: "common.charts.phases.dns",
|
|
||||||
avgTcp: "common.charts.phases.tcp",
|
|
||||||
avgTls: "common.charts.phases.tls",
|
|
||||||
avgRequest: "common.charts.phases.request",
|
|
||||||
avgFirstByte: "common.charts.phases.firstByte",
|
|
||||||
avgDownload: "common.charts.phases.download",
|
|
||||||
};
|
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
export const computeYAxisCap = (values: number[]): number | undefined => {
|
||||||
|
const sorted = values.slice().sort((a, b) => a - b);
|
||||||
|
if (sorted.length < 2) return undefined;
|
||||||
|
const p95 = sorted[Math.min(sorted.length - 1, Math.floor(sorted.length * 0.95))];
|
||||||
|
return p95 > 0 ? Math.ceil(p95 * 2) : undefined;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const PHASE_KEYS = [
|
||||||
|
"avgDns",
|
||||||
|
"avgTcp",
|
||||||
|
"avgTls",
|
||||||
|
"avgRequest",
|
||||||
|
"avgFirstByte",
|
||||||
|
"avgDownload",
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
export const PHASE_COLOR_KEYS = {
|
||||||
|
avgDns: "dns",
|
||||||
|
avgTcp: "tcp",
|
||||||
|
avgTls: "tls",
|
||||||
|
avgRequest: "request",
|
||||||
|
avgFirstByte: "firstByte",
|
||||||
|
avgDownload: "download",
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
// i18n keys, resolved with t() at render
|
||||||
|
export const PHASE_LABEL_KEYS: Record<(typeof PHASE_KEYS)[number], string> = {
|
||||||
|
avgDns: "common.charts.phases.dns",
|
||||||
|
avgTcp: "common.charts.phases.tcp",
|
||||||
|
avgTls: "common.charts.phases.tls",
|
||||||
|
avgRequest: "common.charts.phases.request",
|
||||||
|
avgFirstByte: "common.charts.phases.firstByte",
|
||||||
|
avgDownload: "common.charts.phases.download",
|
||||||
|
};
|
||||||
|
|
||||||
|
export const AREA_COLORS = [
|
||||||
|
// Blues
|
||||||
|
"#3182bd", // Deep blue
|
||||||
|
"#6baed6", // Medium blue
|
||||||
|
"#9ecae1", // Light blue
|
||||||
|
|
||||||
|
// Greens
|
||||||
|
"#74c476", // Soft green
|
||||||
|
"#a1d99b", // Light green
|
||||||
|
"#c7e9c0", // Pale green
|
||||||
|
|
||||||
|
// Oranges
|
||||||
|
"#fdae6b", // Warm orange
|
||||||
|
"#fdd0a2", // Light orange
|
||||||
|
"#feedde", // Pale orange
|
||||||
|
|
||||||
|
// Purples
|
||||||
|
"#9467bd", // Lavender
|
||||||
|
"#a55194", // Deep magenta
|
||||||
|
"#c994c7", // Soft magenta
|
||||||
|
|
||||||
|
// Reds
|
||||||
|
"#ff9896", // Soft red
|
||||||
|
"#de2d26", // Deep red
|
||||||
|
"#fc9272", // Medium red
|
||||||
|
|
||||||
|
// Cyans/Teals
|
||||||
|
"#17becf", // Cyan
|
||||||
|
"#7fcdbb", // Teal
|
||||||
|
"#a1dab4", // Light teal
|
||||||
|
|
||||||
|
// Yellows
|
||||||
|
"#fec44f", // Mustard
|
||||||
|
"#fee391", // Light yellow
|
||||||
|
"#ffffd4", // Pale yellow
|
||||||
|
|
||||||
|
// Additional colors
|
||||||
|
"#e377c2", // Soft pink
|
||||||
|
"#bcbd22", // Olive
|
||||||
|
"#2ca02c", // Vibrant green
|
||||||
|
];
|
||||||
|
|
||||||
|
export const createGradient = ({
|
||||||
|
id,
|
||||||
|
startColor,
|
||||||
|
endColor,
|
||||||
|
startOpacity = 0.8,
|
||||||
|
endOpacity = 0,
|
||||||
|
direction = "vertical",
|
||||||
|
}: {
|
||||||
|
id: string;
|
||||||
|
startColor: string;
|
||||||
|
endColor: string;
|
||||||
|
startOpacity?: number;
|
||||||
|
endOpacity?: number;
|
||||||
|
direction?: "vertical" | "horizontal";
|
||||||
|
}) => (
|
||||||
|
<defs>
|
||||||
|
<linearGradient
|
||||||
|
id={id}
|
||||||
|
x1={direction === "vertical" ? "0" : "0"}
|
||||||
|
y1={direction === "vertical" ? "0" : "0"}
|
||||||
|
x2={direction === "vertical" ? "0" : "1"}
|
||||||
|
y2={direction === "vertical" ? "1" : "0"}
|
||||||
|
>
|
||||||
|
<stop
|
||||||
|
offset="0%"
|
||||||
|
stopColor={startColor}
|
||||||
|
stopOpacity={startOpacity}
|
||||||
|
/>
|
||||||
|
<stop
|
||||||
|
offset="100%"
|
||||||
|
stopColor={endColor}
|
||||||
|
stopOpacity={endOpacity}
|
||||||
|
/>
|
||||||
|
</linearGradient>
|
||||||
|
</defs>
|
||||||
|
);
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
import { BaseChart } from "@/Components/design-elements";
|
||||||
|
import { Area, AreaChart, CartesianGrid, ResponsiveContainer } from "recharts";
|
||||||
|
|
||||||
|
// Types
|
||||||
|
import type { DockerContainerStats } from "@/Types/Monitor";
|
||||||
|
|
||||||
|
// Hooks
|
||||||
|
import { useTheme } from "@mui/material";
|
||||||
|
import { Fragment, useId } from "react";
|
||||||
|
|
||||||
|
// Utils
|
||||||
|
import { createGradient } from "@/Components/monitors/charts/ChartUtils";
|
||||||
|
interface HistogramDockerContainerProps {
|
||||||
|
title: string;
|
||||||
|
rightTitle: string;
|
||||||
|
stats: DockerContainerStats;
|
||||||
|
dataKey: string;
|
||||||
|
strokeColor: string;
|
||||||
|
gradientStartColor: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const HistogramDockerContainer = ({
|
||||||
|
title,
|
||||||
|
rightTitle,
|
||||||
|
stats,
|
||||||
|
dataKey,
|
||||||
|
strokeColor,
|
||||||
|
gradientStartColor,
|
||||||
|
}: HistogramDockerContainerProps) => {
|
||||||
|
const uniqueId = useId();
|
||||||
|
const theme = useTheme();
|
||||||
|
const gradientId = `gradient-${uniqueId}`;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<BaseChart
|
||||||
|
icon="null"
|
||||||
|
title={title}
|
||||||
|
rightTitle={rightTitle}
|
||||||
|
>
|
||||||
|
<ResponsiveContainer
|
||||||
|
width="100%"
|
||||||
|
height={200}
|
||||||
|
>
|
||||||
|
<AreaChart data={stats.aggregate}>
|
||||||
|
<CartesianGrid
|
||||||
|
strokeWidth={1}
|
||||||
|
stroke={theme.palette.divider}
|
||||||
|
strokeOpacity={1}
|
||||||
|
fill="transparent"
|
||||||
|
vertical={false}
|
||||||
|
/>
|
||||||
|
<Fragment>
|
||||||
|
{createGradient({
|
||||||
|
id: gradientId,
|
||||||
|
startColor: gradientStartColor,
|
||||||
|
endColor: "transparent",
|
||||||
|
direction: "vertical",
|
||||||
|
})}
|
||||||
|
<Area
|
||||||
|
dataKey={dataKey}
|
||||||
|
type="monotone"
|
||||||
|
stroke={strokeColor}
|
||||||
|
fill={`url(#${gradientId})`}
|
||||||
|
/>
|
||||||
|
</Fragment>
|
||||||
|
</AreaChart>
|
||||||
|
</ResponsiveContainer>
|
||||||
|
</BaseChart>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -12,85 +12,7 @@ import { XTick } from "@/Components/monitors/charts/XTick";
|
|||||||
|
|
||||||
import { useTheme } from "@mui/material/styles";
|
import { useTheme } from "@mui/material/styles";
|
||||||
import type { HardwareCheckStats } from "@/Types/Monitor";
|
import type { HardwareCheckStats } from "@/Types/Monitor";
|
||||||
|
import { AREA_COLORS, createGradient } from "@/Components/monitors/charts/ChartUtils";
|
||||||
const AREA_COLORS = [
|
|
||||||
// Blues
|
|
||||||
"#3182bd", // Deep blue
|
|
||||||
"#6baed6", // Medium blue
|
|
||||||
"#9ecae1", // Light blue
|
|
||||||
|
|
||||||
// Greens
|
|
||||||
"#74c476", // Soft green
|
|
||||||
"#a1d99b", // Light green
|
|
||||||
"#c7e9c0", // Pale green
|
|
||||||
|
|
||||||
// Oranges
|
|
||||||
"#fdae6b", // Warm orange
|
|
||||||
"#fdd0a2", // Light orange
|
|
||||||
"#feedde", // Pale orange
|
|
||||||
|
|
||||||
// Purples
|
|
||||||
"#9467bd", // Lavender
|
|
||||||
"#a55194", // Deep magenta
|
|
||||||
"#c994c7", // Soft magenta
|
|
||||||
|
|
||||||
// Reds
|
|
||||||
"#ff9896", // Soft red
|
|
||||||
"#de2d26", // Deep red
|
|
||||||
"#fc9272", // Medium red
|
|
||||||
|
|
||||||
// Cyans/Teals
|
|
||||||
"#17becf", // Cyan
|
|
||||||
"#7fcdbb", // Teal
|
|
||||||
"#a1dab4", // Light teal
|
|
||||||
|
|
||||||
// Yellows
|
|
||||||
"#fec44f", // Mustard
|
|
||||||
"#fee391", // Light yellow
|
|
||||||
"#ffffd4", // Pale yellow
|
|
||||||
|
|
||||||
// Additional colors
|
|
||||||
"#e377c2", // Soft pink
|
|
||||||
"#bcbd22", // Olive
|
|
||||||
"#2ca02c", // Vibrant green
|
|
||||||
];
|
|
||||||
|
|
||||||
const createGradient = ({
|
|
||||||
id,
|
|
||||||
startColor,
|
|
||||||
endColor,
|
|
||||||
startOpacity = 0.8,
|
|
||||||
endOpacity = 0,
|
|
||||||
direction = "vertical",
|
|
||||||
}: {
|
|
||||||
id: string;
|
|
||||||
startColor: string;
|
|
||||||
endColor: string;
|
|
||||||
startOpacity?: number;
|
|
||||||
endOpacity?: number;
|
|
||||||
direction?: "vertical" | "horizontal";
|
|
||||||
}) => (
|
|
||||||
<defs>
|
|
||||||
<linearGradient
|
|
||||||
id={id}
|
|
||||||
x1={direction === "vertical" ? "0" : "0"}
|
|
||||||
y1={direction === "vertical" ? "0" : "0"}
|
|
||||||
x2={direction === "vertical" ? "0" : "1"}
|
|
||||||
y2={direction === "vertical" ? "1" : "0"}
|
|
||||||
>
|
|
||||||
<stop
|
|
||||||
offset="0%"
|
|
||||||
stopColor={startColor}
|
|
||||||
stopOpacity={startOpacity}
|
|
||||||
/>
|
|
||||||
<stop
|
|
||||||
offset="100%"
|
|
||||||
stopColor={endColor}
|
|
||||||
stopOpacity={endOpacity}
|
|
||||||
/>
|
|
||||||
</linearGradient>
|
|
||||||
</defs>
|
|
||||||
);
|
|
||||||
|
|
||||||
export const HistogramInfrastructure = ({
|
export const HistogramInfrastructure = ({
|
||||||
dateRange,
|
dateRange,
|
||||||
|
|||||||
@@ -15,3 +15,4 @@ export * from "./charts/HistogramPageSpeedDetailsTooltip";
|
|||||||
export * from "./charts/HistogramInfrastructure";
|
export * from "./charts/HistogramInfrastructure";
|
||||||
export * from "./HeaderMonitorsSummary";
|
export * from "./HeaderMonitorsSummary";
|
||||||
export * from "./BulkActionsBar";
|
export * from "./BulkActionsBar";
|
||||||
|
export * from "./MonitorListPage";
|
||||||
@@ -18,64 +18,95 @@ import {
|
|||||||
Lock,
|
Lock,
|
||||||
Users,
|
Users,
|
||||||
Tag,
|
Tag,
|
||||||
|
Waypoints,
|
||||||
|
Container,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
|
|
||||||
export const getMenu = (t: Function) => {
|
export const getMenu = (t: Function) => {
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
name: t("components.sidebar.menu.uptime"),
|
group: t("components.sidebar.menu.groups.monitoring"),
|
||||||
path: "uptime",
|
items: [
|
||||||
icon: <Icon icon={Globe} />,
|
{
|
||||||
|
name: t("components.sidebar.menu.uptime"),
|
||||||
|
path: "uptime",
|
||||||
|
icon: <Icon icon={Globe} />,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: t("components.sidebar.menu.pagespeed"),
|
||||||
|
path: "pagespeed",
|
||||||
|
icon: <Icon icon={Gauge} />,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: t("components.sidebar.menu.infrastructure"),
|
||||||
|
path: "infrastructure",
|
||||||
|
icon: <Icon icon={Link} />,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: t("components.sidebar.menu.docker"),
|
||||||
|
path: "docker",
|
||||||
|
icon: <Icon icon={Container} />,
|
||||||
|
},
|
||||||
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: t("components.sidebar.menu.pagespeed"),
|
group: t("components.sidebar.menu.groups.alerting"),
|
||||||
path: "pagespeed",
|
items: [
|
||||||
icon: <Icon icon={Gauge} />,
|
{
|
||||||
|
name: t("components.sidebar.menu.incidents"),
|
||||||
|
path: "incidents",
|
||||||
|
icon: <Icon icon={AlertTriangle} />,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: t("components.sidebar.menu.notifications"),
|
||||||
|
path: "notifications",
|
||||||
|
icon: <Icon icon={Bell} />,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: t("components.sidebar.menu.maintenance"),
|
||||||
|
path: "maintenance",
|
||||||
|
icon: <Icon icon={Wrench} />,
|
||||||
|
},
|
||||||
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: t("components.sidebar.menu.infrastructure"),
|
group: t("components.sidebar.menu.groups.reporting"),
|
||||||
path: "infrastructure",
|
items: [
|
||||||
icon: <Icon icon={Link} />,
|
{
|
||||||
|
name: t("components.sidebar.menu.statusPages"),
|
||||||
|
path: "status",
|
||||||
|
icon: <Icon icon={Wifi} />,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: t("components.sidebar.menu.checks"),
|
||||||
|
path: "checks",
|
||||||
|
icon: <Icon icon={FileText} />,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: t("components.sidebar.menu.logs"),
|
||||||
|
path: "logs",
|
||||||
|
icon: <Icon icon={ScrollText} />,
|
||||||
|
},
|
||||||
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: t("components.sidebar.menu.notifications"),
|
group: t("components.sidebar.menu.groups.configuration"),
|
||||||
path: "notifications",
|
items: [
|
||||||
icon: <Icon icon={Bell} />,
|
{
|
||||||
},
|
name: t("components.sidebar.menu.tags"),
|
||||||
{
|
path: "tags",
|
||||||
name: t("components.sidebar.menu.tags"),
|
icon: <Icon icon={Tag} />,
|
||||||
path: "tags",
|
},
|
||||||
icon: <Icon icon={Tag} />,
|
{
|
||||||
},
|
name: t("components.sidebar.menu.proxies"),
|
||||||
{
|
path: "proxies",
|
||||||
name: t("components.sidebar.menu.checks"),
|
icon: <Icon icon={Waypoints} />,
|
||||||
path: "checks",
|
},
|
||||||
icon: <Icon icon={FileText} />,
|
{
|
||||||
},
|
name: t("components.sidebar.menu.settings"),
|
||||||
{
|
path: "settings",
|
||||||
name: t("components.sidebar.menu.incidents"),
|
icon: <Icon icon={Settings} />,
|
||||||
path: "incidents",
|
},
|
||||||
icon: <Icon icon={AlertTriangle} />,
|
],
|
||||||
},
|
|
||||||
{
|
|
||||||
name: t("components.sidebar.menu.statusPages"),
|
|
||||||
path: "status",
|
|
||||||
icon: <Icon icon={Wifi} />,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: t("components.sidebar.menu.maintenance"),
|
|
||||||
path: "maintenance",
|
|
||||||
icon: <Icon icon={Wrench} />,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: t("components.sidebar.menu.logs"),
|
|
||||||
path: "logs",
|
|
||||||
icon: <Icon icon={ScrollText} />,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: t("components.sidebar.menu.settings"),
|
|
||||||
icon: <Icon icon={Settings} />,
|
|
||||||
path: "settings",
|
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
import Backdrop from "@mui/material/Backdrop";
|
import Backdrop from "@mui/material/Backdrop";
|
||||||
import Stack from "@mui/material/Stack";
|
import Stack from "@mui/material/Stack";
|
||||||
|
import Box from "@mui/material/Box";
|
||||||
|
import Typography from "@mui/material/Typography";
|
||||||
import List from "@mui/material/List";
|
import List from "@mui/material/List";
|
||||||
import Divider from "@mui/material/Divider";
|
import Divider from "@mui/material/Divider";
|
||||||
import { LAYOUT } from "@/Utils/Theme/constants";
|
import { LAYOUT } from "@/Utils/Theme/constants";
|
||||||
|
import { typographyLevels } from "@/Utils/Theme/Palette";
|
||||||
import { useSidebar } from "@/Hooks/useSidebar.js";
|
import { useSidebar } from "@/Hooks/useSidebar.js";
|
||||||
import { Logo } from "@/Components/sidebar/Logo";
|
import { Logo } from "@/Components/sidebar/Logo";
|
||||||
import { getMenu, getAccountMenu } from "@/Components/sidebar/Menu";
|
import { getMenu, getAccountMenu } from "@/Components/sidebar/Menu";
|
||||||
@@ -29,7 +32,7 @@ export const Sidebar = () => {
|
|||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { width, transition, collapsed } = useSidebar();
|
const { width, transition, transitionTiming, collapsed } = useSidebar();
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
||||||
const menu = getMenu(t);
|
const menu = getMenu(t);
|
||||||
@@ -89,17 +92,52 @@ export const Sidebar = () => {
|
|||||||
pt={theme.spacing(LAYOUT.MD)}
|
pt={theme.spacing(LAYOUT.MD)}
|
||||||
pb={theme.spacing(LAYOUT.MD)}
|
pb={theme.spacing(LAYOUT.MD)}
|
||||||
/>
|
/>
|
||||||
{menu.map((item) => {
|
{menu.map((group) => (
|
||||||
const selected = location.pathname.startsWith(`/${item.path}`);
|
<Box key={group.group}>
|
||||||
return (
|
<Box
|
||||||
<NavItem
|
position="relative"
|
||||||
key={item.path}
|
overflow="hidden"
|
||||||
item={item}
|
>
|
||||||
selected={selected}
|
<Typography
|
||||||
onClick={() => handleNavClick(item.path)}
|
variant="eyebrow"
|
||||||
/>
|
component="div"
|
||||||
);
|
color={theme.palette.text.disabled}
|
||||||
})}
|
fontSize={typographyLevels.s}
|
||||||
|
paddingLeft={theme.spacing(5)}
|
||||||
|
paddingTop={theme.spacing(LAYOUT.SM)}
|
||||||
|
paddingBottom={theme.spacing(LAYOUT.XXS)}
|
||||||
|
whiteSpace="nowrap"
|
||||||
|
sx={{
|
||||||
|
opacity: collapsed ? 0 : 1,
|
||||||
|
transition: `opacity ${transitionTiming}`,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{group.group}
|
||||||
|
</Typography>
|
||||||
|
<Divider
|
||||||
|
sx={{
|
||||||
|
position: "absolute",
|
||||||
|
top: "50%",
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
opacity: collapsed ? 1 : 0,
|
||||||
|
transition: `opacity ${transitionTiming}`,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
{group.items.map((item) => {
|
||||||
|
const selected = location.pathname.startsWith(`/${item.path}`);
|
||||||
|
return (
|
||||||
|
<NavItem
|
||||||
|
key={item.path}
|
||||||
|
item={item}
|
||||||
|
selected={selected}
|
||||||
|
onClick={() => handleNavClick(item.path)}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Box>
|
||||||
|
))}
|
||||||
</List>
|
</List>
|
||||||
<StarPrompt />
|
<StarPrompt />
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,14 @@ import { createSlice, type PayloadAction } from "@reduxjs/toolkit";
|
|||||||
|
|
||||||
type ThemeMode = "light" | "dark";
|
type ThemeMode = "light" | "dark";
|
||||||
type ChartType = "histogram" | "line";
|
type ChartType = "histogram" | "line";
|
||||||
type TableName = "monitors" | "team" | "maintenance" | "infrastructure" | "logs";
|
type TableName =
|
||||||
|
| "monitors"
|
||||||
|
| "team"
|
||||||
|
| "maintenance"
|
||||||
|
| "infrastructure"
|
||||||
|
| "logs"
|
||||||
|
| "pagespeed"
|
||||||
|
| "docker";
|
||||||
|
|
||||||
interface TableState {
|
interface TableState {
|
||||||
rowsPerPage: number;
|
rowsPerPage: number;
|
||||||
@@ -14,9 +21,11 @@ interface SidebarState {
|
|||||||
|
|
||||||
interface UIState {
|
interface UIState {
|
||||||
monitors: TableState;
|
monitors: TableState;
|
||||||
|
pagespeed: TableState;
|
||||||
team: TableState;
|
team: TableState;
|
||||||
maintenance: TableState;
|
maintenance: TableState;
|
||||||
infrastructure: TableState;
|
infrastructure: TableState;
|
||||||
|
docker: TableState;
|
||||||
logs: TableState;
|
logs: TableState;
|
||||||
sidebar: SidebarState;
|
sidebar: SidebarState;
|
||||||
mode: ThemeMode;
|
mode: ThemeMode;
|
||||||
@@ -37,6 +46,9 @@ const initialState: UIState = {
|
|||||||
monitors: {
|
monitors: {
|
||||||
rowsPerPage: 10,
|
rowsPerPage: 10,
|
||||||
},
|
},
|
||||||
|
pagespeed: {
|
||||||
|
rowsPerPage: 10,
|
||||||
|
},
|
||||||
team: {
|
team: {
|
||||||
rowsPerPage: 5,
|
rowsPerPage: 5,
|
||||||
},
|
},
|
||||||
@@ -46,6 +58,9 @@ const initialState: UIState = {
|
|||||||
infrastructure: {
|
infrastructure: {
|
||||||
rowsPerPage: 5,
|
rowsPerPage: 5,
|
||||||
},
|
},
|
||||||
|
docker: {
|
||||||
|
rowsPerPage: 5,
|
||||||
|
},
|
||||||
logs: {
|
logs: {
|
||||||
rowsPerPage: 15,
|
rowsPerPage: 15,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import {
|
|||||||
DefaultHttpMethod,
|
DefaultHttpMethod,
|
||||||
DefaultMonitorMatchMethod,
|
DefaultMonitorMatchMethod,
|
||||||
DefaultPageSpeedStrategy,
|
DefaultPageSpeedStrategy,
|
||||||
|
DefaultProxyMode,
|
||||||
} from "@/Types/Monitor";
|
} from "@/Types/Monitor";
|
||||||
import type { Monitor, MonitorType } from "@/Types/Monitor";
|
import type { Monitor, MonitorType } from "@/Types/Monitor";
|
||||||
|
|
||||||
@@ -46,6 +47,8 @@ export const getMonitorDefaults = (
|
|||||||
url: data?.url || "",
|
url: data?.url || "",
|
||||||
method: data?.method ?? DefaultHttpMethod,
|
method: data?.method ?? DefaultHttpMethod,
|
||||||
ignoreTlsErrors: data?.ignoreTlsErrors || false,
|
ignoreTlsErrors: data?.ignoreTlsErrors || false,
|
||||||
|
proxyMode: data?.proxyMode ?? DefaultProxyMode,
|
||||||
|
proxyId: data?.proxyId || "",
|
||||||
useAdvancedMatching: data?.useAdvancedMatching || false,
|
useAdvancedMatching: data?.useAdvancedMatching || false,
|
||||||
matchMethod: data?.matchMethod || DefaultMonitorMatchMethod,
|
matchMethod: data?.matchMethod || DefaultMonitorMatchMethod,
|
||||||
expectedValue: data?.expectedValue || "",
|
expectedValue: data?.expectedValue || "",
|
||||||
@@ -141,6 +144,8 @@ export const getMonitorDefaults = (
|
|||||||
url: "",
|
url: "",
|
||||||
method: DefaultHttpMethod,
|
method: DefaultHttpMethod,
|
||||||
ignoreTlsErrors: false,
|
ignoreTlsErrors: false,
|
||||||
|
proxyMode: DefaultProxyMode,
|
||||||
|
proxyId: "",
|
||||||
useAdvancedMatching: false,
|
useAdvancedMatching: false,
|
||||||
matchMethod: DefaultMonitorMatchMethod,
|
matchMethod: DefaultMonitorMatchMethod,
|
||||||
expectedValue: "",
|
expectedValue: "",
|
||||||
|
|||||||
@@ -0,0 +1,209 @@
|
|||||||
|
import { setRowsPerPage, type TableName } from "@/Features/UI/uiSlice";
|
||||||
|
import { useDelete, useGet } from "@/Hooks/UseApi";
|
||||||
|
import { useBulkMonitorActions } from "@/Hooks/useBulkMonitorActions";
|
||||||
|
import useDebounce from "@/Hooks/useDebounce";
|
||||||
|
import type { RootState } from "@/store";
|
||||||
|
import {
|
||||||
|
type MonitorsWithChecksResponse,
|
||||||
|
SelectableMonitorTypes,
|
||||||
|
type Monitor,
|
||||||
|
type MonitorType,
|
||||||
|
} from "@/Types/Monitor";
|
||||||
|
import type { Tag } from "@/Types/Tag";
|
||||||
|
import { useCallback, useMemo, useState } from "react";
|
||||||
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
|
|
||||||
|
interface MonitorListConfig {
|
||||||
|
types: MonitorType[] | "selectable";
|
||||||
|
checksLimit: number;
|
||||||
|
refreshInterval: number;
|
||||||
|
rowsPerPageTable: TableName;
|
||||||
|
rowsPerPageDefault: number;
|
||||||
|
initialSortField?: string; // default ""
|
||||||
|
}
|
||||||
|
|
||||||
|
export const useMonitorListController = (config: MonitorListConfig) => {
|
||||||
|
const dispatch = useDispatch();
|
||||||
|
const rowsPerPage = useSelector(
|
||||||
|
(state: RootState) =>
|
||||||
|
state.ui?.[config.rowsPerPageTable]?.rowsPerPage ?? config.rowsPerPageDefault
|
||||||
|
);
|
||||||
|
|
||||||
|
// Filter states
|
||||||
|
const [selectedTypes, setSelectedTypes] = useState<MonitorType[]>([]);
|
||||||
|
const [selectedStatus, setSelectedStatus] = useState<string>("");
|
||||||
|
const [selectedState, setSelectedState] = useState<string>("");
|
||||||
|
const [selectedTags, setSelectedTags] = useState<string[]>([]);
|
||||||
|
const [page, setPage] = useState<number>(0);
|
||||||
|
const [search, setSearch] = useState<string>("");
|
||||||
|
const [sortField, setSortField] = useState<string>(config.initialSortField ?? "");
|
||||||
|
const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
|
||||||
|
const [selectedMonitor, setSelectedMonitor] = useState<Monitor | null>(null);
|
||||||
|
const debouncedSearch = useDebounce<string>(search, 300);
|
||||||
|
|
||||||
|
// Convert filter selections to API filter values
|
||||||
|
// Status: pass "up"/"down" directly to the API
|
||||||
|
// State: "active" -> true, "paused" -> false
|
||||||
|
const toFilterStatus = useMemo(() => {
|
||||||
|
if (selectedStatus === "up") return "up";
|
||||||
|
if (selectedStatus === "down") return "down";
|
||||||
|
return undefined;
|
||||||
|
}, [selectedStatus]);
|
||||||
|
|
||||||
|
const toFilterActive = useMemo(() => {
|
||||||
|
if (selectedState === "active") return "true";
|
||||||
|
if (selectedState === "paused") return "false";
|
||||||
|
return undefined;
|
||||||
|
}, [selectedState]);
|
||||||
|
|
||||||
|
// Determine field and filter for the API request
|
||||||
|
// Priority: status > isActive > search > sort
|
||||||
|
const filterLookup = new Map<string | undefined, string>([
|
||||||
|
[toFilterStatus, "status"],
|
||||||
|
[toFilterActive, "isActive"],
|
||||||
|
]);
|
||||||
|
const activeFilter = [...filterLookup].find(([key]) => key !== undefined);
|
||||||
|
const field = activeFilter?.[1] || (debouncedSearch ? "name" : sortField || undefined);
|
||||||
|
const filter = activeFilter?.[0] || debouncedSearch || undefined;
|
||||||
|
|
||||||
|
const effectiveTypes = useMemo(() => {
|
||||||
|
return config.types === "selectable"
|
||||||
|
? selectedTypes.length > 0
|
||||||
|
? selectedTypes
|
||||||
|
: [...SelectableMonitorTypes]
|
||||||
|
: config.types;
|
||||||
|
}, [config.types, selectedTypes]);
|
||||||
|
|
||||||
|
// Fetching
|
||||||
|
const monitorsWithChecksUrl = useMemo(() => {
|
||||||
|
const params = new URLSearchParams();
|
||||||
|
effectiveTypes.forEach((type) => params.append("type", type));
|
||||||
|
selectedTags.forEach((tag) => params.append("tags", tag));
|
||||||
|
params.append("limit", String(config.checksLimit));
|
||||||
|
if (page !== undefined) params.append("page", String(page));
|
||||||
|
if (rowsPerPage) params.append("rowsPerPage", String(rowsPerPage));
|
||||||
|
if (filter) params.append("filter", filter);
|
||||||
|
if (field) params.append("field", field);
|
||||||
|
if (sortOrder) params.append("order", sortOrder);
|
||||||
|
return `/monitors/team/with-checks?${params.toString()}`;
|
||||||
|
}, [
|
||||||
|
effectiveTypes,
|
||||||
|
selectedTags,
|
||||||
|
page,
|
||||||
|
rowsPerPage,
|
||||||
|
filter,
|
||||||
|
field,
|
||||||
|
sortOrder,
|
||||||
|
config.checksLimit,
|
||||||
|
]);
|
||||||
|
|
||||||
|
const {
|
||||||
|
data: monitorsWithChecksData,
|
||||||
|
isLoading,
|
||||||
|
error,
|
||||||
|
refetch,
|
||||||
|
} = useGet<MonitorsWithChecksResponse>(
|
||||||
|
monitorsWithChecksUrl,
|
||||||
|
{},
|
||||||
|
{ refreshInterval: config.refreshInterval, keepPreviousData: true }
|
||||||
|
);
|
||||||
|
const { data: tags } = useGet<Tag[]>("/tags/team");
|
||||||
|
|
||||||
|
const bulk = useBulkMonitorActions(refetch, page);
|
||||||
|
|
||||||
|
// Delete ops
|
||||||
|
const { deleteFn, loading: isDeleting } = useDelete();
|
||||||
|
const handleConfirmDelete = async () => {
|
||||||
|
if (!selectedMonitor) return;
|
||||||
|
await deleteFn(`/monitors/${selectedMonitor.id}`);
|
||||||
|
setSelectedMonitor(null);
|
||||||
|
refetch();
|
||||||
|
};
|
||||||
|
const handleCancelDelete = () => setSelectedMonitor(null);
|
||||||
|
|
||||||
|
// Handle filters
|
||||||
|
const handleClearFilters = useCallback(() => {
|
||||||
|
setSelectedTypes([]);
|
||||||
|
setSelectedStatus("");
|
||||||
|
setSelectedState("");
|
||||||
|
setSelectedTags([]);
|
||||||
|
setSearch("");
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleSetRowsPerPage = (value: number) => {
|
||||||
|
dispatch(setRowsPerPage({ value, table: config.rowsPerPageTable }));
|
||||||
|
setPage(0);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Check for active filters
|
||||||
|
const hasActiveFilters = Boolean(
|
||||||
|
selectedTypes.length > 0 ||
|
||||||
|
selectedStatus ||
|
||||||
|
selectedState ||
|
||||||
|
selectedTags.length > 0 ||
|
||||||
|
search
|
||||||
|
);
|
||||||
|
|
||||||
|
// Show empty state only when there are truly no monitors (not just filtered out)
|
||||||
|
// If filters are active and count is 0, pass 1 to prevent empty state fallback
|
||||||
|
|
||||||
|
const { monitors, summary, count } = monitorsWithChecksData ?? {
|
||||||
|
monitors: null,
|
||||||
|
summary: null,
|
||||||
|
count: 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
const effectiveTotalCount =
|
||||||
|
hasActiveFilters && (summary?.totalMonitors ?? 0) === 0
|
||||||
|
? 1
|
||||||
|
: (summary?.totalMonitors ?? 0);
|
||||||
|
|
||||||
|
return {
|
||||||
|
// Data
|
||||||
|
monitors,
|
||||||
|
summary,
|
||||||
|
count,
|
||||||
|
tags,
|
||||||
|
isLoading,
|
||||||
|
error,
|
||||||
|
refetch,
|
||||||
|
effectiveTotalCount,
|
||||||
|
hasActiveFilters,
|
||||||
|
|
||||||
|
// Filter state and setters
|
||||||
|
selectedTypes,
|
||||||
|
setSelectedTypes,
|
||||||
|
selectedStatus,
|
||||||
|
setSelectedStatus,
|
||||||
|
selectedState,
|
||||||
|
setSelectedState,
|
||||||
|
selectedTags,
|
||||||
|
setSelectedTags,
|
||||||
|
search,
|
||||||
|
setSearch,
|
||||||
|
handleClearFilters,
|
||||||
|
|
||||||
|
// Paging and Sorting
|
||||||
|
page,
|
||||||
|
setPage,
|
||||||
|
rowsPerPage,
|
||||||
|
handleSetRowsPerPage,
|
||||||
|
sortField,
|
||||||
|
setSortField,
|
||||||
|
sortOrder,
|
||||||
|
setSortOrder,
|
||||||
|
|
||||||
|
// Delete
|
||||||
|
selectedMonitor,
|
||||||
|
setSelectedMonitor,
|
||||||
|
isDialogOpen: Boolean(selectedMonitor),
|
||||||
|
isDeleting,
|
||||||
|
handleConfirmDelete,
|
||||||
|
handleCancelDelete,
|
||||||
|
|
||||||
|
// Rendered only when config.bulkActions
|
||||||
|
...bulk,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export type MonitorListController = ReturnType<typeof useMonitorListController>;
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import { useMemo } from "react";
|
||||||
|
import { proxySchema, type ProxyFormData } from "@/Validation/proxy";
|
||||||
|
import type { ProxyResponse } from "@/Types/Proxy";
|
||||||
|
|
||||||
|
interface UseProxiesFormOptions {
|
||||||
|
data?: ProxyResponse | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const useProxiesForm = ({ data }: UseProxiesFormOptions) => {
|
||||||
|
return useMemo(() => {
|
||||||
|
const defaults: ProxyFormData = {
|
||||||
|
name: data?.name ?? "",
|
||||||
|
protocol: data?.protocol ?? "http",
|
||||||
|
host: data?.host ?? "",
|
||||||
|
port: data?.port ?? 8080,
|
||||||
|
username: "",
|
||||||
|
password: "",
|
||||||
|
};
|
||||||
|
|
||||||
|
return { schema: proxySchema, defaults };
|
||||||
|
}, [data]);
|
||||||
|
};
|
||||||
@@ -43,6 +43,8 @@ export const useSettingsForm = ({ data = null }: UseSettingsFormOptions = {}) =>
|
|||||||
checkTTL: data?.checkTTL ?? 30,
|
checkTTL: data?.checkTTL ?? 30,
|
||||||
pagespeedApiKey: "",
|
pagespeedApiKey: "",
|
||||||
systemEmailPassword: "",
|
systemEmailPassword: "",
|
||||||
|
globalProxyEnabled: data?.globalProxyEnabled ?? false,
|
||||||
|
globalProxyId: data?.globalProxyId ?? null,
|
||||||
};
|
};
|
||||||
|
|
||||||
return { schema: settingsSchema, defaults };
|
return { schema: settingsSchema, defaults };
|
||||||
|
|||||||
@@ -6,7 +6,8 @@ const SIDEBAR_WIDTH_VAR = 250;
|
|||||||
const SIDEBAR_COLLAPSED_WIDTH_VAR = 64;
|
const SIDEBAR_COLLAPSED_WIDTH_VAR = 64;
|
||||||
|
|
||||||
// Transition timing for sidebar width changes
|
// Transition timing for sidebar width changes
|
||||||
const SIDEBAR_TRANSITION = "width 650ms cubic-bezier(0.36, -0.01, 0, 0.77)";
|
const SIDEBAR_TRANSITION_TIMING = "650ms cubic-bezier(0.36, -0.01, 0, 0.77)";
|
||||||
|
const SIDEBAR_TRANSITION = `width ${SIDEBAR_TRANSITION_TIMING}`;
|
||||||
|
|
||||||
export const useSidebar = () => {
|
export const useSidebar = () => {
|
||||||
const collapsed = useSelector(
|
const collapsed = useSelector(
|
||||||
@@ -19,6 +20,7 @@ export const useSidebar = () => {
|
|||||||
expandedWidth: SIDEBAR_WIDTH_VAR,
|
expandedWidth: SIDEBAR_WIDTH_VAR,
|
||||||
width: collapsed ? SIDEBAR_COLLAPSED_WIDTH_VAR : SIDEBAR_WIDTH_VAR,
|
width: collapsed ? SIDEBAR_COLLAPSED_WIDTH_VAR : SIDEBAR_WIDTH_VAR,
|
||||||
transition: SIDEBAR_TRANSITION,
|
transition: SIDEBAR_TRANSITION,
|
||||||
|
transitionTiming: SIDEBAR_TRANSITION_TIMING,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -17,13 +17,14 @@ import { useParams } from "react-router-dom";
|
|||||||
import { useGet } from "@/Hooks/UseApi";
|
import { useGet } from "@/Hooks/UseApi";
|
||||||
import type { Monitor } from "@/Types/Monitor";
|
import type { Monitor } from "@/Types/Monitor";
|
||||||
import type { ChecksSummary, ChecksResponse } from "@/Types/Check";
|
import type { ChecksSummary, ChecksResponse } from "@/Types/Check";
|
||||||
|
import type { DateRange } from "@/Types/Query";
|
||||||
|
|
||||||
const Checks = () => {
|
const Checks = () => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { monitorId } = useParams<{ monitorId?: string }>();
|
const { monitorId } = useParams<{ monitorId?: string }>();
|
||||||
|
|
||||||
const [selectedMonitor, setSelectedMonitor] = useState<string>(monitorId || "0");
|
const [selectedMonitor, setSelectedMonitor] = useState<string>(monitorId || "0");
|
||||||
const [dateRange, setDateRange] = useState<string>("recent");
|
const [dateRange, setDateRange] = useState<DateRange>("recent");
|
||||||
const [statusFilter, setStatusFilter] = useState<string>("down");
|
const [statusFilter, setStatusFilter] = useState<string>("down");
|
||||||
const [page, setPage] = useState<number>(0);
|
const [page, setPage] = useState<number>(0);
|
||||||
const [rowsPerPage, setRowsPerPage] = useState<number>(10);
|
const [rowsPerPage, setRowsPerPage] = useState<number>(10);
|
||||||
|
|||||||
@@ -41,9 +41,12 @@ import {
|
|||||||
DefaultMonitorMatchMethod,
|
DefaultMonitorMatchMethod,
|
||||||
MonitorMatchMethods,
|
MonitorMatchMethods,
|
||||||
GeoCheckIntervalOptions,
|
GeoCheckIntervalOptions,
|
||||||
|
ProxyModes,
|
||||||
|
type ProxyMode,
|
||||||
} from "@/Types/Monitor";
|
} from "@/Types/Monitor";
|
||||||
import type { Notification } from "@/Types/Notification";
|
import type { Notification } from "@/Types/Notification";
|
||||||
import type { Tag } from "@/Types/Tag";
|
import type { Tag } from "@/Types/Tag";
|
||||||
|
import type { AppSettingsResponse } from "@/Types/Settings";
|
||||||
import {
|
import {
|
||||||
stepFieldsFor,
|
stepFieldsFor,
|
||||||
monitorStepCount,
|
monitorStepCount,
|
||||||
@@ -56,6 +59,7 @@ import { FormMultiSelectField } from "@/Components/inputs/forms/FormMultiSelectF
|
|||||||
import { FormSelectField } from "@/Components/inputs/forms/FormSelectField";
|
import { FormSelectField } from "@/Components/inputs/forms/FormSelectField";
|
||||||
import { FormSliderField } from "@/Components/inputs/forms/FormSliderField";
|
import { FormSliderField } from "@/Components/inputs/forms/FormSliderField";
|
||||||
import { FormSwitchField } from "@/Components/inputs/forms/FormSwitchField";
|
import { FormSwitchField } from "@/Components/inputs/forms/FormSwitchField";
|
||||||
|
import type { ProxyResponse } from "@/Types/Proxy";
|
||||||
|
|
||||||
const httpMethodOptions = HttpMethods.map((method) => ({
|
const httpMethodOptions = HttpMethods.map((method) => ({
|
||||||
value: method,
|
value: method,
|
||||||
@@ -67,6 +71,7 @@ interface GeneralSettingsConfig {
|
|||||||
urlPlaceholder: string;
|
urlPlaceholder: string;
|
||||||
namePlaceholder: string;
|
namePlaceholder: string;
|
||||||
showUrl: boolean;
|
showUrl: boolean;
|
||||||
|
showProxy: boolean;
|
||||||
showPort: boolean;
|
showPort: boolean;
|
||||||
showGameSelect: boolean;
|
showGameSelect: boolean;
|
||||||
showSecret: boolean;
|
showSecret: boolean;
|
||||||
@@ -87,6 +92,7 @@ const getGeneralSettingsConfig = (
|
|||||||
urlPlaceholder: t("pages.createMonitor.form.general.option.url.placeholder"),
|
urlPlaceholder: t("pages.createMonitor.form.general.option.url.placeholder"),
|
||||||
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
||||||
showUrl: true,
|
showUrl: true,
|
||||||
|
showProxy: true,
|
||||||
showPort: false,
|
showPort: false,
|
||||||
showGameSelect: false,
|
showGameSelect: false,
|
||||||
showSecret: false,
|
showSecret: false,
|
||||||
@@ -101,6 +107,7 @@ const getGeneralSettingsConfig = (
|
|||||||
urlPlaceholder: t("pages.createMonitor.form.general.option.host.placeholder"),
|
urlPlaceholder: t("pages.createMonitor.form.general.option.host.placeholder"),
|
||||||
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
||||||
showUrl: true,
|
showUrl: true,
|
||||||
|
showProxy: false,
|
||||||
showPort: false,
|
showPort: false,
|
||||||
showGameSelect: false,
|
showGameSelect: false,
|
||||||
showSecret: false,
|
showSecret: false,
|
||||||
@@ -115,6 +122,7 @@ const getGeneralSettingsConfig = (
|
|||||||
urlPlaceholder: t("pages.createMonitor.form.general.option.container.placeholder"),
|
urlPlaceholder: t("pages.createMonitor.form.general.option.container.placeholder"),
|
||||||
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
||||||
showUrl: true,
|
showUrl: true,
|
||||||
|
showProxy: false,
|
||||||
showPort: false,
|
showPort: false,
|
||||||
showGameSelect: false,
|
showGameSelect: false,
|
||||||
showSecret: false,
|
showSecret: false,
|
||||||
@@ -129,6 +137,7 @@ const getGeneralSettingsConfig = (
|
|||||||
urlPlaceholder: t("pages.createMonitor.form.general.option.url.placeholder"),
|
urlPlaceholder: t("pages.createMonitor.form.general.option.url.placeholder"),
|
||||||
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
||||||
showUrl: true,
|
showUrl: true,
|
||||||
|
showProxy: false,
|
||||||
showPort: true,
|
showPort: true,
|
||||||
showGameSelect: false,
|
showGameSelect: false,
|
||||||
showSecret: false,
|
showSecret: false,
|
||||||
@@ -143,6 +152,7 @@ const getGeneralSettingsConfig = (
|
|||||||
urlPlaceholder: t("pages.createMonitor.form.general.option.url.placeholder"),
|
urlPlaceholder: t("pages.createMonitor.form.general.option.url.placeholder"),
|
||||||
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
||||||
showUrl: true,
|
showUrl: true,
|
||||||
|
showProxy: false,
|
||||||
showPort: true,
|
showPort: true,
|
||||||
showGameSelect: true,
|
showGameSelect: true,
|
||||||
showSecret: false,
|
showSecret: false,
|
||||||
@@ -157,6 +167,7 @@ const getGeneralSettingsConfig = (
|
|||||||
urlPlaceholder: t("pages.createMonitor.form.general.option.host.placeholder"),
|
urlPlaceholder: t("pages.createMonitor.form.general.option.host.placeholder"),
|
||||||
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
||||||
showUrl: true,
|
showUrl: true,
|
||||||
|
showProxy: false,
|
||||||
showPort: true,
|
showPort: true,
|
||||||
showGameSelect: false,
|
showGameSelect: false,
|
||||||
showSecret: false,
|
showSecret: false,
|
||||||
@@ -171,6 +182,7 @@ const getGeneralSettingsConfig = (
|
|||||||
urlPlaceholder: t("pages.createMonitor.form.general.option.url.placeholder"),
|
urlPlaceholder: t("pages.createMonitor.form.general.option.url.placeholder"),
|
||||||
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
||||||
showUrl: true,
|
showUrl: true,
|
||||||
|
showProxy: false,
|
||||||
showPort: false,
|
showPort: false,
|
||||||
showGameSelect: false,
|
showGameSelect: false,
|
||||||
showSecret: false,
|
showSecret: false,
|
||||||
@@ -185,6 +197,7 @@ const getGeneralSettingsConfig = (
|
|||||||
urlPlaceholder: t("pages.createMonitor.form.general.option.captureUrl.placeholder"),
|
urlPlaceholder: t("pages.createMonitor.form.general.option.captureUrl.placeholder"),
|
||||||
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
||||||
showUrl: true,
|
showUrl: true,
|
||||||
|
showProxy: false,
|
||||||
showPort: false,
|
showPort: false,
|
||||||
showGameSelect: false,
|
showGameSelect: false,
|
||||||
showSecret: true,
|
showSecret: true,
|
||||||
@@ -199,6 +212,7 @@ const getGeneralSettingsConfig = (
|
|||||||
urlPlaceholder: t("pages.createMonitor.form.general.option.wsUrl.placeholder"),
|
urlPlaceholder: t("pages.createMonitor.form.general.option.wsUrl.placeholder"),
|
||||||
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
||||||
showUrl: true,
|
showUrl: true,
|
||||||
|
showProxy: false,
|
||||||
showPort: false,
|
showPort: false,
|
||||||
showGameSelect: false,
|
showGameSelect: false,
|
||||||
showSecret: false,
|
showSecret: false,
|
||||||
@@ -213,6 +227,7 @@ const getGeneralSettingsConfig = (
|
|||||||
urlPlaceholder: t("pages.createMonitor.form.general.option.url.placeholder"),
|
urlPlaceholder: t("pages.createMonitor.form.general.option.url.placeholder"),
|
||||||
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
|
||||||
showUrl: true,
|
showUrl: true,
|
||||||
|
showProxy: false,
|
||||||
showPort: false,
|
showPort: false,
|
||||||
showGameSelect: false,
|
showGameSelect: false,
|
||||||
showSecret: false,
|
showSecret: false,
|
||||||
@@ -258,6 +273,8 @@ const CreateMonitorPage = () => {
|
|||||||
const { data: notifications } = useGet<Notification[]>("/notifications/team");
|
const { data: notifications } = useGet<Notification[]>("/notifications/team");
|
||||||
const { data: games } = useGet<GamesMap>("/monitors/games");
|
const { data: games } = useGet<GamesMap>("/monitors/games");
|
||||||
const { data: tags } = useGet<Tag[]>("/tags/team");
|
const { data: tags } = useGet<Tag[]>("/tags/team");
|
||||||
|
const { data: proxies } = useGet<ProxyResponse[]>("/proxies/team");
|
||||||
|
const { data: appSettings } = useGet<AppSettingsResponse>("/settings");
|
||||||
|
|
||||||
const { schema, defaults } = useMonitorForm({
|
const { schema, defaults } = useMonitorForm({
|
||||||
data: existingMonitor ?? null,
|
data: existingMonitor ?? null,
|
||||||
@@ -281,6 +298,7 @@ const CreateMonitorPage = () => {
|
|||||||
|
|
||||||
const watchedType = watch("type") as MonitorType;
|
const watchedType = watch("type") as MonitorType;
|
||||||
const watchedMethod = watch("method") as HttpMethod | undefined;
|
const watchedMethod = watch("method") as HttpMethod | undefined;
|
||||||
|
const watchedProxyMode = watch("proxyMode") as ProxyMode | undefined;
|
||||||
const watchedUseAdvancedMatching = watch("useAdvancedMatching") as boolean;
|
const watchedUseAdvancedMatching = watch("useAdvancedMatching") as boolean;
|
||||||
const watchGeoCheckEnabled = watch("geoCheckEnabled") as boolean;
|
const watchGeoCheckEnabled = watch("geoCheckEnabled") as boolean;
|
||||||
|
|
||||||
@@ -466,6 +484,38 @@ const CreateMonitorPage = () => {
|
|||||||
})),
|
})),
|
||||||
[t]
|
[t]
|
||||||
);
|
);
|
||||||
|
const globalProxyName = appSettings?.globalProxy?.name;
|
||||||
|
|
||||||
|
const proxyModeOptions = useMemo(
|
||||||
|
() =>
|
||||||
|
ProxyModes.map((mode) => {
|
||||||
|
const key =
|
||||||
|
mode === "inherit"
|
||||||
|
? globalProxyName
|
||||||
|
? "inheritGlobal"
|
||||||
|
: "inheritDirect"
|
||||||
|
: mode;
|
||||||
|
return {
|
||||||
|
value: mode,
|
||||||
|
label: t(`pages.createMonitor.form.general.option.proxyMode.value.${key}`, {
|
||||||
|
name: globalProxyName,
|
||||||
|
}),
|
||||||
|
description: t(
|
||||||
|
`pages.createMonitor.form.general.option.proxyMode.description.${key}`
|
||||||
|
),
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
[t, globalProxyName]
|
||||||
|
);
|
||||||
|
|
||||||
|
const proxyOptions = useMemo(
|
||||||
|
() =>
|
||||||
|
(proxies ?? []).map((proxy) => ({
|
||||||
|
value: proxy.id,
|
||||||
|
label: `${proxy.name} (${proxy.host}:${proxy.port})`,
|
||||||
|
})),
|
||||||
|
[proxies]
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<FormProvider {...form}>
|
<FormProvider {...form}>
|
||||||
@@ -518,6 +568,11 @@ const CreateMonitorPage = () => {
|
|||||||
}
|
}
|
||||||
rightContent={
|
rightContent={
|
||||||
<Stack spacing={theme.spacing(LAYOUT.MD)}>
|
<Stack spacing={theme.spacing(LAYOUT.MD)}>
|
||||||
|
<FormTextField
|
||||||
|
name="name"
|
||||||
|
fieldLabel={t("pages.createMonitor.form.general.option.name.label")}
|
||||||
|
placeholder={generalSettingsConfig.namePlaceholder}
|
||||||
|
/>
|
||||||
{/* URL/Host/Container field - not shown for hardware */}
|
{/* URL/Host/Container field - not shown for hardware */}
|
||||||
{generalSettingsConfig.showUrl && (
|
{generalSettingsConfig.showUrl && (
|
||||||
<FormTextField
|
<FormTextField
|
||||||
@@ -527,6 +582,27 @@ const CreateMonitorPage = () => {
|
|||||||
disabled={isEditMode}
|
disabled={isEditMode}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
{/* Proxy fields - only shown for HTTP */}
|
||||||
|
{generalSettingsConfig.showProxy && (
|
||||||
|
<>
|
||||||
|
<FormRadioGroup
|
||||||
|
name="proxyMode"
|
||||||
|
options={proxyModeOptions}
|
||||||
|
fieldLabel={t(
|
||||||
|
"pages.createMonitor.form.general.option.proxyMode.label"
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
{watchedProxyMode === "custom" && (
|
||||||
|
<FormSelectField
|
||||||
|
name="proxyId"
|
||||||
|
fieldLabel={t(
|
||||||
|
"pages.createMonitor.form.general.option.proxy.label"
|
||||||
|
)}
|
||||||
|
options={proxyOptions}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Strategy field - only for pagespeed type */}
|
{/* Strategy field - only for pagespeed type */}
|
||||||
{generalSettingsConfig.showStrategy && (
|
{generalSettingsConfig.showStrategy && (
|
||||||
@@ -603,11 +679,6 @@ const CreateMonitorPage = () => {
|
|||||||
options={dnsRecordTypeOptions}
|
options={dnsRecordTypeOptions}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<FormTextField
|
|
||||||
name="name"
|
|
||||||
fieldLabel={t("pages.createMonitor.form.general.option.name.label")}
|
|
||||||
placeholder={generalSettingsConfig.namePlaceholder}
|
|
||||||
/>
|
|
||||||
</Stack>
|
</Stack>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|||||||
Whitespace-only changes.
@@ -0,0 +1,51 @@
|
|||||||
|
import Stack from "@mui/material/Stack";
|
||||||
|
import { StatBox } from "@/Components/design-elements";
|
||||||
|
|
||||||
|
// Types
|
||||||
|
|
||||||
|
// Hooks
|
||||||
|
import { useTheme } from "@mui/material";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import type { DockerContainerInfo } from "@/Types/Check";
|
||||||
|
|
||||||
|
// Utils
|
||||||
|
import { formatDuration } from "@/Utils/TimeUtils";
|
||||||
|
|
||||||
|
export const DockerContainerStatusBoxes = ({
|
||||||
|
container,
|
||||||
|
}: {
|
||||||
|
container: DockerContainerInfo | undefined;
|
||||||
|
}) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const theme = useTheme();
|
||||||
|
|
||||||
|
if (!container) return null;
|
||||||
|
|
||||||
|
const { state, restartCount, health } = container;
|
||||||
|
const startedAt = container.startedAt ?? "0";
|
||||||
|
const runningFor = Date.now() - new Date(startedAt).getTime();
|
||||||
|
return (
|
||||||
|
<Stack
|
||||||
|
direction="row"
|
||||||
|
gap={theme.spacing(8)}
|
||||||
|
flexWrap={"wrap"}
|
||||||
|
>
|
||||||
|
<StatBox
|
||||||
|
title={t("common.labels.state")}
|
||||||
|
subtitle={state}
|
||||||
|
/>
|
||||||
|
<StatBox
|
||||||
|
title={t("common.labels.uptime")}
|
||||||
|
subtitle={formatDuration(runningFor)}
|
||||||
|
/>
|
||||||
|
<StatBox
|
||||||
|
title={t("common.labels.restarts")}
|
||||||
|
subtitle={String(restartCount ?? 0)}
|
||||||
|
/>
|
||||||
|
<StatBox
|
||||||
|
title={t("common.labels.health")}
|
||||||
|
subtitle={health}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
export const TabLogs = () => {
|
||||||
|
return "This is the logs tab";
|
||||||
|
};
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
// Components
|
||||||
|
import Grid from "@mui/material/Grid";
|
||||||
|
import Stack from "@mui/material/Stack";
|
||||||
|
import { HistogramDockerContainer } from "@/Components/monitors/charts/HistogramDockerContainer";
|
||||||
|
|
||||||
|
// Hooks
|
||||||
|
import { Typography, useTheme } from "@mui/material";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import useMediaQuery from "@mui/material/useMediaQuery";
|
||||||
|
|
||||||
|
// Types
|
||||||
|
import type { Theme } from "@mui/material";
|
||||||
|
import type { TFunction } from "i18next";
|
||||||
|
import type { DockerContainerStats } from "@/Types/Monitor";
|
||||||
|
import { LAYOUT } from "@/Utils/Theme/constants";
|
||||||
|
import { formatPercentage } from "@/Utils/FormatUtils";
|
||||||
|
import prettyBytes from "pretty-bytes";
|
||||||
|
import { BaseBox } from "@/Components/design-elements";
|
||||||
|
import { dedupeDockerPorts, getDockerMountLabel } from "@/Utils/MonitorUtils";
|
||||||
|
|
||||||
|
const getChartConfigs = (theme: Theme, t: TFunction, stats: DockerContainerStats) => [
|
||||||
|
{
|
||||||
|
title: t("common.charts.labels.cpuUsage"),
|
||||||
|
key: "avgCpuPct",
|
||||||
|
color: theme.palette.success.main,
|
||||||
|
rightTitle: formatPercentage(stats?.latest?.container.cpuPct || 0),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t("common.charts.labels.memoryUsage"),
|
||||||
|
key: "avgMemoryUsedBytes",
|
||||||
|
color: theme.palette.primary.main,
|
||||||
|
rightTitle: prettyBytes(stats?.latest?.container.memoryUsedBytes || 0),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
export const TabOverview = ({ stats }: { stats: DockerContainerStats }) => {
|
||||||
|
const theme = useTheme();
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
||||||
|
|
||||||
|
const { ports, mounts } = stats?.latest?.container ?? {};
|
||||||
|
const dedupedPorts = dedupeDockerPorts(ports ?? []);
|
||||||
|
return (
|
||||||
|
<Grid
|
||||||
|
container
|
||||||
|
spacing={LAYOUT.MD}
|
||||||
|
>
|
||||||
|
{getChartConfigs(theme, t, stats).map((config) => {
|
||||||
|
return (
|
||||||
|
<Grid
|
||||||
|
key={config.key}
|
||||||
|
size={isSmall ? 12 : 6}
|
||||||
|
>
|
||||||
|
<HistogramDockerContainer
|
||||||
|
title={config.title}
|
||||||
|
rightTitle={config.rightTitle}
|
||||||
|
stats={stats}
|
||||||
|
dataKey={config.key}
|
||||||
|
strokeColor={config.color}
|
||||||
|
gradientStartColor={config.color}
|
||||||
|
/>
|
||||||
|
</Grid>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
<Grid size={isSmall ? 12 : 6}>
|
||||||
|
<BaseBox
|
||||||
|
padding={LAYOUT.MD}
|
||||||
|
minHeight={200}
|
||||||
|
>
|
||||||
|
<Typography
|
||||||
|
variant="eyebrow"
|
||||||
|
color={theme.palette.text.secondary}
|
||||||
|
textTransform={"uppercase"}
|
||||||
|
>
|
||||||
|
Ports
|
||||||
|
</Typography>
|
||||||
|
<Stack>
|
||||||
|
{dedupedPorts?.map((port) => {
|
||||||
|
return (
|
||||||
|
<Typography
|
||||||
|
key={`${port.publicPort}/${port.privatePort}`}
|
||||||
|
>{`${port.hostIp}:${port.publicPort} -> ${port.privatePort}/${port.protocol}`}</Typography>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Stack>
|
||||||
|
</BaseBox>
|
||||||
|
</Grid>
|
||||||
|
<Grid size={isSmall ? 12 : 6}>
|
||||||
|
<BaseBox
|
||||||
|
padding={LAYOUT.MD}
|
||||||
|
minHeight={200}
|
||||||
|
>
|
||||||
|
<Typography
|
||||||
|
variant="eyebrow"
|
||||||
|
color={theme.palette.text.secondary}
|
||||||
|
textTransform={"uppercase"}
|
||||||
|
>
|
||||||
|
Volumes
|
||||||
|
</Typography>
|
||||||
|
<Stack>
|
||||||
|
{mounts?.map((mount) => {
|
||||||
|
return (
|
||||||
|
<Typography key={`${mount.source}/${mount.destination}`}>
|
||||||
|
{`${getDockerMountLabel(mount)} -> ${mount.destination}`}
|
||||||
|
</Typography>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Stack>
|
||||||
|
</BaseBox>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
// Components
|
||||||
|
import { BasePage, Tabs, Tab, DockerStateLabel } from "@/Components/design-elements";
|
||||||
|
import { TabOverview } from "@/Pages/Docker/ContainerDetails/TabOverview";
|
||||||
|
import { TabLogs } from "@/Pages/Docker/ContainerDetails/TabLogs";
|
||||||
|
|
||||||
|
// Hooks
|
||||||
|
import { useParams } from "react-router-dom";
|
||||||
|
import { useState } from "react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { useGet } from "@/Hooks/UseApi";
|
||||||
|
import type { DockerContainerResponse } from "@/Types/Monitor";
|
||||||
|
import { DockerContainerStatusBoxes } from "@/Pages/Docker/ContainerDetails/Components/StatBoxes";
|
||||||
|
import type { DateRange } from "@/Types/Query";
|
||||||
|
import { HeaderTimeRange } from "@/Components/common";
|
||||||
|
interface DockerContainerDetailsProps {
|
||||||
|
open?: "overview" | "logs";
|
||||||
|
}
|
||||||
|
|
||||||
|
const TAB_MAP = {
|
||||||
|
overview: 0,
|
||||||
|
logs: 1,
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
const DockerDetailsPage = ({ open = "overview" }: DockerContainerDetailsProps) => {
|
||||||
|
const [activeTab, setActiveTab] = useState<number>(TAB_MAP[open]);
|
||||||
|
const [dateRange, setDateRange] = useState<DateRange>("recent");
|
||||||
|
const { monitorId, containerName } = useParams<{
|
||||||
|
monitorId: string;
|
||||||
|
containerName: string;
|
||||||
|
}>();
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
const containerDetailsUrl = monitorId
|
||||||
|
? `/monitors/docker/details/${monitorId}/containers/${containerName}?dateRange=${dateRange}`
|
||||||
|
: null;
|
||||||
|
|
||||||
|
const { data: containerData } = useGet<DockerContainerResponse>(
|
||||||
|
containerDetailsUrl,
|
||||||
|
{},
|
||||||
|
{ refreshInterval: 10000, keepPreviousData: true }
|
||||||
|
);
|
||||||
|
|
||||||
|
const monitor = containerData?.monitor;
|
||||||
|
if (!monitor) return null;
|
||||||
|
|
||||||
|
const stats = containerData.stats;
|
||||||
|
|
||||||
|
const container = stats?.latest?.container;
|
||||||
|
if (!container) return null;
|
||||||
|
|
||||||
|
const { state, name, image } = container;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<BasePage headerKey="docker.container">
|
||||||
|
<DockerStateLabel
|
||||||
|
state={state}
|
||||||
|
name={name}
|
||||||
|
image={image}
|
||||||
|
/>
|
||||||
|
<DockerContainerStatusBoxes container={container} />
|
||||||
|
<HeaderTimeRange
|
||||||
|
dateRange={dateRange}
|
||||||
|
setDateRange={setDateRange}
|
||||||
|
/>
|
||||||
|
<Tabs
|
||||||
|
value={activeTab}
|
||||||
|
onChange={(_, newValue: number) => setActiveTab(newValue)}
|
||||||
|
>
|
||||||
|
<Tab label={t("pages.docker.container.tabs.overview")} />
|
||||||
|
<Tab label={t("pages.docker.container.tabs.logs")} />
|
||||||
|
</Tabs>
|
||||||
|
{activeTab === 0 && <TabOverview stats={stats} />}
|
||||||
|
{activeTab === 1 && <TabLogs />}
|
||||||
|
</BasePage>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default DockerDetailsPage;
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
import Box from "@mui/material/Box";
|
||||||
|
import Typography from "@mui/material/Typography";
|
||||||
|
import { DockerStateLabel, Table } from "@/Components/design-elements";
|
||||||
|
// Hooks
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import useMediaQuery from "@mui/material/useMediaQuery";
|
||||||
|
import { useTheme } from "@mui/material/styles";
|
||||||
|
import { useNavigate } from "react-router-dom";
|
||||||
|
|
||||||
|
// Types
|
||||||
|
import type { Header } from "@/Components/design-elements/Table";
|
||||||
|
import type { DockerContainerInfo } from "@/Types/Check";
|
||||||
|
|
||||||
|
// Utils
|
||||||
|
import { formatPercentage } from "@/Utils/FormatUtils";
|
||||||
|
|
||||||
|
interface DockerContainersTableProps {
|
||||||
|
monitorId: string | undefined;
|
||||||
|
containers: DockerContainerInfo[];
|
||||||
|
onRowClick?: (container: DockerContainerInfo) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const DockerContainersTable = ({
|
||||||
|
monitorId,
|
||||||
|
containers,
|
||||||
|
}: DockerContainersTableProps) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const theme = useTheme();
|
||||||
|
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
||||||
|
const navigate = useNavigate();
|
||||||
|
|
||||||
|
const getHeaders = () => {
|
||||||
|
// const renderSortIcon = (isActive: boolean) => (
|
||||||
|
// <Box
|
||||||
|
// width={16}
|
||||||
|
// display="inline-flex"
|
||||||
|
// justifyContent="center"
|
||||||
|
// >
|
||||||
|
// {isActive ? (
|
||||||
|
// sortOrder === "asc" ? (
|
||||||
|
// <ArrowUp size={16} />
|
||||||
|
// ) : (
|
||||||
|
// <ArrowDown size={16} />
|
||||||
|
// )
|
||||||
|
// ) : null}
|
||||||
|
// </Box>
|
||||||
|
// );
|
||||||
|
const headers: Header<DockerContainerInfo>[] = [
|
||||||
|
{
|
||||||
|
id: "container",
|
||||||
|
content: t("pages.docker.host.table.headers.container"),
|
||||||
|
render: (row) => {
|
||||||
|
return (
|
||||||
|
<DockerStateLabel
|
||||||
|
state={row.state}
|
||||||
|
name={row.name}
|
||||||
|
image={row.image}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "status",
|
||||||
|
content: t("common.table.headers.status"),
|
||||||
|
render: (row) => {
|
||||||
|
return <Typography>{row.state}</Typography>;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "health",
|
||||||
|
content: t("common.labels.health"),
|
||||||
|
render: (row) => {
|
||||||
|
return <Typography>{row.health}</Typography>;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "cpu",
|
||||||
|
content: t("pages.docker.host.table.headers.cpu"),
|
||||||
|
render: (row) => {
|
||||||
|
return <Typography>{formatPercentage(row.cpuPct ?? 0)}</Typography>;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "memory",
|
||||||
|
content: t("pages.docker.host.table.headers.memory"),
|
||||||
|
render: (row) => {
|
||||||
|
return <Typography>{formatPercentage(row.memoryPct ?? 0)}</Typography>;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "restarts",
|
||||||
|
content: t("common.labels.restarts"),
|
||||||
|
render: (row) => {
|
||||||
|
return <Typography>{row.restartCount}</Typography>;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
return headers;
|
||||||
|
};
|
||||||
|
|
||||||
|
let headers = getHeaders();
|
||||||
|
|
||||||
|
if (isSmall) {
|
||||||
|
headers = headers.filter((h) => h.id !== "histogram");
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box>
|
||||||
|
<Table
|
||||||
|
headers={headers}
|
||||||
|
data={containers}
|
||||||
|
onRowClick={(row) => {
|
||||||
|
navigate(`/docker/host/${monitorId}/container/${row.name}`);
|
||||||
|
}}
|
||||||
|
// getRowSx={(row) => ({
|
||||||
|
// backgroundColor: isRowSelected(row.id)
|
||||||
|
// ? theme.palette.action.selected
|
||||||
|
// : "inherit",
|
||||||
|
// })}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
import Stack from "@mui/material/Stack";
|
||||||
|
import { StatBox } from "@/Components/design-elements";
|
||||||
|
|
||||||
|
// Types
|
||||||
|
import type { DockerStats } from "@/Types/Monitor";
|
||||||
|
|
||||||
|
// Hooks
|
||||||
|
import { useTheme } from "@mui/material";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
|
// Utils
|
||||||
|
|
||||||
|
export const DockerStatusBoxes = ({ stats }: { stats: DockerStats | undefined }) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const theme = useTheme();
|
||||||
|
|
||||||
|
if (!stats) return null;
|
||||||
|
|
||||||
|
const { total, running, stopped, unhealthy } = stats.latest?.summary ?? {};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Stack
|
||||||
|
direction="row"
|
||||||
|
gap={theme.spacing(8)}
|
||||||
|
flexWrap={"wrap"}
|
||||||
|
>
|
||||||
|
<StatBox
|
||||||
|
title={t("pages.docker.host.statBoxes.containers")}
|
||||||
|
subtitle={String(total)}
|
||||||
|
/>
|
||||||
|
<StatBox
|
||||||
|
title={t("pages.docker.host.statBoxes.running")}
|
||||||
|
subtitle={String(running)}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<StatBox
|
||||||
|
title={t("pages.docker.host.statBoxes.stopped")}
|
||||||
|
subtitle={String(stopped)}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<StatBox
|
||||||
|
title={t("pages.docker.host.statBoxes.unhealthy")}
|
||||||
|
subtitle={String(unhealthy)}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
import { BasePage } from "@/Components/design-elements";
|
||||||
|
import { HeaderMonitorControls, MonitorStatBoxes } from "@/Components/monitors";
|
||||||
|
import { DockerStatusBoxes } from "@/Pages/Docker/HostDetails/Components/StatBoxes";
|
||||||
|
|
||||||
|
// Types
|
||||||
|
import type { DockerDetailsResponse } from "@/Types/Monitor";
|
||||||
|
|
||||||
|
// Hooks
|
||||||
|
import { useGet } from "@/Hooks/UseApi";
|
||||||
|
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
||||||
|
import { useParams } from "react-router-dom";
|
||||||
|
import { DockerContainersTable } from "@/Pages/Docker/HostDetails/Components/DockerContainersTable";
|
||||||
|
|
||||||
|
const DockerHostDetailsPage = () => {
|
||||||
|
const { monitorId } = useParams<{ monitorId: string }>();
|
||||||
|
const isAdmin = useIsAdmin();
|
||||||
|
|
||||||
|
// The containers list renders the latest check only, so no date range is
|
||||||
|
// offered; the endpoint's dateRange param only shapes the aggregate buckets.
|
||||||
|
const monitorDetailsUrl = monitorId ? `/monitors/docker/details/${monitorId}` : null;
|
||||||
|
|
||||||
|
const { data: monitorDetailsData, refetch: refetchMonitor } =
|
||||||
|
useGet<DockerDetailsResponse>(
|
||||||
|
monitorDetailsUrl,
|
||||||
|
{},
|
||||||
|
{ refreshInterval: 10000, keepPreviousData: true }
|
||||||
|
);
|
||||||
|
|
||||||
|
const monitor = monitorDetailsData?.monitor;
|
||||||
|
const monitorStats = monitorDetailsData?.monitorStats ?? null;
|
||||||
|
const stats = monitorDetailsData?.stats;
|
||||||
|
const containers = stats?.latest?.containers ?? [];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<BasePage>
|
||||||
|
<HeaderMonitorControls
|
||||||
|
path="docker"
|
||||||
|
monitor={monitor}
|
||||||
|
isAdmin={isAdmin}
|
||||||
|
refetch={refetchMonitor}
|
||||||
|
/>
|
||||||
|
<MonitorStatBoxes
|
||||||
|
monitor={monitor}
|
||||||
|
monitorStats={monitorStats}
|
||||||
|
/>
|
||||||
|
<DockerStatusBoxes stats={stats} />
|
||||||
|
<DockerContainersTable
|
||||||
|
monitorId={monitorId}
|
||||||
|
containers={containers}
|
||||||
|
/>
|
||||||
|
</BasePage>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default DockerHostDetailsPage;
|
||||||
@@ -0,0 +1,347 @@
|
|||||||
|
import Box from "@mui/material/Box";
|
||||||
|
import Stack from "@mui/material/Stack";
|
||||||
|
import Typography from "@mui/material/Typography";
|
||||||
|
import {
|
||||||
|
Table,
|
||||||
|
Pagination,
|
||||||
|
StatusLabel,
|
||||||
|
ColoredLabel,
|
||||||
|
} from "@/Components/design-elements";
|
||||||
|
import { SPACING } from "@/Utils/Theme/constants";
|
||||||
|
import type { Header } from "@/Components/design-elements/Table";
|
||||||
|
import { ActionsMenu, type ActionMenuItem } from "@/Components/actions-menu";
|
||||||
|
import { ArrowUp, ArrowDown } from "lucide-react";
|
||||||
|
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import useMediaQuery from "@mui/material/useMediaQuery";
|
||||||
|
import { useTheme } from "@mui/material/styles";
|
||||||
|
import { useNavigate } from "react-router-dom";
|
||||||
|
import { usePost } from "@/Hooks/UseApi";
|
||||||
|
|
||||||
|
import type { Monitor } from "@/Types/Monitor";
|
||||||
|
import type { Tag } from "@/Types/Tag";
|
||||||
|
import type { DockerContainerSummary } from "@/Types/Check";
|
||||||
|
import { Checkbox } from "@/Components/inputs";
|
||||||
|
|
||||||
|
const summaryOf = (monitor: Monitor): DockerContainerSummary | undefined => {
|
||||||
|
const recentChecks = monitor.recentChecks ?? [];
|
||||||
|
return recentChecks[recentChecks.length - 1]?.containerSummary;
|
||||||
|
};
|
||||||
|
|
||||||
|
interface DockerMonitorsTableProps {
|
||||||
|
monitors: Monitor[];
|
||||||
|
tags: Tag[];
|
||||||
|
refetch: () => void;
|
||||||
|
setSelectedMonitor: (monitor: Monitor | null) => void;
|
||||||
|
sortField: string;
|
||||||
|
setSortField: (field: string) => void;
|
||||||
|
sortOrder: "asc" | "desc";
|
||||||
|
setSortOrder: (order: "asc" | "desc") => void;
|
||||||
|
count: number;
|
||||||
|
page: number;
|
||||||
|
setPage: (page: number) => void;
|
||||||
|
rowsPerPage: number;
|
||||||
|
setRowsPerPage: (rowsPerPage: number) => void;
|
||||||
|
selectedRows?: string[];
|
||||||
|
onSelectionChange?: (selected: string[]) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const DockerMonitorsTable = ({
|
||||||
|
monitors,
|
||||||
|
tags,
|
||||||
|
refetch,
|
||||||
|
setSelectedMonitor,
|
||||||
|
sortField,
|
||||||
|
setSortField,
|
||||||
|
sortOrder,
|
||||||
|
setSortOrder,
|
||||||
|
count,
|
||||||
|
page,
|
||||||
|
setPage,
|
||||||
|
rowsPerPage,
|
||||||
|
setRowsPerPage,
|
||||||
|
selectedRows = [],
|
||||||
|
onSelectionChange,
|
||||||
|
}: DockerMonitorsTableProps) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const theme = useTheme();
|
||||||
|
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const { post } = usePost<Record<string, never>, Monitor>();
|
||||||
|
|
||||||
|
const selectedSet = new Set(selectedRows);
|
||||||
|
const isAllSelected =
|
||||||
|
monitors.length > 0 && monitors.every((m) => selectedSet.has(m.id));
|
||||||
|
const isSomeSelected = selectedRows.length > 0 && !isAllSelected;
|
||||||
|
|
||||||
|
const handleSelectAll = (checked: boolean) => {
|
||||||
|
onSelectionChange?.(checked ? monitors.map((m) => m.id) : []);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSelectRow = (id: string, checked: boolean) => {
|
||||||
|
if (!onSelectionChange) return;
|
||||||
|
onSelectionChange(
|
||||||
|
checked ? [...selectedRows, id] : selectedRows.filter((rowId) => rowId !== id)
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const isRowSelected = (id: string) => selectedSet.has(id);
|
||||||
|
|
||||||
|
const handlePageChange = (
|
||||||
|
_e: React.MouseEvent<HTMLButtonElement> | null,
|
||||||
|
newPage: number
|
||||||
|
) => {
|
||||||
|
setPage(newPage);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleRowsPerPageChange = (
|
||||||
|
e: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>
|
||||||
|
) => {
|
||||||
|
const value = Number(e.target.value);
|
||||||
|
setPage(0);
|
||||||
|
setRowsPerPage(value);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSort = (e: React.MouseEvent, field: string) => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
if (sortField === field) {
|
||||||
|
const newOrder = sortOrder === "asc" ? "desc" : "asc";
|
||||||
|
setSortOrder(newOrder);
|
||||||
|
} else {
|
||||||
|
setSortField(field);
|
||||||
|
setSortOrder("asc");
|
||||||
|
}
|
||||||
|
refetch();
|
||||||
|
};
|
||||||
|
|
||||||
|
const getActions = (monitor: Monitor): ActionMenuItem[] => {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
id: 2,
|
||||||
|
label: t("pages.common.monitors.actions.details"),
|
||||||
|
action: () => {
|
||||||
|
navigate(`${monitor.id}`);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 3,
|
||||||
|
label: t("pages.common.monitors.actions.incidents"),
|
||||||
|
action: () => {
|
||||||
|
navigate(`/incidents?monitorId=${monitor.id}`);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 4,
|
||||||
|
label: t("pages.common.monitors.actions.configure"),
|
||||||
|
action: () => {
|
||||||
|
navigate(`/docker/configure/${monitor.id}`);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 6,
|
||||||
|
label:
|
||||||
|
monitor.isActive === false
|
||||||
|
? t("common.buttons.resume")
|
||||||
|
: t("common.buttons.pause"),
|
||||||
|
action: async () => {
|
||||||
|
await post(`/monitors/pause/${monitor.id}`, {});
|
||||||
|
refetch();
|
||||||
|
},
|
||||||
|
closeMenu: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 7,
|
||||||
|
label: (
|
||||||
|
<Typography color={theme.palette.error.main}>
|
||||||
|
{t("common.buttons.delete")}
|
||||||
|
</Typography>
|
||||||
|
),
|
||||||
|
action: () => {
|
||||||
|
setSelectedMonitor(monitor);
|
||||||
|
},
|
||||||
|
closeMenu: true,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
const getHeaders = () => {
|
||||||
|
const renderSortIcon = (isActive: boolean) => (
|
||||||
|
<Box
|
||||||
|
width={16}
|
||||||
|
display="inline-flex"
|
||||||
|
justifyContent="center"
|
||||||
|
>
|
||||||
|
{isActive ? (
|
||||||
|
sortOrder === "asc" ? (
|
||||||
|
<ArrowUp size={16} />
|
||||||
|
) : (
|
||||||
|
<ArrowDown size={16} />
|
||||||
|
)
|
||||||
|
) : null}
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
const headers: Header<Monitor>[] = [
|
||||||
|
{
|
||||||
|
id: "selection",
|
||||||
|
content: (
|
||||||
|
<Checkbox
|
||||||
|
aria-label={t("pages.common.monitors.actions.selectAll")}
|
||||||
|
indeterminate={isSomeSelected}
|
||||||
|
checked={isAllSelected}
|
||||||
|
onChange={(e) => handleSelectAll(e.target.checked)}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
hideMobileLabel: true,
|
||||||
|
render: (row) => (
|
||||||
|
<Checkbox
|
||||||
|
aria-label={t("pages.common.monitors.actions.selectMonitor", {
|
||||||
|
name: row.name,
|
||||||
|
})}
|
||||||
|
checked={isRowSelected(row.id)}
|
||||||
|
onChange={(e) => {
|
||||||
|
handleSelectRow(row.id, e.target.checked);
|
||||||
|
}}
|
||||||
|
onClick={(e) => e.stopPropagation()}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
onClick: (e) => e?.stopPropagation(),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "name",
|
||||||
|
align: "left",
|
||||||
|
mobileLabel: t("pages.docker.table.headers.host"),
|
||||||
|
content: (
|
||||||
|
<Typography
|
||||||
|
component="div"
|
||||||
|
display="inline-flex"
|
||||||
|
alignItems="center"
|
||||||
|
gap={theme.spacing(4)}
|
||||||
|
onClick={(e) => handleSort(e, "name")}
|
||||||
|
sx={{ cursor: "pointer" }}
|
||||||
|
>
|
||||||
|
{t("pages.docker.table.headers.host")}
|
||||||
|
{renderSortIcon(sortField === "name")}
|
||||||
|
</Typography>
|
||||||
|
),
|
||||||
|
render: (row) => {
|
||||||
|
return (
|
||||||
|
<Stack>
|
||||||
|
<Typography variant="body2">{row.name}</Typography>
|
||||||
|
<Typography
|
||||||
|
variant="caption"
|
||||||
|
color={theme.palette.text.secondary}
|
||||||
|
>
|
||||||
|
{row.url}
|
||||||
|
</Typography>
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "status",
|
||||||
|
mobileLabel: t("common.table.headers.status"),
|
||||||
|
content: (
|
||||||
|
<Stack
|
||||||
|
gap={theme.spacing(4)}
|
||||||
|
direction={"row"}
|
||||||
|
justifyContent={"center"}
|
||||||
|
alignItems={"center"}
|
||||||
|
onClick={(e) => handleSort(e, "status")}
|
||||||
|
sx={{ cursor: "pointer" }}
|
||||||
|
>
|
||||||
|
<Box width={theme.spacing(8)} />
|
||||||
|
{t("common.table.headers.status")}
|
||||||
|
{renderSortIcon(sortField === "status")}
|
||||||
|
</Stack>
|
||||||
|
),
|
||||||
|
render: (row) => {
|
||||||
|
return <StatusLabel status={row.status} />;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "containers",
|
||||||
|
content: t("pages.docker.table.headers.containers"),
|
||||||
|
render: (row) => {
|
||||||
|
const summary = summaryOf(row);
|
||||||
|
return (
|
||||||
|
<Typography variant="body2">
|
||||||
|
{summary
|
||||||
|
? t("pages.docker.table.containersRunning", {
|
||||||
|
running: summary.running,
|
||||||
|
total: summary.total,
|
||||||
|
})
|
||||||
|
: "—"}
|
||||||
|
</Typography>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "tags",
|
||||||
|
content: t("common.table.headers.tags"),
|
||||||
|
render: (row) => {
|
||||||
|
if (row.tags.length === 0) return "-";
|
||||||
|
return (
|
||||||
|
<Stack
|
||||||
|
justifyContent={"center"}
|
||||||
|
direction={isSmall ? "column" : "row"}
|
||||||
|
gap={theme.spacing(SPACING.LG)}
|
||||||
|
>
|
||||||
|
{row.tags.map((tagId) => {
|
||||||
|
const fullTag = tags.find((t) => t.id === tagId);
|
||||||
|
if (!fullTag) return null;
|
||||||
|
return (
|
||||||
|
<ColoredLabel
|
||||||
|
key={fullTag.id}
|
||||||
|
text={fullTag.name}
|
||||||
|
color={fullTag.color}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
id: "actions",
|
||||||
|
content: t("common.table.headers.actions"),
|
||||||
|
render: (row) => {
|
||||||
|
return <ActionsMenu items={getActions(row)} />;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
return headers;
|
||||||
|
};
|
||||||
|
|
||||||
|
let headers = getHeaders();
|
||||||
|
|
||||||
|
if (isSmall) {
|
||||||
|
headers = headers.filter((h) => h.id !== "histogram");
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<Box>
|
||||||
|
<Table
|
||||||
|
headers={headers}
|
||||||
|
data={monitors}
|
||||||
|
onRowClick={(row) => {
|
||||||
|
navigate(`/docker/host/${row.id}`);
|
||||||
|
}}
|
||||||
|
getRowSx={(row) => ({
|
||||||
|
backgroundColor: isRowSelected(row.id)
|
||||||
|
? theme.palette.action.selected
|
||||||
|
: "inherit",
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
<Pagination
|
||||||
|
component="div"
|
||||||
|
count={count}
|
||||||
|
page={page}
|
||||||
|
rowsPerPage={rowsPerPage}
|
||||||
|
onPageChange={handlePageChange}
|
||||||
|
onRowsPerPageChange={handleRowsPerPageChange}
|
||||||
|
itemsOnPage={monitors.length}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
import { MonitorListPage } from "@/Components/monitors";
|
||||||
|
import { DockerMonitorsTable } from "@/Pages/Docker/Monitors/Components/DockerMonitorsTable";
|
||||||
|
import { useMonitorListController } from "@/Hooks/useMonitorListController";
|
||||||
|
|
||||||
|
const DockerMonitorsPage = () => {
|
||||||
|
const c = useMonitorListController({
|
||||||
|
types: ["docker"],
|
||||||
|
checksLimit: 25,
|
||||||
|
refreshInterval: 5000,
|
||||||
|
rowsPerPageTable: "docker",
|
||||||
|
rowsPerPageDefault: 10,
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<MonitorListPage
|
||||||
|
headerKey="docker"
|
||||||
|
page="docker"
|
||||||
|
actionLink="/docker/create"
|
||||||
|
controller={c}
|
||||||
|
bulkActions
|
||||||
|
showTypeFilter={false}
|
||||||
|
>
|
||||||
|
<DockerMonitorsTable
|
||||||
|
monitors={c.monitors || []}
|
||||||
|
tags={c.tags || []}
|
||||||
|
refetch={c.refetch}
|
||||||
|
setSelectedMonitor={c.setSelectedMonitor}
|
||||||
|
count={c.count || 0}
|
||||||
|
page={c.page}
|
||||||
|
setPage={c.setPage}
|
||||||
|
rowsPerPage={c.rowsPerPage}
|
||||||
|
sortField={c.sortField}
|
||||||
|
setSortField={c.setSortField}
|
||||||
|
sortOrder={c.sortOrder}
|
||||||
|
setSortOrder={c.setSortOrder}
|
||||||
|
setRowsPerPage={c.handleSetRowsPerPage}
|
||||||
|
selectedRows={c.selectedRows}
|
||||||
|
onSelectionChange={c.setSelectedRows}
|
||||||
|
/>
|
||||||
|
</MonitorListPage>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default DockerMonitorsPage;
|
||||||
@@ -20,6 +20,7 @@ import { useState, useEffect, useMemo } from "react";
|
|||||||
import { useParams } from "react-router-dom";
|
import { useParams } from "react-router-dom";
|
||||||
import type { Incident, IncidentsResponse, IncidentSummary } from "@/Types/Incident";
|
import type { Incident, IncidentsResponse, IncidentSummary } from "@/Types/Incident";
|
||||||
import type { Monitor } from "@/Types/Monitor";
|
import type { Monitor } from "@/Types/Monitor";
|
||||||
|
import type { DateRange } from "@/Types/Query";
|
||||||
import { useTheme } from "@mui/material";
|
import { useTheme } from "@mui/material";
|
||||||
|
|
||||||
const IncidentsPage = () => {
|
const IncidentsPage = () => {
|
||||||
@@ -30,7 +31,7 @@ const IncidentsPage = () => {
|
|||||||
// Filter state
|
// Filter state
|
||||||
const [selectedMonitor, setSelectedMonitor] = useState(monitorId || "0");
|
const [selectedMonitor, setSelectedMonitor] = useState(monitorId || "0");
|
||||||
const [filter, setFilter] = useState("all");
|
const [filter, setFilter] = useState("all");
|
||||||
const [dateRange, setDateRange] = useState("recent");
|
const [dateRange, setDateRange] = useState<DateRange>("recent");
|
||||||
const [page, setPage] = useState(0);
|
const [page, setPage] = useState(0);
|
||||||
const [rowsPerPage, setRowsPerPage] = useState(10);
|
const [rowsPerPage, setRowsPerPage] = useState(10);
|
||||||
const [activeIncidentsPage, setActiveIncidentsPage] = useState(0);
|
const [activeIncidentsPage, setActiveIncidentsPage] = useState(0);
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ const formatTemp = (value: number) => `${value.toFixed(0)}°C`;
|
|||||||
const getChartConfigs = (theme: any, checks: HardwareCheckStats[], t: any) => {
|
const getChartConfigs = (theme: any, checks: HardwareCheckStats[], t: any) => {
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
title: t("pages.infrastructure.charts.labels.memory"),
|
title: t("common.charts.labels.memoryUsage"),
|
||||||
type: "memory",
|
type: "memory",
|
||||||
dataKeys: ["avgMemoryUsage"],
|
dataKeys: ["avgMemoryUsage"],
|
||||||
strokeColor: theme.palette.primary.main,
|
strokeColor: theme.palette.primary.main,
|
||||||
@@ -22,7 +22,7 @@ const getChartConfigs = (theme: any, checks: HardwareCheckStats[], t: any) => {
|
|||||||
idx: null,
|
idx: null,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: t("pages.infrastructure.charts.labels.cpu"),
|
title: t("common.charts.labels.cpuUsage"),
|
||||||
type: "cpu",
|
type: "cpu",
|
||||||
dataKeys: ["avgCpuUsage"],
|
dataKeys: ["avgCpuUsage"],
|
||||||
strokeColor: theme.palette.success.main,
|
strokeColor: theme.palette.success.main,
|
||||||
|
|||||||
@@ -63,19 +63,42 @@ const getChartConfigs = (
|
|||||||
return configs;
|
return configs;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Loopback / bridge names Capture sees when it can only observe the container's
|
// Loopback / bridge names Capture reports when it can only observe the
|
||||||
// own network namespace. When ALL reported interfaces match this set we assume
|
// container's own network namespace.
|
||||||
// the "no real interfaces visible" case and surface the notice.
|
|
||||||
const CONTAINER_ONLY_IFACE_NAMES = new Set(["lo", "lo0", "docker0"]);
|
const CONTAINER_ONLY_IFACE_NAMES = new Set(["lo", "lo0", "docker0"]);
|
||||||
|
|
||||||
|
// Below this, an interface is carrying no traffic worth charting. Real host
|
||||||
|
// NICs sit orders of magnitude above it; a container's veth sits at or near
|
||||||
|
// zero.
|
||||||
|
const IDLE_INTERFACE_BYTES_PER_SECOND = 1024;
|
||||||
|
|
||||||
|
const interfaceIsIdle = (checks: HardwareCheckStats[], name: string): boolean =>
|
||||||
|
checks.every((check) => {
|
||||||
|
const iface = check.net?.find((candidate) => candidate.name === name);
|
||||||
|
if (!iface) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
(iface.bytesSentPerSecond || 0) < IDLE_INTERFACE_BYTES_PER_SECOND &&
|
||||||
|
(iface.deltaBytesRecv || 0) < IDLE_INTERFACE_BYTES_PER_SECOND
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
const onlyContainerVisibleInterfaces = (checks: HardwareCheckStats[]): boolean => {
|
const onlyContainerVisibleInterfaces = (checks: HardwareCheckStats[]): boolean => {
|
||||||
const named = new Set<string>();
|
const named = new Set<string>();
|
||||||
checks.forEach((c) => c.net?.forEach((iface) => named.add(iface.name)));
|
checks.forEach((c) => c.net?.forEach((iface) => named.add(iface.name)));
|
||||||
if (named.size === 0) return false;
|
if (named.size === 0) {
|
||||||
for (const name of named) {
|
return false;
|
||||||
if (!CONTAINER_ONLY_IFACE_NAMES.has(name)) return false;
|
|
||||||
}
|
}
|
||||||
return true;
|
|
||||||
|
const names = [...named];
|
||||||
|
if (names.every((name) => CONTAINER_ONLY_IFACE_NAMES.has(name))) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (!names.some((name) => CONTAINER_ONLY_IFACE_NAMES.has(name))) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return names.every((name) => interfaceIsIdle(checks, name));
|
||||||
};
|
};
|
||||||
|
|
||||||
export const InfraNetworkCharts = ({
|
export const InfraNetworkCharts = ({
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ import { useTheme } from "@mui/material";
|
|||||||
import useMediaQuery from "@mui/material/useMediaQuery";
|
import useMediaQuery from "@mui/material/useMediaQuery";
|
||||||
import type { CheckSnapshot } from "@/Types/Check";
|
import type { CheckSnapshot } from "@/Types/Check";
|
||||||
|
|
||||||
|
const GAUGE_MAX_WIDTH = 260;
|
||||||
|
|
||||||
export const InfraDetailsGauges = ({
|
export const InfraDetailsGauges = ({
|
||||||
snapshot,
|
snapshot,
|
||||||
}: {
|
}: {
|
||||||
@@ -26,37 +28,42 @@ export const InfraDetailsGauges = ({
|
|||||||
direction={isSmall ? "column" : "row"}
|
direction={isSmall ? "column" : "row"}
|
||||||
spacing={theme.spacing(8)}
|
spacing={theme.spacing(8)}
|
||||||
alignItems={"stretch"}
|
alignItems={"stretch"}
|
||||||
|
flexWrap={"wrap"}
|
||||||
|
useFlexGap
|
||||||
>
|
>
|
||||||
<DetailGauge
|
<DetailGauge
|
||||||
title={t("pages.infrastructure.gauges.memory.title")}
|
title={t("pages.infrastructure.gauges.memory.title")}
|
||||||
maxWidth={260}
|
maxWidth={GAUGE_MAX_WIDTH}
|
||||||
progress={(snapshot?.memory?.usage_percent || 0) * 100}
|
progress={(snapshot?.memory?.usage_percent || 0) * 100}
|
||||||
upperLabel={t("pages.infrastructure.gauges.memory.upperLabel")}
|
upperLabel={t("pages.infrastructure.gauges.memory.upperLabel")}
|
||||||
upperValue={prettyBytes(snapshot?.memory?.used_bytes || 0)}
|
upperValue={prettyBytes(snapshot?.memory?.used_bytes || 0)}
|
||||||
lowerLabel={t("pages.infrastructure.gauges.memory.lowerLabel")}
|
lowerLabel={t("pages.infrastructure.gauges.memory.lowerLabel")}
|
||||||
lowerValue={prettyBytes(snapshot?.memory?.total_bytes || 0)}
|
lowerValue={prettyBytes(snapshot?.memory?.total_bytes || 0)}
|
||||||
|
flexBasis={isSmall ? "auto" : GAUGE_MAX_WIDTH}
|
||||||
/>
|
/>
|
||||||
<DetailGauge
|
<DetailGauge
|
||||||
title={t("pages.infrastructure.gauges.cpu.title")}
|
title={t("pages.infrastructure.gauges.cpu.title")}
|
||||||
maxWidth={260}
|
maxWidth={GAUGE_MAX_WIDTH}
|
||||||
progress={(snapshot?.cpu?.usage_percent || 0) * 100}
|
progress={(snapshot?.cpu?.usage_percent || 0) * 100}
|
||||||
upperLabel={t("pages.infrastructure.gauges.cpu.upperLabel")}
|
upperLabel={t("pages.infrastructure.gauges.cpu.upperLabel")}
|
||||||
upperValue={getFrequency(snapshot?.cpu?.current_frequency || 0)}
|
upperValue={getFrequency(snapshot?.cpu?.current_frequency || 0)}
|
||||||
lowerLabel={t("pages.infrastructure.gauges.cpu.lowerLabel")}
|
lowerLabel={t("pages.infrastructure.gauges.cpu.lowerLabel")}
|
||||||
lowerValue={getFrequency(snapshot?.cpu?.frequency || 0)}
|
lowerValue={getFrequency(snapshot?.cpu?.frequency || 0)}
|
||||||
|
flexBasis={isSmall ? "auto" : GAUGE_MAX_WIDTH}
|
||||||
/>
|
/>
|
||||||
{snapshot?.disk?.map((disk, idx) => {
|
{snapshot?.disk?.map((disk, idx) => {
|
||||||
return (
|
return (
|
||||||
<DetailGauge
|
<DetailGauge
|
||||||
key={disk?.device || 0 + idx}
|
key={disk?.device || `disk-${idx}`}
|
||||||
// title={`Disk ${idx} usage`}
|
// title={`Disk ${idx} usage`}
|
||||||
title={t("pages.infrastructure.gauges.disk.title", { idx })}
|
title={t("pages.infrastructure.gauges.disk.title", { idx })}
|
||||||
maxWidth={260}
|
maxWidth={GAUGE_MAX_WIDTH}
|
||||||
progress={(disk.usage_percent || 0) * 100}
|
progress={(disk.usage_percent || 0) * 100}
|
||||||
upperLabel={t("pages.infrastructure.gauges.disk.upperLabel")}
|
upperLabel={t("pages.infrastructure.gauges.disk.upperLabel")}
|
||||||
upperValue={prettyBytes(disk?.used_bytes || 0)}
|
upperValue={prettyBytes(disk?.used_bytes || 0)}
|
||||||
lowerLabel={t("pages.infrastructure.gauges.disk.lowerLabel")}
|
lowerLabel={t("pages.infrastructure.gauges.disk.lowerLabel")}
|
||||||
lowerValue={prettyBytes(disk?.total_bytes || 0)}
|
lowerValue={prettyBytes(disk?.total_bytes || 0)}
|
||||||
|
flexBasis={isSmall ? "auto" : GAUGE_MAX_WIDTH}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { useGet } from "@/Hooks/UseApi";
|
|||||||
import type { HardwareDetailsResponse } from "@/Types/Monitor";
|
import type { HardwareDetailsResponse } from "@/Types/Monitor";
|
||||||
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
|
import type { DateRange } from "@/Types/Query";
|
||||||
|
|
||||||
const InfrastructureDetails = () => {
|
const InfrastructureDetails = () => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@@ -17,7 +18,7 @@ const InfrastructureDetails = () => {
|
|||||||
|
|
||||||
const { monitorId } = useParams<{ monitorId: string }>();
|
const { monitorId } = useParams<{ monitorId: string }>();
|
||||||
|
|
||||||
const [dateRange, setDateRange] = useState<string>("recent");
|
const [dateRange, setDateRange] = useState<DateRange>("recent");
|
||||||
const [selectedTab, setSelectedTab] = useState<number>(0);
|
const [selectedTab, setSelectedTab] = useState<number>(0);
|
||||||
|
|
||||||
const monitorDetailsUrl = useMemo(() => {
|
const monitorDetailsUrl = useMemo(() => {
|
||||||
|
|||||||
@@ -1,274 +1,44 @@
|
|||||||
import Stack from "@mui/material/Stack";
|
import { MonitorListPage } from "@/Components/monitors";
|
||||||
import Typography from "@mui/material/Typography";
|
import { InfraMonitorsTable } from "@/Pages/Infrastructure/Monitors/Components/MonitorsTable";
|
||||||
import useMediaQuery from "@mui/material/useMediaQuery";
|
|
||||||
import { MonitorBasePageWithStates, ColoredLabel } from "@/Components/design-elements";
|
|
||||||
import { HeaderCreate } from "@/Components/common";
|
|
||||||
import {
|
|
||||||
ControlsFilter,
|
|
||||||
HeaderMonitorsSummary,
|
|
||||||
BulkActionsBar,
|
|
||||||
} from "@/Components/monitors";
|
|
||||||
import { TextField, Dialog, Button } from "@/Components/inputs";
|
|
||||||
import { Play, Pause } from "lucide-react";
|
|
||||||
|
|
||||||
import { useGet, useDelete } from "@/Hooks/UseApi";
|
import { useMonitorListController } from "@/Hooks/useMonitorListController";
|
||||||
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
|
||||||
import type { Monitor, MonitorsWithChecksResponse } from "@/Types/Monitor";
|
|
||||||
import type { Tag } from "@/Types/Tag";
|
|
||||||
import { useTheme } from "@mui/material";
|
|
||||||
import { SPACING } from "@/Utils/Theme/constants";
|
|
||||||
import { useState, useCallback, useMemo } from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { useSelector, useDispatch } from "react-redux";
|
|
||||||
import { setRowsPerPage } from "@/Features/UI/uiSlice.js";
|
|
||||||
import type { RootState } from "@/Types/state";
|
|
||||||
import { InfraMonitorsTable } from "./Components/MonitorsTable";
|
|
||||||
import useDebounce from "@/Hooks/useDebounce";
|
|
||||||
import { useBulkMonitorActions } from "@/Hooks/useBulkMonitorActions";
|
|
||||||
|
|
||||||
const InfrastructureMonitors = () => {
|
const InfrastructureMonitors = () => {
|
||||||
const { t } = useTranslation();
|
const c = useMonitorListController({
|
||||||
const theme = useTheme();
|
types: ["hardware"],
|
||||||
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
checksLimit: 1,
|
||||||
const isAdmin = useIsAdmin();
|
refreshInterval: 5000,
|
||||||
const dispatch = useDispatch();
|
rowsPerPageTable: "infrastructure",
|
||||||
|
rowsPerPageDefault: 5,
|
||||||
// Redux state
|
});
|
||||||
const rowsPerPage = useSelector(
|
|
||||||
(state: RootState) => state.ui?.infrastructure?.rowsPerPage ?? 5
|
|
||||||
);
|
|
||||||
|
|
||||||
// Local state
|
|
||||||
const [selectedStatus, setSelectedStatus] = useState<string>("");
|
|
||||||
const [selectedState, setSelectedState] = useState<string>("");
|
|
||||||
const [selectedTags, setSelectedTags] = useState<string[]>([]);
|
|
||||||
const [search, setSearch] = useState<string>("");
|
|
||||||
const [page, setPage] = useState<number>(0);
|
|
||||||
const [sortField, setSortField] = useState<string>("");
|
|
||||||
const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
|
|
||||||
const [selectedMonitor, setSelectedMonitor] = useState<Monitor | null>(null);
|
|
||||||
|
|
||||||
const { data: tags } = useGet<Tag[]>("/tags/team");
|
|
||||||
|
|
||||||
const isDialogOpen = Boolean(selectedMonitor);
|
|
||||||
|
|
||||||
const debouncedSearch = useDebounce<string>(search, 300);
|
|
||||||
|
|
||||||
const handleClearFilters = useCallback(() => {
|
|
||||||
setSelectedStatus("");
|
|
||||||
setSelectedState("");
|
|
||||||
setSelectedTags([]);
|
|
||||||
setSearch("");
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
// Convert filter selections to API filter values
|
|
||||||
const toFilterStatus = useMemo(() => {
|
|
||||||
if (selectedStatus === "up") return "true";
|
|
||||||
if (selectedStatus === "down") return "false";
|
|
||||||
return undefined;
|
|
||||||
}, [selectedStatus]);
|
|
||||||
|
|
||||||
const toFilterActive = useMemo(() => {
|
|
||||||
if (selectedState === "active") return "true";
|
|
||||||
if (selectedState === "paused") return "false";
|
|
||||||
return undefined;
|
|
||||||
}, [selectedState]);
|
|
||||||
|
|
||||||
// Determine field and filter for the API request
|
|
||||||
// Priority: status > isActive > search
|
|
||||||
const filterLookup = new Map<string | undefined, string>([
|
|
||||||
[toFilterStatus, "status"],
|
|
||||||
[toFilterActive, "isActive"],
|
|
||||||
]);
|
|
||||||
const activeFilter = [...filterLookup].find(([key]) => key !== undefined);
|
|
||||||
const field = activeFilter?.[1] || (debouncedSearch ? "name" : sortField || undefined);
|
|
||||||
const filter = activeFilter?.[0] || debouncedSearch || undefined;
|
|
||||||
|
|
||||||
// Build URL for monitors with checks
|
|
||||||
const monitorsWithChecksUrl = useMemo(() => {
|
|
||||||
const params = new URLSearchParams();
|
|
||||||
params.append("type", "hardware");
|
|
||||||
selectedTags.forEach((tagId) => params.append("tags", tagId));
|
|
||||||
params.append("limit", "1");
|
|
||||||
if (page !== undefined) params.append("page", String(page));
|
|
||||||
if (rowsPerPage) params.append("rowsPerPage", String(rowsPerPage));
|
|
||||||
if (filter) params.append("filter", filter);
|
|
||||||
if (field) params.append("field", field);
|
|
||||||
if (sortOrder) params.append("order", sortOrder);
|
|
||||||
return `/monitors/team/with-checks?${params.toString()}`;
|
|
||||||
}, [page, rowsPerPage, filter, field, sortOrder, selectedTags]);
|
|
||||||
|
|
||||||
const {
|
|
||||||
data: monitorsWithChecksData,
|
|
||||||
isLoading: monitorsWithChecksLoading,
|
|
||||||
error: monitorsWithChecksError,
|
|
||||||
refetch,
|
|
||||||
} = useGet<MonitorsWithChecksResponse>(
|
|
||||||
monitorsWithChecksUrl,
|
|
||||||
{},
|
|
||||||
{ refreshInterval: 5000, keepPreviousData: true }
|
|
||||||
);
|
|
||||||
|
|
||||||
const { summary, count } = monitorsWithChecksData ?? { summary: null, count: 0 };
|
|
||||||
const isLoading = monitorsWithChecksLoading;
|
|
||||||
|
|
||||||
// Bulk actions
|
|
||||||
const {
|
|
||||||
selectedRows,
|
|
||||||
setSelectedRows,
|
|
||||||
handleBulkPause,
|
|
||||||
handleBulkResume,
|
|
||||||
handleCancelSelection,
|
|
||||||
} = useBulkMonitorActions(refetch, page);
|
|
||||||
|
|
||||||
// Check if any filters are active
|
|
||||||
const hasActiveFilters = Boolean(
|
|
||||||
selectedStatus || selectedState || selectedTags.length > 0 || search
|
|
||||||
);
|
|
||||||
|
|
||||||
// Show empty state only when there are truly no monitors (not just filtered out)
|
|
||||||
const effectiveTotalCount =
|
|
||||||
hasActiveFilters && (summary?.totalMonitors ?? 0) === 0
|
|
||||||
? 1
|
|
||||||
: (summary?.totalMonitors ?? 0);
|
|
||||||
|
|
||||||
// Delete hook
|
|
||||||
const { deleteFn, loading: isDeleting } = useDelete();
|
|
||||||
|
|
||||||
const handleConfirm = async () => {
|
|
||||||
if (!selectedMonitor) return;
|
|
||||||
await deleteFn(`/monitors/${selectedMonitor.id}`);
|
|
||||||
setSelectedMonitor(null);
|
|
||||||
refetch();
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleCancel = () => {
|
|
||||||
setSelectedMonitor(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MonitorBasePageWithStates
|
<MonitorListPage
|
||||||
headerKey="infrastructure"
|
headerKey="infrastructure"
|
||||||
loading={isLoading}
|
|
||||||
error={monitorsWithChecksError}
|
|
||||||
totalCount={effectiveTotalCount}
|
|
||||||
page="infrastructure"
|
page="infrastructure"
|
||||||
actionLink="/infrastructure/create"
|
actionLink="/infrastructure/create"
|
||||||
|
controller={c}
|
||||||
|
bulkActions
|
||||||
|
showTypeFilter={false}
|
||||||
|
summaryProps={{ showBreached: true }}
|
||||||
>
|
>
|
||||||
<HeaderCreate
|
|
||||||
path="/infrastructure/create"
|
|
||||||
isLoading={isLoading}
|
|
||||||
isAdmin={isAdmin}
|
|
||||||
/>
|
|
||||||
<HeaderMonitorsSummary
|
|
||||||
summary={summary}
|
|
||||||
showBreached={true}
|
|
||||||
/>
|
|
||||||
<Stack
|
|
||||||
direction={isSmall ? "column" : "row"}
|
|
||||||
justifyContent={isSmall ? "flex-start" : "space-between"}
|
|
||||||
gap={theme.spacing(4)}
|
|
||||||
>
|
|
||||||
<ControlsFilter
|
|
||||||
showTypes={false}
|
|
||||||
selectedStatus={selectedStatus}
|
|
||||||
setSelectedStatus={setSelectedStatus}
|
|
||||||
selectedState={selectedState}
|
|
||||||
setSelectedState={setSelectedState}
|
|
||||||
tagOptions={tags ?? []}
|
|
||||||
selectedTags={selectedTags}
|
|
||||||
setSelectedTags={setSelectedTags}
|
|
||||||
onClearFilters={handleClearFilters}
|
|
||||||
/>
|
|
||||||
<TextField
|
|
||||||
placeholder={t("pages.uptime.filters.search.placeholder")}
|
|
||||||
value={search}
|
|
||||||
onChange={(event) => {
|
|
||||||
setSearch(event.target.value);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</Stack>
|
|
||||||
|
|
||||||
{selectedTags.length > 0 && (
|
|
||||||
<Stack
|
|
||||||
direction={isSmall ? "column" : "row"}
|
|
||||||
alignItems={isSmall ? "flex-start" : "center"}
|
|
||||||
flexWrap="wrap"
|
|
||||||
gap={theme.spacing(SPACING.XL)}
|
|
||||||
>
|
|
||||||
<Typography color={theme.palette.text.secondary}>
|
|
||||||
{t("pages.uptime.filters.activeTags")}
|
|
||||||
</Typography>
|
|
||||||
{selectedTags.map((tagId) => {
|
|
||||||
const tag = tags?.find((t) => t.id === tagId);
|
|
||||||
if (!tag) return null;
|
|
||||||
return (
|
|
||||||
<ColoredLabel
|
|
||||||
key={tag.id}
|
|
||||||
text={tag.name}
|
|
||||||
color={tag.color}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</Stack>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{!isLoading && (
|
|
||||||
<BulkActionsBar
|
|
||||||
selectedCount={selectedRows.length}
|
|
||||||
onCancel={handleCancelSelection}
|
|
||||||
>
|
|
||||||
<Button
|
|
||||||
size="small"
|
|
||||||
startIcon={<Play size={16} />}
|
|
||||||
onClick={handleBulkResume}
|
|
||||||
>
|
|
||||||
{t("common.buttons.resume")}
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
size="small"
|
|
||||||
startIcon={<Pause size={16} />}
|
|
||||||
onClick={handleBulkPause}
|
|
||||||
>
|
|
||||||
{t("common.buttons.pause")}
|
|
||||||
</Button>
|
|
||||||
</BulkActionsBar>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<InfraMonitorsTable
|
<InfraMonitorsTable
|
||||||
monitors={monitorsWithChecksData?.monitors || []}
|
monitors={c.monitors || []}
|
||||||
tags={tags ?? []}
|
tags={c.tags || []}
|
||||||
refetch={refetch}
|
refetch={c.refetch}
|
||||||
setSelectedMonitor={setSelectedMonitor}
|
setSelectedMonitor={c.setSelectedMonitor}
|
||||||
sortField={sortField}
|
count={c.count || 0}
|
||||||
setSortField={setSortField}
|
page={c.page}
|
||||||
sortOrder={sortOrder}
|
setPage={c.setPage}
|
||||||
setSortOrder={setSortOrder}
|
rowsPerPage={c.rowsPerPage}
|
||||||
count={count || 0}
|
sortField={c.sortField}
|
||||||
page={page}
|
setSortField={c.setSortField}
|
||||||
setPage={setPage}
|
sortOrder={c.sortOrder}
|
||||||
rowsPerPage={rowsPerPage}
|
setSortOrder={c.setSortOrder}
|
||||||
setRowsPerPage={(value: number) => {
|
setRowsPerPage={c.handleSetRowsPerPage}
|
||||||
dispatch(
|
selectedRows={c.selectedRows}
|
||||||
setRowsPerPage({
|
onSelectionChange={c.setSelectedRows}
|
||||||
value,
|
|
||||||
table: "infrastructure",
|
|
||||||
})
|
|
||||||
);
|
|
||||||
setPage(0);
|
|
||||||
}}
|
|
||||||
selectedRows={selectedRows}
|
|
||||||
onSelectionChange={setSelectedRows}
|
|
||||||
/>
|
/>
|
||||||
<Dialog
|
</MonitorListPage>
|
||||||
open={isDialogOpen}
|
|
||||||
title={t("common.dialogs.delete.title")}
|
|
||||||
content={t("common.dialogs.delete.description")}
|
|
||||||
onConfirm={handleConfirm}
|
|
||||||
onCancel={handleCancel}
|
|
||||||
loading={isDeleting}
|
|
||||||
/>
|
|
||||||
</MonitorBasePageWithStates>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import Stack from "@mui/material/Stack";
|
import Stack from "@mui/material/Stack";
|
||||||
|
import Typography from "@mui/material/Typography";
|
||||||
import { logger } from "@/Utils/logger";
|
import { logger } from "@/Utils/logger";
|
||||||
import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
|
import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
|
||||||
import { BasePage, ConfigBox } from "@/Components/design-elements";
|
import { BasePage, ColoredLabel, ConfigBox } from "@/Components/design-elements";
|
||||||
import { Button } from "@/Components/inputs";
|
import { Button } from "@/Components/inputs";
|
||||||
|
|
||||||
import { useTheme } from "@mui/material";
|
import { useTheme } from "@mui/material";
|
||||||
@@ -15,6 +16,7 @@ import { useGet, usePost, usePatch } from "@/Hooks/UseApi";
|
|||||||
import { mutate } from "swr";
|
import { mutate } from "swr";
|
||||||
import { useParams, useNavigate } from "react-router-dom";
|
import { useParams, useNavigate } from "react-router-dom";
|
||||||
import type { Monitor } from "@/Types/Monitor";
|
import type { Monitor } from "@/Types/Monitor";
|
||||||
|
import type { Tag } from "@/Types/Tag";
|
||||||
import { useForm, FormProvider } from "react-hook-form";
|
import { useForm, FormProvider } from "react-hook-form";
|
||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js";
|
import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js";
|
||||||
@@ -41,6 +43,7 @@ const CreateMaintenanceWindowPage = () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const { data: monitors } = useGet<Monitor[]>("/monitors/team");
|
const { data: monitors } = useGet<Monitor[]>("/monitors/team");
|
||||||
|
const { data: tags } = useGet<Tag[]>("/tags/team");
|
||||||
|
|
||||||
const { post, loading: isPosting } = usePost();
|
const { post, loading: isPosting } = usePost();
|
||||||
const { patch, loading: isPatching } = usePatch();
|
const { patch, loading: isPatching } = usePatch();
|
||||||
@@ -203,6 +206,26 @@ const CreateMaintenanceWindowPage = () => {
|
|||||||
"pages.maintenanceWindow.form.startTime.monitors.option.addMonitors.label"
|
"pages.maintenanceWindow.form.startTime.monitors.option.addMonitors.label"
|
||||||
)}
|
)}
|
||||||
options={monitors ?? []}
|
options={monitors ?? []}
|
||||||
|
renderOptionContent={(monitor) => (
|
||||||
|
<Stack
|
||||||
|
direction="row"
|
||||||
|
alignItems="center"
|
||||||
|
gap={theme.spacing(2)}
|
||||||
|
flexWrap="wrap"
|
||||||
|
>
|
||||||
|
<Typography>{monitor.name}</Typography>
|
||||||
|
{monitor.tags.map((tagId) => {
|
||||||
|
const tag = tags?.find(({ id }) => id === tagId);
|
||||||
|
return tag ? (
|
||||||
|
<ColoredLabel
|
||||||
|
key={tag.id}
|
||||||
|
text={tag.name}
|
||||||
|
color={tag.color}
|
||||||
|
/>
|
||||||
|
) : null;
|
||||||
|
})}
|
||||||
|
</Stack>
|
||||||
|
)}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -15,12 +15,13 @@ import { useGet } from "@/Hooks/UseApi";
|
|||||||
import { useParams } from "react-router-dom";
|
import { useParams } from "react-router-dom";
|
||||||
import { useTheme } from "@mui/material";
|
import { useTheme } from "@mui/material";
|
||||||
import { useState, useMemo } from "react";
|
import { useState, useMemo } from "react";
|
||||||
|
import type { DateRange } from "@/Types/Query";
|
||||||
|
|
||||||
const PageSpeedDetails = () => {
|
const PageSpeedDetails = () => {
|
||||||
const { monitorId } = useParams();
|
const { monitorId } = useParams();
|
||||||
const isAdmin = useIsAdmin();
|
const isAdmin = useIsAdmin();
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const [dateRange, setDateRange] = useState<string>("day");
|
const [dateRange, setDateRange] = useState<DateRange>("day");
|
||||||
|
|
||||||
const monitorDetailsUrl = useMemo(() => {
|
const monitorDetailsUrl = useMemo(() => {
|
||||||
if (!monitorId) {
|
if (!monitorId) {
|
||||||
|
|||||||
@@ -1,229 +1,57 @@
|
|||||||
import {
|
import { PageSpeedKeyPriorityFallback } from "@/Components/design-elements";
|
||||||
MonitorBasePageWithStates,
|
|
||||||
PageSpeedKeyPriorityFallback,
|
|
||||||
ColoredLabel,
|
|
||||||
} from "@/Components/design-elements";
|
|
||||||
import { Dialog, TextField } from "@/Components/inputs";
|
|
||||||
import { HeaderCreate } from "@/Components/common";
|
|
||||||
import { PageSpeedMonitorsTable } from "@/Pages/PageSpeed/Monitors/Components/PageSpeedMonitorsTable";
|
import { PageSpeedMonitorsTable } from "@/Pages/PageSpeed/Monitors/Components/PageSpeedMonitorsTable";
|
||||||
import type { Monitor } from "@/Types/Monitor";
|
|
||||||
import type { Tag } from "@/Types/Tag";
|
|
||||||
import Stack from "@mui/material/Stack";
|
|
||||||
import Typography from "@mui/material/Typography";
|
|
||||||
import useMediaQuery from "@mui/material/useMediaQuery";
|
|
||||||
import { useTheme } from "@mui/material";
|
|
||||||
import { SPACING } from "@/Utils/Theme/constants";
|
|
||||||
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { useCallback, useMemo, useState } from "react";
|
|
||||||
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
||||||
import { useGet, useDelete } from "@/Hooks/UseApi";
|
import { useGet } from "@/Hooks/UseApi";
|
||||||
import useDebounce from "@/Hooks/useDebounce";
|
|
||||||
import type { MonitorsWithChecksResponse } from "@/Types/Monitor";
|
|
||||||
import type { AppSettingsResponse } from "@/Types/Settings";
|
import type { AppSettingsResponse } from "@/Types/Settings";
|
||||||
import { ControlsFilter, HeaderMonitorsSummary } from "@/Components/monitors";
|
import { MonitorListPage } from "@/Components/monitors";
|
||||||
|
import { useMonitorListController } from "@/Hooks/useMonitorListController";
|
||||||
|
|
||||||
const PageSpeedMonitorsPage = () => {
|
const PageSpeedMonitorsPage = () => {
|
||||||
const { t } = useTranslation();
|
|
||||||
const theme = useTheme();
|
|
||||||
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
|
||||||
const isAdmin = useIsAdmin();
|
const isAdmin = useIsAdmin();
|
||||||
const { deleteFn, loading: isDeleting } = useDelete();
|
|
||||||
|
|
||||||
const settingsUrl = "/settings";
|
|
||||||
const {
|
const {
|
||||||
data: settingsData,
|
data: settingsData,
|
||||||
isLoading: settingsIsLoading,
|
isLoading: settingsIsLoading,
|
||||||
error: settingsError,
|
error: settingsError,
|
||||||
} = useGet<AppSettingsResponse>(settingsUrl);
|
} = useGet<AppSettingsResponse>("/settings");
|
||||||
|
|
||||||
const [selectedMonitor, setSelectedMonitor] = useState<Monitor | null>(null);
|
const c = useMonitorListController({
|
||||||
const isDialogOpen = Boolean(selectedMonitor);
|
types: ["pagespeed"],
|
||||||
const [sortField, setSortField] = useState<string>("name");
|
checksLimit: 25,
|
||||||
const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
|
refreshInterval: 30000,
|
||||||
const [page, setPage] = useState(0);
|
rowsPerPageTable: "pagespeed",
|
||||||
const [rowsPerPage, setRowsPerPage] = useState(10);
|
rowsPerPageDefault: 10,
|
||||||
const [selectedTags, setSelectedTags] = useState<string[]>([]);
|
initialSortField: "name",
|
||||||
const [selectedStatus, setSelectedStatus] = useState<string>("");
|
});
|
||||||
const [selectedState, setSelectedState] = useState<string>("");
|
|
||||||
const [search, setSearch] = useState<string>("");
|
|
||||||
|
|
||||||
const debouncedSearch = useDebounce<string>(search, 300);
|
|
||||||
|
|
||||||
// Status: pass "up"/"down" directly to the API
|
|
||||||
// State: "active" -> true, "paused" -> false
|
|
||||||
const toFilterStatus = useMemo(() => {
|
|
||||||
if (selectedStatus === "up") return "up";
|
|
||||||
if (selectedStatus === "down") return "down";
|
|
||||||
return undefined;
|
|
||||||
}, [selectedStatus]);
|
|
||||||
|
|
||||||
const toFilterActive = useMemo(() => {
|
|
||||||
if (selectedState === "active") return "true";
|
|
||||||
if (selectedState === "paused") return "false";
|
|
||||||
return undefined;
|
|
||||||
}, [selectedState]);
|
|
||||||
|
|
||||||
// Priority: status > isActive > search > sort
|
|
||||||
const filterLookup = new Map<string | undefined, string>([
|
|
||||||
[toFilterStatus, "status"],
|
|
||||||
[toFilterActive, "isActive"],
|
|
||||||
]);
|
|
||||||
const activeFilter = [...filterLookup].find(([key]) => key !== undefined);
|
|
||||||
const field = activeFilter?.[1] || (debouncedSearch ? "name" : sortField || undefined);
|
|
||||||
const filter = activeFilter?.[0] || debouncedSearch;
|
|
||||||
|
|
||||||
const { data: tags } = useGet<Tag[]>("/tags/team");
|
|
||||||
|
|
||||||
const monitorsWithChecksUrl = useMemo(() => {
|
|
||||||
const params = new URLSearchParams();
|
|
||||||
params.append("type", "pagespeed");
|
|
||||||
selectedTags.forEach((tagId) => params.append("tags", tagId));
|
|
||||||
params.append("limit", "25");
|
|
||||||
if (page !== undefined) params.append("page", String(page));
|
|
||||||
if (rowsPerPage) params.append("rowsPerPage", String(rowsPerPage));
|
|
||||||
if (filter) params.append("filter", filter);
|
|
||||||
if (field) params.append("field", field);
|
|
||||||
if (sortOrder) params.append("order", sortOrder);
|
|
||||||
return `/monitors/team/with-checks?${params.toString()}`;
|
|
||||||
}, [page, rowsPerPage, sortOrder, selectedTags, filter, field]);
|
|
||||||
|
|
||||||
const {
|
|
||||||
data: monitorsData,
|
|
||||||
isLoading: monitorsIsLoading,
|
|
||||||
error: monitorsError,
|
|
||||||
refetch,
|
|
||||||
} = useGet<MonitorsWithChecksResponse>(
|
|
||||||
monitorsWithChecksUrl,
|
|
||||||
{},
|
|
||||||
{ refreshInterval: 30000 }
|
|
||||||
);
|
|
||||||
|
|
||||||
const monitors = monitorsData?.monitors;
|
|
||||||
const monitorsCount = monitorsData?.count ?? 0;
|
|
||||||
const summary = monitorsData?.summary ?? null;
|
|
||||||
|
|
||||||
const isLoading = monitorsIsLoading || settingsIsLoading;
|
|
||||||
|
|
||||||
const showApiKeyWarning = isAdmin && settingsData && !settingsData.pagespeedKeySet;
|
const showApiKeyWarning = isAdmin && settingsData && !settingsData.pagespeedKeySet;
|
||||||
|
|
||||||
const handleConfirm = async () => {
|
|
||||||
if (!selectedMonitor) return;
|
|
||||||
await deleteFn(`/monitors/${selectedMonitor.id}`);
|
|
||||||
setSelectedMonitor(null);
|
|
||||||
refetch();
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleCancel = () => {
|
|
||||||
setSelectedMonitor(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleClearFilters = useCallback(() => {
|
|
||||||
setSelectedStatus("");
|
|
||||||
setSelectedState("");
|
|
||||||
setSelectedTags([]);
|
|
||||||
setSearch("");
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const hasActiveFilters = Boolean(
|
|
||||||
selectedStatus || selectedState || selectedTags.length > 0 || search
|
|
||||||
);
|
|
||||||
|
|
||||||
const effectiveTotalCount =
|
|
||||||
hasActiveFilters && (summary?.totalMonitors ?? 0) === 0
|
|
||||||
? 1
|
|
||||||
: (summary?.totalMonitors ?? 0);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MonitorBasePageWithStates
|
<MonitorListPage
|
||||||
headerKey="pageSpeed"
|
headerKey="pageSpeed"
|
||||||
loading={isLoading}
|
|
||||||
error={monitorsError || settingsError}
|
|
||||||
totalCount={effectiveTotalCount}
|
|
||||||
page="pageSpeed"
|
page="pageSpeed"
|
||||||
actionLink="/pagespeed/create"
|
actionLink="/pagespeed/create"
|
||||||
|
controller={c}
|
||||||
|
showTypeFilter={false}
|
||||||
|
extraLoading={settingsIsLoading}
|
||||||
|
extraError={settingsError}
|
||||||
priorityFallback={showApiKeyWarning ? <PageSpeedKeyPriorityFallback /> : undefined}
|
priorityFallback={showApiKeyWarning ? <PageSpeedKeyPriorityFallback /> : undefined}
|
||||||
>
|
>
|
||||||
<HeaderCreate
|
|
||||||
path="/pagespeed/create"
|
|
||||||
isLoading={isLoading}
|
|
||||||
isAdmin={isAdmin}
|
|
||||||
/>
|
|
||||||
<HeaderMonitorsSummary summary={summary} />
|
|
||||||
|
|
||||||
<Stack
|
|
||||||
direction={isSmall ? "column" : "row"}
|
|
||||||
justifyContent={isSmall ? "flex-start" : "space-between"}
|
|
||||||
gap={theme.spacing(4)}
|
|
||||||
>
|
|
||||||
<ControlsFilter
|
|
||||||
showTypes={false}
|
|
||||||
selectedStatus={selectedStatus}
|
|
||||||
setSelectedStatus={setSelectedStatus}
|
|
||||||
selectedState={selectedState}
|
|
||||||
setSelectedState={setSelectedState}
|
|
||||||
tagOptions={tags ?? []}
|
|
||||||
selectedTags={selectedTags}
|
|
||||||
setSelectedTags={setSelectedTags}
|
|
||||||
onClearFilters={handleClearFilters}
|
|
||||||
/>
|
|
||||||
<TextField
|
|
||||||
placeholder={t("pages.uptime.filters.search.placeholder")}
|
|
||||||
value={search}
|
|
||||||
onChange={(event) => {
|
|
||||||
setSearch(event.target.value);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</Stack>
|
|
||||||
|
|
||||||
{selectedTags.length > 0 && (
|
|
||||||
<Stack
|
|
||||||
direction={isSmall ? "column" : "row"}
|
|
||||||
alignItems={isSmall ? "flex-start" : "center"}
|
|
||||||
flexWrap="wrap"
|
|
||||||
gap={theme.spacing(SPACING.XL)}
|
|
||||||
>
|
|
||||||
<Typography color={theme.palette.text.secondary}>
|
|
||||||
{t("pages.uptime.filters.activeTags")}
|
|
||||||
</Typography>
|
|
||||||
{selectedTags.map((tagId) => {
|
|
||||||
const tag = tags?.find((t) => t.id === tagId);
|
|
||||||
if (!tag) return null;
|
|
||||||
return (
|
|
||||||
<ColoredLabel
|
|
||||||
key={tag.id}
|
|
||||||
text={tag.name}
|
|
||||||
color={tag.color}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</Stack>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<PageSpeedMonitorsTable
|
<PageSpeedMonitorsTable
|
||||||
monitors={monitors || []}
|
monitors={c.monitors || []}
|
||||||
tags={tags ?? []}
|
tags={c.tags || []}
|
||||||
refetch={refetch}
|
refetch={c.refetch}
|
||||||
setSelectedMonitor={setSelectedMonitor}
|
setSelectedMonitor={c.setSelectedMonitor}
|
||||||
sortField={sortField}
|
count={c.count || 0}
|
||||||
setSortField={setSortField}
|
page={c.page}
|
||||||
sortOrder={sortOrder}
|
setPage={c.setPage}
|
||||||
setSortOrder={setSortOrder}
|
rowsPerPage={c.rowsPerPage}
|
||||||
count={monitorsCount || 0}
|
sortField={c.sortField}
|
||||||
page={page}
|
setSortField={c.setSortField}
|
||||||
setPage={setPage}
|
sortOrder={c.sortOrder}
|
||||||
rowsPerPage={rowsPerPage}
|
setSortOrder={c.setSortOrder}
|
||||||
setRowsPerPage={setRowsPerPage}
|
setRowsPerPage={c.handleSetRowsPerPage}
|
||||||
/>
|
/>
|
||||||
<Dialog
|
</MonitorListPage>
|
||||||
open={isDialogOpen}
|
|
||||||
title={t("common.dialogs.delete.title")}
|
|
||||||
content={t("common.dialogs.delete.description")}
|
|
||||||
onConfirm={handleConfirm}
|
|
||||||
onCancel={handleCancel}
|
|
||||||
loading={isDeleting}
|
|
||||||
/>
|
|
||||||
</MonitorBasePageWithStates>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,103 @@
|
|||||||
|
import { ActionsMenu, type ActionMenuItem } from "@/Components/actions-menu";
|
||||||
|
import Typography from "@mui/material/Typography";
|
||||||
|
import type { Header } from "@/Components/design-elements/Table";
|
||||||
|
import { Table } from "@/Components/design-elements";
|
||||||
|
import { Pagination } from "@/Components/design-elements/Table";
|
||||||
|
import { useClientPagination } from "@/Hooks/useClientPagination";
|
||||||
|
|
||||||
|
import type { ProxyResponse } from "@/Types/Proxy";
|
||||||
|
import { useNavigate } from "react-router";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { useTheme } from "@mui/material";
|
||||||
|
|
||||||
|
interface ProxiesTableProps {
|
||||||
|
proxies: ProxyResponse[];
|
||||||
|
setSelectedProxy: Function;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const ProxiesTable = ({ proxies, setSelectedProxy }: ProxiesTableProps) => {
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const theme = useTheme();
|
||||||
|
const { pagedRows, paginationProps } = useClientPagination(proxies);
|
||||||
|
|
||||||
|
const getActions = (proxy: ProxyResponse): ActionMenuItem[] => {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
label: t("pages.common.monitors.actions.configure"),
|
||||||
|
action: () => {
|
||||||
|
navigate(`/proxies/configure/${proxy.id}`);
|
||||||
|
},
|
||||||
|
closeMenu: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
id: 2,
|
||||||
|
label: (
|
||||||
|
<Typography color={theme.palette.error.main}>
|
||||||
|
{t("pages.common.monitors.actions.delete")}
|
||||||
|
</Typography>
|
||||||
|
),
|
||||||
|
action: async () => {
|
||||||
|
setSelectedProxy(proxy);
|
||||||
|
},
|
||||||
|
closeMenu: true,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
const getHeaders = () => {
|
||||||
|
const headers: Header<ProxyResponse>[] = [
|
||||||
|
{
|
||||||
|
id: "name",
|
||||||
|
content: t("common.table.headers.name"),
|
||||||
|
render: (row) => {
|
||||||
|
return <Typography>{row?.name}</Typography>;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "protocol",
|
||||||
|
content: t("pages.proxies.table.headers.protocol"),
|
||||||
|
render: (row) => {
|
||||||
|
return <Typography>{row?.protocol}</Typography>;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "host",
|
||||||
|
content: t("pages.proxies.table.headers.host"),
|
||||||
|
render: (row) => {
|
||||||
|
return <Typography>{row?.host}</Typography>;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "port",
|
||||||
|
content: t("pages.proxies.table.headers.port"),
|
||||||
|
render: (row) => {
|
||||||
|
return <Typography>{row?.port}</Typography>;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "actions",
|
||||||
|
content: t("common.table.headers.actions"),
|
||||||
|
render: (row) => {
|
||||||
|
return <ActionsMenu items={getActions(row)} />;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
return headers;
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Table
|
||||||
|
headers={getHeaders()}
|
||||||
|
data={pagedRows}
|
||||||
|
onRowClick={(row) => {
|
||||||
|
navigate(`/proxies/configure/${row.id}`);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
{proxies.length > 0 && <Pagination {...paginationProps} />}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,213 @@
|
|||||||
|
import { BasePage, ConfigBox } from "@/Components/design-elements";
|
||||||
|
import { LAYOUT } from "@/Utils/Theme/constants";
|
||||||
|
import { Button, FieldLabel } from "@/Components/inputs";
|
||||||
|
import Box from "@mui/material/Box";
|
||||||
|
import Stack from "@mui/material/Stack";
|
||||||
|
import { useTheme } from "@mui/material/styles";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { useParams } from "react-router-dom";
|
||||||
|
import { useNavigate } from "react-router-dom";
|
||||||
|
import { useForm, FormProvider } from "react-hook-form";
|
||||||
|
import { zodResolver } from "@hookform/resolvers/zod";
|
||||||
|
import { mutate } from "swr";
|
||||||
|
import { useGet, usePost, usePatch } from "@/Hooks/UseApi";
|
||||||
|
import type { ProxyFormData } from "@/Validation/proxy";
|
||||||
|
import { ProxyProtocols, type ProxyResponse } from "@/Types/Proxy";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { useProxiesForm } from "@/Hooks/useProxiesForm";
|
||||||
|
import { FormTextField } from "@/Components/inputs/forms/FormTextField";
|
||||||
|
import { FormSelectField } from "@/Components/inputs/forms/FormSelectField";
|
||||||
|
import { useMemo } from "react";
|
||||||
|
import { FormNumberField } from "@/Components/inputs/forms/FormNumberField";
|
||||||
|
const ProxiesCreatePage = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const theme = useTheme();
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const { proxyId } = useParams<{ proxyId: string }>();
|
||||||
|
const isEditMode = Boolean(proxyId);
|
||||||
|
|
||||||
|
const { data: existingProxy } = useGet<ProxyResponse>(
|
||||||
|
isEditMode ? `/proxies/${proxyId}` : null
|
||||||
|
);
|
||||||
|
|
||||||
|
const { post, loading: isSubmitting } = usePost<ProxyFormData, ProxyResponse>();
|
||||||
|
const { patch, loading: isPatching } = usePatch<ProxyFormData, ProxyResponse>();
|
||||||
|
|
||||||
|
const { schema, defaults } = useProxiesForm({ data: existingProxy });
|
||||||
|
|
||||||
|
const form = useForm<ProxyFormData>({
|
||||||
|
resolver: zodResolver(schema),
|
||||||
|
defaultValues: defaults,
|
||||||
|
});
|
||||||
|
|
||||||
|
const { reset, handleSubmit } = form;
|
||||||
|
|
||||||
|
const isPasswordSet = existingProxy?.hasPassword ?? false;
|
||||||
|
const [passwordHasBeenReset, setPasswordHasBeenReset] = useState(false);
|
||||||
|
|
||||||
|
const handleResetPassword = () => {
|
||||||
|
form.setValue("password", "");
|
||||||
|
setPasswordHasBeenReset(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const isUsernameSet = Boolean(existingProxy?.username);
|
||||||
|
const [usernameHasBeenReset, setUsernameHasBeenReset] = useState(false);
|
||||||
|
|
||||||
|
const handleResetUsername = () => {
|
||||||
|
form.setValue("username", "");
|
||||||
|
setUsernameHasBeenReset(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const protocolOptions = useMemo(
|
||||||
|
() =>
|
||||||
|
ProxyProtocols.map((protocol) => ({
|
||||||
|
value: protocol,
|
||||||
|
label: protocol,
|
||||||
|
})),
|
||||||
|
[]
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
reset(defaults);
|
||||||
|
}, [defaults, reset]);
|
||||||
|
|
||||||
|
const onSubmit = async (data: ProxyFormData) => {
|
||||||
|
const payload: ProxyFormData & { clearPassword?: boolean; clearUsername?: boolean } =
|
||||||
|
{
|
||||||
|
...data,
|
||||||
|
};
|
||||||
|
// Don't send password/username if one is set and the user hasn't clicked reset
|
||||||
|
if (isPasswordSet && !passwordHasBeenReset) {
|
||||||
|
delete payload.password;
|
||||||
|
} else if (passwordHasBeenReset && !payload.password) {
|
||||||
|
payload.clearPassword = true;
|
||||||
|
}
|
||||||
|
if (isUsernameSet && !usernameHasBeenReset) {
|
||||||
|
delete payload.username;
|
||||||
|
} else if (usernameHasBeenReset && !payload.username) {
|
||||||
|
payload.clearUsername = true;
|
||||||
|
}
|
||||||
|
const result = isEditMode
|
||||||
|
? await patch(`/proxies/${proxyId}`, payload)
|
||||||
|
: await post("/proxies", payload);
|
||||||
|
if (result?.success) {
|
||||||
|
await mutate((key) => typeof key === "string" && key.startsWith("/proxies"));
|
||||||
|
navigate("/proxies");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<FormProvider {...form}>
|
||||||
|
<BasePage
|
||||||
|
component="form"
|
||||||
|
onSubmit={handleSubmit(onSubmit)}
|
||||||
|
>
|
||||||
|
<ConfigBox
|
||||||
|
title={t("pages.proxies.form.name.title")}
|
||||||
|
subtitle={t("pages.proxies.form.name.description")}
|
||||||
|
rightContent={
|
||||||
|
<FormTextField
|
||||||
|
name="name"
|
||||||
|
fieldLabel={t("pages.proxies.form.name.optionName")}
|
||||||
|
placeholder={t("pages.proxies.form.name.placeholder")}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<ConfigBox
|
||||||
|
title={t("pages.proxies.form.server.title")}
|
||||||
|
subtitle={t("pages.proxies.form.server.description")}
|
||||||
|
rightContent={
|
||||||
|
<Stack gap={theme.spacing(LAYOUT.MD)}>
|
||||||
|
<FormSelectField
|
||||||
|
name="protocol"
|
||||||
|
fieldLabel={t("pages.proxies.form.server.option.protocol.label")}
|
||||||
|
options={protocolOptions}
|
||||||
|
/>
|
||||||
|
<FormTextField
|
||||||
|
name="host"
|
||||||
|
fieldLabel={t("pages.proxies.form.server.option.host.label")}
|
||||||
|
placeholder={t("pages.proxies.form.server.option.host.placeholder")}
|
||||||
|
/>
|
||||||
|
<FormNumberField
|
||||||
|
name="port"
|
||||||
|
fieldLabel={t("pages.proxies.form.server.option.port.label")}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<ConfigBox
|
||||||
|
title={t("pages.proxies.form.auth.title")}
|
||||||
|
subtitle={t("pages.proxies.form.auth.description")}
|
||||||
|
rightContent={
|
||||||
|
<Stack gap={theme.spacing(LAYOUT.MD)}>
|
||||||
|
{(isUsernameSet === false || usernameHasBeenReset === true) && (
|
||||||
|
<FormTextField
|
||||||
|
name="username"
|
||||||
|
fieldLabel={t("pages.proxies.form.auth.option.username.label")}
|
||||||
|
placeholder={t("pages.proxies.form.auth.option.username.placeholder")}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{isUsernameSet === true && usernameHasBeenReset === false && (
|
||||||
|
<Box>
|
||||||
|
<FieldLabel>
|
||||||
|
{t("pages.proxies.form.auth.option.username.labelSet")}
|
||||||
|
</FieldLabel>
|
||||||
|
<Button
|
||||||
|
onClick={handleResetUsername}
|
||||||
|
variant="contained"
|
||||||
|
color="error"
|
||||||
|
>
|
||||||
|
{t("common.buttons.reset")}
|
||||||
|
</Button>
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{(isPasswordSet === false || passwordHasBeenReset === true) && (
|
||||||
|
<FormTextField
|
||||||
|
name="password"
|
||||||
|
type="password"
|
||||||
|
fieldLabel={t("pages.proxies.form.auth.option.password.label")}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{isPasswordSet === true && passwordHasBeenReset === false && (
|
||||||
|
<Box>
|
||||||
|
<FieldLabel>
|
||||||
|
{t("pages.proxies.form.auth.option.password.labelSet")}
|
||||||
|
</FieldLabel>
|
||||||
|
<Button
|
||||||
|
onClick={handleResetPassword}
|
||||||
|
variant="contained"
|
||||||
|
color="error"
|
||||||
|
>
|
||||||
|
{t("common.buttons.reset")}
|
||||||
|
</Button>
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
|
</Stack>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Stack
|
||||||
|
direction="row"
|
||||||
|
justifyContent="flex-end"
|
||||||
|
spacing={theme.spacing(2)}
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
loading={isSubmitting || isPatching}
|
||||||
|
type="submit"
|
||||||
|
variant="contained"
|
||||||
|
color="primary"
|
||||||
|
>
|
||||||
|
{t("common.buttons.save")}
|
||||||
|
</Button>
|
||||||
|
</Stack>
|
||||||
|
</BasePage>
|
||||||
|
</FormProvider>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ProxiesCreatePage;
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { BasePageWithStates } from "@/Components/design-elements";
|
||||||
|
import { ProxiesTable } from "@/Pages/Proxies/components/ProxiesTable";
|
||||||
|
import { Dialog } from "@/Components/inputs";
|
||||||
|
import { HeaderCreate } from "@/Components/common";
|
||||||
|
|
||||||
|
import { useState } from "react";
|
||||||
|
import { useGet, useDelete } from "@/Hooks/UseApi";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import type { ProxyResponse } from "@/Types/Proxy";
|
||||||
|
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
||||||
|
|
||||||
|
const ProxiesPage = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const isAdmin = useIsAdmin();
|
||||||
|
|
||||||
|
const [selectedProxy, setSelectedProxy] = useState<ProxyResponse | null>(null);
|
||||||
|
const isDialogOpen = Boolean(selectedProxy);
|
||||||
|
|
||||||
|
const {
|
||||||
|
data: proxies,
|
||||||
|
isLoading,
|
||||||
|
isValidating,
|
||||||
|
error,
|
||||||
|
refetch,
|
||||||
|
} = useGet<ProxyResponse[]>("/proxies/team", {}, { keepPreviousData: true });
|
||||||
|
|
||||||
|
const { deleteFn, loading: isDeleting } = useDelete();
|
||||||
|
|
||||||
|
const handleConfirm = async () => {
|
||||||
|
if (!selectedProxy) return;
|
||||||
|
await deleteFn(`/proxies/${selectedProxy.id}`);
|
||||||
|
setSelectedProxy(null);
|
||||||
|
refetch();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCancel = () => {
|
||||||
|
setSelectedProxy(null);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<BasePageWithStates
|
||||||
|
headerKey="proxies"
|
||||||
|
page={t("pages.proxies.fallback.title")}
|
||||||
|
description={t("pages.proxies.fallback.description")}
|
||||||
|
loading={isLoading || isValidating}
|
||||||
|
error={!!error}
|
||||||
|
totalCount={proxies?.length ?? 0}
|
||||||
|
actionButtonText={t("pages.proxies.fallback.actionButton")}
|
||||||
|
actionLink="/proxies/create"
|
||||||
|
>
|
||||||
|
<HeaderCreate
|
||||||
|
path="/proxies/create"
|
||||||
|
isLoading={isLoading || isValidating}
|
||||||
|
isAdmin={isAdmin}
|
||||||
|
/>
|
||||||
|
<ProxiesTable
|
||||||
|
proxies={proxies ?? []}
|
||||||
|
setSelectedProxy={setSelectedProxy}
|
||||||
|
/>
|
||||||
|
<Dialog
|
||||||
|
open={isDialogOpen}
|
||||||
|
title={t("common.dialogs.delete.title")}
|
||||||
|
content={t("common.dialogs.delete.description")}
|
||||||
|
onConfirm={handleConfirm}
|
||||||
|
onCancel={handleCancel}
|
||||||
|
loading={isDeleting}
|
||||||
|
/>
|
||||||
|
</BasePageWithStates>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ProxiesPage;
|
||||||
+725
-495
File diff suppressed because it is too large.
Load diff
@@ -1,4 +1,9 @@
|
|||||||
import { BasePage, ConfigBox, StepProgress } from "@/Components/design-elements";
|
import {
|
||||||
|
BasePage,
|
||||||
|
ColoredLabel,
|
||||||
|
ConfigBox,
|
||||||
|
StepProgress,
|
||||||
|
} from "@/Components/design-elements";
|
||||||
import Stack from "@mui/material/Stack";
|
import Stack from "@mui/material/Stack";
|
||||||
import { logger } from "@/Utils/logger";
|
import { logger } from "@/Utils/logger";
|
||||||
import { LAYOUT } from "@/Utils/Theme/constants";
|
import { LAYOUT } from "@/Utils/Theme/constants";
|
||||||
@@ -16,12 +21,12 @@ import { statusPageStepCount, statusPageStepFieldsFor } from "@/Validation/statu
|
|||||||
import { useGet, usePost, usePut, useDelete } from "@/Hooks/UseApi";
|
import { useGet, usePost, usePut, useDelete } from "@/Hooks/UseApi";
|
||||||
import type { Monitor } from "@/Types/Monitor";
|
import type { Monitor } from "@/Types/Monitor";
|
||||||
import { SelectableMonitorTypes } from "@/Types/Monitor";
|
import { SelectableMonitorTypes } from "@/Types/Monitor";
|
||||||
|
import type { Tag } from "@/Types/Tag";
|
||||||
import type { MonitorDisplayType, StatusPageResponse } from "@/Types/StatusPage";
|
import type { MonitorDisplayType, StatusPageResponse } from "@/Types/StatusPage";
|
||||||
import { getMonitorTypeLabel } from "@/Types/StatusPage";
|
import { getMonitorTypeLabel } from "@/Types/StatusPage";
|
||||||
import { timezoneOptions } from "@/Utils/timezoneOptions";
|
import { timezoneOptions } from "@/Utils/timezoneOptions";
|
||||||
import { useNavigate, useParams } from "react-router-dom";
|
import { useNavigate, useParams } from "react-router-dom";
|
||||||
import { mutate } from "swr";
|
import { mutate } from "swr";
|
||||||
import axios from "axios";
|
|
||||||
import { HeaderConfigStatusControls } from "./Components/HeaderConfigStatusControls";
|
import { HeaderConfigStatusControls } from "./Components/HeaderConfigStatusControls";
|
||||||
import { ThemePicker } from "./Components/ThemePicker";
|
import { ThemePicker } from "./Components/ThemePicker";
|
||||||
import { FormSwitchField } from "@/Components/inputs/forms/FormSwitchField";
|
import { FormSwitchField } from "@/Components/inputs/forms/FormSwitchField";
|
||||||
@@ -53,7 +58,9 @@ const LogoUploadField = () => {
|
|||||||
<ImageUpload
|
<ImageUpload
|
||||||
src={field.value?.data}
|
src={field.value?.data}
|
||||||
onChange={(file) => {
|
onChange={(file) => {
|
||||||
field.onChange(file ? { data: file.src, contentType: file.file.type } : null);
|
field.onChange(
|
||||||
|
file ? { data: file.src, contentType: file.file.type, file: file.file } : null
|
||||||
|
);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
@@ -86,6 +93,8 @@ const CreateStatusPage = () => {
|
|||||||
|
|
||||||
const { data: monitorsResponse } = useGet<Monitor[]>(monitorsUrl);
|
const { data: monitorsResponse } = useGet<Monitor[]>(monitorsUrl);
|
||||||
const monitors = useMemo(() => monitorsResponse ?? [], [monitorsResponse]);
|
const monitors = useMemo(() => monitorsResponse ?? [], [monitorsResponse]);
|
||||||
|
const { data: tagsResponse } = useGet<Tag[]>("/tags/team");
|
||||||
|
const tags = useMemo(() => tagsResponse ?? [], [tagsResponse]);
|
||||||
|
|
||||||
const { post, loading: isSubmittingPost } = usePost();
|
const { post, loading: isSubmittingPost } = usePost();
|
||||||
const { put, loading: isSubmittingPut } = usePut();
|
const { put, loading: isSubmittingPut } = usePut();
|
||||||
@@ -196,18 +205,8 @@ const CreateStatusPage = () => {
|
|||||||
if (data.logo === null) {
|
if (data.logo === null) {
|
||||||
// Signal to remove the logo
|
// Signal to remove the logo
|
||||||
fd.append("removeLogo", "true");
|
fd.append("removeLogo", "true");
|
||||||
} else if (data.logo?.data && data.logo.data !== "") {
|
} else if (data.logo?.file) {
|
||||||
if (data.logo.data.startsWith("blob:")) {
|
fd.append("logo", data.logo.file);
|
||||||
try {
|
|
||||||
const imageResult = await axios.get(data.logo.data, {
|
|
||||||
responseType: "blob",
|
|
||||||
});
|
|
||||||
fd.append("logo", imageResult.data);
|
|
||||||
URL.revokeObjectURL(data.logo.data);
|
|
||||||
} catch (e) {
|
|
||||||
logger.error("Failed to fetch logo blob", e instanceof Error ? e : undefined);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let result;
|
let result;
|
||||||
@@ -308,6 +307,28 @@ const CreateStatusPage = () => {
|
|||||||
"pages.statusPages.form.monitors.option.monitors.placeholder"
|
"pages.statusPages.form.monitors.option.monitors.placeholder"
|
||||||
)}
|
)}
|
||||||
options={monitors}
|
options={monitors}
|
||||||
|
renderOptionContent={(monitor) => (
|
||||||
|
<Stack
|
||||||
|
direction="row"
|
||||||
|
alignItems="center"
|
||||||
|
gap={theme.spacing(2)}
|
||||||
|
flexWrap="wrap"
|
||||||
|
>
|
||||||
|
<Typography>
|
||||||
|
{`${monitor.name} (${getMonitorTypeLabel(monitor.type, t)})`}
|
||||||
|
</Typography>
|
||||||
|
{monitor.tags.map((tagId) => {
|
||||||
|
const tag = tags.find(({ id }) => id === tagId);
|
||||||
|
return tag ? (
|
||||||
|
<ColoredLabel
|
||||||
|
key={tag.id}
|
||||||
|
text={tag.name}
|
||||||
|
color={tag.color}
|
||||||
|
/>
|
||||||
|
) : null;
|
||||||
|
})}
|
||||||
|
</Stack>
|
||||||
|
)}
|
||||||
renderRow={(monitor) => (
|
renderRow={(monitor) => (
|
||||||
<Typography flexGrow={1}>
|
<Typography flexGrow={1}>
|
||||||
{`${monitor.name} (${getMonitorTypeLabel(monitor.type, t)})`}
|
{`${monitor.name} (${getMonitorTypeLabel(monitor.type, t)})`}
|
||||||
|
|||||||
@@ -113,6 +113,7 @@ const StatusPageView = () => {
|
|||||||
apiUrl,
|
apiUrl,
|
||||||
{},
|
{},
|
||||||
{
|
{
|
||||||
|
keepPreviousData: true,
|
||||||
refreshInterval: range === "latest" ? 10000 : 60000,
|
refreshInterval: range === "latest" ? 10000 : 60000,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import type { SxProps, Theme } from "@mui/material/styles";
|
import type { SxProps, Theme } from "@mui/material/styles";
|
||||||
import type { StatusPageThemeTokens } from "../tokens";
|
import { mixSeverityColor, type StatusPageThemeTokens } from "../tokens";
|
||||||
import { type OverallTone, toneColor, toneSoft } from "../shared/overallStatus";
|
import { type OverallTone, toneColor, toneSoft } from "../shared/overallStatus";
|
||||||
import { BOLD_SANS_STACK, MONO_STACK } from "../shared/fontStacks";
|
import { BOLD_SANS_STACK, MONO_STACK } from "../shared/fontStacks";
|
||||||
import { MAX_RECENT_CHECKS } from "@/Types/Monitor";
|
import { MAX_RECENT_CHECKS } from "@/Types/Monitor";
|
||||||
@@ -34,9 +34,9 @@ export interface BoldStyles {
|
|||||||
monitorUrl: SxProps<Theme>;
|
monitorUrl: SxProps<Theme>;
|
||||||
badge: (tone: OverallTone) => SxProps<Theme>;
|
badge: (tone: OverallTone) => SxProps<Theme>;
|
||||||
heatmap: SxProps<Theme>;
|
heatmap: SxProps<Theme>;
|
||||||
heatmapCell: (kind: BoldHeatCell) => SxProps<Theme>;
|
heatmapCell: (kind: BoldHeatCell, severity?: number) => SxProps<Theme>;
|
||||||
histogram: SxProps<Theme>;
|
histogram: SxProps<Theme>;
|
||||||
bar: (kind: BoldBarKind, heightPct: number) => SxProps<Theme>;
|
bar: (kind: BoldBarKind, heightPct: number, severity?: number) => SxProps<Theme>;
|
||||||
chartStats: SxProps<Theme>;
|
chartStats: SxProps<Theme>;
|
||||||
infra: SxProps<Theme>;
|
infra: SxProps<Theme>;
|
||||||
infraEmpty: SxProps<Theme>;
|
infraEmpty: SxProps<Theme>;
|
||||||
@@ -327,9 +327,12 @@ export const boldStyles = (
|
|||||||
gap: { xs: "1px", md: "3px" },
|
gap: { xs: "1px", md: "3px" },
|
||||||
height: 48,
|
height: 48,
|
||||||
},
|
},
|
||||||
heatmapCell: (kind) => ({
|
heatmapCell: (kind, severity = 1) => ({
|
||||||
borderRadius: "3px",
|
borderRadius: "3px",
|
||||||
background: heatCellBg[kind],
|
background:
|
||||||
|
kind === "degraded"
|
||||||
|
? mixSeverityColor(tokens.up, tokens.degraded, severity)
|
||||||
|
: heatCellBg[kind],
|
||||||
boxShadow: heatCellShadow[kind],
|
boxShadow: heatCellShadow[kind],
|
||||||
opacity: kind === "empty" ? 0.4 : 1,
|
opacity: kind === "empty" ? 0.4 : 1,
|
||||||
transition: "transform 0.15s",
|
transition: "transform 0.15s",
|
||||||
@@ -344,8 +347,11 @@ export const boldStyles = (
|
|||||||
alignItems: "flex-end",
|
alignItems: "flex-end",
|
||||||
height: 48,
|
height: 48,
|
||||||
},
|
},
|
||||||
bar: (kind, heightPct) => ({
|
bar: (kind, heightPct, severity = 1) => ({
|
||||||
background: barBg[kind],
|
background:
|
||||||
|
kind === "degraded"
|
||||||
|
? mixSeverityColor(tokens.up, tokens.degraded, severity)
|
||||||
|
: barBg[kind],
|
||||||
borderRadius: "3px",
|
borderRadius: "3px",
|
||||||
minHeight: 4,
|
minHeight: 4,
|
||||||
opacity: kind === "empty" ? 0.4 : 1,
|
opacity: kind === "empty" ? 0.4 : 1,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import type { SxProps, Theme } from "@mui/material/styles";
|
import type { SxProps, Theme } from "@mui/material/styles";
|
||||||
import type { StatusPageThemeTokens } from "../tokens";
|
import { mixSeverityColor, type StatusPageThemeTokens } from "../tokens";
|
||||||
import { type OverallTone, toneColor, toneSoft } from "../shared/overallStatus";
|
import { type OverallTone, toneColor, toneSoft } from "../shared/overallStatus";
|
||||||
import {
|
import {
|
||||||
EDITORIAL_SECONDARY_SANS_STACK,
|
EDITORIAL_SECONDARY_SANS_STACK,
|
||||||
@@ -38,9 +38,9 @@ export interface EditorialStyles {
|
|||||||
monitorUrl: SxProps<Theme>;
|
monitorUrl: SxProps<Theme>;
|
||||||
badge: (tone: OverallTone) => SxProps<Theme>;
|
badge: (tone: OverallTone) => SxProps<Theme>;
|
||||||
heatmap: SxProps<Theme>;
|
heatmap: SxProps<Theme>;
|
||||||
heatmapCell: (kind: EditorialHeatCell) => SxProps<Theme>;
|
heatmapCell: (kind: EditorialHeatCell, severity?: number) => SxProps<Theme>;
|
||||||
histogram: SxProps<Theme>;
|
histogram: SxProps<Theme>;
|
||||||
bar: (kind: EditorialBarKind, heightPct: number) => SxProps<Theme>;
|
bar: (kind: EditorialBarKind, heightPct: number, severity?: number) => SxProps<Theme>;
|
||||||
chartStats: SxProps<Theme>;
|
chartStats: SxProps<Theme>;
|
||||||
infra: SxProps<Theme>;
|
infra: SxProps<Theme>;
|
||||||
infraEmpty: SxProps<Theme>;
|
infraEmpty: SxProps<Theme>;
|
||||||
@@ -272,8 +272,11 @@ export const editorialStyles = (
|
|||||||
gap: { xs: "1px", md: "2px" },
|
gap: { xs: "1px", md: "2px" },
|
||||||
height: 40,
|
height: 40,
|
||||||
},
|
},
|
||||||
heatmapCell: (kind) => ({
|
heatmapCell: (kind, severity = 1) => ({
|
||||||
background: heatCellBg[kind],
|
background:
|
||||||
|
kind === "degraded"
|
||||||
|
? mixSeverityColor(tokens.up, tokens.degraded, severity)
|
||||||
|
: heatCellBg[kind],
|
||||||
opacity: kind === "empty" ? 0.5 : 1,
|
opacity: kind === "empty" ? 0.5 : 1,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
@@ -285,8 +288,11 @@ export const editorialStyles = (
|
|||||||
alignItems: "flex-end",
|
alignItems: "flex-end",
|
||||||
height: 40,
|
height: 40,
|
||||||
},
|
},
|
||||||
bar: (kind, heightPct) => ({
|
bar: (kind, heightPct, severity = 1) => ({
|
||||||
background: barBg[kind],
|
background:
|
||||||
|
kind === "degraded"
|
||||||
|
? mixSeverityColor(tokens.up, tokens.degraded, severity)
|
||||||
|
: barBg[kind],
|
||||||
minHeight: 3,
|
minHeight: 3,
|
||||||
opacity: kind === "empty" ? 0.5 : 1,
|
opacity: kind === "empty" ? 0.5 : 1,
|
||||||
height: `${heightPct}%`,
|
height: `${heightPct}%`,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { SxProps, Theme } from "@mui/material/styles";
|
import type { SxProps, Theme } from "@mui/material/styles";
|
||||||
import { keyframes } from "@mui/system";
|
import { keyframes } from "@mui/system";
|
||||||
import type { StatusPageThemeTokens } from "../tokens";
|
import { mixSeverityColor, type StatusPageThemeTokens } from "../tokens";
|
||||||
import { type OverallTone, toneColor, toneSoft } from "../shared/overallStatus";
|
import { type OverallTone, toneColor, toneSoft } from "../shared/overallStatus";
|
||||||
import { MONO_STACK, SANS_STACK } from "../shared/fontStacks";
|
import { MONO_STACK, SANS_STACK } from "../shared/fontStacks";
|
||||||
import { MAX_RECENT_CHECKS } from "@/Types/Monitor";
|
import { MAX_RECENT_CHECKS } from "@/Types/Monitor";
|
||||||
@@ -37,9 +37,9 @@ export interface ModernStyles {
|
|||||||
monitorUrl: SxProps<Theme>;
|
monitorUrl: SxProps<Theme>;
|
||||||
badge: (tone: OverallTone) => SxProps<Theme>;
|
badge: (tone: OverallTone) => SxProps<Theme>;
|
||||||
heatmap: SxProps<Theme>;
|
heatmap: SxProps<Theme>;
|
||||||
heatmapCell: (kind: ModernHeatCell) => SxProps<Theme>;
|
heatmapCell: (kind: ModernHeatCell, severity?: number) => SxProps<Theme>;
|
||||||
histogram: SxProps<Theme>;
|
histogram: SxProps<Theme>;
|
||||||
bar: (kind: ModernBarKind, heightPct: number) => SxProps<Theme>;
|
bar: (kind: ModernBarKind, heightPct: number, severity?: number) => SxProps<Theme>;
|
||||||
chartStats: SxProps<Theme>;
|
chartStats: SxProps<Theme>;
|
||||||
infra: SxProps<Theme>;
|
infra: SxProps<Theme>;
|
||||||
infraEmpty: SxProps<Theme>;
|
infraEmpty: SxProps<Theme>;
|
||||||
@@ -83,13 +83,14 @@ export const modernStyles = (
|
|||||||
): ModernStyles => {
|
): ModernStyles => {
|
||||||
const cardShadow = isDark ? darkShadow : lightShadow;
|
const cardShadow = isDark ? darkShadow : lightShadow;
|
||||||
const cardHoverShadow = isDark ? darkShadowHover : lightShadowHover;
|
const cardHoverShadow = isDark ? darkShadowHover : lightShadowHover;
|
||||||
|
const darken = (color: string) => `color-mix(in srgb, ${color} 70%, #000000 30%)`;
|
||||||
|
|
||||||
const heatCellBg: Record<ModernHeatCell, string> = {
|
const heatCellBg: Record<ModernHeatCell, string> = {
|
||||||
fast: `linear-gradient(180deg, ${tokens.up}, ${tokens.upStrong})`,
|
fast: `linear-gradient(180deg, ${tokens.up}, ${tokens.upStrong})`,
|
||||||
med: `linear-gradient(180deg, color-mix(in srgb, ${tokens.up} 70%, #ffffff 30%), ${tokens.up})`,
|
med: `linear-gradient(180deg, color-mix(in srgb, ${tokens.up} 70%, #ffffff 30%), ${tokens.up})`,
|
||||||
slow: `linear-gradient(180deg, ${tokens.warn}, ${tokens.degraded})`,
|
slow: `linear-gradient(180deg, ${tokens.warn}, ${tokens.degraded})`,
|
||||||
degraded: `linear-gradient(180deg, ${tokens.degraded}, color-mix(in srgb, ${tokens.degraded} 70%, #000000 30%))`,
|
degraded: `linear-gradient(180deg, ${tokens.degraded}, ${darken(tokens.degraded)})`,
|
||||||
down: `linear-gradient(180deg, ${tokens.down}, color-mix(in srgb, ${tokens.down} 70%, #000000 30%))`,
|
down: `linear-gradient(180deg, ${tokens.down}, ${darken(tokens.down)})`,
|
||||||
empty: tokens.border,
|
empty: tokens.border,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -103,7 +104,7 @@ export const modernStyles = (
|
|||||||
const gaugeFillBg: Record<ModernGaugeFill, string> = {
|
const gaugeFillBg: Record<ModernGaugeFill, string> = {
|
||||||
ok: `linear-gradient(90deg, ${tokens.up}, ${tokens.upStrong})`,
|
ok: `linear-gradient(90deg, ${tokens.up}, ${tokens.upStrong})`,
|
||||||
warm: `linear-gradient(90deg, ${tokens.warn}, ${tokens.degraded})`,
|
warm: `linear-gradient(90deg, ${tokens.warn}, ${tokens.degraded})`,
|
||||||
hot: `linear-gradient(90deg, ${tokens.down}, color-mix(in srgb, ${tokens.down} 70%, #000000 30%))`,
|
hot: `linear-gradient(90deg, ${tokens.down}, color-mix(in srgb, ${tokens.down}, ${darken(tokens.down)})`,
|
||||||
};
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -354,13 +355,19 @@ export const modernStyles = (
|
|||||||
gap: { xs: "1px", md: "3px" },
|
gap: { xs: "1px", md: "3px" },
|
||||||
height: 46,
|
height: 46,
|
||||||
},
|
},
|
||||||
heatmapCell: (kind) => ({
|
heatmapCell: (kind, severity = 1) => {
|
||||||
borderRadius: "3px",
|
const mixed = mixSeverityColor(tokens.up, tokens.degraded, severity);
|
||||||
background: heatCellBg[kind],
|
return {
|
||||||
opacity: kind === "empty" ? 0.4 : 1,
|
borderRadius: "3px",
|
||||||
transition: "transform 0.15s",
|
background:
|
||||||
"&:hover": { transform: "scaleY(1.2)" },
|
kind === "degraded"
|
||||||
}),
|
? `linear-gradient(180deg, ${mixed}, ${darken(mixed)})`
|
||||||
|
: heatCellBg[kind],
|
||||||
|
opacity: kind === "empty" ? 0.4 : 1,
|
||||||
|
transition: "transform 0.15s",
|
||||||
|
"&:hover": { transform: "scaleY(1.2)" },
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
histogram: {
|
histogram: {
|
||||||
padding: { xs: "0 12px", md: "0 24px" },
|
padding: { xs: "0 12px", md: "0 24px" },
|
||||||
@@ -370,8 +377,11 @@ export const modernStyles = (
|
|||||||
alignItems: "flex-end",
|
alignItems: "flex-end",
|
||||||
height: 46,
|
height: 46,
|
||||||
},
|
},
|
||||||
bar: (kind, heightPct) => ({
|
bar: (kind, heightPct, severity = 1) => ({
|
||||||
background: barBg[kind],
|
background:
|
||||||
|
kind === "degraded"
|
||||||
|
? mixSeverityColor(tokens.up, tokens.degraded, severity)
|
||||||
|
: barBg[kind],
|
||||||
borderRadius: "3px",
|
borderRadius: "3px",
|
||||||
minHeight: 4,
|
minHeight: 4,
|
||||||
opacity: kind === "empty" ? 0.4 : 1,
|
opacity: kind === "empty" ? 0.4 : 1,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import type { SxProps, Theme } from "@mui/material/styles";
|
import type { SxProps, Theme } from "@mui/material/styles";
|
||||||
import type { StatusPageThemeTokens } from "../tokens";
|
import { mixSeverityColor, type StatusPageThemeTokens } from "../tokens";
|
||||||
import { type OverallTone, toneColor, toneSoft } from "../shared/overallStatus";
|
import { type OverallTone, toneColor, toneSoft } from "../shared/overallStatus";
|
||||||
import { MONO_STACK, SANS_STACK } from "../shared/fontStacks";
|
import { MONO_STACK, SANS_STACK } from "../shared/fontStacks";
|
||||||
|
|
||||||
@@ -37,9 +37,9 @@ export interface RefinedStyles {
|
|||||||
monitorUrl: SxProps<Theme>;
|
monitorUrl: SxProps<Theme>;
|
||||||
badge: (tone: OverallTone) => SxProps<Theme>;
|
badge: (tone: OverallTone) => SxProps<Theme>;
|
||||||
heatmap: SxProps<Theme>;
|
heatmap: SxProps<Theme>;
|
||||||
heatmapCell: (kind: RefinedHeatCell) => SxProps<Theme>;
|
heatmapCell: (kind: RefinedHeatCell, severity?: number) => SxProps<Theme>;
|
||||||
histogram: SxProps<Theme>;
|
histogram: SxProps<Theme>;
|
||||||
bar: (kind: RefinedBarKind, heightPct: number) => SxProps<Theme>;
|
bar: (kind: RefinedBarKind, heightPct: number, severity?: number) => SxProps<Theme>;
|
||||||
chartStats: SxProps<Theme>;
|
chartStats: SxProps<Theme>;
|
||||||
infra: SxProps<Theme>;
|
infra: SxProps<Theme>;
|
||||||
infraEmpty: SxProps<Theme>;
|
infraEmpty: SxProps<Theme>;
|
||||||
@@ -296,9 +296,12 @@ export const refinedStyles = (
|
|||||||
gap: { xs: "1px", md: "3px" },
|
gap: { xs: "1px", md: "3px" },
|
||||||
height: 42,
|
height: 42,
|
||||||
},
|
},
|
||||||
heatmapCell: (kind) => ({
|
heatmapCell: (kind, severity = 1) => ({
|
||||||
borderRadius: "2px",
|
borderRadius: "2px",
|
||||||
background: heatCellBg[kind],
|
background:
|
||||||
|
kind === "degraded"
|
||||||
|
? mixSeverityColor(tokens.up, tokens.degraded, severity)
|
||||||
|
: heatCellBg[kind],
|
||||||
opacity: kind === "empty" ? 0.4 : 1,
|
opacity: kind === "empty" ? 0.4 : 1,
|
||||||
transition: "transform 0.15s",
|
transition: "transform 0.15s",
|
||||||
"&:hover": { transform: "scaleY(1.15)" },
|
"&:hover": { transform: "scaleY(1.15)" },
|
||||||
@@ -312,8 +315,11 @@ export const refinedStyles = (
|
|||||||
alignItems: "flex-end",
|
alignItems: "flex-end",
|
||||||
height: 42,
|
height: 42,
|
||||||
},
|
},
|
||||||
bar: (kind, heightPct) => ({
|
bar: (kind, heightPct, severity = 1) => ({
|
||||||
background: barBg[kind],
|
background:
|
||||||
|
kind === "degraded"
|
||||||
|
? mixSeverityColor(tokens.up, tokens.degraded, severity)
|
||||||
|
: barBg[kind],
|
||||||
borderRadius: "2px",
|
borderRadius: "2px",
|
||||||
minHeight: 3,
|
minHeight: 3,
|
||||||
opacity: kind === "empty" ? 0.4 : 1,
|
opacity: kind === "empty" ? 0.4 : 1,
|
||||||
|
|||||||
@@ -59,9 +59,9 @@ export interface BaseStyles {
|
|||||||
monitorUrl: SxProps<Theme>;
|
monitorUrl: SxProps<Theme>;
|
||||||
badge: (tone: OverallTone) => SxProps<Theme>;
|
badge: (tone: OverallTone) => SxProps<Theme>;
|
||||||
heatmap: SxProps<Theme>;
|
heatmap: SxProps<Theme>;
|
||||||
heatmapCell: (kind: HeatCellKind) => SxProps<Theme>;
|
heatmapCell: (kind: HeatCellKind, severity?: number) => SxProps<Theme>;
|
||||||
histogram: SxProps<Theme>;
|
histogram: SxProps<Theme>;
|
||||||
bar: (kind: BarKind, heightPct: number) => SxProps<Theme>;
|
bar: (kind: BarKind, heightPct: number, severity?: number) => SxProps<Theme>;
|
||||||
chartStats: SxProps<Theme>;
|
chartStats: SxProps<Theme>;
|
||||||
infra: SxProps<Theme>;
|
infra: SxProps<Theme>;
|
||||||
infraEmpty: SxProps<Theme>;
|
infraEmpty: SxProps<Theme>;
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ export type HeatCellKind = "fast" | "med" | "slow" | "degraded" | "down" | "empt
|
|||||||
|
|
||||||
export interface ChartCell {
|
export interface ChartCell {
|
||||||
key: string;
|
key: string;
|
||||||
|
severity: number;
|
||||||
barKind: BarKind;
|
barKind: BarKind;
|
||||||
heatKind: HeatCellKind;
|
heatKind: HeatCellKind;
|
||||||
heightPct: number; // histogram bar height
|
heightPct: number; // histogram bar height
|
||||||
@@ -28,9 +29,22 @@ export interface ChartCell {
|
|||||||
|
|
||||||
const DAY_DOWN_THRESHOLD = 0.5;
|
const DAY_DOWN_THRESHOLD = 0.5;
|
||||||
|
|
||||||
const classifyDay = (bucket: DailyCheckBucket): BarKind => {
|
// Color interpolation
|
||||||
|
// 0 = perfect
|
||||||
|
// 1 = at or below the down threshold
|
||||||
|
const SEVERITY_FLOOR = 0.15; // A degraded server should never be green
|
||||||
|
const SEVERITY_GAMMA = 2; // >1 biases toward green so high-uptime days stay visibly distinct from low ones
|
||||||
|
|
||||||
|
export const severityFromUpRatio = (upRatio: number): number => {
|
||||||
|
const failed = 1 - upRatio;
|
||||||
|
if (failed <= 0) return 0;
|
||||||
|
const scaled = (Math.log10(failed) + 3) / (Math.log10(1 - DAY_DOWN_THRESHOLD) + 3);
|
||||||
|
const clamped = Math.min(1, Math.max(0, scaled));
|
||||||
|
return Math.max(SEVERITY_FLOOR, clamped ** SEVERITY_GAMMA);
|
||||||
|
};
|
||||||
|
|
||||||
|
const classifyDay = (bucket: DailyCheckBucket, upRatio: number): BarKind => {
|
||||||
if (bucket.totalChecks === 0) return "empty";
|
if (bucket.totalChecks === 0) return "empty";
|
||||||
const upRatio = bucket.upChecks / bucket.totalChecks;
|
|
||||||
if (upRatio >= 1) return "up";
|
if (upRatio >= 1) return "up";
|
||||||
if (upRatio < DAY_DOWN_THRESHOLD) return "down";
|
if (upRatio < DAY_DOWN_THRESHOLD) return "down";
|
||||||
return "degraded";
|
return "degraded";
|
||||||
@@ -55,6 +69,7 @@ const emptyCell = (key: string): ChartCell => ({
|
|||||||
responseTime: 0,
|
responseTime: 0,
|
||||||
tooltip: null,
|
tooltip: null,
|
||||||
ariaLabel: "",
|
ariaLabel: "",
|
||||||
|
severity: 0,
|
||||||
});
|
});
|
||||||
|
|
||||||
const padCells = (cells: ChartCell[], length: number): ChartCell[] => [
|
const padCells = (cells: ChartCell[], length: number): ChartCell[] => [
|
||||||
@@ -76,6 +91,7 @@ export const checksToCells = (checks: CheckSnapshot[]): ChartCell[] => {
|
|||||||
responseTime: check.responseTime ?? 0,
|
responseTime: check.responseTime ?? 0,
|
||||||
tooltip: <ThemedChartTooltip check={check} />,
|
tooltip: <ThemedChartTooltip check={check} />,
|
||||||
ariaLabel: `${formatMs(check.responseTime)}, ${check.status ? "up" : "down"}`,
|
ariaLabel: `${formatMs(check.responseTime)}, ${check.status ? "up" : "down"}`,
|
||||||
|
severity: 0,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
return padCells(cells, MAX_RECENT_CHECKS);
|
return padCells(cells, MAX_RECENT_CHECKS);
|
||||||
@@ -93,9 +109,17 @@ export const dailyBucketsToCells = (
|
|||||||
return enumerated.map((date) => {
|
return enumerated.map((date) => {
|
||||||
const bucket = byDate.get(date);
|
const bucket = byDate.get(date);
|
||||||
if (!bucket) return emptyCell(`day-${date}`);
|
if (!bucket) return emptyCell(`day-${date}`);
|
||||||
const barKind = classifyDay(bucket);
|
const upRatio = bucket.upChecks / bucket.totalChecks;
|
||||||
|
|
||||||
|
const barKind = classifyDay(bucket, upRatio);
|
||||||
return {
|
return {
|
||||||
key: `day-${date}`,
|
key: `day-${date}`,
|
||||||
|
severity:
|
||||||
|
barKind === "degraded"
|
||||||
|
? severityFromUpRatio(upRatio)
|
||||||
|
: barKind === "down"
|
||||||
|
? 1
|
||||||
|
: 0,
|
||||||
barKind,
|
barKind,
|
||||||
heatKind:
|
heatKind:
|
||||||
barKind === "up"
|
barKind === "up"
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import type {
|
|||||||
interface Props {
|
interface Props {
|
||||||
cells: ChartCell[];
|
cells: ChartCell[];
|
||||||
containerSx: SxProps<Theme>;
|
containerSx: SxProps<Theme>;
|
||||||
cellSx: (kind: HeatCellKind) => SxProps<Theme>;
|
cellSx: (kind: HeatCellKind, severity?: number) => SxProps<Theme>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const ThemedHeatmap = ({ cells, containerSx, cellSx }: Props) => {
|
export const ThemedHeatmap = ({ cells, containerSx, cellSx }: Props) => {
|
||||||
@@ -42,7 +42,7 @@ export const ThemedHeatmap = ({ cells, containerSx, cellSx }: Props) => {
|
|||||||
placement="top"
|
placement="top"
|
||||||
>
|
>
|
||||||
<Box
|
<Box
|
||||||
sx={cellSx(cell.heatKind)}
|
sx={cellSx(cell.heatKind, cell.severity)}
|
||||||
aria-label={cell.ariaLabel}
|
aria-label={cell.ariaLabel}
|
||||||
/>
|
/>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import type {
|
|||||||
interface Props {
|
interface Props {
|
||||||
cells: ChartCell[];
|
cells: ChartCell[];
|
||||||
containerSx: SxProps<Theme>;
|
containerSx: SxProps<Theme>;
|
||||||
barSx: (kind: BarKind, heightPct: number) => SxProps<Theme>;
|
barSx: (kind: BarKind, heightPct: number, severity?: number) => SxProps<Theme>;
|
||||||
statsSx: SxProps<Theme>;
|
statsSx: SxProps<Theme>;
|
||||||
statsGap?: number;
|
statsGap?: number;
|
||||||
}
|
}
|
||||||
@@ -61,7 +61,7 @@ export const ThemedHistogram = ({
|
|||||||
placement="top"
|
placement="top"
|
||||||
>
|
>
|
||||||
<Box
|
<Box
|
||||||
sx={barSx(cell.barKind, cell.heightPct)}
|
sx={barSx(cell.barKind, cell.heightPct, cell.severity)}
|
||||||
aria-label={cell.ariaLabel}
|
aria-label={cell.ariaLabel}
|
||||||
/>
|
/>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
|||||||
@@ -243,3 +243,10 @@ export const themeTokens: Record<StatusPageTheme, ThemeVariants> = {
|
|||||||
editorial,
|
editorial,
|
||||||
minimal,
|
minimal,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Interpolate between a theme's up and degraded colors by severity (0..1).
|
||||||
|
export const mixSeverityColor = (
|
||||||
|
up: string,
|
||||||
|
degraded: string,
|
||||||
|
severity: number
|
||||||
|
): string => `color-mix(in oklch, ${degraded} ${Math.round(severity * 100)}%, ${up})`;
|
||||||
@@ -31,6 +31,7 @@ import type { RootState } from "@/Types/state";
|
|||||||
import { formatDateWithTz } from "@/Utils/TimeUtils";
|
import { formatDateWithTz } from "@/Utils/TimeUtils";
|
||||||
import { t } from "i18next";
|
import { t } from "i18next";
|
||||||
import { Typography } from "@mui/material";
|
import { Typography } from "@mui/material";
|
||||||
|
import type { DateRange } from "@/Types/Query";
|
||||||
|
|
||||||
const certificateDateFormat = "MMM D, YYYY h A";
|
const certificateDateFormat = "MMM D, YYYY h A";
|
||||||
|
|
||||||
@@ -53,7 +54,7 @@ const UptimeDetailsPage = () => {
|
|||||||
const [rowsPerPage, setRowsPerPage] = useState<number>(5);
|
const [rowsPerPage, setRowsPerPage] = useState<number>(5);
|
||||||
const [geoPage, setGeoPage] = useState<number>(0);
|
const [geoPage, setGeoPage] = useState<number>(0);
|
||||||
const [geoRowsPerPage, setGeoRowsPerPage] = useState<number>(5);
|
const [geoRowsPerPage, setGeoRowsPerPage] = useState<number>(5);
|
||||||
const [dateRange, setDateRange] = useState<string>("recent");
|
const [dateRange, setDateRange] = useState<DateRange>("recent");
|
||||||
const [selectedLocation, setSelectedLocation] = useState<GeoContinent>("NA");
|
const [selectedLocation, setSelectedLocation] = useState<GeoContinent>("NA");
|
||||||
|
|
||||||
const monitorDetailsUrl = useMemo(() => {
|
const monitorDetailsUrl = useMemo(() => {
|
||||||
|
|||||||
@@ -1,294 +1,43 @@
|
|||||||
import {
|
import { MonitorListPage } from "@/Components/monitors";
|
||||||
ControlsFilter,
|
|
||||||
HeaderMonitorsSummary,
|
|
||||||
BulkActionsBar,
|
|
||||||
} from "@/Components/monitors";
|
|
||||||
import { MonitorBasePageWithStates, ColoredLabel } from "@/Components/design-elements";
|
|
||||||
import { TextField, Dialog, Button } from "@/Components/inputs";
|
|
||||||
import Stack from "@mui/material/Stack";
|
|
||||||
import { MonitorTable } from "@/Pages/Uptime/Monitors/Components/UptimeMonitorsTable";
|
import { MonitorTable } from "@/Pages/Uptime/Monitors/Components/UptimeMonitorsTable";
|
||||||
import { HeaderCreate } from "@/Components/common";
|
|
||||||
import { Play, Pause } from "lucide-react";
|
|
||||||
import Typography from "@mui/material/Typography";
|
|
||||||
|
|
||||||
import { useTranslation } from "react-i18next";
|
import { useMonitorListController } from "@/Hooks/useMonitorListController";
|
||||||
import useMediaQuery from "@mui/material/useMediaQuery";
|
|
||||||
import { useGet, useDelete } from "@/Hooks/UseApi";
|
|
||||||
import type { Monitor, MonitorType, MonitorsWithChecksResponse } from "@/Types/Monitor";
|
|
||||||
import type { Tag } from "@/Types/Tag";
|
|
||||||
import { useState, useMemo, useCallback } from "react";
|
|
||||||
import { useSelector, useDispatch } from "react-redux";
|
|
||||||
import { setRowsPerPage } from "@/Features/UI/uiSlice.js";
|
|
||||||
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
|
||||||
import type { RootState } from "@/Types/state";
|
|
||||||
import { useTheme } from "@mui/material";
|
|
||||||
import useDebounce from "@/Hooks/useDebounce";
|
|
||||||
import { useBulkMonitorActions } from "@/Hooks/useBulkMonitorActions";
|
|
||||||
import { SPACING } from "@/Utils/Theme/constants";
|
|
||||||
|
|
||||||
const UptimeMonitorsPage = () => {
|
const UptimeMonitorsPage = () => {
|
||||||
const { t } = useTranslation();
|
const c = useMonitorListController({
|
||||||
const theme = useTheme();
|
types: "selectable",
|
||||||
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
checksLimit: 25,
|
||||||
const dispatch = useDispatch();
|
refreshInterval: 5000,
|
||||||
const isAdmin = useIsAdmin();
|
rowsPerPageTable: "monitors",
|
||||||
// Redux state
|
rowsPerPageDefault: 10,
|
||||||
const rowsPerPage = useSelector(
|
});
|
||||||
(state: RootState) => state.ui?.monitors?.rowsPerPage ?? 10
|
|
||||||
);
|
|
||||||
|
|
||||||
// Local state
|
|
||||||
const [selectedTypes, setSelectedTypes] = useState<MonitorType[]>([]);
|
|
||||||
const [selectedStatus, setSelectedStatus] = useState<string>("");
|
|
||||||
const [selectedState, setSelectedState] = useState<string>("");
|
|
||||||
const [selectedTags, setSelectedTags] = useState<string[]>([]);
|
|
||||||
const [page, setPage] = useState<number>(0);
|
|
||||||
const [search, setSearch] = useState<string>("");
|
|
||||||
const [sortField, setSortField] = useState<string>("");
|
|
||||||
const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
|
|
||||||
const [selectedMonitor, setSelectedMonitor] = useState<Monitor | null>(null);
|
|
||||||
|
|
||||||
const isDialogOpen = Boolean(selectedMonitor);
|
|
||||||
|
|
||||||
const debouncedSearch = useDebounce<string>(search, 300);
|
|
||||||
|
|
||||||
// Convert filter selections to API filter values
|
|
||||||
// Status: pass "up"/"down" directly to the API
|
|
||||||
// State: "active" -> true, "paused" -> false
|
|
||||||
const toFilterStatus = useMemo(() => {
|
|
||||||
if (selectedStatus === "up") return "up";
|
|
||||||
if (selectedStatus === "down") return "down";
|
|
||||||
return undefined;
|
|
||||||
}, [selectedStatus]);
|
|
||||||
|
|
||||||
const toFilterActive = useMemo(() => {
|
|
||||||
if (selectedState === "active") return "true";
|
|
||||||
if (selectedState === "paused") return "false";
|
|
||||||
return undefined;
|
|
||||||
}, [selectedState]);
|
|
||||||
|
|
||||||
// Determine field and filter for the API request
|
|
||||||
// Priority: status > isActive > search > sort
|
|
||||||
const filterLookup = new Map<string | undefined, string>([
|
|
||||||
[toFilterStatus, "status"],
|
|
||||||
[toFilterActive, "isActive"],
|
|
||||||
]);
|
|
||||||
const activeFilter = [...filterLookup].find(([key]) => key !== undefined);
|
|
||||||
const field = activeFilter?.[1] || (debouncedSearch ? "name" : sortField || undefined);
|
|
||||||
const filter = activeFilter?.[0] || debouncedSearch;
|
|
||||||
|
|
||||||
// Default to all types when none selected
|
|
||||||
const effectiveTypes =
|
|
||||||
selectedTypes.length > 0
|
|
||||||
? selectedTypes
|
|
||||||
: ["http", "ping", "docker", "port", "game", "grpc", "websocket", "dns"];
|
|
||||||
|
|
||||||
// Build URL for monitors with checks
|
|
||||||
const monitorsWithChecksUrl = useMemo(() => {
|
|
||||||
const params = new URLSearchParams();
|
|
||||||
effectiveTypes.forEach((type) => params.append("type", type));
|
|
||||||
selectedTags.forEach((tagId) => params.append("tags", tagId));
|
|
||||||
params.append("limit", "25");
|
|
||||||
if (page !== undefined) params.append("page", String(page));
|
|
||||||
if (rowsPerPage) params.append("rowsPerPage", String(rowsPerPage));
|
|
||||||
if (filter) params.append("filter", filter);
|
|
||||||
if (field) params.append("field", field);
|
|
||||||
if (sortOrder) params.append("order", sortOrder);
|
|
||||||
return `/monitors/team/with-checks?${params.toString()}`;
|
|
||||||
}, [effectiveTypes, selectedTags, page, rowsPerPage, filter, field, sortOrder]);
|
|
||||||
|
|
||||||
const {
|
|
||||||
data: monitorsWithChecksData,
|
|
||||||
isLoading: monitorsWithChecksLoading,
|
|
||||||
error: monitorsWithChecksError,
|
|
||||||
refetch,
|
|
||||||
} = useGet<MonitorsWithChecksResponse>(
|
|
||||||
monitorsWithChecksUrl,
|
|
||||||
{},
|
|
||||||
{ refreshInterval: 5000, keepPreviousData: true }
|
|
||||||
);
|
|
||||||
|
|
||||||
const { data: tags } = useGet<Tag[]>("/tags/team");
|
|
||||||
|
|
||||||
const {
|
|
||||||
monitors: monitorsWithChecks,
|
|
||||||
summary,
|
|
||||||
count,
|
|
||||||
} = monitorsWithChecksData ?? { monitors: null, summary: null, count: 0 };
|
|
||||||
|
|
||||||
// Bulk actions
|
|
||||||
const {
|
|
||||||
selectedRows,
|
|
||||||
setSelectedRows,
|
|
||||||
handleBulkPause,
|
|
||||||
handleBulkResume,
|
|
||||||
handleCancelSelection,
|
|
||||||
} = useBulkMonitorActions(refetch, page);
|
|
||||||
|
|
||||||
// Delete hook
|
|
||||||
const { deleteFn, loading: isDeleting } = useDelete();
|
|
||||||
|
|
||||||
// Handlers
|
|
||||||
const handleClearFilters = useCallback(() => {
|
|
||||||
setSelectedTypes([]);
|
|
||||||
setSelectedStatus("");
|
|
||||||
setSelectedState("");
|
|
||||||
setSelectedTags([]);
|
|
||||||
setSearch("");
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const handleConfirm = async () => {
|
|
||||||
if (!selectedMonitor) return;
|
|
||||||
await deleteFn(`/monitors/${selectedMonitor.id}`);
|
|
||||||
setSelectedMonitor(null);
|
|
||||||
refetch();
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleCancel = () => {
|
|
||||||
setSelectedMonitor(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const isLoading = monitorsWithChecksLoading;
|
|
||||||
|
|
||||||
// Check if any filters are active
|
|
||||||
const hasActiveFilters = Boolean(
|
|
||||||
selectedTypes.length > 0 ||
|
|
||||||
selectedStatus ||
|
|
||||||
selectedState ||
|
|
||||||
selectedTags.length > 0 ||
|
|
||||||
search
|
|
||||||
);
|
|
||||||
|
|
||||||
// Show empty state only when there are truly no monitors (not just filtered out)
|
|
||||||
// If filters are active and count is 0, pass 1 to prevent empty state fallback
|
|
||||||
const effectiveTotalCount =
|
|
||||||
hasActiveFilters && (summary?.totalMonitors ?? 0) === 0
|
|
||||||
? 1
|
|
||||||
: (summary?.totalMonitors ?? 0);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MonitorBasePageWithStates
|
<MonitorListPage
|
||||||
headerKey="uptime"
|
headerKey="uptime"
|
||||||
loading={isLoading}
|
|
||||||
error={monitorsWithChecksError}
|
|
||||||
totalCount={effectiveTotalCount}
|
|
||||||
page="uptime"
|
page="uptime"
|
||||||
actionLink="/uptime/create"
|
actionLink="/uptime/create"
|
||||||
|
controller={c}
|
||||||
|
bulkActions
|
||||||
>
|
>
|
||||||
<HeaderCreate
|
|
||||||
path="/uptime/create"
|
|
||||||
isLoading={isLoading}
|
|
||||||
isAdmin={isAdmin}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<HeaderMonitorsSummary summary={summary} />
|
|
||||||
|
|
||||||
<Stack
|
|
||||||
direction={isSmall ? "column" : "row"}
|
|
||||||
justifyContent={isSmall ? "flex-start" : "space-between"}
|
|
||||||
gap={theme.spacing(4)}
|
|
||||||
>
|
|
||||||
<ControlsFilter
|
|
||||||
selectedTypes={selectedTypes}
|
|
||||||
setSelectedTypes={setSelectedTypes}
|
|
||||||
selectedStatus={selectedStatus}
|
|
||||||
setSelectedStatus={setSelectedStatus}
|
|
||||||
selectedState={selectedState}
|
|
||||||
setSelectedState={setSelectedState}
|
|
||||||
tagOptions={tags ?? []}
|
|
||||||
selectedTags={selectedTags}
|
|
||||||
setSelectedTags={setSelectedTags}
|
|
||||||
onClearFilters={handleClearFilters}
|
|
||||||
/>
|
|
||||||
<TextField
|
|
||||||
placeholder={t("pages.uptime.filters.search.placeholder")}
|
|
||||||
value={search}
|
|
||||||
onChange={(event) => {
|
|
||||||
setSearch(event.target.value);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</Stack>
|
|
||||||
|
|
||||||
{selectedTags.length > 0 && (
|
|
||||||
<Stack
|
|
||||||
direction={isSmall ? "column" : "row"}
|
|
||||||
alignItems={isSmall ? "flex-start" : "center"}
|
|
||||||
flexWrap="wrap"
|
|
||||||
gap={theme.spacing(SPACING.XL)}
|
|
||||||
>
|
|
||||||
<Typography color={theme.palette.text.secondary}>
|
|
||||||
{t("pages.uptime.filters.activeTags")}
|
|
||||||
</Typography>
|
|
||||||
{selectedTags.map((tagId) => {
|
|
||||||
const tag = tags?.find((t) => t.id === tagId);
|
|
||||||
if (!tag) return null;
|
|
||||||
return (
|
|
||||||
<ColoredLabel
|
|
||||||
key={tag.id}
|
|
||||||
text={tag.name}
|
|
||||||
color={tag.color}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</Stack>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{!isLoading && (
|
|
||||||
<BulkActionsBar
|
|
||||||
selectedCount={selectedRows.length}
|
|
||||||
onCancel={handleCancelSelection}
|
|
||||||
>
|
|
||||||
<Button
|
|
||||||
size="small"
|
|
||||||
startIcon={<Play size={16} />}
|
|
||||||
onClick={handleBulkResume}
|
|
||||||
>
|
|
||||||
{t("common.buttons.resume")}
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
size="small"
|
|
||||||
startIcon={<Pause size={16} />}
|
|
||||||
onClick={handleBulkPause}
|
|
||||||
>
|
|
||||||
{t("common.buttons.pause")}
|
|
||||||
</Button>
|
|
||||||
</BulkActionsBar>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<MonitorTable
|
<MonitorTable
|
||||||
monitors={monitorsWithChecks || []}
|
monitors={c.monitors || []}
|
||||||
tags={tags || []}
|
tags={c.tags || []}
|
||||||
refetch={refetch}
|
refetch={c.refetch}
|
||||||
setSelectedMonitor={setSelectedMonitor}
|
setSelectedMonitor={c.setSelectedMonitor}
|
||||||
count={count || 0}
|
count={c.count || 0}
|
||||||
page={page}
|
page={c.page}
|
||||||
setPage={setPage}
|
setPage={c.setPage}
|
||||||
rowsPerPage={rowsPerPage}
|
rowsPerPage={c.rowsPerPage}
|
||||||
sortField={sortField}
|
sortField={c.sortField}
|
||||||
setSortField={setSortField}
|
setSortField={c.setSortField}
|
||||||
sortOrder={sortOrder}
|
sortOrder={c.sortOrder}
|
||||||
setSortOrder={setSortOrder}
|
setSortOrder={c.setSortOrder}
|
||||||
setRowsPerPage={(rowsPerPage: number) => {
|
setRowsPerPage={c.handleSetRowsPerPage}
|
||||||
dispatch(
|
selectedRows={c.selectedRows}
|
||||||
setRowsPerPage({
|
onSelectionChange={c.setSelectedRows}
|
||||||
value: rowsPerPage,
|
|
||||||
table: "monitors",
|
|
||||||
})
|
|
||||||
);
|
|
||||||
setPage(0);
|
|
||||||
}}
|
|
||||||
selectedRows={selectedRows}
|
|
||||||
onSelectionChange={setSelectedRows}
|
|
||||||
/>
|
/>
|
||||||
<Dialog
|
</MonitorListPage>
|
||||||
open={isDialogOpen}
|
|
||||||
title={t("common.dialogs.delete.title")}
|
|
||||||
content={t("common.dialogs.delete.description")}
|
|
||||||
onConfirm={handleConfirm}
|
|
||||||
onCancel={handleCancel}
|
|
||||||
loading={isDeleting}
|
|
||||||
/>
|
|
||||||
</MonitorBasePageWithStates>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,11 @@ import PageSpeedDetails from "@/Pages/PageSpeed/Details/";
|
|||||||
import Infrastructure from "@/Pages/Infrastructure/Monitors";
|
import Infrastructure from "@/Pages/Infrastructure/Monitors";
|
||||||
import InfrastructureDetails from "@/Pages/Infrastructure/Details";
|
import InfrastructureDetails from "@/Pages/Infrastructure/Details";
|
||||||
|
|
||||||
|
// Docker
|
||||||
|
import Docker from "@/Pages/Docker/Monitors";
|
||||||
|
import DockerHostDetails from "@/Pages/Docker/HostDetails";
|
||||||
|
import DockerDetails from "@/Pages/Docker/ContainerDetails";
|
||||||
|
|
||||||
// Checks
|
// Checks
|
||||||
import Checks from "@/Pages/Checks";
|
import Checks from "@/Pages/Checks";
|
||||||
|
|
||||||
@@ -39,11 +44,14 @@ import CreateNotifications from "@/Pages/Notifications/create";
|
|||||||
import Tags from "@/Pages/Tags";
|
import Tags from "@/Pages/Tags";
|
||||||
import CreateTags from "@/Pages/Tags/create";
|
import CreateTags from "@/Pages/Tags/create";
|
||||||
|
|
||||||
|
// Proxies
|
||||||
|
import Proxies from "@/Pages/Proxies";
|
||||||
|
import CreateProxies from "@/Pages/Proxies/create";
|
||||||
|
|
||||||
// Settings
|
// Settings
|
||||||
import Account from "@/Pages/Account";
|
import Account from "@/Pages/Account";
|
||||||
import EditUser from "@/Pages/Account/EditUser";
|
import EditUser from "@/Pages/Account/EditUser";
|
||||||
import Settings from "@/Pages/Settings";
|
import Settings from "@/Pages/Settings";
|
||||||
|
|
||||||
import Maintenance from "@/Pages/Maintenance";
|
import Maintenance from "@/Pages/Maintenance";
|
||||||
import CreateNewMaintenanceWindow from "@/Pages/Maintenance/create";
|
import CreateNewMaintenanceWindow from "@/Pages/Maintenance/create";
|
||||||
|
|
||||||
@@ -52,10 +60,8 @@ import Logs from "@/Pages/Logs";
|
|||||||
|
|
||||||
// Routing
|
// Routing
|
||||||
import { ProtectedRoute, RoleProtectedRoute } from "@/Components/routing/RouteProtected";
|
import { ProtectedRoute, RoleProtectedRoute } from "@/Components/routing/RouteProtected";
|
||||||
|
|
||||||
import CreateMonitor from "@/Pages/CreateMonitor";
|
import CreateMonitor from "@/Pages/CreateMonitor";
|
||||||
import { isCustomDomainHost } from "@/Utils/statusPageUrl";
|
import { isCustomDomainHost } from "@/Utils/statusPageUrl";
|
||||||
|
|
||||||
const Routes = () => {
|
const Routes = () => {
|
||||||
if (isCustomDomainHost()) {
|
if (isCustomDomainHost()) {
|
||||||
return (
|
return (
|
||||||
@@ -138,6 +144,26 @@ const Routes = () => {
|
|||||||
path="infrastructure/:monitorId"
|
path="infrastructure/:monitorId"
|
||||||
element={<InfrastructureDetails />}
|
element={<InfrastructureDetails />}
|
||||||
/>
|
/>
|
||||||
|
<Route
|
||||||
|
path="docker"
|
||||||
|
element={<Docker />}
|
||||||
|
/>
|
||||||
|
<Route
|
||||||
|
path="docker/create"
|
||||||
|
element={<CreateMonitor />}
|
||||||
|
/>
|
||||||
|
<Route
|
||||||
|
path="/docker/configure/:monitorId"
|
||||||
|
element={<CreateMonitor />}
|
||||||
|
/>
|
||||||
|
<Route
|
||||||
|
path="docker/host/:monitorId/container/:containerName"
|
||||||
|
element={<DockerDetails />}
|
||||||
|
/>
|
||||||
|
<Route
|
||||||
|
path="docker/host/:monitorId"
|
||||||
|
element={<DockerHostDetails />}
|
||||||
|
/>
|
||||||
<Route
|
<Route
|
||||||
path="checks/:monitorId?"
|
path="checks/:monitorId?"
|
||||||
element={<Checks />}
|
element={<Checks />}
|
||||||
@@ -188,12 +214,24 @@ const Routes = () => {
|
|||||||
path="tags/create"
|
path="tags/create"
|
||||||
element={<CreateTags />}
|
element={<CreateTags />}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Route
|
<Route
|
||||||
path="tags/configure/:tagId"
|
path="tags/configure/:tagId"
|
||||||
element={<CreateTags />}
|
element={<CreateTags />}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<Route
|
||||||
|
path="proxies"
|
||||||
|
element={<Proxies />}
|
||||||
|
/>
|
||||||
|
<Route
|
||||||
|
path="proxies/create"
|
||||||
|
element={<CreateProxies />}
|
||||||
|
/>
|
||||||
|
<Route
|
||||||
|
path="proxies/configure/:proxyId"
|
||||||
|
element={<CreateProxies />}
|
||||||
|
/>
|
||||||
|
|
||||||
<Route
|
<Route
|
||||||
path="maintenance"
|
path="maintenance"
|
||||||
element={<Maintenance />}
|
element={<Maintenance />}
|
||||||
|
|||||||
@@ -119,6 +119,65 @@ export interface CheckTimings {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Mirrors DockerContainerSummary in server/src/types/network.ts.
|
||||||
|
export interface DockerContainerSummary {
|
||||||
|
total: number;
|
||||||
|
running: number;
|
||||||
|
stopped: number;
|
||||||
|
unhealthy: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mirrors DockerContainerStates in server/src/types/network.ts.
|
||||||
|
export const DockerContainerStates = [
|
||||||
|
"created",
|
||||||
|
"running",
|
||||||
|
"paused",
|
||||||
|
"restarting",
|
||||||
|
"removing",
|
||||||
|
"exited",
|
||||||
|
"dead",
|
||||||
|
] as const;
|
||||||
|
export type DockerContainerState = (typeof DockerContainerStates)[number];
|
||||||
|
|
||||||
|
export const DockerHealthStatuses = ["healthy", "unhealthy", "starting", "none"] as const;
|
||||||
|
export type DockerHealthStatus = (typeof DockerHealthStatuses)[number];
|
||||||
|
|
||||||
|
export const DockerPortProtocols = ["tcp", "udp", "sctp"] as const;
|
||||||
|
export type DockerPortProtocol = (typeof DockerPortProtocols)[number];
|
||||||
|
|
||||||
|
export interface DockerContainerPort {
|
||||||
|
privatePort: number;
|
||||||
|
protocol: DockerPortProtocol;
|
||||||
|
publicPort?: number;
|
||||||
|
hostIp?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DockerContainerMount {
|
||||||
|
type: string;
|
||||||
|
name?: string;
|
||||||
|
source: string;
|
||||||
|
destination: string;
|
||||||
|
mode: string;
|
||||||
|
rw: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DockerContainerInfo {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
image: string;
|
||||||
|
state: DockerContainerState;
|
||||||
|
status: string;
|
||||||
|
health: DockerHealthStatus;
|
||||||
|
cpuPct?: number;
|
||||||
|
memoryUsedBytes?: number;
|
||||||
|
memoryLimitBytes?: number;
|
||||||
|
memoryPct?: number;
|
||||||
|
restartCount?: number;
|
||||||
|
startedAt?: string;
|
||||||
|
ports?: DockerContainerPort[];
|
||||||
|
mounts?: DockerContainerMount[];
|
||||||
|
}
|
||||||
|
|
||||||
export interface Check {
|
export interface Check {
|
||||||
id: string;
|
id: string;
|
||||||
metadata: CheckMetadata;
|
metadata: CheckMetadata;
|
||||||
@@ -133,6 +192,7 @@ export interface Check {
|
|||||||
host?: CheckHostInfo;
|
host?: CheckHostInfo;
|
||||||
errors?: CheckErrorInfo[];
|
errors?: CheckErrorInfo[];
|
||||||
capture?: CheckCaptureInfo;
|
capture?: CheckCaptureInfo;
|
||||||
|
containerSummary?: DockerContainerSummary;
|
||||||
net?: CheckNetworkInterfaceInfo[];
|
net?: CheckNetworkInterfaceInfo[];
|
||||||
accessibility?: number;
|
accessibility?: number;
|
||||||
bestPractices?: number;
|
bestPractices?: number;
|
||||||
@@ -287,6 +347,7 @@ export type CheckSnapshot = Pick<
|
|||||||
memory?: SnapshotMemoryInfo;
|
memory?: SnapshotMemoryInfo;
|
||||||
disk?: SnapshotDiskInfo[];
|
disk?: SnapshotDiskInfo[];
|
||||||
host?: SnapshotHostInfo;
|
host?: SnapshotHostInfo;
|
||||||
|
containerSummary?: DockerContainerSummary;
|
||||||
};
|
};
|
||||||
export interface HasResponseTime {
|
export interface HasResponseTime {
|
||||||
responseTime: number;
|
responseTime: number;
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ import type {
|
|||||||
CheckSnapshot,
|
CheckSnapshot,
|
||||||
GroupedUptimeCheck,
|
GroupedUptimeCheck,
|
||||||
DailyCheckBucket,
|
DailyCheckBucket,
|
||||||
|
DockerContainerInfo,
|
||||||
|
DockerContainerSummary,
|
||||||
} from "@/Types/Check";
|
} from "@/Types/Check";
|
||||||
import type { PageSpeedGroupedCheck } from "@/Types/Check";
|
import type { PageSpeedGroupedCheck } from "@/Types/Check";
|
||||||
import type { GeoContinent } from "@/Types/GeoCheck";
|
import type { GeoContinent } from "@/Types/GeoCheck";
|
||||||
@@ -30,7 +32,6 @@ export type MonitorType = (typeof MonitorTypes)[number];
|
|||||||
export const SelectableMonitorTypes = [
|
export const SelectableMonitorTypes = [
|
||||||
"http",
|
"http",
|
||||||
"ping",
|
"ping",
|
||||||
"docker",
|
|
||||||
"port",
|
"port",
|
||||||
"game",
|
"game",
|
||||||
"grpc",
|
"grpc",
|
||||||
@@ -109,6 +110,10 @@ export const HttpMethods = ["GET", "HEAD"] as const;
|
|||||||
export type HttpMethod = (typeof HttpMethods)[number];
|
export type HttpMethod = (typeof HttpMethods)[number];
|
||||||
export const DefaultHttpMethod: HttpMethod = "GET";
|
export const DefaultHttpMethod: HttpMethod = "GET";
|
||||||
|
|
||||||
|
export const ProxyModes = ["inherit", "none", "custom"] as const;
|
||||||
|
export type ProxyMode = (typeof ProxyModes)[number];
|
||||||
|
export const DefaultProxyMode: ProxyMode = "inherit";
|
||||||
|
|
||||||
export interface Monitor {
|
export interface Monitor {
|
||||||
id: string;
|
id: string;
|
||||||
userId: string;
|
userId: string;
|
||||||
@@ -121,6 +126,8 @@ export interface Monitor {
|
|||||||
statusWindowThreshold: number;
|
statusWindowThreshold: number;
|
||||||
type: MonitorType;
|
type: MonitorType;
|
||||||
ignoreTlsErrors: boolean;
|
ignoreTlsErrors: boolean;
|
||||||
|
proxyMode: ProxyMode;
|
||||||
|
proxyId?: string;
|
||||||
useAdvancedMatching: boolean;
|
useAdvancedMatching: boolean;
|
||||||
jsonPath?: string;
|
jsonPath?: string;
|
||||||
expectedValue?: string;
|
expectedValue?: string;
|
||||||
@@ -263,6 +270,58 @@ export interface HardwareDetailsResponse {
|
|||||||
monitorStats: MonitorStats | null;
|
monitorStats: MonitorStats | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface DockerStatsBucket {
|
||||||
|
_id: string;
|
||||||
|
avgResponseTime: number | null;
|
||||||
|
upCount: number;
|
||||||
|
totalCount: number;
|
||||||
|
avgRunning: number | null;
|
||||||
|
avgTotal: number | null;
|
||||||
|
avgUnhealthy: number | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DockerStats {
|
||||||
|
aggregateData: {
|
||||||
|
totalChecks: number;
|
||||||
|
};
|
||||||
|
upChecks: {
|
||||||
|
totalChecks: number;
|
||||||
|
};
|
||||||
|
aggregate: DockerStatsBucket[];
|
||||||
|
latest: {
|
||||||
|
containers: DockerContainerInfo[];
|
||||||
|
summary?: DockerContainerSummary;
|
||||||
|
checkedAt: string;
|
||||||
|
} | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DockerDetailsResponse {
|
||||||
|
monitor: Monitor;
|
||||||
|
stats: DockerStats;
|
||||||
|
monitorStats: MonitorStats | null;
|
||||||
|
}
|
||||||
|
export interface DockerContainerStatsBucket {
|
||||||
|
_id: string;
|
||||||
|
avgCpuPct: number | null;
|
||||||
|
avgMemoryUsedBytes: number | null;
|
||||||
|
avgMemoryPct: number | null;
|
||||||
|
minRestartCount: number | null;
|
||||||
|
maxRestartCount: number | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DockerContainerStats {
|
||||||
|
aggregate: DockerContainerStatsBucket[];
|
||||||
|
restartsInRange: number;
|
||||||
|
latest: {
|
||||||
|
container: DockerContainerInfo;
|
||||||
|
checkedAt: string;
|
||||||
|
} | null;
|
||||||
|
}
|
||||||
|
export interface DockerContainerResponse {
|
||||||
|
monitor: Monitor;
|
||||||
|
stats: DockerContainerStats;
|
||||||
|
}
|
||||||
|
|
||||||
export interface Game {
|
export interface Game {
|
||||||
name: string;
|
name: string;
|
||||||
options?: {
|
options?: {
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
export const ProxyProtocols = ["http", "https"] as const;
|
||||||
|
export type ProxyProtocol = (typeof ProxyProtocols)[number];
|
||||||
|
|
||||||
|
export interface Proxy {
|
||||||
|
id: string;
|
||||||
|
teamId: string;
|
||||||
|
name: string;
|
||||||
|
protocol: ProxyProtocol;
|
||||||
|
host: string;
|
||||||
|
port: number;
|
||||||
|
username?: string;
|
||||||
|
password?: string;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type ProxyResponse = Omit<Proxy, "password"> & { hasPassword: boolean };
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
export const DateRanges = ["recent", "hour", "day", "week", "month", "all"] as const;
|
||||||
|
export type DateRange = (typeof DateRanges)[number];
|
||||||
@@ -24,6 +24,8 @@ export interface Settings {
|
|||||||
showURL: boolean;
|
showURL: boolean;
|
||||||
singleton: boolean;
|
singleton: boolean;
|
||||||
globalThresholds?: SettingsThresholds;
|
globalThresholds?: SettingsThresholds;
|
||||||
|
globalProxyEnabled: boolean;
|
||||||
|
globalProxyId?: string | null;
|
||||||
createdAt: string;
|
createdAt: string;
|
||||||
updatedAt: string;
|
updatedAt: string;
|
||||||
}
|
}
|
||||||
@@ -31,5 +33,11 @@ export interface Settings {
|
|||||||
export interface AppSettingsResponse {
|
export interface AppSettingsResponse {
|
||||||
pagespeedKeySet: boolean;
|
pagespeedKeySet: boolean;
|
||||||
emailPasswordSet: boolean;
|
emailPasswordSet: boolean;
|
||||||
|
globalProxy: {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
host: string;
|
||||||
|
port: number;
|
||||||
|
} | null;
|
||||||
settings: Settings;
|
settings: Settings;
|
||||||
}
|
}
|
||||||
@@ -1,25 +1,31 @@
|
|||||||
/**
|
/**
|
||||||
* Intl.NumberFormat instance for percentage formatting.
|
* Intl.NumberFormat instance for percentage formatting.
|
||||||
* Reused across all formatting calls for performance.
|
* Reused across all formatting calls for performance.
|
||||||
|
*
|
||||||
|
* Two decimals rather than one: at a single decimal every value above 99.95%
|
||||||
|
* renders as "100.0%", so a period containing real downtime is reported as
|
||||||
|
* flawless. It also collapses 99.9 / 99.95 / 99.99 — three materially
|
||||||
|
* different SLA commitments — into the same figure.
|
||||||
*/
|
*/
|
||||||
const percentageFormatter = new Intl.NumberFormat("en-US", {
|
const percentageFormatter = new Intl.NumberFormat("en-US", {
|
||||||
style: "percent",
|
style: "percent",
|
||||||
minimumFractionDigits: 1,
|
minimumFractionDigits: 2,
|
||||||
maximumFractionDigits: 1,
|
maximumFractionDigits: 2,
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Formats a decimal value as a percentage string.
|
* Formats a decimal value as a percentage string.
|
||||||
* @param value - Decimal value (e.g., 0.75 for 75%)
|
* @param value - Decimal value (e.g., 0.75 for 75%)
|
||||||
* @returns Formatted percentage string (e.g., "75.0%")
|
* @returns Formatted percentage string (e.g., "75.00%")
|
||||||
* @example
|
* @example
|
||||||
* formatPercentage(0.75) // "75.0%"
|
* formatPercentage(0.75) // "75.00%"
|
||||||
* formatPercentage(1) // "100.0%"
|
* formatPercentage(1) // "100.00%"
|
||||||
* formatPercentage(0.5432) // "54.3%"
|
* formatPercentage(0.5432) // "54.32%"
|
||||||
|
* formatPercentage(0.9999) // "99.99%"
|
||||||
*/
|
*/
|
||||||
export const formatPercentage = (value: number): string => {
|
export const formatPercentage = (value: number): string => {
|
||||||
if (typeof value !== "number" || Number.isNaN(value)) {
|
if (typeof value !== "number" || Number.isNaN(value)) {
|
||||||
return "0.0%";
|
return "0.00%";
|
||||||
}
|
}
|
||||||
return percentageFormatter.format(value);
|
return percentageFormatter.format(value);
|
||||||
};
|
};
|
||||||
@@ -27,11 +33,11 @@ export const formatPercentage = (value: number): string => {
|
|||||||
/**
|
/**
|
||||||
* Formats a whole number percentage value as a percentage string.
|
* Formats a whole number percentage value as a percentage string.
|
||||||
* @param value - Whole number percentage (e.g., 75 for 75%)
|
* @param value - Whole number percentage (e.g., 75 for 75%)
|
||||||
* @returns Formatted percentage string (e.g., "75.0%")
|
* @returns Formatted percentage string (e.g., "75.00%")
|
||||||
* @example
|
* @example
|
||||||
* formatPercentageFromWhole(75) // "75.0%"
|
* formatPercentageFromWhole(75) // "75.00%"
|
||||||
* formatPercentageFromWhole(100) // "100.0%"
|
* formatPercentageFromWhole(100) // "100.00%"
|
||||||
* formatPercentageFromWhole(54.32) // "54.3%"
|
* formatPercentageFromWhole(54.32) // "54.32%"
|
||||||
*/
|
*/
|
||||||
export const formatPercentageFromWhole = (value: number): string => {
|
export const formatPercentageFromWhole = (value: number): string => {
|
||||||
return formatPercentage(value / 100);
|
return formatPercentage(value / 100);
|
||||||
|
|||||||
@@ -1,6 +1,11 @@
|
|||||||
import type { MonitorStatus, MonitorType } from "@/Types/Monitor";
|
import type { MonitorStatus, MonitorType } from "@/Types/Monitor";
|
||||||
import type { PaletteKey } from "@/Utils/Theme/Theme";
|
import type { PaletteKey } from "@/Utils/Theme/Theme";
|
||||||
import type { ValueType } from "@/Components/design-elements/StatusLabel";
|
import type { ValueType } from "@/Components/design-elements/StatusLabel";
|
||||||
|
import type {
|
||||||
|
DockerContainerMount,
|
||||||
|
DockerContainerPort,
|
||||||
|
DockerContainerState,
|
||||||
|
} from "@/Types/Check";
|
||||||
|
|
||||||
export const getMonitorPath = (type: MonitorType): string => {
|
export const getMonitorPath = (type: MonitorType): string => {
|
||||||
const pathMap: Record<MonitorType, string> = {
|
const pathMap: Record<MonitorType, string> = {
|
||||||
@@ -12,7 +17,7 @@ export const getMonitorPath = (type: MonitorType): string => {
|
|||||||
websocket: "uptime",
|
websocket: "uptime",
|
||||||
dns: "uptime",
|
dns: "uptime",
|
||||||
unknown: "uptime",
|
unknown: "uptime",
|
||||||
docker: "uptime",
|
docker: "docker",
|
||||||
hardware: "infrastructure",
|
hardware: "infrastructure",
|
||||||
pagespeed: "pagespeed",
|
pagespeed: "pagespeed",
|
||||||
};
|
};
|
||||||
@@ -41,6 +46,19 @@ export const getValuePalette = (value: ValueType): PaletteKey => {
|
|||||||
return paletteMap[value];
|
return paletteMap[value];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getDockerStatePalette = (state: DockerContainerState): PaletteKey => {
|
||||||
|
const paletteMap: Record<DockerContainerState, PaletteKey> = {
|
||||||
|
paused: "warning",
|
||||||
|
created: "warning",
|
||||||
|
running: "success",
|
||||||
|
restarting: "warning",
|
||||||
|
removing: "warning",
|
||||||
|
exited: "error",
|
||||||
|
dead: "error",
|
||||||
|
};
|
||||||
|
return paletteMap[state];
|
||||||
|
};
|
||||||
|
|
||||||
export const getStatusColor = (status: MonitorStatus, theme: any): string => {
|
export const getStatusColor = (status: MonitorStatus, theme: any): string => {
|
||||||
if (status === "up") {
|
if (status === "up") {
|
||||||
return theme.palette.success.light;
|
return theme.palette.success.light;
|
||||||
@@ -97,3 +115,32 @@ export const formatUrl = (url: string, maxLength: number = 55) => {
|
|||||||
? `${strippedUrl.slice(0, maxLength)}…`
|
? `${strippedUrl.slice(0, maxLength)}…`
|
||||||
: strippedUrl;
|
: strippedUrl;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const dedupeDockerPorts = (
|
||||||
|
ports: DockerContainerPort[]
|
||||||
|
): DockerContainerPort[] => {
|
||||||
|
return ports.filter((port) => {
|
||||||
|
// Discard ipv6 wildcards
|
||||||
|
if (port.hostIp !== "::") return port;
|
||||||
|
|
||||||
|
const isDuplicate = ports.some((otherPort) => {
|
||||||
|
if (otherPort.hostIp !== "0.0.0.0") return false;
|
||||||
|
|
||||||
|
return (
|
||||||
|
otherPort.privatePort === port.privatePort &&
|
||||||
|
otherPort.protocol === port.protocol &&
|
||||||
|
otherPort.publicPort === port.publicPort
|
||||||
|
);
|
||||||
|
});
|
||||||
|
return !isDuplicate;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const isAnonymousVolumeName = (name: string): boolean => /^[0-9a-f]{64}$/.test(name);
|
||||||
|
|
||||||
|
export const getDockerMountLabel = (mount: DockerContainerMount) => {
|
||||||
|
if (mount.type === "volume" && mount.name)
|
||||||
|
return isAnonymousVolumeName(mount.name) ? mount.name.slice(0, 12) : mount.name;
|
||||||
|
if (mount.source) return mount.source;
|
||||||
|
return mount.type;
|
||||||
|
};
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { alpha } from "@mui/material/styles";
|
import { alpha } from "@mui/material/styles";
|
||||||
|
import { HOVER } from "@/Utils/Theme/constants";
|
||||||
|
|
||||||
const typographyBase = 13;
|
const typographyBase = 13;
|
||||||
|
|
||||||
@@ -39,6 +40,10 @@ export const lightPalette = {
|
|||||||
primary: {
|
primary: {
|
||||||
main: colors.brandGreen,
|
main: colors.brandGreen,
|
||||||
},
|
},
|
||||||
|
action: {
|
||||||
|
rowHover: alpha(colors.gray900, HOVER.ROW),
|
||||||
|
controlHover: alpha(colors.gray900, HOVER.CONTROL),
|
||||||
|
},
|
||||||
secondary: {
|
secondary: {
|
||||||
main: colors.gray200,
|
main: colors.gray200,
|
||||||
},
|
},
|
||||||
@@ -65,6 +70,10 @@ export const darkPalette = {
|
|||||||
primary: {
|
primary: {
|
||||||
main: colors.brandGreen,
|
main: colors.brandGreen,
|
||||||
},
|
},
|
||||||
|
action: {
|
||||||
|
rowHover: alpha("#FFFFFF", HOVER.ROW),
|
||||||
|
controlHover: alpha("#FFFFFF", HOVER.CONTROL),
|
||||||
|
},
|
||||||
secondary: {
|
secondary: {
|
||||||
main: colors.gray700,
|
main: colors.gray700,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -13,6 +13,10 @@ declare module "@mui/material/styles" {
|
|||||||
eyebrow?: React.CSSProperties;
|
eyebrow?: React.CSSProperties;
|
||||||
fontFamilyMonospace?: string;
|
fontFamilyMonospace?: string;
|
||||||
}
|
}
|
||||||
|
interface TypeAction {
|
||||||
|
rowHover: string;
|
||||||
|
controlHover: string;
|
||||||
|
}
|
||||||
interface Palette {
|
interface Palette {
|
||||||
sidebar: { accent: string };
|
sidebar: { accent: string };
|
||||||
rowStatus: { running: string; paused: string };
|
rowStatus: { running: string; paused: string };
|
||||||
|
|||||||
@@ -20,4 +20,6 @@ export const LAYOUT = {
|
|||||||
|
|
||||||
export const HOVER = {
|
export const HOVER = {
|
||||||
DARKEN: 0.06, // This is a coefficient for darkening function
|
DARKEN: 0.06, // This is a coefficient for darkening function
|
||||||
|
ROW: 0.025, // Overlay alpha for hoverable rows and cards
|
||||||
|
CONTROL: 0.05, // Stronger overlay for controls nested inside a hoverable row
|
||||||
} as const;
|
} as const;
|
||||||
@@ -5,6 +5,7 @@ import {
|
|||||||
DnsRecordTypes,
|
DnsRecordTypes,
|
||||||
HttpMethods,
|
HttpMethods,
|
||||||
PageSpeedStrategies,
|
PageSpeedStrategies,
|
||||||
|
ProxyModes,
|
||||||
type MonitorType,
|
type MonitorType,
|
||||||
} from "@/Types/Monitor";
|
} from "@/Types/Monitor";
|
||||||
import { ALL_HTTP_STATUS_CODES } from "@/Utils/statusCode";
|
import { ALL_HTTP_STATUS_CODES } from "@/Utils/statusCode";
|
||||||
@@ -67,6 +68,13 @@ const httpStatusCode = z.number().refine((code) => httpStatusCodeSet.has(code),
|
|||||||
const httpSchema = baseSchema.extend({
|
const httpSchema = baseSchema.extend({
|
||||||
type: z.literal("http"),
|
type: z.literal("http"),
|
||||||
url: urlSchema,
|
url: urlSchema,
|
||||||
|
proxyMode: z.enum(ProxyModes),
|
||||||
|
// The form uses "" for "no proxy selected". drop it from the payload so the
|
||||||
|
// server never receives an empty ObjectId
|
||||||
|
proxyId: z
|
||||||
|
.string()
|
||||||
|
.transform((value) => (value === "" ? undefined : value))
|
||||||
|
.optional(),
|
||||||
method: z.enum(HttpMethods).optional().register(monitorStepRegistry, { step: 2 }),
|
method: z.enum(HttpMethods).optional().register(monitorStepRegistry, { step: 2 }),
|
||||||
ignoreTlsErrors: z.boolean().register(monitorStepRegistry, { step: 2 }),
|
ignoreTlsErrors: z.boolean().register(monitorStepRegistry, { step: 2 }),
|
||||||
useAdvancedMatching: z.boolean().register(monitorStepRegistry, { step: 2 }),
|
useAdvancedMatching: z.boolean().register(monitorStepRegistry, { step: 2 }),
|
||||||
@@ -195,7 +203,7 @@ const dnsSchema = baseSchema.extend({
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Discriminated union of all monitor types
|
// Discriminated union of all monitor types
|
||||||
export const monitorSchema = z.discriminatedUnion("type", [
|
const monitorSchemaUnion = z.discriminatedUnion("type", [
|
||||||
httpSchema,
|
httpSchema,
|
||||||
pingSchema,
|
pingSchema,
|
||||||
portSchema,
|
portSchema,
|
||||||
@@ -208,10 +216,21 @@ export const monitorSchema = z.discriminatedUnion("type", [
|
|||||||
dnsSchema,
|
dnsSchema,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// Mirrors the server's refineProxySelection (monitorValidation.ts)
|
||||||
|
export const monitorSchema = monitorSchemaUnion.superRefine((data, ctx) => {
|
||||||
|
if (data.type === "http" && data.proxyMode === "custom" && !data.proxyId) {
|
||||||
|
ctx.addIssue({
|
||||||
|
code: "custom",
|
||||||
|
path: ["proxyId"],
|
||||||
|
message: "A proxy must be selected when proxy mode is custom",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
export type MonitorFormData = z.infer<typeof monitorSchema>;
|
export type MonitorFormData = z.infer<typeof monitorSchema>;
|
||||||
|
|
||||||
const optionForType = (type: MonitorType) =>
|
const optionForType = (type: MonitorType) =>
|
||||||
monitorSchema.options.find((o) => o.shape.type.value === type);
|
monitorSchemaUnion.options.find((o) => o.shape.type.value === type);
|
||||||
|
|
||||||
// The step each field of a type is validated on, from the per-field
|
// The step each field of a type is validated on, from the per-field
|
||||||
// `monitorStepRegistry` metadata (unannotated fields default to step 0).
|
// `monitorStepRegistry` metadata (unannotated fields default to step 0).
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { z } from "zod";
|
||||||
|
import { ProxyProtocols } from "@/Types/Proxy";
|
||||||
|
|
||||||
|
export const proxySchema = z.object({
|
||||||
|
name: z.string().min(1, "Proxy name is required"),
|
||||||
|
protocol: z.enum(ProxyProtocols, "Invalid proxy protocol"),
|
||||||
|
host: z.string().min(1, "Proxy host is required"),
|
||||||
|
port: z
|
||||||
|
.number()
|
||||||
|
.int()
|
||||||
|
.min(1, "Proxy port is required")
|
||||||
|
.max(65535, "Proxy port must be between 1 and 65535"),
|
||||||
|
username: z.string().optional(),
|
||||||
|
password: z.string().optional(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type ProxyFormData = z.infer<typeof proxySchema>;
|
||||||
@@ -1,61 +1,73 @@
|
|||||||
import { CHECK_TTL_SENTINEL } from "@/Types/Check";
|
import { CHECK_TTL_SENTINEL } from "@/Types/Check";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
export const settingsSchema = z.object({
|
export const settingsSchema = z
|
||||||
systemEmailIgnoreTLS: z.boolean(),
|
.object({
|
||||||
systemEmailRequireTLS: z.boolean(),
|
systemEmailIgnoreTLS: z.boolean(),
|
||||||
systemEmailRejectUnauthorized: z.boolean(),
|
systemEmailRequireTLS: z.boolean(),
|
||||||
systemEmailConnectionHost: z
|
systemEmailRejectUnauthorized: z.boolean(),
|
||||||
.string()
|
systemEmailConnectionHost: z
|
||||||
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
.string()
|
||||||
.optional(),
|
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
||||||
systemEmailSecure: z.boolean().optional(),
|
.optional(),
|
||||||
systemEmailPool: z.boolean().optional(),
|
systemEmailSecure: z.boolean().optional(),
|
||||||
showURL: z.boolean().optional(),
|
systemEmailPool: z.boolean().optional(),
|
||||||
checkTTL: z
|
showURL: z.boolean().optional(),
|
||||||
.number()
|
checkTTL: z
|
||||||
.int()
|
.number()
|
||||||
.min(1, "Please enter a value")
|
.int()
|
||||||
.max(CHECK_TTL_SENTINEL, `Maximum ${CHECK_TTL_SENTINEL}`),
|
.min(1, "Please enter a value")
|
||||||
pagespeedApiKey: z
|
.max(CHECK_TTL_SENTINEL, `Maximum ${CHECK_TTL_SENTINEL}`),
|
||||||
.string()
|
pagespeedApiKey: z
|
||||||
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
.string()
|
||||||
.optional(),
|
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
||||||
systemEmailHost: z
|
.optional(),
|
||||||
.string()
|
systemEmailHost: z
|
||||||
.regex(/^[a-zA-Z0-9.-]*$/, "Invalid hostname or IP address")
|
.string()
|
||||||
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
.regex(/^[a-zA-Z0-9.-]*$/, "Invalid hostname or IP address")
|
||||||
.optional(),
|
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
||||||
systemEmailPort: z.number().int().min(1).max(65535).optional(),
|
.optional(),
|
||||||
systemEmailAddress: z
|
systemEmailPort: z.number().int().min(1).max(65535).optional(),
|
||||||
.email("Please enter a valid email address")
|
systemEmailAddress: z
|
||||||
.or(z.literal(""))
|
.email("Please enter a valid email address")
|
||||||
.transform((val) => (val === "" ? null : val.toLowerCase().trim()))
|
.or(z.literal(""))
|
||||||
.optional(),
|
.transform((val) => (val === "" ? null : val.toLowerCase().trim()))
|
||||||
systemEmailDisplayName: z
|
.optional(),
|
||||||
.string()
|
systemEmailDisplayName: z
|
||||||
.max(100, "Display name must be 100 characters or fewer")
|
.string()
|
||||||
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
.max(100, "Display name must be 100 characters or fewer")
|
||||||
.optional(),
|
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
||||||
systemEmailUser: z
|
.optional(),
|
||||||
.string()
|
systemEmailUser: z
|
||||||
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
.string()
|
||||||
.optional(),
|
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
||||||
systemEmailPassword: z
|
.optional(),
|
||||||
.string()
|
systemEmailPassword: z
|
||||||
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
.string()
|
||||||
.optional(),
|
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
||||||
systemEmailTLSServername: z
|
.optional(),
|
||||||
.string()
|
systemEmailTLSServername: z
|
||||||
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
.string()
|
||||||
.optional(),
|
.transform((val) => (val.trim() === "" ? null : val.trim()))
|
||||||
globalThresholds: z.object({
|
.optional(),
|
||||||
cpu: z.number().int().min(1).max(100),
|
globalThresholds: z.object({
|
||||||
memory: z.number().int().min(1).max(100),
|
cpu: z.number().int().min(1).max(100),
|
||||||
disk: z.number().int().min(1).max(100),
|
memory: z.number().int().min(1).max(100),
|
||||||
temperature: z.number().int().min(1).max(150),
|
disk: z.number().int().min(1).max(100),
|
||||||
}),
|
temperature: z.number().int().min(1).max(150),
|
||||||
});
|
}),
|
||||||
|
globalProxyEnabled: z.boolean(),
|
||||||
|
globalProxyId: z.string().nullable().optional(),
|
||||||
|
})
|
||||||
|
.superRefine((body, ctx) => {
|
||||||
|
if (body.globalProxyEnabled === true && !body.globalProxyId) {
|
||||||
|
ctx.addIssue({
|
||||||
|
code: "custom",
|
||||||
|
path: ["globalProxyId"],
|
||||||
|
message: "A proxy must be selected to enable the global proxy",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
export type SettingsFormInput = z.input<typeof settingsSchema>;
|
export type SettingsFormInput = z.input<typeof settingsSchema>;
|
||||||
export type SettingsFormData = z.infer<typeof settingsSchema>;
|
export type SettingsFormData = z.infer<typeof settingsSchema>;
|
||||||
@@ -79,6 +79,7 @@ export const statusPageSchema = z.object({
|
|||||||
.object({
|
.object({
|
||||||
data: z.string(),
|
data: z.string(),
|
||||||
contentType: z.string(),
|
contentType: z.string(),
|
||||||
|
file: z.instanceof(File).optional(),
|
||||||
})
|
})
|
||||||
.nullable()
|
.nullable()
|
||||||
.optional()
|
.optional()
|
||||||
|
|||||||
@@ -181,7 +181,13 @@
|
|||||||
"statusPages": "صفحات الحالة",
|
"statusPages": "صفحات الحالة",
|
||||||
"maintenance": "الصيانة",
|
"maintenance": "الصيانة",
|
||||||
"logs": "السجلات",
|
"logs": "السجلات",
|
||||||
"settings": "الإعدادات"
|
"settings": "الإعدادات",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "المراقبة",
|
||||||
|
"alerting": "التنبيهات",
|
||||||
|
"reporting": "التقارير",
|
||||||
|
"configuration": "الإعدادات العامة"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "الدعم",
|
"support": "الدعم",
|
||||||
@@ -1141,6 +1147,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "عام",
|
||||||
|
"monitoring": "المراقبة",
|
||||||
|
"email": "البريد الإلكتروني",
|
||||||
|
"integrations": "التكاملات",
|
||||||
|
"data": "البيانات"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "المنطقة الزمنية للعرض",
|
"title": "المنطقة الزمنية للعرض",
|
||||||
|
|||||||
@@ -189,7 +189,13 @@
|
|||||||
"statusPages": "Pàgines d'estat",
|
"statusPages": "Pàgines d'estat",
|
||||||
"maintenance": "Manteniment",
|
"maintenance": "Manteniment",
|
||||||
"logs": "Registres",
|
"logs": "Registres",
|
||||||
"settings": "Configuració"
|
"settings": "Configuració",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "Monitoratge",
|
||||||
|
"alerting": "Alertes",
|
||||||
|
"reporting": "Informes",
|
||||||
|
"configuration": "Configuració"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "Suport",
|
"support": "Suport",
|
||||||
@@ -1141,6 +1147,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "General",
|
||||||
|
"monitoring": "Monitoratge",
|
||||||
|
"email": "Correu electrònic",
|
||||||
|
"integrations": "Integracions",
|
||||||
|
"data": "Dades"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "Zona horària de visualització",
|
"title": "Zona horària de visualització",
|
||||||
|
|||||||
@@ -181,7 +181,13 @@
|
|||||||
"statusPages": "Stavové stránky",
|
"statusPages": "Stavové stránky",
|
||||||
"maintenance": "Údržba",
|
"maintenance": "Údržba",
|
||||||
"logs": "Záznamy",
|
"logs": "Záznamy",
|
||||||
"settings": "Nastavení"
|
"settings": "Nastavení",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "Monitorování",
|
||||||
|
"alerting": "Upozornění",
|
||||||
|
"reporting": "Přehledy",
|
||||||
|
"configuration": "Konfigurace"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "Podpora",
|
"support": "Podpora",
|
||||||
@@ -1141,6 +1147,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "Obecné",
|
||||||
|
"monitoring": "Monitorování",
|
||||||
|
"email": "E-mail",
|
||||||
|
"integrations": "Integrace",
|
||||||
|
"data": "Data"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "Zobrazované časové pásmo",
|
"title": "Zobrazované časové pásmo",
|
||||||
|
|||||||
@@ -181,7 +181,13 @@
|
|||||||
"statusPages": "Statusseite",
|
"statusPages": "Statusseite",
|
||||||
"maintenance": "Wartung",
|
"maintenance": "Wartung",
|
||||||
"logs": "Protokolle",
|
"logs": "Protokolle",
|
||||||
"settings": "Einstellungen"
|
"settings": "Einstellungen",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "Überwachung",
|
||||||
|
"alerting": "Benachrichtigungen",
|
||||||
|
"reporting": "Berichte",
|
||||||
|
"configuration": "Konfiguration"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "Support",
|
"support": "Support",
|
||||||
@@ -1141,6 +1147,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "Allgemein",
|
||||||
|
"monitoring": "Überwachung",
|
||||||
|
"email": "E-Mail",
|
||||||
|
"integrations": "Integrationen",
|
||||||
|
"data": "Daten"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "Anzeigesprache Zeitzone",
|
"title": "Anzeigesprache Zeitzone",
|
||||||
|
|||||||
+161
-8
@@ -66,9 +66,11 @@
|
|||||||
"charts": {
|
"charts": {
|
||||||
"labels": {
|
"labels": {
|
||||||
"averageResponseTime": "Average response time",
|
"averageResponseTime": "Average response time",
|
||||||
|
"cpuUsage": "CPU usage",
|
||||||
"downtime": "Downtime",
|
"downtime": "Downtime",
|
||||||
"high": "High",
|
"high": "High",
|
||||||
"low": "Low",
|
"low": "Low",
|
||||||
|
"memoryUsage": "Memory usage",
|
||||||
"responseTime": "Response time",
|
"responseTime": "Response time",
|
||||||
"timingPhases": "Timing phases",
|
"timingPhases": "Timing phases",
|
||||||
"totalResponseTime": "Total response time",
|
"totalResponseTime": "Total response time",
|
||||||
@@ -102,7 +104,11 @@
|
|||||||
"idle": "Idle",
|
"idle": "Idle",
|
||||||
"na": "N/A",
|
"na": "N/A",
|
||||||
"resolved": "Resolved",
|
"resolved": "Resolved",
|
||||||
"responseTime": "Response time"
|
"responseTime": "Response time",
|
||||||
|
"state": "State",
|
||||||
|
"uptime": "Uptime",
|
||||||
|
"health": "Health",
|
||||||
|
"restarts": "Restarts"
|
||||||
},
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"autocomplete": {
|
"autocomplete": {
|
||||||
@@ -203,14 +209,22 @@
|
|||||||
"uptime": "Uptime",
|
"uptime": "Uptime",
|
||||||
"pagespeed": "Pagespeed",
|
"pagespeed": "Pagespeed",
|
||||||
"infrastructure": "Infrastructure",
|
"infrastructure": "Infrastructure",
|
||||||
|
"docker": "Docker",
|
||||||
"notifications": "Notifications",
|
"notifications": "Notifications",
|
||||||
"tags": "Tags",
|
"tags": "Tags",
|
||||||
|
"proxies": "Proxies",
|
||||||
"checks": "Checks",
|
"checks": "Checks",
|
||||||
"incidents": "Incidents",
|
"incidents": "Incidents",
|
||||||
"statusPages": "Status pages",
|
"statusPages": "Status pages",
|
||||||
"maintenance": "Maintenance",
|
"maintenance": "Maintenance",
|
||||||
"logs": "Logs",
|
"logs": "Logs",
|
||||||
"settings": "Settings"
|
"settings": "Settings",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "Monitoring",
|
||||||
|
"alerting": "Alerting",
|
||||||
|
"reporting": "Reporting",
|
||||||
|
"configuration": "Configuration"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "Support",
|
"support": "Support",
|
||||||
@@ -244,6 +258,63 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"pages": {
|
"pages": {
|
||||||
|
"proxies": {
|
||||||
|
"header": {
|
||||||
|
"title": "Proxies",
|
||||||
|
"description": "Manage your proxy servers for routing HTTP monitoring traffic."
|
||||||
|
},
|
||||||
|
"fallback": {
|
||||||
|
"title": "No proxies yet",
|
||||||
|
"description": "Route HTTP monitor checks through a proxy server. Once you create a proxy, you can select it on individual monitors or set it as the global default in Settings.",
|
||||||
|
"actionButton": "Create a proxy"
|
||||||
|
},
|
||||||
|
"form": {
|
||||||
|
"name": {
|
||||||
|
"title": "Proxy name",
|
||||||
|
"description": "A friendly name to identify this proxy",
|
||||||
|
"optionName": "Proxy name",
|
||||||
|
"placeholder": "My proxy"
|
||||||
|
},
|
||||||
|
"server": {
|
||||||
|
"title": "Proxy server",
|
||||||
|
"description": "Where the proxy server is reachable. Set the protocol Checkmate uses to connect to it, its hostname or IP address, and the port it listens on.",
|
||||||
|
"option": {
|
||||||
|
"protocol": {
|
||||||
|
"label": "Protocol"
|
||||||
|
},
|
||||||
|
"host": {
|
||||||
|
"label": "Hostname / IP Address",
|
||||||
|
"placeholder": "proxy.example.com"
|
||||||
|
},
|
||||||
|
"port": {
|
||||||
|
"label": "Port"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"title": "Authentication",
|
||||||
|
"description": "Optional. Only needed if the proxy server requires basic authentication.",
|
||||||
|
"option": {
|
||||||
|
"username": {
|
||||||
|
"label": "Username",
|
||||||
|
"placeholder": "Proxy username",
|
||||||
|
"labelSet": "Username is set. Click Reset to change it."
|
||||||
|
},
|
||||||
|
"password": {
|
||||||
|
"label": "Password",
|
||||||
|
"labelSet": "Password is set. Click Reset to change it."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"table": {
|
||||||
|
"headers": {
|
||||||
|
"protocol": "Protocol",
|
||||||
|
"host": "Host",
|
||||||
|
"port": "Port"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"notFound": {
|
"notFound": {
|
||||||
"title": "Oh no! You dropped your sushi!",
|
"title": "Oh no! You dropped your sushi!",
|
||||||
"subtitle": "Either the URL doesn’t exist, or you don’t have access to it."
|
"subtitle": "Either the URL doesn’t exist, or you don’t have access to it."
|
||||||
@@ -581,6 +652,24 @@
|
|||||||
"label": "URL",
|
"label": "URL",
|
||||||
"placeholder": "https://www.google.com"
|
"placeholder": "https://www.google.com"
|
||||||
},
|
},
|
||||||
|
"proxyMode": {
|
||||||
|
"label": "Proxy",
|
||||||
|
"value": {
|
||||||
|
"inheritDirect": "Default (direct connection)",
|
||||||
|
"inheritGlobal": "Default ({{name}})",
|
||||||
|
"none": "Never use a proxy",
|
||||||
|
"custom": "Custom proxy"
|
||||||
|
},
|
||||||
|
"description": {
|
||||||
|
"inheritDirect": "No global proxy is configured, connect directly. If a global proxy is later configured, this monitor will use it.",
|
||||||
|
"inheritGlobal": "Use the global proxy setting",
|
||||||
|
"none": "Always connects directly even if a global proxy is enabled later.",
|
||||||
|
"custom": "Route this monitor's checks through a specific proxy. Overrides global proxy"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"proxy": {
|
||||||
|
"label": "Proxy server"
|
||||||
|
},
|
||||||
"game": {
|
"game": {
|
||||||
"label": "Choose game",
|
"label": "Choose game",
|
||||||
"placeholder": "Select a game"
|
"placeholder": "Select a game"
|
||||||
@@ -624,7 +713,7 @@
|
|||||||
},
|
},
|
||||||
"title": "General settings",
|
"title": "General settings",
|
||||||
"description": {
|
"description": {
|
||||||
"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
|
"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard. Set an optional proxy server to connect through.",
|
||||||
"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
|
"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
|
||||||
"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard.",
|
"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard.",
|
||||||
"docker": "Enter the Docker container name or ID. You can use either the container name (e.g., my-app) or the container ID (full 64-char ID or short ID).",
|
"docker": "Enter the Docker container name or ID. You can use either the container name (e.g., my-app) or the container ID (full 64-char ID or short ID).",
|
||||||
@@ -842,15 +931,56 @@
|
|||||||
"description": "When monitors go down or recover, incidents appear here with timing, monitor details and resolution history."
|
"description": "When monitors go down or recover, incidents appear here with timing, monitor details and resolution history."
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"docker": {
|
||||||
|
"header": {
|
||||||
|
"title": "Docker monitors",
|
||||||
|
"description": "Monitor your Docker hosts and every container running on them."
|
||||||
|
},
|
||||||
|
"fallback": {
|
||||||
|
"title": "No Docker monitors yet",
|
||||||
|
"description": "Add a Docker host to monitor its containers.",
|
||||||
|
"actionButton": "Create a monitor"
|
||||||
|
},
|
||||||
|
"table": {
|
||||||
|
"headers": {
|
||||||
|
"host": "Host",
|
||||||
|
"containers": "Containers"
|
||||||
|
},
|
||||||
|
"containersRunning": "{{running}} of {{total}} running"
|
||||||
|
},
|
||||||
|
"container": {
|
||||||
|
"header": {
|
||||||
|
"title": "Container details",
|
||||||
|
"description": "State, resource usage, and logs for this container."
|
||||||
|
},
|
||||||
|
"tabs": {
|
||||||
|
"overview": "Overview",
|
||||||
|
"logs": "Logs"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"host": {
|
||||||
|
"statBoxes": {
|
||||||
|
"containers": "Containers",
|
||||||
|
"running": "Running",
|
||||||
|
"stopped": "Stopped",
|
||||||
|
"unhealthy": "Unhealthy"
|
||||||
|
},
|
||||||
|
"table": {
|
||||||
|
"headers": {
|
||||||
|
"container": "Containers",
|
||||||
|
"cpu": "CPU",
|
||||||
|
"memory": "Memory"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"infrastructure": {
|
"infrastructure": {
|
||||||
"charts": {
|
"charts": {
|
||||||
"labels": {
|
"labels": {
|
||||||
"cpu": "CPU usage",
|
|
||||||
"disk": "Disk usage",
|
"disk": "Disk usage",
|
||||||
"memory": "Memory usage",
|
|
||||||
"netBytesRecv": "{{name}} - Bytes Received",
|
"netBytesRecv": "{{name}} - Bytes Received",
|
||||||
"netBytesSent": "{{name}} - Bytes Sent",
|
"netBytesSent": "{{name}} - Bytes Sent",
|
||||||
"loopbackOnlyNotice": "Capture is only reporting loopback or container-bridge interfaces (lo, lo0, docker0). This is normal when Capture runs inside a container that can only see its own network namespace — run Capture directly on the host to see real network activity.",
|
"loopbackOnlyNotice": "Capture is only seeing container network interfaces, and none of them are carrying real traffic. This is normal when Capture runs inside a container that can only observe its own network namespace — interfaces with host-like names (eth0, ens3) are the container's virtual interfaces, not the host's. Run Capture directly on the host to see real network activity.",
|
||||||
"temp": "CPU temperature"
|
"temp": "CPU temperature"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1257,6 +1387,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "General",
|
||||||
|
"monitoring": "Monitoring",
|
||||||
|
"email": "Email",
|
||||||
|
"integrations": "Integrations",
|
||||||
|
"data": "Data"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "Display timezone",
|
"title": "Display timezone",
|
||||||
@@ -1286,6 +1423,22 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"globalProxy": {
|
||||||
|
"title": "Global proxy",
|
||||||
|
"description": "Route monitoring checks through a proxy by default. Applies to all HTTP monitors whose proxy setting is \"Default\"; monitors set to \"Never use a proxy\" or a custom proxy are unaffected.",
|
||||||
|
"option": {
|
||||||
|
"enabled": {
|
||||||
|
"label": "Use global proxy"
|
||||||
|
},
|
||||||
|
"proxy": {
|
||||||
|
"label": "Choose a global proxy"
|
||||||
|
},
|
||||||
|
"empty": {
|
||||||
|
"text": "No proxies configured yet.",
|
||||||
|
"link": "Create one first"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"pagespeed": {
|
"pagespeed": {
|
||||||
"title": "Google PageSpeed API key",
|
"title": "Google PageSpeed API key",
|
||||||
"description": "Enter your Google PageSpeed API key to enable Google PageSpeed monitoring. Click Reset to update the key.",
|
"description": "Enter your Google PageSpeed API key to enable Google PageSpeed monitoring. Click Reset to update the key.",
|
||||||
@@ -1298,7 +1451,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"url": {
|
"url": {
|
||||||
"title": "Monitor IP/URL on Status Page",
|
"title": "Monitor IP/URL on status page",
|
||||||
"description": "Display the IP address or URL of monitor on the public Status page. If it's disabled, only the monitor name will be shown to protect sensitive information.",
|
"description": "Display the IP address or URL of monitor on the public Status page. If it's disabled, only the monitor name will be shown to protect sensitive information.",
|
||||||
"option": {
|
"option": {
|
||||||
"showURL": {
|
"showURL": {
|
||||||
@@ -1330,7 +1483,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"thresholds": {
|
"thresholds": {
|
||||||
"title": "Global Thresholds",
|
"title": "Global thresholds",
|
||||||
"description": "Set global CPU, Memory, Disk, and Temperature thresholds for infrastructure monitoring. These apply to all hardware monitors unless overridden.",
|
"description": "Set global CPU, Memory, Disk, and Temperature thresholds for infrastructure monitoring. These apply to all hardware monitors unless overridden.",
|
||||||
"option": {
|
"option": {
|
||||||
"cpu": {
|
"cpu": {
|
||||||
|
|||||||
@@ -181,7 +181,13 @@
|
|||||||
"statusPages": "Páginas de estado",
|
"statusPages": "Páginas de estado",
|
||||||
"maintenance": "Mantenimiento",
|
"maintenance": "Mantenimiento",
|
||||||
"logs": "Registros",
|
"logs": "Registros",
|
||||||
"settings": "Configuración"
|
"settings": "Configuración",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "Monitorización",
|
||||||
|
"alerting": "Alertas",
|
||||||
|
"reporting": "Informes",
|
||||||
|
"configuration": "Configuración"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "Soporte",
|
"support": "Soporte",
|
||||||
@@ -1141,6 +1147,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "General",
|
||||||
|
"monitoring": "Monitorización",
|
||||||
|
"email": "Correo electrónico",
|
||||||
|
"integrations": "Integraciones",
|
||||||
|
"data": "Datos"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "Zona horaria de visualización",
|
"title": "Zona horaria de visualización",
|
||||||
|
|||||||
@@ -181,7 +181,13 @@
|
|||||||
"statusPages": "Tilasivut",
|
"statusPages": "Tilasivut",
|
||||||
"maintenance": "Huolto",
|
"maintenance": "Huolto",
|
||||||
"logs": "Lokit",
|
"logs": "Lokit",
|
||||||
"settings": "Asetukset"
|
"settings": "Asetukset",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "Valvonta",
|
||||||
|
"alerting": "Hälytykset",
|
||||||
|
"reporting": "Raportointi",
|
||||||
|
"configuration": "Määritykset"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "Tuki",
|
"support": "Tuki",
|
||||||
@@ -1141,6 +1147,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "Yleiset",
|
||||||
|
"monitoring": "Valvonta",
|
||||||
|
"email": "Sähköposti",
|
||||||
|
"integrations": "Integraatiot",
|
||||||
|
"data": "Tiedot"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "Näytettävä aikavyöhyke",
|
"title": "Näytettävä aikavyöhyke",
|
||||||
|
|||||||
@@ -181,7 +181,13 @@
|
|||||||
"statusPages": "Pages de statut",
|
"statusPages": "Pages de statut",
|
||||||
"maintenance": "Maintenance",
|
"maintenance": "Maintenance",
|
||||||
"logs": "Journaux",
|
"logs": "Journaux",
|
||||||
"settings": "Paramètres"
|
"settings": "Paramètres",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "Surveillance",
|
||||||
|
"alerting": "Alertes",
|
||||||
|
"reporting": "Rapports",
|
||||||
|
"configuration": "Configuration"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "Support",
|
"support": "Support",
|
||||||
@@ -1141,6 +1147,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "Général",
|
||||||
|
"monitoring": "Surveillance",
|
||||||
|
"email": "E-mail",
|
||||||
|
"integrations": "Intégrations",
|
||||||
|
"data": "Données"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "Fuseau horaire d'affichage",
|
"title": "Fuseau horaire d'affichage",
|
||||||
|
|||||||
@@ -193,7 +193,13 @@
|
|||||||
"statusPages": "Pagine di stato",
|
"statusPages": "Pagine di stato",
|
||||||
"maintenance": "Manutenzione",
|
"maintenance": "Manutenzione",
|
||||||
"logs": "Log",
|
"logs": "Log",
|
||||||
"settings": "Impostazioni"
|
"settings": "Impostazioni",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "Monitoraggio",
|
||||||
|
"alerting": "Avvisi",
|
||||||
|
"reporting": "Report",
|
||||||
|
"configuration": "Configurazione"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "Supporto",
|
"support": "Supporto",
|
||||||
@@ -1237,6 +1243,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "Generale",
|
||||||
|
"monitoring": "Monitoraggio",
|
||||||
|
"email": "Email",
|
||||||
|
"integrations": "Integrazioni",
|
||||||
|
"data": "Dati"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "Fuso orario di visualizzazione",
|
"title": "Fuso orario di visualizzazione",
|
||||||
|
|||||||
@@ -181,7 +181,13 @@
|
|||||||
"statusPages": "ステータスページ",
|
"statusPages": "ステータスページ",
|
||||||
"maintenance": "メンテナンス",
|
"maintenance": "メンテナンス",
|
||||||
"logs": "ログ",
|
"logs": "ログ",
|
||||||
"settings": "設定"
|
"settings": "設定",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "監視",
|
||||||
|
"alerting": "アラート",
|
||||||
|
"reporting": "レポート",
|
||||||
|
"configuration": "設定"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "サポート",
|
"support": "サポート",
|
||||||
@@ -1141,6 +1147,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "一般",
|
||||||
|
"monitoring": "監視",
|
||||||
|
"email": "メール",
|
||||||
|
"integrations": "連携",
|
||||||
|
"data": "データ"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "表示タイムゾーン",
|
"title": "表示タイムゾーン",
|
||||||
|
|||||||
@@ -214,7 +214,13 @@
|
|||||||
"settings": "Ustawienia",
|
"settings": "Ustawienia",
|
||||||
"statusPages": "Strony statusu",
|
"statusPages": "Strony statusu",
|
||||||
"tags": "Tagi",
|
"tags": "Tagi",
|
||||||
"uptime": "Czas działania"
|
"uptime": "Czas działania",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "Monitorowanie",
|
||||||
|
"alerting": "Alerty",
|
||||||
|
"reporting": "Raporty",
|
||||||
|
"configuration": "Konfiguracja"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"starPrompt": {
|
"starPrompt": {
|
||||||
"description": "Zobacz najnowsze wydania i pomóż rozwijać społeczność na GitHub",
|
"description": "Zobacz najnowsze wydania i pomóż rozwijać społeczność na GitHub",
|
||||||
@@ -1207,6 +1213,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "Ogólne",
|
||||||
|
"monitoring": "Monitorowanie",
|
||||||
|
"email": "E-mail",
|
||||||
|
"integrations": "Integracje",
|
||||||
|
"data": "Dane"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"about": {
|
"about": {
|
||||||
"developedBy": "Opracowane przez Bluewave Labs",
|
"developedBy": "Opracowane przez Bluewave Labs",
|
||||||
|
|||||||
@@ -181,7 +181,13 @@
|
|||||||
"statusPages": "Pagina de status",
|
"statusPages": "Pagina de status",
|
||||||
"maintenance": "Manutenção",
|
"maintenance": "Manutenção",
|
||||||
"logs": "Registros",
|
"logs": "Registros",
|
||||||
"settings": "Configurações"
|
"settings": "Configurações",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "Monitoramento",
|
||||||
|
"alerting": "Alertas",
|
||||||
|
"reporting": "Relatórios",
|
||||||
|
"configuration": "Configuração"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "Suporte",
|
"support": "Suporte",
|
||||||
@@ -1141,6 +1147,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "Geral",
|
||||||
|
"monitoring": "Monitoramento",
|
||||||
|
"email": "E-mail",
|
||||||
|
"integrations": "Integrações",
|
||||||
|
"data": "Dados"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "Fuso horário de exibição",
|
"title": "Fuso horário de exibição",
|
||||||
|
|||||||
@@ -181,7 +181,13 @@
|
|||||||
"statusPages": "Страницы статуса",
|
"statusPages": "Страницы статуса",
|
||||||
"maintenance": "Обслуживание",
|
"maintenance": "Обслуживание",
|
||||||
"logs": "Логи",
|
"logs": "Логи",
|
||||||
"settings": "Настройки"
|
"settings": "Настройки",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "Мониторинг",
|
||||||
|
"alerting": "Оповещения",
|
||||||
|
"reporting": "Отчёты",
|
||||||
|
"configuration": "Конфигурация"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "Поддержка",
|
"support": "Поддержка",
|
||||||
@@ -1141,6 +1147,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "Общие",
|
||||||
|
"monitoring": "Мониторинг",
|
||||||
|
"email": "Электронная почта",
|
||||||
|
"integrations": "Интеграции",
|
||||||
|
"data": "Данные"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "Часовой пояс отображения",
|
"title": "Часовой пояс отображения",
|
||||||
|
|||||||
@@ -181,7 +181,13 @@
|
|||||||
"statusPages": "หน้าสถานะ",
|
"statusPages": "หน้าสถานะ",
|
||||||
"maintenance": "การบำรุงรักษา",
|
"maintenance": "การบำรุงรักษา",
|
||||||
"logs": "บันทึก",
|
"logs": "บันทึก",
|
||||||
"settings": "การตั้งค่า"
|
"settings": "การตั้งค่า",
|
||||||
|
"groups": {
|
||||||
|
"monitoring": "การตรวจสอบ",
|
||||||
|
"alerting": "การแจ้งเตือน",
|
||||||
|
"reporting": "รายงาน",
|
||||||
|
"configuration": "การกำหนดค่า"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"bottomMenu": {
|
"bottomMenu": {
|
||||||
"support": "การสนับสนุน",
|
"support": "การสนับสนุน",
|
||||||
@@ -1141,6 +1147,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
|
"tabs": {
|
||||||
|
"general": "ทั่วไป",
|
||||||
|
"monitoring": "การตรวจสอบ",
|
||||||
|
"email": "อีเมล",
|
||||||
|
"integrations": "การเชื่อมต่อ",
|
||||||
|
"data": "ข้อมูล"
|
||||||
|
},
|
||||||
"form": {
|
"form": {
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"title": "เขตเวลาที่แสดง",
|
"title": "เขตเวลาที่แสดง",
|
||||||
|
|||||||
Loaded 100 of 187 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user