-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feat(listv2 as default) #74
Merged
Merged
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
51588ed
removed all v1 list files
GailMelanie edb9fb5
e2e list test adaption to new list
GailMelanie 20c6887
e2e list test adaption to new list
GailMelanie cc29f1a
filter out configuration aas
GailMelanie a812217
ts-ignore
GailMelanie 63fcbb0
Merge branch 'dev' of https://github.com/eclipse-mnestix/mnestix-brow…
GailMelanie 0598bfb
missing translation string
GailMelanie 1f93209
missing translation string
GailMelanie 44a345a
get artifacts back
GailMelanie 3d7770d
use the current branch image
GailMelanie 474f02e
pipeline should fail when e2e tests are failing
GailMelanie bddb9ac
pipeline should fail when e2e tests are failing
GailMelanie 4cd17c6
fix
GailMelanie File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
166 changes: 81 additions & 85 deletions
166
cypress/fixtures/cypress_e2e/AasListMockData/cyListAasMockData.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,86 @@ | ||
| [ | ||
| { | ||
| "modelType": "AssetAdministrationShell", | ||
| "assetInformation": { | ||
| "assetKind": "Instance", | ||
| "globalAssetId": "https://mnestix.io/listTest1", | ||
| "specificAssetIds": [ | ||
| { | ||
| "name": "assetIdShort", | ||
| "value": "testElement_1" | ||
| } | ||
| ] | ||
| }, | ||
| "id": "https://mnestix.io/aas/listTest1", | ||
| "idShort": "aas_cypressTest1", | ||
|
|
||
| "submodels": [ | ||
| { | ||
| "keys": [ | ||
| { | ||
| "type": "Submodel", | ||
| "value": "https://mnestix.io/sm/aHR0cHM6Ly9hYXMyLnVuaS1oLmRlL2Fhcy9sbmkwNzI6_TD" | ||
| } | ||
| ], | ||
| "type": "ModelReference" | ||
| } | ||
| ] | ||
| { | ||
| "modelType": "AssetAdministrationShell", | ||
| "assetInformation": { | ||
| "assetKind": "Instance", | ||
| "globalAssetId": "https://mnestix.io/listTest1", | ||
| "specificAssetIds": [ | ||
| { | ||
| "name": "assetIdShort", | ||
| "value": "testElement_1" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "modelType": "AssetAdministrationShell", | ||
| "assetInformation": { | ||
| "assetKind": "Instance", | ||
| "globalAssetId": "https://mnestix.io/listTest2", | ||
| "specificAssetIds": [ | ||
| { | ||
| "name": "assetIdShort", | ||
| "value": "testElement_2" | ||
| } | ||
| ] | ||
| }, | ||
| "id": "https://mnestix.io/aas/listTest2", | ||
| "idShort": "aas_cypressTest2", | ||
|
|
||
| "submodels": [ | ||
| { | ||
| "keys": [ | ||
| { | ||
| "type": "Submodel", | ||
| "value": "https://mnestix.io/sm/aHR0cHM6Ly9hYXMyLnVuaS1oLmRlL2Fhcy9sbmkwNzI4_TD" | ||
| } | ||
| ], | ||
| "type": "ModelReference" | ||
| } | ||
| ] | ||
| "id": "https://mnestix.io/aas/listTest1", | ||
| "idShort": "aas_cypressTest1", | ||
| "submodels": [ | ||
| { | ||
| "keys": [ | ||
| { | ||
| "type": "Submodel", | ||
| "value": "https://i40.xitaso.com/sm/nameplateListTest1" | ||
| } | ||
| ], | ||
| "type": "ModelReference" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "modelType": "AssetAdministrationShell", | ||
| "assetInformation": { | ||
| "assetKind": "Instance", | ||
| "globalAssetId": "https://mnestix.io/listTest2", | ||
| "specificAssetIds": [ | ||
| { | ||
| "name": "assetIdShort", | ||
| "value": "testElement_2" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "modelType": "AssetAdministrationShell", | ||
| "assetInformation": { | ||
| "assetKind": "Instance", | ||
| "globalAssetId": "https://mnestix.io/listTest3", | ||
| "specificAssetIds": [ | ||
| { | ||
| "name": "assetIdShort", | ||
| "value": "testElement_3" | ||
| } | ||
| ] | ||
| }, | ||
| "id": "https://mnestix.io/aas/listTest3", | ||
| "idShort": "aas_cypressTest3", | ||
|
|
||
| "submodels": [] | ||
| "id": "https://mnestix.io/aas/listTest2", | ||
| "idShort": "aas_cypressTest2", | ||
| "submodels": [ | ||
| { | ||
| "keys": [ | ||
| { | ||
| "type": "Submodel", | ||
| "value": "https://i40.xitaso.com/sm/nameplateListTest2" | ||
| } | ||
| ], | ||
| "type": "ModelReference" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "modelType": "AssetAdministrationShell", | ||
| "assetInformation": { | ||
| "assetKind": "Instance", | ||
| "globalAssetId": "https://mnestix.io/listTest3", | ||
| "specificAssetIds": [ | ||
| { | ||
| "name": "assetIdShort", | ||
| "value": "testElement_3" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "modelType": "AssetAdministrationShell", | ||
| "assetInformation": { | ||
| "assetKind": "Instance", | ||
| "globalAssetId": "https://mnestix.io/listTest4", | ||
| "specificAssetIds": [ | ||
| { | ||
| "name": "assetIdShort", | ||
| "value": "testElement_4" | ||
| } | ||
| ] | ||
| }, | ||
| "id": "https://mnestix.io/aas/listTest4", | ||
| "idShort": "aas_cypressTest4", | ||
|
|
||
| "submodels": [] | ||
| } | ||
| "id": "https://mnestix.io/aas/listTest3", | ||
| "idShort": "aas_cypressTest3", | ||
| "submodels": [] | ||
| }, | ||
| { | ||
| "modelType": "AssetAdministrationShell", | ||
| "assetInformation": { | ||
| "assetKind": "Instance", | ||
| "globalAssetId": "https://mnestix.io/listTest4", | ||
| "specificAssetIds": [ | ||
| { | ||
| "name": "assetIdShort", | ||
| "value": "testElement_4" | ||
| } | ||
| ] | ||
| }, | ||
| "id": "https://mnestix.io/aas/listTest4", | ||
| "idShort": "aas_cypressTest4", | ||
| "submodels": [] | ||
| } | ||
| ] |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will adapt this in the wiki - did those changes already last week and forgot