Introduce the hash URL param presetUrlOverwrite
#9475
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,5 +1,6 @@ | ||||||||||||||||||||||||||
| import parseVersion from 'vparse'; | ||||||||||||||||||||||||||
| import { presetsCdnUrlTemplate, ociCdnUrlTemplate, wmfSitematrixCdnUrlTemplate } from '../../config/id.js'; | ||||||||||||||||||||||||||
| import { utilStringQs } from '../util'; | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| import packageJSON from '../../package.json'; | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
|
|
@@ -11,10 +12,21 @@ export { _mainFileFetcher as fileFetcher }; | |||||||||||||||||||||||||
| // coreFileFetcher asynchronously fetches data from JSON files | ||||||||||||||||||||||||||
| // | ||||||||||||||||||||||||||
| export function coreFileFetcher() { | ||||||||||||||||||||||||||
| const presetsVersion = packageJSON.devDependencies['@openstreetmap/id-tagging-schema']; | ||||||||||||||||||||||||||
| let presetsCdnUrl = presetsCdnUrlTemplate.replace('{presets_version}', presetsVersion); | ||||||||||||||||||||||||||
| // Allow to overwrite the preset source to enable testing PRs for the id-editor-presets repo. | ||||||||||||||||||||||||||
| const presetUrlOverwrite = utilStringQs(window.location.hash)?.presetUrlOverwrote; | ||||||||||||||||||||||||||
| if (presetUrlOverwrite) { | ||||||||||||||||||||||||||
| presetsCdnUrl = presetUrlOverwrite; | ||||||||||||||||||||||||||
| console.info('`presetUrlOverwrite` applied. Presets are fetched from', presetsCdnUrl); | ||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||
|
Comment on lines
+16
to
+22
There was a problem hiding this comment.
Suggested change
|
||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| const ociVersion = packageJSON.dependencies['osm-community-index'] || packageJSON.devDependencies['osm-community-index']; | ||||||||||||||||||||||||||
| const v = parseVersion(ociVersion); | ||||||||||||||||||||||||||
| const ociVersionMinor = `${v.major}.${v.minor}`; | ||||||||||||||||||||||||||
| const ociCdnUrl = ociCdnUrlTemplate.replace('{version}', ociVersionMinor); | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| const wmfSitematrixCdnUrl = wmfSitematrixCdnUrlTemplate.replace('{version}', '0.1'); | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| let _this = {}; | ||||||||||||||||||||||||||
| let _inflight = {}; | ||||||||||||||||||||||||||
|
|
@@ -29,24 +41,23 @@ export function coreFileFetcher() { | |||||||||||||||||||||||||
| 'qa_data': 'data/qa_data.min.json', | ||||||||||||||||||||||||||
| 'shortcuts': 'data/shortcuts.min.json', | ||||||||||||||||||||||||||
| 'territory_languages': 'data/territory_languages.min.json', | ||||||||||||||||||||||||||
| 'oci_defaults': ociCdnUrl + 'dist/defaults.min.json', | ||||||||||||||||||||||||||
| 'oci_features': ociCdnUrl + 'dist/featureCollection.min.json', | ||||||||||||||||||||||||||
| 'oci_resources': ociCdnUrl + 'dist/resources.min.json', | ||||||||||||||||||||||||||
| 'presets_package': presetsCdnUrl + 'package.json', | ||||||||||||||||||||||||||
| 'deprecated': presetsCdnUrl + 'dist/deprecated.min.json', | ||||||||||||||||||||||||||
| 'discarded': presetsCdnUrl + 'dist/discarded.min.json', | ||||||||||||||||||||||||||
| 'preset_categories': presetsCdnUrl + 'dist/preset_categories.min.json', | ||||||||||||||||||||||||||
| 'preset_defaults': presetsCdnUrl + 'dist/preset_defaults.min.json', | ||||||||||||||||||||||||||
| 'preset_fields': presetsCdnUrl + 'dist/fields.min.json', | ||||||||||||||||||||||||||
| 'preset_presets': presetsCdnUrl + 'dist/presets.min.json', | ||||||||||||||||||||||||||
|
Comment on lines
48
to
53
There was a problem hiding this comment. These files (except There was a problem hiding this comment. For example:
Suggested change
|
||||||||||||||||||||||||||
| 'wmf_sitematrix': wmfSitematrixCdnUrl + 'wikipedia.min.json' | ||||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| let _cachedData = {}; | ||||||||||||||||||||||||||
| // expose the cache; useful for tests | ||||||||||||||||||||||||||
| _this.cache = () => _cachedData; | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| // Returns a Promise to fetch data | ||||||||||||||||||||||||||
| // (resolved with the data if we have it already) | ||||||||||||||||||||||||||
| _this.get = (which) => { | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,8 @@ import { fileFetcher } from './file_fetcher'; | |
| import { utilDetect } from '../util/detect'; | ||
| import { utilStringQs } from '../util'; | ||
| import { utilArrayUniq } from '../util/array'; | ||
| import { presetsCdnUrlTemplate } from '../../config/id.js'; | ||
| import packageJSON from '../../package.json'; | ||
|
|
||
| let _mainLocalizer = coreLocalizer(); // singleton | ||
| let _t = _mainLocalizer.t; | ||
|
|
@@ -88,6 +89,8 @@ export function coreLocalizer() { | |
| 'locales' // load the list of supported locales | ||
| ]; | ||
|
|
||
| const presetsVersion = packageJSON.devDependencies['@openstreetmap/id-tagging-schema']; | ||
| const presetsCdnUrl = presetsCdnUrlTemplate.replace('{presets_version}', presetsVersion); | ||
|
Comment on lines
+92
to
+93
There was a problem hiding this comment. actually… this was working as intended:
To avoid this, the fileFetcher does first load the preset's -- The url template can be passed to the fileFetcher: const localeDirs = {
general: 'locales',
tagging: presetsCdnUrlTemplate + 'dist/translations'
};There was a problem hiding this comment. @tyrasd even thought this PR is closed, I think your feedback and the fact that I was not able to read those details from the variable names hints that the variable names could be improved. The name itself you communicate if its a "template" – as in, something of the string will need to be replaced in order to work – or a URL that will be used as is. This might be something to refactor at some point… |
||
| const localeDirs = { | ||
| general: 'locales', | ||
| tagging: presetsCdnUrl + 'dist/translations' | ||
|
|
||
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
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.