Skip to content

Commit

Permalink
Merge pull request #1171 from Grand-Thibault/split-logistics-and-customs
Browse files Browse the repository at this point in the history
Split logistics and customs in two KITs
  • Loading branch information
stephanbcbauer authored Feb 28, 2025
2 parents 589cb63 + 8d2d003 commit acda82e
Show file tree
Hide file tree
Showing 24 changed files with 483 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
id: Adoption View Customs Kit
title: Adoption View Customs
description: "Customs Kit"
sidebar_position: 1
sidebar_position: 2
---

![Logistics kit banner](@site/static/img/kits/logistics/logistics-kit-logo.drawio.svg)
![Customs kit logo](@site/static/img/kits/customs/customs-kit-logo.drawio.svg)

## Vision & Mission

Expand Down Expand Up @@ -49,7 +49,7 @@ Every company divides the trade agreements into different and individual zones.
6. A contract negotiation takes place between the sender (supplier) and the receiver (customer) by using their Eclipse Data Connectors (EDC).
7. After a successful contract negotiation, the sender (supplier) sends the customs notification via a HTTP POST request to the receiver (customer) via the dataplane endpoint from the contract agreement.

![PushCustoms](../assets/pushCustoms.svg)
![PushCustoms](./assets/pushCustoms.svg)

### Pull of customs information

Expand All @@ -64,7 +64,7 @@ Every company divides the trade agreements into different and individual zones.
7. The Data Consumer (customer) initiates a contract negotiation to get a contract agreement. A contract negotiation takes place between the Data Provider (supplier) and the Data Consumer (customer) by using their Eclipse Data Connectors (EDC).
8. After a successful contract negotiation, the Data Consumer (customer) pulls the aspect model “customsInformation” (json) from the Submodel Server of the Data Provider (supplier).

![PullCustoms](../assets/pullCustoms.svg)
![PullCustoms](./assets/pullCustoms.svg)

## Signature

Expand Down
22 changes: 22 additions & 0 deletions docs-kits/kits/customs-kit/changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
id: Customs Kit Changelog
title: Changelog
description: 'Customs Kit'
sidebar_position: 1
---

![Customs kit logo](@site/static/img/kits/customs/customs-kit-logo.drawio.svg)

## [0.0.0] -

### Added

- Initial version of the Kit including the adoption view

### Changed

- ./.

### Removed

- ./.
8 changes: 8 additions & 0 deletions docs-kits/kits/customs-kit/documentation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
id: Documentation Customs Kit
title: Documentation
description: "Customs Kit"
sidebar_position: 5
---

![Customs kit logo](@site/static/img/kits/customs/customs-kit-logo.drawio.svg)
8 changes: 8 additions & 0 deletions docs-kits/kits/customs-kit/software-development-view.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
id: Software Development Customs Kit
title: Software Development View
description: "Customs Kit"
sidebar_position: 3
---

![Customs kit logo](@site/static/img/kits/customs/customs-kit-logo.drawio.svg)
8 changes: 8 additions & 0 deletions docs-kits/kits/customs-kit/software-operation-view.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
id: Operations View Customs Kit
title: Operations View
description: 'Customs Kit Operations View'
sidebar_position: 4
---

![Customs kit logo](@site/static/img/kits/customs/customs-kit-logo.drawio.svg)
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: Documentation Logistics Kit
title: Documentation
description: "Logistics Kit"
sidebar_position: 3
sidebar_position: 5
---

![Logistics kit banner](@site/static/img/kits/logistics/logistics-kit-logo.drawio.svg)
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: Software Development Logistics Kit
title: Software Development View
description: "Logistics Kit"
sidebar_position: 1
sidebar_position: 3
---

![Logistics kit banner](@site/static/img/kits/logistics/logistics-kit-logo.drawio.svg)
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: Operations View Logistics Kit
title: Operations View
description: 'Logistics Kit Operations View'
sidebar_position: 3
sidebar_position: 4
---

![Logistics kit banner](@site/static/img/kits/logistics/logistics-kit-logo.drawio.svg)
4 changes: 4 additions & 0 deletions docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,10 @@ const config = {
to: '/docs-kits/kits/Connector%20Kit/Adoption%20View/connector_kit_adoption_view',
label: 'Connector',
},
{
to: '/docs-kits/kits/customs-kit/page_adoption-view',
label: 'Customs',
},
{
to: '/docs-kits/kits/Data%20Chain%20Kit/Adoption%20View%20Data%20Chain%20Kit',
label: 'Data Chain',
Expand Down
34 changes: 18 additions & 16 deletions sidebarsDocsKits.js
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,20 @@ const sidebars = {

],
},
{
type: 'category',
label: 'Customs KIT',
link: {
type: 'generated-index',
},
collapsed: true,
items: [
{
type: 'autogenerated',
dirName: 'kits/customs-kit/Adoption View Customs Kit'
},
],
},
{
type: 'category',
label: 'Data Chain KIT',
Expand Down Expand Up @@ -567,27 +581,15 @@ const sidebars = {
},
{
type: 'category',
label: 'Logistics and Customs KIT',
label: 'Logistics KIT',
link: {
type: 'doc',
id: 'kits/logistics-kit/Adoption View Logistics Kit',
type: 'generated-index',
},
collapsed: true,
items: [
'kits/logistics-kit/Adoption View Logistics Kit',
{
type: 'category',
label: 'Customs',
link: {
type: 'doc',
id: 'kits/logistics-kit/customs/Adoption View Customs Kit'
},
items: [
{
type: 'autogenerated',
dirName: 'kits/logistics-kit/customs/Adoption View Customs Kit'
}
]
type: 'autogenerated',
dirName: 'kits/logistics-kit/Adoption View Customs Kit'
},
],
},
Expand Down
5 changes: 3 additions & 2 deletions src/components/KitsGalleryWithFilters/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,10 @@ export default function KitsGalleryWithFilters({itemsArray, title, description})
<MenuItem value={'All Domains'}>All Domains</MenuItem>
<MenuItem value={'Engineering'}>Engineering</MenuItem>
<MenuItem value={'Industry Core'}>Industry Core</MenuItem>
<MenuItem value={'Manufacturing'}>Industry Core</MenuItem>
<MenuItem value={'Network Services'}>Network Services</MenuItem>
<MenuItem value={'PLM / Quality'}>PLM / Quality</MenuItem>
<MenuItem value={'Resiliency'}>Resiliency</MenuItem>
<MenuItem value={'Quality'}>Quality</MenuItem>
<MenuItem value={'Supply Chain'}>Supply Chain</MenuItem>
<MenuItem value={'Sustainability'}>Sustainability</MenuItem>
</Select>
</FormControl>
Expand Down
155 changes: 155 additions & 0 deletions static/img/kits/customs/customs-gallery.drawio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions static/img/kits/customs/customs-gallery.drawio.svg.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
img/This work is licensed under the CC-BY-4.0

- SPDX-License-Identifier: CC-BY-4.0
- SPDX-FileCopyrightText: 2024 Contributors to the Eclipse Foundation
- Source URL: https://github.com/eclipse-tractusx/eclipse-tractusx.github.io/blob/main/static/img/kits/customs/customs-gallery.drawio.svg
37 changes: 37 additions & 0 deletions static/img/kits/customs/customs-kit-logo.drawio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions static/img/kits/customs/customs-kit-logo.drawio.svg.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
img/This work is licensed under the CC-BY-4.0

- SPDX-License-Identifier: CC-BY-4.0
- SPDX-FileCopyrightText: 2024 Contributors to the Eclipse Foundation
- Source URL: https://github.com/eclipse-tractusx/eclipse-tractusx.github.io/blob/main/static/img/kits/customs/customs-kit-logo.drawio.svg
156 changes: 152 additions & 4 deletions static/img/kits/logistics/logistics-gallery.drawio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 38 additions & 4 deletions static/img/kits/logistics/logistics-kit-logo.drawio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 13 additions & 11 deletions utils/kitsGallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@ import Traceability_Kit from "@site/static/img/kits/traceability/traceability-ki
//************************** IMPORTANT **************************** */

// WHEN DEFINING A "DOMAIN" IN THE kitsGallery ARRAY, MAKE SURE TO SELECT/TYPE EXACTLY AS BELOW:
// * Engineering
// * Industry Core
// * Manufacturing
// * Network Services
// * PLM / Quality
// * Resiliency
// * Quality
// * Supply Chain
// * Sustainability
// * Engineering

Expand Down Expand Up @@ -79,7 +81,7 @@ export const kitsGallery = [
{
id: 4,
name: 'Traceability Kit',
domain: 'PLM / Quality',
domain: 'Quality',
img: Traceability_Kit,
pageRoute: "/docs-kits/kits/Traceability Kit/Business View Traceability Kit"
},
Expand Down Expand Up @@ -107,14 +109,14 @@ export const kitsGallery = [
{
id: 8,
name: 'Online Simulation Kit',
domain: 'Resiliency',
domain: 'Supply Chain',
img: OnlineSimulation,
pageRoute: "/docs-kits/kits/OSim%20Kit/Adoption%20View%20OSim%20Kit"
},
{
id: 9,
name: 'Data Driven Quality Management Kit',
domain: 'PLM / Quality',
domain: 'Quality',
img: DDQM,
pageRoute: "/docs-kits/kits/Quality-Kit/Adoption%20View%20Quality%20Kit"
},
Expand All @@ -135,14 +137,14 @@ export const kitsGallery = [
{
id: 12,
name: 'DCM Kit',
domain: 'Resiliency',
domain: 'Supply Chain',
img: DemandandCapacityManagement_Kit,
pageRoute: "/docs-kits/kits/Demand%20and%20Capacity%20Management%20Kit/adoption-view/overview"
},
{
id: 13,
name: 'Modular Production Kit',
domain: 'Resiliency',
domain: 'Manufacturing',
img: ModularProduction_Kit,
pageRoute: "/docs-kits/kits/Modular%20Production%20Kit/Adoption%20View%20Modular%20Production%20Kit"
},
Expand All @@ -156,7 +158,7 @@ export const kitsGallery = [
{
id: 15,
name: 'Manufacturing as a Service Kit',
domain: 'Resiliency',
domain: 'Manufacturing',
img: Maas_Kit,
pageRoute: "/docs-kits/kits/Manufacturing%20as%20a%20Service%20Kit/Adoption%20View%20MaaS%20Kit"
},
Expand All @@ -177,14 +179,14 @@ export const kitsGallery = [
{
id: 18,
name: 'PURIS Kit',
domain: 'Resiliency',
domain: 'Supply Chain',
pageRoute: '/docs-kits/kits/PURIS%20Kit/Adoption%20View%20PURIS%20Kit',
img: PURIS_Kit,
},
{
id: 19,
name: 'Supply Chain Disruption Notifications KIT',
domain: 'Resiliency',
domain: 'Supply Chain',
pageRoute: '/docs-kits/next/kits/Supply%20Chain%20Disruption%20Notifications%20KIT/Adoption%20View%20PURIS-DCM%20Supply%20Chain%20Disruption%20Notifications',
img: SupplyChainsDisruptionNotifications_Kit,
},
Expand All @@ -198,7 +200,7 @@ export const kitsGallery = [
{
id: 21,
name: 'Logistics KIT',
domain: 'PLM / Quality',
domain: 'Supply Chain',
pageRoute: 'docs-kits/kits/Logistics%20Kit/page_adoption-view.md',
img: Logistics_Kit,
},
Expand Down

0 comments on commit acda82e

Please sign in to comment.