Skip to content

Commit

Permalink
Merge branch 'main' into dcm-content-r2403
Browse files Browse the repository at this point in the history
  • Loading branch information
nhaenis committed Feb 19, 2024
2 parents f67740a + 23ef5ca commit d300c95
Show file tree
Hide file tree
Showing 15 changed files with 113 additions and 59 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/lint-on-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,8 @@ jobs:
- name: Install dependencies
run: npm ci

- name: Run markdown lint
- name: Run markdown lint for docs folder
run: npm run lint-doc

- name: Run markdown lint for docs-kits folder
run: npm run lint-kits
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ We do want to follow a specific style for our markdown based documentation.
Therefore, this repository is configured to use a [markdown linter](https://github.com/DavidAnson/markdownlint-cli2).
Specific rules are configured via [.markdownlint.yaml](./.markdownlint.yaml).

Additionally, there is a npm script `lint-doc`, that will lint all the markdown files inside [docs](./docs).
Additionally, there is a npm script `lint-doc`, that will lint all the markdown files inside [docs](./docs) and `lint-kits`, that will lint all the markdown files inside [docs-kits](./docs-kits).
This script is also run as a pre-commit hook, set up via [husky](https://www.npmjs.com/package/husky).
You can also run the linting step manually by running `npm run lint-doc`.
You can also run the linting step manually by running `npm run lint-doc` or `npm run lint-kits`.
12 changes: 10 additions & 2 deletions community/open-meetings.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ These are dedicated sync meetings for specific products, as well as open plannin
/>

<MeetingInfo title="Committer Meeting"
schedule="Every third Friday of the month effective 16. Feb 2024 until 31. Dec 2024 from 02:05 pm to 03:00 pm CET"
schedule="Eevery 2 weeks on Friday effective 16. Feb 2024 until 31. Dec 2024 from 02:05 pm to 03:00 pm CET"
description="Open hour meeting for Eclipse Tractus-X committers. The goal of the meeting is to discuss and share specific committer tasks/responsibilities."
contact="[email protected]"
sessionLink="https://teams.microsoft.com/l/meetup-join/19%3ameeting_ZjlmNTc5MjMtN2Y2YS00YjliLTg3NTItNWE1MmMzMWUzNmYw%40thread.v2/0?context=%7b%22Tid%22%3a%221ad22c6d-2f08-4f05-a0ba-e17f6ce88380%22%2c%22Oid%22%3a%22a8b7a5ee-66ff-4695-afa2-08f893d8aaf6%22%7d"
Expand All @@ -40,7 +40,15 @@ These are dedicated sync meetings for specific products, as well as open plannin
/>

<MeetingInfo title="[TRACE-X] Trace-X Open Meeting"
schedule="Every Thursday effective 8. Feb 2024 until 20. Jun 2024 from 02:05 pm to 02:45 pm CET"
schedule="Thursday effective 22. Feb 2024 from 02:05 pm to 03:00 pm CET"
description="Coordination of feature development & concepts. For further information, please contact Martin Kanal or have a look into the downloadable ics file."
contact="[email protected]"
sessionLink="https://teams.microsoft.com/l/meetup-join/19%3ameeting_MTEyNTAyNTYtY2VkOC00ZDdjLTk0NTItNWViYTJmNmJmOTlh%40thread.v2/0?context=%7b%22Tid%22%3a%2226f86412-f875-4281-b566-fe6fe385e17c%22%2c%22Oid%22%3a%22db3ba521-7335-4e4f-b672-fc9f7c3f5536%22%7d"
meetingLink="/meetings/coordination-feature-development-trace-x.ics"
/>

<MeetingInfo title="[TRACE-X] Trace-X Open Meeting"
schedule="Every Thursday effective 8. Feb 2024 until 20. Jun 2024 (except 22. Feb 2024) from 02:05 pm to 02:45 pm CET"
description="Coordination of feature development & concepts. For further information, please contact Martin Kanal or have a look into the downloadable ics file."
contact="[email protected]"
sessionLink="https://teams.microsoft.com/l/meetup-join/19%3ameeting_MTEyNTAyNTYtY2VkOC00ZDdjLTk0NTItNWViYTJmNmJmOTlh%40thread.v2/0?context=%7b%22Tid%22%3a%2226f86412-f875-4281-b566-fe6fe385e17c%22%2c%22Oid%22%3a%22db3ba521-7335-4e4f-b672-fc9f7c3f5536%22%7d"
Expand Down
9 changes: 9 additions & 0 deletions community/sigs/01_intro.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
title: "What is a SIG?"
---

Eclipse Tractus-X consists of different applications, products, KITs and also hosts other supporting repositories.
All of these repositories have a very dedicated goal and focus.
However, there are of course cross-cutting topics, that affect our whole project.

To foster these needs, we decided to form "Special Interest Groups", or "SIGs" in short.
20 changes: 20 additions & 0 deletions community/sigs/02_sig_infra.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
title: "SIG Infra"
---

__Focus:__ Creating automation for various Eclipse Tractus-X topics like CI or release.

__Repository:__ [eclipse-tractusx/sig-infra](https://github.com/eclipse-tractusx/sig-infra)

## Intro

SIG infra is striving to improve the developer experience in Eclipse Tractus-X, by working on different automation topics.
We are also providing guidance on how to work with [Helm](https://helm.sh/) and support the [e2e-testing](https://github.com/eclipse-tractusx/e2e-testing)
approach, that will be based on a umbrella Chart and Helm tests.

## Dash automation

A topic, every Tractus-X repo has to take care of, is legal compliance.
One of the aspects is an up-to-date `DEPENDENCIES` file, generated by [eclipse dash-licenses](https://github.com/eclipse/dash-licenses).
SIG infra is maintaining a [run-dash](https://github.com/eclipse-tractusx/sig-infra/tree/main/.github/actions/run-dash)
GitHub action, that helps to ensure the `DEPENDENCIES` file stays up-to-date.
7 changes: 7 additions & 0 deletions community/sigs/03_sig_security.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: "SIG Security"
---

__Focus:__ Define and maintain security best practices for Eclipse Tractus-X. Provide guidance on security related topics and incidents

__Repository:__ [eclipse-tractusx/sig-security](https://github.com/eclipse-tractusx/sig-security)
9 changes: 9 additions & 0 deletions community/sigs/04_sig_release.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
title: "SIG Release"
---

__Focus:__ Planning Tractus-X releases and product roadmaps. Defining the release process

__Repository:__ [eclipse-tractusx/sig-release](https://github.com/eclipse-tractusx/sig-release)

__Project:__ [Release Planning](https://github.com/orgs/eclipse-tractusx/projects/26)
20 changes: 10 additions & 10 deletions docs-kits/kits/Business Partner Kit/page_adoption-view.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ as a shared and cost-optimized service (quality tested by the biggest players).
Most of today’s automotive companies have to invest a significant amount of resources to keep their individual partner master data updated and correct, since outdated or incorrect data records result in federal fines and wrong claims / billing processes. The industry spends a vast amount into an area that is non differentiating, regulated and executed redundantly across the partners.

For this, cutting individual company costs by offering the golden master data record as a shared service is the mission. And proactively reduce Business Partner risk via collaborative value-add services.
More insights to the business partner data management use case here: [Catena-X | Business Partner Use Case](https://catena-x.net/fileadmin/user_upload/Standard-Bibliothek/5_PC_BPDM_v.2.1/BPM_-_001_BUSINESS_PARTNER_NUMBER_PlatformCapabilityBPDM_v2.1.pdf)
More insights to the business partner data management use case here: [Catena-X | Business Partner Use Case](https://catena-x.net/en/offers-standards/bpdm)

This will become the industry’s largest golden record collection as a shared and cost-optimized service (quality tested by the biggest players).

Expand Down Expand Up @@ -80,13 +80,13 @@ Our relevant standards can be downloaded from the official [Catena-X Standard Li
This work is licensed under the [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/legalcode).

- SPDX-License-Identifier: CC-BY-4.0
- SPDX-FileCopyrightText: 2023,2023 ZF Friedrichshafen AG
- SPDX-FileCopyrightText: 2023,2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
- SPDX-FileCopyrightText: 2023,2023 SAP SE
- SPDX-FileCopyrightText: 2023,2023 Volkswagen AG
- SPDX-FileCopyrightText: 2023,2023 Robert Bosch GmbH
- SPDX-FileCopyrightText: 2023,2023 Mercedes Benz Group
- SPDX-FileCopyrightText: 2023,2023 BASF SE
- SPDX-FileCopyrightText: 2023,2023 Schaeffler AG
- SPDX-FileCopyrightText: 2023,2023 Contributors to the Eclipse Foundation
- SPDX-FileCopyrightText: 2023,2024 ZF Friedrichshafen AG
- SPDX-FileCopyrightText: 2023,2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
- SPDX-FileCopyrightText: 2023,2024 SAP SE
- SPDX-FileCopyrightText: 2023,2024 Volkswagen AG
- SPDX-FileCopyrightText: 2023,2024 Robert Bosch GmbH
- SPDX-FileCopyrightText: 2023,2024 Mercedes Benz Group
- SPDX-FileCopyrightText: 2023,2024 BASF SE
- SPDX-FileCopyrightText: 2023,2024 Schaeffler AG
- SPDX-FileCopyrightText: 2023,2024 Contributors to the Eclipse Foundation
- Source URL: https://github.com/eclipse-tractusx/bpdm
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"write-translations": "docusaurus write-translations",
"write-heading-ids": "docusaurus write-heading-ids",
"lint-doc": "markdownlint-cli2-config .markdownlint.yaml \"docs/**/*.md\" \"#node_modules\"",
"lint-kits": "markdownlint-cli2-config .markdownlint.yaml \"docs-kits/**/*.md\" \"#node_modules\"",
"prepare": "husky install"
},
"dependencies": {
Expand Down
11 changes: 11 additions & 0 deletions sidebarsCommunity.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ const sidebars = {
community: [
'intro',
'open-meetings',
{
type: 'category',
label: 'Special Interest Groups (SIGs)',
collapsed: true,
items: [
{
type: 'autogenerated',
dirName: 'sigs',
},
],
},
'products',
{
type: 'link',
Expand Down
5 changes: 2 additions & 3 deletions src/components/RoleBasedEnrtyComponent/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@ import Slider from "react-slick";
import "slick-carousel/slick/slick.css";
import "slick-carousel/slick/slick-theme.css";
import Typography from '@mui/material/Typography';
import { carouselRoleBased } from "../../../utils/carouselRoleBased";
import styles from "./styles.module.css";
import { useMediaQuery } from '@mui/material';
import ArrowCircleRightIcon from '@mui/icons-material/ArrowCircleRight';
import sliderRightArrowImage from '@site/static/img/slider_right_icon.png'
import sliderLeftArrowImage from '@site/static/img/slider_left_icon.png';
import Link from "@docusaurus/Link";

export default function RoleBasedEnrtyComponent({data}) {
export default function RoleBasedEnrtyComponent({data, showArrow = true}) {
const isWeb = useMediaQuery('(min-width:1024px)');
const isMobile = useMediaQuery('(max-width:600px)');
function NextArrow (props) {
Expand Down Expand Up @@ -70,7 +69,7 @@ export default function RoleBasedEnrtyComponent({data}) {
autoplay: false,
infinite: false,
variableWidth: true,
arrows: true,
arrows: showArrow,
nextArrow: <NextArrow />,
prevArrow: <PrevArrow />,
initialSlide: 0,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Kits/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default function KitsPage() {
>
<DeepdiveHeader {...headerInput} />
<main>
<RoleBasedEnrtyComponent data={carouselKitdeepdive} />
<RoleBasedEnrtyComponent showArrow={false} data={carouselKitdeepdive} />
<AboutUsCard {...aboutInput} />
<KitsGalleryWithFilters
itemsArray={kitsGallery}
Expand Down
38 changes: 19 additions & 19 deletions static/meetings/committer-office-hour.ics
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,31 @@ END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
ORGANIZER;CN=Stephan Bauer:mailto:[email protected]
DESCRIPTION:Open hour meeting for all committers. The goal of the meeting i
s to discuss and share specific committer tasks/responsibilities.\n\n\n\n_
__________________________________________________________________________
_____\nMicrosoft Teams meeting\nJoin on your computer\, mobile app or room
device\nClick here to join the meeting<https://teams.microsoft.com/l/meet
up-join/19%3ameeting_ZjlmNTc5MjMtN2Y2YS00YjliLTg3NTItNWE1MmMzMWUzNmYw%40th
read.v2/0?context=%7b%22Tid%22%3a%221ad22c6d-2f08-4f05-a0ba-e17f6ce88380%2
2%2c%22Oid%22%3a%22a8b7a5ee-66ff-4695-afa2-08f893d8aaf6%22%7d>\nMeeting ID
: 332 054 435 962\nPasscode: bDwMjb\nDownload Teams<https://www.microsoft.
com/en-us/microsoft-teams/download-app> | Join on the web<https://www.micr
osoft.com/microsoft-teams/join-a-meeting>\nLearn More<https://aka.ms/JoinT
eamsMeeting> | Meeting options<https://teams.microsoft.com/meetingOptions/
?organizerId=a8b7a5ee-66ff-4695-afa2-08f893d8aaf6&tenantId=1ad22c6d-2f08-4
f05-a0ba-e17f6ce88380&threadId=19_meeting_ZjlmNTc5MjMtN2Y2YS00YjliLTg3NTIt
NWE1MmMzMWUzNmYw@thread.v2&messageId=0&language=en-GB>\n__________________
______________________________________________________________\n
RRULE:FREQ=MONTHLY;UNTIL=20241230T230000Z;INTERVAL=1;BYDAY=3FR
DESCRIPTION:Open hour meeting for Eclipse Tractus-X committers. The goal of
the meeting is to discuss and share specific committer tasks/responsibili
ties.\n\n_________________________________________________________________
_______________\nMicrosoft Teams meeting\nJoin on your computer\, mobile a
pp or room device\nClick here to join the meeting<https://teams.microsoft.
com/l/meetup-join/19%3ameeting_ZjlmNTc5MjMtN2Y2YS00YjliLTg3NTItNWE1MmMzMWU
zNmYw%40thread.v2/0?context=%7b%22Tid%22%3a%221ad22c6d-2f08-4f05-a0ba-e17f
6ce88380%22%2c%22Oid%22%3a%22a8b7a5ee-66ff-4695-afa2-08f893d8aaf6%22%7d>\n
Meeting ID: 332 054 435 962\nPasscode: bDwMjb\nDownload Teams<https://www.
microsoft.com/en-us/microsoft-teams/download-app> | Join on the web<https:
//www.microsoft.com/microsoft-teams/join-a-meeting>\nLearn More<https://ak
a.ms/JoinTeamsMeeting> | Meeting options<https://teams.microsoft.com/meeti
ngOptions/?organizerId=a8b7a5ee-66ff-4695-afa2-08f893d8aaf6&tenantId=1ad22
c6d-2f08-4f05-a0ba-e17f6ce88380&threadId=19_meeting_ZjlmNTc5MjMtN2Y2YS00Yj
liLTg3NTItNWE1MmMzMWUzNmYw@thread.v2&messageId=0&language=en-GB>\n________
________________________________________________________________________\n
RRULE:FREQ=WEEKLY;UNTIL=20241230T230000Z;INTERVAL=2;BYDAY=FR;WKST=MO
UID:040000008200E00074C5B7101A82E0080000000051BBCDCF435BDA01000000000000000
010000000F334FB7EDA04724AA775688B06788E20
SUMMARY:Committer - Office Hour
SUMMARY:Committer Meeting
DTSTART:20240216T130500Z
DTEND:20240216T140000Z
CLASS:PUBLIC
PRIORITY:5
DTSTAMP:20240209T103620Z
DTSTAMP:20240216T131141Z
TRANSP:OPAQUE
STATUS:CONFIRMED
LOCATION:Microsoft Teams Meeting
Expand Down
2 changes: 1 addition & 1 deletion utils/carouselKitdeepdive.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const carouselKitdeepdive = [
{
id: 2,
title: "KIT Usage",
description: "How to use a KIT ?",
description: "How to use a KIT?",
navigate: "/kits-usage"
},
{
Expand Down
27 changes: 7 additions & 20 deletions utils/enablementServices.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ export const enablementServices = [
subTitle: "",
productDescription: "Tractus-X EDC provides a framework for sovereign data exchange containing modules for performing data query, data exchange, policy enforcement, monitoring, and auditing.",
githubRepo: [
"https://github.com/eclipse-tractusx/bpdm",
"https://github.com/daps-helm-chart",
"https://github.com/dft-frontend",
"https://github.com/bpdm"
"https://github.com/eclipse-tractusx/tractusx-edc"
],
committers: [],
mailTo: "",
Expand All @@ -19,10 +16,7 @@ export const enablementServices = [
subTitle: "",
productDescription: "The Managed Identity Wallets (MIW) service implements the Self-Sovereign-Identity (SSI) using did:web for the Catena-X data space.",
githubRepo: [
"https://github.com/eclipse-tractusx/bpdm",
"https://github.com/eclipse-tractusx/daps-helm-chart",
"https://github.com/eclipse-tractusx/dft-frontend",
"https://github.com/eclipse-tractusx/bpdm"
"https://github.com/eclipse-tractusx/managed-identity-wallet"
],
committers: [],
mailTo: "",
Expand All @@ -34,10 +28,7 @@ export const enablementServices = [
subTitle: "",
productDescription: "The digital twin registry is used to manage and discover digital twin meta-data. Each participant must register its digital twin and relevant sub-models in the digital twin registry to expose its data offering to other participants.",
githubRepo: [
"https://github.com/eclipse-tractusx/bpdm",
"https://github.com/eclipse-tractusx/daps-helm-chart",
"https://github.com/eclipse-tractusx/dft-frontend",
"https://github.com/eclipse-tractusx/bpdm"
"https://github.com/eclipse-tractusx/sldt-digital-twin-registry"
],
committers: [],
mailTo: "",
Expand All @@ -49,10 +40,7 @@ export const enablementServices = [
subTitle: "",
productDescription: "The Item Relationship Service (IRS) builds data chains and provides custom business logic for business applications and other services",
githubRepo: [
"https://github.com/eclipse-tractusx/bpdm",
"https://github.com/eclipse-tractusx/daps-helm-chart",
"https://github.com/eclipse-tractusx/dft-frontend",
"https://github.com/eclipse-tractusx/bpdm"
"https://github.com/eclipse-tractusx/item-relationship-service",
],
committers: [],
mailTo: "",
Expand All @@ -64,10 +52,9 @@ export const enablementServices = [
subTitle: "",
productDescription: "The Managed Identity Wallets (MIW) service implements the Self-Sovereign-Identity (SSI) using did:web for the Catena-X data space.",
githubRepo: [
"https://github.com/eclipse-tractusx/bpdm",
"https://github.com/eclipse-tractusx/daps-helm-chart",
"https://github.com/eclipse-tractusx/dft-frontend",
"https://github.com/eclipse-tractusx/bpdm"
"https://github.com/eclipse-tractusx/knowledge-agents",
"https://github.com/eclipse-tractusx/knowledge-agents-aas-bridge",
"https://github.com/eclipse-tractusx/knowledge-agents-edc"
],
committers: [],
mailTo: "",
Expand Down

0 comments on commit d300c95

Please sign in to comment.