mirror of
https://github.com/gethomepage/homepage.git
synced 2026-09-26 05:51:17 -07:00
Compare commits
19
Commits
v2.1.0
..
2811ad6553
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2811ad6553 | ||
|
|
a17763ca9f | ||
|
|
bd39fb48b9 | ||
|
|
f2dc80e39e | ||
|
|
7d48b7ea78 | ||
|
|
4c361422ca | ||
|
|
7c26cf6d97 | ||
|
|
f0bd255adb | ||
|
|
728c6fbe18 | ||
|
|
6a96289717 | ||
|
|
fa47a2d86c | ||
|
|
cc22d04429 | ||
|
|
a414f376b9 | ||
|
|
bdd77342d8 | ||
|
|
63d2172ef7 | ||
|
|
85e4e439bc | ||
|
|
36aa241689 | ||
|
|
0933ba015a | ||
|
|
c57117daae |
@@ -10,6 +10,7 @@ version-resolver:
|
|||||||
- 'breaking-change'
|
- 'breaking-change'
|
||||||
minor:
|
minor:
|
||||||
labels:
|
labels:
|
||||||
|
- 'minor'
|
||||||
- 'enhancement'
|
- 'enhancement'
|
||||||
- 'feature'
|
- 'feature'
|
||||||
patch:
|
patch:
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ on:
|
|||||||
]
|
]
|
||||||
branches: [ dev ]
|
branches: [ dev ]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
synchronize-with-crowdin:
|
synchronize-with-crowdin:
|
||||||
name: Crowdin Sync
|
name: Crowdin Sync
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ on:
|
|||||||
env:
|
env:
|
||||||
IMAGE_NAME: ${{ github.repository }}
|
IMAGE_NAME: ${{ github.repository }}
|
||||||
|
|
||||||
|
permissions: {}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
|
|
||||||
@@ -27,7 +29,6 @@ jobs:
|
|||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
packages: write
|
packages: write
|
||||||
id-token: write
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
|
|||||||
@@ -10,8 +10,6 @@ on:
|
|||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
pages: write
|
|
||||||
id-token: write
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
@@ -33,6 +31,10 @@ jobs:
|
|||||||
name: Build & Deploy Docs
|
name: Build & Deploy Docs
|
||||||
if: github.repository == 'gethomepage/homepage' && github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
|
if: github.repository == 'gethomepage/homepage' && github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
pages: write
|
||||||
|
id-token: write
|
||||||
environment:
|
environment:
|
||||||
name: github-pages
|
name: github-pages
|
||||||
url: ${{ steps.deployment.outputs.page_url }}
|
url: ${{ steps.deployment.outputs.page_url }}
|
||||||
|
|||||||
@@ -6,15 +6,15 @@ on:
|
|||||||
discussion:
|
discussion:
|
||||||
types: [labeled]
|
types: [labeled]
|
||||||
|
|
||||||
permissions:
|
permissions: {}
|
||||||
discussions: write
|
|
||||||
issues: write
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
close-needs-discussion:
|
close-needs-discussion:
|
||||||
name: Issues Need Discussion
|
name: Issues Need Discussion
|
||||||
if: github.event_name == 'issues' && github.event.label.name == 'needs-discussion'
|
if: github.event_name == 'issues' && github.event.label.name == 'needs-discussion'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
issues: write
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||||
with:
|
with:
|
||||||
@@ -49,6 +49,8 @@ jobs:
|
|||||||
name: Discussions Need Information
|
name: Discussions Need Information
|
||||||
if: github.event_name == 'discussion' && github.event.label.name == 'needs-information'
|
if: github.event_name == 'discussion' && github.event.label.name == 'needs-information'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
discussions: write
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
merge_group:
|
merge_group:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint:
|
lint:
|
||||||
name: Linting Checks
|
name: Linting Checks
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ name: PR Quality
|
|||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
issues: read
|
|
||||||
pull-requests: write
|
pull-requests: write
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ on:
|
|||||||
types: [labeled]
|
types: [labeled]
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
issues: write
|
|
||||||
pull-requests: write
|
pull-requests: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|||||||
@@ -5,10 +5,7 @@ on:
|
|||||||
- cron: '0 3 * * *'
|
- cron: '0 3 * * *'
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
permissions:
|
permissions: {}
|
||||||
issues: write
|
|
||||||
pull-requests: write
|
|
||||||
discussions: write
|
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: lock
|
group: lock
|
||||||
@@ -17,6 +14,9 @@ jobs:
|
|||||||
stale:
|
stale:
|
||||||
name: 'Stale'
|
name: 'Stale'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
issues: write
|
||||||
|
pull-requests: write
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10
|
- uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10
|
||||||
with:
|
with:
|
||||||
@@ -31,6 +31,10 @@ jobs:
|
|||||||
lock-threads:
|
lock-threads:
|
||||||
name: 'Lock Old Threads'
|
name: 'Lock Old Threads'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
discussions: write
|
||||||
|
issues: write
|
||||||
|
pull-requests: write
|
||||||
steps:
|
steps:
|
||||||
- uses: dessant/lock-threads@89ae32b08ed1a541efecbab17912962a5e38981c # v6.0.2
|
- uses: dessant/lock-threads@89ae32b08ed1a541efecbab17912962a5e38981c # v6.0.2
|
||||||
with:
|
with:
|
||||||
@@ -56,6 +60,8 @@ jobs:
|
|||||||
close-answered-discussions:
|
close-answered-discussions:
|
||||||
name: 'Close Answered Discussions'
|
name: 'Close Answered Discussions'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
discussions: write
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||||
with:
|
with:
|
||||||
@@ -112,6 +118,8 @@ jobs:
|
|||||||
close-outdated-discussions:
|
close-outdated-discussions:
|
||||||
name: 'Close Outdated Discussions'
|
name: 'Close Outdated Discussions'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
discussions: write
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||||
with:
|
with:
|
||||||
@@ -203,6 +211,8 @@ jobs:
|
|||||||
close-unsupported-feature-requests:
|
close-unsupported-feature-requests:
|
||||||
name: 'Close Unsupported Feature Requests'
|
name: 'Close Unsupported Feature Requests'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
discussions: write
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ on:
|
|||||||
push:
|
push:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
vitest:
|
vitest:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|||||||
@@ -49,6 +49,23 @@ environment:
|
|||||||
HOMEPAGE_MCP_TOKEN: "generate-with-openssl-rand-base64-32"
|
HOMEPAGE_MCP_TOKEN: "generate-with-openssl-rand-base64-32"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Connecting Claude Desktop
|
||||||
|
|
||||||
|
Claude Desktop can use [`mcp-remote`](https://www.npmjs.com/package/mcp-remote) to communicate with the homepage MCP endpoint in `claude_desktop_config.json`:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"mcpServers": {
|
||||||
|
"homepage": {
|
||||||
|
"command": "npx",
|
||||||
|
"args": ["-y", "mcp-remote", "http://localhost:3000/api/mcp", "--header", "X-Homepage-MCP-Token: your-token"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
The **Add custom connector** option will not work: remote connectors authenticate with OAuth and cannot supply `HOMEPAGE_MCP_TOKEN`.
|
||||||
|
|
||||||
## Read-only by default
|
## Read-only by default
|
||||||
|
|
||||||
The MCP endpoint exposes tools for reading and validating supported Homepage config files. File writes are disabled unless you opt in with:
|
The MCP endpoint exposes tools for reading and validating supported Homepage config files. File writes are disabled unless you opt in with:
|
||||||
|
|||||||
@@ -85,6 +85,7 @@ To ensure cohesiveness of various widgets, the following should be used as a gui
|
|||||||
- Note that we reserve the right to decline widgets for projects that are very young (eg < ~1y) or those with a small reach (eg low GitHub stars). Again, this is in an effort to keep overall widget maintenance under control.
|
- Note that we reserve the right to decline widgets for projects that are very young (eg < ~1y) or those with a small reach (eg low GitHub stars). Again, this is in an effort to keep overall widget maintenance under control.
|
||||||
- Widgets should be only one row of blocks
|
- Widgets should be only one row of blocks
|
||||||
- Widgets should be no more than 4 blocks wide and generally conform to the styling / design choices of other widgets
|
- Widgets should be no more than 4 blocks wide and generally conform to the styling / design choices of other widgets
|
||||||
|
- Use `withWidgetFields(service, defaultFields)` from `utils/widget-fields` to apply default fields and cap configured fields without mutating the service. The helper limits widgets to 4 fields.
|
||||||
- Minimize the number of API calls
|
- Minimize the number of API calls
|
||||||
- Avoid the use of custom proxy unless absolutely necessary
|
- Avoid the use of custom proxy unless absolutely necessary
|
||||||
- Widgets should be 'read-only', as in they should not make write changes using the relevant tool's API. Homepage widgets are designed to surface information, not to be a (usually worse) replacement for the tool itself.
|
- Widgets should be 'read-only', as in they should not make write changes using the relevant tool's API. Homepage widgets are designed to surface information, not to be a (usually worse) replacement for the tool itself.
|
||||||
|
|||||||
+5
-5
@@ -15,7 +15,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@headlessui/react": "^2.2.10",
|
"@headlessui/react": "^2.2.10",
|
||||||
"@kubernetes/client-node": "^1.4.0",
|
"@kubernetes/client-node": "^2.0.0",
|
||||||
"classnames": "^2.5.1",
|
"classnames": "^2.5.1",
|
||||||
"compare-versions": "^6.1.1",
|
"compare-versions": "^6.1.1",
|
||||||
"dockerode": "^5.0.0",
|
"dockerode": "^5.0.0",
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
"gamedig": "^5.3.3",
|
"gamedig": "^5.3.3",
|
||||||
"i18next": "^26.3.6",
|
"i18next": "^26.3.6",
|
||||||
"ical.js": "^2.2.1",
|
"ical.js": "^2.2.1",
|
||||||
"js-yaml": "^4.3.1",
|
"js-yaml": "^5.3.0",
|
||||||
"json-rpc-2.0": "^1.7.1",
|
"json-rpc-2.0": "^1.7.1",
|
||||||
"luxon": "^3.7.2",
|
"luxon": "^3.7.2",
|
||||||
"memory-cache": "^0.2.0",
|
"memory-cache": "^0.2.0",
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
"react-i18next": "^17.0.11",
|
"react-i18next": "^17.0.11",
|
||||||
"react-icons": "^5.6.0",
|
"react-icons": "^5.6.0",
|
||||||
"recharts": "^3.1.2",
|
"recharts": "^3.1.2",
|
||||||
"swr": "^2.4.2",
|
"swr": "^2.5.1",
|
||||||
"systeminformation": "^5.33.1",
|
"systeminformation": "^5.33.1",
|
||||||
"tough-cookie": "^6.0.2",
|
"tough-cookie": "^6.0.2",
|
||||||
"urbackup-server-api": "^0.92.2",
|
"urbackup-server-api": "^0.92.2",
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
"@eslint/js": "^9.39.4",
|
"@eslint/js": "^9.39.4",
|
||||||
"@tailwindcss/forms": "^0.5.11",
|
"@tailwindcss/forms": "^0.5.11",
|
||||||
"@tailwindcss/postcss": "^4.3.3",
|
"@tailwindcss/postcss": "^4.3.3",
|
||||||
"@testing-library/jest-dom": "^7.0.0",
|
"@testing-library/jest-dom": "^7.0.1",
|
||||||
"@testing-library/react": "^16.3.0",
|
"@testing-library/react": "^16.3.0",
|
||||||
"@vitest/coverage-v8": "^4.1.10",
|
"@vitest/coverage-v8": "^4.1.10",
|
||||||
"eslint": "^9.25.1",
|
"eslint": "^9.25.1",
|
||||||
@@ -63,7 +63,7 @@
|
|||||||
"eslint-plugin-jsx-a11y": "^6.10.2",
|
"eslint-plugin-jsx-a11y": "^6.10.2",
|
||||||
"eslint-plugin-prettier": "^5.5.6",
|
"eslint-plugin-prettier": "^5.5.6",
|
||||||
"eslint-plugin-react": "^7.37.4",
|
"eslint-plugin-react": "^7.37.4",
|
||||||
"eslint-plugin-react-hooks": "^5.2.0",
|
"eslint-plugin-react-hooks": "^7.1.1",
|
||||||
"jsdom": "^30.0.1",
|
"jsdom": "^30.0.1",
|
||||||
"postcss": "^8.5.26",
|
"postcss": "^8.5.26",
|
||||||
"prettier": "^3.8.4",
|
"prettier": "^3.8.4",
|
||||||
|
|||||||
Generated
+504
-294
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10"><circle cx="5" cy="5" r="4"/></svg>
|
||||||
|
After Width: | Height: | Size: 96 B |
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Wag asseblief"
|
"wait": "Wag asseblief"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Soek…"
|
"placeholder": "Soek…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "SVE",
|
"cpu": "SVE",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "الرجاء الإنتظار"
|
"wait": "الرجاء الإنتظار"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "بحث …"
|
"placeholder": "بحث …",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "المعالج",
|
"cpu": "المعالج",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Моля изчакайте"
|
"wait": "Моля изчакайте"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Търсене…"
|
"placeholder": "Търсене…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "Процесор",
|
"cpu": "Процесор",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Si us plau, espereu"
|
"wait": "Si us plau, espereu"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Cerca…"
|
"placeholder": "Cerca…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Počkejte prosím"
|
"wait": "Počkejte prosím"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Hledat…"
|
"placeholder": "Hledat…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "Využití procesoru",
|
"cpu": "Využití procesoru",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Vent venligst"
|
"wait": "Vent venligst"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Søg…"
|
"placeholder": "Søg…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Bitte warten"
|
"wait": "Bitte warten"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Suche…"
|
"placeholder": "Suche…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Παρακαλώ περιμένετε"
|
"wait": "Παρακαλώ περιμένετε"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Αναζήτηση…"
|
"placeholder": "Αναζήτηση…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "Επεξεργαστής",
|
"cpu": "Επεξεργαστής",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Please wait"
|
"wait": "Please wait"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Search…"
|
"placeholder": "Search…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Bonvolu atendi"
|
"wait": "Bonvolu atendi"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Serĉi…"
|
"placeholder": "Serĉi…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "Ĉefprocesoro",
|
"cpu": "Ĉefprocesoro",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Espera, por favor"
|
"wait": "Espera, por favor"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Buscar…"
|
"placeholder": "Buscar…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
@@ -472,7 +474,7 @@
|
|||||||
"users": "Usuarios",
|
"users": "Usuarios",
|
||||||
"loginsLast24H": "Inicios de sesión (24h)",
|
"loginsLast24H": "Inicios de sesión (24h)",
|
||||||
"failedLoginsLast24H": "Inicios de sesión fallidos (24h)",
|
"failedLoginsLast24H": "Inicios de sesión fallidos (24h)",
|
||||||
"authorizationsLast24H": "Auths (24h)"
|
"authorizationsLast24H": "Autenticaciones (24 h)"
|
||||||
},
|
},
|
||||||
"proxmox": {
|
"proxmox": {
|
||||||
"mem": "MEM",
|
"mem": "MEM",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Itxaron mesedez"
|
"wait": "Itxaron mesedez"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Bilatu…"
|
"placeholder": "Bilatu…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Odota, ole hyvä"
|
"wait": "Odota, ole hyvä"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Hae…"
|
"placeholder": "Hae…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Veuillez patienter"
|
"wait": "Veuillez patienter"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Recherche…"
|
"placeholder": "Recherche…",
|
||||||
|
"provider": "Moteur de recherche : {{name}}",
|
||||||
|
"select_provider": "Sélectionnez un moteur de recherche"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "המתן בבקשה"
|
"wait": "המתן בבקשה"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "חיפוש…"
|
"placeholder": "חיפוש…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "מעבד",
|
"cpu": "מעבד",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Please wait"
|
"wait": "Please wait"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Search…"
|
"placeholder": "Search…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Pričekaj"
|
"wait": "Pričekaj"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Traži …"
|
"placeholder": "Traži …",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Kérjük várjon"
|
"wait": "Kérjük várjon"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Keresés…"
|
"placeholder": "Keresés…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "Processzor",
|
"cpu": "Processzor",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Harap tunggu"
|
"wait": "Harap tunggu"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Telusuri…"
|
"placeholder": "Telusuri…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Attendi per favore"
|
"wait": "Attendi per favore"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Cerca…"
|
"placeholder": "Cerca…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "お待ちください"
|
"wait": "お待ちください"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "検索…"
|
"placeholder": "検索…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "잠시만 기다리세요"
|
"wait": "잠시만 기다리세요"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "검색…"
|
"placeholder": "검색…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
@@ -472,7 +474,7 @@
|
|||||||
"users": "사용자",
|
"users": "사용자",
|
||||||
"loginsLast24H": "로그인 (24시간)",
|
"loginsLast24H": "로그인 (24시간)",
|
||||||
"failedLoginsLast24H": "실패한 로그인 (24시간)",
|
"failedLoginsLast24H": "실패한 로그인 (24시간)",
|
||||||
"authorizationsLast24H": "Auths (24h)"
|
"authorizationsLast24H": "인증(24시간)"
|
||||||
},
|
},
|
||||||
"proxmox": {
|
"proxmox": {
|
||||||
"mem": "메모리",
|
"mem": "메모리",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Lūdzu, uzgaidiet"
|
"wait": "Lūdzu, uzgaidiet"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Meklēt…"
|
"placeholder": "Meklēt…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Sila tunggu"
|
"wait": "Sila tunggu"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Carian…"
|
"placeholder": "Carian…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Even geduld"
|
"wait": "Even geduld"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Zoeken…"
|
"placeholder": "Zoeken…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Vennligst vent"
|
"wait": "Vennligst vent"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Søk…"
|
"placeholder": "Søk…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Proszę czekać"
|
"wait": "Proszę czekać"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Szukaj…"
|
"placeholder": "Szukaj…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "Procesor",
|
"cpu": "Procesor",
|
||||||
@@ -472,7 +474,7 @@
|
|||||||
"users": "Użytkownicy",
|
"users": "Użytkownicy",
|
||||||
"loginsLast24H": "Logowania (24h)",
|
"loginsLast24H": "Logowania (24h)",
|
||||||
"failedLoginsLast24H": "Nieudane logowania (24h)",
|
"failedLoginsLast24H": "Nieudane logowania (24h)",
|
||||||
"authorizationsLast24H": "Auths (24h)"
|
"authorizationsLast24H": "Uwierzytelnienia (24h)"
|
||||||
},
|
},
|
||||||
"proxmox": {
|
"proxmox": {
|
||||||
"mem": "RAM",
|
"mem": "RAM",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Por favor aguarde"
|
"wait": "Por favor aguarde"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Pesquisar…"
|
"placeholder": "Pesquisar…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Por favor, aguarde"
|
"wait": "Por favor, aguarde"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Pesquisar…"
|
"placeholder": "Pesquisar…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Va rugăm așteptați"
|
"wait": "Va rugăm așteptați"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Caută…"
|
"placeholder": "Caută…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "Procesor",
|
"cpu": "Procesor",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Пожалуйста, подождите"
|
"wait": "Пожалуйста, подождите"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Поиск…"
|
"placeholder": "Поиск…",
|
||||||
|
"provider": "Поисковая система: {{name}}",
|
||||||
|
"select_provider": "Выберите поисковую систему"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "ЦП",
|
"cpu": "ЦП",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Počkajte prosím"
|
"wait": "Počkajte prosím"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Hľadať…"
|
"placeholder": "Hľadať…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Prosimo počakajte"
|
"wait": "Prosimo počakajte"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Iskanje…"
|
"placeholder": "Iskanje…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Молим сачекајте"
|
"wait": "Молим сачекајте"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Претражи…"
|
"placeholder": "Претражи…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "Процесор",
|
"cpu": "Процесор",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Vänligen vänta"
|
"wait": "Vänligen vänta"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Sök…"
|
"placeholder": "Sök…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "దయచేసి వేచి ఉండండి"
|
"wait": "దయచేసి వేచి ఉండండి"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "వెతకండి…"
|
"placeholder": "వెతకండి…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "సీపియూ",
|
"cpu": "సీపియూ",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "โปรดรอ"
|
"wait": "โปรดรอ"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "ค้นหา…"
|
"placeholder": "ค้นหา…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "ซีพียู",
|
"cpu": "ซีพียู",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Lütfen bekleyin"
|
"wait": "Lütfen bekleyin"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Ara…"
|
"placeholder": "Ara…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "İşlemci",
|
"cpu": "İşlemci",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Будь ласка, зачекайте"
|
"wait": "Будь ласка, зачекайте"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Пошук…"
|
"placeholder": "Пошук…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "ЦП",
|
"cpu": "ЦП",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "Vui lòng chờ"
|
"wait": "Vui lòng chờ"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "Tìm kiếm…"
|
"placeholder": "Tìm kiếm…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "請稍後"
|
"wait": "請稍後"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "搜索緊…"
|
"placeholder": "搜索緊…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "请稍候"
|
"wait": "请稍候"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "搜索…"
|
"placeholder": "搜索…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -39,7 +39,9 @@
|
|||||||
"wait": "請稍候"
|
"wait": "請稍候"
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
"placeholder": "搜尋…"
|
"placeholder": "搜尋…",
|
||||||
|
"provider": "Search engine: {{name}}",
|
||||||
|
"select_provider": "Select search engine"
|
||||||
},
|
},
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": "CPU",
|
"cpu": "CPU",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// @vitest-environment jsdom
|
// @vitest-environment jsdom
|
||||||
|
|
||||||
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
|
import { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
|
||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
import { ColorContext } from "utils/contexts/color";
|
import { ColorContext } from "utils/contexts/color";
|
||||||
@@ -25,6 +25,7 @@ const {
|
|||||||
throwIn: null,
|
throwIn: null,
|
||||||
validateData: [],
|
validateData: [],
|
||||||
hashData: null,
|
hashData: null,
|
||||||
|
hashConfig: null,
|
||||||
mutateHash: vi.fn(),
|
mutateHash: vi.fn(),
|
||||||
servicesData: [],
|
servicesData: [],
|
||||||
bookmarksData: [],
|
bookmarksData: [],
|
||||||
@@ -59,9 +60,12 @@ const {
|
|||||||
const serverSideTranslations = vi.fn(async (language) => ({ _translations: language }));
|
const serverSideTranslations = vi.fn(async (language) => ({ _translations: language }));
|
||||||
const logger = { error: vi.fn() };
|
const logger = { error: vi.fn() };
|
||||||
|
|
||||||
const useSWR = vi.fn((key) => {
|
const useSWR = vi.fn((key, config) => {
|
||||||
if (key === "/api/validate") return { data: state.validateData };
|
if (key === "/api/validate") return { data: state.validateData };
|
||||||
if (key === "/api/hash") return { data: state.hashData, mutate: state.mutateHash };
|
if (key === "/api/hash") {
|
||||||
|
state.hashConfig = config;
|
||||||
|
return { data: state.hashData, mutate: state.mutateHash };
|
||||||
|
}
|
||||||
if (key === "/api/services") return { data: state.servicesData };
|
if (key === "/api/services") return { data: state.servicesData };
|
||||||
if (key === "/api/bookmarks") return { data: state.bookmarksData };
|
if (key === "/api/bookmarks") return { data: state.bookmarksData };
|
||||||
if (key === "/api/widgets") return { data: state.widgetsData };
|
if (key === "/api/widgets") return { data: state.widgetsData };
|
||||||
@@ -172,6 +176,7 @@ describe("pages/index getStaticProps", () => {
|
|||||||
state.throwIn = null;
|
state.throwIn = null;
|
||||||
state.validateData = [];
|
state.validateData = [];
|
||||||
state.hashData = null;
|
state.hashData = null;
|
||||||
|
state.hashConfig = null;
|
||||||
state.servicesData = [];
|
state.servicesData = [];
|
||||||
state.bookmarksData = [];
|
state.bookmarksData = [];
|
||||||
state.widgetsData = [];
|
state.widgetsData = [];
|
||||||
@@ -351,6 +356,7 @@ describe("pages/index Index routing + SWR branches", () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await renderIndex({ initialSettings: { title: "Homepage", layout: {} }, settings: { layout: {} } });
|
await renderIndex({ initialSettings: { title: "Homepage", layout: {} }, settings: { layout: {} } });
|
||||||
|
act(() => state.hashConfig.onSuccess(state.hashData));
|
||||||
|
|
||||||
await waitFor(() => {
|
await waitFor(() => {
|
||||||
expect(fetchSpy).toHaveBeenCalledWith("/api/revalidate");
|
expect(fetchSpy).toHaveBeenCalledWith("/api/revalidate");
|
||||||
@@ -379,11 +385,24 @@ describe("pages/index Index routing + SWR branches", () => {
|
|||||||
localStorage.removeItem("hash");
|
localStorage.removeItem("hash");
|
||||||
|
|
||||||
await renderIndex({ initialSettings: { title: "Homepage", layout: {} }, settings: { layout: {} } });
|
await renderIndex({ initialSettings: { title: "Homepage", layout: {} }, settings: { layout: {} } });
|
||||||
|
act(() => state.hashConfig.onSuccess(state.hashData));
|
||||||
|
|
||||||
await waitFor(() => {
|
await waitFor(() => {
|
||||||
expect(localStorage.getItem("hash")).toBe("first-hash");
|
expect(localStorage.getItem("hash")).toBe("first-hash");
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("ignores a hash response without a hash", async () => {
|
||||||
|
state.validateData = [];
|
||||||
|
localStorage.setItem("hash", "old-hash");
|
||||||
|
|
||||||
|
await renderIndex({ initialSettings: { title: "Homepage", layout: {} }, settings: { layout: {} } });
|
||||||
|
|
||||||
|
expect(() => act(() => state.hashConfig.onSuccess(null))).not.toThrow();
|
||||||
|
expect(() => act(() => state.hashConfig.onSuccess({}))).not.toThrow();
|
||||||
|
expect(localStorage.getItem("hash")).toBe("old-hash");
|
||||||
|
expect(document.querySelector(".animate-spin")).toBeFalsy();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("pages/index Home behavior", () => {
|
describe("pages/index Home behavior", () => {
|
||||||
@@ -419,11 +438,27 @@ describe("pages/index Home behavior", () => {
|
|||||||
|
|
||||||
fireEvent.keyDown(document.body, { key: "a" });
|
fireEvent.keyDown(document.body, { key: "a" });
|
||||||
expect(screen.getByTestId("quicklaunch")).toHaveTextContent("open:3");
|
expect(screen.getByTestId("quicklaunch")).toHaveTextContent("open:3");
|
||||||
|
expect(state.quickLaunchProps.searchString).toBe("a");
|
||||||
|
|
||||||
fireEvent.keyDown(document.body, { key: "Escape" });
|
fireEvent.keyDown(document.body, { key: "Escape" });
|
||||||
expect(screen.getByTestId("quicklaunch")).toHaveTextContent("closed:3");
|
expect(screen.getByTestId("quicklaunch")).toHaveTextContent("closed:3");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("opens search on space without seeding the query with whitespace", async () => {
|
||||||
|
await renderIndex({
|
||||||
|
initialSettings: { title: "Homepage", layout: {} },
|
||||||
|
settings: { title: "Homepage", layout: {}, language: "en" },
|
||||||
|
});
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(state.quickLaunchProps).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
fireEvent.keyDown(document.body, { key: " " });
|
||||||
|
expect(screen.getByTestId("quicklaunch")).toHaveTextContent("open:3");
|
||||||
|
expect(state.quickLaunchProps.searchString).toBe("");
|
||||||
|
});
|
||||||
|
|
||||||
it("renders services and bookmark groups when present", async () => {
|
it("renders services and bookmark groups when present", async () => {
|
||||||
await renderIndex({
|
await renderIndex({
|
||||||
initialSettings: { title: "Homepage", layout: {} },
|
initialSettings: { title: "Homepage", layout: {} },
|
||||||
@@ -489,7 +524,7 @@ describe("pages/index Home behavior", () => {
|
|||||||
state.widgetsData = [];
|
state.widgetsData = [];
|
||||||
|
|
||||||
const { setTheme, setColor, setSettings } = await renderIndex({
|
const { setTheme, setColor, setSettings } = await renderIndex({
|
||||||
initialSettings: { title: "Homepage", layout: {} },
|
initialSettings: { title: "Homepage", layout: {}, favicon: "/x.ico" },
|
||||||
settings: {
|
settings: {
|
||||||
title: "Homepage",
|
title: "Homepage",
|
||||||
layout: {},
|
layout: {},
|
||||||
@@ -498,7 +533,6 @@ describe("pages/index Home behavior", () => {
|
|||||||
color: "emerald",
|
color: "emerald",
|
||||||
disableIndexing: true,
|
disableIndexing: true,
|
||||||
base: "/base/",
|
base: "/base/",
|
||||||
favicon: "/x.ico",
|
|
||||||
},
|
},
|
||||||
theme: "dark",
|
theme: "dark",
|
||||||
color: "slate",
|
color: "slate",
|
||||||
@@ -516,6 +550,20 @@ describe("pages/index Home behavior", () => {
|
|||||||
expect(document.querySelector('link[rel="icon"]')?.getAttribute("href")).toBe("/x.ico");
|
expect(document.querySelector('link[rel="icon"]')?.getAttribute("href")).toBe("/x.ico");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Safari reads the head without running JS, so the favicon has to be there before the
|
||||||
|
// settings context is populated, and mask-icon must not be
|
||||||
|
it("renders a custom favicon before the settings context is populated", async () => {
|
||||||
|
await renderIndex({
|
||||||
|
initialSettings: { title: "Homepage", layout: {}, favicon: "/x.ico" },
|
||||||
|
settings: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(document.querySelector('link[rel="icon"]')?.getAttribute("href")).toBe("/x.ico");
|
||||||
|
expect(document.querySelector('link[rel="apple-touch-icon"]')?.getAttribute("href")).toBe("/x.ico");
|
||||||
|
expect(document.querySelector('link[rel="mask-icon"]')).toBeNull();
|
||||||
|
expect(document.querySelector('link[rel="shortcut icon"]')).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
it("marks information widgets as right-aligned for known widget types", async () => {
|
it("marks information widgets as right-aligned for known widget types", async () => {
|
||||||
await renderIndex({
|
await renderIndex({
|
||||||
initialSettings: { title: "Homepage", layout: {} },
|
initialSettings: { title: "Homepage", layout: {} },
|
||||||
|
|||||||
+129
-110
@@ -15,6 +15,69 @@ const MOBILE_BUTTON_POSITIONS = {
|
|||||||
"bottom-right": "bottom-4 right-4",
|
"bottom-right": "bottom-4 right-4",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
function parseUrl(searchString) {
|
||||||
|
if (!/.+[.:].+/.test(searchString)) return null; // basic test for probably a url
|
||||||
|
|
||||||
|
try {
|
||||||
|
return new URL(searchString.toLowerCase().startsWith("http") ? searchString : `https://${searchString}`);
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getSearchResults({
|
||||||
|
hideVisitURL,
|
||||||
|
searchDescriptions,
|
||||||
|
searchProvider,
|
||||||
|
searchString,
|
||||||
|
searchSuggestions,
|
||||||
|
servicesAndBookmarks,
|
||||||
|
t,
|
||||||
|
url,
|
||||||
|
}) {
|
||||||
|
if (searchString.trim().length === 0) return [];
|
||||||
|
|
||||||
|
const results = servicesAndBookmarks.flatMap((result) => {
|
||||||
|
const nameMatch = result.name.toLowerCase().includes(searchString);
|
||||||
|
const descriptionMatch = searchDescriptions && result.description?.toLowerCase().includes(searchString);
|
||||||
|
|
||||||
|
if (!nameMatch && !descriptionMatch) return [];
|
||||||
|
return [{ ...result, ...(searchDescriptions && { priority: nameMatch ? 2 : +descriptionMatch }) }];
|
||||||
|
});
|
||||||
|
|
||||||
|
if (searchDescriptions) {
|
||||||
|
results.sort((a, b) => b.priority - a.priority);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (searchProvider) {
|
||||||
|
results.push({
|
||||||
|
href: searchProvider.url + encodeURIComponent(searchString),
|
||||||
|
name: `${searchProvider.name ?? t("quicklaunch.custom")} ${t("quicklaunch.search")}`,
|
||||||
|
type: "search",
|
||||||
|
});
|
||||||
|
|
||||||
|
if (searchProvider.showSearchSuggestions && searchProvider.suggestionUrl && searchSuggestions[1]) {
|
||||||
|
results.push(
|
||||||
|
...searchSuggestions[1].map((suggestion) => ({
|
||||||
|
href: searchProvider.url + encodeURIComponent(suggestion),
|
||||||
|
name: suggestion,
|
||||||
|
type: "searchSuggestion",
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!hideVisitURL && url) {
|
||||||
|
results.unshift({
|
||||||
|
href: url.toString(),
|
||||||
|
name: `${t("quicklaunch.visit")} URL`,
|
||||||
|
type: "url",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
|
||||||
export default function QuickLaunch({ servicesAndBookmarks, searchString, setSearchString, isOpen, setSearching }) {
|
export default function QuickLaunch({ servicesAndBookmarks, searchString, setSearchString, isOpen, setSearching }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
@@ -23,9 +86,8 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea
|
|||||||
|
|
||||||
const searchField = useRef();
|
const searchField = useRef();
|
||||||
|
|
||||||
const [results, setResults] = useState([]);
|
|
||||||
const [currentItemIndex, setCurrentItemIndex] = useState(null);
|
const [currentItemIndex, setCurrentItemIndex] = useState(null);
|
||||||
const [url, setUrl] = useState(null);
|
const url = parseUrl(searchString);
|
||||||
const [searchSuggestions, setSearchSuggestions] = useState([]);
|
const [searchSuggestions, setSearchSuggestions] = useState([]);
|
||||||
|
|
||||||
const { data: widgets } = useSWR("/api/widgets");
|
const { data: widgets } = useSWR("/api/widgets");
|
||||||
@@ -62,7 +124,7 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea
|
|||||||
: null;
|
: null;
|
||||||
|
|
||||||
function openCurrentItem(newWindow) {
|
function openCurrentItem(newWindow) {
|
||||||
const result = results[currentItemIndex];
|
const result = results[activeItemIndex];
|
||||||
window.open(
|
window.open(
|
||||||
result.href,
|
result.href,
|
||||||
newWindow ? "_blank" : (result.target ?? searchProvider?.target ?? settings.target ?? "_blank"),
|
newWindow ? "_blank" : (result.target ?? searchProvider?.target ?? settings.target ?? "_blank"),
|
||||||
@@ -81,17 +143,9 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea
|
|||||||
|
|
||||||
function handleSearchChange(event) {
|
function handleSearchChange(event) {
|
||||||
const rawSearchString = event.target.value;
|
const rawSearchString = event.target.value;
|
||||||
try {
|
setCurrentItemIndex(null);
|
||||||
if (!/.+[.:].+/g.test(rawSearchString)) throw new Error(); // basic test for probably a url
|
// urls keep their casing, everything else is lowercased for matching
|
||||||
let urlString = rawSearchString;
|
setSearchString(parseUrl(rawSearchString) ? rawSearchString : rawSearchString.toLowerCase());
|
||||||
if (urlString.toLowerCase().indexOf("http") !== 0) urlString = `https://${rawSearchString}`;
|
|
||||||
setUrl(new URL(urlString)); // basic validation
|
|
||||||
setSearchString(rawSearchString);
|
|
||||||
return;
|
|
||||||
} catch (e) {
|
|
||||||
setUrl(null);
|
|
||||||
}
|
|
||||||
setSearchString(rawSearchString.toLowerCase());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleSearchKeyDown(event) {
|
function handleSearchKeyDown(event) {
|
||||||
@@ -103,18 +157,19 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea
|
|||||||
} else if (event.key === "Enter" && results.length) {
|
} else if (event.key === "Enter" && results.length) {
|
||||||
closeAndReset();
|
closeAndReset();
|
||||||
openCurrentItem(event.metaKey);
|
openCurrentItem(event.metaKey);
|
||||||
} else if (event.key === "ArrowDown" && results[currentItemIndex + 1]) {
|
} else if (event.key === "ArrowDown" && results[activeItemIndex + 1]) {
|
||||||
setCurrentItemIndex(currentItemIndex + 1);
|
setCurrentItemIndex(activeItemIndex + 1);
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
} else if (event.key === "ArrowUp" && currentItemIndex > 0) {
|
} else if (event.key === "ArrowUp" && activeItemIndex > 0) {
|
||||||
setCurrentItemIndex(currentItemIndex - 1);
|
setCurrentItemIndex(activeItemIndex - 1);
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
} else if (
|
} else if (
|
||||||
event.key === "ArrowRight" &&
|
event.key === "ArrowRight" &&
|
||||||
results[currentItemIndex] &&
|
results[activeItemIndex] &&
|
||||||
results[currentItemIndex].type === "searchSuggestion"
|
results[activeItemIndex].type === "searchSuggestion"
|
||||||
) {
|
) {
|
||||||
setSearchString(results[currentItemIndex].name);
|
setCurrentItemIndex(null);
|
||||||
|
setSearchString(results[activeItemIndex].name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -138,88 +193,51 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea
|
|||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const abortController = new AbortController();
|
if (
|
||||||
|
searchString.trim().length === 0 ||
|
||||||
if (searchString.trim().length === 0) setResults([]);
|
!searchProvider?.showSearchSuggestions ||
|
||||||
else {
|
!searchProvider.suggestionUrl ||
|
||||||
let newResults = servicesAndBookmarks.filter((r) => {
|
searchString.trim() === searchSuggestions[0]?.trim()
|
||||||
const nameMatch = r.name.toLowerCase().includes(searchString);
|
) {
|
||||||
let descriptionMatch;
|
return undefined;
|
||||||
if (searchDescriptions) {
|
|
||||||
descriptionMatch = r.description?.toLowerCase().includes(searchString);
|
|
||||||
r.priority = nameMatch ? 2 * +nameMatch : +descriptionMatch;
|
|
||||||
}
|
|
||||||
return nameMatch || descriptionMatch;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (searchDescriptions) {
|
|
||||||
newResults = newResults.sort((a, b) => b.priority - a.priority);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (searchProvider) {
|
|
||||||
newResults.push({
|
|
||||||
href: searchProvider.url + encodeURIComponent(searchString),
|
|
||||||
name: `${searchProvider.name ?? t("quicklaunch.custom")} ${t("quicklaunch.search")}`,
|
|
||||||
type: "search",
|
|
||||||
});
|
|
||||||
|
|
||||||
if (searchProvider.showSearchSuggestions && searchProvider.suggestionUrl) {
|
|
||||||
if (searchString.trim() !== searchSuggestions[0]?.trim()) {
|
|
||||||
fetch(
|
|
||||||
`/api/search/searchSuggestion?query=${encodeURIComponent(searchString)}&providerName=${
|
|
||||||
searchProvider.name ?? "Custom"
|
|
||||||
}`,
|
|
||||||
{ signal: abortController.signal },
|
|
||||||
)
|
|
||||||
.then(async (searchSuggestionResult) => {
|
|
||||||
const newSearchSuggestions = await searchSuggestionResult.json();
|
|
||||||
|
|
||||||
if (newSearchSuggestions) {
|
|
||||||
if (newSearchSuggestions[1].length > 4) {
|
|
||||||
newSearchSuggestions[1] = newSearchSuggestions[1].splice(0, 4);
|
|
||||||
}
|
|
||||||
setSearchSuggestions(newSearchSuggestions);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
// If there is an error, just ignore it. There just will be no search suggestions.
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (searchSuggestions[1]) {
|
|
||||||
newResults = newResults.concat(
|
|
||||||
searchSuggestions[1].map((suggestion) => ({
|
|
||||||
href: searchProvider.url + encodeURIComponent(suggestion),
|
|
||||||
name: suggestion,
|
|
||||||
type: "searchSuggestion",
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!hideVisitURL && url) {
|
|
||||||
newResults.unshift({
|
|
||||||
href: url.toString(),
|
|
||||||
name: `${t("quicklaunch.visit")} URL`,
|
|
||||||
type: "url",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
setResults(newResults);
|
|
||||||
|
|
||||||
if (newResults.length) {
|
|
||||||
setCurrentItemIndex(0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return () => {
|
const abortController = new AbortController();
|
||||||
abortController.abort();
|
|
||||||
};
|
fetch(
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
`/api/search/searchSuggestion?query=${encodeURIComponent(searchString)}&providerName=${
|
||||||
}, [searchString, servicesAndBookmarks, searchDescriptions, hideVisitURL, searchSuggestions, searchProvider, url]);
|
searchProvider.name ?? "Custom"
|
||||||
|
}`,
|
||||||
|
{ signal: abortController.signal },
|
||||||
|
)
|
||||||
|
.then(async (searchSuggestionResult) => {
|
||||||
|
const newSearchSuggestions = await searchSuggestionResult.json();
|
||||||
|
|
||||||
|
if (newSearchSuggestions) {
|
||||||
|
setCurrentItemIndex(null);
|
||||||
|
setSearchSuggestions([newSearchSuggestions[0], newSearchSuggestions[1].slice(0, 4)]);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
// If there is an error, just ignore it. There just will be no search suggestions.
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => abortController.abort();
|
||||||
|
}, [searchProvider, searchString, searchSuggestions]);
|
||||||
|
|
||||||
|
const results = getSearchResults({
|
||||||
|
hideVisitURL,
|
||||||
|
searchDescriptions,
|
||||||
|
searchProvider,
|
||||||
|
searchString,
|
||||||
|
searchSuggestions,
|
||||||
|
servicesAndBookmarks,
|
||||||
|
t,
|
||||||
|
url,
|
||||||
|
});
|
||||||
|
|
||||||
|
const activeItemIndex = currentItemIndex ?? (results.length ? 0 : null);
|
||||||
|
|
||||||
const [hidden, setHidden] = useState(true);
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
function handleBackdropClick(event) {
|
function handleBackdropClick(event) {
|
||||||
if (event.target?.tagName === "DIV") closeAndReset();
|
if (event.target?.tagName === "DIV") closeAndReset();
|
||||||
@@ -228,14 +246,11 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea
|
|||||||
if (isOpen) {
|
if (isOpen) {
|
||||||
searchField.current.focus();
|
searchField.current.focus();
|
||||||
document.body.addEventListener("click", handleBackdropClick);
|
document.body.addEventListener("click", handleBackdropClick);
|
||||||
setHidden(false);
|
|
||||||
} else {
|
} else {
|
||||||
document.body.removeEventListener("click", handleBackdropClick);
|
|
||||||
searchField.current.blur();
|
searchField.current.blur();
|
||||||
setTimeout(() => {
|
|
||||||
setHidden(true);
|
|
||||||
}, 300); // disable on close
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return () => document.body.removeEventListener("click", handleBackdropClick);
|
||||||
}, [isOpen, closeAndReset]);
|
}, [isOpen, closeAndReset]);
|
||||||
|
|
||||||
function highlightText(text) {
|
function highlightText(text) {
|
||||||
@@ -259,13 +274,17 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea
|
|||||||
<>
|
<>
|
||||||
<div
|
<div
|
||||||
className={classNames(
|
className={classNames(
|
||||||
"relative z-40 ease-in-out duration-300 transition-opacity",
|
"relative z-40 ease-in-out",
|
||||||
hidden && !isOpen && "hidden",
|
isOpen ? "visible opacity-100" : "invisible opacity-0 pointer-events-none",
|
||||||
!hidden && isOpen && "opacity-100",
|
|
||||||
!isOpen && "opacity-0",
|
|
||||||
)}
|
)}
|
||||||
|
style={{
|
||||||
|
transitionProperty: "opacity, visibility",
|
||||||
|
transitionDuration: "300ms, 0s",
|
||||||
|
transitionDelay: isOpen ? "0s, 0s" : "0s, 300ms",
|
||||||
|
}}
|
||||||
role="dialog"
|
role="dialog"
|
||||||
aria-modal="true"
|
aria-modal="true"
|
||||||
|
aria-hidden={!isOpen}
|
||||||
>
|
>
|
||||||
<div className="fixed inset-0 bg-gray-500 opacity-50" />
|
<div className="fixed inset-0 bg-gray-500 opacity-50" />
|
||||||
<div className="fixed inset-0 z-20 overflow-y-auto">
|
<div className="fixed inset-0 z-20 overflow-y-auto">
|
||||||
@@ -297,7 +316,7 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea
|
|||||||
onKeyDown={handleItemKeyDown}
|
onKeyDown={handleItemKeyDown}
|
||||||
className={classNames(
|
className={classNames(
|
||||||
"flex flex-row w-full items-center justify-between rounded-md text-sm md:text-xl py-2 px-4 cursor-pointer text-theme-700 dark:text-theme-200",
|
"flex flex-row w-full items-center justify-between rounded-md text-sm md:text-xl py-2 px-4 cursor-pointer text-theme-700 dark:text-theme-200",
|
||||||
i === currentItemIndex && "bg-theme-300/50 dark:bg-theme-700/50",
|
i === activeItemIndex && "bg-theme-300/50 dark:bg-theme-700/50",
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<div className="flex flex-row items-center mr-4 pointer-events-none">
|
<div className="flex flex-row items-center mr-4 pointer-events-none">
|
||||||
|
|||||||
@@ -46,13 +46,25 @@ function Wrapper({ servicesAndBookmarks = [], initialOpen = true } = {}) {
|
|||||||
const [isOpen, setSearching] = useState(initialOpen);
|
const [isOpen, setSearching] = useState(initialOpen);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<QuickLaunch
|
<>
|
||||||
servicesAndBookmarks={servicesAndBookmarks}
|
<button
|
||||||
searchString={searchString}
|
type="button"
|
||||||
setSearchString={setSearchString}
|
data-testid="seed-key"
|
||||||
isOpen={isOpen}
|
onClick={() => {
|
||||||
setSearching={setSearching}
|
setSearchString((current) => `${current}g`);
|
||||||
/>
|
setSearching(true);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
seed
|
||||||
|
</button>
|
||||||
|
<QuickLaunch
|
||||||
|
servicesAndBookmarks={servicesAndBookmarks}
|
||||||
|
searchString={searchString}
|
||||||
|
setSearchString={setSearchString}
|
||||||
|
isOpen={isOpen}
|
||||||
|
setSearching={setSearching}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -151,6 +163,35 @@ describe("components/quicklaunch", () => {
|
|||||||
openSpy.mockRestore();
|
openSpy.mockRestore();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("does not carry a previous url result into a search seeded by a keypress", async () => {
|
||||||
|
renderWithProviders(<Wrapper />, {
|
||||||
|
settings: {
|
||||||
|
target: "_self",
|
||||||
|
quicklaunch: {
|
||||||
|
provider: "duckduckgo",
|
||||||
|
showSearchSuggestions: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const input = screen.getByPlaceholderText("Search");
|
||||||
|
await waitFor(() => expect(input).toHaveFocus());
|
||||||
|
|
||||||
|
fireEvent.change(input, { target: { value: "example.com" } });
|
||||||
|
expect(await screen.findByText("quicklaunch.visit URL")).toBeInTheDocument();
|
||||||
|
|
||||||
|
fireEvent.keyDown(input, { key: "Escape" });
|
||||||
|
await act(async () => {
|
||||||
|
await new Promise((r) => setTimeout(r, 350));
|
||||||
|
});
|
||||||
|
|
||||||
|
// reopen by "typing" a character, the way pages/index does
|
||||||
|
fireEvent.click(screen.getByTestId("seed-key"));
|
||||||
|
|
||||||
|
expect(input).toHaveValue("g");
|
||||||
|
expect(screen.queryByText("quicklaunch.visit URL")).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
it("closes on Escape and clears the search string after the timeout", async () => {
|
it("closes on Escape and clears the search string after the timeout", async () => {
|
||||||
renderWithProviders(<Wrapper />, {
|
renderWithProviders(<Wrapper />, {
|
||||||
settings: {
|
settings: {
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
import { useTranslation } from "next-i18next/pages";
|
import { useTranslation } from "next-i18next/pages";
|
||||||
import { useEffect, useState } from "react";
|
import { useMemo } from "react";
|
||||||
|
|
||||||
import Container from "../widget/container";
|
import Container from "../widget/container";
|
||||||
import Raw from "../widget/raw";
|
import Raw from "../widget/raw";
|
||||||
|
|
||||||
|
import useCurrentTime from "utils/hooks/use-current-time";
|
||||||
|
|
||||||
const textSizes = {
|
const textSizes = {
|
||||||
"4xl": "text-4xl",
|
"4xl": "text-4xl",
|
||||||
"3xl": "text-3xl",
|
"3xl": "text-3xl",
|
||||||
@@ -18,17 +20,10 @@ const textSizes = {
|
|||||||
export default function DateTime({ options }) {
|
export default function DateTime({ options }) {
|
||||||
const { text_size: textSize, locale, format } = options;
|
const { text_size: textSize, locale, format } = options;
|
||||||
const { i18n } = useTranslation();
|
const { i18n } = useTranslation();
|
||||||
const [date, setDate] = useState("");
|
|
||||||
const dateLocale = locale ?? i18n.language;
|
const dateLocale = locale ?? i18n.language;
|
||||||
|
const currentTime = useCurrentTime(1000);
|
||||||
useEffect(() => {
|
const dateFormatter = useMemo(() => new Intl.DateTimeFormat(dateLocale, { ...format }), [dateLocale, format]);
|
||||||
const dateFormat = new Intl.DateTimeFormat(dateLocale, { ...format });
|
const date = currentTime === null ? "" : dateFormatter.format(new Date(currentTime));
|
||||||
setDate(dateFormat.format(new Date()));
|
|
||||||
const interval = setInterval(() => {
|
|
||||||
setDate(dateFormat.format(new Date()));
|
|
||||||
}, 1000);
|
|
||||||
return () => clearInterval(interval);
|
|
||||||
}, [date, setDate, dateLocale, format]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container options={options} additionalClassNames="information-widget-datetime">
|
<Container options={options} additionalClassNames="information-widget-datetime">
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ import Resource from "../widget/resource";
|
|||||||
|
|
||||||
export default function Network({ options, refresh = 1500 }) {
|
export default function Network({ options, refresh = 1500 }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
if (options.network === true) options.network = "default";
|
const network = options.network === true ? "default" : options.network;
|
||||||
|
|
||||||
const { data, error } = useSWR(`/api/widgets/resources?type=network&interfaceName=${options.network}`, {
|
const { data, error } = useSWR(`/api/widgets/resources?type=network&interfaceName=${network}`, {
|
||||||
refreshInterval: refresh,
|
refreshInterval: refresh,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -22,10 +22,12 @@ describe("components/widgets/resources/network", () => {
|
|||||||
|
|
||||||
it("normalizes options.network=true to default interfaceName in the request", () => {
|
it("normalizes options.network=true to default interfaceName in the request", () => {
|
||||||
useSWR.mockReturnValue({ data: undefined, error: undefined });
|
useSWR.mockReturnValue({ data: undefined, error: undefined });
|
||||||
|
const options = Object.freeze({ network: true });
|
||||||
|
|
||||||
render(<Network options={{ network: true }} />);
|
render(<Network options={options} />);
|
||||||
|
|
||||||
expect(useSWR).toHaveBeenCalledWith(expect.stringContaining("interfaceName=default"), expect.any(Object));
|
expect(useSWR).toHaveBeenCalledWith(expect.stringContaining("interfaceName=default"), expect.any(Object));
|
||||||
|
expect(options.network).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("renders rates and usage percentage when data is present", () => {
|
it("renders rates and usage percentage when data is present", () => {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import {
|
|||||||
} from "@headlessui/react";
|
} from "@headlessui/react";
|
||||||
import classNames from "classnames";
|
import classNames from "classnames";
|
||||||
import { useTranslation } from "next-i18next/pages";
|
import { useTranslation } from "next-i18next/pages";
|
||||||
import { Fragment, useEffect, useMemo, useState } from "react";
|
import { Fragment, useEffect, useMemo, useState, useSyncExternalStore } from "react";
|
||||||
import { BiLogoBing } from "react-icons/bi";
|
import { BiLogoBing } from "react-icons/bi";
|
||||||
import { FiSearch } from "react-icons/fi";
|
import { FiSearch } from "react-icons/fi";
|
||||||
import { SiBaidu, SiBrave, SiDuckduckgo, SiGoogle } from "react-icons/si";
|
import { SiBaidu, SiBrave, SiDuckduckgo, SiGoogle } from "react-icons/si";
|
||||||
@@ -79,24 +79,32 @@ export function getStoredProvider() {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function subscribeToStoredProvider(onStoreChange) {
|
||||||
|
const handleStorage = (event) => {
|
||||||
|
if (event.key === localStorageKey) onStoreChange();
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener("storage", handleStorage);
|
||||||
|
return () => window.removeEventListener("storage", handleStorage);
|
||||||
|
}
|
||||||
|
|
||||||
export default function Search({ options }) {
|
export default function Search({ options }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
// options is a fresh object each render, so memo on provider itself
|
// options is a fresh object each render, so memo on provider itself
|
||||||
const availableProviderIds = useMemo(() => getAvailableProviderIds(options.provider) ?? [], [options.provider]);
|
const availableProviderIds = useMemo(() => getAvailableProviderIds(options.provider) ?? [], [options.provider]);
|
||||||
|
const storedProvider = useSyncExternalStore(subscribeToStoredProvider, getStoredProvider, () => null);
|
||||||
|
const storedProviderId = Object.keys(searchProviders).find(
|
||||||
|
(providerId) => searchProviders[providerId] === storedProvider,
|
||||||
|
);
|
||||||
|
const initialProvider = availableProviderIds.includes(storedProviderId)
|
||||||
|
? storedProvider
|
||||||
|
: searchProviders[availableProviderIds[0] ?? "google"];
|
||||||
|
|
||||||
const [query, setQuery] = useState("");
|
const [query, setQuery] = useState("");
|
||||||
const [selectedProvider, setSelectedProvider] = useState(searchProviders[availableProviderIds[0] ?? "google"]);
|
const [providerOverride, setProviderOverride] = useState(null);
|
||||||
const [searchSuggestions, setSearchSuggestions] = useState([]);
|
const [searchSuggestions, setSearchSuggestions] = useState([]);
|
||||||
|
const selectedProvider = providerOverride ?? initialProvider;
|
||||||
useEffect(() => {
|
|
||||||
const storedProvider = getStoredProvider();
|
|
||||||
let storedProviderKey = null;
|
|
||||||
storedProviderKey = Object.keys(searchProviders).find((pkey) => searchProviders[pkey] === storedProvider);
|
|
||||||
if (storedProvider && availableProviderIds.includes(storedProviderKey)) {
|
|
||||||
setSelectedProvider(storedProvider);
|
|
||||||
}
|
|
||||||
}, [availableProviderIds]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const abortController = new AbortController();
|
const abortController = new AbortController();
|
||||||
@@ -130,8 +138,6 @@ export default function Search({ options }) {
|
|||||||
};
|
};
|
||||||
}, [selectedProvider, options, query, searchSuggestions]);
|
}, [selectedProvider, options, query, searchSuggestions]);
|
||||||
|
|
||||||
let currentSuggestion;
|
|
||||||
|
|
||||||
function doSearch(value) {
|
function doSearch(value) {
|
||||||
const q = encodeURIComponent(value);
|
const q = encodeURIComponent(value);
|
||||||
const { url } = selectedProvider;
|
const { url } = selectedProvider;
|
||||||
@@ -142,13 +148,11 @@ export default function Search({ options }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
setQuery("");
|
setQuery("");
|
||||||
currentSuggestion = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleSearchKeyDown = (event) => {
|
const handleSearchKeyDown = (event) => {
|
||||||
const useSuggestion = searchSuggestions.length && currentSuggestion;
|
if (event.key === "Enter" && !searchSuggestions[1]?.length) {
|
||||||
if (event.key === "Enter") {
|
doSearch(event.target.value);
|
||||||
doSearch(useSuggestion ? currentSuggestion : event.target.value);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -157,7 +161,7 @@ export default function Search({ options }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const onChangeProvider = (provider) => {
|
const onChangeProvider = (provider) => {
|
||||||
setSelectedProvider(provider);
|
setProviderOverride(provider);
|
||||||
localStorage.setItem(localStorageKey, provider.name);
|
localStorage.setItem(localStorageKey, provider.name);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -166,7 +170,7 @@ export default function Search({ options }) {
|
|||||||
<Raw>
|
<Raw>
|
||||||
<div className="flex-col relative h-8 my-4 min-w-fit z-20">
|
<div className="flex-col relative h-8 my-4 min-w-fit z-20">
|
||||||
<div className="flex absolute inset-y-0 left-0 items-center pl-3 pointer-events-none w-full text-theme-800 dark:text-white" />
|
<div className="flex absolute inset-y-0 left-0 items-center pl-3 pointer-events-none w-full text-theme-800 dark:text-white" />
|
||||||
<Combobox value={query}>
|
<Combobox value={query} onChange={doSearch}>
|
||||||
<ComboboxInput
|
<ComboboxInput
|
||||||
type="text"
|
type="text"
|
||||||
className="
|
className="
|
||||||
@@ -178,6 +182,7 @@ export default function Search({ options }) {
|
|||||||
focus:border-theme-500 dark:focus:border-white/50
|
focus:border-theme-500 dark:focus:border-white/50
|
||||||
border border-theme-300 dark:border-theme-200/50"
|
border border-theme-300 dark:border-theme-200/50"
|
||||||
placeholder={t("search.placeholder")}
|
placeholder={t("search.placeholder")}
|
||||||
|
aria-label={t("search.placeholder")}
|
||||||
onChange={(event) => {
|
onChange={(event) => {
|
||||||
setQuery(event.target.value);
|
setQuery(event.target.value);
|
||||||
}}
|
}}
|
||||||
@@ -204,8 +209,8 @@ export default function Search({ options }) {
|
|||||||
bg-theme-600/40 dark:bg-white/10
|
bg-theme-600/40 dark:bg-white/10
|
||||||
focus:ring-theme-500 dark:focus:ring-white/50"
|
focus:ring-theme-500 dark:focus:ring-white/50"
|
||||||
>
|
>
|
||||||
<selectedProvider.icon className="text-white w-3 h-3" />
|
<selectedProvider.icon className="text-white w-3 h-3" aria-hidden="true" />
|
||||||
<span className="sr-only">{t("search.search")}</span>
|
<span className="sr-only">{t("search.provider", { name: selectedProvider.name })}</span>
|
||||||
</ListboxButton>
|
</ListboxButton>
|
||||||
</div>
|
</div>
|
||||||
<Transition
|
<Transition
|
||||||
@@ -218,6 +223,7 @@ export default function Search({ options }) {
|
|||||||
leaveTo="transform opacity-0 scale-95"
|
leaveTo="transform opacity-0 scale-95"
|
||||||
>
|
>
|
||||||
<ListboxOptions
|
<ListboxOptions
|
||||||
|
aria-label={t("search.select_provider")}
|
||||||
className="absolute right-0 z-10 mt-1 origin-top-right rounded-md
|
className="absolute right-0 z-10 mt-1 origin-top-right rounded-md
|
||||||
bg-theme-100 dark:bg-theme-600 shadow-lg
|
bg-theme-100 dark:bg-theme-600 shadow-lg
|
||||||
ring-1 ring-black ring-opacity-5 focus:outline-hidden"
|
ring-1 ring-black ring-opacity-5 focus:outline-hidden"
|
||||||
@@ -234,7 +240,8 @@ export default function Search({ options }) {
|
|||||||
active ? "bg-theme-600/10 dark:bg-white/10 dark:text-gray-900" : "dark:text-gray-100",
|
active ? "bg-theme-600/10 dark:bg-white/10 dark:text-gray-900" : "dark:text-gray-100",
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<p.icon className="h-4 w-4 mx-4 my-2" />
|
<p.icon className="h-4 w-4 mx-4 my-2" aria-hidden="true" />
|
||||||
|
<span className="sr-only">{p.name}</span>
|
||||||
</li>
|
</li>
|
||||||
)}
|
)}
|
||||||
</ListboxOption>
|
</ListboxOption>
|
||||||
@@ -248,32 +255,24 @@ export default function Search({ options }) {
|
|||||||
{searchSuggestions[1]?.length > 0 && (
|
{searchSuggestions[1]?.length > 0 && (
|
||||||
<ComboboxOptions className="mt-1 rounded-md bg-theme-50 dark:bg-theme-800 border border-theme-300 dark:border-theme-200/30 cursor-pointer shadow-lg">
|
<ComboboxOptions className="mt-1 rounded-md bg-theme-50 dark:bg-theme-800 border border-theme-300 dark:border-theme-200/30 cursor-pointer shadow-lg">
|
||||||
<div className="p-1 bg-white/50 dark:bg-white/10 text-theme-900/90 dark:text-white/90 text-xs">
|
<div className="p-1 bg-white/50 dark:bg-white/10 text-theme-900/90 dark:text-white/90 text-xs">
|
||||||
<ComboboxOption key={query} value={query} />
|
<ComboboxOption key={query} value={query}>
|
||||||
|
<span className="sr-only">{query}</span>
|
||||||
|
</ComboboxOption>
|
||||||
{searchSuggestions[1].map((suggestion) => (
|
{searchSuggestions[1].map((suggestion) => (
|
||||||
<ComboboxOption
|
<ComboboxOption key={suggestion} value={suggestion} className="flex w-full">
|
||||||
key={suggestion}
|
{({ active }) => (
|
||||||
value={suggestion}
|
<div
|
||||||
onMouseDown={() => {
|
className={classNames(
|
||||||
doSearch(suggestion);
|
"px-2 py-1 rounded-md w-full flex-nowrap",
|
||||||
}}
|
active ? "bg-theme-300/20 dark:bg-white/10" : "",
|
||||||
className="flex w-full"
|
)}
|
||||||
>
|
>
|
||||||
{({ active }) => {
|
<span className="whitespace-pre">{suggestion.indexOf(query) === 0 ? query : ""}</span>
|
||||||
if (active) currentSuggestion = suggestion;
|
<span className="mr-4 whitespace-pre opacity-50">
|
||||||
return (
|
{suggestion.indexOf(query) === 0 ? suggestion.substring(query.length) : suggestion}
|
||||||
<div
|
</span>
|
||||||
className={classNames(
|
</div>
|
||||||
"px-2 py-1 rounded-md w-full flex-nowrap",
|
)}
|
||||||
active ? "bg-theme-300/20 dark:bg-white/10" : "",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<span className="whitespace-pre">{suggestion.indexOf(query) === 0 ? query : ""}</span>
|
|
||||||
<span className="mr-4 whitespace-pre opacity-50">
|
|
||||||
{suggestion.indexOf(query) === 0 ? suggestion.substring(query.length) : suggestion}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}}
|
|
||||||
</ComboboxOption>
|
</ComboboxOption>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { renderWithProviders } from "test-utils/render-with-providers";
|
|||||||
vi.mock("@headlessui/react", async () => {
|
vi.mock("@headlessui/react", async () => {
|
||||||
const React = await import("react");
|
const React = await import("react");
|
||||||
const { Fragment, createContext, useContext } = React;
|
const { Fragment, createContext, useContext } = React;
|
||||||
|
const ComboboxContext = createContext(null);
|
||||||
const ListboxContext = createContext(null);
|
const ListboxContext = createContext(null);
|
||||||
|
|
||||||
function passthrough({ as: As = "div", children, ...props }) {
|
function passthrough({ as: As = "div", children, ...props }) {
|
||||||
@@ -18,9 +19,21 @@ vi.mock("@headlessui/react", async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
Combobox: passthrough,
|
Combobox: ({ onChange, children }) => (
|
||||||
|
<ComboboxContext.Provider value={{ onChange }}>
|
||||||
|
<div>{children}</div>
|
||||||
|
</ComboboxContext.Provider>
|
||||||
|
),
|
||||||
ComboboxInput: (props) => <input {...props} />,
|
ComboboxInput: (props) => <input {...props} />,
|
||||||
ComboboxOption: passthrough,
|
ComboboxOption: ({ as: As = "div", value, children, ...props }) => {
|
||||||
|
const ctx = useContext(ComboboxContext);
|
||||||
|
const content = typeof children === "function" ? children({ active: false }) : children;
|
||||||
|
return (
|
||||||
|
<As value={value} onMouseDown={() => ctx?.onChange?.(value)} {...props}>
|
||||||
|
{content}
|
||||||
|
</As>
|
||||||
|
);
|
||||||
|
},
|
||||||
ComboboxOptions: passthrough,
|
ComboboxOptions: passthrough,
|
||||||
Listbox: ({ value, onChange, children, ...props }) => (
|
Listbox: ({ value, onChange, children, ...props }) => (
|
||||||
<ListboxContext.Provider value={{ value, onChange }}>
|
<ListboxContext.Provider value={{ value, onChange }}>
|
||||||
@@ -165,6 +178,28 @@ describe("components/widgets/search", () => {
|
|||||||
openSpy.mockRestore();
|
openSpy.mockRestore();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("gives every provider option an accessible name", () => {
|
||||||
|
renderWithProviders(
|
||||||
|
<Search options={{ provider: ["google", "duckduckgo", "brave"], showSearchSuggestions: false }} />,
|
||||||
|
{ settings: {} },
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(screen.getAllByRole("option").map((option) => option.textContent)).toEqual([
|
||||||
|
"Google",
|
||||||
|
"DuckDuckGo",
|
||||||
|
"Brave",
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("labels the search input and the provider button", () => {
|
||||||
|
renderWithProviders(<Search options={{ provider: ["google", "duckduckgo"], showSearchSuggestions: false }} />, {
|
||||||
|
settings: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(screen.getByRole("textbox")).toHaveAccessibleName("search.placeholder");
|
||||||
|
expect(screen.getByRole("button")).toHaveAccessibleName(/search\.provider/);
|
||||||
|
});
|
||||||
|
|
||||||
it("fetches search suggestions and triggers a search when a suggestion is selected", async () => {
|
it("fetches search suggestions and triggers a search when a suggestion is selected", async () => {
|
||||||
const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
|
const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
|
||||||
|
|
||||||
|
|||||||
@@ -14,11 +14,11 @@ import useWidgetAPI from "utils/proxy/use-widget-api";
|
|||||||
export default function Widget({ options }) {
|
export default function Widget({ options }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
options.service_group = options.service_name = "unifi_console";
|
const widgetOptions = { ...options, service_group: "unifi_console", service_name: "unifi_console" };
|
||||||
const { data: statsData, error: statsError } = useWidgetAPI(options, "stat/sites", { index: options.index });
|
const { data: statsData, error: statsError } = useWidgetAPI(widgetOptions, "stat/sites", { index: options.index });
|
||||||
|
|
||||||
if (statsError) {
|
if (statsError) {
|
||||||
return <Error options={options} />;
|
return <Error options={widgetOptions} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultSite = options.site
|
const defaultSite = options.site
|
||||||
@@ -27,27 +27,27 @@ export default function Widget({ options }) {
|
|||||||
|
|
||||||
if (!defaultSite) {
|
if (!defaultSite) {
|
||||||
return (
|
return (
|
||||||
<Container options={options} additionalClassNames="information-widget-unifi-console">
|
<Container options={widgetOptions} additionalClassNames="information-widget-unifi-console">
|
||||||
<PrimaryText>{t("unifi.wait")}</PrimaryText>
|
<PrimaryText>{t("unifi.wait")}</PrimaryText>
|
||||||
<WidgetIcon icon={SiUbiquiti} />
|
<WidgetIcon icon={SiUbiquiti} />
|
||||||
</Container>
|
</Container>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const wan = defaultSite.health.find((h) => h.subsystem === "wan");
|
const getHealth = (subsystem) => {
|
||||||
const lan = defaultSite.health.find((h) => h.subsystem === "lan");
|
const health = defaultSite.health.find((item) => item.subsystem === subsystem) ?? { status: "unknown" };
|
||||||
const wlan = defaultSite.health.find((h) => h.subsystem === "wlan");
|
return { ...health, up: health.status === "ok", show: health.status !== "unknown" };
|
||||||
[wan, lan, wlan].forEach((s) => {
|
};
|
||||||
s.up = s.status === "ok";
|
const wan = getHealth("wan");
|
||||||
s.show = s.status !== "unknown";
|
const lan = getHealth("lan");
|
||||||
});
|
const wlan = getHealth("wlan");
|
||||||
const name = wan.gw_name ?? defaultSite.desc;
|
const name = wan.gw_name ?? defaultSite.desc;
|
||||||
const uptime = wan["gw_system-stats"] ? wan["gw_system-stats"].uptime : null;
|
const uptime = wan["gw_system-stats"] ? wan["gw_system-stats"].uptime : null;
|
||||||
|
|
||||||
const dataEmpty = !(wan.show || lan.show || wlan.show || uptime);
|
const dataEmpty = !(wan.show || lan.show || wlan.show || uptime);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container options={options} additionalClassNames="information-widget-unifi-console">
|
<Container options={widgetOptions} additionalClassNames="information-widget-unifi-console">
|
||||||
<Raw>
|
<Raw>
|
||||||
<div className="flex-none flex flex-row items-center mr-3 py-1.5">
|
<div className="flex-none flex flex-row items-center mr-3 py-1.5">
|
||||||
<div className="flex flex-col">
|
<div className="flex flex-col">
|
||||||
|
|||||||
@@ -40,32 +40,41 @@ describe("components/widgets/unifi_console", () => {
|
|||||||
|
|
||||||
it("renders a wait state when no site is available yet", () => {
|
it("renders a wait state when no site is available yet", () => {
|
||||||
useWidgetAPI.mockReturnValue({ data: undefined, error: undefined });
|
useWidgetAPI.mockReturnValue({ data: undefined, error: undefined });
|
||||||
|
const options = Object.freeze({ index: 0 });
|
||||||
|
|
||||||
renderWithProviders(<UnifiConsole options={{ index: 0 }} />, { settings: { target: "_self" } });
|
renderWithProviders(<UnifiConsole options={options} />, { settings: { target: "_self" } });
|
||||||
|
|
||||||
expect(screen.getByText("unifi.wait")).toBeInTheDocument();
|
expect(screen.getByText("unifi.wait")).toBeInTheDocument();
|
||||||
|
expect(useWidgetAPI).toHaveBeenCalledWith(
|
||||||
|
{ index: 0, service_group: "unifi_console", service_name: "unifi_console" },
|
||||||
|
"stat/sites",
|
||||||
|
{ index: 0 },
|
||||||
|
);
|
||||||
|
expect(options).toEqual({ index: 0 });
|
||||||
});
|
});
|
||||||
|
|
||||||
it("renders site name and uptime when data is available", () => {
|
it("renders site name and uptime when data is available", () => {
|
||||||
|
const data = {
|
||||||
|
data: [
|
||||||
|
{
|
||||||
|
name: "default",
|
||||||
|
desc: "Home",
|
||||||
|
health: [
|
||||||
|
{
|
||||||
|
subsystem: "wan",
|
||||||
|
status: "ok",
|
||||||
|
gw_name: "Router",
|
||||||
|
"gw_system-stats": { uptime: 172800 },
|
||||||
|
},
|
||||||
|
{ subsystem: "lan", status: "unknown" },
|
||||||
|
{ subsystem: "wlan", status: "unknown" },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
const originalData = structuredClone(data);
|
||||||
useWidgetAPI.mockReturnValue({
|
useWidgetAPI.mockReturnValue({
|
||||||
data: {
|
data,
|
||||||
data: [
|
|
||||||
{
|
|
||||||
name: "default",
|
|
||||||
desc: "Home",
|
|
||||||
health: [
|
|
||||||
{
|
|
||||||
subsystem: "wan",
|
|
||||||
status: "ok",
|
|
||||||
gw_name: "Router",
|
|
||||||
"gw_system-stats": { uptime: 172800 },
|
|
||||||
},
|
|
||||||
{ subsystem: "lan", status: "unknown" },
|
|
||||||
{ subsystem: "wlan", status: "unknown" },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
error: undefined,
|
error: undefined,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -75,6 +84,7 @@ describe("components/widgets/unifi_console", () => {
|
|||||||
// common.number is mocked to return the numeric value as a string.
|
// common.number is mocked to return the numeric value as a string.
|
||||||
expect(screen.getByText("2")).toBeInTheDocument();
|
expect(screen.getByText("2")).toBeInTheDocument();
|
||||||
expect(screen.getByText("unifi.days")).toBeInTheDocument();
|
expect(screen.getByText("unifi.days")).toBeInTheDocument();
|
||||||
|
expect(data).toEqual(originalData);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("selects a site by description when options.site is set", () => {
|
it("selects a site by description when options.site is set", () => {
|
||||||
|
|||||||
@@ -15,6 +15,12 @@ export default async function handler(req, res) {
|
|||||||
return res.status(404).end("Not Found");
|
return res.status(404).end("Not Found");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Method check precedes auth so CORS preflights aren't answered with a 401.
|
||||||
|
if (req.method !== "POST") {
|
||||||
|
res.setHeader("Allow", "POST");
|
||||||
|
return res.status(405).end("Method Not Allowed");
|
||||||
|
}
|
||||||
|
|
||||||
const tokenError = mcpTokenConfigError();
|
const tokenError = mcpTokenConfigError();
|
||||||
if (tokenError) {
|
if (tokenError) {
|
||||||
createLogger("mcp").error(tokenError);
|
createLogger("mcp").error(tokenError);
|
||||||
@@ -25,11 +31,6 @@ export default async function handler(req, res) {
|
|||||||
return res.status(401).json({ error: "Unauthorized" });
|
return res.status(401).json({ error: "Unauthorized" });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (req.method !== "POST") {
|
|
||||||
res.setHeader("Allow", "POST");
|
|
||||||
return res.status(405).end("Method Not Allowed");
|
|
||||||
}
|
|
||||||
|
|
||||||
const response = handleMcpRequest(req.body);
|
const response = handleMcpRequest(req.body);
|
||||||
if (!response) {
|
if (!response) {
|
||||||
return res.status(202).end();
|
return res.status(202).end();
|
||||||
|
|||||||
@@ -214,4 +214,38 @@ describe("pages/api/mcp", () => {
|
|||||||
expect(res.status).toHaveBeenCalledWith(405);
|
expect(res.status).toHaveBeenCalledWith(405);
|
||||||
expect(res.setHeader).toHaveBeenCalledWith("Allow", "POST");
|
expect(res.setHeader).toHaveBeenCalledWith("Allow", "POST");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("answers unauthenticated CORS preflights with 405 rather than 401", async () => {
|
||||||
|
process.env.HOMEPAGE_MCP_ENABLED = "true";
|
||||||
|
process.env.HOMEPAGE_MCP_TOKEN = "mcp-tok-0123456789abcdefghijklmnopqrstuv";
|
||||||
|
const handler = await loadHandler();
|
||||||
|
const res = mockResponse();
|
||||||
|
|
||||||
|
// a preflight never carries the Authorization header the browser strips
|
||||||
|
await handler(
|
||||||
|
{
|
||||||
|
method: "OPTIONS",
|
||||||
|
headers: {
|
||||||
|
origin: "https://claude.ai",
|
||||||
|
"access-control-request-method": "POST",
|
||||||
|
"access-control-request-headers": "authorization,content-type",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
res,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(res.status).toHaveBeenCalledWith(405);
|
||||||
|
expect(res.setHeader).toHaveBeenCalledWith("Allow", "POST");
|
||||||
|
expect(getServerSession).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("still returns 404 for non-POST requests while disabled", async () => {
|
||||||
|
delete process.env.HOMEPAGE_MCP_ENABLED;
|
||||||
|
const handler = await loadHandler();
|
||||||
|
const res = mockResponse();
|
||||||
|
|
||||||
|
await handler({ method: "OPTIONS", headers: {} }, res);
|
||||||
|
|
||||||
|
expect(res.status).toHaveBeenCalledWith(404);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
+35
-28
@@ -12,7 +12,7 @@ import dynamic from "next/dynamic";
|
|||||||
import Head from "next/head";
|
import Head from "next/head";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import Script from "next/script";
|
import Script from "next/script";
|
||||||
import { useContext, useEffect, useMemo, useState } from "react";
|
import { useCallback, useContext, useEffect, useMemo, useState } from "react";
|
||||||
import { BiError } from "react-icons/bi";
|
import { BiError } from "react-icons/bi";
|
||||||
import useSWR, { SWRConfig } from "swr";
|
import useSWR, { SWRConfig } from "swr";
|
||||||
import { ColorContext } from "utils/contexts/color";
|
import { ColorContext } from "utils/contexts/color";
|
||||||
@@ -102,7 +102,29 @@ function Index({ initialSettings, fallback }) {
|
|||||||
const [stale, setStale] = useState(false);
|
const [stale, setStale] = useState(false);
|
||||||
const { data: errorsData } = useSWR("/api/validate");
|
const { data: errorsData } = useSWR("/api/validate");
|
||||||
const { error: validateError } = errorsData || {};
|
const { error: validateError } = errorsData || {};
|
||||||
const { data: hashData, mutate: mutateHash } = useSWR("/api/hash");
|
|
||||||
|
const handleHashData = useCallback((hashData) => {
|
||||||
|
if (typeof window === "undefined" || !hashData?.hash) return;
|
||||||
|
|
||||||
|
const previousHash = localStorage.getItem("hash");
|
||||||
|
|
||||||
|
if (!previousHash) {
|
||||||
|
localStorage.setItem("hash", hashData.hash);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (previousHash && previousHash !== hashData.hash) {
|
||||||
|
setStale(true);
|
||||||
|
localStorage.setItem("hash", hashData.hash);
|
||||||
|
|
||||||
|
fetch("/api/revalidate").then((res) => {
|
||||||
|
if (res.ok) {
|
||||||
|
window.location.reload();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const { mutate: mutateHash } = useSWR("/api/hash", { onSuccess: handleHashData });
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (windowFocused) {
|
if (windowFocused) {
|
||||||
@@ -110,29 +132,6 @@ function Index({ initialSettings, fallback }) {
|
|||||||
}
|
}
|
||||||
}, [windowFocused, mutateHash]);
|
}, [windowFocused, mutateHash]);
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (hashData) {
|
|
||||||
if (typeof window !== "undefined") {
|
|
||||||
const previousHash = localStorage.getItem("hash");
|
|
||||||
|
|
||||||
if (!previousHash) {
|
|
||||||
localStorage.setItem("hash", hashData.hash);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (previousHash && previousHash !== hashData.hash) {
|
|
||||||
setStale(true);
|
|
||||||
localStorage.setItem("hash", hashData.hash);
|
|
||||||
|
|
||||||
fetch("/api/revalidate").then((res) => {
|
|
||||||
if (res.ok) {
|
|
||||||
window.location.reload();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, [hashData]);
|
|
||||||
|
|
||||||
if (validateError) {
|
if (validateError) {
|
||||||
return (
|
return (
|
||||||
<div className="w-full h-screen container m-auto justify-center p-10 pointer-events-none">
|
<div className="w-full h-screen container m-auto justify-center p-10 pointer-events-none">
|
||||||
@@ -264,6 +263,13 @@ function Home({ initialSettings }) {
|
|||||||
e.key.match(/([à-ü]|[À-Ü]|!)/g) ||
|
e.key.match(/([à-ü]|[À-Ü]|!)/g) ||
|
||||||
(e.key === "v" && (e.ctrlKey || e.metaKey))
|
(e.key === "v" && (e.ctrlKey || e.metaKey))
|
||||||
) {
|
) {
|
||||||
|
if (e.key.length === 1 && !(e.key === "v" && (e.ctrlKey || e.metaKey))) {
|
||||||
|
e.preventDefault();
|
||||||
|
// whitespace opens the search but shouldn't be in it
|
||||||
|
if (e.key.trim()) {
|
||||||
|
setSearchString((currentSearchString) => currentSearchString + e.key);
|
||||||
|
}
|
||||||
|
}
|
||||||
setSearching(true);
|
setSearching(true);
|
||||||
} else if (e.key === "Escape") {
|
} else if (e.key === "Escape") {
|
||||||
setSearchString("");
|
setSearchString("");
|
||||||
@@ -420,10 +426,11 @@ function Home({ initialSettings }) {
|
|||||||
/>
|
/>
|
||||||
{settings.disableIndexing && <meta name="robots" content="noindex, nofollow" />}
|
{settings.disableIndexing && <meta name="robots" content="noindex, nofollow" />}
|
||||||
{settings.base && <base href={settings.base} />}
|
{settings.base && <base href={settings.base} />}
|
||||||
{settings.favicon ? (
|
{/* from props, not context so its set before running JS */}
|
||||||
|
{initialSettings.favicon ? (
|
||||||
<>
|
<>
|
||||||
<link rel="icon" href={settings.favicon} />
|
<link rel="icon" href={initialSettings.favicon} />
|
||||||
<link rel="apple-touch-icon" sizes="180x180" href={settings.favicon} />
|
<link rel="apple-touch-icon" sizes="180x180" href={initialSettings.favicon} />
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
import { promises as fs } from "fs";
|
import { promises as fs } from "fs";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
|
|
||||||
import yaml from "js-yaml";
|
|
||||||
|
|
||||||
import checkAndCopyConfig, { CONF_DIR, getSettings, substituteEnvironmentVars } from "utils/config/config";
|
import checkAndCopyConfig, { CONF_DIR, getSettings, substituteEnvironmentVars } from "utils/config/config";
|
||||||
import {
|
import {
|
||||||
cleanServiceGroups,
|
cleanServiceGroups,
|
||||||
@@ -12,6 +10,7 @@ import {
|
|||||||
servicesFromKubernetes,
|
servicesFromKubernetes,
|
||||||
} from "utils/config/service-helpers";
|
} from "utils/config/service-helpers";
|
||||||
import { cleanWidgetGroups, widgetsFromConfig } from "utils/config/widget-helpers";
|
import { cleanWidgetGroups, widgetsFromConfig } from "utils/config/widget-helpers";
|
||||||
|
import { loadYaml } from "utils/config/yaml";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compares services by weight then by name.
|
* Compares services by weight then by name.
|
||||||
@@ -30,7 +29,7 @@ export async function bookmarksResponse() {
|
|||||||
const bookmarksYaml = path.join(CONF_DIR, "bookmarks.yaml");
|
const bookmarksYaml = path.join(CONF_DIR, "bookmarks.yaml");
|
||||||
const rawFileContents = await fs.readFile(bookmarksYaml, "utf8");
|
const rawFileContents = await fs.readFile(bookmarksYaml, "utf8");
|
||||||
const fileContents = substituteEnvironmentVars(rawFileContents);
|
const fileContents = substituteEnvironmentVars(rawFileContents);
|
||||||
const bookmarks = yaml.load(fileContents);
|
const bookmarks = loadYaml(fileContents);
|
||||||
|
|
||||||
if (!bookmarks) return [];
|
if (!bookmarks) return [];
|
||||||
|
|
||||||
|
|||||||
@@ -30,10 +30,7 @@ vi.mock("fs", () => ({
|
|||||||
promises: fs,
|
promises: fs,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("js-yaml", () => ({
|
vi.mock("utils/config/yaml", () => ({ loadYaml: yaml.load }));
|
||||||
default: yaml,
|
|
||||||
...yaml,
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("utils/config/config", () => config);
|
vi.mock("utils/config/config", () => config);
|
||||||
vi.mock("utils/config/widget-helpers", () => widgetHelpers);
|
vi.mock("utils/config/widget-helpers", () => widgetHelpers);
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ const { fs, yaml } = vi.hoisted(() => ({
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("fs", () => fs);
|
vi.mock("fs", () => fs);
|
||||||
vi.mock("js-yaml", () => ({ default: yaml, ...yaml }));
|
vi.mock("utils/config/yaml", () => ({ loadYaml: yaml.load }));
|
||||||
|
|
||||||
describe("utils/config/config checkAndCopyConfig", () => {
|
describe("utils/config/config checkAndCopyConfig", () => {
|
||||||
const originalEnv = process.env;
|
const originalEnv = process.env;
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import { copyFileSync, existsSync, mkdirSync, readFileSync } from "fs";
|
import { copyFileSync, existsSync, mkdirSync, readFileSync } from "fs";
|
||||||
import { join } from "path";
|
import { join } from "path";
|
||||||
|
|
||||||
import yaml from "js-yaml";
|
|
||||||
import cache from "memory-cache";
|
import cache from "memory-cache";
|
||||||
|
|
||||||
|
import { loadYaml } from "utils/config/yaml";
|
||||||
|
|
||||||
const cacheKey = "homepageEnvironmentVariables";
|
const cacheKey = "homepageEnvironmentVariables";
|
||||||
const homepageVarPrefix = "HOMEPAGE_VAR_";
|
const homepageVarPrefix = "HOMEPAGE_VAR_";
|
||||||
const homepageFilePrefix = "HOMEPAGE_FILE_";
|
const homepageFilePrefix = "HOMEPAGE_FILE_";
|
||||||
@@ -42,7 +43,7 @@ export default function checkAndCopyConfig(config) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
yaml.load(readFileSync(configYaml, "utf8"));
|
loadYaml(readFileSync(configYaml, "utf8"));
|
||||||
return true;
|
return true;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
return { ...e, config };
|
return { ...e, config };
|
||||||
@@ -85,7 +86,7 @@ export function getSettings() {
|
|||||||
const settingsYaml = join(CONF_DIR, "settings.yaml");
|
const settingsYaml = join(CONF_DIR, "settings.yaml");
|
||||||
const rawFileContents = readFileSync(settingsYaml, "utf8");
|
const rawFileContents = readFileSync(settingsYaml, "utf8");
|
||||||
const fileContents = substituteEnvironmentVars(rawFileContents);
|
const fileContents = substituteEnvironmentVars(rawFileContents);
|
||||||
const initialSettings = yaml.load(fileContents) ?? {};
|
const initialSettings = loadYaml(fileContents) ?? {};
|
||||||
|
|
||||||
if (initialSettings.layout) {
|
if (initialSettings.layout) {
|
||||||
// support yaml list but old spec was object so convert to that
|
// support yaml list but old spec was object so convert to that
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
import { readFileSync } from "fs";
|
import { readFileSync } from "fs";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
|
|
||||||
import yaml from "js-yaml";
|
|
||||||
|
|
||||||
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
|
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
|
||||||
|
import { loadYaml } from "utils/config/yaml";
|
||||||
|
|
||||||
export function getDefaultDockerArgs(platform = process.platform) {
|
export function getDefaultDockerArgs(platform = process.platform) {
|
||||||
if (platform !== "win32" && platform !== "darwin") {
|
if (platform !== "win32" && platform !== "darwin") {
|
||||||
@@ -19,7 +18,7 @@ export default function getDockerArguments(server) {
|
|||||||
const configFile = path.join(CONF_DIR, "docker.yaml");
|
const configFile = path.join(CONF_DIR, "docker.yaml");
|
||||||
const rawConfigData = readFileSync(configFile, "utf8");
|
const rawConfigData = readFileSync(configFile, "utf8");
|
||||||
const configData = substituteEnvironmentVars(rawConfigData);
|
const configData = substituteEnvironmentVars(rawConfigData);
|
||||||
const servers = yaml.load(configData);
|
const servers = loadYaml(configData);
|
||||||
|
|
||||||
if (!server) {
|
if (!server) {
|
||||||
return getDefaultDockerArgs();
|
return getDefaultDockerArgs();
|
||||||
|
|||||||
@@ -21,10 +21,7 @@ vi.mock("fs", () => ({
|
|||||||
readFileSync: fs.readFileSync,
|
readFileSync: fs.readFileSync,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("js-yaml", () => ({
|
vi.mock("utils/config/yaml", () => ({ loadYaml: yaml.load }));
|
||||||
default: yaml,
|
|
||||||
...yaml,
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("utils/config/config", () => ({
|
vi.mock("utils/config/config", () => ({
|
||||||
default: checkAndCopyConfig,
|
default: checkAndCopyConfig,
|
||||||
|
|||||||
@@ -1,17 +1,18 @@
|
|||||||
import { readFileSync } from "fs";
|
import { readFileSync } from "fs";
|
||||||
|
import { isIPv6 } from "net";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
|
|
||||||
import { ApiextensionsV1Api, KubeConfig } from "@kubernetes/client-node";
|
import { ApiextensionsV1Api, KubeConfig } from "@kubernetes/client-node";
|
||||||
import yaml from "js-yaml";
|
|
||||||
|
|
||||||
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
|
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
|
||||||
|
import { loadYaml } from "utils/config/yaml";
|
||||||
|
|
||||||
export function getKubernetes() {
|
export function getKubernetes() {
|
||||||
checkAndCopyConfig("kubernetes.yaml");
|
checkAndCopyConfig("kubernetes.yaml");
|
||||||
const configFile = path.join(CONF_DIR, "kubernetes.yaml");
|
const configFile = path.join(CONF_DIR, "kubernetes.yaml");
|
||||||
const rawConfigData = readFileSync(configFile, "utf8");
|
const rawConfigData = readFileSync(configFile, "utf8");
|
||||||
const configData = substituteEnvironmentVars(rawConfigData);
|
const configData = substituteEnvironmentVars(rawConfigData);
|
||||||
return yaml.load(configData);
|
return loadYaml(configData);
|
||||||
}
|
}
|
||||||
|
|
||||||
export const getKubeConfig = () => {
|
export const getKubeConfig = () => {
|
||||||
@@ -21,6 +22,10 @@ export const getKubeConfig = () => {
|
|||||||
switch (config?.mode) {
|
switch (config?.mode) {
|
||||||
case "cluster":
|
case "cluster":
|
||||||
kc.loadFromCluster();
|
kc.loadFromCluster();
|
||||||
|
// node < 26 can't match an IPv6 host against an IP SAN, so verify against the DNS SAN instead (nodejs/node#64032)
|
||||||
|
if (isIPv6(process.env.KUBERNETES_SERVICE_HOST ?? "")) {
|
||||||
|
kc.clusters = kc.clusters.map((cluster) => ({ ...cluster, tlsServerName: "kubernetes.default.svc" }));
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case "default":
|
case "default":
|
||||||
kc.loadFromDefault();
|
kc.loadFromDefault();
|
||||||
|
|||||||
@@ -32,10 +32,7 @@ vi.mock("fs", () => ({
|
|||||||
readFileSync: fs.readFileSync,
|
readFileSync: fs.readFileSync,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("js-yaml", () => ({
|
vi.mock("utils/config/yaml", () => ({ loadYaml: yaml.load }));
|
||||||
default: yaml,
|
|
||||||
...yaml,
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("utils/config/config", () => ({
|
vi.mock("utils/config/config", () => ({
|
||||||
default: checkAndCopyConfig,
|
default: checkAndCopyConfig,
|
||||||
@@ -46,6 +43,7 @@ vi.mock("@kubernetes/client-node", () => ({
|
|||||||
ApiextensionsV1Api: class ApiextensionsV1Api {},
|
ApiextensionsV1Api: class ApiextensionsV1Api {},
|
||||||
KubeConfig: class KubeConfig {
|
KubeConfig: class KubeConfig {
|
||||||
loadFromCluster() {
|
loadFromCluster() {
|
||||||
|
this.clusters = [{ name: "inCluster", server: "https://host:443", skipTLSVerify: false }];
|
||||||
return kube.loadFromCluster();
|
return kube.loadFromCluster();
|
||||||
}
|
}
|
||||||
loadFromDefault() {
|
loadFromDefault() {
|
||||||
@@ -88,6 +86,27 @@ describe("utils/config/kubernetes", () => {
|
|||||||
expect(kc2).not.toBeNull();
|
expect(kc2).not.toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("getKubeConfig sets tlsServerName when the in-cluster host is IPv6", () => {
|
||||||
|
vi.stubEnv("KUBERNETES_SERVICE_HOST", "fd00:1018:2000::1");
|
||||||
|
yaml.load.mockReturnValueOnce({ mode: "cluster" });
|
||||||
|
|
||||||
|
expect(getKubeConfig().clusters[0]).toMatchObject({
|
||||||
|
name: "inCluster",
|
||||||
|
tlsServerName: "kubernetes.default.svc",
|
||||||
|
});
|
||||||
|
|
||||||
|
vi.unstubAllEnvs();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("getKubeConfig leaves tlsServerName unset for non-IPv6 in-cluster hosts", () => {
|
||||||
|
vi.stubEnv("KUBERNETES_SERVICE_HOST", "10.43.0.1");
|
||||||
|
yaml.load.mockReturnValueOnce({ mode: "cluster" });
|
||||||
|
|
||||||
|
expect(getKubeConfig().clusters[0].tlsServerName).toBeUndefined();
|
||||||
|
|
||||||
|
vi.unstubAllEnvs();
|
||||||
|
});
|
||||||
|
|
||||||
it("checkCRD returns true when the CRD exists", async () => {
|
it("checkCRD returns true when the CRD exists", async () => {
|
||||||
apiExt.readCustomResourceDefinitionStatus.mockResolvedValueOnce({ ok: true });
|
apiExt.readCustomResourceDefinitionStatus.mockResolvedValueOnce({ ok: true });
|
||||||
const logger = { error: vi.fn() };
|
const logger = { error: vi.fn() };
|
||||||
|
|||||||
@@ -1,14 +1,13 @@
|
|||||||
import { readFileSync } from "fs";
|
import { readFileSync } from "fs";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
|
|
||||||
import yaml from "js-yaml";
|
|
||||||
|
|
||||||
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
|
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
|
||||||
|
import { loadYaml } from "utils/config/yaml";
|
||||||
|
|
||||||
export function getProxmoxConfig() {
|
export function getProxmoxConfig() {
|
||||||
checkAndCopyConfig("proxmox.yaml");
|
checkAndCopyConfig("proxmox.yaml");
|
||||||
const configFile = path.join(CONF_DIR, "proxmox.yaml");
|
const configFile = path.join(CONF_DIR, "proxmox.yaml");
|
||||||
const rawConfigData = readFileSync(configFile, "utf8");
|
const rawConfigData = readFileSync(configFile, "utf8");
|
||||||
const configData = substituteEnvironmentVars(rawConfigData);
|
const configData = substituteEnvironmentVars(rawConfigData);
|
||||||
return yaml.load(configData);
|
return loadYaml(configData);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,10 +18,7 @@ vi.mock("fs", () => ({
|
|||||||
readFileSync: fs.readFileSync,
|
readFileSync: fs.readFileSync,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("js-yaml", () => ({
|
vi.mock("utils/config/yaml", () => ({ loadYaml: yaml.load }));
|
||||||
default: yaml,
|
|
||||||
...yaml,
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("utils/config/config", () => ({
|
vi.mock("utils/config/config", () => ({
|
||||||
default: checkAndCopyConfig,
|
default: checkAndCopyConfig,
|
||||||
|
|||||||
@@ -2,12 +2,12 @@ import { promises as fs } from "fs";
|
|||||||
import path from "path";
|
import path from "path";
|
||||||
|
|
||||||
import Docker from "dockerode";
|
import Docker from "dockerode";
|
||||||
import yaml from "js-yaml";
|
|
||||||
|
|
||||||
import checkAndCopyConfig, { CONF_DIR, getSettings, substituteEnvironmentVars } from "utils/config/config";
|
import checkAndCopyConfig, { CONF_DIR, getSettings, substituteEnvironmentVars } from "utils/config/config";
|
||||||
import getDockerArguments from "utils/config/docker";
|
import getDockerArguments from "utils/config/docker";
|
||||||
import { getKubeConfig } from "utils/config/kubernetes";
|
import { getKubeConfig } from "utils/config/kubernetes";
|
||||||
import * as shvl from "utils/config/shvl";
|
import * as shvl from "utils/config/shvl";
|
||||||
|
import { loadYaml } from "utils/config/yaml";
|
||||||
import kubernetes from "utils/kubernetes/export";
|
import kubernetes from "utils/kubernetes/export";
|
||||||
import createLogger from "utils/logger";
|
import createLogger from "utils/logger";
|
||||||
import { parseVersionForUrl } from "utils/proxy/api-helpers";
|
import { parseVersionForUrl } from "utils/proxy/api-helpers";
|
||||||
@@ -56,7 +56,7 @@ export async function servicesFromConfig() {
|
|||||||
const servicesYaml = path.join(CONF_DIR, "services.yaml");
|
const servicesYaml = path.join(CONF_DIR, "services.yaml");
|
||||||
const rawFileContents = await fs.readFile(servicesYaml, "utf8");
|
const rawFileContents = await fs.readFile(servicesYaml, "utf8");
|
||||||
const fileContents = substituteEnvironmentVars(rawFileContents);
|
const fileContents = substituteEnvironmentVars(rawFileContents);
|
||||||
const services = yaml.load(fileContents);
|
const services = loadYaml(fileContents);
|
||||||
return parseServicesToGroups(services);
|
return parseServicesToGroups(services);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,7 +66,7 @@ export async function servicesFromDocker() {
|
|||||||
const dockerYaml = path.join(CONF_DIR, "docker.yaml");
|
const dockerYaml = path.join(CONF_DIR, "docker.yaml");
|
||||||
const rawDockerFileContents = await fs.readFile(dockerYaml, "utf8");
|
const rawDockerFileContents = await fs.readFile(dockerYaml, "utf8");
|
||||||
const dockerFileContents = substituteEnvironmentVars(rawDockerFileContents);
|
const dockerFileContents = substituteEnvironmentVars(rawDockerFileContents);
|
||||||
const servers = yaml.load(dockerFileContents);
|
const servers = loadYaml(dockerFileContents);
|
||||||
|
|
||||||
if (!servers) {
|
if (!servers) {
|
||||||
return [];
|
return [];
|
||||||
|
|||||||
@@ -70,10 +70,7 @@ vi.mock("fs", () => ({
|
|||||||
promises: fs,
|
promises: fs,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("js-yaml", () => ({
|
vi.mock("utils/config/yaml", () => ({ loadYaml: yaml.load }));
|
||||||
default: yaml,
|
|
||||||
...yaml,
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("utils/config/config", () => config);
|
vi.mock("utils/config/config", () => config);
|
||||||
vi.mock("dockerode", () => ({ default: Docker }));
|
vi.mock("dockerode", () => ({ default: Docker }));
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
import { promises as fs } from "fs";
|
import { promises as fs } from "fs";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
|
|
||||||
import yaml from "js-yaml";
|
|
||||||
|
|
||||||
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
|
import checkAndCopyConfig, { CONF_DIR, substituteEnvironmentVars } from "utils/config/config";
|
||||||
|
import { loadYaml } from "utils/config/yaml";
|
||||||
|
|
||||||
export async function widgetsFromConfig() {
|
export async function widgetsFromConfig() {
|
||||||
checkAndCopyConfig("widgets.yaml");
|
checkAndCopyConfig("widgets.yaml");
|
||||||
@@ -11,7 +10,7 @@ export async function widgetsFromConfig() {
|
|||||||
const widgetsYaml = path.join(CONF_DIR, "widgets.yaml");
|
const widgetsYaml = path.join(CONF_DIR, "widgets.yaml");
|
||||||
const rawFileContents = await fs.readFile(widgetsYaml, "utf8");
|
const rawFileContents = await fs.readFile(widgetsYaml, "utf8");
|
||||||
const fileContents = substituteEnvironmentVars(rawFileContents);
|
const fileContents = substituteEnvironmentVars(rawFileContents);
|
||||||
const widgets = yaml.load(fileContents);
|
const widgets = loadYaml(fileContents);
|
||||||
|
|
||||||
if (!widgets) return [];
|
if (!widgets) return [];
|
||||||
|
|
||||||
|
|||||||
@@ -18,10 +18,7 @@ vi.mock("fs", () => ({
|
|||||||
promises: fs,
|
promises: fs,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("js-yaml", () => ({
|
vi.mock("utils/config/yaml", () => ({ loadYaml: yaml.load }));
|
||||||
default: yaml,
|
|
||||||
...yaml,
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("utils/config/config", () => config);
|
vi.mock("utils/config/config", () => config);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import * as yaml from "js-yaml";
|
||||||
|
|
||||||
|
const EMPTY_DOCUMENT_ERROR = "expected a document, but the input is empty";
|
||||||
|
const DEFAULT_SCHEMA = yaml.CORE_SCHEMA.withTags(yaml.timestampTag, yaml.mergeTag, yaml.legacyMapTag);
|
||||||
|
|
||||||
|
export function loadYaml(input, options) {
|
||||||
|
try {
|
||||||
|
return yaml.load(input, { schema: DEFAULT_SCHEMA, ...options });
|
||||||
|
} catch (error) {
|
||||||
|
// js-yaml v4 returned undefined for empty and comment-only documents.
|
||||||
|
if (error?.reason === EMPTY_DOCUMENT_ERROR) return undefined;
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
import { loadYaml } from "./yaml";
|
||||||
|
|
||||||
|
describe("utils/config/yaml", () => {
|
||||||
|
it.each(["", " \n", "# comment only\n"])("loads an empty document from %j as undefined", (input) => {
|
||||||
|
expect(loadYaml(input)).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("loads a populated document", () => {
|
||||||
|
expect(loadYaml("title: Homepage\n")).toEqual({ title: "Homepage" });
|
||||||
|
});
|
||||||
|
|
||||||
|
it("preserves v4 merge key behavior", () => {
|
||||||
|
expect(loadYaml("defaults: &defaults\n href: https://example.com\nservice:\n <<: *defaults\n")).toEqual({
|
||||||
|
defaults: { href: "https://example.com" },
|
||||||
|
service: { href: "https://example.com" },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("preserves v4 timestamp behavior without enabling YAML 1.1 booleans", () => {
|
||||||
|
expect(loadYaml("date: 2026-08-21\nenabled: yes\n")).toEqual({
|
||||||
|
date: new Date("2026-08-21T00:00:00.000Z"),
|
||||||
|
enabled: "yes",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("preserves v4 handling of non-string keys", () => {
|
||||||
|
// an unsubstituted {{HOMEPAGE_VAR_*}} parses as a flow mapping key
|
||||||
|
expect(loadYaml("- Plex:\n widget:\n key: {{HOMEPAGE_VAR_PLEX_KEY}}\n")).toEqual([
|
||||||
|
{ Plex: { widget: { key: { "[object Object]": null } } } },
|
||||||
|
]);
|
||||||
|
expect(loadYaml("- Backups:\n - 2024-01-01:\n href: http://x\n")).toEqual([
|
||||||
|
{ Backups: [{ [String(new Date("2024-01-01T00:00:00.000Z"))]: { href: "http://x" } }] },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("still rejects invalid YAML", () => {
|
||||||
|
expect(() => loadYaml("value: [\n")).toThrow();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -30,10 +30,6 @@ export function ColorProvider({ initialTheme, children }) {
|
|||||||
lastColor = rawColor;
|
lastColor = rawColor;
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (initialTheme !== undefined) setColor(initialTheme ?? getInitialColor());
|
|
||||||
}, [initialTheme]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
rawSetColor(color);
|
rawSetColor(color);
|
||||||
}, [color]);
|
}, [color]);
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
import { createContext, useEffect, useMemo, useState } from "react";
|
import { createContext, useMemo, useState } from "react";
|
||||||
|
|
||||||
export const SettingsContext = createContext();
|
export const SettingsContext = createContext();
|
||||||
|
|
||||||
export function SettingsProvider({ initialSettings, children }) {
|
export function SettingsProvider({ initialSettings, children }) {
|
||||||
const [settings, setSettings] = useState(() => initialSettings ?? {});
|
const [settings, setSettings] = useState(() => initialSettings ?? {});
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (initialSettings !== undefined) setSettings(initialSettings ?? {});
|
|
||||||
}, [initialSettings]);
|
|
||||||
|
|
||||||
const value = useMemo(() => ({ settings, setSettings }), [settings]);
|
const value = useMemo(() => ({ settings, setSettings }), [settings]);
|
||||||
|
|
||||||
return <SettingsContext.Provider value={value}>{children}</SettingsContext.Provider>;
|
return <SettingsContext.Provider value={value}>{children}</SettingsContext.Provider>;
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
import { createContext, useEffect, useMemo, useState } from "react";
|
import { createContext, useMemo, useState } from "react";
|
||||||
|
|
||||||
export const TabContext = createContext();
|
export const TabContext = createContext();
|
||||||
|
|
||||||
export function TabProvider({ initialTab, children }) {
|
export function TabProvider({ initialTab, children }) {
|
||||||
const [activeTab, setActiveTab] = useState(() => initialTab ?? false);
|
const [activeTab, setActiveTab] = useState(() => initialTab ?? false);
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (initialTab !== undefined) setActiveTab(initialTab ?? false);
|
|
||||||
}, [initialTab]);
|
|
||||||
|
|
||||||
const value = useMemo(() => ({ activeTab, setActiveTab }), [activeTab]);
|
const value = useMemo(() => ({ activeTab, setActiveTab }), [activeTab]);
|
||||||
|
|
||||||
return <TabContext.Provider value={value}>{children}</TabContext.Provider>;
|
return <TabContext.Provider value={value}>{children}</TabContext.Provider>;
|
||||||
|
|||||||
@@ -31,10 +31,6 @@ export function ThemeProvider({ initialTheme, children }) {
|
|||||||
localStorage.setItem("theme-mode", rawTheme);
|
localStorage.setItem("theme-mode", rawTheme);
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (initialTheme !== undefined) setTheme(initialTheme ?? getInitialTheme());
|
|
||||||
}, [initialTheme]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
rawSetTheme(theme);
|
rawSetTheme(theme);
|
||||||
}, [theme]);
|
}, [theme]);
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
import { useSyncExternalStore } from "react";
|
||||||
|
|
||||||
|
const MINUTE = 60_000;
|
||||||
|
const stores = new Map();
|
||||||
|
|
||||||
|
function getStore(refreshInterval) {
|
||||||
|
const existing = stores.get(refreshInterval);
|
||||||
|
if (existing) return existing;
|
||||||
|
|
||||||
|
const listeners = new Set();
|
||||||
|
let now = null; // null until mounted, so SSR and hydration render the same thing
|
||||||
|
let timer = null;
|
||||||
|
|
||||||
|
const store = {
|
||||||
|
getSnapshot: () => now,
|
||||||
|
subscribe: (onStoreChange) => {
|
||||||
|
listeners.add(onStoreChange);
|
||||||
|
|
||||||
|
if (!timer) {
|
||||||
|
now = Date.now();
|
||||||
|
timer = setInterval(() => {
|
||||||
|
now = Date.now();
|
||||||
|
listeners.forEach((listener) => listener());
|
||||||
|
}, refreshInterval);
|
||||||
|
}
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
listeners.delete(onStoreChange);
|
||||||
|
if (!listeners.size) {
|
||||||
|
clearInterval(timer);
|
||||||
|
timer = null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
stores.set(refreshInterval, store);
|
||||||
|
return store;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns null on the server and during hydration, then the current time.
|
||||||
|
export default function useCurrentTime(refreshInterval = MINUTE) {
|
||||||
|
const { subscribe, getSnapshot } = getStore(refreshInterval);
|
||||||
|
return useSyncExternalStore(subscribe, getSnapshot, () => null);
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
// @vitest-environment jsdom
|
||||||
|
|
||||||
|
import { act, render, screen } from "@testing-library/react";
|
||||||
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
|
import useCurrentTime from "./use-current-time";
|
||||||
|
|
||||||
|
function CurrentTime({ refreshInterval }) {
|
||||||
|
return <span>{useCurrentTime(refreshInterval)}</span>;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("utils/hooks/use-current-time", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.useFakeTimers();
|
||||||
|
vi.setSystemTime(1_000);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.useRealTimers();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("updates at the requested interval", () => {
|
||||||
|
render(<CurrentTime refreshInterval={5_000} />);
|
||||||
|
expect(screen.getByText("1000")).toBeInTheDocument();
|
||||||
|
|
||||||
|
act(() => {
|
||||||
|
vi.advanceTimersByTime(5_000);
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(screen.getByText("6000")).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,26 +1,17 @@
|
|||||||
import { useEffect, useState } from "react";
|
import { useSyncExternalStore } from "react";
|
||||||
|
|
||||||
const hasFocus = () => typeof document !== "undefined" && document.hasFocus();
|
const hasFocus = () => typeof document !== "undefined" && document.hasFocus();
|
||||||
|
|
||||||
const useWindowFocus = () => {
|
const subscribe = (onFocusChange) => {
|
||||||
const [focused, setFocused] = useState(hasFocus);
|
window.addEventListener("focus", onFocusChange);
|
||||||
|
window.addEventListener("blur", onFocusChange);
|
||||||
|
|
||||||
useEffect(() => {
|
return () => {
|
||||||
setFocused(hasFocus());
|
window.removeEventListener("focus", onFocusChange);
|
||||||
|
window.removeEventListener("blur", onFocusChange);
|
||||||
const onFocus = () => setFocused(true);
|
};
|
||||||
const onBlur = () => setFocused(false);
|
|
||||||
|
|
||||||
window.addEventListener("focus", onFocus);
|
|
||||||
window.addEventListener("blur", onBlur);
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
window.removeEventListener("focus", onFocus);
|
|
||||||
window.removeEventListener("blur", onBlur);
|
|
||||||
};
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
return focused;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const useWindowFocus = () => useSyncExternalStore(subscribe, hasFocus, () => false);
|
||||||
|
|
||||||
export default useWindowFocus;
|
export default useWindowFocus;
|
||||||
|
|||||||
@@ -12,15 +12,17 @@ function Fixture() {
|
|||||||
|
|
||||||
describe("utils/hooks/window-focus", () => {
|
describe("utils/hooks/window-focus", () => {
|
||||||
it("tracks focus/blur events", async () => {
|
it("tracks focus/blur events", async () => {
|
||||||
vi.spyOn(document, "hasFocus").mockReturnValue(true);
|
const hasFocus = vi.spyOn(document, "hasFocus").mockReturnValue(true);
|
||||||
|
|
||||||
render(<Fixture />);
|
render(<Fixture />);
|
||||||
|
|
||||||
expect(screen.getByTestId("focused")).toHaveTextContent("true");
|
expect(screen.getByTestId("focused")).toHaveTextContent("true");
|
||||||
|
|
||||||
|
hasFocus.mockReturnValue(false);
|
||||||
window.dispatchEvent(new Event("blur"));
|
window.dispatchEvent(new Event("blur"));
|
||||||
await waitFor(() => expect(screen.getByTestId("focused")).toHaveTextContent("false"));
|
await waitFor(() => expect(screen.getByTestId("focused")).toHaveTextContent("false"));
|
||||||
|
|
||||||
|
hasFocus.mockReturnValue(true);
|
||||||
window.dispatchEvent(new Event("focus"));
|
window.dispatchEvent(new Event("focus"));
|
||||||
await waitFor(() => expect(screen.getByTestId("focused")).toHaveTextContent("true"));
|
await waitFor(() => expect(screen.getByTestId("focused")).toHaveTextContent("true"));
|
||||||
});
|
});
|
||||||
|
|||||||
+6
-13
@@ -18,23 +18,16 @@ function combineMessageAndSplat() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function messageFormatter(logInfo) {
|
function messageFormatter(logInfo) {
|
||||||
if (logInfo.label) {
|
const label = logInfo.label ? `<${logInfo.label}> ` : "";
|
||||||
if (logInfo.stack) {
|
// e.g. fetch errors say nothing useful without the cause
|
||||||
return `[${logInfo.timestamp}] ${logInfo.level}: <${logInfo.label}> ${logInfo.stack}`;
|
const cause = logInfo.cause ? `\ncaused by: ${logInfo.cause.stack ?? logInfo.cause}` : "";
|
||||||
}
|
return `[${logInfo.timestamp}] ${logInfo.level}: ${label}${logInfo.stack || logInfo.message}${cause}`;
|
||||||
return `[${logInfo.timestamp}] ${logInfo.level}: <${logInfo.label}> ${logInfo.message}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (logInfo.stack) {
|
|
||||||
return `[${logInfo.timestamp}] ${logInfo.level}: ${logInfo.stack}`;
|
|
||||||
}
|
|
||||||
return `[${logInfo.timestamp}] ${logInfo.level}: ${logInfo.message}`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function getConsoleLogger() {
|
function getConsoleLogger() {
|
||||||
return new winston.transports.Console({
|
return new winston.transports.Console({
|
||||||
format: winston.format.combine(
|
format: winston.format.combine(
|
||||||
winston.format.errors({ stack: true }),
|
winston.format.errors({ stack: true, cause: true }),
|
||||||
combineMessageAndSplat(),
|
combineMessageAndSplat(),
|
||||||
winston.format.timestamp(),
|
winston.format.timestamp(),
|
||||||
winston.format.colorize(),
|
winston.format.colorize(),
|
||||||
@@ -51,7 +44,7 @@ function getFileLogger() {
|
|||||||
|
|
||||||
return new winston.transports.File({
|
return new winston.transports.File({
|
||||||
format: winston.format.combine(
|
format: winston.format.combine(
|
||||||
winston.format.errors({ stack: true }),
|
winston.format.errors({ stack: true, cause: true }),
|
||||||
combineMessageAndSplat(),
|
combineMessageAndSplat(),
|
||||||
winston.format.timestamp(),
|
winston.format.timestamp(),
|
||||||
winston.format.printf(messageFormatter),
|
winston.format.printf(messageFormatter),
|
||||||
|
|||||||
@@ -170,6 +170,16 @@ describe("utils/logger", () => {
|
|||||||
});
|
});
|
||||||
expect(plainMsg).toBe("[t] info: hello");
|
expect(plainMsg).toBe("[t] info: hello");
|
||||||
|
|
||||||
|
const causeMsg = formatter({
|
||||||
|
timestamp: "t",
|
||||||
|
level: "error",
|
||||||
|
label: "x",
|
||||||
|
stack: "STACK",
|
||||||
|
message: "fetch failed",
|
||||||
|
cause: { stack: "CAUSE STACK" },
|
||||||
|
});
|
||||||
|
expect(causeMsg).toBe("[t] error: <x> STACK\ncaused by: CAUSE STACK");
|
||||||
|
|
||||||
const out = splat.transform(
|
const out = splat.transform(
|
||||||
{
|
{
|
||||||
message: "Hello %s",
|
message: "Hello %s",
|
||||||
|
|||||||
@@ -2,9 +2,10 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
|
|||||||
import { createHash, timingSafeEqual } from "node:crypto";
|
import { createHash, timingSafeEqual } from "node:crypto";
|
||||||
import { join } from "path";
|
import { join } from "path";
|
||||||
|
|
||||||
import yaml from "js-yaml";
|
import * as yaml from "js-yaml";
|
||||||
|
|
||||||
import { CONF_DIR } from "utils/config/config";
|
import { CONF_DIR } from "utils/config/config";
|
||||||
|
import { loadYaml } from "utils/config/yaml";
|
||||||
|
|
||||||
const PROTOCOL_VERSION = "2025-11-25";
|
const PROTOCOL_VERSION = "2025-11-25";
|
||||||
const SERVER_INFO = {
|
const SERVER_INFO = {
|
||||||
@@ -118,7 +119,7 @@ function readConfig(file) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function parseYamlConfig(file) {
|
function parseYamlConfig(file) {
|
||||||
const parsed = yaml.load(readConfig(file) || "");
|
const parsed = loadYaml(readConfig(file) || "");
|
||||||
return parsed ?? [];
|
return parsed ?? [];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -128,7 +129,7 @@ function validateYaml(file, content) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
yaml.load(content || "");
|
loadYaml(content || "");
|
||||||
return { valid: true };
|
return { valid: true };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -2,13 +2,13 @@ import useSWR from "swr";
|
|||||||
|
|
||||||
import { formatProxyUrl } from "./api-helpers";
|
import { formatProxyUrl } from "./api-helpers";
|
||||||
|
|
||||||
export default function useWidgetAPI(widget, ...options) {
|
export default function useWidgetAPI(widget, endpoint, queryParams, swrConfig = {}) {
|
||||||
const config = {};
|
const config = { ...swrConfig };
|
||||||
if (options && options[1]?.refreshInterval) {
|
if (queryParams?.refreshInterval) {
|
||||||
config.refreshInterval = options[1].refreshInterval;
|
config.refreshInterval = queryParams.refreshInterval;
|
||||||
}
|
}
|
||||||
let url = formatProxyUrl(widget, ...options);
|
let url = formatProxyUrl(widget, endpoint, queryParams);
|
||||||
if (options[0] === "") {
|
if (endpoint === "") {
|
||||||
url = null;
|
url = null;
|
||||||
}
|
}
|
||||||
const { data, error, mutate } = useSWR(url, config);
|
const { data, error, mutate } = useSWR(url, config);
|
||||||
|
|||||||
@@ -28,6 +28,18 @@ describe("utils/proxy/use-widget-api", () => {
|
|||||||
expect(result.mutate).toBe("m");
|
expect(result.mutate).toBe("m");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("passes additional SWR configuration separately from the proxy query", () => {
|
||||||
|
useSWR.mockReturnValue({ data: undefined, error: undefined, mutate: vi.fn() });
|
||||||
|
|
||||||
|
const widget = { service_group: "g", service_name: "s", index: 0 };
|
||||||
|
const onSuccess = vi.fn();
|
||||||
|
useWidgetAPI(widget, "status", { refreshInterval: 123 }, { onSuccess });
|
||||||
|
|
||||||
|
const [url, config] = useSWR.mock.calls[0];
|
||||||
|
expect(url).not.toContain("onSuccess");
|
||||||
|
expect(config).toEqual({ refreshInterval: 123, onSuccess });
|
||||||
|
});
|
||||||
|
|
||||||
it("returns data.error as the top-level error", () => {
|
it("returns data.error as the top-level error", () => {
|
||||||
const dataError = { message: "nope" };
|
const dataError = { message: "nope" };
|
||||||
useSWR.mockReturnValue({ data: { error: dataError }, error: undefined, mutate: vi.fn() });
|
useSWR.mockReturnValue({ data: { error: dataError }, error: undefined, mutate: vi.fn() });
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user