Skip to content

Commit 818ae36

Browse files
committed
[spalenque] * change generic reducer name and remove ajax loader from marketplace sangria
1 parent 6443778 commit 818ae36

6 files changed

Lines changed: 5 additions & 11 deletions

File tree

marketplace/ui/source/js/sangria-marketplace-openstack-powered-products/SangriaOpenStackPoweredProductsApp.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
22
import { connect } from 'react-redux';
33
import { fetchAllProducts, updateProductField, exportAllProducts, navigateToProductDetails } from './actions';
4-
import { AjaxLoader } from '~core-components/ajaxloader';
54
import Message from "~core-components/message";
65

76
const SortDirectionAsc = 'ASC';
@@ -234,7 +233,6 @@ class SangriaOpenStackPoweredProductsApp extends React.Component
234233
return (
235234
<div>
236235
<Message />
237-
<AjaxLoader show={this.props.loading} />
238236
<h3>OpenStack Powered Products</h3>
239237
<div className="row" style={{ marginBottom: "25px"}}>
240238
<div className="col-md-12">

marketplace/ui/source/js/sangria-marketplace-openstack-powered-products/store.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ import { createStore, applyMiddleware, combineReducers, compose} from 'redux';
1515
import reduceReducers from 'reduce-reducers';
1616
import thunk from 'redux-thunk';
1717
import {openStackPoweredProducts} from './reducers';
18-
import { generic_reducers } from "~core-utils/reducers";
18+
import { genericReducers } from "~core-utils/reducers";
1919

2020
/*const createStoreWithMiddleware = applyMiddleware(
2121
thunk,
2222
)(createStore);*/
2323

2424
const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
2525

26-
let reducer = reduceReducers(openStackPoweredProducts, generic_reducers);
26+
let reducer = reduceReducers(openStackPoweredProducts, genericReducers);
2727
const store = createStore(reducer, composeEnhancers(applyMiddleware(thunk)));
2828

2929
//const store = createStoreWithMiddleware(openStackPoweredProducts);

marketplace/ui/source/js/sangria-marketplace-openstack-products-by-region/SangriaOpenStackProductsByRegionApp.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
22
import { connect } from 'react-redux';
33
import { fetchAllProducts, exportAllProducts } from './actions';
4-
import { AjaxLoader } from '~core-components/ajaxloader';
54
import Message from "~core-components/message";
65

76
const SortDirectionAsc = 'ASC';
@@ -149,7 +148,6 @@ class SangriaOpenStackProductsByRegionApp extends React.Component
149148
return (
150149
<div>
151150
<Message />
152-
<AjaxLoader show={this.props.loading} />
153151
<h3>OpenStack Products By Region</h3>
154152
<div className="row" style={{ marginBottom: "25px"}}>
155153
<div className="col-md-12">

marketplace/ui/source/js/sangria-marketplace-openstack-products-by-region/store.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import { createStore, applyMiddleware, combineReducers, compose} from 'redux';
1515
import reduceReducers from 'reduce-reducers';
1616
import thunk from 'redux-thunk';
1717
import {openStackProductsByRegion} from './reducers';
18-
import { generic_reducers } from "~core-utils/reducers";
18+
import { genericReducers } from "~core-utils/reducers";
1919

2020
const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
2121

22-
let reducer = reduceReducers(openStackProductsByRegion, generic_reducers);
22+
let reducer = reduceReducers(openStackProductsByRegion, genericReducers);
2323
const store = createStore(reducer, composeEnhancers(applyMiddleware(thunk)));
2424

2525
export default store;

ui-core/ui/source/js/utils/actions.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ export const responseHandler = (dispatch, success, errorHandler) => {
9595
}
9696
else if(typeof success === 'function') {
9797
success(res.body);
98-
if (res.body && res.body.msg && res.body.msg_type)
99-
dispatch(showMessage({msg: res.body.msg, msg_type: res.body.msg_type}));
10098
}
10199
};
102100
};

ui-core/ui/source/js/utils/reducers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* limitations under the License.
1212
**/
1313

14-
export const generic_reducers = function (
14+
export const genericReducers = function (
1515
state = {
1616
msg: null,
1717
msg_type: null,

0 commit comments

Comments
 (0)