Skip to content

Commit e6ca074

Browse files
committed
Merge branch 'main' of github.com:catenax-ng/tx-traceability-foss-frontend
2 parents b698885 + 66ea1d2 commit e6ca074

File tree

3 files changed

+38
-5
lines changed

3 files changed

+38
-5
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ jobs:
2626
run: CHROMIUM_BIN=$(which chrome) npm run test:ci # will run `test:ci` command
2727
- name: Run SonarCloud with organzation and project key from environment
2828
uses: SonarSource/sonarcloud-github-action@master
29-
if: ${{ env.SONAR_ORGANIZATION != '' && env.SONAR_PROJECT_KEY != '' }}
29+
if: ${{ vars.SONAR_ORGANIZATION != '' && vars.SONAR_PROJECT_KEY != '' }}
3030
env:
3131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
3232
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3333
with:
3434
args: >
35-
-Dsonar.organization=${{ env.SONAR_ORGANIZATION }}
36-
-Dsonar.projectKey=${{ env.SONAR_PROJECT_KEY }}
35+
-Dsonar.organization=${{ vars.SONAR_ORGANIZATION }}
36+
-Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }}
3737
- name: Run SonarCloud with hardcoded organization and project key
3838
uses: SonarSource/sonarcloud-github-action@master # Fallback for the catenax-ng/product-traceability-foss-frontend
39-
if: ${{ env.SONAR_ORGANIZATION == '' || env.SONAR_PROJECT_KEY == '' }}
39+
if: ${{ vars.SONAR_ORGANIZATION == '' || vars.SONAR_PROJECT_KEY == '' }}
4040
env:
4141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
4242
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
"browserTarget": "trace-x:build:dev,authMock"
153153
},
154154
"localBackend": {
155-
"browserTarget": "webapp:build:dev,localBackend"
155+
"browserTarget": "trace-x:build:dev,localBackend"
156156
},
157157
"production": {
158158
"browserTarget": "trace-x:build:production"
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/********************************************************************************
2+
* Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
3+
* Copyright (c) 2022, 2023 ZF Friedrichshafen AG
4+
* Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
5+
*
6+
* See the NOTICE file(s) distributed with this work for additional
7+
* information regarding copyright ownership.
8+
*
9+
* This program and the accompanying materials are made available under the
10+
* terms of the Apache License, Version 2.0 which is available at
11+
* https://www.apache.org/licenses/LICENSE-2.0.
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
15+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
16+
* License for the specific language governing permissions and limitations
17+
* under the License.
18+
*
19+
* SPDX-License-Identifier: Apache-2.0
20+
********************************************************************************/
21+
22+
import { _environment } from './_environment.base';
23+
24+
export const environment = {
25+
..._environment,
26+
multiTenant: true,
27+
authDisabled: false,
28+
mockService: false,
29+
keycloakUrl: 'https://centralidp.dev.demo.catena-x.net/auth',
30+
clientId: 'Cl10-CX-Part',
31+
defaultRealm: 'CX-Central',
32+
apiUrl: 'http://localhost:8080/api',
33+
};

0 commit comments

Comments
 (0)