aboutsummaryrefslogtreecommitdiffstats
path: root/src/app/vnfs
diff options
context:
space:
mode:
authorsj108s <sj108s@us.att.com>2018-03-15 20:26:47 +0530
committersj108s <sj108s@us.att.com>2018-03-15 20:33:07 +0530
commit90174648e4553018398f88c6acbd9dc905aa17ff (patch)
treee2f1ad12c68d10020e8fb7681910f4ec7c4d8915 /src/app/vnfs
parent7cf978ff9f510733dce1cf70693feedcb5ffbccd (diff)
Added few more test case & fixed modal in template
Added few more test cases to improve code coverage and changed trigger command for modal in template page from Enter to ctrl-4 Issue-ID: APPC-697 Change-Id: I4a158ba687bad0bb2f808428333083200714f18a Signed-off-by: sj108s <sj108s@us.att.com>
Diffstat (limited to 'src/app/vnfs')
-rw-r--r--src/app/vnfs/build-artifacts/parameter-definitions/parameter.component.spec.ts16
-rw-r--r--src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.html14
-rw-r--r--src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.ts7
3 files changed, 29 insertions, 8 deletions
diff --git a/src/app/vnfs/build-artifacts/parameter-definitions/parameter.component.spec.ts b/src/app/vnfs/build-artifacts/parameter-definitions/parameter.component.spec.ts
index 0d220c8..7e248e3 100644
--- a/src/app/vnfs/build-artifacts/parameter-definitions/parameter.component.spec.ts
+++ b/src/app/vnfs/build-artifacts/parameter-definitions/parameter.component.spec.ts
@@ -176,7 +176,23 @@ describe('ParameterComponent', () => {
expect(obj['response-keys'][4]['key-name']).toBeNull;
expect(obj['response-keys'][4]['key-value']).toBeNull;
}));
+
+ it('should read file key file content...', () => {
+ let file = new File(["testing"], "foo.XLS", {type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"});
+ let uploadType = 'keyfile';
+ let input = {files: [file]};
+ component.fileChange(input, uploadType);
+ });
+
+
+ it('should read file key file content...', () => {
+ let file = new File(["testing"], "foo.XLS", {type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"});
+ let uploadType = 'pdfile';
+ let input = {files: [file]};
+
+ component.fileChange(input, uploadType);
+ });
});
diff --git a/src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.html b/src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.html
index 335b595..02b5a02 100644
--- a/src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.html
+++ b/src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.html
@@ -17,7 +17,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
============LICENSE_END============================================
-->
<simple-notifications [options]="options"></simple-notifications>
@@ -76,8 +75,12 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<app-modal [title]="'Confirmation'" [isShow]="false" [message]="'Template is saved and ready for creating parameter definition'" #modalComponent>
</app-modal>
<modal #myModal>
- <modal-header [show-close]="true">
- <h4 class="modal-title">Enter Name for {{selectedWord}}</h4>
+ <modal-header style="height:65px">
+ <h4 class="modal-title" style="position:absolute;">Enter Name for <b>"{{selectedWord}}"</b></h4>
+ <button type="button" class="close" aria-label="Close" (click)="modal.close()" style="margin-left:auto">
+ <span aria-hidden="true">&times;</span>
+ </button>
+
</modal-header>
<modal-body>
<div class="form-group row">
@@ -89,7 +92,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
</div>
</modal-body>
<modal-footer [show-default-buttons]="false">
- <button type="button" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent" (click)="submitNameValues()">Submit
+ <button type="button" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary" (click)="submitNameValues()">Submit
</button>
+ <button type="button" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent
+
+ " (click)="modal.close()">Cancel</button>
</modal-footer>
</modal> \ No newline at end of file
diff --git a/src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.ts b/src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.ts
index 1d1bc4f..750b979 100644
--- a/src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.ts
+++ b/src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.ts
@@ -17,7 +17,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
============LICENSE_END============================================
*/
@@ -194,8 +193,8 @@ export class GoldenConfigurationComponent implements OnInit {
let self = this;
this.templateEditor = self.templateeditor.getEditor();
this.templateeditor.getEditor().commands.addCommand({
- name: 'annotateCommand',
- bindKey: { win: 'ENTER', mac: 'ENTER' },
+ name: 'annotateCommandAlternate',
+ bindKey: { win: 'CTRL-4', mac: 'Command-4' },
exec: (editor: any) => {
this.handleAnnotation(this.modal);
}
@@ -724,7 +723,7 @@ export class GoldenConfigurationComponent implements OnInit {
public handleAnnotation(modal) {
this.selectedWord = this.templateeditor.getEditor().session.getTextRange(this.templateeditor.getEditor().selectionRange);
- modal.open();
+ if(this.selectedWord && this.selectedWord!=undefined) modal.open();
}
//========================== End of handleAnnotations() Method============================================
public submitNameValues() {