Merge remote-tracking branch 'origin/master' into issue230_person

This commit is contained in:
nobohan
2022-01-04 13:50:27 +01:00
611 changed files with 13079 additions and 4316 deletions

View File

@@ -1,30 +1,30 @@
const create = (accompanying_period_id, payload) => {
const url = `/api/1.0/person/accompanying-course/${accompanying_period_id}/work.json`;
let status;
console.log('create', payload);
// const create = (accompanying_period_id, payload) => {
// const url = `/api/1.0/person/accompanying-course/${accompanying_period_id}/work.json`;
// let status;
// console.log('create', payload);
return fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify(payload),
})
.then(response => {
if (response.ok || response.status === 422) {
status = response.status;
// return fetch(url, {
// method: 'POST',
// headers: {
// 'Content-Type': 'application/json',
// },
// body: JSON.stringify(payload),
// })
// .then(response => {
// if (response.ok || response.status === 422) {
// status = response.status;
return response.json();
}
// return response.json();
// }
throw new Error("Error while retrieving social actions: " + response.status +
" " + response.statusText);
})
.then(data => {
return new Promise((resolve, reject) => {
resolve({ status, data });
});
});
};
// throw new Error("Error while retrieving social actions: " + response.status +
// " " + response.statusText);
// })
// .then(data => {
// return new Promise((resolve, reject) => {
// resolve({ status, data });
// });
// });
// };
export { create };
// export { create };

View File

@@ -3,44 +3,54 @@
*/
const parametersToString = ({ query, options }) => {
let types ='';
options.type.forEach(function(type) {
options.type.forEach(function(type) {
types += '&type[]=' + type;
});
});
return 'q=' + query + types;
};
/*
/*
* Endpoint chill_person_search
* method GET, get a list of persons
*
*
* @query string - the query to search for
* @deprecated
*/
const searchPersons = ({ query, options }) => {
const searchPersons = ({ query, options }, signal) => {
console.err('deprecated');
let queryStr = parametersToString({ query, options });
let url = `/fr/search.json?name=person_regular&${queryStr}`;
return fetch(url)
let fetchOpts = {
method: 'GET',
headers: {
'Content-Type': 'application/json;charset=utf-8'
},
signal,
};
return fetch(url, fetchOpts)
.then(response => {
if (response.ok) { return response.json(); }
throw Error('Error with request resource response');
throw Error('Error with request resource response');
});
};
/*
/*
* Endpoint v.2 chill_main_search_global
* method GET, get a list of persons and thirdparty
*
* NOTE: this is a temporary WIP endpoint, return inconsistent random results
* @query string - the query to search for
*
* @param query string - the query to search for
*
*/
const searchPersons_2 = ({ query, options }) => {
const searchEntities = ({ query, options }, signal) => {
let queryStr = parametersToString({ query, options });
let url = `/api/1.0/search.json?${queryStr}`;
return fetch(url)
.then(response => {
if (response.ok) { return response.json(); }
throw Error('Error with request resource response');
throw Error('Error with request resource response');
});
};
export { searchPersons, searchPersons_2 };
export { searchPersons, searchEntities };