shell: Manifest validation upon import #21449
Draft
Conversation
This file contains 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
Member
mvollmer
commented
Dec 18, 2024
•
mvollmer
commented
- shell: Even more types #21425
mvollmer
added
the
blocked
|
This is quite WIPy still... |
mvollmer
added
the
no-test
cockpituous
reviewed
Dec 18, 2024
Comment on lines
+174
to
+176
| function validation_error(msg: string): never { | ||
| console.error(`JSON validation error for ${validation_path.join("")}: ${msg}`); | ||
| throw new ValidationError(); |
There was a problem hiding this comment.
These 3 added lines are not executed by any test.
| export function import_string(val: JsonValue): string { | ||
| if (typeof val == "string") | ||
| return val; | ||
| validation_error(`Not a string: ${JSON.stringify(val)}`); |
There was a problem hiding this comment.
This added line is not executed by any test.
| export function import_number(val: JsonValue): number { | ||
| if (typeof val == "number") | ||
| return val; | ||
| validation_error(`Not a number: ${JSON.stringify(val)}`); |
There was a problem hiding this comment.
This added line is not executed by any test.
Comment on lines
+191
to
+194
| export function import_boolean(val: JsonValue): boolean { | ||
| if (typeof val == "boolean") | ||
| return val; | ||
| validation_error(`Not a boolean: ${JSON.stringify(val)}`); |
There was a problem hiding this comment.
These 4 added lines are not executed by any test.
| export function import_json_object(val: JsonValue): JsonObject { | ||
| if (!!val && typeof val == "object" && val.length === undefined) | ||
| return val as JsonObject; | ||
| validation_error(`Not an object: ${JSON.stringify(val)}`); |
There was a problem hiding this comment.
This added line is not executed by any test.
Comment on lines
+262
to
+265
| } catch (e) { | ||
| if (!(e instanceof ValidationError)) | ||
| throw e; | ||
| return fallback; |
There was a problem hiding this comment.
These 4 added lines are not executed by any test.
pkg/shell/nav.tsx
Outdated
| if (begin < 0) | ||
| begin = all.length - 1; | ||
| all[begin].focus(); | ||
| } else { | ||
| let i = all.findIndex(item => item === cur); | ||
| i += step; | ||
| if (i < 0 || i >= all.length) | ||
| document.querySelector("#" + sel + " .pf-v5-c-text-input-group__text-input").focus(); | ||
| document.querySelector<HTMLElement>("#" + sel + " .pf-v5-c-text-input-group__text-input")?.focus(); |
There was a problem hiding this comment.
This added line is not executed by any test.
pkg/shell/nav.tsx
Outdated
Comment on lines
207
to
211
| if (g.action) | ||
| this.props.jump(g.action.target); |
There was a problem hiding this comment.
These 2 added lines are not executed by any test.
| @@ -140,8 +142,9 @@ export const LangModal = ({ dialogResult }) => { | |||
| <MenuList> | |||
| { | |||
| (() => { | |||
| const filteredLocales = Object.keys(manifest.locales || {}) | |||
| .filter(key => !searchInput || manifest.locales[key].toLowerCase().includes(searchInput.toString().toLowerCase())); | |||
| const locales = state.config.manifest.locales || {}; | |||
There was a problem hiding this comment.
This added line is not executed by any test.
| // global documentation for cockpit as a whole | ||
| (cockpit.manifests.shell?.docs ?? []).forEach(doc => { | ||
| (shell_manifest.docs ?? []).forEach(doc => { |
There was a problem hiding this comment.
This added line is not executed by any test.
This way, it is only validated once and not on every render.
mvollmer
removed
the
blocked
mvollmer
force-pushed
the
shell-validation
branch
from
c3fd607 to
e89ae83
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.