Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Allow for un-captured route of config.yml #1182

Merged
merged 4 commits into from
Mar 28, 2018
Merged

Allow for un-captured route of config.yml #1182

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
256de91
allow for un-captured route
talves Mar 19, 2018
d394839
move fetched config getter to function
erquhart Mar 27, 2018
a1c8f22
own function for fetch of config
talves Mar 27, 2018
82e450c
passthrough for backwards compatibility
talves Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions src/actions/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,21 @@ function parseConfig(data) {
return config;
}

async function getConfig(file, isPreloaded) {
const response = await fetch(file, { credentials: 'same-origin' });
if (response.status !== 200) {
if (isPreloaded) return parseConfig('');
throw new Error(`Failed to load config.yml (${ response.status })`);
}
const contentType = response.headers.get('Content-Type') || 'Not-Found';
const isYaml = contentType.indexOf('yaml') !== -1;
Copy link
Collaborator Author

@talves talves Mar 27, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are different type strings for yaml that can exist, so this should allow for each. After some thought, I think we can allow for an external location later as long as it returns a valid header type for yaml, it should be accepted. Later we could allow for a preloaded path in the preloaded config that could supply the location of the file.

if (!isYaml) {
console.log(`Response for ${ file } was not yaml. (Content-Type: ${ contentType })`);
if (isPreloaded) return parseConfig('');
}
return parseConfig(await response.text());
}

export function configLoaded(config) {
return {
type: CONFIG_SUCCESS,
Expand Down Expand Up @@ -115,19 +130,12 @@ export function loadConfig() {

try {
const preloadedConfig = getState().config;
const response = await fetch('config.yml', { credentials: 'same-origin' })
const requestSuccess = response.status === 200;

if (!preloadedConfig && !requestSuccess) {
throw new Error(`Failed to load config.yml (${ response.status })`);
}

const loadedConfig = parseConfig(requestSuccess ? await response.text() : '');
const loadedConfig = await getConfig('config.yml', preloadedConfig && preloadedConfig.size > 1);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In testing, preloadedConfig has an iterable object map with one key isFetching if the preload did not have a JSON preload using init().


/**
* Merge any existing configuration so the result can be validated.
*/
const mergedConfig = mergePreloadedConfig(preloadedConfig, loadedConfig)
const mergedConfig = mergePreloadedConfig(preloadedConfig, loadedConfig);
const config = flow(validateConfig, applyDefaults)(mergedConfig);

dispatch(configDidLoad(config));
Expand Down