diff --git a/.conf/Dockerfile b/.conf/Dockerfile index dc645d98..41474db2 100644 --- a/.conf/Dockerfile +++ b/.conf/Dockerfile @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2022 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/.conf/nginx.conf b/.conf/nginx.conf index f243a4e1..802c6b6d 100644 --- a/.conf/nginx.conf +++ b/.conf/nginx.conf @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2022 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f5691b3e..487500a0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -34,6 +34,11 @@ updates: ignore: - dependency-name: "*" update-types: ["version-update:semver-major", "version-update:semver-minor"] + groups: + production-dependencies: + dependency-type: "production" + development-dependencies: + dependency-type: "development" # Github Actions - @@ -45,6 +50,9 @@ updates: - "github-actions" schedule: interval: "weekly" + groups: + dependencies: + dependency-type: "production" # Docker - @@ -56,3 +64,6 @@ updates: - "docker" schedule: interval: "weekly" + groups: + dependencies: + dependency-type: "production" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fecb2e21..bc405581 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2022 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 03da5af9..133ed77a 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2022 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml index f8ae32cf..ca2af351 100644 --- a/.github/workflows/dependencies.yaml +++ b/.github/workflows/dependencies.yaml @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2023 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml index 56e7c314..d4532f10 100644 --- a/.github/workflows/kics.yml +++ b/.github/workflows/kics.yml @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2022 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/.github/workflows/release-release_candidate.yml b/.github/workflows/release-release_candidate.yml index 978808ba..712681ab 100644 --- a/.github/workflows/release-release_candidate.yml +++ b/.github/workflows/release-release_candidate.yml @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2022 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 839e9a1c..80d2585d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2022 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml index fbb34849..dcd5e241 100644 --- a/.github/workflows/release_candidate.yml +++ b/.github/workflows/release_candidate.yml @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2022 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/.github/workflows/trivy-dev.yml b/.github/workflows/trivy-dev.yml index 7ab37053..18eadcb4 100644 --- a/.github/workflows/trivy-dev.yml +++ b/.github/workflows/trivy-dev.yml @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2022 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 2d7f2801..d27b0161 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2022 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/.tractusx b/.tractusx index b21a984f..a92aaa5c 100644 --- a/.tractusx +++ b/.tractusx @@ -1,5 +1,5 @@ ############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2023 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/.vscode/settings.json b/.vscode/settings.json index b178b479..f7eb0776 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,7 +11,7 @@ "commentend": "-->", "commentprefix": "-", "cx_header_default":[ - "* Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation", + "* Copyright (c) 2024 Contributors to the Eclipse Foundation", " *", " * See the NOTICE file(s) distributed with this work for additional", " * information regarding copyright ownership.", @@ -29,7 +29,7 @@ " * SPDX-License-Identifier: Apache-2.0" ], "cx_header_with_#":[ - "Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation", + "Copyright (c) 2024 Contributors to the Eclipse Foundation", "", " See the NOTICE file(s) distributed with this work for additional", " information regarding copyright ownership.", @@ -47,7 +47,7 @@ " SPDX-License-Identifier: Apache-2.0" ], "cx_header_with_":[ - "Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation", + "Copyright (c) 2024 Contributors to the Eclipse Foundation", "-", "- See the NOTICE file(s) distributed with this work for additional", "- information regarding copyright ownership.", diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b493f39..cef159fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,22 @@ # Changelog -## 2.0.0-RC1 + +## 2.0.0 ### Change -- Migrated from Create React App (webpack) to Vite (rollup) - - Switched from deprecated CRA to new framework for build scripts and development server - - Use React 18 instead of 17 - - Upgraded dependencies - Pattern updates - Support special characters in the registration form - Name, street, region, city and postal code - updated company region field to accept hyphens -- upgraded keycloak-js dependency to v23.0.7 -- move config values from code to config (clientID, realm name, etc.) - + +### Feature +- Registration Step "Select Company Role" + - added support for optional and inactive agreements based on received backend response ![Tag](https://img.shields.io/static/v1?label=&message=Pre-Release&color=grey&style=flat) + ### Technical Support +- migrated from Create React App (webpack) to Vite (rollup) + - switched from deprecated CRA to new framework for build scripts and development server + - use React 18 instead of 17 + - upgraded dependencies - set node version explicitly - introduced codeql scan - introduced dependabot.yml @@ -21,7 +24,10 @@ - upgraded gh actions and change to pinned actions full length commit sha - CONTRIBUTING.md: linked to contribution details - renamed docker notice file -* updated eclipse dash tool for dependencies check +- updated eclipse dash tool for dependencies check +- reworked year in file header +- upgraded keycloak-js dependency to v23.0.7 +- move config values from code to config (clientID, realm name, etc.) ## 1.6.0 diff --git a/DEPENDENCIES b/DEPENDENCIES index b7fe6aed..6aaa91b5 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -42,7 +42,7 @@ npm/npmjs/-/binary-extensions/2.3.0, MIT, approved, #13867 npm/npmjs/-/bootstrap/5.3.3, MIT AND CC-BY-3.0, approved, #9867 npm/npmjs/-/brace-expansion/1.1.11, MIT, approved, clearlydefined npm/npmjs/-/brace-expansion/2.0.1, MIT, approved, clearlydefined -npm/npmjs/-/braces/3.0.2, MIT, approved, clearlydefined +npm/npmjs/-/braces/3.0.2, MIT, approved, #14866 npm/npmjs/-/browserslist/4.23.0, MIT, approved, clearlydefined npm/npmjs/-/bs-logger/0.2.6, MIT, approved, clearlydefined npm/npmjs/-/bser/2.1.1, Apache-2.0, approved, clearlydefined @@ -305,7 +305,7 @@ npm/npmjs/-/jest-validate/29.7.0, MIT, approved, clearlydefined npm/npmjs/-/jest-watcher/29.7.0, MIT, approved, clearlydefined npm/npmjs/-/jest-worker/29.7.0, MIT, approved, clearlydefined npm/npmjs/-/jest/29.7.0, MIT, approved, clearlydefined -npm/npmjs/-/js-sha256/0.11.0, MIT, approved, clearlydefined +npm/npmjs/-/js-sha256/0.10.1, MIT, approved, clearlydefined npm/npmjs/-/js-tokens/4.0.0, MIT, approved, #2401 npm/npmjs/-/js-yaml/3.14.1, MIT, approved, clearlydefined npm/npmjs/-/js-yaml/4.1.0, MIT, approved, clearlydefined @@ -320,7 +320,7 @@ npm/npmjs/-/json5/2.2.3, MIT, approved, #2126 npm/npmjs/-/jsx-ast-utils/3.3.5, MIT, approved, #9209 npm/npmjs/-/just-curry-it/5.3.0, MIT, approved, clearlydefined npm/npmjs/-/jwt-decode/4.0.0, MIT, approved, clearlydefined -npm/npmjs/-/keycloak-js/24.0.2, Apache-2.0, approved, clearlydefined +npm/npmjs/-/keycloak-js/23.0.7, Apache-2.0 AND MIT AND EPL-1.0 AND LicenseRef-scancode-oasis-ws-security-spec AND W3C AND LicenseRef-scancode-ws-policy-specification AND W3C AND W3C-19980720 AND (AFL-2.1 OR LGPL-2.0-only) AND (Apache-2.0 AND MIT) AND (Apache-2.0 AND MIT), approved, #11737 npm/npmjs/-/keyv/4.5.4, MIT, approved, #4674 npm/npmjs/-/kleur/3.0.3, MIT, approved, clearlydefined npm/npmjs/-/leven/3.1.0, MIT, approved, clearlydefined @@ -395,7 +395,7 @@ npm/npmjs/-/path-parse/1.0.7, MIT, approved, clearlydefined npm/npmjs/-/path-to-regexp/1.8.0, MIT, approved, clearlydefined npm/npmjs/-/path-type/4.0.0, MIT, approved, clearlydefined npm/npmjs/-/phone/3.1.42, MIT, approved, #10500 -npm/npmjs/-/picocolors/1.0.0, ISC, approved, clearlydefined +npm/npmjs/-/picocolors/1.0.0, ISC, approved, #14718 npm/npmjs/-/picomatch/2.3.1, MIT, approved, clearlydefined npm/npmjs/-/pirates/4.0.6, MIT, approved, #680 npm/npmjs/-/pkg-dir/4.2.0, MIT, approved, clearlydefined @@ -469,9 +469,9 @@ npm/npmjs/-/safe-regex-test/1.0.3, MIT, approved, clearlydefined npm/npmjs/-/safer-buffer/2.1.2, MIT, approved, clearlydefined npm/npmjs/-/sass/1.75.0, MIT, approved, clearlydefined npm/npmjs/-/saxes/6.0.0, ISC, approved, clearlydefined -npm/npmjs/-/scheduler/0.23.0, MIT, approved, clearlydefined +npm/npmjs/-/scheduler/0.23.0, MIT, approved, #14589 npm/npmjs/-/semver/6.3.1, ISC, approved, clearlydefined -npm/npmjs/-/semver/7.6.0, ISC, approved, clearlydefined +npm/npmjs/-/semver/7.6.0, ISC, approved, #14659 npm/npmjs/-/set-function-length/1.2.2, MIT, approved, #12772 npm/npmjs/-/set-function-name/2.0.2, MIT, approved, #10590 npm/npmjs/-/shebang-command/2.0.0, MIT, approved, clearlydefined diff --git a/FILEHEADER.md b/FILEHEADER.md index 0dc6980e..fba55209 100644 --- a/FILEHEADER.md +++ b/FILEHEADER.md @@ -19,5 +19,5 @@ Currently the following templates are available: This work is licensed under the [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0). - SPDX-License-Identifier: Apache-2.0 -- SPDX-FileCopyrightText: 2021-2024 Contributors to the Eclipse Foundation +- SPDX-FileCopyrightText: 2023 Contributors to the Eclipse Foundation - Source URL: https://github.com/eclipse-tractusx/portal-frontend-registration diff --git a/index.html b/index.html index 15ae07fc..c06d2a30 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@