-
-
Notifications
You must be signed in to change notification settings - Fork 341
Add EvidenceStore for tracking activity evidence (#496) #501
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
sawankshrma
wants to merge
2
commits into
devsecopsmaturitymodel:main
Choose a base branch
from
sawankshrma:team_evidence
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+222
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,194 @@ | ||
| import { YamlService } from '../service/yaml-loader/yaml-loader.service'; | ||
| import { Uuid } from './types'; | ||
|
|
||
| export interface EvidenceAttachment { | ||
| type: string; // e.g. 'document', 'image', 'link' | ||
| externalLink: string; // URL | ||
| } | ||
|
|
||
| export interface EvidenceEntry { | ||
| id: string; // stable UUID for this entry | ||
| teams: string[]; | ||
| title: string; | ||
| evidenceRecorded: string; // ISO date string | ||
| reviewer?: string; | ||
| description: string; | ||
| attachment?: EvidenceAttachment[]; | ||
| } | ||
|
|
||
| export type EvidenceData = Record<Uuid, EvidenceEntry[]>; | ||
|
|
||
| const LOCALSTORAGE_KEY: string = 'evidence'; | ||
|
|
||
| export class EvidenceStore { | ||
| private yamlService: YamlService = new YamlService(); | ||
| private _evidence: EvidenceData = {}; | ||
|
|
||
| // ─── Lifecycle ──────────────────────────────────────────── | ||
|
|
||
| public initFromLocalStorage(): void { | ||
| const stored = this.retrieveStoredEvidence(); | ||
| if (stored) { | ||
| this.addEvidenceData(stored); | ||
| } | ||
| } | ||
|
|
||
| // ─── Accessors ──────────────────────────────────────────── | ||
|
|
||
| public getEvidenceData(): EvidenceData { | ||
| return this._evidence; | ||
| } | ||
|
|
||
| public getEvidence(activityUuid: Uuid): EvidenceEntry[] { | ||
| return this._evidence[activityUuid] || []; | ||
| } | ||
|
|
||
| public hasEvidence(activityUuid: Uuid): boolean { | ||
| return (this._evidence[activityUuid]?.length || 0) > 0; | ||
| } | ||
|
|
||
| public getEvidenceCount(activityUuid: Uuid): number { | ||
| return this._evidence[activityUuid]?.length ?? 0; | ||
| } | ||
|
|
||
| public getTotalEvidenceCount(): number { | ||
| let count = 0; | ||
| for (const uuid in this._evidence) { | ||
| count += this._evidence[uuid].length; | ||
| } | ||
| return count; | ||
| } | ||
|
|
||
| public getActivityUuidsWithEvidence(): Uuid[] { | ||
| return Object.keys(this._evidence).filter(uuid => this._evidence[uuid].length > 0); | ||
| } | ||
|
|
||
| // ─── Mutators ──────────────────────────────────────────── | ||
|
|
||
| public addEvidenceData(newEvidence: EvidenceData): void { | ||
| if (!newEvidence) return; | ||
|
|
||
| for (const activityUuid in newEvidence) { | ||
| if (!this._evidence[activityUuid]) { | ||
| this._evidence[activityUuid] = []; | ||
| } | ||
|
|
||
| const newEntries = newEvidence[activityUuid]; | ||
| if (Array.isArray(newEntries)) { | ||
| for (const entry of newEntries) { | ||
| if (!this.isDuplicateEntry(activityUuid, entry)) { | ||
| this._evidence[activityUuid].push(entry); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public replaceEvidenceData(data: EvidenceData): void { | ||
| this._evidence = data; | ||
| this.saveToLocalStorage(); | ||
| } | ||
|
|
||
| public addEvidence(activityUuid: Uuid, entry: EvidenceEntry): void { | ||
| if (!this._evidence[activityUuid]) { | ||
| this._evidence[activityUuid] = []; | ||
| } | ||
| this._evidence[activityUuid].push(entry); | ||
| this.saveToLocalStorage(); | ||
| } | ||
|
|
||
| public updateEvidence( | ||
| activityUuid: Uuid, | ||
| entryId: string, | ||
| updatedEntry: Partial<EvidenceEntry> | ||
| ): void { | ||
| const entries = this._evidence[activityUuid]; | ||
| if (!entries) { | ||
| console.warn(`No evidence found for activity ${activityUuid}`); | ||
| return; | ||
| } | ||
| const index = entries.findIndex(e => e.id === entryId); | ||
| if (index === -1) { | ||
| console.warn(`Cannot find evidence with id ${entryId} for activity ${activityUuid}`); | ||
| return; | ||
| } | ||
| // Immutable update for Angular change detection | ||
| entries[index] = { ...entries[index], ...updatedEntry }; | ||
| this.saveToLocalStorage(); | ||
| } | ||
|
|
||
| public deleteEvidence(activityUuid: Uuid, entryId: string): void { | ||
| const entries = this._evidence[activityUuid]; | ||
| if (!entries) { | ||
| console.warn(`No evidence found for activity ${activityUuid}`); | ||
| return; | ||
| } | ||
| const index = entries.findIndex(e => e.id === entryId); | ||
| if (index === -1) { | ||
| console.warn(`Cannot find evidence with id ${entryId} for activity ${activityUuid}`); | ||
| return; | ||
| } | ||
| entries.splice(index, 1); | ||
|
|
||
| if (entries.length === 0) { | ||
| delete this._evidence[activityUuid]; | ||
| } | ||
| this.saveToLocalStorage(); | ||
| } | ||
|
|
||
| public renameTeam(oldName: string, newName: string): void { | ||
| console.log(`Renaming team '${oldName}' to '${newName}' in evidence store`); | ||
| for (const uuid in this._evidence) { | ||
| this._evidence[uuid].forEach(entry => { | ||
| entry.teams = entry.teams.map(t => (t === oldName ? newName : t)); | ||
| }); | ||
| } | ||
| this.saveToLocalStorage(); | ||
| } | ||
|
|
||
| // ─── Serialization ────────────────────────────────────── | ||
|
|
||
| public asYamlString(): string { | ||
| return this.yamlService.stringify({ evidence: this._evidence }); | ||
| } | ||
|
|
||
| public saveToLocalStorage(): void { | ||
| const yamlStr = this.asYamlString(); | ||
| localStorage.setItem(LOCALSTORAGE_KEY, yamlStr); | ||
| } | ||
|
|
||
| public deleteBrowserStoredEvidence(): void { | ||
| console.log('Deleting evidence from browser storage'); | ||
| localStorage.removeItem(LOCALSTORAGE_KEY); | ||
| } | ||
|
|
||
| public retrieveStoredEvidenceYaml(): string | null { | ||
| return localStorage.getItem(LOCALSTORAGE_KEY); | ||
| } | ||
|
|
||
| public retrieveStoredEvidence(): EvidenceData | null { | ||
| const yamlStr = this.retrieveStoredEvidenceYaml(); | ||
| if (!yamlStr) return null; | ||
|
|
||
| const parsed = this.yamlService.parse(yamlStr); | ||
| return parsed?.evidence ?? null; | ||
| } | ||
|
|
||
| // ─── Helpers ───────────────────────────────────────────── | ||
|
|
||
| private isDuplicateEntry(activityUuid: Uuid, entry: EvidenceEntry): boolean { | ||
| const existing = this._evidence[activityUuid]; | ||
| if (!existing) return false; | ||
| return existing.some(e => e.id === entry.id); | ||
| } | ||
|
|
||
| public static todayDateString(): string { | ||
| const now = new Date(); | ||
| return now.toISOString().substring(0, 10); | ||
| } | ||
|
|
||
| // to be used when creating new evidence entries to ensure they have a stable UUID | ||
| public static generateId(): string { | ||
| return crypto.randomUUID?.() ?? `${Date.now()}-${Math.random().toString(36).substring(2, 9)}`; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Export team evidence from the browser, and replace this file | ||
| evidence: |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah. I was not clear in my example.
The UUID on top level under the root node
evidence:I was thinking would be the activity-uuid.So unless we want to create an UUID as an ID for the evidence entry itself, I don't think this will be needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. I did understand in the issue example that the top level UUID was the activity-uuid.
It was my mistake that I did not point this extra design choice of the data-structure in the PR description.
Let me calrify this here.
Since we are not going to tie evidence with progress (as specifically mentioned in the issue's comments). For the same team and the same activity we could have more than one EvidenceEntry (say entries for starting and partly implementing but not fully implementing, 2 here).
For this I went for a unique id for each EvidenceEntry to identify them separately.
I have updated the Format in the original PR description which showcases this. I just copy-pasted the Format form the issue earlier. my bad.!
If this design choice seems unnecessary, please suggest another way to uniquely identify multiple EvidenceEntry entries for the same team and activity.