Skip to content
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.

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

release(1.6.0-RC1): merge release into main #138

Merged
merged 67 commits into from
Jul 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
cb8d56f
fix(about-card): change example data (#56)
evegufy Jun 2, 2023
beb5c50
feat(app subscription): ui enhancements and functionality changes (#54)
nidhigarg-bmw Jun 2, 2023
74159b0
update(validate and publish): UI alignment fix (#57)
lavanya-bmw Jun 5, 2023
d94596d
feat(app detail): ui fixes (#58)
nidhigarg-bmw Jun 5, 2023
1610aa5
Merge branch 'main' into release/1.5.0-RC1-merge-main-in-dev
evegufy Jun 7, 2023
449bc23
Merge pull request #61 from eclipse-tractusx/release/1.5.0-RC1-merge-…
evegufy Jun 7, 2023
7fd4d7d
feat(app subscription): activation overlay changes in app and service…
nidhigarg-bmw Jun 11, 2023
6f61885
bugfix(sonar): fixed sonar findings (#62)
nidhigarg-bmw Jun 12, 2023
47028a1
fix(subscribe btn): fix subscribe button wrong state in appdetail (#64)
nidhigarg-bmw Jun 12, 2023
c2caab5
feat(my account): add admin info to issuer info table (#63)
nidhigarg-bmw Jun 12, 2023
1c9285b
bugfix(checks): sonar bug fixes (#66)
nidhigarg-bmw Jun 12, 2023
0a58c13
feat(Service release process): skip technical integration (#65)
lavanya-bmw Jun 12, 2023
a0f9b24
bugfix(checks): sonar bugs fixes (#67)
nidhigarg-bmw Jun 13, 2023
6bf0e96
feat(activation overlay): ui changes (#68)
nidhigarg-bmw Jun 13, 2023
c895acc
fix(veracode fixes): bug fixes (#74)
nidhigarg-bmw Jun 14, 2023
01c366b
fix(technical user detail): ui fixes (#73)
nidhigarg-bmw Jun 14, 2023
fb4af57
bugfix(service release process): service release process issue fix. s…
manojava-gk Jun 14, 2023
66f6870
update(Service release process): skip technical integration (#77)
lavanya-bmw Jun 16, 2023
b9c5fc9
bugfix(app release process): app lead image load issue fix (#78)
lavanya-bmw Jun 16, 2023
8a3f7ef
feature(stage header): sliding header (#70)
manojava-gk Jun 16, 2023
44e77c4
feat(App overview): Enhance Sub Menu by adding 'Change Image' (#79)
lavanya-bmw Jun 20, 2023
8addff2
bugfix(service marketplace): clear state on change subscription servi…
manojava-gk Jun 20, 2023
794eede
feat(notification): mark notification done and allow to mark read/unr…
manojava-gk Jun 21, 2023
9915d69
feat(App overview): image change functionality (#85)
lavanya-bmw Jun 21, 2023
84c6738
Merge branch 'main' into release/1.5.0-merge-in-dev
evegufy Jun 21, 2023
92e5978
updates(home): slider content (#82)
manojava-gk Jun 21, 2023
2f0efc0
Merge pull request #88 from eclipse-tractusx/release/1.5.0-merge-in-dev
evegufy Jun 21, 2023
2cd1db3
feat(use case): add support for use cases (#87)
nidhigarg-bmw Jun 21, 2023
3d88571
bugfix(upgrade): enable yarn upgrade and use new shared components (#89)
oyo Jun 23, 2023
72f878a
chore(structure): move source and assets to root (#90)
oyo Jun 23, 2023
34c0b6f
bugfix(legal notice): fixed path (#94)
oyo Jun 23, 2023
fe415ac
bugfix(home carousel): responsiveness - when switching the portal wid…
manojava-gk Jun 23, 2023
7842013
feat(app subscription): add tenant url indetail overlay (#96)
nidhigarg-bmw Jun 23, 2023
392284e
Revert "feat(app subscription): add tenant url indetail overlay (#96)…
oyo Jun 23, 2023
f61c0cc
update(App Release Process): updated language endpoint changed struct…
lavanya-bmw Jun 26, 2023
9785d5a
update(app overview): app overview 'in review' style fix (#99)
lavanya-bmw Jun 26, 2023
639ad9f
bugfix(theme): use palette definitions export from shared library (#101)
oyo Jun 26, 2023
6ac6aa0
chore(workflows): add dependencies check and update release (#102)
evegufy Jun 26, 2023
6484322
chore(dependencies): run on push to dev (#103)
evegufy Jun 27, 2023
6f0f7c0
chore: don't exit at dependencies file update (#106)
evegufy Jun 27, 2023
a0a9120
update(app overview): feedback fixes (#104)
lavanya-bmw Jun 27, 2023
7ca256c
bugfix(service detail): fix display for undefined values (#105)
oyo Jun 27, 2023
49c26e6
Feature/cplp 2843/add tenant url (#100)
nidhigarg-bmw Jun 28, 2023
fefc653
feat(update company role): chnage the post request payload (#108)
nidhigarg-bmw Jun 28, 2023
a9d6595
updates(refactor): remove unused roles, pages and components (#107)
manojava-gk Jun 28, 2023
872aace
chore(components): upgrade library (#109)
oyo Jun 29, 2023
7941c87
updates(home slider): add navigation (#111)
manojava-gk Jul 3, 2023
6f5fc24
updates(notification): update header and filter ui (#113)
manojava-gk Jul 3, 2023
5b2981f
feat(usecase): implement usecase backend logic (#110)
nidhigarg-bmw Jul 3, 2023
8d5fa85
updates(refactor): remove unused pages (#114)
manojava-gk Jul 3, 2023
800db1e
feat(app overview): enhance sub menu (#112)
lavanya-bmw Jul 3, 2023
3df160d
updates(notification): update ui (#115)
manojava-gk Jul 3, 2023
18dd291
bugfix(notification): remove onlyDueDate=true (#118)
manojava-gk Jul 11, 2023
f98ec79
feat(static page): new static page (#117)
manojava-gk Jul 11, 2023
1fcafee
updates(participant): new templates (#119)
manojava-gk Jul 11, 2023
2a124ba
sub-menu(description): implemented change description (#120)
lavanya-bmw Jul 11, 2023
800e62e
feat(certificates): add certification page (#121)
nidhigarg-bmw Jul 11, 2023
cf313c8
updates(connectors): disable daps sections (#116)
manojava-gk Jul 12, 2023
d24035d
bugfix(notification): isread user action (#122)
manojava-gk Jul 12, 2023
53425c2
bugfix(static page): fix inline scroll height (#123)
manojava-gk Jul 12, 2023
ba215f9
feat(certificate): added overlay business logic (#131)
nidhigarg-bmw Jul 12, 2023
0d35b87
feat(usecase): add business logic to upload document (#124)
nidhigarg-bmw Jul 13, 2023
0159a85
bugfix(portal): add max width to the portal body (#134)
manojava-gk Jul 14, 2023
ef5a0ac
feat(certificate admin board): add new page and created ui (#135)
nidhigarg-bmw Jul 14, 2023
f12f261
release(1.6.0-RC1): update changelog
evegufy Jul 14, 2023
e6bc06c
release(1.6.0-RC1): bump version
evegufy Jul 14, 2023
4ef2b0d
chore(rc): change pattern to trigger workflow
evegufy Jul 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .conf/Dockerfile.full
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN yarn build
# Step 2
FROM nginxinc/nginx-unprivileged:alpine
COPY .conf/nginx.conf /etc/nginx/conf.d/default.conf
COPY --from=build-step /app/cx-portal/build /usr/share/nginx/html
COPY --from=build-step /app/build /usr/share/nginx/html
# Change to root user for renaming of index.html to index.html.reference, to be used by env variables inject script
USER root
RUN mv /usr/share/nginx/html/index.html /usr/share/nginx/html/index.html.reference
Expand Down
2 changes: 1 addition & 1 deletion .conf/Dockerfile.prebuilt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

FROM nginxinc/nginx-unprivileged:alpine
COPY .conf/nginx.conf /etc/nginx/conf.d/default.conf
COPY cx-portal/build /usr/share/nginx/html
COPY build /usr/share/nginx/html
# Change to root user for renaming of index.html to index.html.reference, to be used by env variables inject script
USER root
RUN mv /usr/share/nginx/html/index.html /usr/share/nginx/html/index.html.reference
Expand Down
4 changes: 2 additions & 2 deletions .conf/notice-portal.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ DockerHub: [https://hub.docker.com/r/tractusx/portal-frontend](https://hub.docke

Eclipse Tractus-X product(s) installed within the image:

__Portal frontend__
**Portal frontend**

- GitHub: https://github.com/eclipse-tractusx/portal-frontend
- Project home: https://projects.eclipse.org/projects/automotive.tractusx
- Dockerfile: https://github.com/eclipse-tractusx/portal-frontend/blob/main/.conf/Dockerfile.prebuilt
- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/portal-frontend/blob/main/LICENSE)

__Used base images__
**Used base images**

- Dockerfile: [nginxinc/nginx-unprivileged:alpine](https://github.com/nginxinc/docker-nginx-unprivileged/blob/main/Dockerfile-alpine.template)
- GitHub project: [https://github.com/nginxinc/docker-nginx-unprivileged](https://github.com/nginxinc/docker-nginx-unprivileged)
Expand Down
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
**/node_modules
**/storybook-static
**/storybook
**/build
**/dist
**/public
88 changes: 77 additions & 11 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,97 @@
{
"ignorePatterns": [
],
"ignorePatterns": ["*.test.tsx", "*.stories.tsx"],
"env": {
"browser": true,
"es2021": true
},
"extends": [
"standard-with-typescript",
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended"
"plugin:@typescript-eslint/recommended",
"prettier"
],
"parser": "@typescript-eslint/parser",
"plugins": ["react", "react-hooks", "@typescript-eslint"],
"overrides": [
{
"files": ["*.ts", "*.tsx", ".js", ".jsx"],
"extends": [
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking"
],
"parserOptions": {
"project": ["./tsconfig.json"]
},
"rules": {
"linebreak-style": ["error", "unix"],
"quotes": ["error", "single"],
"semi": ["error", "never"],
"comma-dangle": 0,
"react/react-in-jsx-scope": 0,
"@typescript-eslint/comma-dangle": 0,
"@typescript-eslint/explicit-function-return-type": 0,
"@typescript-eslint/ban-types": 0,
"@typescript-eslint/consistent-type-imports": 0,
"@typescript-eslint/no-confusing-void-expression": 0,
"@typescript-eslint/no-empty-function": 0,
"@typescript-eslint/no-explicit-any": 0,
"@typescript-eslint/no-extra-semi": 0,
"@typescript-eslint/no-unsafe-argument": 0,
"@typescript-eslint/no-unsafe-assignment": 0,
"@typescript-eslint/no-unsafe-call": 0,
"@typescript-eslint/no-unsafe-member-access": 0,
"@typescript-eslint/no-unsafe-return": 0,
"@typescript-eslint/prefer-optional-chain": 0,
"@typescript-eslint/restrict-template-expressions": 0,
"@typescript-eslint/strict-boolean-expressions": 0,
"@typescript-eslint/array-type": 0,
"@typescript-eslint/consistent-indexed-object-style": 0,
"@typescript-eslint/consistent-type-assertions": 0,
"@typescript-eslint/consistent-type-definitions": 0,
"@typescript-eslint/dot-notation": 0,
"@typescript-eslint/no-base-to-string": 0,
"@typescript-eslint/no-floating-promises": 0,
"@typescript-eslint/no-inferrable-types": 0,
"@typescript-eslint/no-invalid-void-type": 0,
"@typescript-eslint/no-misused-promises": 0,
"@typescript-eslint/no-non-null-assertion": 0,
"@typescript-eslint/no-unnecessary-type-assertion": 0,
"@typescript-eslint/prefer-includes": 0,
"@typescript-eslint/prefer-nullish-coalescing": 0,
"@typescript-eslint/prefer-readonly": 0,
"@typescript-eslint/prefer-reduce-type-parameter": 0,
"@typescript-eslint/promise-function-async": 0,
"@typescript-eslint/require-await": 0,
"@typescript-eslint/restrict-plus-operands": 0,
"@typescript-eslint/return-await": 0,
"@typescript-eslint/triple-slash-reference": 0,
"@typescript-eslint/unbound-method": 0,
"eqeqeq": 0,
"import/no-duplicates": 0,
"n/handle-callback-err": 0,
"no-extra-boolean-cast": 0,
"no-prototype-builtins": 0,
"no-unneeded-ternary": 0,
"no-void": 0,
"object-shorthand": 0,
"prefer-const": 0,
"promise/param-names": 0,
"react/display-name": 0,
"react/jsx-key": 0,
"react/no-children-prop": 0,
"react/no-unescaped-entities": 0,
"spaced-comment": 0
}
}
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint"],
"rules": {
"indent": ["error", 2],
"linebreak-style": ["error", "unix"],
"quotes": ["error", "single"],
"semi": ["error", "never"],
"react/react-in-jsx-scope": "off"
},
"settings": {
"react": {
"version": "detect"
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,5 @@ jobs:
- name: linter checks
run: yarn lint

- name: Build Library
run: yarn build:lib

- name: Unit Tests
run: yarn test:ci
79 changes: 79 additions & 0 deletions .github/workflows/dependencies.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
###############################################################
# Copyright (c) 2021, 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
###############################################################

name: Check Dependencies

on:
push:
branches: [main, dev]
pull_request:
types: [opened, synchronize, reopened]
workflow_dispatch:

jobs:
check-dependencies:

runs-on: ubuntu-latest

steps:

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'

- name: Checkout repository
uses: actions/checkout@v3

- name: Generate Dependencies file
run: java -jar ./scripts/download/org.eclipse.dash.licenses-1.0.2.jar yarn.lock -project automotive.tractusx -summary DEPENDENCIES || true

- name: Check if dependencies were changed
id: dependencies-changed
run: |
changed=$(git diff DEPENDENCIES)
if [[ -n "$changed" ]]; then
echo "dependencies changed"
echo "changed=true" >> $GITHUB_OUTPUT
else
echo "dependencies not changed"
echo "changed=false" >> $GITHUB_OUTPUT
fi

- name: Check for restricted dependencies
run: |
restricted=$(grep ' restricted,' DEPENDENCIES || true)
if [[ -n "$restricted" ]]; then
echo "The following dependencies are restricted: $restricted"
exit 1
fi
if: steps.dependencies-changed.outputs.changed == 'true'

- name: Upload DEPENDENCIES file
uses: actions/upload-artifact@v3
with:
path: DEPENDENCIES
if: steps.dependencies-changed.outputs.changed == 'true'

- name: Signal need to update DEPENDENCIES
run: |
echo "Dependencies need to be updated (updated DEPENDENCIES file has been uploaded to workflow run)"
exit 1
if: steps.dependencies-changed.outputs.changed == 'true'
6 changes: 0 additions & 6 deletions .github/workflows/release-release_candidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,6 @@ jobs:
repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
readme-filepath: ".conf/notice-portal.md"

# - name: Publish Shared Components to npm
# working-directory: ./cx-portal-shared-components
# run: npm publish
# env:
# NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}

auth-and-dispatch:
needs: build-and-push-release
runs-on: ubuntu-latest
Expand Down
23 changes: 17 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,6 @@ jobs:
repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
readme-filepath: ".conf/notice-portal.md"

# - name: Publish Shared Components to npm
# working-directory: ./cx-portal-shared-components
# run: npm publish
# env:
# NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}

auth-and-dispatch:
needs: build-and-push-release
runs-on: ubuntu-latest
Expand All @@ -132,16 +126,30 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Check for hotfix version
id: hf-check
run: |
hf=$(git ls-remote --heads origin "hotfix/${{ env.REF_NAME }}*")
if [[ -n "$hf" ]]; then
echo "hf=true" >> $GITHUB_OUTPUT
else
echo "hf=false" >> $GITHUB_OUTPUT
fi

- name: Get tags
run: git fetch --tags --force
if: steps.hf-check.outputs.hf == 'false'

- name: Check for previous release candidate version
id: rc-check
run: |
rc=$(git tag -l "${{ env.REF_NAME }}-RC*")
if [[ -n "$rc" ]]; then
echo "rc=true" >> $GITHUB_OUTPUT
else
echo "rc=false" >> $GITHUB_OUTPUT
fi
if: steps.hf-check.outputs.hf == 'false'

- name: Determine branch to update in portal-cd
id: cd-branch
Expand All @@ -151,13 +159,15 @@ jobs:
else
echo "branch=dev" >> $GITHUB_OUTPUT
fi
if: steps.hf-check.outputs.hf == 'false'

- name: Get token
id: get_workflow_token
uses: peter-murray/workflow-application-token-action@v2
with:
application_id: ${{ secrets.ORG_PORTAL_DISPATCH_APPID }}
application_private_key: ${{ secrets.ORG_PORTAL_DISPATCH_KEY }}
if: steps.hf-check.outputs.hf == 'false'

- name: Trigger workflow
id: call_action
Expand All @@ -171,3 +181,4 @@ jobs:
--header "Accept: application/vnd.github.v3+json" \
--data '{"ref":"${{ steps.cd-branch.outputs.branch }}", "inputs": { "new-image":"${{ env.REF_NAME }}" }}' \
--fail
if: steps.hf-check.outputs.hf == 'false'
8 changes: 1 addition & 7 deletions .github/workflows/release_candidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ name: release candidate (RC)
on:
push:
branches:
- 'release/*.*.*-RC*'
- 'release/v*.*.*-RC*'
workflow_dispatch:

env:
Expand Down Expand Up @@ -95,12 +95,6 @@ jobs:
repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
readme-filepath: ".conf/notice-portal.md"

# - name: Publish Shared Components to npm
# working-directory: ./cx-portal-shared-components
# run: npm publish
# env:
# NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}

auth-and-dispatch:
needs: build-and-push-image
runs-on: ubuntu-latest
Expand Down
Loading