-
Notifications
You must be signed in to change notification settings - Fork 4
fix: check for icon file referenced by preset.icon #782
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
tomasciccola
merged 12 commits into
main
from
fix/checkForMissingIconNameInConfigImport
Aug 29, 2024
Merged
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
37ac186
check for icon file referenced by preset.icon
32fd767
Merge branch 'main' of github.com:digidem/mapeo-core-next into fix/ch…
1e39219
add access-point to completeConfig
3950aee
add test for invalid icon name
3f70454
remove unnecessary icons, fix presets.json
d8261a6
add icons to complete config
49d35c1
metter check for `'icon' in field`
d85d377
Merge branch 'main' of github.com:digidem/mapeo-core-next into fix/ch…
617fbac
compute `iconFilenames` once, repurpuse icon name regex
0e1a8ae
Merge branch 'main' of github.com:digidem/mapeo-core-next into fix/ch…
aef3dee
iconFilenames should be `Set<string>`, not `Set<string | undefined>` …
EvanHahn de67a66
Fix missing icon name, warn instead of throwing (#791)
EvanHahn 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.29 KB
tests/fixtures/config/invalidIconNameOnPreset/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+948 Bytes
tests/fixtures/config/invalidIconNameOnPreset/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,5 @@ | ||
{ | ||
"name": "test-config", | ||
"buildDate": "2024-07-29T17:37:23.382Z", | ||
"fileVersion": "1.0" | ||
} |
47 changes: 47 additions & 0 deletions
47
tests/fixtures/config/invalidIconNameOnPreset/presets.json
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,47 @@ | ||
{ | ||
"fields":{ | ||
"nombre-monitor": { | ||
"tagKey": "nombre-monitor", | ||
"type": "text", | ||
"label": "Nombre del Monitor o Mapeador", | ||
"universal": true, | ||
"placeholder": "¿Quién está haciendo esta observación?" | ||
} | ||
}, | ||
"presets":{ | ||
"access-point":{ | ||
"icon": "access-pont", | ||
"fields": [ | ||
"nombre-monitor" | ||
], | ||
"geometry": [ | ||
"point", | ||
"area", | ||
"line" | ||
], | ||
"sort": 1, | ||
"tags": { | ||
"type": "threat", | ||
"threat": "access-point" | ||
}, | ||
"name": "Punto de entrada" | ||
}, | ||
"plant":{ | ||
"icon": "plant", | ||
"fields": [ | ||
"nombre-monitor" | ||
], | ||
"sort": 3, | ||
"geometry": [ | ||
"point", | ||
"area" | ||
], | ||
"tags": { | ||
"type": "natural", | ||
"natural": "plant" | ||
}, | ||
"terms": [], | ||
"name": "Planta" | ||
} | ||
} | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.
Uh oh!
There was an error while loading. Please reload this page.