Skip to content

Commit 51986ed

Browse files
authored
Fix and improve some problems (#114)
* Resolved the issue with adding references. * The migration button now refreshes automatically after migration in a single window. * Ensured that the Aspect Model only opens in one window to enhance user experience. * Updated the documentation to reflect current known issues. * Adjusted the workspace view so that the close button no longer overlaps with other elements.
1 parent a4daef8 commit 51986ed

File tree

54 files changed

+528
-192
lines changed

Some content is hidden

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

54 files changed

+528
-192
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ speed-measure-plugin.json
2121
*.launch
2222
.settings/
2323
*.sublime-workspace
24+
.log
2425

2526
# IDE - VSCode
2627
.vscode

core/.browserslistrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not
1919

2020
not ios_saf 15.2-15.3
2121
not safari 15.2-15.3
22-
not op_mini all

core/.eslintrc.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@
4242
{
4343
"files": ["*.js", "*.jsx"],
4444
"extends": ["plugin:@nx/javascript"],
45-
"rules": {}
45+
"rules": {
46+
"no-var": "error",
47+
"no-unused-vars": "error",
48+
"no-undef": "error"
49+
}
4650
}
4751
]
4852
}

core/.husky/pre-commit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env sh
2-
32
. "$(dirname -- "$0")/_/husky.sh"
43

54
cd core

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/// <reference types="Cypress" />
1515

16+
import {cyHelp} from '../../../support/helpers';
1617
import {
1718
SELECTOR_ecCharacteristic,
1819
SELECTOR_fileMenuFindElements,
@@ -42,6 +43,7 @@ describe('Test drag and drop ext characteristic', () => {
4243
cy.visitDefault().then(() =>
4344
cy
4445
.startModelling()
46+
.then(() => cyHelp.checkAspectDefaultExists())
4547
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
4648
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
4749
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}).wait(3000))

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ describe('Test drag and drop ext constraint', () => {
4545
cy.visitDefault().then(() =>
4646
cy
4747
.startModelling()
48+
.then(() => cyHelp.checkAspectDefaultExists())
4849
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
4950
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
5051
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}).wait(3000))

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/// <reference types="Cypress" />
1515

16+
import {cyHelp} from '../../../support/helpers';
1617
import {
1718
SELECTOR_ecEntity,
1819
SELECTOR_fileMenuFindElements,
@@ -42,6 +43,7 @@ describe('Test drag and drop', () => {
4243
cy.visitDefault().then(() =>
4344
cy
4445
.startModelling()
46+
.then(() => cyHelp.checkAspectDefaultExists())
4547
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
4648
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
4749
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}))

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313

1414
/// <reference types="Cypress" />
1515

16+
import {cyHelp} from '../../../support/helpers';
1617
import {
1718
SELECTOR_ecProperty,
1819
SELECTOR_fileMenuFindElements,
1920
SELECTOR_namespaceFileMenuButton,
2021
SELECTOR_openNamespacesButton,
2122
} from '../../../support/constants';
22-
import {checkAspectTree, checkRelationParentChild, connectElements, dragExternalReferenceWithChildren} from '../../../support/utils';
23+
import {checkAspectTree, connectElements, dragExternalReferenceWithChildren} from '../../../support/utils';
2324

2425
describe('Test drag and drop ext properties', () => {
2526
it("can add Property with children's from external reference different namespace", () => {
@@ -42,6 +43,7 @@ describe('Test drag and drop ext properties', () => {
4243
cy.visitDefault().then(() =>
4344
cy
4445
.startModelling()
46+
.then(() => cyHelp.checkAspectDefaultExists())
4547
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
4648
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
4749
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}))

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313

1414
/// <reference types="Cypress" />
1515

16+
import {cyHelp} from '../../../support/helpers';
1617
import {
1718
SELECTOR_ecProperty,
1819
SELECTOR_fileMenuFindElements,
1920
SELECTOR_namespaceFileMenuButton,
2021
SELECTOR_openNamespacesButton,
2122
} from '../../../support/constants';
22-
import {checkAspectTree, checkRelationParentChild, connectElements, dragExternalReferenceWithChildren} from '../../../support/utils';
23+
import {checkRelationParentChild, connectElements} from '../../../support/utils';
2324

2425
describe('Test drag and drop ext properties', () => {
2526
it('can add Property from external reference with different namespace', () => {
@@ -42,6 +43,7 @@ describe('Test drag and drop ext properties', () => {
4243
cy.visitDefault().then(() =>
4344
cy
4445
.startModelling()
46+
.then(() => cyHelp.checkAspectDefaultExists())
4547
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
4648
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
4749
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}).wait(3000))

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/// <reference types="Cypress" />
1515

16+
import {cyHelp} from '../../../support/helpers';
1617
import {
1718
SELECTOR_ecCharacteristic,
1819
SELECTOR_fileMenuFindElements,
@@ -45,6 +46,7 @@ describe('Test drag and drop ext characteristic', () => {
4546
cy.visitDefault().then(() =>
4647
cy
4748
.startModelling()
49+
.then(() => cyHelp.checkAspectDefaultExists())
4850
.then(() => cy.get(SELECTOR_openNamespacesButton).click({force: true}))
4951
.then(() => cy.get(SELECTOR_namespaceFileMenuButton).click({force: true}))
5052
.then(() => cy.get(SELECTOR_fileMenuFindElements).click({force: true}).wait(3000))

0 commit comments

Comments
 (0)