Skip to content

Commit

Permalink
Merge pull request #551 from catenax-ng/main
Browse files Browse the repository at this point in the history
chore/feature: ui for asset publishing and minor improvements
  • Loading branch information
ds-mmaul authored Jan 11, 2024
2 parents 9d49d92 + 0be62bb commit 30e003e
Show file tree
Hide file tree
Showing 58 changed files with 13,195 additions and 268 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/kics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
with:
# Scanning directory .
path: "./tx-backend"
exclude_queries: 2ea04bef-c769-409e-9179-ee3a50b5c0ac,6998389e-66b2-473d-8d05-c8d71ac4d04d,a8e859da-4a43-4e7f-94b8-25d6e3bf8e90,d172a060-8569-4412-8045-3560ebd477e8,2e9b6612-8f69-42e0-a5b8-ed17739c2f3a,d172a060-8569-4412-8045-3560ebd477e8,9f88c88d-824d-4d9a-b985-e22977046042,8c8261c2-19a9-4ef7-ad37-b8bc7bdd4d85,181bd815-767e-4e95-a24d-bb3c87328e19,00b78adf-b83f-419c-8ed8-c6018441dd3a,86e3702f-c868-44b2-b61d-ea5316c18110,a92be1d5-d762-484a-86d6-8cd0907ba100
exclude_queries: 2ea04bef-c769-409e-9179-ee3a50b5c0ac,6998389e-66b2-473d-8d05-c8d71ac4d04d,a8e859da-4a43-4e7f-94b8-25d6e3bf8e90,d172a060-8569-4412-8045-3560ebd477e8,2e9b6612-8f69-42e0-a5b8-ed17739c2f3a,d172a060-8569-4412-8045-3560ebd477e8,9f88c88d-824d-4d9a-b985-e22977046042,8c8261c2-19a9-4ef7-ad37-b8bc7bdd4d85,181bd815-767e-4e95-a24d-bb3c87328e19,00b78adf-b83f-419c-8ed8-c6018441dd3a,86e3702f-c868-44b2-b61d-ea5316c18110,a92be1d5-d762-484a-86d6-8cd0907ba100,4f31dd9f-2cc3-4751-9b53-67e4af83dac0
enable_comments: true
# Fail on HIGH severity results
fail_on: high
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
fetch-depth: 0
- name: Check if CHANGELOG is updated
id: updated-changelog
uses: tj-actions/changed-files@v40
uses: tj-actions/changed-files@v41
with:
# Avoid using single or double quotes for multiline patterns
files: |
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [UNRELEASED - DD.MM.YYYY]

### Added
- Added UI to publish own assets

### Changed
- Fixed security findings
- Fixed deadline overlap issues for Q-investigations in update menu
### Removed

## [10.1.0 - 22.12.2023]
### Added
- Added an option for testdata upload in Argo Workflow
- Validation for import data
- GitHub action that ensures an up-to-date CHANGELOG.md

### Changed
Expand Down
9 changes: 8 additions & 1 deletion DEPENDENCIES_BACKEND
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ maven/mavencentral/ch.qos.logback/logback-core/1.4.11, EPL-1.0 OR LGPL-2.1-only,
maven/mavencentral/ch.qos.logback/logback-core/1.4.14, EPL-1.0 OR LGPL-2.1-only, approved, #3373
maven/mavencentral/com.apicatalog/titanium-json-ld/1.3.2, Apache-2.0, approved, #8912
maven/mavencentral/com.auth0/java-jwt/4.4.0, MIT, approved, #8459
maven/mavencentral/com.damnhandy/handy-uri-templates/2.1.8, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.3, Apache-2.0, approved, #7947
maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.2, Apache-2.0 AND MIT, approved, #4303
maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.15.3, MIT AND Apache-2.0, approved, #7932
maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.2, Apache-2.0, approved, #4105
maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.12.5, Apache-2.0, approved, CQ23725
maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.3, Apache-2.0, approved, #7934
maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.14.0, Apache-2.0 AND BSD-3-Clause AND MIT AND Apache-2.0, approved, #7943
maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.15.3, Apache-2.0, approved, #9160
Expand All @@ -28,6 +29,7 @@ maven/mavencentral/com.github.scribejava/scribejava-core/8.3.3, MIT, approved, #
maven/mavencentral/com.github.scribejava/scribejava-java8/8.3.3, MIT, approved, #4706
maven/mavencentral/com.github.stephenc.jcip/jcip-annotations/1.0-1, Apache-2.0, approved, CQ21949
maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, #20
maven/mavencentral/com.ibm.icu/icu4j/69.1, Unicode-TOU AND ICU AND BSD-3-Clause AND BSD-2-Clause, approved, CQ23850
maven/mavencentral/com.jayway.jsonpath/json-path/2.8.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.nimbusds/content-type/2.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.nimbusds/lang-tag/1.7, Apache-2.0, approved, clearlydefined
Expand Down Expand Up @@ -119,6 +121,7 @@ maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0,
maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest
maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.0, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.1, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/joda-time/joda-time/2.10.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636
maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.10, Apache-2.0, approved, #7164
maven/mavencentral/net.bytebuddy/byte-buddy/1.12.21, Apache-2.0 AND BSD-3-Clause, approved, #1811
Expand All @@ -130,6 +133,7 @@ maven/mavencentral/net.javacrumbs.json-unit/json-unit-json-path/3.2.2, Apache-2.
maven/mavencentral/net.javacrumbs.shedlock/shedlock-core/5.10.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/net.javacrumbs.shedlock/shedlock-provider-jdbc-template/5.10.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/net.javacrumbs.shedlock/shedlock-spring/5.10.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/net.jimblackler.jsonschemafriend/core/0.12.3, Apache-2.0, approved, #10911
maven/mavencentral/net.minidev/accessors-smart/2.4.11, Apache-2.0, approved, #7515
maven/mavencentral/net.minidev/accessors-smart/2.4.9, Apache-2.0, approved, #7515
maven/mavencentral/net.minidev/json-smart/2.4.10, Apache-2.0, approved, #3288
Expand Down Expand Up @@ -320,6 +324,9 @@ maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.8.22, Apache-2.0, a
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.6.20, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.8.22, Apache-2.0, approved, #8865
maven/mavencentral/org.jetbrains/annotations/24.0.1, Apache-2.0, approved, #7417
maven/mavencentral/org.jruby.jcodings/jcodings/1.0.55, MIT, approved, CQ10635
maven/mavencentral/org.jruby.joni/joni/2.1.41, MIT, approved, CQ10636
maven/mavencentral/org.jsoup/jsoup/1.14.2, MIT, approved, #2511
maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.3, EPL-2.0, approved, #3133
maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.9.3, EPL-2.0, approved, #3125
maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.3, EPL-2.0, approved, #3134
Expand Down
2 changes: 1 addition & 1 deletion DEPENDENCIES_FRONTEND
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ npm/npmjs/-/semver/6.3.1, ISC, approved, clearlydefined
npm/npmjs/-/semver/7.3.8, ISC, approved, clearlydefined
npm/npmjs/-/semver/7.5.4, ISC, approved, clearlydefined
npm/npmjs/-/send/0.18.0, MIT, approved, clearlydefined
npm/npmjs/-/serialize-javascript/6.0.1, BSD-3-Clause, approved, clearlydefined
npm/npmjs/-/serialize-javascript/6.0.1, BSD-3-Clause, approved, #12680
npm/npmjs/-/serve-index/1.9.1, MIT, approved, clearlydefined
npm/npmjs/-/serve-static/1.15.0, MIT, approved, clearlydefined
npm/npmjs/-/set-blocking/2.0.0, ISC, approved, #5899
Expand Down
14 changes: 10 additions & 4 deletions charts/traceability-foss/charts/frontend/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,22 @@ serviceAccount:

podAnnotations: { }

podSecurityContext: { }
# fsGroup: 2000
podSecurityContext:
runAsUser: 10001
seccompProfile:
type: RuntimeDefault

# Following Catena-X Helm Best Practices @url: https://catenax-ng.github.io/docs/kubernetes-basics/helm
# @url: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
runAsUser: 101
# runAsGroup: 3000
runAsUser: 10001
runAsGroup: 3000
capabilities:
drop:
- ALL
readOnlyRootFilesystem: false

service:
type: ClusterIP
Expand Down
40 changes: 29 additions & 11 deletions docs/RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,35 @@

## Release an app

In order to release an app go to [GitHub Releases page](https://github.com/eclipse-tractusx/traceability-foss/releases)
and create a new release. While creating it create new tag that follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
1) Decide which version will be incremented. Following shows example for 1.0.0
2) Create a release branch on catena /release/1.0.0
3) Check out release branch from catena /release/1.0.0
4) Edit changelog: Align the new version (1.0.0) with the changes and add new UNRELEASED section
5) Push onto /release/1.0.0 catena and eclipse
6) Open Release App Page Catena: https://github.com/catenax-ng/tx-traceability-foss/releases
7) Draft a new release
8) On dropdown choose a tag - use the version 1.0.0 (Create new tag will appear - select it)
9) On dropdown target use your /release/1.0.0
10) Title = Version of app -> 1.0.0
11) Description = Changelog Content of app
12) Checkbox set as latest release
- Verify that github action release generation has been triggered
13) Repeat step 7 to 12 for tractus-x: [GitHub Releases page](https://github.com/eclipse-tractusx/traceability-foss/releases)
14) Edit /release/1.0.0 branch: package.json version field with your version 1.0.0
15) Open /charts/Chart.yaml and edit the fields:
- version, frontend.version, backend.version (set only one minor version higher) - you need to verify that this version does not exist, see release page
- appVersion (needs to be your app version) -> 1.0.0
16) Open /charts/backend/Chart.yaml and set same version / appVersion
17) Open /charts/frontend/Chart.yaml and set same version / appVersion
18) Push to catena and eclipse
19) Open Github Action on Catena and run action ON release/1.0.0: https://github.com/catenax-ng/tx-traceability-foss/actions/workflows/helm-chart-release.yaml
- Verify that helm-chart release has been generated and is on release page
20) Edit the app release and set checkbox to latest release
21)Open Github Action on Eclipse and run action ON release/1.0.0: https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/helm-chart-release.yaml and run on your release branch
- Verify that helm-chart release has been generated and is on release page
22) Edit the app release and set checkbox to latest release
23) Merge release branch into catena main branch
24) Sync catena and eclipse main branch

Please update the [CHANGELOG.md](https://github.com/eclipse-tractusx/traceability-foss/blob/main/CHANGELOG.md) file with release changes that follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format.

## Release helm charts
Hint: You need to stricly follow this guide to make sure the helm chart releaser will be able to detect a new helm chart version!
1) Create a new Release in catena: https://github.com/catenax-ng/tx-traceability-foss/releases/new with the release version of the application.
2) Before accepting the Pull Request which will be created based on Step 1) please make sure to create a Pull Request from catena to eclipse and merge it.
3) Then create a new Release in tractusx: https://github.com/eclipse-tractusx/traceability-foss/releases/new with the release version of the application.
4) A Release Action ( Release Trace-X ) will bump the helm versions and create a Pull request that needs to be merged for catena and tractusx.
5) Please accept the PRs on both repositories.
6) Invoke the [Release Charts workflow](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/helm-chart-release.yaml) on main branch
7) Invoke the [Release Charts workflow](https://github.com/catenax-ng/tx-traceability-foss/actions/workflows/helm-chart-release.yaml) on main branch
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,29 @@
</div>
<div class="app-bom-lifecycle-activator-container">
<app-bom-lifecycle-activator [view]=UserSettingView.PARTS
(buttonClickEvent)="handleTableActivationEvent($event)"></app-bom-lifecycle-activator>
(buttonClickEvent)="handleTableActivationEvent($event)">
</app-bom-lifecycle-activator>
<div class="table--header--select--button"
matTooltip="{{'routing.unauthorized' | i18n}}"
matTooltipClass="table--header--tooltip"
matTooltipPosition="above"
[class.mdc-tooltip--multiline]="true"
[matTooltipShowDelay]="1000"
[matTooltipDisabled]="roleService.hasAccess(['wip'])"
>
<app-button
*ngIf="(allSelectedItems$ | async).length"
(click)="isPublisherOpen$.next(true)"
[variant]="'raised'"
[color]="'accent'"
[isDisabled]="!roleService.hasAccess(['wip'])"
>
<div class="flex justify-between items-center text-dark p-0.5">
<mat-icon class="mr-2">published_with_changes</mat-icon>
{{ 'actions.publishAssets' | i18n }}
</div>
</app-button>
</div>
</div>
<div class="split-container-wrapper">
<as-split direction="horizontal" class="split-container">
Expand Down Expand Up @@ -87,6 +109,7 @@
[addTrigger]="addPartTrigger$ | async"
(selected)="onSelectItem($event)"
(configChanged)="onAsPlannedTableConfigChange($event)"
(multiSelect)="currentSelectedAsPlannedItems$.next($event)"
(clickSelectAction)="isAlertOpen$.next(true)"
(filterActivated)="filterActivated(false, $event)"
[multiSortList]="tableAsPlannedSortList"
Expand All @@ -103,6 +126,13 @@

<app-part-detail></app-part-detail>

<app-sidenav-wrapper [isOpen]="isPublisherOpen$ | async" (sidenavAction)="isPublisherOpen$.next($event)">
<app-asset-publisher
[selectedAssets] = "allSelectedItems$ | async"
(submitted)="isPublisherOpen$.next(false)"
></app-asset-publisher>
</app-sidenav-wrapper>

<app-sidenav-wrapper [isOpen]="isAlertOpen$ | async" (sidenavAction)="isAlertOpen$.next($event)">
<app-notification-request
*ngIf="isAlertOpen$ | async"
Expand Down
Loading

0 comments on commit 30e003e

Please sign in to comment.