v0.4.22

* Fix: deleting MyTag
SecSimon · Nov 17, 2023 · 176c45f · 176c45f
1 parent 2f0dbc3
commit 176c45f
Show file tree

Hide file tree

Showing 10 changed files with 106 additions and 86 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.22
+
+* Fix: deleting MyTag
+
 ## 0.4.21
 
 * Fix: undefined flow anchors in hardware diagram

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ttmodeler",
-  "version": "0.4.21",
+  "version": "0.4.22",
   "description": "Thing Threat Modeler for Internet of Things Devices",
   "homepage": "https://www.simon-liebl.de/TTM",
   "author": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ttmodeler",
-  "version": "0.4.21",
+  "version": "0.4.22",
   "description": "Thing Threat Modeler for Internet of Things Devices",
   "homepage": "https://www.simon-liebl.de/TTM",
   "author": {

diff --git a/src/app/model/database.ts b/src/app/model/database.ts
@@ -150,7 +150,9 @@ export enum DataReferenceTypes {
 
   DeleteTestCase,
 
-  RemoveMyTagFromAttackScenario
+  RemoveMyTagFromAttackScenario,
+  RemoveMyTagFromCountermeasure,
+  RemoveMyTagFromMyTagChart
 }
 
 export interface IDataReferences {

diff --git a/src/app/model/my-tags.ts b/src/app/model/my-tags.ts
@@ -3,6 +3,7 @@ import { ConfigFile } from './config-file';
 import { DatabaseBase, IDataReferences, DataReferenceTypes } from './database';
 import { ProjectFile } from './project-file';
 import { AttackScenario } from './threat-model';
+import { Countermeasure } from './mitigations';
 
 export interface ITagable {
   MyTags: MyTag[];
@@ -68,13 +69,18 @@ export class MyTag extends DatabaseBase {
     let refs: IDataReferences[] = [];
 
     pf?.GetAttackScenarios().filter(x => x.MyTags.includes(this)).forEach(x => refs.push({ Type: DataReferenceTypes.RemoveMyTagFromAttackScenario, Param: x }));
+    pf?.GetCountermeasures().filter(x => x.MyTags.includes(this)).forEach(x => refs.push({ Type: DataReferenceTypes.RemoveMyTagFromCountermeasure, Param: x }));
+    pf?.GetMyTagCharts().filter(x => x.MyTags.includes(this)).forEach(x => refs.push({ Type: DataReferenceTypes.RemoveMyTagFromMyTagChart, Param: x }));
+
     return refs;
   }
 
   public OnDelete(pf: ProjectFile, cf: ConfigFile) {
     let refs = this.FindReferences(pf, cf);
     refs.forEach(x => {
       if (x.Type == DataReferenceTypes.RemoveMyTagFromAttackScenario) (x.Param as AttackScenario).RemoveMyTag(this.ID);
+      else if (x.Type == DataReferenceTypes.RemoveMyTagFromCountermeasure) (x.Param as Countermeasure).RemoveMyTag(this.ID);
+      else if (x.Type == DataReferenceTypes.RemoveMyTagFromMyTagChart) (x.Param as MyTagChart).RemoveMyTag(this.ID);
     });
   }
 

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -328,9 +328,11 @@
   "dialog.delete.RemoveFromStencilProtocolStack": "Protokoll von Protokollstack entfernt:",
   "dialog.delete.RemoveMitigationProcessFromCountermeasure": "Maßnahmenprozess entfernt von Gegenmaßnahme:",
   "dialog.delete.RemoveMyTagFromAttackScenario": "Tag entfernt von Angriffsszenario:",
+  "dialog.delete.RemoveMyTagFromCountermeasure": "Tag entfernt von Gegenmaßnahme:",
+  "dialog.delete.RemoveMyTagFromMyTagChart": "Tag entfernt von Tag Chart:",
   "dialog.delete.RemovePhysicalElementReference": "Referenz als physisches Element entfernt:",
-  "dialog.delete.RemoveRequirementTypeFromChecklist": "Anforderung von Checkliste entfernt",
-  "dialog.delete.RemoveRequirementTypeFromChecklistType": "Anforderungstyp von Checklistentyp entfernt",
+  "dialog.delete.RemoveRequirementTypeFromChecklist": "Anforderung von Checkliste entfernt:",
+  "dialog.delete.RemoveRequirementTypeFromChecklistType": "Anforderungstyp von Checklistentyp entfernt:",
   "dialog.delete.RemoveStencilTypeTemplateFromStencilType": "Template von Stencil entfernt:",
   "dialog.delete.RemoveThreatCategoryFromAttackScenario": "Bedrohungskategorie von Angriffsszenario entfernt:",
   "dialog.delete.RemoveThreatCategoryFromThreatMnemonic": "Bedrohungskategorie von Bedrohungsmerkhilfe entfernt:",

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -328,9 +328,11 @@
   "dialog.delete.RemoveFromStencilProtocolStack": "Protocol removed from protocol stack:",
   "dialog.delete.RemoveMitigationProcessFromCountermeasure": "Mitigation process removed from countermeasure:",
   "dialog.delete.RemoveMyTagFromAttackScenario": "Tag removed from attack scenario:",
+  "dialog.delete.RemoveMyTagFromCountermeasure": "Tag removed from countermeasure:",
+  "dialog.delete.RemoveMyTagFromMyTagChart": "Tag removed from tag chart:",
   "dialog.delete.RemovePhysicalElementReference": "Reference as physical element removed:",
-  "dialog.delete.RemoveRequirementTypeFromChecklist": "Requirement type removed from checklist",
-  "dialog.delete.RemoveRequirementTypeFromChecklistType": "Requirement type removed from checklist type",
+  "dialog.delete.RemoveRequirementTypeFromChecklist": "Requirement type removed from checklist:",
+  "dialog.delete.RemoveRequirementTypeFromChecklistType": "Requirement type removed from checklist type:",
   "dialog.delete.RemoveStencilTypeTemplateFromStencilType": "Template removed from stencil:",
   "dialog.delete.RemoveThreatCategoryFromAttackScenario": "Threat category removed from attack scenario:",
   "dialog.delete.RemoveThreatCategoryFromThreatMnemonic": "Threat category removed from threat mnemonic:",

diff --git a/src/assets/version.json b/src/assets/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "0.4.21"
+  "version": "0.4.22"
 }