core-dashboard-worona - npm Package Compare versions

Comparing version 1.2.24 to 1.2.25

package.json

 {
   "name": "core-dashboard-worona",
-  "version": "1.2.24",
+  "version": "1.2.25",
   "description": "Core Package of Worona Dashboard",
@@ -28,3 +28,5 @@ "scripts": {
     "type": "core",
-    "services": ["dashboard"],
+    "services": [
+      "dashboard"
+    ],
     "authors": [
@@ -53,2 +55,4 @@ "[e-mail]"
     "redux": "^3.6.0",
+    "redux-devtools-extension": "^1.0.0",
+    "redux-form": "^6.2.0",
     "redux-router": "^2.1.2",
@@ -60,5 +64,5 @@ "redux-saga": "^0.12.0",
     "systemjs": "^0.19.39",
-    "worona-deps": "^1.8.3",
+    "worona-deps": "^1.8.6",
     "worona-polyfills": "^1.0.0"
   }
 }

src/dashboard/build-dashboard-extension-worona/reducers/assets.js

@@ -6,3 +6,3 @@ import update from 'react/lib/update';
 
-export const assets = (state = {}, action) => {
+export default (state = {}, action) => {
   let pkgAssets;
@@ -23,3 +23,1 @@ switch (action.type) {
 };
-
-export default assets;

src/dashboard/build-dashboard-extension-worona/reducers/packages.js

@@ -0,5 +1,9 @@
+import { getDevelopmentPackages } from 'worona-deps';
 import { combineReducers } from 'redux';
+import { map } from 'lodash';
 import update from 'react/lib/update';
 import * as types from '../types';
 
+const developmentPackages = getDevelopmentPackages();
+
 const defaultList = {
@@ -9,3 +13,2 @@ 'build-dashboard-extension-worona': {
     namespace: 'build',
-    type: 'extension',
   },
@@ -15,3 +18,2 @@ 'loading-dashboard-theme-worona': {
     namespace: 'theme',
-    type: 'theme',
   },
@@ -21,3 +23,2 @@ 'routing-dashboard-extension-worona': {
     namespace: 'routing',
-    type: 'extension',
   },
@@ -27,2 +28,3 @@ };
 const defaultDownloaded = [
+  ...map(developmentPackages, item => item.name),
   'build-dashboard-extension-worona',
@@ -29,0 +31,0 @@ 'loading-dashboard-theme-worona',

src/dashboard/build-dashboard-extension-worona/sagas/download.js

 /* eslint-disable no-constant-condition, no-undef, global-require, import/no-dynamic-require */
-import { isRemote, packageDownloaded } from 'worona-deps';
+import worona, { isRemote, packageDownloaded } from 'worona-deps';
 import { put, call } from 'redux-saga/effects';
@@ -4,0 +4,0 @@ import update from 'react/lib/update';

src/dashboard/build-dashboard-extension-worona/sagas/index.js

 /* eslint-disable no-constant-condition, array-callback-return */
 import request from 'superagent';
-import { isRemote, isDev } from 'worona-deps';
+import { isRemote, isDev, getDevelopmentPackages } from 'worona-deps';
 import { normalize } from 'normalizr';
@@ -29,3 +29,6 @@ import { takeEvery } from 'redux-saga';
     // Normalize the result using normalizr.
-    const pkgs = normalize(res.body, schemas.arrayOfPackages).entities.packages;
+    const pkgs = {
+      ...normalize(res.body, schemas.arrayOfPackages).entities.packages,
+      ...getDevelopmentPackages(),
+    };
     // Inform that the API call was successful.
@@ -43,4 +46,4 @@ yield put(actions.corePackagesSucceed({ pkgs }));
     // Download phase.
-    const downloaded = select(selectors.getDownloadedPackages);
-    if (!downloaded[pkg.name]) {
+    const downloaded = yield select(selectors.getDownloadedPackages);
+    if (downloaded.indexOf(pkg.name) === -1) {
       yield put(actions.packageDownloadRequested({ pkg }));
@@ -47,0 +50,0 @@ yield call(waitFor, pkg.name, types.PACKAGE_DOWNLOAD_SUCCEED, types.PACKAGE_DOWNLOAD_FAILED);

src/dashboard/build-dashboard-extension-worona/sagas/load.js

 /* eslint-disable no-constant-condition */
 import { isProd, getSagas, getReducers, packageActivated, getDeps, waitForDeps,
   getDevelopmentPackages } from 'worona-deps';
-import { put, call, fork } from 'redux-saga/effects';
+import { put, call } from 'redux-saga/effects';
+import { map } from 'lodash';
 import { takeEvery } from 'redux-saga';
@@ -54,7 +55,2 @@ import { addReducer, startSaga, reloadReducers, removeReducer, stopSaga } from '../store';
 
-export function* addDevelopmentPackagesSaga() {
-  const pkgs = getDevelopmentPackages();
-  yield pkgs.map(pkg => put(actions.packageLoadRequested({ pkg })));
-}
-
 export default function* sagas() {
@@ -64,4 +60,3 @@ yield [
     takeEvery(types.PACKAGE_DEACTIVATION_REQUESTED, packageUnloadSaga),
-    fork(addDevelopmentPackagesSaga),
   ];
 }

src/dashboard/build-dashboard-extension-worona/store/index.js

 /* eslint-disable global-require */
 /* global window */
-import { compose, createStore, applyMiddleware, combineReducers } from 'redux';
+import { createStore, applyMiddleware, combineReducers } from 'redux';
 import createSagaMiddleware from 'redux-saga';
 import { isTest } from 'worona-deps';
 import { reduxReactRouter, routerStateReducer as router } from 'redux-router';
+import { composeWithDevTools } from 'redux-devtools-extension';
 import build from '../reducers';
@@ -14,5 +15,9 @@
 
+const composeEnhancers = composeWithDevTools({
+  serializeState: false,
+});
+
 export const store = createStore(
   combineReducers(reducers),
-  compose(
+  composeEnhancers(
     reduxReactRouter({
@@ -22,3 +27,2 @@ createHistory: !isTest ? require('history').createHistory : require('history').createMemoryHistory,
     applyMiddleware(sagaMiddleware),
-    typeof window !== 'undefined' && window.devToolsExtension ? window.devToolsExtension() : f => f
   )
@@ -25,0 +29,0 @@ );

src/dashboard/router-dashboard-extension-worona/components/CssLoader/index.js

@@ -6,3 +6,3 @@ import { isRemote } from 'worona-deps';
 
-class LinkCss extends React.Component {
+class LinkCssClass extends React.Component {
   componentDidMount() {
@@ -18,3 +18,3 @@ this.refs.link.addEventListener('load', this.props.assetsFileDownloaded);
 }
-LinkCss.propTypes = ({
+LinkCssClass.propTypes = ({
   cdn: React.PropTypes.string.isRequired,
@@ -31,5 +31,5 @@ path: React.PropTypes.string.isRequired,
 
-LinkCss = connect(null, mapDispatchToProps)(LinkCss);
+const LinkCss = connect(null, mapDispatchToProps)(LinkCssClass);
 
-export const CssLoader = ({ cssAssets }) => {
+const CssLoader = ({ cssAssets }) => {
   const cdn = isRemote ? 'https://cdn.worona.io/packages/' : 'http://localhost:4000/packages/';
@@ -36,0 +36,0 @@ return (

src/dashboard/router-dashboard-extension-worona/routes/index.js

 /* eslint-disable react/prefer-stateless-function, react/no-multi-comp, react/prop-types */
-/* eslint-disable prefer-template, react/prefer-es6-class */
+/* eslint-disable prefer-template, react/prefer-es6-class, react/jsx-filename-extension */
 import React from 'react';
@@ -14,3 +14,3 @@ import { dep } from 'worona-deps';
 
-class ThemeLoader extends React.Component {
+class ThemeLoaderClass extends React.Component {
   render() {
@@ -26,3 +26,3 @@ const Theme = dep('theme', 'components', 'Theme');
 }
-ThemeLoader = connect(mapStateToProps)(ThemeLoader);
+const ThemeLoader = connect(mapStateToProps)(ThemeLoaderClass);
 
@@ -71,5 +71,6 @@ class Entry extends React.Component {
     <Route path="sites" component={Entry} wrapped="Sites" onEnter={requireAuth(store)} />
-    <Redirect from="/site/:siteId/" to="/site/:siteId/app/general" />
+    <Redirect from="/site/:siteId/app" to="/site/:siteId/app/general-app-extension-worona" />
+    <Redirect from="/site/:siteId/fbia" to="/site/:siteId/fbia/general-fbia-extension-worona" />
     <Route
-      path="/site/:siteId/:service/:namespace" component={Entry} wrapped="SiteHome"
+      path="/site/:siteId/:service/:packageName" component={Entry} wrapped="SiteHome"
       onEnter={requireAuth(store)}
@@ -76,0 +77,0 @@ />

src/dashboard/router-dashboard-extension-worona/selectors/index.js

@@ -5,3 +5,3 @@ export const getParam = param => state => state.router.params[param];
 export const getSelectedService = state => state.router.params.service;
-export const getSelectedNamespace = state => state.router.params.namespace;
+export const getSelectedPackageName = state => state.router.params.packageName;
 export const getURLQueries = state => state.router.location.query;

vendors.json

@@ -12,2 +12,3 @@ [
   "redux-router",
+  "redux-form",
   "reselect",
@@ -14,0 +15,0 @@ "i18next",

No alert changes

Improved metrics

Lines of code

1064

increased by0.38%

Worsened metrics

Total package byte prevSize

46431

decreased by-0.98%

Dependency count

22

increased by10%

Dependency changes

• + Addedredux-devtools-extension@^1.0.0

• + Addedredux-form@^6.2.0

• + Addedes6-error@4.1.1(transitive)

• + Addedis-promise@2.2.2(transitive)

• + Addedredux-devtools-extension@1.0.0(transitive)

• + Addedredux-form@6.8.0(transitive)

• Updatedworona-deps@^1.8.6