systemd: guard against currentIdentifiers being undefined #22038
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mvollmer
reviewed
May 22, 2025
pkg/systemd/logsJournal.jsx
Outdated
| @@ -168,7 +168,7 @@ export class JournalBox extends React.Component { | |||
| const serviceTag = entries[i].SYSLOG_IDENTIFIER; | |||
| this.renderer.prepend(entries[i]); | |||
| // Only update if the service is not yet known | |||
| if (serviceTag && !this.props.currentIdentifiers.includes(serviceTag)) | |||
| if (serviceTag && this.props.currentIdentifiers && !this.props.currentIdentifiers.includes(serviceTag)) | |||
There was a problem hiding this comment.
This looks fishy. Without knowing the context, I would expect a falsy currentIdentifiers to be treated like the empty list. I.e.:
!(this.props.currentIdentifiers || []).includes(serviceTag)
There was a problem hiding this comment.
But it's probably better to initialize this.props.currentIdentifiers to [] explicitly, in the parent component.
jelly
force-pushed
the
oops-teardown-debug
branch
from
e54d97e to
29b9bfb
Compare
jelly
added
the
no-test
jelly
force-pushed
the
oops-teardown-debug
branch
2 times, most recently
from
d55ece2 to
57fe620
Compare
The initial state of `currentIdentifiers` is undefined, while unlikely to be triggered as prependEntries() is called after some promises are done. Adding a link to the logs page from cockpit-podman triggered and clicking it in our tests triggered: ``` TypeError: Cannot read properties of undefined (reading 'includes')"] ```
This issue has been uncovered by adding a link to the logs page from
cockpit-podman. Once clicking on it the initial state is undefined and
the ServiceDetails page raises an exception:
> error: TypeError: Cannot read properties of undefined (reading 'includes')
> error: The above error occurred in the <ServiceDetails> component:
at ServiceDetails (http://127.0.0.2:9091/cockpit/@localhost/system/services.js:38578:7)
jelly
force-pushed
the
oops-teardown-debug
branch
from
3ded2b1 to
20bbfb4
Compare
jelly
removed
the
no-test
jelly
force-pushed
the
oops-teardown-debug
branch
from
20bbfb4 to
6fbe36d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The initial state of
currentIdentifiersis undefined, while unlikely to be triggered as prependEntries() is called after some promises are done.Adding a link to the logs page from cockpit-podman triggered and clicking it in our tests triggered:
Not sure if this is a fix for this podman issue but it smells like it!