Skip to content

Develop #170

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.

Sign up for GitHub

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
ala-ebi wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Develop #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0836504
Add `warning-snackbar` styling for trait sanitization feedback
ala-ebi Oct 29, 2025
f2c08c3
Merge pull request #169 from EBISPOT/#1768-UI-alert-for-removal-of-no…
ala-ebi Oct 29, 2025
a58c61d
Integrate SAST, secret detection, and scanning jobs into CI pipeline
ala-ebi Dec 10, 2025
14f0b1d
Update CI pipeline: add 'scan' stage and adjust container_scanning stage
ala-ebi Dec 10, 2025
e4b04de
Merge pull request #172 from EBISPOT/#1786-Scan-security-vulnerabilit…
ala-ebi Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
include:
- template: Jobs/SAST.gitlab-ci.yml
- template: Jobs/Secret-Detection.gitlab-ci.yml
- template: Jobs/Dependency-Scanning.gitlab-ci.yml
- template: Jobs/Container-Scanning.gitlab-ci.yml

image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:latest
services:
- docker:dind

stages:
- sandbox-build-migration
- prod-build
- test
- docker-build
- scan
- docker-build-release
- deploy-sandbox-migration
- deploy-production
Expand Down Expand Up @@ -64,6 +72,15 @@ docker-build:
except:
- tags

container_scanning:
stage: scan
needs: ["docker-build"]
variables:
CS_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
CS_REGISTRY_USER: $DOCKER_HUB_USER
CS_REGISTRY_PASSWORD: $DOCKER_HUB_PASSWORD
GIT_STRATEGY: fetch

docker-build-release:
variables:
GIT_STRATEGY: none
Expand Down
2 changes: 1 addition & 1 deletion src/app/feature/efo-trait/pages/efo-traits/efo-traits.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export class EfoTraitsComponent implements OnInit, AfterViewInit {
this.isLoadingCreate = false;
this.dialogRef.close();
if (resp.trait !== efoTrait.trait) {
this.snackBar.open('Trait created. Sanitized: ' + efoTrait.trait + ' -> ' + resp.trait, '', {duration: 5000});
this.snackBar.open('Trait created. Sanitized: ' + efoTrait.trait + ' -> ' + resp.trait, '', {duration: 5000, panelClass: 'warning-snackbar'});
}
else {
this.snackBar.open('Trait created.', '', {duration: 2500});
Expand Down
2 changes: 1 addition & 1 deletion src/app/feature/reported-trait/pages/reported-trait/reported-trait.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export class ReportedTraitComponent implements OnInit, AfterViewInit {
this.isLoadingCreate = false;
this.dialogRef.close();
if (this.createTraitName !== reportedTrait.trait) {
this.snackBar.open('Trait created. Sanitized: ' + this.createTraitName + ' -> ' + reportedTrait.trait, '', {duration: 5000});
this.snackBar.open('Trait created. Sanitized: ' + this.createTraitName + ' -> ' + reportedTrait.trait, '', {duration: 5000, panelClass: 'warning-snackbar'});
}
else {
this.snackBar.open('Trait created.', '', {duration: 2500});
Expand Down
5 changes: 5 additions & 0 deletions src/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,3 +458,8 @@ a.menu-btn {
background: #f44336;
color: white;
}

.warning-snackbar {
background: darkorange;
color: white;
}