Skip to content

Commit d87cc14

Browse files
Release 1.5.1
2 parents 224e827 + 91818e6 commit d87cc14

File tree

134 files changed

+11841
-3265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+11841
-3265
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.patch text eol=lf
2+
*.sh text eol=lf

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @GailMelanie @hofermo @JonathanXITASO @pawel-baran-se @XAlinaGS @NilsXitaso @milofranke @sirchnik-xitaso
1+
* @GailMelanie @hofermo @JonathanXITASO @pawel-baran-se @XAlinaGS @NilsXitaso @milofranke

.github/dependabot.yml

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,49 @@
11
version: 2
22
updates:
3+
# biweekly minor+patch and major
34
- package-ecosystem: npm
45
target-branch: dev
5-
directory: '/'
6+
directory: "/"
67
schedule:
7-
interval: weekly
8-
day: monday
9-
time: '07:00'
10-
timezone: 'Europe/Berlin'
8+
interval: cron
9+
cronjob: "0 8 * * mon%2"
10+
timezone: "Europe/Berlin"
1111
groups:
12-
yarn-patch:
13-
update-types: ['patch']
14-
yarn-minor:
15-
update-types: ['minor']
12+
yarn-minor-patch:
13+
update-types: ["patch", "minor"]
1614
yarn-major:
17-
update-types: ['major']
18-
- package-ecosystem: 'docker'
15+
update-types: ["major"]
16+
# monthly docker docker-compose github-actions
17+
- package-ecosystem: "docker"
1918
target-branch: dev
20-
directory: '/'
19+
directory: "/"
2120
groups:
2221
docker-all:
2322
patterns:
24-
- '*'
23+
- "*"
2524
schedule:
26-
interval: weekly
25+
interval: cron
26+
cronjob: "0 8 * * mon%4"
27+
timezone: "Europe/Berlin"
2728
- package-ecosystem: docker-compose
2829
target-branch: dev
29-
directory: '/'
30+
directory: "/"
3031
groups:
3132
compose-all:
3233
patterns:
33-
- '*'
34+
- "*"
3435
schedule:
35-
interval: weekly
36+
interval: cron
37+
cronjob: "0 8 * * mon%4"
38+
timezone: "Europe/Berlin"
3639
- package-ecosystem: github-actions
3740
target-branch: dev
38-
directory: '/'
41+
directory: "/"
3942
groups:
4043
actions-all:
4144
patterns:
42-
- '*'
45+
- "*"
4346
schedule:
44-
interval: weekly
47+
interval: cron
48+
cronjob: "0 8 * * mon%4"
49+
timezone: "Europe/Berlin"

.github/workflows/docker-build.yml

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,22 @@ name: CI and Docker Deploy
22

33
on:
44
push:
5-
branches: ['main', 'dev', 'staging']
5+
branches: ['main', 'dev', 'maintenance/1.x']
66
tags: ['v*.*.*']
7+
paths-ignore:
8+
- '.github/ISSUE_TEMPLATE/**'
9+
- '.github/CODEOWNERS'
10+
- '.github/copilot-instructions.md'
11+
- 'wiki/**'
12+
- 'README.md'
713
pull_request:
814
branches: ['dev']
15+
paths-ignore:
16+
- '.github/ISSUE_TEMPLATE/**'
17+
- '.github/CODEOWNERS'
18+
- '.github/copilot-instructions.md'
19+
- 'wiki/**'
20+
- 'README.md'
921

1022
concurrency:
1123
group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,7 +27,7 @@ env:
1527
# github.repository as <account>/<repo>
1628
IMAGE_NAME: mnestix-browser
1729
# Update the version manually
18-
IMAGE_TAG_VERSION: 1.5.0
30+
IMAGE_TAG_VERSION: 1.5.1
1931

2032
jobs:
2133
build-browser-image:
@@ -129,6 +141,11 @@ jobs:
129141
steps:
130142
- name: Checkout repository
131143
uses: actions/checkout@v4
144+
- name: Setup Node.js
145+
uses: actions/setup-node@v4
146+
with:
147+
node-version: '22'
148+
cache: 'yarn'
132149
- name: Install dependencies
133150
run: yarn install --frozen-lockfile
134151

@@ -144,6 +161,11 @@ jobs:
144161
steps:
145162
- name: Checkout repository
146163
uses: actions/checkout@v4
164+
- name: Setup Node.js
165+
uses: actions/setup-node@v4
166+
with:
167+
node-version: '22'
168+
cache: 'yarn'
147169
- name: Install dependencies
148170
run: yarn install --frozen-lockfile
149171

@@ -204,7 +226,7 @@ jobs:
204226
runs-on: ubuntu-latest
205227
if: github.event_name != 'pull_request' &&
206228
github.repository_owner == 'eclipse-mnestix' &&
207-
(github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/dev')
229+
(github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev')
208230
permissions:
209231
contents: read
210232
packages: write

compose.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ networks:
55

66
volumes:
77
mnestix-database:
8+
mnestix-mongodb-data:
89

910
services:
1011
mnestix-browser:
1112
container_name: mnestix-browser
12-
image: mnestix/mnestix-browser:1.5.0
13+
image: mnestix/mnestix-browser:1.5.1
1314
profiles: ['', 'frontend', 'tests']
1415
build:
1516
dockerfile: Dockerfile
@@ -41,7 +42,7 @@ services:
4142
- mnestix-database:/app/prisma/database
4243

4344
mnestix-api:
44-
image: mnestix/mnestix-api:1.3.2
45+
image: mnestix/mnestix-api:1.3.3
4546
container_name: mnestix-api
4647
profiles: ['', 'backend', 'tests']
4748
ports:
@@ -81,7 +82,7 @@ services:
8182
- mnestix-network
8283

8384
mongodb:
84-
image: mongo:5
85+
image: mongo:8
8586
container_name: mongodb
8687
profiles: ['', 'basyx', 'tests']
8788
environment:
@@ -100,9 +101,11 @@ services:
100101
max-size: '100m'
101102
networks:
102103
- mnestix-network
104+
volumes:
105+
- mnestix-mongodb-data:/data/db
103106

104107
aas-environment:
105-
image: eclipsebasyx/aas-environment:2.0.0-milestone-05
108+
image: eclipsebasyx/aas-environment:2.0.0-milestone-06
106109
container_name: aas-environment
107110
profiles: ['', 'basyx', 'tests']
108111
depends_on:
@@ -134,7 +137,7 @@ services:
134137
- mnestix-network
135138

136139
aas-discovery:
137-
image: eclipsebasyx/aas-discovery:2.0.0-milestone-05
140+
image: eclipsebasyx/aas-discovery:2.0.0-milestone-06
138141
container_name: aas-discovery
139142
profiles: ['', 'basyx', 'tests']
140143
depends_on:
@@ -162,7 +165,7 @@ services:
162165
- mnestix-network
163166

164167
aas-registry:
165-
image: eclipsebasyx/aas-registry-log-mongodb:2.0.0-milestone-05
168+
image: eclipsebasyx/aas-registry-log-mongodb:2.0.0-milestone-06
166169
container_name: aas-registry
167170
profiles: ['', 'basyx']
168171
ports:
@@ -182,7 +185,7 @@ services:
182185
- mnestix-network
183186

184187
submodel-registry:
185-
image: eclipsebasyx/submodel-registry-log-mongodb:2.0.0-milestone-05
188+
image: eclipsebasyx/submodel-registry-log-mongodb:2.0.0-milestone-06
186189
container_name: submodel-registry
187190
profiles: ['', 'basyx']
188191
ports:

cypress.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM cypress/included:14.1.0
1+
FROM cypress/included:14.4.1
22

33
ENV NO_COLOR=1
44

cypress/e2e/documentComponentTest.spec.js

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import resolutions from '../fixtures/resolutions.json';
22

33
describe('Test DocumentComponent', function () {
4-
const defaultResolution = resolutions[0]; // Verwende die erste Auflösung als Standard
4+
const defaultResolution = resolutions[0];
55

66
describe('test on default resolution: ' + defaultResolution, function () {
77
beforeEach(function () {
88
cy.setResolution(defaultResolution);
9-
cy.visitViewer("https://vws.xitaso.com/aas/mnestix");
9+
cy.visitViewer('https://vws.xitaso.com/aas/mnestix');
1010
cy.getByTestId('submodel-tab').contains('HandoverDocumentation').click();
1111
});
1212

@@ -20,23 +20,20 @@ describe('Test DocumentComponent', function () {
2020
.should('exist')
2121
.should('be.visible')
2222
.should('have.attr', 'src')
23-
.and('contain', 'repo/submodels/aHR0cHM6Ly9leGFtcGxlLmNvbS9pZHMvc20vNzc5MV8xMzA3XzMxMzFfNTg3Mw/submodel-elements/Document.DocumentVersion.PreviewFile/attachment');
23+
.and(
24+
'contain',
25+
'repo/submodels/aHR0cHM6Ly9leGFtcGxlLmNvbS9pZHMvc20vNzc5MV8xMzA3XzMxMzFfNTg3Mw/submodel-elements/Document.DocumentVersion.PreviewFile/attachment',
26+
);
2427
});
2528

26-
it('should have working open button with correct URL', function () {
27-
cy.getByTestId('document-open-button')
28-
.should('exist')
29-
.should('not.be.disabled')
30-
.should('have.attr', 'href')
31-
.and('contain', 'repo/submodels/aHR0cHM6Ly9leGFtcGxlLmNvbS9pZHMvc20vNzc5MV8xMzA3XzMxMzFfNTg3Mw/submodel-elements/Document.DocumentVersion.DigitalFile/attachment');
29+
it('should have working open button', function () {
30+
cy.getByTestId('document-open-button').should('exist').should('not.be.disabled');
3231
});
3332

3433
it('should open details dialog when info button is clicked', function () {
3534
cy.getByTestId('document-info-button').click();
36-
cy.getByTestId('document-details-dialog')
37-
.should('exist')
38-
.should('be.visible');
39-
//Check if the dialog closes when the close button is clicked
35+
cy.getByTestId('document-details-dialog').should('exist').should('be.visible');
36+
// Check if the dialog closes when the close button is clicked
4037
cy.get('[aria-label="close"]').click();
4138
cy.getByTestId('document-details-dialog').should('not.exist');
4239
});

docker-compose/compose.dynamic-rbac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ services:
114114
volumes:
115115
- ./docker-compose/data/keycloak/realm:/opt/jboss/keycloak/imports
116116
ports:
117-
- 8080:8080
117+
- '8080:8080'
118118
environment:
119119
KEYCLOAK_ADMIN: admin
120120
KEYCLOAK_ADMIN_PASSWORD: admin
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
networks:
2+
mnestix-network:
3+
driver: bridge
4+
external: true
5+
6+
services:
7+
searcher-mongodb:
8+
container_name: searcher-mongodb
9+
image: mongo:latest
10+
ports:
11+
- '27018:27017'
12+
environment:
13+
MONGO_INITDB_ROOT_USERNAME: admin
14+
MONGO_INITDB_ROOT_PASSWORD: superSecureSecret
15+
volumes:
16+
- mongodb_data:/data/db
17+
networks:
18+
- mnestix-network
19+
20+
mnestix-searcher:
21+
container_name: mnestix-searcher
22+
image: mnestix/mnestix-searcher:latest-dev
23+
ports:
24+
- '5149:5149'
25+
environment:
26+
AuthenticationSettings__ApiKey: ${MNESTIX_BACKEND_API_KEY:-verySecureApiKey}
27+
AasSearcherDatabase__ConnectionString: 'mongodb://admin:superSecureSecret@searcher-mongodb:27017'
28+
BaseUrlSettings__AasRepositoryBaseUrl: 'https://vws4ls-api.dev.mnestix.xitaso.net/repo'
29+
BaseUrlSettings__SubmodelRepositoryBaseUrl: 'https://vws4ls-api.dev.mnestix.xitaso.net/repo'
30+
BaseUrlSettings__ConceptDescriptionRepositoryBaseUrl: 'https://vws4ls-api.dev.mnestix.xitaso.net/repo'
31+
ASPNETCORE_URLS: 'http://+:5149'
32+
networks:
33+
- mnestix-network
34+
35+
volumes:
36+
mongodb_data:

0 commit comments

Comments
 (0)