From 00e935fc6b8baae4d9b9ffef2c748202a60b66b4 Mon Sep 17 00:00:00 2001 From: avigaffa Date: Sun, 10 Sep 2017 08:58:51 +0300 Subject: Add latest bug fixes to master Change-Id: Ieddc2330ad4e093984f14a69b52f2ca5cb465a10 Issue-ID: SDC-293 Signed-off-by: avigaffa --- openecomp-ui/package.json | 5 +- openecomp-ui/pom.xml | 268 ++++++++++----------- .../scss/components/_submitErrorResponse.scss | 2 +- .../modules/_softwareProductAttachmentPage.scss | 34 +-- .../src/nfvo-components/SubmitErrorResponse.jsx | 10 +- openecomp-ui/src/nfvo-utils/i18n/i18n.js | 18 +- 6 files changed, 169 insertions(+), 168 deletions(-) (limited to 'openecomp-ui') diff --git a/openecomp-ui/package.json b/openecomp-ui/package.json index 82b5dea888..335a658b0a 100644 --- a/openecomp-ui/package.json +++ b/openecomp-ui/package.json @@ -2,7 +2,7 @@ "name": "dox-ui", "version": "1.0.0", "description": "", - "author": "OPENECOMP", + "author": "ECOMP", "license": "SEE LICENSE IN LICENSE", "scripts": { "start": "gulp dev && webpack-dev-server --progress", @@ -21,13 +21,12 @@ "dependencies": { "classnames": "^2.2.5", "core-js": "^2.4.0", - "d3": "^4.10.0", + "d3": "^3.5.16", "dox-sequence-diagram-ui": "file:../dox-sequence-diagram-ui", "intl": "^1.0.1", "intl-format-cache": "^2.0.5", "intl-messageformat": "^1.2.0", "intl-relativeformat": "^1.2.0", - "jquery": "^2.1.4", "lodash": "^4.13.1", "md5": "^2.1.0", "randomstring": "^1.1.5", diff --git a/openecomp-ui/pom.xml b/openecomp-ui/pom.xml index 026f129b93..609cc914ae 100644 --- a/openecomp-ui/pom.xml +++ b/openecomp-ui/pom.xml @@ -1,153 +1,25 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.openecomp.sdc + com.att.asdc.onboarding onboarding-fe onboarding-ui-war + 1.0-SNAPSHOT war - - org.openecomp.sdc - sdc-onboarding - 1.1.0-SNAPSHOT - ../onboarding - - - - - - - maven-clean-plugin - 2.6.1 - - - clean.dist.folder - clean - - clean - - - - - ${basedir}/dist - - - ${basedir}/node_modules - - - ${basedir}/../dox-sequence-diagram-ui/dist - - - ${basedir}/../dox-sequence-diagram-ui/node_modules - - - - - - - - - - - - com.github.eirslett - frontend-maven-plugin - 1.4 - - - ${project.parent.parent.basedir} - - - - - - install node and npm - - install-node-and-npm - - - v6.9.5 - 3.10.10 - - - - - npm set progress off - - npm - - - set progress=false - - - - - npm install in dox-sequence-diagram-ui - - npm - - - ${project.basedir}/../dox-sequence-diagram-ui - install - - - - - npm install - - npm - - - install - - - - - npm run build - - npm - - - run build -- --version=${project.version} - - - - - - - maven-antrun-plugin - - - repack war - prepare-package - - - - - - - - - - - - run - - - - - - org.apache.maven.plugins maven-war-plugin - 3.0.0 + webapp-onboarding\WEB-INF\web.xml - ${basedir}/target/dist + external-resources/healthcheck + + v1.0/healthcheck + @@ -155,4 +27,128 @@ + + + + + dox + + true + + + + 10.147.3.4 + 8081 + ${amdocs.repository.host}:${amdocs.repository.port} + daily + + + + + Amdocs + Amdocs public + http://${amdocs.repository.address}:${amdocs.repository.port}/nexus/content/groups/public/ + + true + ${amdocs.repository.updatePolicy.default} + ignore + + + false + ${amdocs.repository.updatePolicy.default} + ignore + + + + + snapshots + Maven Snapshot Repository + http://${amdocs.repository.address}/nexus/content/repositories/snapshots/ + + false + ${amdocs.repository.updatePolicy.default} + ignore + + + true + ${amdocs.repository.updatePolicy.default} + ignore + + + + + + + + ASDC + http://${amdocs.repository.address}/nexus/repository/D2-tlv-release + + + snapshots + http://${amdocs.repository.address}/nexus/content/repositories/snapshots + false + + + + + + + att + + false + + + + mavencentral.it.att.com + 8084 + att-repository-releases + att-repository-snapshots + nexus + nexus + + + + + 2020 + 2020 + http://${nexusServerName}:${nexusServerPort}/nexus/content/groups/2020SAPC/ + default + + + + ATT public + ATT public + http://${nexusServerName}:${nexusServerPort}/nexus/content/groups/att-public-group/ + default + + + + + + + nexus + Nexus repository + http://${nexusServerName}:${nexusServerPort}/nexus/content/repositories/att-public-group + default + + + + + + + ${nexus.id.snapshot} + att-repository-snapshots + http://${nexusServerName}:${nexusServerPort}/nexus/content/repositories/${nexus.snapshot.repository}/ + + + + ${nexus.id.release} + att-repository-releases + http://${nexusServerName}:${nexusServerPort}/nexus/content/repositories/${nexus.release.repository}/ + + + + + + diff --git a/openecomp-ui/resources/scss/components/_submitErrorResponse.scss b/openecomp-ui/resources/scss/components/_submitErrorResponse.scss index ac5dd278b0..cd5284059d 100644 --- a/openecomp-ui/resources/scss/components/_submitErrorResponse.scss +++ b/openecomp-ui/resources/scss/components/_submitErrorResponse.scss @@ -32,7 +32,7 @@ .collapse-right { .svg-icon { &.__chevronDown { - transform: rotate(270deg); + transform: rotate(270deg); } } } diff --git a/openecomp-ui/resources/scss/modules/_softwareProductAttachmentPage.scss b/openecomp-ui/resources/scss/modules/_softwareProductAttachmentPage.scss index bd47fbb334..c8d8cf4e0b 100644 --- a/openecomp-ui/resources/scss/modules/_softwareProductAttachmentPage.scss +++ b/openecomp-ui/resources/scss/modules/_softwareProductAttachmentPage.scss @@ -1,27 +1,27 @@ .vsp-attachments-view { position: relative; - #attachments-tabs { - .nav-tabs { - background-color: $tlv-gray; - box-shadow: none; - border-bottom: 1px solid $light-gray; - & > li { - & > a { - @extend .heading-2; - padding-left: 0; - padding-right: 0; - margin-right: 40px; - }; - &.active > a {color: $blue;}; - } - } - } + #attachments-tabs { + .nav-tabs { + background-color: $tlv-gray; + box-shadow: none; + border-bottom: 1px solid $light-gray; + & > li { + & > a { + @extend .heading-2; + padding-left: 0; + padding-right: 0; + margin-right: 40px; + }; + &.active > a {color: $blue;}; + } + } + } .attachments-view-controllers { position: absolute; right: 40px; top: 15px; - display: flex; + display: flex; .icon-component { diff --git a/openecomp-ui/src/nfvo-components/SubmitErrorResponse.jsx b/openecomp-ui/src/nfvo-components/SubmitErrorResponse.jsx index 8d45d86a9d..40daeff9c5 100644 --- a/openecomp-ui/src/nfvo-components/SubmitErrorResponse.jsx +++ b/openecomp-ui/src/nfvo-components/SubmitErrorResponse.jsx @@ -115,7 +115,7 @@ const UploadErrorList = ({items}) => { {item.list.map((error, i) => )} );} - + return (
{errors} @@ -152,10 +152,10 @@ const ErrorHeader = ({errorType, collapsed, onClick}) => { const ErrorMessage = ({error, warning}) => { return ( - - {error} + + {error} ); }; diff --git a/openecomp-ui/src/nfvo-utils/i18n/i18n.js b/openecomp-ui/src/nfvo-utils/i18n/i18n.js index 2f63dfe605..ef97b8bab4 100644 --- a/openecomp-ui/src/nfvo-utils/i18n/i18n.js +++ b/openecomp-ui/src/nfvo-utils/i18n/i18n.js @@ -14,14 +14,16 @@ * permissions and limitations under the License. */ import IntlObj from 'intl'; +import IntlMessageFormatObj from 'intl-messageformat'; import IntlRelativeFormatObj from 'intl-relativeformat'; import createFormatCacheObj from 'intl-format-cache'; import i18nJson from 'i18nJson'; /* - Intl libs are using out dated transpailer from ecmascript6. -* TODO: As soon as they fix it, remove this assignments!!! -* */ + Intl libs are using out dated transpailer from ecmascript6. + * TODO: As soon as they fix it, remove this assignments!!! + * */ var Intl = window.Intl || IntlObj.default, + IntlMessageFormat = IntlMessageFormatObj.default, IntlRelativeFormat = IntlRelativeFormatObj.default, createFormatCache = createFormatCacheObj.default; @@ -68,11 +70,15 @@ var i18n = { dateRelative(date, options) { return createFormatCache(IntlRelativeFormat)(this._locale, options).format(date); }, - message(messageId) { + message(messageId, options) { + let messageTxt = null; if (i18nJson && i18nJson[messageId]) { - return i18nJson[messageId]; + messageTxt = i18nJson[messageId]; + } else { + messageTxt = String(messageId); } - return messageId; + return createFormatCache(IntlMessageFormat)(messageTxt, this._locale).format(options); + }, getLocale() { return this._locale; -- cgit 1.2.3-korg