From ce1d343e682f9f173ae4f10b8b5fb3d5834baac7 Mon Sep 17 00:00:00 2001 From: svishnev Date: Mon, 15 Jan 2018 14:44:48 +0200 Subject: Adding owner id to onboarding tiles Issue-ID: SDC-930 Change-Id: If8e66f45f088950acfef8dd7a5a43eb97d0de9ab Signed-off-by: svishnev --- openecomp-ui/proxy-server.js | 2 +- openecomp-ui/resources/scss/modules/_onboardingCatalog.scss | 1 + .../src/sdc-app/onboarding/onboard/CatalogItemDetails.jsx | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/openecomp-ui/proxy-server.js b/openecomp-ui/proxy-server.js index 3c4c32cc35..39d9c67d0a 100644 --- a/openecomp-ui/proxy-server.js +++ b/openecomp-ui/proxy-server.js @@ -93,7 +93,7 @@ module.exports = function (server) { var wsProxy = proxy(devConfig.proxyConfig.websocketProxy.proxy, Object.assign({}, proxyConfigDefaults, { target: websocketTarget, ws: true - })) + })); middlewares.push(wsProxy); diff --git a/openecomp-ui/resources/scss/modules/_onboardingCatalog.scss b/openecomp-ui/resources/scss/modules/_onboardingCatalog.scss index 4fb0f7c99e..1201d4a34d 100644 --- a/openecomp-ui/resources/scss/modules/_onboardingCatalog.scss +++ b/openecomp-ui/resources/scss/modules/_onboardingCatalog.scss @@ -50,6 +50,7 @@ $transitionLength: 0.6s; display: flex; align-items: center; flex-direction: row; + text-transform: none; } } } diff --git a/openecomp-ui/src/sdc-app/onboarding/onboard/CatalogItemDetails.jsx b/openecomp-ui/src/sdc-app/onboarding/onboard/CatalogItemDetails.jsx index dc3b3f5ab9..345c91e01b 100644 --- a/openecomp-ui/src/sdc-app/onboarding/onboard/CatalogItemDetails.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/onboard/CatalogItemDetails.jsx @@ -17,7 +17,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import i18n from 'nfvo-utils/i18n/i18n.js'; import {catalogItemTypes, migrationStatusMapper} from './onboardingCatalog/OnboardingCatalogConstants.js'; -import {Tile, TileInfo, TileInfoLine} from 'sdc-ui/lib/react'; +import {Tile, TileInfo, TileInfoLine, TileFooter, TileFooterCell} from 'sdc-ui/lib/react'; import {TooltipWrapper} from './onboardingCatalog/Tooltip.jsx'; const ITEM_TYPE_MAP = { @@ -35,7 +35,7 @@ const ITEM_TYPE_MAP = { const CatalogItemDetails = ({catalogItemData, catalogItemTypeClass, onSelect, onMigrate}) => { - let {vendorName, name} = catalogItemData; + let {vendorName, name, owner} = catalogItemData; let {headerText, color, contentIconName} = ITEM_TYPE_MAP[catalogItemTypeClass]; let onClick = (e) => { @@ -66,6 +66,11 @@ const CatalogItemDetails = ({catalogItemData, catalogItemTypeClass, onSelect, on {name} + + {owner && + Owner - {owner} + } + ); -- cgit 1.2.3-korg