Merge branch 'master' into zopflipng

src/plugins/configs/actions.js

@@ -1,20 +0,0 @@
-export const UPDATE_CONFIGS = "configs_update"
-export const TOGGLE_CONFIGS = "configs_toggle"
-
-// Update the configs, with a merge ( not deep )
-export function update(configName, configValue) {
-  return {
-    type: UPDATE_CONFIGS,
-    payload: {
-      [configName]: configValue
-    },
-  }
-}
-
-// Toggle's the config, by name
-export function toggle(configName) {
-  return {
-    type: TOGGLE_CONFIGS,
-    payload: configName,
-  }
-}

src/plugins/configs/index.js

@@ -1,66 +0,0 @@
-import YAML from "js-yaml"
-import yamlConfig from "../../../swagger-config.yaml"
-import * as actions from "./actions"
-import * as selectors from "./selectors"
-import reducers from "./reducers"
-
-const parseYamlConfig = (yaml, system) => {
-  try {
-    return YAML.safeLoad(yaml)
-  } catch(e) {
-    if (system) {
-      system.errActions.newThrownErr( new Error(e) )
-    }
-    return {}
-  }
-}
-
-
-const specActions = {
-  downloadConfig: (url) => ({fn}) => {
-    let {fetch} = fn
-    return fetch(url)
-  },
-
-  getConfigByUrl: (configUrl, cb)=> ({ specActions }) => {
-    if (configUrl) {
-      return specActions.downloadConfig(configUrl).then(next, next)
-    }
-
-    function next(res) {
-      if (res instanceof Error || res.status >= 400) {
-        specActions.updateLoadingStatus("failedConfig")
-        specActions.updateLoadingStatus("failedConfig")
-        specActions.updateUrl("")
-        console.error(res.statusText + " " + configUrl)
-        cb(null)
-      } else {
-        cb(parseYamlConfig(res.text))
-      }
-    }
-  }
-}
-
-const specSelectors = {
-  getLocalConfig: () => {
-    return parseYamlConfig(yamlConfig)
-  }
-}
-
-
-export default function configsPlugin() {
-
-  return {
-    statePlugins: {
-      spec: {
-        actions: specActions,
-        selectors: specSelectors,
-      },
-      configs: {
-        reducers,
-        actions,
-        selectors,
-      }
-    }
-  }
-}

src/plugins/configs/reducers.js

@@ -1,20 +0,0 @@
-import { fromJS } from "immutable"
-
-import {
-	UPDATE_CONFIGS,
-	TOGGLE_CONFIGS,
-} from "./actions"
-
-export default {
-
-  [UPDATE_CONFIGS]: (state, action) => {
-    return state.merge(fromJS(action.payload))
-  },
-
-  [TOGGLE_CONFIGS]: (state, action) => {
-    const configName = action.payload
-    const oriVal = state.get(configName)
-    return state.set(configName, !oriVal)
-  },
-
-}

src/plugins/configs/selectors.js

@@ -1,4 +0,0 @@
-// Just get the config value ( it can possibly be an immutable object)
-export const get = (state, path) => {
-  return state.getIn(Array.isArray(path) ? path : [path])
-}

src/plugins/index.js

@@ -1,17 +1,7 @@
-import { pascalCaseFilename } from "js/utils"
+import Configs from "./configs"
+import Topbar from "./topbar"
 
-const request = require.context(".", true, /\.jsx?$/)
-
-request.keys().forEach( function( key ){
-  if( key === "./index.js" ) {
-    return
-  }
-
-  // if( key.slice(2).indexOf("/") > -1) {
-  //   // skip files in subdirs
-  //   return
-  // }
-
-  let mod = request(key)
-  module.exports[pascalCaseFilename(key)] = mod.default ? mod.default : mod
-})
+export default {
+  Configs,
+  Topbar
+}