diff --git a/frontend/src/app/components/producer-edit/producer-edit-security/producer-edit-security.component.ts b/frontend/src/app/components/producer-edit/producer-edit-security/producer-edit-security.component.ts
index bc9beeb5..18bde906 100644
--- a/frontend/src/app/components/producer-edit/producer-edit-security/producer-edit-security.component.ts
+++ b/frontend/src/app/components/producer-edit/producer-edit-security/producer-edit-security.component.ts
@@ -22,7 +22,6 @@ export class ProducerEditSecurityComponent implements OnInit, CanDeactivateModal
@Input() system: System;
security: any;
classifiers = classifiers;
-
buttonClicked: boolean = false;
hasSecurity: boolean = false;
@@ -93,10 +92,10 @@ export class ProducerEditSecurityComponent implements OnInit, CanDeactivateModal
if (security.latest_audit_date){
security.latest_audit_date = this.generalHelperService.dateObjToTimestamp(security.latest_audit_date);
}
- if (this.securityStandard != this.classifiers.security_standard.MUU.code){
- security.standard = this.securityStandard;
+ if (this.securityStandard == 'ISKE'){
+ security.standard = this.classifiers.security_standard.ISKE.code;
}
- if (this.securityStandard != this.classifiers.security_standard.MUU.code && this.securityClass.k != null && this.securityClass.s != null && this.securityClass.t != null){
+ if (this.securityStandard == 'ISKE' && this.securityClass.k != null && this.securityClass.s != null && this.securityClass.t != null){
security.class = this.getSecurityClass();
security.level = this.getSecurityLevel();
} else {
@@ -112,9 +111,9 @@ export class ProducerEditSecurityComponent implements OnInit, CanDeactivateModal
}
getSecurityClass(){
- if (this.securityStandard == this.classifiers.security_standard.ISKE.code){
+ if (this.securityStandard == 'ISKE'){
return this.getIskeSecurityClass();
- } else if (this.securityStandard == this.classifiers.security_standard.EITS.code){
+ } else if (this.securityStandard == 'EITS'){
return this.getEitsSecurityClass();
}
}
@@ -138,7 +137,6 @@ export class ProducerEditSecurityComponent implements OnInit, CanDeactivateModal
return true;
}
-
/**
* Getters
*/
@@ -167,8 +165,8 @@ export class ProducerEditSecurityComponent implements OnInit, CanDeactivateModal
this.hasSecurity = this.security.standard != null;
- if (this.security.standard != this.classifiers.security_standard.ISKE.code && this.security.standard != this.classifiers.security_standard.EITS.code) {
- this.securityStandard = this.classifiers.security_standard.MUU.code;
+ if (this.security.standard != 'ISKE' && this.security.standard != 'EITS') {
+ this.securityStandard = 'MUU';
} else {
this.securityStandard = this.security.standard;
}
@@ -177,9 +175,9 @@ export class ProducerEditSecurityComponent implements OnInit, CanDeactivateModal
if (this.security.class && this.security.class.length == 6){
this.securityClass = {
- k: this.security.standard == this.classifiers.security_standard.ISKE.code ? this.security.class.substr(1, 1) : this.security.class.substr(5, 1),
+ k: this.security.class.substr(1, 1),
t: this.security.class.substr(3, 1),
- s: this.security.standard == this.classifiers.security_standard.ISKE.code ? this.security.class.substr(5, 1) : this.security.class.substr(1, 1),
+ s: this.security.class.substr(5, 1)
}
} else {
this.securityClass = {
@@ -189,7 +187,6 @@ export class ProducerEditSecurityComponent implements OnInit, CanDeactivateModal
}
}
-
this.security.latest_audit_date = this.generalHelperService.timestampToDateObj(this.security.latest_audit_date);
};
From 37b610129c836ee874783029083d239e38310e40 Mon Sep 17 00:00:00 2001
From: makar
Date: Mon, 14 Feb 2022 11:16:27 +0200
Subject: [PATCH 23/93] Revert "Deleted Setup.java changes"
This reverts commit ded786081deff0a9b3f22d832dfe13dc9966d593.
---
autotest/src/main/java/ee/ria/riha/driver/Setup.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/autotest/src/main/java/ee/ria/riha/driver/Setup.java b/autotest/src/main/java/ee/ria/riha/driver/Setup.java
index 63529376..3674a504 100644
--- a/autotest/src/main/java/ee/ria/riha/driver/Setup.java
+++ b/autotest/src/main/java/ee/ria/riha/driver/Setup.java
@@ -24,6 +24,8 @@ public void init() {
WebDriverManager.chromedriver().setup();
ChromeOptions chromeOptions = new ChromeOptions();
chromeOptions.addArguments("start-maximized");
+ chromeOptions.addArguments("--disable-web-security");
+ chromeOptions.addArguments("--ignore-certificate-errors");
driver = new ChromeDriver(chromeOptions);
break;
case "firefox":
From 18df2f41b9d5e716a1de8aac7b13c3c44e280f07 Mon Sep 17 00:00:00 2001
From: makar
Date: Mon, 14 Feb 2022 11:16:27 +0200
Subject: [PATCH 24/93] Revert "Added E-ITS"
This reverts commit 31188727c7668407de6cc1300c3ef5eb4d13983a.
---
.../main/java/ee/ria/riha/driver/Setup.java | 2 -
.../producer-edit-security.component.html | 145 ++++--------------
.../producer-edit-security.component.ts | 27 +---
3 files changed, 35 insertions(+), 139 deletions(-)
diff --git a/autotest/src/main/java/ee/ria/riha/driver/Setup.java b/autotest/src/main/java/ee/ria/riha/driver/Setup.java
index 3674a504..63529376 100644
--- a/autotest/src/main/java/ee/ria/riha/driver/Setup.java
+++ b/autotest/src/main/java/ee/ria/riha/driver/Setup.java
@@ -24,8 +24,6 @@ public void init() {
WebDriverManager.chromedriver().setup();
ChromeOptions chromeOptions = new ChromeOptions();
chromeOptions.addArguments("start-maximized");
- chromeOptions.addArguments("--disable-web-security");
- chromeOptions.addArguments("--ignore-certificate-errors");
driver = new ChromeDriver(chromeOptions);
break;
case "firefox":
diff --git a/frontend/src/app/components/producer-edit/producer-edit-security/producer-edit-security.component.html b/frontend/src/app/components/producer-edit/producer-edit-security/producer-edit-security.component.html
index f09dd6f9..3d8029f0 100644
--- a/frontend/src/app/components/producer-edit/producer-edit-security/producer-edit-security.component.html
+++ b/frontend/src/app/components/producer-edit/producer-edit-security/producer-edit-security.component.html
@@ -20,19 +20,15 @@
vali, millist turvameetmete süsteemi või standardeid infosüsteemi haldamisel kasutatakse
-
-
-
- 1
+
+ 1
-
- 2
+
+ 2
-
- 3
+
+ 3
@@ -167,20 +83,20 @@
diff --git a/frontend/src/app/components/producer-edit/producer-edit-security/producer-edit-security.component.ts b/frontend/src/app/components/producer-edit/producer-edit-security/producer-edit-security.component.ts
index 18bde906..b79825c9 100644
--- a/frontend/src/app/components/producer-edit/producer-edit-security/producer-edit-security.component.ts
+++ b/frontend/src/app/components/producer-edit/producer-edit-security/producer-edit-security.component.ts
@@ -26,7 +26,7 @@ export class ProducerEditSecurityComponent implements OnInit, CanDeactivateModal
hasSecurity: boolean = false;
isAuditApplied: boolean = false;
- securityStandard: any;
+ isIske: boolean;
securityClass: {
k: any,
t: any,
@@ -43,12 +43,9 @@ export class ProducerEditSecurityComponent implements OnInit, CanDeactivateModal
}
}
- getIskeSecurityClass(){
+ getSecurityClass(){
return `K${this.securityClass.k}T${this.securityClass.t}S${this.securityClass.s}`;
}
- getEitsSecurityClass(){
- return `C${this.securityClass.s}I${this.securityClass.t}A${this.securityClass.k}`;
- }
saveSystem(f){
if (f.valid){
@@ -92,10 +89,10 @@ export class ProducerEditSecurityComponent implements OnInit, CanDeactivateModal
if (security.latest_audit_date){
security.latest_audit_date = this.generalHelperService.dateObjToTimestamp(security.latest_audit_date);
}
- if (this.securityStandard == 'ISKE'){
+ if (this.isIske){
security.standard = this.classifiers.security_standard.ISKE.code;
}
- if (this.securityStandard == 'ISKE' && this.securityClass.k != null && this.securityClass.s != null && this.securityClass.t != null){
+ if (this.isIske && this.securityClass.k != null && this.securityClass.s != null && this.securityClass.t != null){
security.class = this.getSecurityClass();
security.level = this.getSecurityLevel();
} else {
@@ -110,14 +107,6 @@ export class ProducerEditSecurityComponent implements OnInit, CanDeactivateModal
return security;
}
- getSecurityClass(){
- if (this.securityStandard == 'ISKE'){
- return this.getIskeSecurityClass();
- } else if (this.securityStandard == 'EITS'){
- return this.getEitsSecurityClass();
- }
- }
-
canDeactivate(): Observable
| Promise | boolean {
return this.closeModal();
}
@@ -164,13 +153,7 @@ export class ProducerEditSecurityComponent implements OnInit, CanDeactivateModal
};
this.hasSecurity = this.security.standard != null;
-
- if (this.security.standard != 'ISKE' && this.security.standard != 'EITS') {
- this.securityStandard = 'MUU';
- } else {
- this.securityStandard = this.security.standard;
- }
-
+ this.isIske = this.security.standard == 'ISKE';
this.isAuditApplied = this.security.latest_audit_date || this.security.latest_audit_resolution;
if (this.security.class && this.security.class.length == 6){
From 02158028e0e22d944da62a49a308742d277bcb35 Mon Sep 17 00:00:00 2001
From: makar
Date: Mon, 14 Feb 2022 11:18:01 +0200
Subject: [PATCH 25/93] Revert "Correct E-ITS security standard preview"
This reverts commit 31886df8
---
.../producer-details-security.component.html | 2 +-
frontend/src/app/models/system.ts | 11 -----------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/frontend/src/app/components/producer-details/producer-details-security/producer-details-security.component.html b/frontend/src/app/components/producer-details/producer-details-security/producer-details-security.component.html
index 025e26b0..9a0b3904 100644
--- a/frontend/src/app/components/producer-details/producer-details-security/producer-details-security.component.html
+++ b/frontend/src/app/components/producer-details/producer-details-security/producer-details-security.component.html
@@ -9,7 +9,7 @@
Turvainfo puudub
- {{ system.getSecurityStandardValue() }}
+ {{ system.getSecurityStandard() }}
diff --git a/frontend/src/app/models/system.ts b/frontend/src/app/models/system.ts
index 9664e6ae..08ccfcde 100644
--- a/frontend/src/app/models/system.ts
+++ b/frontend/src/app/models/system.ts
@@ -36,17 +36,6 @@ export class System {
return this.details.security.standard ? this.details.security.standard : null;
}
- getSecurityStandardValue(){
- if (this.getSecurityStandard() == classifiers.security_standard.ISKE.code){
- return classifiers.security_standard.ISKE.value;
- } else if (this.getSecurityStandard() == classifiers.security_standard.EITS.code){
- return classifiers.security_standard.EITS.value;
- } else {
- return this.details.security.standard;
- }
- }
-
-
getSecurityLevel() {
return this.details.security.level ? this.details.security.level : null;
}
From 58605ee573f7315baa673781032d1fbb39884048 Mon Sep 17 00:00:00 2001
From: makar
Date: Mon, 14 Feb 2022 11:18:02 +0200
Subject: [PATCH 26/93] Revert "Added E-ITS security standard preview"
This reverts commit 35ca7085d5ddcec3f6790d31beba4b0a4bbe8b77.
---
.../producer-details-security.component.html | 7 -------
1 file changed, 7 deletions(-)
diff --git a/frontend/src/app/components/producer-details/producer-details-security/producer-details-security.component.html b/frontend/src/app/components/producer-details/producer-details-security/producer-details-security.component.html
index 9a0b3904..f7e0570a 100644
--- a/frontend/src/app/components/producer-details/producer-details-security/producer-details-security.component.html
+++ b/frontend/src/app/components/producer-details/producer-details-security/producer-details-security.component.html
@@ -19,13 +19,6 @@
({{ system.getSecurityClass() }})
-