diff --git a/aasportal.mdx b/aasportal.mdx index 6ffa30a9..dbaa7934 100644 --- a/aasportal.mdx +++ b/aasportal.mdx @@ -536,6 +536,8 @@ + + @@ -1506,6 +1508,9 @@ + + + @@ -2733,7 +2738,7 @@ {"border-color": "91,155,213,255","fill-color": "151,188,228,255","font-color": "0,0,0,255","gradient": false,"shadow": false} - {"bounds": "291,66,166,80","model": "YU49xadxiUm+XA2jmjG0IA","name": "PC, Tablet, Phone","render": [{"bounds": "291,66,166,80","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "336,95,71,13","text": "<<browser>>","type": "Text"},{"bounds": "323,108,97,13","fontStyle": "2","text": "PC, Tablet, Phone","type": "Text"}],"type": "UMLNodeView"} + {"bounds": "291,66,166,80","model": "YU49xadxiUm+XA2jmjG0IA","name": "PC, Tablet, Phone","render": [{"bounds": "291,66,166,80","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "330,92,83,16","text": "<<browser>>","type": "Text"},{"bounds": "316,108,112,16","fontStyle": "2","text": "PC, Tablet, Phone","type": "Text"}],"type": "UMLNodeView"} 291,66,166,80 @@ -2743,7 +2748,7 @@ {"fill-color": "255,255,255,255"} - {"bounds": "291,227,166,80","model": "99kwFUgB7EqpO13lxMSpzg","name": "aas-web-app","render": [{"bounds": "291,227,166,80","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "339,256,66,13","text": "<<service>>","type": "Text"},{"bounds": "335,269,74,13","fontStyle": "2","text": "aas-web-app","type": "Text"}],"type": "UMLNodeView"} + {"bounds": "291,227,166,80","model": "99kwFUgB7EqpO13lxMSpzg","name": "aas-web-app","render": [{"bounds": "291,227,166,80","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "334,253,76,16","text": "<<service>>","type": "Text"},{"bounds": "329,269,86,16","fontStyle": "2","text": "aas-web-app","type": "Text"}],"type": "UMLNodeView"} 291,227,166,80 @@ -2879,7 +2884,7 @@ 5 - {"model": "M8ySx8TZlk6RyQIVYtyXCg","name": "","render": [{"lineWidth": "0","points": "373,145,373,227,","type": "Line"},{"bounds": "355,159,6,13","text": "*","type": "Text"},{"bounds": "358,198,6,13","text": "1","type": "Text"}],"type": "UMLAssociationView"} + {"model": "M8ySx8TZlk6RyQIVYtyXCg","name": "","render": [{"lineWidth": "0","points": "373,145,373,227,","type": "Line"},{"bounds": "354,157,8,16","text": "*","type": "Text"},{"bounds": "358,196,7,16","text": "1","type": "Text"}],"type": "UMLAssociationView"} 373,145,373,227, @@ -2921,7 +2926,7 @@ fromMultiView true - 355,159,6,13 + 354,157,8,16 16 20,15 * @@ -2945,7 +2950,7 @@ toMultiView true - 358,198,6,13 + 358,196,7,16 18 23,-12 1 @@ -3311,7 +3316,7 @@ {"fill-color": "255,255,255,255"} - {"bounds": "291,395,166,80","model": "qdayvcplfEapRY3chDyZvA","name": "aas-server-app","render": [{"bounds": "291,395,166,80","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "339,424,66,13","text": "<<service>>","type": "Text"},{"bounds": "328,437,88,13","fontStyle": "2","text": "aas-server-app","type": "Text"}],"type": "UMLNodeView"} + {"bounds": "291,395,166,80","model": "qdayvcplfEapRY3chDyZvA","name": "aas-server-app","render": [{"bounds": "291,395,166,80","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "334,421,76,16","text": "<<service>>","type": "Text"},{"bounds": "321,437,102,16","fontStyle": "2","text": "aas-server-app","type": "Text"}],"type": "UMLNodeView"} 291,395,166,80 @@ -3320,7 +3325,7 @@ 17 - {"bounds": "50,355,147,80","model": "cmOEgyeti02akOoZ1BETVg","name": "aas-server","render": [{"bounds": "50,355,147,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "90,381,68,13","text": "<<node.js>>","type": "Text"},{"bounds": "93,394,62,13","fontStyle": "2","text": "aas-server","type": "Text"}],"type": "UMLArtifactView"} + {"bounds": "50,355,147,80","model": "cmOEgyeti02akOoZ1BETVg","name": "aas-server","render": [{"bounds": "50,355,147,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "85,378,78,16","text": "<<node.js>>","type": "Text"},{"bounds": "88,394,72,16","fontStyle": "2","text": "aas-server","type": "Text"}],"type": "UMLArtifactView"} 50,355,147,80 @@ -3330,7 +3335,7 @@ {"border-color": "91,155,213,255","fill-color": "255,255,255,255","font-color": "0,0,0,255","gradient": false,"shadow": false} - {"bounds": "559,276,166,80","model": "DEyatjst4Euy6JghnVkkzw","name": "aasportal-users","render": [{"bounds": "559,276,166,80","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "607,305,66,13","text": "<<service>>","type": "Text"},{"bounds": "595,318,90,13","fontStyle": "2","text": "aasportal-users","type": "Text"}],"type": "UMLNodeView"} + {"bounds": "559,276,166,80","model": "DEyatjst4Euy6JghnVkkzw","name": "aasportal-users","render": [{"bounds": "559,276,166,80","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "602,302,76,16","text": "<<service>>","type": "Text"},{"bounds": "588,318,104,16","fontStyle": "2","text": "aasportal-users","type": "Text"}],"type": "UMLNodeView"} 559,276,166,80 @@ -3339,11 +3344,11 @@ 22 - {"bounds": "50,506,147,80","model": "nRhw4pRJ1kKmCyELXdav5w","name": "aas-scan-worker","render": [{"bounds": "50,506,147,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "90,532,68,13","text": "<<node.js>>","type": "Text"},{"bounds": "76,545,96,13","fontStyle": "2","text": "aas-scan-worker","type": "Text"}],"type": "UMLArtifactView"} + {"bounds": "50,506,147,80","model": "nRhw4pRJ1kKmCyELXdav5w","name": "aas-scan-worker","render": [{"bounds": "50,506,147,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "85,529,78,16","text": "<<node.js>>","type": "Text"},{"bounds": "68,545,111,16","fontStyle": "2","text": "aas-scan-worker","type": "Text"}],"type": "UMLArtifactView"} 50,506,147,80 - {"model": "VOaFYxEa+kq15XnfVi0Q4w","name": "","render": [{"lineWidth": "0","points": "123,506,123,434,","type": "Line"},{"bounds": "134,482,6,13","text": "*","type": "Text"},{"bounds": "135,448,6,13","text": "1","type": "Text"}],"type": "UMLAssociationView"} + {"model": "VOaFYxEa+kq15XnfVi0Q4w","name": "","render": [{"lineWidth": "0","points": "123,506,123,434,","type": "Line"},{"bounds": "133,480,8,16","text": "*","type": "Text"},{"bounds": "135,446,7,16","text": "1","type": "Text"}],"type": "UMLAssociationView"} 123,506,123,434, @@ -3385,7 +3390,7 @@ fromMultiView true - 134,482,6,13 + 133,480,8,16 16 18,14 * @@ -3409,7 +3414,7 @@ toMultiView true - 135,448,6,13 + 135,446,7,16 18 20,-15 1 @@ -3466,11 +3471,11 @@ 22 - {"bounds": "50,127,147,80","model": "SvIxLoASkki055TXQB2qlA","name": "NGINX","render": [{"bounds": "50,127,147,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "81,153,86,13","text": "<<http server>>","type": "Text"},{"bounds": "107,166,34,13","fontStyle": "2","text": "NGINX","type": "Text"}],"type": "UMLArtifactView"} + {"bounds": "50,127,147,80","model": "SvIxLoASkki055TXQB2qlA","name": "NGINX","render": [{"bounds": "50,127,147,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "75,150,98,16","text": "<<http server>>","type": "Text"},{"bounds": "105,166,38,16","fontStyle": "2","text": "NGINX","type": "Text"}],"type": "UMLArtifactView"} 50,127,147,80 - {"model": "dvgraY4s8EG1YRNFL4I92Q","name": "","render": [{"lineWidth": "0","points": "373,306,373,395,","type": "Line"},{"bounds": "355,320,6,13","text": "1","type": "Text"},{"bounds": "355,369,6,13","text": "1","type": "Text"}],"type": "UMLAssociationView"} + {"model": "dvgraY4s8EG1YRNFL4I92Q","name": "","render": [{"lineWidth": "0","points": "373,306,373,395,","type": "Line"},{"bounds": "355,318,7,16","text": "1","type": "Text"},{"bounds": "355,367,7,16","text": "1","type": "Text"}],"type": "UMLAssociationView"} 373,306,373,395, @@ -3512,7 +3517,7 @@ fromMultiView true - 355,320,6,13 + 355,318,7,16 16 20,15 1 @@ -3536,7 +3541,7 @@ toMultiView true - 355,369,6,13 + 355,367,7,16 18 20,-15 1 @@ -3588,7 +3593,7 @@ uml.onEditAttribute(view, model, text) - {"model": "jc0ng+UQr0uqOGFNWYls6Q","name": "","render": [{"lineWidth": "0","points": "456,397,559,351,","type": "Line"},{"bounds": "544,367,6,13","text": "1","type": "Text"}],"type": "UMLAssociationView"} + {"model": "jc0ng+UQr0uqOGFNWYls6Q","name": "","render": [{"lineWidth": "0","points": "456,397,559,351,","type": "Line"},{"bounds": "544,365,7,16","text": "1","type": "Text"}],"type": "UMLAssociationView"} 456,397,559,351, @@ -3654,7 +3659,7 @@ toMultiView true - 544,367,6,13 + 544,365,7,16 18 20,-15 1 @@ -3706,7 +3711,7 @@ uml.onEditAttribute(view, model, text) - {"model": "uXBYfjACfUiDMLEejN+nWw","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "196,513,291,471,","type": "Line"},{"bounds": "291,462,16,18","path": ":/images/dummy/arrow.svg","rotate": "661","type": "EdgeEnd"},{"bounds": "191,469,64,13","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} + {"model": "uXBYfjACfUiDMLEejN+nWw","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "196,513,291,471,","type": "Line"},{"bounds": "291,462,16,18","path": ":/images/dummy/arrow.svg","rotate": "661","type": "EdgeEnd"},{"bounds": "187,467,73,16","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} 196,513,291,471, @@ -3723,7 +3728,7 @@ true - 191,469,64,13 + 187,467,73,16 17 -12,-24 <<deploy>> @@ -3734,7 +3739,7 @@ uml.onEditStereotype(view, model, text) - {"model": "58ton5tBSUaDQ59frULkfw","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "196,406,291,421,","type": "Line"},{"bounds": "291,412,16,18","path": ":/images/dummy/arrow.svg","rotate": "-2610","type": "EdgeEnd"},{"bounds": "217,378,64,13","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} + {"model": "58ton5tBSUaDQ59frULkfw","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "196,406,291,421,","type": "Line"},{"bounds": "291,412,16,18","path": ":/images/dummy/arrow.svg","rotate": "-2610","type": "EdgeEnd"},{"bounds": "213,376,73,16","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} 196,406,291,421, @@ -3751,7 +3756,7 @@ true - 217,378,64,13 + 213,376,73,16 17 0,-30 <<deploy>> @@ -3766,11 +3771,11 @@ 23 - {"bounds": "849,276,140,80","model": "fUCEV8SyUkiKgOKj6d69ZA","name": "MongoDB","render": [{"bounds": "849,276,140,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "893,309,53,13","fontStyle": "2","text": "MongoDB","type": "Text"}],"type": "UMLArtifactView"} + {"bounds": "849,276,140,80","model": "fUCEV8SyUkiKgOKj6d69ZA","name": "MongoDB","render": [{"bounds": "849,276,140,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "889,307,60,16","fontStyle": "2","text": "MongoDB","type": "Text"}],"type": "UMLArtifactView"} 849,276,140,80 - {"model": "msqagNoCsUmfXbUckUzT7Q","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "196,195,291,233,","type": "Line"},{"bounds": "291,224,16,18","path": ":/images/dummy/arrow.svg","rotate": "-2481","type": "EdgeEnd"},{"bounds": "219,190,64,13","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} + {"model": "msqagNoCsUmfXbUckUzT7Q","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "196,195,291,233,","type": "Line"},{"bounds": "291,224,16,18","path": ":/images/dummy/arrow.svg","rotate": "-2481","type": "EdgeEnd"},{"bounds": "215,188,73,16","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} 196,195,291,233, @@ -3787,7 +3792,7 @@ true - 219,190,64,13 + 215,188,73,16 17 0,-19 <<deploy>> @@ -3803,7 +3808,7 @@ 23 - {"bounds": "50,246,138,80","model": "P6w27jhd6EePFn9YYQjiIA","name": "aas-portal","render": [{"bounds": "50,246,138,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "73,272,92,13","text": "<<browser app>>","type": "Text"},{"bounds": "90,285,59,13","fontStyle": "2","text": "aas-portal","type": "Text"}],"type": "UMLArtifactView"} + {"bounds": "50,246,138,80","model": "P6w27jhd6EePFn9YYQjiIA","name": "aas-portal","render": [{"bounds": "50,246,138,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "65,269,108,16","text": "<<browser app>>","type": "Text"},{"bounds": "85,285,68,16","fontStyle": "2","text": "aas-portal","type": "Text"}],"type": "UMLArtifactView"} 50,246,138,80 @@ -4722,7 +4727,7 @@ {"border-color": "165,165,165,255","fill-color": "255,255,255,255","font-color": "0,0,0,255","gradient": false,"shadow": false} - {"bounds": "559,395,166,80","model": "iBChC93lJkilnUz46XxJ+Q","name": "aasportal-index","render": [{"bounds": "559,395,166,80","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "607,424,66,13","text": "<<service>>","type": "Text"},{"bounds": "595,437,90,13","fontStyle": "2","text": "aasportal-index","type": "Text"}],"type": "UMLNodeView"} + {"bounds": "559,395,166,80","model": "iBChC93lJkilnUz46XxJ+Q","name": "aasportal-index","render": [{"bounds": "559,395,166,80","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "602,421,76,16","text": "<<service>>","type": "Text"},{"bounds": "589,437,102,16","fontStyle": "2","text": "aasportal-index","type": "Text"}],"type": "UMLNodeView"} 559,395,166,80 @@ -4732,11 +4737,11 @@ {"fill-color": "255,255,255,255"} - {"bounds": "559,517,166,80","model": "9R9lfABHQku4VaZOVMJrmw","name": "aasportal-cloud","render": [{"bounds": "559,517,166,80","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "607,546,66,13","text": "<<service>>","type": "Text"},{"bounds": "595,559,89,13","fontStyle": "2","text": "aasportal-cloud","type": "Text"}],"type": "UMLNodeView"} + {"bounds": "559,517,166,80","model": "9R9lfABHQku4VaZOVMJrmw","name": "aasportal-cloud","render": [{"bounds": "559,517,166,80","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "602,543,76,16","text": "<<service>>","type": "Text"},{"bounds": "589,559,102,16","fontStyle": "2","text": "aasportal-cloud","type": "Text"}],"type": "UMLNodeView"} 559,517,166,80 - {"model": "jtrRI8DnzEOJH0Ws9TRJSg","name": "","render": [{"lineWidth": "0","points": "559,434,456,434,","type": "Line"},{"bounds": "536,413,6,13","text": "1","type": "Text"}],"type": "UMLAssociationView"} + {"model": "jtrRI8DnzEOJH0Ws9TRJSg","name": "","render": [{"lineWidth": "0","points": "559,434,456,434,","type": "Line"},{"bounds": "536,411,7,16","text": "1","type": "Text"}],"type": "UMLAssociationView"} 559,434,456,434, @@ -4778,7 +4783,7 @@ fromMultiView true - 536,413,6,13 + 536,411,7,16 16 20,15 1 @@ -4854,7 +4859,7 @@ uml.onEditAttribute(view, model, text) - {"model": "x0WSXqCmsU2F06qK3KNU3Q","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "849,315,724,315,","type": "Line"},{"bounds": "724,306,16,18","path": ":/images/dummy/arrow.svg","rotate": "-900","type": "EdgeEnd"},{"bounds": "763,330,64,13","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} + {"model": "x0WSXqCmsU2F06qK3KNU3Q","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "849,315,724,315,","type": "Line"},{"bounds": "724,306,16,18","path": ":/images/dummy/arrow.svg","rotate": "-900","type": "EdgeEnd"},{"bounds": "759,328,73,16","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} 849,315,724,315, @@ -4871,7 +4876,7 @@ true - 763,330,64,13 + 759,328,73,16 17 -8,-21 <<deploy>> @@ -4882,7 +4887,7 @@ uml.onEditStereotype(view, model, text) - {"model": "NEqycTCW9k2q/kvexvnVpQ","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "187,280,291,272,","type": "Line"},{"bounds": "291,263,16,18","path": ":/images/dummy/arrow.svg","rotate": "856","type": "EdgeEnd"},{"bounds": "205,240,64,13","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} + {"model": "NEqycTCW9k2q/kvexvnVpQ","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "187,280,291,272,","type": "Line"},{"bounds": "291,263,16,18","path": ":/images/dummy/arrow.svg","rotate": "856","type": "EdgeEnd"},{"bounds": "201,238,73,16","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} 187,280,291,272, @@ -4899,7 +4904,7 @@ true - 205,240,64,13 + 201,238,73,16 17 0,-30 <<deploy>> @@ -4914,7 +4919,7 @@ 20 - {"bounds": "849,395,140,80","model": "bsotc6VFTEKlYpU4uCYZvQ","name": "MySQL","render": [{"bounds": "849,395,140,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "900,428,38,13","fontStyle": "2","text": "MySQL","type": "Text"}],"type": "UMLArtifactView"} + {"bounds": "849,395,140,80","model": "bsotc6VFTEKlYpU4uCYZvQ","name": "MySQL","render": [{"bounds": "849,395,140,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "898,426,43,16","fontStyle": "2","text": "MySQL","type": "Text"}],"type": "UMLArtifactView"} 849,395,140,80 @@ -4924,11 +4929,11 @@ {"border-color": "237,125,49,255","fill-color": "247,170,137,255","font-color": "0,0,0,255","gradient": false,"shadow": false} - {"bounds": "309,546,130,75","model": "OjJ8jzkOjkG3ITn0NLKE6A","name": "AAS Source","render": [{"bounds": "309,546,130,75","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "339,579,66,13","fontStyle": "3","text": "AAS Source","type": "Text"}],"type": "UMLNodeView"} + {"bounds": "309,546,130,75","model": "OjJ8jzkOjkG3ITn0NLKE6A","name": "AAS Source","render": [{"bounds": "309,546,130,75","path": "shapes/node.png","preserveRatio": "true","sliceMargin": "28,22,29,22","type": "Image"},{"bounds": "333,577,78,16","fontStyle": "3","text": "AAS Source","type": "Text"}],"type": "UMLNodeView"} 309,546,130,75 - {"model": "DlrFj8B2xUyZ1dGbwM9vQQ","name": "","render": [{"lineWidth": "0","points": "373,546,373,474,","type": "Line"},{"bounds": "358,527,6,13","text": "*","type": "Text"}],"type": "UMLAssociationView"} + {"model": "DlrFj8B2xUyZ1dGbwM9vQQ","name": "","render": [{"lineWidth": "0","points": "373,546,373,474,","type": "Line"},{"bounds": "357,525,8,16","text": "*","type": "Text"}],"type": "UMLAssociationView"} 373,546,373,474, @@ -4970,7 +4975,7 @@ fromMultiView true - 358,527,6,13 + 357,525,8,16 16 13,-12 * @@ -5050,11 +5055,11 @@ 22 - {"bounds": "849,517,140,80","model": "PDNvFWD7ckK6KJluMdDsfg","name": "ownCloud","render": [{"bounds": "849,517,140,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "892,550,54,13","fontStyle": "2","text": "ownCloud","type": "Text"}],"type": "UMLArtifactView"} + {"bounds": "849,517,140,80","model": "PDNvFWD7ckK6KJluMdDsfg","name": "ownCloud","render": [{"bounds": "849,517,140,80","path": "shapes/artifact.png","preserveRatio": "true","sliceMargin": "5,22,19,22","type": "Image"},{"bounds": "888,548,62,16","fontStyle": "2","text": "ownCloud","type": "Text"}],"type": "UMLArtifactView"} 849,517,140,80 - {"model": "lZsEF3tSCEKLFINc8GzbaQ","name": "","render": [{"lineWidth": "0","points": "559,519,456,472,","type": "Line"},{"bounds": "544,491,6,13","text": "1","type": "Text"}],"type": "UMLAssociationView"} + {"model": "lZsEF3tSCEKLFINc8GzbaQ","name": "","render": [{"lineWidth": "0","points": "559,519,456,472,","type": "Line"},{"bounds": "544,489,7,16","text": "1","type": "Text"}],"type": "UMLAssociationView"} 559,519,456,472, @@ -5096,7 +5101,7 @@ fromMultiView true - 544,491,6,13 + 544,489,7,16 16 20,15 1 @@ -5172,7 +5177,7 @@ uml.onEditAttribute(view, model, text) - {"model": "lCogz1zvtk6ntkQJ+PdDgg","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "849,434,724,434,","type": "Line"},{"bounds": "724,425,16,18","path": ":/images/dummy/arrow.svg","rotate": "-900","type": "EdgeEnd"},{"bounds": "758,450,64,13","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} + {"model": "lCogz1zvtk6ntkQJ+PdDgg","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "849,434,724,434,","type": "Line"},{"bounds": "724,425,16,18","path": ":/images/dummy/arrow.svg","rotate": "-900","type": "EdgeEnd"},{"bounds": "754,448,73,16","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} 849,434,724,434, @@ -5189,7 +5194,7 @@ true - 758,450,64,13 + 754,448,73,16 17 -3,-22 <<deploy>> @@ -5200,7 +5205,7 @@ uml.onEditStereotype(view, model, text) - {"model": "Laro1O/aJ06Rit+memdNKA","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "849,556,724,556,","type": "Line"},{"bounds": "724,547,16,18","path": ":/images/dummy/arrow.svg","rotate": "-900","type": "EdgeEnd"},{"bounds": "757,571,64,13","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} + {"model": "Laro1O/aJ06Rit+memdNKA","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "849,556,724,556,","type": "Line"},{"bounds": "724,547,16,18","path": ":/images/dummy/arrow.svg","rotate": "-900","type": "EdgeEnd"},{"bounds": "753,569,73,16","text": "<<deploy>>","type": "Text"}],"type": "UMLDependencyView"} 849,556,724,556, @@ -5217,7 +5222,7 @@ true - 757,571,64,13 + 753,569,73,16 17 -2,-21 <<deploy>> @@ -5236,12 +5241,12 @@ FAAAST Cloud (static .aasx files)]]> - {"bounds": "438,655,136,75","model": "tbO7QEXmeE2hsNe9+Sg56Q","name": "Comment1","render": [{"bounds": "438,655,136,75","path": "shapes/comment.png","preserveRatio": "true","sliceMargin": "1,14,13,1","type": "Image"},{"bounds": "443,660,116,52","multiline": "true","text": "AASX Server\nOPCUA Server\nFAAAST\nCloud (static .aasx files)","type": "Text"}],"type": "CommentView"} - 438,655,136,75 + {"bounds": "438,655,157,126","model": "tbO7QEXmeE2hsNe9+Sg56Q","name": "Comment1","render": [{"bounds": "438,655,157,126","path": "shapes/comment.png","preserveRatio": "true","sliceMargin": "1,14,13,1","type": "Image"},{"bounds": "443,660,137,64","multiline": "true","text": "AASX Server\r\nOPCUA Server\r\nFAAAST\r\nCloud (static .aasx files)","type": "Text"}],"type": "CommentView"} + 438,655,157,126 - {"model": "hpvaFPo6/kyNmtFvEwOXOQ","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "460,655,418,620,","type": "Line"}],"type": "AnnotationLinkView"} - 460,655,418,620, + {"model": "hpvaFPo6/kyNmtFvEwOXOQ","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "450,655,413,620,","type": "Line"}],"type": "AnnotationLinkView"} + 450,655,413,620, Comment2 @@ -5250,13 +5255,21 @@ Cloud (static .aasx files)]]> Static .aasx files]]> - {"bounds": "641,645,129,50","model": "nvq7J+QtYEWAUdAXIk4UEw","name": "Comment2","render": [{"bounds": "641,645,129,50","path": "shapes/comment.png","preserveRatio": "true","sliceMargin": "1,14,13,1","type": "Image"},{"bounds": "646,650,79,26","multiline": "true","text": "Templates\nStatic .aasx files","type": "Text"}],"type": "CommentView"} + {"bounds": "641,645,129,50","model": "nvq7J+QtYEWAUdAXIk4UEw","name": "Comment2","render": [{"bounds": "641,645,129,50","path": "shapes/comment.png","preserveRatio": "true","sliceMargin": "1,14,13,1","type": "Image"},{"bounds": "646,650,93,32","multiline": "true","text": "Templates\r\nStatic .aasx files","type": "Text"}],"type": "CommentView"} 641,645,129,50 {"model": "QLR5c0b2bEGrNcrGv5U2yw","name": "","render": [{"lineStyle": "2","lineWidth": "0","points": "691,645,663,596,","type": "Line"}],"type": "AnnotationLinkView"} 691,645,663,596, + + Comment3 + 21 + + + {"bounds": "81,656,80,50","model": "+Eu802agM0CImq3TCqYlxQ","name": "Comment3","render": [{"bounds": "81,656,80,50","path": "shapes/comment.png","preserveRatio": "true","sliceMargin": "1,14,13,1","type": "Image"}],"type": "CommentView"} + 81,656,80,50 + diff --git a/projects/common/src/test/convert.spec.ts b/projects/common/src/test/convert.spec.ts index 8e5b4a23..b088f0d2 100644 --- a/projects/common/src/test/convert.spec.ts +++ b/projects/common/src/test/convert.spec.ts @@ -6,7 +6,7 @@ * *****************************************************************************/ -import { describe, it, expect } from '@jest/globals' +import { describe, it, expect } from '@jest/globals'; import { LangString } from '../lib/aas.js'; import { changeType, @@ -22,7 +22,7 @@ import { parseNumber, toBoolean, mimeTypeToExtension, - extensionToMimeType + extensionToMimeType, } from '../lib/convert.js'; describe('Convert', function () { @@ -94,12 +94,14 @@ describe('Convert', function () { expect(convertToString(new Date('1/1/1970, 1:02:03 AM'), 'en-us')).toEqual('1/1/1970, 1:02:03 AM'); }); - it ('converts an array', function() { + it('converts an array', function () { expect(convertToString([1, 2])).toEqual('[1, 2]'); }); - it('converts an object', function() { - expect(convertToString({ text: 'Hello world!', number: 42 })).toEqual('{ text: Hello world!, number: 42 }'); + it('converts an object', function () { + expect(convertToString({ text: 'Hello world!', number: 42 })).toEqual( + JSON.stringify({ text: 'Hello world!', number: 42 }, undefined, 2), + ); }); }); @@ -207,20 +209,20 @@ describe('Convert', function () { localizable = [ { language: 'en-us', - text: 'Hello World!' + text: 'Hello World!', }, { language: 'de-de', - text: 'Hallo Deutschland!' + text: 'Hallo Deutschland!', }, { language: 'de-LU', - text: 'Hallo Luxembourg!' + text: 'Hallo Luxembourg!', }, { language: 'de', - text: 'Hallo Welt!' - } + text: 'Hallo Welt!', + }, ]; }); @@ -229,15 +231,15 @@ describe('Convert', function () { }); it('gets "Hallo Welt!" for de-de', function () { - expect(getLocaleValue(localizable, 'de-de')).toEqual('Hallo Deutschland!') + expect(getLocaleValue(localizable, 'de-de')).toEqual('Hallo Deutschland!'); }); it('gets "Hallo Welt!" for de', function () { - expect(getLocaleValue(localizable, 'de')).toEqual('Hallo Welt!') + expect(getLocaleValue(localizable, 'de')).toEqual('Hallo Welt!'); }); it('gets "Hallo Welt!" for de-ch', function () { - expect(getLocaleValue(localizable, 'de-lu')).toEqual('Hallo Luxembourg!') + expect(getLocaleValue(localizable, 'de-lu')).toEqual('Hallo Luxembourg!'); }); it('gets first entry for unknown language', function () { @@ -395,7 +397,7 @@ describe('Convert', function () { expect(toBoolean('false')).toBeFalsy(); }); }); - + describe('mimeTypeToExtension', function () { it('return ".png" for "image/png"', function () { expect(mimeTypeToExtension('image/png')).toEqual('.png'); @@ -415,4 +417,4 @@ describe('Convert', function () { expect(extensionToMimeType('unknown')).toBeUndefined(); }); }); -}); \ No newline at end of file +});