Skip to content

Commit de0aa86

Browse files
michelu89michelu89
authored
Update project to angular 16 (#81)
* Update project to angular 16
1 parent a38fdd8 commit de0aa86

File tree

269 files changed

+18754
-14025
lines changed

Some content is hidden

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

269 files changed

+18754
-14025
lines changed

‎core/apps/ame-e2e/project.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"name": "ame-e2e",
3+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
4+
"sourceRoot": "apps/ame-e2e/src",
5+
"projectType": "application",
6+
"targets": {
7+
"e2e": {
8+
"executor": "@nx/cypress:cypress",
9+
"options": {
10+
"cypressConfig": "cypress.config.js",
11+
"devServerTarget": "ame:serve:development",
12+
"tsConfig": "apps/ame-e2e/tsconfig.cypress.json"
13+
},
14+
"configurations": {
15+
"production": {
16+
"devServerTarget": "ame:serve-coverage:production"
17+
}
18+
}
19+
},
20+
"lint": {
21+
"executor": "@nx/linter:eslint",
22+
"outputs": ["{options.outputFile}"],
23+
"options": {
24+
"lintFilePatterns": ["apps/ame-e2e/**/*.{js,ts}"]
25+
}
26+
}
27+
}
28+
}

‎core/apps/ame-e2e/src/fixtures/external-reference/different-namespace/entity-external-property-with-children-reference.txt‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
2+
#
3+
# See the AUTHORS file(s) distributed with this work for
4+
# additional information regarding authorship.
5+
#
6+
# This Source Code Form is subject to the terms of the Mozilla Public
7+
# License, v. 2.0. If a copy of the MPL was not distributed with this
8+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
9+
#
10+
# SPDX-License-Identifier: MPL-2.0
11+
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#> .
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#> .
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.0.0#> .
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.0.0#> .
16+
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
17+
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
18+
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
19+
@prefix : <urn:samm:org.eclipse.digitaltwin:1.0.0#> .
20+
@prefix different: <urn:samm:org.eclipse.different:1.0.0#> .
21+
22+
:AspectDefault a samm:Aspect ;
23+
samm:properties ( :property1 ) ;
24+
samm:operations ( ) ;
25+
samm:events ( ) .
26+
27+
:property1 a samm:Property ;
28+
samm:characteristic :Characteristic1 .
29+
30+
:Characteristic1 a samm:Characteristic ;
31+
samm:dataType :Entity1 .
32+
33+
:Entity1 a samm:Entity ;
34+
samm:properties ( different:childrenProperty1 ) .
35+

‎core/apps/ame-e2e/src/integration/editor/drag-and-drop.spec.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
/// <reference types="Cypress" />
1515

1616
import {
17-
SELECTOR_ecAspect,
1817
SELECTOR_ecCharacteristic,
1918
SELECTOR_ecConstraint,
2019
SELECTOR_ecEntity,

‎core/apps/ame-e2e/src/integration/editor/edit-abstract-entity.spec.ts‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable cypress/no-unnecessary-waiting */
12
/*
23
* Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
34
*
@@ -111,7 +112,7 @@ describe('Create and Edit Abstract Entity', () => {
111112
.clickShape('Characteristic1') // To lost focus on AbstractEntity2
112113
.then(() => cy.clickConnectShapes('AbstractEntity2', 'AbstractEntity1'))
113114
.then(() => cy.get(SELECTOR_notificationsButton).click({force: true}))
114-
.then(() => cy.wait(500).get('.mat-cell').contains('Recursive elements').should('exist'))
115+
.then(() => cy.wait(500).get('.mat-mdc-cell').contains('Recursive elements').should('exist'))
115116
.then(() => cy.wait(500).get('[data-cy="close-notifications"]').click({force: true}));
116117
});
117118

@@ -145,9 +146,9 @@ describe('Create and Edit Abstract Entity', () => {
145146
cy.clickConnectShapes('AbstractEntity1', 'abstractProperty1')
146147
.then(() => cy.dbClickShape('AbstractEntity1'))
147148
.then(() => cy.get('[data-cy="properties-modal-button"]').click({force: true}))
148-
.then(() => cy.get('.mat-cell').should('contain', 'abstractProperty1'))
149-
.then(() => cy.get('.mat-cell').get('input').should('not.be.disabled'))
150-
.then(() => cy.wait(500).get('.mat-dialog-container .close-button').click())
149+
.then(() => cy.get('.mat-mdc-cell').should('contain', 'abstractProperty1'))
150+
.then(() => cy.get('.mat-mdc-cell').get('input').should('not.be.disabled'))
151+
.then(() => cy.wait(500).get('mat-dialog-container .close-button').click())
151152
.then(() => cy.get(SELECTOR_editorCancelButton).click({force: true}));
152153
});
153154

@@ -157,9 +158,9 @@ describe('Create and Edit Abstract Entity', () => {
157158
.then(() => cy.clickConnectShapes('AbstractEntity2', 'AbstractEntity1'))
158159
.then(() => cy.dbClickShape('AbstractEntity2'))
159160
.then(() => cy.get('[data-cy="properties-modal-button"]').click({force: true}))
160-
.then(() => cy.get('.mat-cell').should('contain', 'abstractProperty1'))
161-
.then(() => cy.get('.mat-cell').get('input').should('be.disabled'))
162-
.then(() => cy.wait(500).get('.mat-dialog-container .close-button').click());
161+
.then(() => cy.get('.mat-mdc-cell').should('contain', 'abstractProperty1'))
162+
.then(() => cy.get('.mat-mdc-cell').get('input').should('be.disabled'))
163+
.then(() => cy.wait(500).get('mat-dialog-container .close-button').click());
163164
});
164165
});
165166

@@ -173,9 +174,9 @@ describe('Create and Edit Abstract Entity', () => {
173174
cy.clickConnectShapes('AbstractEntity1', 'property1')
174175
.then(() => cy.dbClickShape('AbstractEntity1'))
175176
.then(() => cy.get('[data-cy="properties-modal-button"]').click({force: true}))
176-
.then(() => cy.get('.mat-cell').should('contain', 'property1'))
177-
.then(() => cy.get('.mat-cell').get('input').should('not.be.disabled'))
178-
.then(() => cy.wait(500).get('.mat-dialog-container .close-button').click())
177+
.then(() => cy.get('.mat-mdc-cell').should('contain', 'property1'))
178+
.then(() => cy.get('.mat-mdc-cell').get('input').should('not.be.disabled'))
179+
.then(() => cy.wait(500).get('mat-dialog-container .close-button').click())
179180
.then(() => cy.get(SELECTOR_editorCancelButton).click({force: true}))
180181
.then(() => cy.getUpdatedRDF())
181182
.then(rdf => expect(rdf).to.contain(':AbstractEntity1 a samm:AbstractEntity;\n samm:properties (:property1).'));
@@ -187,9 +188,9 @@ describe('Create and Edit Abstract Entity', () => {
187188
.then(() => cy.clickConnectShapes('AbstractEntity2', 'AbstractEntity1'))
188189
.then(() => cy.dbClickShape('AbstractEntity2'))
189190
.then(() => cy.get('[data-cy="properties-modal-button"]').click({force: true}))
190-
.then(() => cy.get('.mat-cell').should('contain', 'property1'))
191-
.then(() => cy.get('.mat-cell').get('input').should('be.disabled'))
192-
.then(() => cy.wait(500).get('.mat-dialog-container .close-button').click());
191+
.then(() => cy.get('.mat-mdc-cell').should('contain', 'property1'))
192+
.then(() => cy.get('.mat-mdc-cell').get('input').should('be.disabled'))
193+
.then(() => cy.wait(500).get('mat-dialog-container .close-button').click());
193194
});
194195
});
195196

‎core/apps/ame-e2e/src/integration/editor/edit-abstract-property.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable cypress/no-unnecessary-waiting */
12
/*
23
* Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
34
*
@@ -24,7 +25,6 @@ import {
2425
SELECTOR_ecAbstractEntity,
2526
SELECTOR_ecProperty,
2627
SELECTOR_ecEntity,
27-
SELECTOR_editorCancelButton,
2828
} from '../../support/constants';
2929

3030
describe('Create and Edit Abstract Property', () => {

‎core/apps/ame-e2e/src/integration/editor/edit-aspect.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable cypress/no-unnecessary-waiting */
12
/*
23
* Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
34
*
@@ -21,7 +22,6 @@ import {
2122
SELECTOR_tbDeleteButton,
2223
} from '../../support/constants';
2324
import {cyHelp} from '../../support/helpers';
24-
import {Aspect} from '@ame/meta-model';
2525

2626
describe('Test editing Aspect', () => {
2727
it('can add new', () => {

0 commit comments

Comments
 (0)