Skip to content

Bug/o2 b 412 #397

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

Merged
DimitrySteenkamer merged 3 commits into from
Aug 10, 2021
Merged

Bug/o2 b 412 #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1fa6ab
Removed payload line
DimitrySteenkamer Aug 5, 2021
f7614b7
Restored Data is failure.
DimitrySteenkamer Aug 10, 2021
c52f1b6
Merge branch 'master' into bug/O2B-412
DimitrySteenkamer Aug 10, 2021
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 lib/public/views/Logs/Create/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ const createLogScreen = (model) => {
'New tags can be created at the ',
h('a#tagCreateLink', {
onclick: (e) => model.router.handleLinkEvent(e),
href: '?page=tag-create',
href: '/?page=tag-create',
}, 'Create Tag'),
' screen.',
]),
h('select#tags.form-control', {
multiple: true,
onchange: (e) => model.logs.setSelectedTags(e.target.selectedOptions),
}, !tagsAvailable ? h('option', {
onclick: () => model.router.go('?page=tag-create'),
onclick: () => model.router.go('/?page=tag-create'),
}, h('a#tagCreateLink', {
}, noTagsText)) :
allTags.isSuccess() ? [
Expand Down
1 change: 1 addition & 0 deletions lib/public/views/Subsystems/Overview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const subsystemOverview = (model) => {
const data = model.subsystems.getSubsystems();

return [
data.isLoading() && spinner(),
h('h2.mv2', { onremove: () => model.subsystems.clearSubsystems() }, 'Subsystems'),
data.match({
NotAsked: () => {},
Expand Down
5 changes: 3 additions & 2 deletions lib/public/views/Tags/Create/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*/

import { h } from '/js/src/index.js';
import spinner from '../../../components/common/spinner.js';
import errorAlert from '../../../components/common/errorAlert.js';

/**
Expand All @@ -25,9 +26,9 @@ const createTagScreen = (model) => {

const disabled = text.length < 3 || text.length > 20 || data.isLoading();

return h('div#create-log', [
return h('div#create-tag', [
data.isLoading() && spinner(),
data.isFailure() && data.payload.map(errorAlert),

h('', {
onremove: () => model.tags.clearEditor(),
}, [
Expand Down