From b676b6dcada5549348003191c09142e92de4d352 Mon Sep 17 00:00:00 2001 From: Idan Amit Date: Thu, 1 Feb 2018 14:01:11 +0200 Subject: Designer alignment Little fixes from previous code Change-Id: I4adcd64ae1323963cec248cabb790a4375ae51df Issue-ID: SDC-972 Signed-off-by: Idan Amit --- .../workspace/tabs/plugins/plugins-context-view-model.ts | 2 +- catalog-ui/webpack.server.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/catalog-ui/src/app/view-models/workspace/tabs/plugins/plugins-context-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/plugins/plugins-context-view-model.ts index ca8c269116..7a399d860a 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/plugins/plugins-context-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/plugins/plugins-context-view-model.ts @@ -35,7 +35,7 @@ export class PluginsContextViewModel { userId: this.$scope.user.userId, userRole: this.$scope.user.role, displayType: "context", - contextType: this.$scope.component.componentType, + contextType: this.$scope.component.getComponentSubType(), uuid: this.$scope.component.uuid, lifecycleState: this.$scope.component.lifecycleState, isOwner: this.$scope.component.lastUpdaterUserId === this.$scope.user.userId diff --git a/catalog-ui/webpack.server.js b/catalog-ui/webpack.server.js index d9baf470d3..e53d79f533 100644 --- a/catalog-ui/webpack.server.js +++ b/catalog-ui/webpack.server.js @@ -39,14 +39,14 @@ module.exports = function(env) { // Redirect all '/sdc1/feProxy/rest' to feHost middlewares.push( proxy(['/sdc1/feProxy/rest'],{ - target: 'http://192.168.50.5:' + fePort, + target: 'http://localhost:' + fePort, changeOrigin: true, secure: false })); middlewares.push( proxy(['/sdc1/rest'],{ - target: 'http://192.168.50.5:' + fePort, + target: 'http://localhost:' + fePort, changeOrigin: true, secure: false })); @@ -54,7 +54,7 @@ module.exports = function(env) { // Redirect dcae urls to feHost middlewares.push( proxy(['/dcae','/sdc1/feProxy/dcae-api'],{ - target: 'http://192.168.50.5:' + fePort, + target: 'http://localhost:' + fePort, changeOrigin: true, secure: false, onProxyRes: (proxyRes, req, res) => { @@ -68,7 +68,7 @@ module.exports = function(env) { // Redirect onboarding urls to feHost middlewares.push( proxy(['/onboarding','/sdc1/feProxy/onboarding-api'],{ - target: 'http://192.168.50.5:' + fePort, + target: 'http://localhost:' + fePort, changeOrigin: true, secure: false, onProxyRes: (proxyRes, req, res) => { -- cgit 1.2.3-korg