aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-ui
diff options
context:
space:
mode:
authoravigaffa <avi.gaffa@amdocs.com>2017-09-10 08:58:51 +0300
committeravigaffa <avi.gaffa@amdocs.com>2017-09-10 10:07:00 +0300
commit00e935fc6b8baae4d9b9ffef2c748202a60b66b4 (patch)
tree56d7b608dbb5a53022db0350f04977da8cd960f5 /openecomp-ui
parent75c572279398dc2be7652263843c8802a9406c4f (diff)
Add latest bug fixes to master
Change-Id: Ieddc2330ad4e093984f14a69b52f2ca5cb465a10 Issue-ID: SDC-293 Signed-off-by: avigaffa <avi.gaffa@amdocs.com>
Diffstat (limited to 'openecomp-ui')
-rw-r--r--openecomp-ui/package.json5
-rw-r--r--openecomp-ui/pom.xml268
-rw-r--r--openecomp-ui/resources/scss/components/_submitErrorResponse.scss2
-rw-r--r--openecomp-ui/resources/scss/modules/_softwareProductAttachmentPage.scss34
-rw-r--r--openecomp-ui/src/nfvo-components/SubmitErrorResponse.jsx10
-rw-r--r--openecomp-ui/src/nfvo-utils/i18n/i18n.js18
6 files changed, 169 insertions, 168 deletions
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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openecomp.sdc</groupId>
+ <groupId>com.att.asdc.onboarding</groupId>
<artifactId>onboarding-fe</artifactId>
<name>onboarding-ui-war</name>
+ <version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
- <parent>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>sdc-onboarding</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <relativePath>../onboarding</relativePath>
- </parent>
-
<build>
<plugins>
- <!-- ============================================= -->
- <!-- Clean dist folder -->
- <!-- ============================================= -->
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.6.1</version>
- <executions>
- <execution>
- <id>clean.dist.folder</id>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/dist</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/node_modules</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/../dox-sequence-diagram-ui/dist</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/../dox-sequence-diagram-ui/node_modules</directory>
- </fileset>
- </filesets>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- ============================================= -->
- <!-- Build the UI module node code -->
- <!-- ============================================= -->
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>1.4</version>
-
- <configuration>
- <installDirectory>${project.parent.parent.basedir}</installDirectory>
- </configuration>
-
- <executions>
-
- <execution>
- <id>install node and npm</id>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- <configuration>
- <nodeVersion>v6.9.5</nodeVersion>
- <npmVersion>3.10.10</npmVersion>
- </configuration>
- </execution>
-
- <execution>
- <id>npm set progress off</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>set progress=false</arguments>
- </configuration>
- </execution>
-
- <execution>
- <id>npm install in dox-sequence-diagram-ui</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui</workingDirectory>
- <arguments>install</arguments>
- </configuration>
- </execution>
-
- <execution>
- <id>npm install</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>install</arguments>
- </configuration>
- </execution>
-
- <execution>
- <id>npm run build</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>run build -- --version=${project.version}</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>repack war</id>
- <phase>prepare-package</phase>
- <configuration>
- <tasks>
- <echo message="Building test environment"/>
- <unzip src="dist/onboarding.war" dest="${basedir}/target/dist">
- <patternset>
- <include name="**/*"/>
- </patternset>
- </unzip>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.0.0</version>
<configuration>
+ <webXml>webapp-onboarding\WEB-INF\web.xml</webXml>
<webResources>
<resource>
- <directory>${basedir}/target/dist</directory>
+ <directory>external-resources/healthcheck</directory>
+ <includes>
+ <include>v1.0/healthcheck</include>
+ </includes>
</resource>
</webResources>
</configuration>
@@ -155,4 +27,128 @@
</plugins>
</build>
+
+ <profiles>
+
+ <profile>
+ <id>dox</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <properties>
+ <amdocs.repository.host>10.147.3.4</amdocs.repository.host>
+ <amdocs.repository.port>8081</amdocs.repository.port>
+ <amdocs.repository.address>${amdocs.repository.host}:${amdocs.repository.port}</amdocs.repository.address>
+ <amdocs.repository.updatePolicy.default>daily</amdocs.repository.updatePolicy.default>
+ </properties>
+ <repositories>
+
+ <repository>
+ <id>Amdocs</id>
+ <name>Amdocs public</name>
+ <url>http://${amdocs.repository.address}:${amdocs.repository.port}/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>${amdocs.repository.updatePolicy.default}</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>${amdocs.repository.updatePolicy.default}</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>snapshots</id>
+ <name>Maven Snapshot Repository</name>
+ <url>http://${amdocs.repository.address}/nexus/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ <updatePolicy>${amdocs.repository.updatePolicy.default}</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>${amdocs.repository.updatePolicy.default}</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+
+ </repositories>
+
+ <distributionManagement>
+ <repository>
+ <id>ASDC</id>
+ <url>http://${amdocs.repository.address}/nexus/repository/D2-tlv-release</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots</id>
+ <url>http://${amdocs.repository.address}/nexus/content/repositories/snapshots</url>
+ <uniqueVersion>false</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+
+ </profile>
+
+ <profile>
+ <id>att</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+
+ <properties>
+ <nexusServerName>mavencentral.it.att.com</nexusServerName>
+ <nexusServerPort>8084</nexusServerPort>
+ <nexus.release.repository>att-repository-releases</nexus.release.repository>
+ <nexus.snapshot.repository>att-repository-snapshots</nexus.snapshot.repository>
+ <nexus.id.release>nexus</nexus.id.release>
+ <nexus.id.snapshot>nexus</nexus.id.snapshot>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>2020</id>
+ <name>2020</name>
+ <url>http://${nexusServerName}:${nexusServerPort}/nexus/content/groups/2020SAPC/</url>
+ <layout>default</layout>
+ </repository>
+
+ <repository>
+ <id>ATT public</id>
+ <name>ATT public</name>
+ <url>http://${nexusServerName}:${nexusServerPort}/nexus/content/groups/att-public-group/</url>
+ <layout>default</layout>
+ </repository>
+
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>nexus</id>
+ <name>Nexus repository</name>
+ <url>http://${nexusServerName}:${nexusServerPort}/nexus/content/repositories/att-public-group</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>${nexus.id.snapshot}</id>
+ <name>att-repository-snapshots</name>
+ <url>http://${nexusServerName}:${nexusServerPort}/nexus/content/repositories/${nexus.snapshot.repository}/</url>
+ </snapshotRepository>
+
+ <repository>
+ <id>${nexus.id.release}</id>
+ <name>att-repository-releases</name>
+ <url>http://${nexusServerName}:${nexusServerPort}/nexus/content/repositories/${nexus.release.repository}/</url>
+ </repository>
+ </distributionManagement>
+
+ </profile>
+ </profiles>
+
</project>
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) => <ErrorMessage key={i} warning={error.level === 'WARNING'} error={error.message}/> )}
</div>
);}
-
+
return (
<div>
{errors}
@@ -152,10 +152,10 @@ const ErrorHeader = ({errorType, collapsed, onClick}) => {
const ErrorMessage = ({error, warning}) => {
return (
<ListGroupItem className='error-code-list-item'>
- <SVGIcon
- name={warning ? 'exclamationTriangleLine' : 'error'}
- color={warning ? 'warning' : 'negative'} />
- <span className='icon-label'>{error}</span>
+ <SVGIcon
+ name={warning ? 'exclamationTriangleLine' : 'error'}
+ color={warning ? 'warning' : 'negative'} />
+ <span className='icon-label'>{error}</span>
</ListGroupItem>
);
};
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;