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

Revert "Create smaller bundles using deferred plugins loading per page" #1245

Merged
merged 1 commit into from
Nov 4, 2016
Merged

Revert "Create smaller bundles using deferred plugins loading per page" #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 0 additions & 21 deletions web/client/actions/__tests__/plugins-test.js
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions web/client/actions/plugins.js
View file
Open in desktop

This file was deleted.

12 changes: 1 addition & 11 deletions web/client/components/app/StandardApp.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const StandardApp = React.createClass({
pluginsDef: {plugins: {}, requires: {}},
initialActions: [],
printingEnabled: false,
appStore: () => ({dispatch: () => {}, subscribe: () => {}}),
appStore: () => ({dispatch: () => {}}),
appComponent: () => <span/>
};
},
Expand All @@ -57,16 +57,6 @@ const StandardApp = React.createClass({
onPersist: onInit
});
this.store = this.props.appStore(this.props.pluginsDef.plugins, opts);
let newPlugins;
this.store.subscribe(() => {
const state = this.store.getState();
if (state.plugins && Object.keys(state.plugins).length > 0) {
if (state.plugins !== newPlugins) {
newPlugins = state.plugins;
this.store.replaceReducer(this.props.appStore(assign({}, this.props.pluginsDef.plugins, newPlugins), {updateReducers: true}));
}
}
});
if (!opts.persist) {
onInit();
}
Expand Down
23 changes: 4 additions & 19 deletions web/client/components/app/StandardRouter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,43 +13,28 @@ const Debug = require('../development/Debug');
const {Router, Route, hashHistory} = require('react-router');

const Localized = require('../I18N/Localized');
const assign = require('object-assign');
const PluginsUtils = require('../../utils/PluginsUtils');

const StandardRouter = React.createClass({
propTypes: {
plugins: React.PropTypes.object,
locale: React.PropTypes.object,
pages: React.PropTypes.array,
loadPlugins: React.PropTypes.func
pages: React.PropTypes.array
},
getDefaultProps() {
return {
plugins: {},
locale: {messages: {}, current: ''},
pages: [],
loadPlugins: () => {}
pages: []
};
},
getInitialState() {
return {plugins: {}};
},
renderPages() {
return this.props.pages.map((page) => {
const pageConfig = page.pageConfig || {};
const Component = connect(() => ({
plugins: assign({}, this.props.plugins, this.state.plugins),
plugins: this.props.plugins,
...pageConfig
}))(page.component);
return (<Route key={page.name || page.path} path={page.path} component={Component} onEnter={page.plugins ? (nextState, replace, callback) => {
page.plugins((newPlugins) => {
this.setState({
plugins: assign({}, this.state.plugins, PluginsUtils.getPlugins(newPlugins))
});
this.props.loadPlugins(newPlugins);
callback();
});
} : null}/>);
return (<Route key={page.name || page.path} path={page.path} component={Component}/>);
});
},
render() {
Expand Down
6 changes: 2 additions & 4 deletions web/client/components/app/__tests__/StandardApp-test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ describe('StandardApp', () => {
const store = () => ({
dispatch() {
dispatched++;
},
subscribe() {}
}
});


Expand All @@ -76,8 +75,7 @@ describe('StandardApp', () => {
if (value === 10) {
done();
}
},
subscribe() {}
}
});


Expand Down
32 changes: 1 addition & 31 deletions web/client/components/app/__tests__/StandardRouter-test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const mycomponent = React.createClass({
}
});

describe('StandardRouter', () => {
describe('StandardApp', () => {
beforeEach((done) => {
document.body.innerHTML = '<div id="container"></div>';
ConfigUtils.setLocalConfigurationFile('base/web/client/test-resources/localConfig.json');
Expand Down Expand Up @@ -93,34 +93,4 @@ describe('StandardRouter', () => {

expect(dom.getElementsByClassName('MyPlugin').length).toBe(1);
});

it('creates a default router app with pages and on page plugins', () => {
const handlers = {
loadPlugins: () => {}
};
const plugins = {
MyPlugin: {}
};
const spy = expect.spyOn(handlers, "loadPlugins");
const pluginsFunc = (callback) => {
callback(plugins);
};

const store = {
dispatch: () => {},
subscribe: () => {},
getState: () => ({})
};
const pages = [{
name: 'mypage',
path: '/',
component: mycomponent,
plugins: pluginsFunc
}];
const app = ReactDOM.render(<Provider store={store}><StandardRouter loadPlugins={handlers.loadPlugins} pages={pages}/></Provider>, document.getElementById("container"));
expect(app).toExist();

expect(spy.calls.length).toBe(1);
expect(spy.calls[0].arguments[0]).toBe(plugins);
});
});
1 change: 0 additions & 1 deletion web/client/components/map/leaflet/Layer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ const LeafletLayer = React.createClass({
if (this.layer) {
this.layer.layerName = options.name;
this.layer.layerId = options.id;
this.setState({});
}
}
},
Expand Down
7 changes: 2 additions & 5 deletions web/client/components/map/openlayers/Layer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,8 @@ const OpenlayersLayer = React.createClass({
if (type) {
const layerOptions = this.generateOpts(options, position, CoordinatesUtils.normalizeSRS(this.props.srs));
this.layer = Layers.createLayer(type, layerOptions, this.props.map, this.props.mapId);
if (this.layer) {
this.setState({});
if (!this.layer.detached) {
this.addLayer(options);
}
if (this.layer && !this.layer.detached) {
this.addLayer(options);
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion web/client/containers/MapViewer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const urlQuery = url.parse(window.location.href, true).query;
const ConfigUtils = require('../utils/ConfigUtils');

const PluginsContainer = connect((state) => ({
pluginsConfig: ConfigUtils.getConfigProp('plugins') || null,
pluginsConfig: state.plugins || ConfigUtils.getConfigProp('plugins') || null,
mode: (urlQuery.mode || (state.browser && state.browser.mobile ? 'mobile' : 'desktop')),
pluginsState: state && state.controls || {}
}))(require('../components/plugins/PluginsContainer'));
Expand Down
2 changes: 1 addition & 1 deletion web/client/examples/rasterstyler/pages/MapViewer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const {resetControls} = require('../../../actions/controls');
const urlQuery = url.parse(window.location.href, true).query;

const PluginsContainer = connect((state) => ({
pluginsConfig: ConfigUtils.getConfigProp('plugins') || null,
pluginsConfig: state.plugins || ConfigUtils.getConfigProp('plugins') || null,
mode: (urlQuery.mobile || (state.browser && state.browser.touch)) ? 'mobile' : 'desktop'
}))(require('../../../components/plugins/PluginsContainer'));

Expand Down
3 changes: 2 additions & 1 deletion web/client/examples/styler/pages/MapViewer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const {resetControls} = require('../../../actions/controls');
const urlQuery = url.parse(window.location.href, true).query;

const PluginsContainer = connect((state) => ({
pluginsConfig: ConfigUtils.getConfigProp('plugins') || null,
pluginsConfig: state.plugins || ConfigUtils.getConfigProp('plugins') || null,
mode: (urlQuery.mobile || (state.browser && state.browser.touch)) ? 'mobile' : 'desktop'
}))(require('../../../components/plugins/PluginsContainer'));

Expand Down Expand Up @@ -65,3 +65,4 @@ module.exports = connect((state) => ({
loadMapConfig,
reset: resetControls
})(MapViewer);

5 changes: 1 addition & 4 deletions web/client/plugins/Save.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,5 @@ module.exports = {
return { style: {display: "none"} };
}
}
})),
reducers: {
currentMap: require('../reducers/currentMap')
}
}))
};
5 changes: 1 addition & 4 deletions web/client/plugins/SaveAs.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,5 @@ module.exports = {
return state && state.security && state.security.user ? {} : { style: {display: "none"} };
}
}
})),
reducers: {
currentMap: require('../reducers/currentMap')
}
}))
};
5 changes: 1 addition & 4 deletions web/client/product/app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const React = require('react');
const ReactDOM = require('react-dom');
const {connect} = require('react-redux');
const LocaleUtils = require('../utils/LocaleUtils');
const {loadPlugins} = require('../actions/plugins');

const startApp = () => {
const ConfigUtils = require('../utils/ConfigUtils');
Expand All @@ -23,9 +22,7 @@ const startApp = () => {
const StandardRouter = connect((state) => ({
locale: state.locale || {},
pages
}), {
loadPlugins
})(require('../components/app/StandardRouter'));
}))(require('../components/app/StandardRouter'));

const appStore = require('../stores/StandardStore').bind(null, initialState, {
home: require('./reducers/home'),
Expand Down
76 changes: 12 additions & 64 deletions web/client/product/appConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,75 +10,23 @@ module.exports = {
pages: [{
name: "home",
path: "/",
component: require('./pages/Maps'),
plugins: (resolve) => {
return require.ensure([], () => {
resolve({
MapsPlugin: require('../plugins/Maps'),
MapSearchPlugin: require('../plugins/MapSearch'),
HomeDescriptionPlugin: require('./plugins/HomeDescription'),
ExamplesPlugin: require('./plugins/Examples'),
MapTypePlugin: require('./plugins/MapType'),
ForkPlugin: require('./plugins/Fork'),
ManagerPlugin: require('../plugins/manager/Manager'),
CreateNewMapPlugin: require('../plugins/CreateNewMap')
});
});
}
component: require('./pages/Maps')
}, {
name: "maps",
path: "/maps",
component: require('./pages/Maps')
}, {
name: "mapviewer",
path: "/viewer/:mapType/:mapId",
component: require('./pages/MapViewer'),
plugins: (resolve) => {
return require.ensure([], () => {
resolve({
MousePositionPlugin: require('../plugins/MousePosition'),
PrintPlugin: require('../plugins/Print'),
IdentifyPlugin: require('../plugins/Identify'),
TOCPlugin: require('../plugins/TOC'),
BackgroundSwitcherPlugin: require('../plugins/BackgroundSwitcher'),
MeasurePlugin: require('../plugins/Measure'),
MeasureResultsPlugin: require('../plugins/MeasureResults'),
MapPlugin: require('../plugins/Map'),
ToolbarPlugin: require('../plugins/Toolbar'),
DrawerMenuPlugin: require('../plugins/DrawerMenu'),
ShapeFilePlugin: require('../plugins/ShapeFile'),
SnapshotPlugin: require('../plugins/Snapshot'),
SettingsPlugin: require('../plugins/Settings'),
ExpanderPlugin: require('../plugins/Expander'),
SearchPlugin: require('../plugins/Search'),
ScaleBoxPlugin: require('../plugins/ScaleBox'),
LocatePlugin: require('../plugins/Locate'),
ZoomInPlugin: require('../plugins/ZoomIn'),
ZoomOutPlugin: require('../plugins/ZoomOut'),
ZoomAllPlugin: require('../plugins/ZoomAll'),
MapLoadingPlugin: require('../plugins/MapLoading'),
AboutPlugin: require('./plugins/About'),
HelpPlugin: require('../plugins/Help'),
MadeWithLovePlugin: require('./plugins/MadeWithLove'),
MetadataExplorerPlugin: require('../plugins/MetadataExplorer'),
BurgerMenuPlugin: require('../plugins/BurgerMenu'),
UndoPlugin: require('../plugins/History'),
RedoPlugin: require('../plugins/History'),
SavePlugin: require('../plugins/Save'),
SaveAsPlugin: require('../plugins/SaveAs'),
SharePlugin: require('../plugins/Share')
});
});
}
component: require('./pages/MapViewer')
}, {
name: "manager",
path: "/manager(/:tool)",
component: require('./pages/Manager'),
plugins: (resolve) => {
return require.ensure([], () => {
resolve({
UserManagerPlugin: require('../plugins/manager/UserManager'),
RulesManagerPlugin: require('../plugins/manager/RulesManager'),
ManagerPlugin: require('../plugins/manager/Manager')
});
});
}
path: "/manager",
component: require('./pages/Manager')
}, {
name: "manager",
path: "/manager/:tool",
component: require('./pages/Manager')
}],
pluginsDef: require('./plugins.js'),
initialState: {
Expand Down
Loading