diff --git a/package.json b/package.json index b40068d878e38c6d24dcf9ea43d245c280487043..73ca6d8e73543bffcd07b232a2562c5d79eec537 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "build-export-aot": "webpack --config webpack.export.aot.js", "build-aot": "PRODUCTION=true GIT_HASH=`git rev-parse --short HEAD` webpack --config webpack.aot.js", "plugin-server": "node ./src/plugin_examples/server.js", - "dev-server": "BACKEND_URL=http://localhost:3000/ webpack-dev-server --config webpack.dev.js --mode development", + "dev-server": "BACKEND_URL=${BACKEND_URL:-http://localhost:3000/} webpack-dev-server --config webpack.dev.js --mode development", "dev": "npm run dev-server & (cd deploy; node server.js)", "dev-server-aot": "PRODUCTION=true GIT_HASH=`git log --pretty=format:'%h' --invert-grep --grep=^.ignore -1` webpack-dev-server --config webpack.aot.js", "dev-server-all-interfaces": "webpack-dev-server --config webpack.dev.js --mode development --hot --host 0.0.0.0", diff --git a/src/atlasViewer/widgetUnit/widgetService.service.ts b/src/atlasViewer/widgetUnit/widgetService.service.ts index 8a394417cc23f818ac4da219633be07375e9775f..b784a431b7753af0ce54ddfc0bc30bf9a1844136 100644 --- a/src/atlasViewer/widgetUnit/widgetService.service.ts +++ b/src/atlasViewer/widgetUnit/widgetService.service.ts @@ -80,9 +80,8 @@ export class WidgetServices implements OnDestroy { const component = this.widgetUnitFactory.create(this.injector) const _option = getOption(options) - if (this.useMobileUI) { - _option.state = 'docked' - } + // TODO bring back docked state? + _option.state = 'floating' _option.state === 'floating' ? this.floatingContainer.insert(component.hostView) diff --git a/src/services/effect/pluginUseEffect.ts b/src/services/effect/pluginUseEffect.ts index f0841b9abf1dba4045cfb7ceb2d9766db72d27a6..d6489812360c61303b2767d97e65eb97ec3ed7b4 100644 --- a/src/services/effect/pluginUseEffect.ts +++ b/src/services/effect/pluginUseEffect.ts @@ -40,7 +40,7 @@ export class PluginServiceUseEffect { fetch(url, constantService.getFetchOption()) .then(res => res.json()) .then(json => pluginService.launchNewWidget(json)) - .catch(this.log.error) + .catch(e => this.log.error(e)) } // clear init manifest diff --git a/src/services/state/pluginState.store.ts b/src/services/state/pluginState.store.ts index 5fed00e8d6d284f85b27335ff287aac9fc16edf4..63082c3eb78bcba907769ca1ea8629fba027d7df 100644 --- a/src/services/state/pluginState.store.ts +++ b/src/services/state/pluginState.store.ts @@ -1,4 +1,5 @@ import { Action } from '@ngrx/store' +import { GENERAL_ACTION_TYPES } from '../stateStore.service' export const defaultState: StateInterface = { initManifests: [] @@ -44,6 +45,9 @@ export const getStateStore = ({ state = defaultState } = {}) => (prevState: Stat initManifests: newManifests, } } + case GENERAL_ACTION_TYPES.APPLY_STATE: + const { pluginState } = (action as any).state + return pluginState default: return prevState } }