-
Notifications
You must be signed in to change notification settings - Fork 73
Fix product and patterns selection #2946
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.
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
Merged
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
71fab41
Update system software types
imobachgs eedea6d
Fix redirection to/from products page
imobachgs 4938af9
Extract software settings JSON schema to a separate file
imobachgs e246fea
Add model/config with software types
imobachgs 5694a41
Fix SelectedBy definition
imobachgs a724c21
Adapt the SoftwarePage component to the new API
imobachgs 1e077c0
Adapt SoftwarePatternsSelection component to the new API
imobachgs bd525fe
Do not crash when the software proposal is not ready
imobachgs ba6559c
Add the software schema to the agama package
imobachgs 4158171
Expose whether a pattern is preselected
imobachgs f79768e
Always submit add/remove lists
imobachgs 29eaf28
Allow to explicitly remove any pattern
imobachgs f840503
Merge branch 'api-v2' into fix-product-selection
imobachgs 4821800
Improve ResolvablesState documentation
imobachgs 796b84e
Replace ResolvablesState::to_hash_set with ::to_vec
imobachgs 8770bd0
Consider preselected patterns as user selected
imobachgs fcc27bf
Do not allow to unselect auto-selected patterns
imobachgs de38940
Use "description" instead of "title" in software the JSON schema
imobachgs 5b763a7
Mark repositories probing as TODO
imobachgs e776fff
Fix software JSON schema
imobachgs File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| { | ||
| "$comment": "Software configuration", | ||
| "$schema": "https://json-schema.org/draft/2019-09/schema", | ||
| "$id": "https://github.com/agama-project/agama/blob/master/rust/agama-lib/share/software.schema.json", | ||
| "title": "Config", | ||
| "description": "Software configuration.", | ||
| "type": "object", | ||
| "properties": { | ||
| "patterns": { | ||
| "anyOf": [ | ||
| { | ||
| "$ref": "#/$defs/patternsArray" | ||
| }, | ||
| { | ||
| "$ref": "#/$defs/patternsObject" | ||
| } | ||
| ] | ||
| }, | ||
| "packages": { | ||
| "description": "List of packages to install", | ||
| "type": "array", | ||
| "items": { | ||
| "type": "string", | ||
| "examples": [ | ||
| "vim" | ||
| ] | ||
| } | ||
| }, | ||
| "onlyRequired": { | ||
| "description": "Flag if only minimal hard dependencies should be used in solver", | ||
| "type": "boolean" | ||
| }, | ||
| "extraRepositories": { | ||
| "description": "List of user specified repositories that will be used on top of default ones", | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/$defs/repository" | ||
| } | ||
| } | ||
| }, | ||
| "$defs": { | ||
| "patternsArray": { | ||
| "description": "List of user-selected patterns to install", | ||
| "type": "array", | ||
| "items": { | ||
| "type": "string", | ||
| "examples": [ | ||
| "minimal_base" | ||
| ] | ||
| } | ||
| }, | ||
| "patternsObject": { | ||
| "description": "Modifications for the list of user-selected patterns to install", | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "add": { | ||
| "description": "List of user-selected patterns to add to the list", | ||
| "type": "array", | ||
| "items": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "remove": { | ||
| "description": "List of user-selected patterns to remove from the list", | ||
| "type": "array", | ||
| "items": { | ||
| "type": "string" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "repository": { | ||
| "description": "Packages repository", | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "alias": { | ||
| "description": "alias used for repository. Acting as identifier", | ||
| "type": "string" | ||
| }, | ||
| "url": { | ||
| "description": "URL pointing to repository", | ||
| "type": "string" | ||
| }, | ||
| "priority": { | ||
| "description": "Repository priority", | ||
| "type": "integer" | ||
| }, | ||
| "name": { | ||
| "description": "User visible name. Defaults to alias", | ||
| "type": "string" | ||
| }, | ||
| "productDir": { | ||
| "description": "product directory on multi repo DVD. Usually not needed", | ||
| "type": "string" | ||
| }, | ||
| "enabled": { | ||
| "description": "If repository should be enabled. Defaults to true. Useful when adding additional repo that should not be immediately use.", | ||
| "type": "boolean" | ||
| }, | ||
| "allowUnsigned": { | ||
| "description": "If unsigned repositories are allowed. Mainly useful for repositories that is hand crafted without GPG signature.", | ||
| "type": "boolean" | ||
| }, | ||
| "gpgFingerprints": { | ||
| "description": "List of GPG fingerprints that is accepted for this repository. Useful for own repositories with proper GPG signature.", | ||
| "type": "array", | ||
| "items": { | ||
| "type": "string", | ||
| "pattern": "^[0-9a-fA-F ]+" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NP: I prefer to have entries alphabetically ordered, as it is easier to read. I would apply it to all parts that do not depend on order.