X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt-frontend%2Fsrc%2Fapp%2Fcorrelation-ruleInfo%2FruleInfo.component.ts;fp=rulemgt%2Fsrc%2Fmain%2Ffrontend%2Fsrc%2Falarm%2Fapp%2Fcorrelation-ruleInfo%2FruleInfo.component.ts;h=7f8d3755033f6e18086dd0c05f02efbcf00c94a4;hb=9720e7d6a706d79f50778af6a39ce6fba79955ed;hp=8222735cdfa21d5bf3cd1958f1201410bf44c7c5;hpb=0b1df79ef7749d62b4412e5433538d32feb6850c;p=holmes%2Frule-management.git diff --git a/rulemgt/src/main/frontend/src/alarm/app/correlation-ruleInfo/ruleInfo.component.ts b/rulemgt-frontend/src/app/correlation-ruleInfo/ruleInfo.component.ts similarity index 60% rename from rulemgt/src/main/frontend/src/alarm/app/correlation-ruleInfo/ruleInfo.component.ts rename to rulemgt-frontend/src/app/correlation-ruleInfo/ruleInfo.component.ts index 8222735..7f8d375 100644 --- a/rulemgt/src/main/frontend/src/alarm/app/correlation-ruleInfo/ruleInfo.component.ts +++ b/rulemgt-frontend/src/app/correlation-ruleInfo/ruleInfo.component.ts @@ -1,14 +1,14 @@ /* Copyright 2017 ZTE Corporation. - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, + distributed under the License is distributed on an 'AS IS' BASIS, 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. @@ -34,8 +34,8 @@ export class RuleInfo implements OnInit { update() { this.queryRule.enabled = $('input:radio:checked').val(); - if (!this.queryRule.content.startsWith("package ")) { - let msg = { title: "exception_content_error", message: "exception_package_error" }; + if (!this.queryRule.content.startsWith('package ')) { + let msg = { title: 'exception_content_error', message: 'exception_package_error' }; this.modalService.getmodalObservable.next(msg); } else { @@ -45,29 +45,29 @@ export class RuleInfo implements OnInit { this.alarmRuleService.updateRule(this.queryRule) .then(res => { if (res.status == 200) { - let msg = { title: "modalTitleUpdate", message: "message_update_rule_success" }; + let msg = { title: 'modalTitleUpdate', message: 'message_update_rule_success' }; this.modalService.getmodalObservable.next(msg); this.router.navigate(['alarmRule']); } else if (res.status == 499) { - let msg = { title: "modalTitleUpdate", message: "message_exception_rule_fail" }; + let msg = { title: 'modalTitleUpdate', message: 'message_exception_rule_fail' }; this.modalService.getmodalObservable.next(msg); } else { - let msg = { title: "modalTitleUpdate", message: "message_other_exception_rule_fail" }; + let msg = { title: 'modalTitleUpdate', message: 'message_other_exception_rule_fail' }; this.modalService.getmodalObservable.next(msg); } }).catch( res => { - let msg = { title: "modalTitleUpdate", message: "message_other_exception_rule_fail" }; + let msg = { title: 'modalTitleUpdate', message: 'message_other_exception_rule_fail' }; this.modalService.getmodalObservable.next(msg); } ); } else if (res.status == 499) { - let msg = { "title": "modalTitleCheck", message: "message_rule_content_repeat_error" }; + let msg = { 'title': 'modalTitleCheck', message: 'message_rule_content_repeat_error' }; this.modalService.getmodalObservable.next(msg); return false; } else { - let msg = { "title": "modalTitleCheck", message: "message_other_exception_rule_fail" }; + let msg = { 'title': 'modalTitleCheck', message: 'message_other_exception_rule_fail' }; this.modalService.getmodalObservable.next(msg); return false; } @@ -80,36 +80,36 @@ export class RuleInfo implements OnInit { } save() { - if (!this.queryRule.content.startsWith("package ")) { - let msg = { title: "exception_content_error", message: "exception_package_error" }; + if (!this.queryRule.content.startsWith('package ')) { + let msg = { title: 'exception_content_error', message: 'exception_package_error' }; this.modalService.getmodalObservable.next(msg); } else { this.alarmRuleService.checkContent(this.queryRule.content).then(res => { if (res.status == 200) { this.alarmRuleService.save(this.queryRule).then(res => { if (res.status == 200) { - let msg = { title: "modalTitleDefault", message: "message_add_rule_success" }; + let msg = { title: 'modalTitleDefault', message: 'message_add_rule_success' }; this.modalService.getmodalObservable.next(msg); this.router.navigate(['alarmRule']); } else if (res.status == 499) { - let msg = { title: "modalTitleDefault", message: "message_rule_name_repeat_error" }; + let msg = { title: 'modalTitleDefault', message: 'message_rule_name_repeat_error' }; this.modalService.getmodalObservable.next(msg); } else { - let msg = { "title": "modalTitleCheck", message: "message_other_exception_rule_fail" }; + let msg = { 'title': 'modalTitleCheck', message: 'message_other_exception_rule_fail' }; this.modalService.getmodalObservable.next(msg); } }).catch(error => { - let msg = { title: "modalTitleDefault", message: "message_rule_name_repeat_error" }; + let msg = { title: 'modalTitleDefault', message: 'message_rule_name_repeat_error' }; this.modalService.getmodalObservable.next(msg); }); return true; } else if (res.status == 499) { - let msg = { "title": "modalTitleCheck", message: "message_rule_content_repeat_error" }; + let msg = { 'title': 'modalTitleCheck', message: 'message_rule_content_repeat_error' }; this.modalService.getmodalObservable.next(msg); return false; } else { - let msg = { "title": "modalTitleCheck", message: "message_other_exception_rule_fail" }; + let msg = { 'title': 'modalTitleCheck', message: 'message_other_exception_rule_fail' }; this.modalService.getmodalObservable.next(msg); return false; } @@ -120,27 +120,27 @@ export class RuleInfo implements OnInit { getRuleInfo(id: string): void { this.route.params.switchMap((params: Params) => this.alarmRuleService.search(id)) .subscribe(rule => { - rule[0].enabled = "" + rule[0].enabled; + rule[0].enabled = '' + rule[0].enabled; this.queryRule = rule[0] }) } checkContent(judge: string): void { - if (!this.queryRule.content.startsWith("package ")) { - let msg = { title: "exception_content_error", message: "exception_package_error" }; + if (!this.queryRule.content.startsWith('package ')) { + let msg = { title: 'exception_content_error', message: 'exception_package_error' }; this.modalService.getmodalObservable.next(msg); } else { this.alarmRuleService.checkContent(this.queryRule.content) .then(res => { if (res.status == 200) { - let msg = { "title": "modalTitleCheck", message: "message_checkContent_rule_success" }; + let msg = { 'title': 'modalTitleCheck', message: 'message_checkContent_rule_success' }; this.modalService.getmodalObservable.next(msg); } else if (res.status == 499) { - let msg = { "title": "modalTitleCheck", message: "message_rule_content_repeat_error" }; + let msg = { 'title': 'modalTitleCheck', message: 'message_rule_content_repeat_error' }; this.modalService.getmodalObservable.next(msg); return false; } else { - let msg = { "title": "modalTitleCheck", message: "message_other_exception_rule_fail" }; + let msg = { 'title': 'modalTitleCheck', message: 'message_other_exception_rule_fail' }; this.modalService.getmodalObservable.next(msg); return false; } @@ -154,48 +154,48 @@ export class RuleInfo implements OnInit { initUpload(queryRule: RuleModel): void { - $("#fileName").text(""); - $("#importFailTip").addClass("hide_panel"); - $("#fileupload").fileupload({ + $('#fileName').text(''); + $('#importFailTip').addClass('hide_panel'); + $('#fileupload').fileupload({ dropZone: $('#dropzone'), maxNumberOfFiles: 1, maxChunkSize: 20000000, autoUpload: false, add: function (e, data) { - var fileName = data.files[0].name; + let fileName = data.files[0].name; - $("#importFailTip").addClass("hide_panel"); - let suffix = fileName.substring(fileName.lastIndexOf("."), fileName.length) + $('#importFailTip').addClass('hide_panel'); + let suffix = fileName.substring(fileName.lastIndexOf('.'), fileName.length) - if (suffix != ".txt") { - $("#importFailTip").removeClass("hide_panel"); + if (suffix != '.txt') { + $('#importFailTip').removeClass('hide_panel'); return suffix; } - $("#bar").css('width', '0%'); - $("#persent").text('0%'); - $("#fileName").text(fileName); - $("#fileremove").attr("disabled", false); - $("#filesubmit").attr("disabled", false); - $("#filesubmit").click(function () { + $('#bar').css('width', '0%'); + $('#persent').text('0%'); + $('#fileName').text(fileName); + $('#fileremove').attr('disabled', false); + $('#filesubmit').attr('disabled', false); + $('#filesubmit').click(function () { this.file = data.files[0] var reader = new FileReader(); reader.readAsText(this.file); reader.onload = function (data) { queryRule.content = this.result; } - $("#fileremove").click(); - $("#importDiv").hide(); + $('#fileremove').click(); + $('#importDiv').hide(); e.stopPropagation(); }); - $("#fileremove").click(function () { - $("#bar").css('width', '0%'); - $("#persent").text("0%"); - $("#fileName").text(""); - $("#filesubmit").attr("disabled", true); - $("#fileremove").attr("disabled", true); + $('#fileremove').click(function () { + $('#bar').css('width', '0%'); + $('#persent').text('0%'); + $('#fileName').text(''); + $('#filesubmit').attr('disabled', true); + $('#fileremove').attr('disabled', true); }); }, done: function (e, data) { @@ -204,9 +204,9 @@ export class RuleInfo implements OnInit { fail: function (e, resp) { }, always: function (e, data) { - $(".progress").removeClass("active"); - $("#bar").css('width', '100%'); - $("#persent").text('100%'); + $('.progress').removeClass('active'); + $('#bar').css('width', '100%'); + $('#persent').text('100%'); }, progressall: function (e, data) { } @@ -215,14 +215,14 @@ export class RuleInfo implements OnInit { initImportDiv(queryRule: RuleModel): void { this.initUpload(queryRule); - var importDiv = $("#importDiv"); + let importDiv = $('#importDiv'); $(function (arg) { - $("#importBtn").click(function (e) { + $('#importBtn').click(function (e) { e.preventDefault(); - $("[data-toggle='tooltip']").tooltip(); - $("#importFailTip").addClass("hide_panel"); + $('[data-toggle="tooltip"]').tooltip(); + $('#importFailTip').addClass('hide_panel'); showDiv(); - $(document).one("click", function (e) { + $(document).one('click', function (e) { $(importDiv).hide(); }); e.stopPropagation(); @@ -230,64 +230,66 @@ export class RuleInfo implements OnInit { $(importDiv).click(function (e) { e.stopPropagation(); }); - $("#filesubmit").attr("disabled", true); - $("#fileremove").attr("disabled", true); + $('#filesubmit').attr('disabled', true); + $('#fileremove').attr('disabled', true); }); function showDiv() { - $("#bar").css('width', '0%'); - $("#persent").text('0%'); + $('#bar').css('width', '0%'); + $('#persent').text('0%'); $(importDiv).fadeIn(); } } ngOnInit() { this.formModel = { - ruleid: null, - rulename: null, + ruleId: null, + ruleName: null, description: null, content: null, - createtime: null, + createTime: null, creator: null, - updatetime: null, + updateTime: null, modifier: null, enabled: null, - } + loopControlName: null + }; this.queryRule = { - ruleid: null, - rulename: null, + ruleId: null, + ruleName: null, description: null, content: null, - createtime: null, + createTime: null, creator: null, - updatetime: null, + updateTime: null, modifier: null, enabled: 0, - } + loopControlName: '' + }; this.route.params.subscribe((params) => { let id = params['id']; - if (typeof (id) == "string") { + if (typeof (id) == 'string') { if (id.indexOf('&') == -1) { - $("#ruleNameInput").attr("disabled", true); - $("#saveLabel").hide(); + $('#ruleNameInput').attr('disabled', true); + $('#saveLabel').hide(); } else { this.addBottonStatus = false; - $("#saveLabel").hide(); - $("#checkLabel").hide(); - $("#updateLabel").hide(); + $('#saveLabel').hide(); + $('#checkLabel').hide(); + $('#updateLabel').hide(); } - let str = id.split("&"); + let str = id.split('&'); this.getRuleInfo(str[0]); - } else if (typeof (id) != "undefined") { + } else if (typeof (id) != 'undefined') { this.getRuleInfo(id); } else { - $("#updateLabel").hide(); + $('#updateLabel').hide(); } - if (typeof (this.queryRule.enabled) === "number") { - this.queryRule.enabled = "" + this.queryRule.enabled; + if (typeof (this.queryRule.enabled) === 'number') { + this.queryRule.enabled = '' + this.queryRule.enabled; } - }) + }); this.initImportDiv(this.queryRule); }