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

Jump to bottom

Feature/osis 9086 #38

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

Feature/osis 9086 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cad0a95
[OSIS- 9086] MG BS5 - replace data-toggle by data-bs-toggle
leboiss Sep 3, 2024
b949dc7
[OSIS-9086] MG BS5 - make history compatible with BS3 and 5
leboiss Sep 3, 2024
a931e06
[OSIS-9086] Update osis-history to 0.4.4
leboiss Sep 4, 2024
57d29bf
[OSIS-9086] Update osis-history to 0.4.4
leboiss Sep 4, 2024
09d0893
[OSIS-9086] update nvm rc to v22
leboiss Sep 4, 2024
c072571
[OSIS-9086] upadate github-actions to 22
leboiss Sep 4, 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
4 changes: 2 additions & 2 deletions .github/workflows/github-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 14.x
node-version: 22.x

- name: Cache npm dependencies
uses: actions/cache@v2
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 14.x
node-version: 22.x

- name: Cache npm dependencies
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v14.21.3
v22
4 changes: 3 additions & 1 deletion frontend/HistoryViewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
v-if="modes.length > 1"
class="btn-group"
data-toggle="buttons"
data-bs-toggle="buttons"
>
<template
v-for="buttonMode in modes"
Expand Down Expand Up @@ -194,7 +195,8 @@ export default defineComponent({
animation: spin 1.5s linear infinite;
}

[data-toggle=buttons]>.btn input[type=radio] {
[data-toggle=buttons]>.btn input[type=radio],
[data-bs-toggle=buttons]>.btn input[type=radio] {
position: absolute;
clip: rect(0, 0, 0, 0);
pointer-events: none;
Expand Down
32 changes: 16 additions & 16 deletions frontend/__snapshots__/HistoryViewer.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`exception 1`] = `
"<div class=\\"btn-group\\" data-toggle=\\"buttons\\"><label class=\\"btn btn-default active\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-table\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fas fa-ellipsis-v\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-ellipsis-h\\"></span></label></div>
<div class=\\"viewport\\"><span class=\\"text-danger\\">Some network error</span></div>"
"<div data-v-a76551b6=\\"\\" class=\\"btn-group\\" data-toggle=\\"buttons\\" data-bs-toggle=\\"buttons\\"><label data-v-a76551b6=\\"\\" class=\\"btn btn-default active\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-table\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fas fa-ellipsis-v\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-ellipsis-h\\"></span></label></div>
<div data-v-a76551b6=\\"\\" class=\\"viewport\\"><span data-v-a76551b6=\\"\\" class=\\"text-danger\\">Some network error</span></div>"
`;

exports[`filtering on tag only 1`] = `
"<div class=\\"btn-group\\" data-toggle=\\"buttons\\"><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-table\\"></span></label><label class=\\"btn btn-default active\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fas fa-ellipsis-v\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-ellipsis-h\\"></span></label></div>
<div class=\\"viewport\\">
<div>
"<div data-v-a76551b6=\\"\\" class=\\"btn-group\\" data-toggle=\\"buttons\\" data-bs-toggle=\\"buttons\\"><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-table\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default active\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fas fa-ellipsis-v\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-ellipsis-h\\"></span></label></div>
<div data-v-a76551b6=\\"\\" class=\\"viewport\\">
<div data-v-a76551b6=\\"\\">
<ul class=\\"timeline\\">
<li class=\\"timeline-item\\">
<div class=\\"timeline-badge\\"></div>
Expand Down Expand Up @@ -55,14 +55,14 @@ exports[`filtering on tag only 1`] = `
`;

exports[`http error 1`] = `
"<div class=\\"btn-group\\" data-toggle=\\"buttons\\"><label class=\\"btn btn-default active\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-table\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fas fa-ellipsis-v\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-ellipsis-h\\"></span></label></div>
<div class=\\"viewport\\"><span class=\\"text-danger\\">Not Found</span></div>"
"<div data-v-a76551b6=\\"\\" class=\\"btn-group\\" data-toggle=\\"buttons\\" data-bs-toggle=\\"buttons\\"><label data-v-a76551b6=\\"\\" class=\\"btn btn-default active\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-table\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fas fa-ellipsis-v\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-ellipsis-h\\"></span></label></div>
<div data-v-a76551b6=\\"\\" class=\\"viewport\\"><span data-v-a76551b6=\\"\\" class=\\"text-danger\\">Not Found</span></div>"
`;

exports[`no history 1`] = `
"<div class=\\"btn-group\\" data-toggle=\\"buttons\\"><label class=\\"btn btn-default active\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-table\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fas fa-ellipsis-v\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-ellipsis-h\\"></span></label></div>
<div class=\\"viewport\\">
<table class=\\"table table-striped\\" horizontal=\\"false\\">
"<div data-v-a76551b6=\\"\\" class=\\"btn-group\\" data-toggle=\\"buttons\\" data-bs-toggle=\\"buttons\\"><label data-v-a76551b6=\\"\\" class=\\"btn btn-default active\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-table\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fas fa-ellipsis-v\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-ellipsis-h\\"></span></label></div>
<div data-v-a76551b6=\\"\\" class=\\"viewport\\">
<table data-v-a76551b6=\\"\\" class=\\"table table-striped\\" horizontal=\\"false\\">
<thead>
<tr>
<th>date</th>
Expand All @@ -80,9 +80,9 @@ exports[`no history 1`] = `
`;

exports[`two modes with bad default 1`] = `
"<div class=\\"btn-group\\" data-toggle=\\"buttons\\"><label class=\\"btn btn-default active\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-table\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-ellipsis-h\\"></span></label></div>
<div class=\\"viewport\\">
<table class=\\"table table-striped\\" horizontal=\\"false\\">
"<div data-v-a76551b6=\\"\\" class=\\"btn-group\\" data-toggle=\\"buttons\\" data-bs-toggle=\\"buttons\\"><label data-v-a76551b6=\\"\\" class=\\"btn btn-default active\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-table\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-ellipsis-h\\"></span></label></div>
<div data-v-a76551b6=\\"\\" class=\\"viewport\\">
<table data-v-a76551b6=\\"\\" class=\\"table table-striped\\" horizontal=\\"false\\">
<thead>
<tr>
<th>date</th>
Expand Down Expand Up @@ -125,9 +125,9 @@ exports[`two modes with bad default 1`] = `
`;

exports[`with history 1`] = `
"<div class=\\"btn-group\\" data-toggle=\\"buttons\\"><label class=\\"btn btn-default active\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-table\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fas fa-ellipsis-v\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-ellipsis-h\\"></span></label></div>
<div class=\\"viewport\\">
<table class=\\"table table-striped\\" horizontal=\\"false\\">
"<div data-v-a76551b6=\\"\\" class=\\"btn-group\\" data-toggle=\\"buttons\\" data-bs-toggle=\\"buttons\\"><label data-v-a76551b6=\\"\\" class=\\"btn btn-default active\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-table\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fas fa-ellipsis-v\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-ellipsis-h\\"></span></label></div>
<div data-v-a76551b6=\\"\\" class=\\"viewport\\">
<table data-v-a76551b6=\\"\\" class=\\"table table-striped\\" horizontal=\\"false\\">
<thead>
<tr>
<th>date</th>
Expand Down
4 changes: 2 additions & 2 deletions frontend/__snapshots__/main.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

exports[`mount app with conversions 1`] = `
"
<div class=\\"history-viewer\\" data-url=\\"/api\\" data-v-app=\\"\\"><div class=\\"btn-group\\" data-toggle=\\"buttons\\"><label class=\\"btn btn-default active\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-table\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fas fa-ellipsis-v\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-ellipsis-h\\"></span></label></div><div class=\\"viewport\\"><table class=\\"table table-striped\\" horizontal=\\"false\\"><thead><tr><th>Date</th><th>Message</th><th>Author</th></tr></thead><tbody><tr><td colspan=\\"3\\">No history entry yet.</td></tr></tbody></table></div></div>
<div class=\\"history-viewer\\" data-url=\\"/api\\" data-modes=\\"table,horizontal\\" data-on-headers-render-table=\\"customOnHeadersRenderTable\\" data-v-app=\\"\\"><div class=\\"btn-group\\" data-toggle=\\"buttons\\"><label class=\\"btn btn-default active\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-table\\"></span></label><label class=\\"btn btn-default\\"><input type=\\"radio\\" name=\\"mode\\"><span class=\\"fa fa-ellipsis-h\\"></span></label></div><div class=\\"viewport\\"><table class=\\"table table-striped\\" horizontal=\\"false\\"><thead></thead><tbody><tr><td colspan=\\"3\\">No history entry yet.</td></tr></tbody></table></div></div>"
<div class=\\"history-viewer\\" data-url=\\"/api\\" data-v-app=\\"\\"><div data-v-a76551b6=\\"\\" class=\\"btn-group\\" data-toggle=\\"buttons\\" data-bs-toggle=\\"buttons\\"><label data-v-a76551b6=\\"\\" class=\\"btn btn-default active\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-table\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fas fa-ellipsis-v\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-ellipsis-h\\"></span></label></div><div data-v-a76551b6=\\"\\" class=\\"viewport\\"><table data-v-a76551b6=\\"\\" class=\\"table table-striped\\" horizontal=\\"false\\"><thead><tr><th>Date</th><th>Message</th><th>Author</th></tr></thead><tbody><tr><td colspan=\\"3\\">No history entry yet.</td></tr></tbody></table></div></div>
<div class=\\"history-viewer\\" data-url=\\"/api\\" data-modes=\\"table,horizontal\\" data-on-headers-render-table=\\"customOnHeadersRenderTable\\" data-v-app=\\"\\"><div data-v-a76551b6=\\"\\" class=\\"btn-group\\" data-toggle=\\"buttons\\" data-bs-toggle=\\"buttons\\"><label data-v-a76551b6=\\"\\" class=\\"btn btn-default active\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-table\\"></span></label><label data-v-a76551b6=\\"\\" class=\\"btn btn-default\\"><input data-v-a76551b6=\\"\\" type=\\"radio\\" name=\\"mode\\"><span data-v-a76551b6=\\"\\" class=\\"fa fa-ellipsis-h\\"></span></label></div><div data-v-a76551b6=\\"\\" class=\\"viewport\\"><table data-v-a76551b6=\\"\\" class=\\"table table-striped\\" horizontal=\\"false\\"><thead></thead><tbody><tr><td colspan=\\"3\\">No history entry yet.</td></tr></tbody></table></div></div>"
`;
2 changes: 1 addition & 1 deletion osis_history/static/osis_history/osis-history.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading