Merge pull request #9 from catenax-ng/main

New Release 1.1.0

.conf/nginx.conf

@@ -0,0 +1,33 @@
+################################################################################
+ # Copyright (c) 2022,2023 BMW Group AG
+ # Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ #
+ # See the NOTICE file(s) distributed with this work for additional
+ # information regarding copyright ownership.
+ #
+ # This program and the accompanying materials are made available under the
+ # terms of the Apache License, Version 2.0 which is available at
+ # https://www.apache.org/licenses/LICENSE-2.0.
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ # License for the specific language governing permissions and limitations
+ # under the License.
+ #
+ # SPDX-License-Identifier: Apache-2.0
+ ################################################################################
+
+
+server {
+
+    listen       8080;
+    server_name  localhost;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html;
+        try_files $uri $uri/index.html /index.html;
+    }
+
+}

.env

@@ -1,20 +1,24 @@
-REACT_APP_DASHBOARD_URL=http://localhost:8080/api/dashboard/getTableInfo?
-REACT_APP_DASHBOARD_URL_RATINGSTABLE=http://localhost:8080/api/dashboard/ratingsByYear?
-REACT_APP_DATEFORM_URL=http://localhost:8080/api/dashboard/allYears
-REACT_APP_DASHBOARD_WOLRD_MAP_URL=http://localhost:8080/api/dashboard/getWorldMap?
-REACT_APP_DASHBOARD_FILE_TEMPLATE_DOWNLOAD=http://localhost:8080/api/dashboard/getTemplate?
-REACT_APP_GET_RANGES=http://localhost:8080/api/dashboard/getUserRanges?
-REACT_APP_SAVE_RANGES=http://localhost:8080/api/dashboard/saveUserRanges?
-REACT_APP_UPLOAD_FILE=http://localhost:8080/api/dashboard/uploadCsv?
-REACT_APP_GET_COUNTRYS=http://localhost:8080/api/dashboard/getCountryFilterByISO2?
-REACT_APP_GET_BPN_COUNTRYS=http://localhost:8080/api/dashboard/getBpnCountrys?
-REACT_APP_GET_BPNS=http://localhost:8080/api/dashboard/getCompanyBpns?
-REACT_APP_GET_REPORTS_BY_USER=http://localhost:8080/api/dashboard/getReportsByCompanyUser?
-REACT_APP_GET_REPORT_VALUES_BY_REPORT=http://localhost:8080/api/dashboard/getReportsValueByReport?
-REACT_APP_SAVE_REPORTS=http://localhost:8080/api/dashboard/saveReports?
-REACT_APP_SHARE_REPORTS=http://localhost:8080/api/dashboard/shareReport?
-REACT_APP_UPDATE_REPORTS=http://localhost:8080/api/dashboard/updateReports?
-REACT_APP_DELETE_REPORTS=http://localhost:8080/api/dashboard/deleteReport
-REACT_APP_GET_USER_BPDM_GATES=http://localhost:8080/api/dashboard/getAllUserBPDMGates?
-REACT_APP_DELETE_RATINGS=http://localhost:8080/api/dashboard/deleteRating
-REACT_APP_GET_COMPANY_USERS=http://localhost:8080/api/dashboard/getUserFromCompany?
+REACT_URL_ENV=http://localhost:8080
+REACT_APP_AUTH_URL=http://localhost:8080/auth
+REACT_APP_PORTAL_URL=http://localhost:8080/auth
+REACT_APP_PORTAL_BACKEND_URL=http://localhost:8080/auth
+REACT_APP_DASHBOARD_URL=${REACT_URL_ENV}/api/dashboard/getTableInfo?
+REACT_APP_DASHBOARD_URL_RATINGSTABLE=${REACT_URL_ENV}/api/dashboard/ratingsByYear?
+REACT_APP_DATEFORM_URL=${REACT_URL_ENV}/api/dashboard/allYears
+REACT_APP_DASHBOARD_WOLRD_MAP_URL=${REACT_URL_ENV}/api/dashboard/getWorldMap?
+REACT_APP_DASHBOARD_FILE_TEMPLATE_DOWNLOAD=${REACT_URL_ENV}/api/dashboard/getTemplate?
+REACT_APP_GET_RANGES=${REACT_URL_ENV}/api/dashboard/getUserRanges?
+REACT_APP_SAVE_RANGES=${REACT_URL_ENV}/api/dashboard/saveUserRanges?
+REACT_APP_UPLOAD_FILE=${REACT_URL_ENV}/api/dashboard/uploadCsv?
+REACT_APP_GET_COUNTRYS=${REACT_URL_ENV}/api/dashboard/getCountryFilterByISO2?
+REACT_APP_GET_BPN_COUNTRYS=${REACT_URL_ENV}/api/dashboard/getBpnCountrys?
+REACT_APP_GET_BPNS=${REACT_URL_ENV}/api/dashboard/getCompanyBpns?
+REACT_APP_GET_REPORTS_BY_USER=${REACT_URL_ENV}/api/dashboard/getReportsByCompanyUser?
+REACT_APP_GET_REPORT_VALUES_BY_REPORT=${REACT_URL_ENV}/api/dashboard/getReportsValueByReport?
+REACT_APP_SAVE_REPORTS=${REACT_URL_ENV}/api/dashboard/saveReports?
+REACT_APP_SHARE_REPORTS=${REACT_URL_ENV}/api/dashboard/shareReport?
+REACT_APP_UPDATE_REPORTS=${REACT_URL_ENV}/api/dashboard/updateReports?
+REACT_APP_DELETE_REPORTS=${REACT_URL_ENV}/api/dashboard/deleteReport
+REACT_APP_GET_USER_BPDM_GATES=${REACT_URL_ENV}/api/dashboard/getAllUserBPDMGates?
+REACT_APP_DELETE_RATINGS=${REACT_URL_ENV}/api/dashboard/deleteRating
+REACT_APP_GET_COMPANY_USERS=${REACT_URL_ENV}/api/dashboard/getUserFromCompany?

.env.production

@@ -1,20 +1,24 @@
-REACT_APP_DASHBOARD_URL=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/getTableInfo?
-REACT_APP_DASHBOARD_URL_RATINGSTABLE=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/ratingsByYear?
-REACT_APP_DATEFORM_URL=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/allYears
-REACT_APP_DASHBOARD_WOLRD_MAP_URL=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/getWorldMap?
-REACT_APP_DASHBOARD_FILE_TEMPLATE_DOWNLOAD=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/getTemplate?
-REACT_APP_GET_RANGES=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/getUserRanges?
-REACT_APP_SAVE_RANGES=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/saveUserRanges?
-REACT_APP_UPLOAD_FILE=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/uploadCsv?
-REACT_APP_GET_COUNTRYS=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/getCountryFilterByISO2?
-REACT_APP_GET_BPN_COUNTRYS=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/getBpnCountrys?
-REACT_APP_GET_BPNS=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/getCompanyBpns?
-REACT_APP_GET_REPORTS_BY_USER=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/getReportsByCompanyUser?
-REACT_APP_GET_REPORT_VALUES_BY_REPORT=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/getReportsValueByReport?
-REACT_APP_SAVE_REPORTS=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/saveReports?
-REACT_APP_SHARE_REPORTS=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/shareReport?
-REACT_APP_UPDATE_REPORTS=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/updateReports?
-REACT_APP_DELETE_REPORTS=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/deleteReport
-REACT_APP_GET_USER_BPDM_GATES=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/getAllUserBPDMGates?
-REACT_APP_DELETE_RATINGS=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/deleteRating
-REACT_APP_GET_COMPANY_USERS=https://vas-country-risk-backend.int.demo.catena-x.net/api/dashboard/getUserFromCompany?
+REACT_URL_ENV=https://vas-country-risk-backend.int.demo.catena-x.net
+REACT_APP_AUTH_URL=https://centralidp.int.demo.catena-x.net/auth
+REACT_APP_PORTAL_URL=https://portal.dev.demo.catena-x.net
+REACT_APP_PORTAL_BACKEND_URL=https://portal-backend.dev.demo.catena-x.net
+REACT_APP_DASHBOARD_URL=${REACT_URL_ENV}/api/dashboard/getTableInfo?
+REACT_APP_DASHBOARD_URL_RATINGSTABLE=${REACT_URL_ENV}/api/dashboard/ratingsByYear?
+REACT_APP_DATEFORM_URL=${REACT_URL_ENV}/api/dashboard/allYears
+REACT_APP_DASHBOARD_WOLRD_MAP_URL=${REACT_URL_ENV}/api/dashboard/getWorldMap?
+REACT_APP_DASHBOARD_FILE_TEMPLATE_DOWNLOAD=${REACT_URL_ENV}/api/dashboard/getTemplate?
+REACT_APP_GET_RANGES=${REACT_URL_ENV}/api/dashboard/getUserRanges?
+REACT_APP_SAVE_RANGES=${REACT_URL_ENV}/api/dashboard/saveUserRanges?
+REACT_APP_UPLOAD_FILE=${REACT_URL_ENV}/api/dashboard/uploadCsv?
+REACT_APP_GET_COUNTRYS=${REACT_URL_ENV}/api/dashboard/getCountryFilterByISO2?
+REACT_APP_GET_BPN_COUNTRYS=${REACT_URL_ENV}/api/dashboard/getBpnCountrys?
+REACT_APP_GET_BPNS=${REACT_URL_ENV}/api/dashboard/getCompanyBpns?
+REACT_APP_GET_REPORTS_BY_USER=${REACT_URL_ENV}/api/dashboard/getReportsByCompanyUser?
+REACT_APP_GET_REPORT_VALUES_BY_REPORT=${REACT_URL_ENV}/api/dashboard/getReportsValueByReport?
+REACT_APP_SAVE_REPORTS=${REACT_URL_ENV}/api/dashboard/saveReports?
+REACT_APP_SHARE_REPORTS=${REACT_URL_ENV}/api/dashboard/shareReport?
+REACT_APP_UPDATE_REPORTS=${REACT_URL_ENV}/api/dashboard/updateReports?
+REACT_APP_DELETE_REPORTS=${REACT_URL_ENV}/api/dashboard/deleteReport
+REACT_APP_GET_USER_BPDM_GATES=${REACT_URL_ENV}/api/dashboard/getAllUserBPDMGates?
+REACT_APP_DELETE_RATINGS=${REACT_URL_ENV}/api/dashboard/deleteRating
+REACT_APP_GET_COMPANY_USERS=${REACT_URL_ENV}/api/dashboard/getUserFromCompany?

CHANGELOG.md

@@ -5,14 +5,43 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.1.0] - 2023-02-22
+
+### Changed
+
+- Removing fixed hardcoded url and change with dynamic vars
+- Added Vars to index.html
+
+### Added
+- Added script for injecting vars on nginx
+- Added arq42 documentation 
+- Added UserGuide
+
+### Fixes
+- Fixed a bug in the Help Dialog regarding broken attachments that we´re missing
+
+## [1.0.1] - 2023-02-21 
+
+### Changed
+
+- Styling changes on some components according to portal style guidelines;
+- Fix whitespace handling that removed apiVersion declaration from Helm templates;
+
+### Added
+
+- Added user information icon on right top corner and logout option;
+- Added Help Button which has documentation explained how to use the application;
+
+### Fixes
+
+- Bug fix. Country selected manually by the user would not persist when the map dialog was opened;
 
 ## [1.0.0] - 2023-01-26
 
 ### Added
 
 - First Release
 
-[Unreleased]: https://github.com/eclipse-tractusx/vas-country-risk-frontend/compare
-
-[1.0.0]: https://github.com/eclipse-tractusx/vas-country-risk-frontend/compare
+[unreleased]: https://github.com/eclipse-tractusx/vas-country-risk-frontend/compare
+[1.0.0]: https://github.com/eclipse-tractusx/vas-country-risk-frontend/compare
+[1.1.0]: https://github.com/eclipse-tractusx/vas-country-risk-frontend/compare

charts/country-risk-frontend-charts/Chart.yaml

@@ -34,13 +34,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.7
+version: 2.0.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.0"
+appVersion: "1.1.0"
 
 
 

charts/country-risk-frontend-charts/templates/configmap.yaml

@@ -17,11 +17,11 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################
 
-{{- if .Values.configmap.create -}}
+{{ if .Values.configmap.create }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-frontend
 data:
   {{- toYaml .Values.configmap.data | nindent 2 }}
-{{- end -}}
+{{ end }}

charts/country-risk-frontend-charts/templates/ingress.yaml

@@ -17,7 +17,7 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################
 
-{{- if .Values.ingress.enabled -}}
+{{ if .Values.ingress.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -53,4 +53,4 @@ spec:
       # Default secret for certificate creation already provided to your namespace
       secretName: tls-secret
 
-{{- end }}
+{{ end }}