Skip to content

Commit c83f0db

Browse files
committed
Merge branch 'v4-dev' into 'v4-dev'
2 parents 5048810 + abd4fca commit c83f0db

File tree

3 files changed

+106
-4
lines changed

3 files changed

+106
-4
lines changed

src/app/component/dependency-graph/dependency-graph.component.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ export class DependencyGraphComponent implements OnInit, OnChanges {
112112
populateGraphWithActivitiesCurrentActivityDependsOn(activity: Activity): void {
113113
if (activity.dependsOn) {
114114
let i: number = 1;
115-
for (const prececcor of activity.dependsOn) {
116-
this.addNode(prececcor, -1, i++);
115+
for (const predecessor of activity.dependsOn) {
116+
this.addNode(predecessor, -1, i++);
117117
this.graphData['links'].push({
118-
source: prececcor,
118+
source: predecessor,
119119
target: activity.name,
120120
});
121121
}
@@ -232,7 +232,9 @@ export class DependencyGraphComponent implements OnInit, OnChanges {
232232
this.activityClicked.observed && d.relativeLevel != 0 ? 'pointer' : 'default'
233233
)
234234
.on('mouseover', function (_event: any, _d: any) {
235-
d3.select(this).classed('hovered', true);
235+
if (d3.select(this).classed('clickable')) {
236+
d3.select(this).classed('hovered', true);
237+
}
236238
})
237239
.on('mouseout', function (_event: any, _d: any) {
238240
d3.select(this).classed('hovered', false);
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
## Things we'd like to improve
2+
### Upgrade to Angular 21
3+
- We’d like to update to lates Angular, as we are currently running on a dated version
4+
5+
### Evidence
6+
- Support handling evidence for each activity.
7+
8+
### Review Level 2 activities in the model
9+
- Do a quality assurance on the model of all level 2 activities in the [DSOMM-data](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data) repository.
10+
11+
 
12+
13+
<hr>
14+
15+
## Completed
16+
### DSOMM application v4.0
17+
The release of v4.0 came with some breaking changing of the data model. This was to separate the role of responsibility into the model itself, and the progress information of a team. This way one can more easily update to a new version of the model, without affecting the historic progress of each team.
18+
19+
The headlines of the release is:
20+
- Breaking changes: Data model
21+
- The `generated.yaml` is split into `model.yaml` and `team-progress.yaml`
22+
- The `model.yaml` has now includes a _"header"_ that contains the version of the DSOMM model it contains
23+
- Customize your own Team names and Groups in the browser
24+
- A Team's progress has changed from a `yes|no` boolean, to customizable steps, from zero to fully complete
25+
- The view of an activity has been improved including the dependencies between activities
26+
- Centralized data loader, all pages uses the same loading mechanism and we only load once at startup
27+
28+
*Released: 2025-12-16*

src/assets/Markdown Files/TODO.md

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# ToDo
2+
The file contains items that would be good to improve. No particular order, apart from 'Doing' amd 'Next in the line'.
3+
4+
5+
## Doing
6+
7+
8+
## Next in line
9+
10+
11+
## Backlog
12+
### Upgrade to latest Angular
13+
- Angular: Upgrade from v13
14+
15+
### Activity view
16+
- Activity: Show Team Evidence from yaml file
17+
- Activity: Input Teams' evidence
18+
- Activity: Dependency: Do not list activities beyond Max Level
19+
- Activity: Give user message if selected activity is of higher level than visible
20+
21+
### Matrix
22+
- Matrix: Add Filter search (like for Mapping)
23+
- Matrix: Remember filters when returning to matrix page
24+
- Matrix: Add a Close/Back button on Activity
25+
- Matrix: Close on pushing ESCAPE
26+
27+
### KPI
28+
- Teams: Bug: Reads progress heading from activityStore, not metaStore
29+
- Team KPI: One KPI per ProgressDefinition
30+
- KPI: Add Sub-title
31+
32+
### Teams
33+
- Teams: Bug: Editing name, pushes the item last
34+
- Teams: Allow user to re-order teams and groups
35+
- Teams: Allow editing dates for progress stages
36+
37+
### Heatmap:
38+
- Heatmap: Known Bug ([#432](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel/issues/432)): Occasionally, the `getComputedStyle()` returns a \ CSSStyleDeclaration` object with empty styles, which leave the heatmap all black.
39+
- Heatmap: Allow 'change all' if more than four activities
40+
- Heatmap: Highlight (outline) the activity card that is open
41+
- Heatmap, Card: Add Complete-symbol per activity
42+
- Heatmap: Slider: Fix: asterisk marks when modified
43+
- ViewController needs to know about changes vs temp storage
44+
- Heatmap: Bug: Selecting a team group does not always get deselected when flipping teams
45+
- Heatmap: meta-yaml: If progress definition is missing, default to 0% + 100%
46+
- Heatmap: Outer rim: Increase subdimension to be two lines (and increase size)
47+
- Heatmap: Outer rim: Make hover display Dimension (over subdimension)
48+
- Heatmap: Search: A bit like 'Filter' but needs to highlight each sector and activity card
49+
- Heatmap: Filter: Bug: SPACE key does not trigger
50+
- Export to Excel. Move from Mapping, to just progress data
51+
52+
### Settings
53+
- Settings: Terms: Allow custom names for: 'Team' and 'Group' (e.g. to 'App' and 'Portfolio')
54+
55+
### Misc
56+
- Move all getMetaString into MetaStore()
57+
- Add fallbacks for getMetaString in MetaStore()
58+
- Move META_FILE constant from data service to main app
59+
- Loader: Check if loader can be optimized by load in yaml in parallel
60+
- Matrix: Go through tags: remove, add and rename
61+
62+
63+
## Done
64+
### DSOMM v4.0.0
65+
- Breaking changes: Data model
66+
- The `generated.yaml` is split into `model.yaml` and `team-progress.yaml`
67+
- The `model.yaml` has now includes a _"header"_ that contains the version of the DSOMM model it contains
68+
- Customize your own Team names and Groups in the browser
69+
- A Team's progress has changed from a `yes|no` boolean, to customizable steps, from zero to fully complete
70+
- The view of an activity has been improved including the dependencies between activities
71+
- Centralized data loader, all pages uses the same loading mechanism and we only load once at startup
72+

0 commit comments

Comments
 (0)