PR#424: Misc Javascript fixes - fedora-hubs

Aurélien Bompard • 6 years ago

40820f3

Aurélien Bompard • 6 years ago

2dd176f

Aurélien Bompard • 6 years ago

aeb4ea8

file modified

+1 -1

		`@@ -181,7 +181,7 @@`
		`return (`
		`<Modal`
		`onCloseClicked={this.props.handleDialogCloseClicked}`
		`- isLarge={this.state.selectedWidget && this.state.selectedWidget.isReact}`
		`+ isLarge={this.state.selectedWidget && this.state.selectedWidget.isLarge}`
		`title={title}`
		`footer={footer}`
		`>`

file modified

+2 -2

		`@@ -36,7 +36,7 @@`
		`hub => dispatch(receiveHub(hub)),`
		`error => {`
		`dispatch(addFlashMessage(error.message, "error"));`
		`- return hubRequestFailed();`
		`+ return dispatch(hubRequestFailed());`
		`}`
		`);`
		`}`
		`@@ -75,7 +75,7 @@`
		`},`
		`error => {`
		`dispatch(addFlashMessage(error.message, "error"));`
		`- return putHubFailure(error.message);`
		`+ return dispatch(putHubFailure(error.message));`
		`})`
		`}`
		`}`

file modified

+1 -1

		`@@ -49,7 +49,7 @@`
		`let url = state.entities.widgets.byId[widgetId].selfUrl;`
		`return apiCall(url).then(`
		`(widgetProps) => (dispatch(putConfigSuccess(widgetId, widgetProps))),`
		`- error => (putConfigFailure(widgetId, error.message))`
		`+ error => (dispatch(putConfigFailure(widgetId, error.message)))`
		`);`
		`}`
		`}`

file modified

+2 -2

		`@@ -38,7 +38,7 @@`
		`widgets => dispatch(receiveWidgets(widgets)),`
		`error => {`
		`dispatch(addFlashMessage(error.message, "error"));`
		`- return widgetsRequestFailed();`
		`+ return dispatch(widgetsRequestFailed());`
		`}`
		`);`
		`}`
		`@@ -87,7 +87,7 @@`
		`},`
		`error => {`
		`dispatch(addFlashMessage(error.message, "error"));`
		`- return widgetsAvailFailure(error.message);`
		`+ return dispatch(widgetsAvailFailure(error.message));`
		`})`
		`}`
		`}`

hubs/static/client/app/core/utils.js

file modified

+23 -15

		`@@ -12,29 +12,37 @@`
		`fetchConfig = Object.assign({}, baseFetchConfig, fetchConfig);`
		`return fetch(url, {...baseFetchConfig, ...fetchConfig}).then(`
		`(response) => {`
		`- if (response.ok) {`
		`- return json ? response.json() : response.text();`
		`- } else {`
		`- return response.text().then((msg) => {`
		`- throw new Error(msg);`
		`+ let resultPromise = json ? response.json() : response.text();`
		`+ if (!response.ok) {`
		`+ resultPromise = resultPromise.then((content) => {`
		`+ if (json) {`
		`+ // It's an object describing the error.`
		`+ throw content;`
		`+ } else {`
		`+ // It's already a text message.`
		`+ throw new Error(content);`
		`+ }`
		`});`
		`}`
		`+ return resultPromise;`
		`}`
		`- ).catch((error) => {`
		`- console.error(error.message);`
		`- throw error;`
		`- });`
		`+ );`
		`}`


		`export function apiCall(url, fetchConfig) {`
		`- return backendCall(url, fetchConfig, true).then(result => {`
		`- if (result.status === "OK") {`
		`- return result.data;`
		`- } else {`
		`- throw new Error(result.message);`
		`+ return backendCall(url, fetchConfig, true).then(`
		`+ result => {`
		`+ if (result.status === "OK") {`
		`+ return result.data;`
		`+ } else {`
		`+ throw new Error(result.message);`
		`+ }`
		`+ },`
		`+ error => {`
		`+ throw new Error(error.message);`
		`}`
		`- });`
		`+ );`
		`}`