Skip to content

Commit a4daef8

Browse files
michelu89michelu89
authored
Feature/improve ame with new functions (#110)
* Add documentation for multiple windows * Add new functionality and fix some bugs fix: * Validation error after export-import from a valid model with AbstractEntities * n Export namespace dialogue, namespace no longer referenced is displayed as Dependenccy * Cannot specify exampleValue true/false for Boolean Characteristic instance #94 * On large workspaces the migrator fails to finalize feature: * Show more children in edit panel & improve edit logo #85 * Double click referenced element to open new tab * Support generation of aasx/xml for Asset Administration Shell (AAS) * Delete installer.nsi * Update n3
1 parent 5127c43 commit a4daef8

File tree

60 files changed

+859
-109
lines changed

Some content is hidden

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

60 files changed

+859
-109
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"executor": "@nx/cypress:cypress",
99
"options": {
1010
"cypressConfig": "cypress.config.js",
11-
"devServerTarget": "ame:serve:development"
11+
"devServerTarget": "ame:serve:development",
12+
"tsConfig": "apps/ame-e2e/tsconfig.cypress.json"
1213
},
1314
"configurations": {
1415
"production": {

‎core/apps/ame-e2e/src/integration/drag-and-drop/different-namespace/external-characteristic-reference.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ describe('Test drag and drop ext characteristic', () => {
4444
.startModelling()
4545
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
4646
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
47-
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}))
48-
.then(() => cy.dragElement(SELECTOR_ecCharacteristic, 100, 300))
47+
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}).wait(3000))
48+
.then(() => cy.dragElement(SELECTOR_ecCharacteristic, 100, 300).wait(3000))
4949
.then(() => connectElements('property1', 'ExternalCharacteristic', false))
5050
.then(() => cy.getAspect())
5151
.then(checkAspect)

‎core/apps/ame-e2e/src/integration/drag-and-drop/different-namespace/external-constraint-reference.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ describe('Test drag and drop ext constraint', () => {
4747
.startModelling()
4848
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
4949
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
50-
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}))
51-
.then(() => cy.dragElement(SELECTOR_ecConstraint, 100, 300))
52-
.then(() => cy.get(SELECTOR_closeSidebarButton).click({force: true}))
50+
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}).wait(3000))
51+
.then(() => cy.dragElement(SELECTOR_ecConstraint, 100, 300).wait(3000))
52+
.then(() => cy.get(SELECTOR_closeSidebarButton).click({force: true}).wait(3000))
5353
.then(() => cy.dragElement(SELECTOR_ecTrait, 1100, 300))
5454
.then(() => cy.clickConnectShapes('property1', 'Trait1'))
5555
.then(() => cy.clickConnectShapes('Trait1', 'Characteristic1'))

‎core/apps/ame-e2e/src/integration/drag-and-drop/different-namespace/external-entity-reference.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ describe('Test drag and drop', () => {
4646
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
4747
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}))
4848
.then(() => cy.dragElement(SELECTOR_ecEntity, 100, 300))
49+
.then(() => cy.clickShape('ExternalEntity'))
4950
.then(() => connectElements('Characteristic1', 'ExternalEntity', false))
5051
.then(() => cy.getAspect())
5152
.then(checkAspectAndChildrenEntity)

‎core/apps/ame-e2e/src/integration/drag-and-drop/different-namespace/external-property-reference-with-children.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
SELECTOR_namespaceFileMenuButton,
2020
SELECTOR_openNamespacesButton,
2121
} from '../../../support/constants';
22-
import {checkAspectTree, connectElements, dragExternalReferenceWithChildren} from '../../../support/utils';
22+
import {checkAspectTree, checkRelationParentChild, connectElements, dragExternalReferenceWithChildren} from '../../../support/utils';
2323

2424
describe('Test drag and drop ext properties', () => {
2525
it("can add Property with children's from external reference different namespace", () => {
@@ -46,6 +46,7 @@ describe('Test drag and drop ext properties', () => {
4646
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
4747
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}))
4848
.then(() => dragExternalReferenceWithChildren(SELECTOR_ecProperty, 100, 300))
49+
.then(() => cy.clickShape('externalPropertyWithChildren'))
4950
.then(() => connectElements('AspectDefault', 'externalPropertyWithChildren', true))
5051
.then(() => cy.getAspect())
5152
.then(checkAspectTree)

‎core/apps/ame-e2e/src/integration/drag-and-drop/different-namespace/external-property-reference.spec.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
SELECTOR_namespaceFileMenuButton,
2020
SELECTOR_openNamespacesButton,
2121
} from '../../../support/constants';
22-
import {checkRelationParentChild, connectElements} from '../../../support/utils';
22+
import {checkAspectTree, checkRelationParentChild, connectElements, dragExternalReferenceWithChildren} from '../../../support/utils';
2323

2424
describe('Test drag and drop ext properties', () => {
2525
it('can add Property from external reference with different namespace', () => {
@@ -44,8 +44,9 @@ describe('Test drag and drop ext properties', () => {
4444
.startModelling()
4545
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
4646
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
47-
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}))
48-
.then(() => cy.dragElement(SELECTOR_ecProperty, 100, 300))
47+
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}).wait(3000))
48+
.then(() => cy.dragElement(SELECTOR_ecProperty, 100, 300).wait(3000))
49+
.then(() => cy.clickShape('externalProperty').wait(3000))
4950
.then(() => connectElements('AspectDefault', 'externalProperty', true))
5051
.then(() => cy.getAspect())
5152
.then(aspect => checkRelationParentChild(aspect, 'AspectDefault', 'externalProperty'))

‎core/apps/ame-e2e/src/integration/drag-and-drop/same-namespace/external-characteristic-reference.spec.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ describe('Test drag and drop ext characteristic', () => {
4747
.startModelling()
4848
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
4949
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
50-
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}))
51-
.then(() => cy.dragElement(SELECTOR_ecCharacteristic, 100, 300))
50+
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}).wait(3000))
51+
.then(() => cy.dragElement(SELECTOR_ecCharacteristic, 100, 300).wait(3000))
52+
.then(() => cy.clickShape('ExternalCharacteristic').wait(3000))
5253
.then(() => connectElements('property1', 'ExternalCharacteristic', false))
5354
.then(() => cy.getAspect())
5455
.then(checkAspect)

‎core/apps/ame-e2e/src/integration/drag-and-drop/same-namespace/external-constraint-reference.spec.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,11 @@ describe('Test drag and drop ext constraint', () => {
5050
.startModelling()
5151
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
5252
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
53-
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}))
54-
.then(() => cy.dragElement(SELECTOR_ecConstraint, 100, 300))
53+
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}).wait(3000))
54+
.then(() => cy.dragElement(SELECTOR_ecConstraint, 100, 300).wait(3000))
55+
.then(() => cy.clickShape('ExternalConstraint').wait(3000))
5556
.then(() => cy.get(SELECTOR_closeSidebarButton).click({force: true}))
56-
.then(() => cy.dragElement(SELECTOR_ecTrait, 1100, 300))
57+
.then(() => cy.dragElement(SELECTOR_ecTrait, 1100, 300).then(() => cy.clickShape('Trait1')))
5758
.then(() => cy.clickConnectShapes('property1', 'Trait1'))
5859
.then(() => cy.clickConnectShapes('Trait1', 'Characteristic1'))
5960
.then(() => cy.clickConnectShapes('Trait1', 'ExternalConstraint'))

‎core/apps/ame-e2e/src/integration/drag-and-drop/same-namespace/external-entity-reference.spec.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ describe('Test drag and drop', () => {
4444
.startModelling()
4545
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
4646
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
47-
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}))
48-
.then(() => cy.dragElement(SELECTOR_ecEntity, 100, 300))
47+
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}).wait(3000))
48+
.then(() => cy.dragElement(SELECTOR_ecEntity, 100, 300).wait(3000))
49+
.then(() => cy.clickShape('ExternalEntity').wait(3000))
4950
.then(() => connectElements('Characteristic1', 'ExternalEntity', false))
5051
.then(() => cy.getAspect())
5152
.then(checkAspectAndChildrenEntity)

‎core/apps/ame-e2e/src/integration/drag-and-drop/same-namespace/external-property-reference.spec.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ describe('Test drag and drop ext properties', () => {
4444
.startModelling()
4545
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
4646
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
47-
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}))
48-
.then(() => cy.dragElement(SELECTOR_ecProperty, 100, 300))
47+
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}).wait(3000))
48+
.then(() => cy.dragElement(SELECTOR_ecProperty, 100, 300).wait(3000))
49+
.then(() => cy.clickShape('externalProperty').wait(3000))
4950
.then(() => connectElements('AspectDefault', 'externalProperty', true))
5051
.then(() => cy.getAspect())
5152
.then(aspect => checkRelationParentChild(aspect, 'AspectDefault', 'externalProperty'))

0 commit comments

Comments
 (0)