Skip to content

Commit 3232ac5

Browse files
georgemoscumichelu89
georgemoscu
and
michelu89
authored
#269-Fixes #252 and #269. Alignment with strict ttl and Java SDK (#282)
* Squashed last 17 commits Aspect model loader integration part 1 Updated elements & created helper functions Loader functionalities (#44) Finished loader FUntionalities fix: Replaced old entity instances references with the new ones (#45) * Fixed characteristic & elements creation * Replaced old EntityInstance references with the new ones * Updated ElementsSet Name Fix: Updated loader to have internal separate memory per load (#46) * Start new factory method * Updated loader to have internal sepparate memory per load Fixed naming issue on creating new element from plus button (#47) Fix - workspace elements & file load (#48) * Fixed elements load * Updated functions from workspace * Fixed external reference function and fixed loading namespace files * Removed unnecessary console.log Fix: abstract element not showing abstract in name (#49) Fixed Abstract element not showing abstract in name Fix/abstract entity extends entty (#50) * Fixed connection between enetity elements * Updated default namespace for new created files Fix: characteristic instances throwing errors on changing (#51) * Fixed connection between enetity elements * Fixed error on predefined characteristic change of class Fix: load icons and font from local (#53) * Fixed connection between enetity elements * Added resources locally so the editor will not make requests externally Fix: load icons and font from local (#53) * Fixed connection between enetity elements * Added resources locally so the editor will not make requests externally Fix/workspace file error detection (#52) * Fixed connection between enetity elements * Fixed load elements & spead up the loading on files in workspace * Updated files loading in workspace and optimized the error displaying in files * splitted functionalities into theri services * Fixed loading in other window. Fixed anonymous elements bug while leading. * Fixed entity instances export * Fixed entity instance sidebar broken view * Re-added copyright header Fix: migrate on load (#54) * Fixed connection between enetity elements * Fixed migrate on load and fixed namespace list on export Fix/minor bugs (#55) * Fixed connection between enetity elements * Fixed migrate on load and fixed namespace list on export * fixed language problems, migration problems, settings problems --------- Co-authored-by: Michele Santoro <[email protected]> Fix/properties payloads (#56) * Fixed connection between enetity elements * Added properties payload to parents * Fixed characteristic change class error & fixed loading elements with multiple used propeties Feature - Updated to SAMM 2.2.0 & new Java SDK (#57) * Fixed connection between enetity elements * Add new SAMM Version 2.2.0 * Add right sever port for the backend app * Change structure of importing and exporting aspect models * redo the detection of workspace errors * Updated editor to work with new SDK * Fixed export bug * Fixed abstract elements connection. Fixed workspace elements loading. Fixed abstract elements export --------- Co-authored-by: Michele Santoro <[email protected]> * Fix some strict ttl findings (#58) * Activate dev mode for testing purpose * Remove params for fetching namespaces * Fix error case when exporting namespace * Create package-lock.json * Update package-lock.json * Update documentation to new SAMM version and also update import and export page * Fix several unit tests * Adjust some cypress tests * Adjust some testing files on cypress * Make different interceptor available on start modeling * Fixed unit tests (#59) * Fix: connection and renaming issues (#60) Fixed multiple issues related to creation and connection of elements; Fixed a few e2e tests * Fixed characteristic and Entity problems & others (#61) * Fix/e2e tests (#62) Fixed e2e tests --------- Co-authored-by: Michele Santoro <[email protected]> Co-authored-by: Michele Santoro <[email protected]>
1 parent b74de3a commit 3232ac5

File tree

868 files changed

+47119
-18456
lines changed

Some content is hidden

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

868 files changed

+47119
-18456
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,4 @@ junit.xml
6363

6464
# nx
6565
core/.nx
66+
.nx

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Are you having trouble with Aspect Model Editor? We want to help!
2323

2424
- Check the [developer documentation](https://eclipse-esmf.github.io)
2525
- Check the
26-
SAMM [specification](https://eclipse-esmf.github.io/samm-specification/2.1.0/index.html)
26+
SAMM [specification](https://eclipse-esmf.github.io/samm-specification/2.2.0/index.html)
2727
- Having issues with the Aspect Model Editor? Open
2828
a [GitHub issue](https://github.com/eclipse-esmf/esmf-aspect-model-editor/issues).
2929

‎core/.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
.nx/cache
1+
.nx
2+
.angular

‎core/.prettierignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
/assembly
77
/.angular
88

9-
/.nx/cache
9+
/.nx/cache
10+
.angular

‎core/.prettierrc‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,14 @@
55
"tabWidth": 2,
66
"semi": true,
77
"bracketSpacing": false,
8-
"arrowParens": "avoid"
8+
"arrowParens": "avoid",
9+
"plugins": ["prettier-plugin-organize-attributes", "prettier-plugin-organize-imports"],
10+
"overrides": [
11+
{
12+
"files": ["*.yml", ".yaml"],
13+
"options": {
14+
"singleQuote": false
15+
}
16+
}
17+
]
918
}

‎core/apps/ame-e2e/src/fixtures/abstract-entity.txt‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#>.
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#>.
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#>.
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#>.
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.2.0#>.
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.2.0#>.
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.2.0#>.
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.2.0#>.
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
@@ -34,10 +34,18 @@
3434
samm:extends :AbstractEntity1.
3535

3636
:property2 a samm:Property;
37-
samm:extends :abstractProperty2.
37+
samm:extends :abstractProperty2;
38+
samm:characteristic :Characteristic2.
39+
40+
:Characteristic2 a samm:Characteristic;
41+
samm:dataType xsd:string.
3842

3943
:property3 a samm:Property;
40-
samm:extends :abstractProperty1.
44+
samm:extends :abstractProperty1;
45+
samm:characteristic :Characteristic3.
46+
47+
:Characteristic3 a samm:Characteristic;
48+
samm:dataType xsd:string.
4149

4250
:AbstractEntity1 a samm:AbstractEntity;
4351
samm:preferredName "Preferred Name 1"@en;

‎core/apps/ame-e2e/src/fixtures/abstract-property.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#> .
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#> .
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#> .
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.2.0#> .
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.2.0#> .
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.2.0#> .
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.2.0#> .
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
1919
@prefix : <urn:samm:org.eclipse:1.0.0#> .
2020

21-
:AspectWithAbstractProperties a samm:Aspect ;
21+
:AspectWithAbstractProperties a samm:Entity ;
2222
samm:properties ( [ samm:extends :abstractProperty1; samm:characteristic :Characteristic1] [samm:extends :abstractProperty2; samm:characteristic :Characteristic1]) ;
2323
samm:operations ( ) .
2424

‎core/apps/ame-e2e/src/fixtures/all-characteristic.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#> .
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#> .
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#> .
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.2.0#> .
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.2.0#> .
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.2.0#> .
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.2.0#> .
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

‎core/apps/ame-e2e/src/fixtures/anonymous-elements.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#
1010
# SPDX-License-Identifier: MPL-2.0
1111

12-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.1.0#> .
13-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.1.0#> .
14-
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.1.0#> .
15-
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.1.0#> .
12+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.2.0#> .
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.2.0#> .
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.2.0#> .
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.2.0#> .
1616
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
1717
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

‎core/apps/ame-e2e/src/fixtures/change-namespace/aspect-workspace-one.ttl‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright (c) 2024 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.2.0#> .
13+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.2.0#> .
14+
@prefix samm-e: <urn:samm:org.eclipse.esmf.samm:entity:2.2.0#> .
15+
@prefix unit: <urn:samm:org.eclipse.esmf.samm:unit:2.2.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.examples.one:1.0.0#> .
20+
21+
:AspectDefault a samm:Aspect ;
22+
samm:properties (:property1) ;
23+
samm:operations ();
24+
samm:events () .
25+
26+
:property1 a samm:Property;
27+
samm:characteristic :Characteristic1 .
28+
29+
:Characteristic1 a samm:Characteristic ;
30+
samm:dataType xsd:string .

0 commit comments

Comments
 (0)