Skip to content

Commit 943a379

Browse files
HishamHR5HishamHR5
committed
merge upstream/main, resolve conflicts
2 parents d8e6f0d + b86934f commit 943a379

34 files changed

Lines changed: 1953 additions & 442 deletions

‎angular.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
},
117117
"defaultProject": "DSOMM",
118118
"cli": {
119-
"defaultCollection": "@angular-eslint/schematics"
119+
"defaultCollection": "@angular-eslint/schematics",
120+
"analytics": false
120121
}
121122
}

‎src/app/app.component.css‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
:host {
2+
display: flex;
3+
flex-direction: column;
4+
height: 100vh;
5+
overflow: hidden;
6+
}
7+
18
.navbar {
29
position: sticky;
310
top: 0;
@@ -7,7 +14,14 @@
714
align-items: center;
815
height: 64px;
916
transition: all 0.25s ease;
17+
flex-shrink: 0;
1018
}
19+
20+
.sidenav-container {
21+
flex: 1;
22+
overflow: hidden;
23+
}
24+
1125
.logo {
1226
display: flex;
1327
align-items: center;
@@ -16,6 +30,7 @@
1630
margin-left: -4px;
1731
height: 100%;
1832
}
33+
1934
.logo-icon {
2035
transform: scale(0.95);
2136
transform-origin: left center;
@@ -35,35 +50,37 @@
3550
margin-top: 4px;
3651
gap: 3px;
3752
}
53+
3854
.tag-title {
3955
font-size: 0.85em;
4056
font-weight: 500;
4157
line-height: 1;
4258
letter-spacing: 0.04em;
4359
}
60+
4461
.tag-subtitle {
4562
font-size: 0.65em;
4663
margin-top: 0;
4764
letter-spacing: 0.08em;
4865
opacity: 0.6;
4966
}
50-
.github-fork-ribbon::before {
51-
background-color: #333;
52-
}
67+
5368
.menu-btn {
5469
margin-right: 4px;
5570
transition: all 0.2s ease;
5671
}
72+
5773
.menu-btn:hover {
5874
background: rgba(0,0,0,0.04);
5975
transform: scale(1.05);
6076
}
61-
.spacer {
62-
flex: 1 1 auto;
63-
}
77+
6478
.content {
6579
padding: 24px;
6680
animation: fadeSlide 1s ease;
81+
height: 100%;
82+
box-sizing: border-box;
83+
overflow-y: auto;
6784
}
6885
@keyframes fadeSlide {
6986
from {
@@ -85,9 +102,6 @@
85102
.tag-subtitle {
86103
font-size: 11px;
87104
}
88-
.github-fork-ribbon {
89-
display: none;
90-
}
91105
.logo,
92106
.logo-icon {
93107
opacity: 0;

‎src/app/app.component.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
</div>
1717
<div class="dummy"></div>
1818
</div>
19-
<span class="spacer"></span>
2019
</mat-toolbar>
2120
<mat-sidenav-container class="sidenav-container">
2221
<mat-sidenav mode="side" opened class="sidenav" [style.width]="sidenavWidth">

‎src/app/app.module.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ import { ReportComponent } from './pages/report/report.component';
3737
import { ReportConfigModalComponent } from './component/report-config-modal/report-config-modal.component';
3838
import { TeamSelectorComponent } from './component/team-selector/team-selector.component';
3939
import { ColResizeDirective } from './directive/col-resize.directive';
40+
import { AddEvidenceModalComponent } from './component/add-evidence-modal/add-evidence-modal.component';
41+
import { EvidencePanelComponent } from './component/evidence-panel/evidence-panel.component';
42+
import { ViewEvidenceModalComponent } from './component/view-evidence-modal/view-evidence-modal.component';
4043

4144
@NgModule({
4245
declarations: [
@@ -65,6 +68,9 @@ import { ColResizeDirective } from './directive/col-resize.directive';
6568
ReportConfigModalComponent,
6669
TeamSelectorComponent,
6770
ColResizeDirective,
71+
AddEvidenceModalComponent,
72+
EvidencePanelComponent,
73+
ViewEvidenceModalComponent,
6874
],
6975
imports: [
7076
BrowserModule,

‎src/app/component/activity-description/activity-description.component.html‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -285,25 +285,6 @@ <h3><b>Usefulness</b></h3>
285285
>
286286
</mat-expansion-panel>
287287

288-
<!-- <mat-expansion-panel>
289-
<mat-expansion-panel-header>
290-
<mat-panel-title>
291-
<b>{{ settings.getTeamLabelPlural() }} Evidence</b>
292-
</mat-panel-title>
293-
</mat-expansion-panel-header>
294-
<mat-accordion multi="true">
295-
<mat-expansion-panel
296-
id="teamsEvidence"
297-
*ngFor="let item of this.currentActivity.teamsEvidence | keyvalue">
298-
<mat-expansion-panel-header>
299-
<mat-panel-title>
300-
<b [innerHTML]="item.key"></b>
301-
</mat-panel-title>
302-
</mat-expansion-panel-header>
303-
<p [innerHTML]="item.value"></p>
304-
</mat-expansion-panel>
305-
</mat-accordion>
306-
</mat-expansion-panel> -->
307288

308289
<mat-expansion-panel
309290
[expanded]="true"
@@ -376,6 +357,9 @@ <h4 class="tool-name" [innerHTML]="implement['name']"></h4>
376357
</p>
377358
</ng-template>
378359
</mat-expansion-panel>
360+
361+
<app-evidence-panel [activityUuid]="currentActivity.uuid || ''" [expanded]="isNarrowScreen">
362+
</app-evidence-panel>
379363
</mat-accordion>
380364

381365
<div

‎src/app/component/add-evidence-modal/add-evidence-modal.component.css‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
.config-content {
2+
max-height: 70vh;
3+
overflow-y: auto;
4+
padding: 0 40px;
5+
background-color: var(--background-primary);
6+
}
7+
8+
.config-section {
9+
padding: 16px 0;
10+
}
11+
12+
.config-section h3 {
13+
margin: 0 0 4px 0;
14+
font-size: 1.1em;
15+
font-weight: 500;
16+
}
17+
18+
.config-hint {
19+
margin: 0 0 12px 0;
20+
font-size: 0.85em;
21+
color: var(--text-secondary);
22+
}
23+
24+
.required {
25+
color: #c62828;
26+
font-weight: bold;
27+
}
28+
29+
.select-all-actions {
30+
display: flex;
31+
gap: 8px;
32+
margin-bottom: 8px;
33+
}
34+
35+
.checkbox-grid {
36+
display: grid;
37+
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
38+
gap: 8px;
39+
}
40+
41+
.full-width {
42+
width: 100%;
43+
}
44+
45+
.form-row {
46+
display: flex;
47+
gap: 16px;
48+
flex-wrap: wrap;
49+
}
50+
51+
.form-row mat-form-field {
52+
flex: 1;
53+
min-width: 180px;
54+
}
55+
56+
.attachment-row {
57+
display: flex;
58+
align-items: center;
59+
gap: 12px;
60+
margin-bottom: 8px;
61+
}
62+
63+
.attachment-type {
64+
flex: 0 0 120px;
65+
}
66+
67+
.attachment-link {
68+
flex: 1;
69+
}
70+
71+
.field-error {
72+
font-size: 0.8em;
73+
margin-top: -12px;
74+
margin-bottom: 16px;
75+
display: block;
76+
}
77+
78+
mat-divider {
79+
margin: 4px 0;
80+
}

‎src/app/component/add-evidence-modal/add-evidence-modal.component.html‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<h2 mat-dialog-title align="center">Add Evidence</h2>
2+
3+
<mat-dialog-content class="config-content">
4+
<app-team-selector
5+
[allTeams]="allTeams"
6+
[(selectedTeams)]="selectedTeams"
7+
[teamGroups]="teamGroups"
8+
(selectedTeamsChange)="onSelectedTeamsChange($event)"
9+
[type]="'add-evidence-config'">
10+
</app-team-selector>
11+
<mat-error *ngIf="teamsError" class="field-error" style="padding: 0 0 8px 0"
12+
>At least one team must be selected.</mat-error
13+
>
14+
15+
<mat-divider></mat-divider>
16+
17+
<!-- Title -->
18+
<div class="config-section">
19+
<h3>Evidence Details</h3>
20+
<mat-form-field appearance="outline" class="full-width">
21+
<mat-label>Title</mat-label>
22+
<input matInput [(ngModel)]="title" placeholder="e.g. Implemented SAST scanning" required />
23+
</mat-form-field>
24+
<mat-error *ngIf="titleError" class="field-error">Title is required.</mat-error>
25+
26+
<mat-form-field appearance="outline" class="full-width">
27+
<mat-label>Description</mat-label>
28+
<textarea
29+
matInput
30+
[(ngModel)]="description"
31+
rows="4"
32+
placeholder="Describe the evidence in detail..."></textarea>
33+
</mat-form-field>
34+
<mat-form-field appearance="outline">
35+
<mat-label>Reviewer</mat-label>
36+
<input matInput [(ngModel)]="reviewer" placeholder="e.g. Jane Doe" />
37+
</mat-form-field>
38+
</div>
39+
40+
<mat-divider></mat-divider>
41+
<!-- Attachments -->
42+
<div class="config-section">
43+
<h3>Attachments</h3>
44+
<p class="config-hint">Add links to supporting documents, images, or URLs.</p>
45+
<div *ngFor="let att of attachments; let i = index" class="attachment-row">
46+
<mat-form-field appearance="outline" class="attachment-type">
47+
<mat-label>Type</mat-label>
48+
<mat-select [(ngModel)]="att.type">
49+
<mat-option *ngFor="let aType of attachmentTypes" [value]="aType">
50+
{{ aType }}
51+
</mat-option>
52+
</mat-select>
53+
</mat-form-field>
54+
<mat-form-field appearance="outline" class="attachment-link">
55+
<mat-label>URL</mat-label>
56+
<input matInput [(ngModel)]="att.externalLink" placeholder="https://..." />
57+
</mat-form-field>
58+
<button mat-icon-button color="warn" (click)="removeAttachment(i)" matTooltip="Remove">
59+
<mat-icon>delete</mat-icon>
60+
</button>
61+
</div>
62+
<button mat-stroked-button color="primary" (click)="addAttachment()">
63+
<mat-icon>add</mat-icon> Add Attachment
64+
</button>
65+
</div>
66+
</mat-dialog-content>
67+
68+
<mat-dialog-actions align="end">
69+
<button mat-button (click)="onCancel()">Cancel</button>
70+
<button mat-raised-button color="primary" (click)="onSave()">Save Evidence</button>
71+
</mat-dialog-actions>

0 commit comments

Comments
 (0)