From: KAPIL SINGAL Date: Tue, 15 Sep 2020 13:07:37 +0000 (+0000) Subject: Merge "Remove overflow hidden / Decreasize size for visibility" X-Git-Tag: 1.0.0~10 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=00618f56efbdd683430397e0336a016acdca4c6f;hp=0c8e6e4b5a21e5182f47066cf5f0fac8f8dbdcf8;p=ccsdk%2Fcds.git Merge "Remove overflow hidden / Decreasize size for visibility" --- diff --git a/TagVersion.groovy b/TagVersion.groovy index d0ff9bf29..8bcd606c5 100644 --- a/TagVersion.groovy +++ b/TagVersion.groovy @@ -25,11 +25,11 @@ package org.onap.ccsdk.cds def versionArray; -if ( project.properties['ccsdk.project.version'] != null ) { - versionArray = project.properties['ccsdk.project.version'].split('\\.'); +if ( project.properties['ccsdk.cds.version'] != null ) { + versionArray = project.properties['ccsdk.cds.version'].split('\\.'); } -if ( project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT") ) { +if ( project.properties['ccsdk.cds.version'].endsWith("-SNAPSHOT") ) { patchArray = versionArray[2].split('-'); project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest"; project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-latest"; diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml index 52eb555d4..368cc9c4f 100644 --- a/cds-ui/application/pom.xml +++ b/cds-ui/application/pom.xml @@ -24,21 +24,19 @@ limitations under the License. org.onap.ccsdk.cds - ui + cds-ui 1.0.0-SNAPSHOT .. - application + cds-ui-application 1.0.0-SNAPSHOT pom - CDS UI Application + UI Application onap/ccsdk-cds-ui - ${project.version} - ${project.version} ${maven.build.timestamp} yyyyMMdd'T'HHmmss'Z' true diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml index d2309f89d..c4b7ea908 100644 --- a/cds-ui/client/pom.xml +++ b/cds-ui/client/pom.xml @@ -20,77 +20,77 @@ limitations under the License. ============LICENSE_END============================================ --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.cds - ui + + org.onap.ccsdk.cds + cds-ui + 1.0.0-SNAPSHOT + .. + + + cds-ui-client 1.0.0-SNAPSHOT - .. - - - ui-client - 1.0.0-SNAPSHOT - pom - - CDS UI Client - - - UTF-8 - npm - https://nexus.onap.org - - - - - - com.github.eirslett - frontend-maven-plugin - - 1.3 - - v8.12.0 - 6.4.1 - https://nodejs.org/dist/ - ./ - - - - install node and npm - - install-node-and-npm - - generate-resources - - - - npm install - - npm - - - generate-resources - - - install - - - - - npm build - - npm - - - generate-resources - - - run build - - - - - - - + pom + + UI Client + + + UTF-8 + npm + https://nexus.onap.org + + + + + + com.github.eirslett + frontend-maven-plugin + + 1.3 + + v8.12.0 + 6.4.1 + https://nodejs.org/dist/ + ./ + + + + install node and npm + + install-node-and-npm + + generate-resources + + + + npm install + + npm + + + generate-resources + + + install + + + + + npm build + + npm + + + generate-resources + + + run build + + + + + + + diff --git a/cds-ui/designer-client/package.json b/cds-ui/designer-client/package.json index 517b2dab1..df6b02b4a 100644 --- a/cds-ui/designer-client/package.json +++ b/cds-ui/designer-client/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "scripts": { "ng": "ng", - "start": "npm run lint && ng build --prod --aot && ng serve --proxy-config proxy.conf.json", + "start": "npm run lint && ng serve --proxy-config proxy.conf.json && ng build --prod --aot ", "build": "npm run lint && ng build --prod --aot ", "test": "ng test", "lint": "ng lint", diff --git a/cds-ui/designer-client/pom.xml b/cds-ui/designer-client/pom.xml index 0d3331d92..9a1ba2627 100644 --- a/cds-ui/designer-client/pom.xml +++ b/cds-ui/designer-client/pom.xml @@ -20,77 +20,77 @@ limitations under the License. ============LICENSE_END============================================ --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.cds - ui + + org.onap.ccsdk.cds + cds-ui + 1.0.0-SNAPSHOT + .. + + + cds-ui-designer-client 1.0.0-SNAPSHOT - .. - - - designer-client - 1.0.0-SNAPSHOT - pom - - CDS designer Client - - - UTF-8 - npm - https://nexus.onap.org - - - - - - com.github.eirslett - frontend-maven-plugin - - 1.3 - - v13.7.0 - 6.13.6 - https://nodejs.org/dist/ - ./ - - - - install node and npm - - install-node-and-npm - - generate-resources - - - - npm install - - npm - - - generate-resources - - - install - - - - - npm build - - npm - - - generate-resources - - - run build - - - - - - - + pom + + UI designer Client + + + UTF-8 + npm + https://nexus.onap.org + + + + + + com.github.eirslett + frontend-maven-plugin + + 1.3 + + v13.7.0 + 6.13.6 + https://nodejs.org/dist/ + ./ + + + + install node and npm + + install-node-and-npm + + generate-resources + + + + npm install + + npm + + + generate-resources + + + install + + + + + npm build + + npm + + + generate-resources + + + run build + + + + + + + diff --git a/cds-ui/designer-client/proxy.conf.json b/cds-ui/designer-client/proxy.conf.json index 17de0a74f..4e8ef0aab 100644 --- a/cds-ui/designer-client/proxy.conf.json +++ b/cds-ui/designer-client/proxy.conf.json @@ -1,12 +1,12 @@ { "/controllerblueprint/*": { - "target": "https://41.128.168.198:3000", + "target": "https://localhost:3000", "secure": false, "logLevel": "debug", "changeOrigin": true }, "/resourcedictionary/*": { - "target": "https://41.128.168.198:3000", + "target": "https://localhost:3000", "secure": false, "logLevel": "debug", "changeOrigin": true diff --git a/cds-ui/designer-client/src/app/common/core/canDactivate/ComponentCanDeactivate.ts b/cds-ui/designer-client/src/app/common/core/canDactivate/ComponentCanDeactivate.ts new file mode 100644 index 000000000..e0dac0dc3 --- /dev/null +++ b/cds-ui/designer-client/src/app/common/core/canDactivate/ComponentCanDeactivate.ts @@ -0,0 +1,14 @@ +import {HostListener} from '@angular/core'; + +export abstract class ComponentCanDeactivate { + + abstract canDeactivate(): boolean; + + + @HostListener('window:beforeunload', ['$event']) + unloadNotification($event: any) { + if (!this.canDeactivate()) { + $event.returnValue = true; + } + } +} diff --git a/cds-ui/designer-client/src/app/common/core/canDactivate/ComponentCanDeactivateGuard.ts b/cds-ui/designer-client/src/app/common/core/canDactivate/ComponentCanDeactivateGuard.ts new file mode 100644 index 000000000..b24784262 --- /dev/null +++ b/cds-ui/designer-client/src/app/common/core/canDactivate/ComponentCanDeactivateGuard.ts @@ -0,0 +1,19 @@ +import {Injectable} from '@angular/core'; + +import {CanDeactivate} from '@angular/router'; +import {ComponentCanDeactivate} from './ComponentCanDeactivate'; + +@Injectable() +export class ComponentCanDeactivateGuard implements CanDeactivate { + canDeactivate(component: ComponentCanDeactivate): boolean { + + if (component.canDeactivate()) { + if (confirm('You have unsaved changes! If you leave, your changes will be lost.')) { + return true; + } else { + return false; + } + } + return true; + } +} diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html index 0ffd9cb5e..2b6ba4c63 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html @@ -13,60 +13,60 @@
-
+ @@ -757,7 +757,7 @@