Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Log Viewer to MainUI #2884

Merged
merged 21 commits into from
Dec 8, 2024
Merged

Add Log Viewer to MainUI #2884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d7b8661
Initial log viewer
cdjackson Nov 20, 2024
6824eaa
Reasonably feature complete MVP other than editing highlights
cdjackson Nov 24, 2024
65f3ed5
Fix colour selector and tidy
cdjackson Nov 25, 2024
ca87992
Fix saving custom logger
cdjackson Nov 25, 2024
0d7b92a
Tidyup
cdjackson Nov 25, 2024
165c441
Further code tidy
cdjackson Nov 25, 2024
1935c2f
Pre-filter highlights to improve performance if users have large sets…
cdjackson Nov 26, 2024
ff65b4c
Use ROOT log level when adding custom logger
cdjackson Nov 26, 2024
cc2a889
Remove unused CSS
cdjackson Nov 26, 2024
e277040
Add ERROR filter, improve dark mode styling
cdjackson Nov 29, 2024
17449c6
Fix lint errors
cdjackson Nov 29, 2024
36e7f21
Proxy websockets connection in devserver
cdjackson Nov 30, 2024
ea249b0
Fix typo
cdjackson Dec 1, 2024
393748f
Refactorings, styling, moving things around
ghys Dec 5, 2024
6a2df57
fix linting
ghys Dec 5, 2024
7bacdc7
fix linting again
ghys Dec 5, 2024
d2c0aa6
Re-enable keep-alive and avoid exception
cdjackson Dec 5, 2024
0140e7e
Manage table directly in DOM
ghys Dec 7, 2024
9b00b82
Add missing CSS classes
ghys Dec 7, 2024
b80263b
Use batch processing of logs
cdjackson Dec 8, 2024
6707d06
Fix clearLog, disable test entries
ghys Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions bundles/org.openhab.ui/web/build/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ module.exports = {
errors: true,
runtimeErrors: false,
warnings: false
},
webSocketTransport: 'ws',
webSocketURL: {
pathname: '/ws'
}
},
static: [
Expand All @@ -68,6 +72,11 @@ module.exports = {
proxy: [{
context: ['/auth', '/rest', '/chart', '/proxy', '/icon', '/static', '/changePassword', '/createApiToken', '/audio'],
target: apiBaseUrl
},
{
context: "/ws/logs",
target: apiBaseUrl,
ws: true
}]
},
performance: {
Expand Down
6 changes: 5 additions & 1 deletion bundles/org.openhab.ui/web/src/components/app.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<!-- Developer Tools -->
<f7-list-item link="/developer/" :title="$t('sidebar.developerTools')" panel-close :animate="false"
:class="{ currentsection: currentUrl.indexOf('/developer/') === 0 && currentUrl.indexOf('/developer/widgets') < 0 &&
currentUrl.indexOf('/developer/blocks') < 0 && currentUrl.indexOf('/developer/api-explorer') < 0 }">
currentUrl.indexOf('/developer/blocks') < 0 && currentUrl.indexOf('/developer/api-explorer') < 0 && currentUrl.indexOf('/developer/log-viewer') < 0 }">
<f7-icon slot="media" ios="f7:wrench_fill" aurora="f7:wrench_fill" md="material:construction" color="gray" />
</f7-list-item>
<li v-if="showDeveloperSubmenu">
Expand All @@ -109,6 +109,10 @@
:class="{ currentsection: currentUrl.indexOf('/developer/api-explorer') === 0 }">
<f7-icon slot="media" f7="burn" color="gray" />
</f7-list-item>
<f7-list-item link="/developer/log-viewer" title="Log Viewer" view=".view-main" panel-close :animate="false" no-chevron
:class="{ currentsection: currentUrl.indexOf('/developer/log-viewer') === 0 }">
<f7-icon slot="media" f7="square_list" color="gray" />
</f7-list-item>
<!-- <f7-list-item link="" @click="$f7.emit('toggleDeveloperDock')" title="Dock" view=".view-main" panel-close :animate="false" no-chevron>
<f7-icon slot="media" :f7="$store.state.developerDock ? 'wrench_fill' : 'wrench'" color="gray" />
</f7-list-item> -->
Expand Down
6 changes: 6 additions & 0 deletions bundles/org.openhab.ui/web/src/js/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const WidgetEditPage = () => import(/* webpackChunkName: "admin-devtools" */ '..
const BlocksListPage = () => import(/* webpackChunkName: "admin-devtools" */ '../pages/developer/blocks/blocks-list.vue')
const BlocksEditPage = () => import(/* webpackChunkName: "blockly-editor" */ '../pages/developer/blocks/blocks-edit.vue')
const ApiExplorerPage = () => import(/* webpackChunkName: "admin-devtools" */ '../pages/developer/api-explorer.vue')
const LogViewerPage = () => import(/* webpackChunkName: "admin-devtools" */ '../pages/developer/log-viewer.vue')

const SetupWizardPage = () => import(/* webpackChunkName: "setup-wizard" */ '../pages/wizards/setup-wizard.vue')

Expand Down Expand Up @@ -501,6 +502,11 @@ export default [
path: 'api-explorer',
beforeEnter: [enforceAdminForRoute],
async: loadAsync(ApiExplorerPage)
},
{
path: 'log-viewer',
beforeEnter: [enforceAdminForRoute],
async: loadAsync(LogViewerPage)
}
]
},
Expand Down
3 changes: 3 additions & 0 deletions bundles/org.openhab.ui/web/src/pages/developer/developer-tools.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
<f7-list-item media-item title="API Explorer" footer="Discover and access the REST API directly" link="api-explorer">
<f7-icon slot="media" f7="burn" color="gray" />
</f7-list-item>
<f7-list-item media-item title="Log Viewer" footer="Monitor openHAB log output" link="log-viewer">
<f7-icon slot="media" f7="square_list" color="gray" />
</f7-list-item>
</f7-list>
</f7-col>
</f7-row>
Expand Down
Loading
Loading