Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/jgraph/drawio into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@actions-user
actions-user committed Nov 9, 2023
2 parents 92d9b83 + 0031495 commit 62378f1
Show file tree
Hide file tree
Showing 22 changed files with 4,527 additions and 910 deletions.
28 changes: 28 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
08-Nov-2023: 22.1.0

- [conf cloud] Added confluence-content parameter support [DFCC-64]
- Updates AWS icons to Q3 23 set [drawio-3945]

25-OCT-2023: 22.0.8

- [conf cloud] Excludes old editor from duplicate macros fix [DID-9751]

24-OCT-2023: 22.0.7

- [conf cloud] Fixed math in the viewer [DID-9794]

19-OCT-2023: 22.0.6

- [conf cloud] Fixes Gliffy import hanging when import API fails [DID-9752]
- [conf cloud] Adds support for importing short links with special characters [DID-9687]

18-OCT-2023: 22.0.5

- [conf cloud] Adds support for importing short links less than 6 characters [DID-9687]
- [conf cloud] Fixes direct editing in blogposts [DID-9702]
- [conf cloud] Fixes fullscreen (lightbox) view of diagrams in page templates [DID-9690]

06-OCT-2023: 22.0.4

- Adds Emoji shape support

05-OCT-2023: 22.0.3

- Fixes possible NPE in clonePages error handler
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.0.3
22.1.0
2 changes: 2 additions & 0 deletions src/main/java/com/mxgraph/online/EmbedServlet2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ public static void initLibraries(HashMap<String, String[]> libraries)
new String[] { SHAPES_PATH + "/pid2/mxPidValves.js" });
libraries.put("pidFlowSensors",
new String[] { STENCIL_PATH + "/pid/flow_sensors.xml" });
libraries.put("emoji",
new String[] { SHAPES_PATH + "/emoji/mxEmoji.js" });
}

/**
Expand Down
Binary file modified src/main/webapp/images/sidebar-aws4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
453 changes: 228 additions & 225 deletions src/main/webapp/js/app.min.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/main/webapp/js/diagramly/Editor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8015,6 +8015,7 @@
mxStencilRegistry.libraries['pid2valves'] = [SHAPES_PATH + '/pid2/mxPidValves.js'];
mxStencilRegistry.libraries['pidFlowSensors'] = [STENCIL_PATH + '/pid/flow_sensors.xml'];
mxStencilRegistry.libraries['salesforce'] = [SHAPES_PATH + '/mxSalesforce.js', STENCIL_PATH + '/salesforce.xml'];
mxStencilRegistry.libraries['emoji'] = [SHAPES_PATH + '/emoji/mxEmoji.js'];

// Triggers dynamic loading for markers
mxMarker.getPackageForType = function(type)
Expand Down
38 changes: 28 additions & 10 deletions src/main/webapp/js/diagramly/sidebar/Sidebar-AWS4.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,23 +266,23 @@
s * 130, s * 130, 'AWS Cloud', null, null, null, this.getTagsForStencil(gn, 'cloud', dt).join(' ')),
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_aws_cloud;strokeColor=#232F3E;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#232F3E;dashed=0;',
s * 130, s * 130, 'AWS Cloud', null, null, null, this.getTagsForStencil(gn, 'cloud', dt).join(' ')),
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_region;strokeColor=#147EBA;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#147EBA;dashed=1;',
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_region;strokeColor=#00A4A6;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#147EBA;dashed=1;',
s * 130, s * 130, 'Region', null, null, null, this.getTagsForStencil(gn, 'region', dt).join(' ')),
this.createVertexTemplateEntry('fillColor=none;strokeColor=#147EBA;dashed=1;verticalAlign=top;fontStyle=0;fontColor=#147EBA;whiteSpace=wrap;html=1;',
s * 130, s * 130, 'Availability Zone', null, null, null, this.getTagsForStencil(gn, 'availability zone', dt).join(' ')),
this.createVertexTemplateEntry('fillColor=none;strokeColor=#DD3522;verticalAlign=top;fontStyle=0;fontColor=#DD3522;whiteSpace=wrap;html=1;',
s * 130, s * 130, 'Security group', null, null, null, this.getTagsForStencil(gn, 'security', dt).join(' ')),
this.createVertexTemplateEntry(n4 + 'groupCenter;grIcon=' + gn + '.group_auto_scaling_group;grStroke=1;strokeColor=#D86613;fillColor=none;verticalAlign=top;align=center;fontColor=#D86613;dashed=1;spacingTop=25;',
s * 130, s * 130, 'Auto Scaling group', null, null, null, this.getTagsForStencil(gn, 'auto scaling', dt).join(' ')),
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_vpc;strokeColor=#248814;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#AAB7B8;dashed=0;',
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_vpc2;strokeColor=#8C4FFF;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#AAB7B8;dashed=0;',
s * 130, s * 130, 'VPC', null, null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud', dt).join(' ')),
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_security_group;grStroke=0;strokeColor=#147EBA;fillColor=#E6F2F8;verticalAlign=top;align=left;spacingLeft=30;fontColor=#147EBA;dashed=0;',
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_security_group;grStroke=0;strokeColor=#00A4A6;fillColor=#E6F6F7;verticalAlign=top;align=left;spacingLeft=30;fontColor=#147EBA;dashed=0;',
s * 130, s * 130, 'Private subnet', null, null, null, this.getTagsForStencil(gn, 'private subnet', dt).join(' ')),
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_security_group;grStroke=0;strokeColor=#248814;fillColor=#E9F3E6;verticalAlign=top;align=left;spacingLeft=30;fontColor=#248814;dashed=0;',
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_security_group;grStroke=0;strokeColor=#7AA116;fillColor=#F2F6E8;verticalAlign=top;align=left;spacingLeft=30;fontColor=#248814;dashed=0;',
s * 130, s * 130, 'Public subnet', null, null, null, this.getTagsForStencil(gn, 'public subnet', dt).join(' ')),
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_on_premise;strokeColor=#5A6C86;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#5A6C86;dashed=0;',
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_on_premise;strokeColor=#7D8998;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#5A6C86;dashed=0;',
s * 130, s * 130, 'Server contents', null, null, null, this.getTagsForStencil(gn, 'server contents', dt).join(' ')),
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_corporate_data_center;strokeColor=#5A6C86;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#5A6C86;dashed=0;',
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_corporate_data_center;strokeColor=#7D8998;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#5A6C86;dashed=0;',
s * 130, s * 130, 'Corporate data center', null, null, null, this.getTagsForStencil(gn, 'corporate data center', dt).join(' ')),
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_elastic_beanstalk;strokeColor=#D86613;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#D86613;dashed=0;',
s * 130, s * 130, 'Elastic Beanstalk container', null, null, null, this.getTagsForStencil(gn, 'elastic beanstalk container', dt).join(' ')),
Expand All @@ -294,9 +294,9 @@
s * 130, s * 130, 'AWS Step Functions workflow', null, null, null, this.getTagsForStencil(gn, 'step function', dt).join(' ')),
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_account;strokeColor=#CD2264;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#CD2264;dashed=0;',
s * 130, s * 130, 'AWS Account', null, null, null, this.getTagsForStencil(gn, 'account', dt).join(' ')),
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_iot_greengrass_deployment;strokeColor=#3F8624;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#3F8624;dashed=0;',
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_iot_greengrass_deployment;strokeColor=#7AA116;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#3F8624;dashed=0;',
s * 130, s * 130, 'AWS Iot\nGreengrass\nDeployment', null, null, null, this.getTagsForStencil(gn, 'iot internet of things greengrass deployment', dt).join(' ')),
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_iot_greengrass;strokeColor=#3F8624;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#3F8624;dashed=0;',
this.createVertexTemplateEntry(n4 + 'group;grIcon=' + gn + '.group_iot_greengrass;strokeColor=#7AA116;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#3F8624;dashed=0;',
s * 130, s * 130, 'AWS Iot\nGreengrass', null, null, null, this.getTagsForStencil(gn, 'iot internet of things greengrass', dt).join(' ')),
this.createVertexTemplateEntry('fillColor=none;strokeColor=#5A6C86;dashed=1;verticalAlign=top;fontStyle=0;fontColor=#5A6C86;whiteSpace=wrap;html=1;',
s * 130, s * 130, 'Generic group', null, null, null, this.getTagsForStencil(gn, 'generic', dt).join(' ')),
Expand Down Expand Up @@ -337,6 +337,8 @@
w2, w2, '', 'Kinesis Data Streams', null, null, this.getTagsForStencil(gn, 'kinesis data streams', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.kinesis_video_streams;',
w2, w2, '', 'Kinesis Video Streams', null, null, this.getTagsForStencil(gn, 'kinesis video streams', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.managed_service_for_apache_flink;',
w2, w2, '', 'Managed Service for Apache Flink', null, null, this.getTagsForStencil(gn, 'managed service for apache flink', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.quicksight;',
w2, w2, '', 'QuickSight', null, null, this.getTagsForStencil(gn, 'quicksight quick sight', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.clean_rooms;',
Expand All @@ -345,6 +347,8 @@
w2, w2, '', 'Redshift', null, null, this.getTagsForStencil(gn, 'redshift', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.data_pipeline;',
w2, w2, '', 'Data Pipeline', null, null, this.getTagsForStencil(gn, 'data pipeline', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.entity_resolution;',
w2, w2, '', 'Entity Resolution', null, null, this.getTagsForStencil(gn, 'entity resolution', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.managed_streaming_for_kafka;',
w2, w2, '', 'Managed Streaming for Kafka', null, null, this.getTagsForStencil(gn, 'managed streaming for kafka', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.glue;',
Expand Down Expand Up @@ -384,6 +388,8 @@
s * 78, s * 78, '', 'OpenSearch Service Observability', null, null, this.getTagsForStencil(gn, 'opensearch service observability', dt).join(' ')),
this.createVertexTemplateEntry(n + 'opensearch_dashboards;',
s * 78, s * 59, '', 'OpenSearch Service Dashboards', null, null, this.getTagsForStencil(gn, 'opensearch service dashboards', dt).join(' ')),
this.createVertexTemplateEntry(n + 'opensearch_ingestion;',
s * 78, s * 78, '', 'OpenSearch Service Ingestion', null, null, this.getTagsForStencil(gn, 'opensearch service ingestion', dt).join(' ')),
this.createVertexTemplateEntry(n + 'opensearch_service_traces;',
s * 78, s * 78, '', 'OpenSearch Service Traces', null, null, this.getTagsForStencil(gn, 'opensearch service traces', dt).join(' ')),
this.createVertexTemplateEntry(n + 'opensearch_service_ultrawarm_node;',
Expand Down Expand Up @@ -495,7 +501,7 @@
this.createVertexTemplateEntry(n + 'topic;',
s * 78, s * 67, '', 'Topic', null, null, this.getTagsForStencil(gn, 'topic', dt).join(' ')),
this.createVertexTemplateEntry(n + 'message;',
s * 76, s * 78, '', 'Message', null, null, this.getTagsForStencil(gn, 'message', dt).join(' ')),
s * 67, s * 78, '', 'Message', null, null, this.getTagsForStencil(gn, 'message', dt).join(' ')),
this.createVertexTemplateEntry(n + 'queue;',
s * 78, s * 47, '', 'Queue', null, null, this.getTagsForStencil(gn, 'queue', dt).join(' ')),
this.createVertexTemplateEntry(n + 'rule_3;',
Expand Down Expand Up @@ -598,6 +604,8 @@
w2, w2, '', 'WorkDocs SDKs', null, null, this.getTagsForStencil(gn, 'workdocs sdk software development kit', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.workmail;',
w2, w2, '', 'WorkMail', null, null, this.getTagsForStencil(gn, 'workmail', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.appfabric;',
w2, w2, '', 'AppFabric', null, null, this.getTagsForStencil(gn, 'appfabric', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.supply_chain;',
w2, w2, '', 'Supply Chain', null, null, this.getTagsForStencil(gn, 'supply chain', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.wickr;',
Expand Down Expand Up @@ -1482,6 +1490,8 @@
w2, w2, '', 'Machine Learning', null, null, this.getTagsForStencil(gn, 'machine learning', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.augmented_ai;',
w2, w2, '', 'Augmented AI', null, null, this.getTagsForStencil(gn, 'augmented ai', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.bedrock;',
w2, w2, '', 'Bedrock', null, null, this.getTagsForStencil(gn, 'bedrock', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.codeguru_2;',
w2, w2, '', 'CodeGuru', null, null, this.getTagsForStencil(gn, 'codeguru', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.codewhisperer;',
Expand Down Expand Up @@ -1520,6 +1530,8 @@
w2, w2, '', 'Monitron', null, null, this.getTagsForStencil(gn, 'monitron', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.omics;',
w2, w2, '', 'Omics', null, null, this.getTagsForStencil(gn, 'omics', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.healthscribe;',
w2, w2, '', 'HealthScribe', null, null, this.getTagsForStencil(gn, 'healthscribe', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.personalize;',
w2, w2, '', 'Personalize', null, null, this.getTagsForStencil(gn, 'personalize', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.polly;',
Expand All @@ -1546,6 +1558,8 @@
w2, w2, '', 'DeepLens', null, null, this.getTagsForStencil(gn, 'deeplens', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.deepracer;',
w2, w2, '', 'DeepRacer', null, null, this.getTagsForStencil(gn, 'deepracer', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.healthimaging;',
w2, w2, '', 'HealthImaging', null, null, this.getTagsForStencil(gn, 'healthimaging', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.tensorflow_on_aws;',
w2, w2, '', 'TensorFlow on AWS', null, null, this.getTagsForStencil(gn, 'tensorflow on aws', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.torchserve;',
Expand Down Expand Up @@ -1808,7 +1822,9 @@
w2, w2, '', 'Elemental Link', null, null, this.getTagsForStencil(gn, 'elemental link', dt).join(' ')),

this.createVertexTemplateEntry(n + 'cloud_digital_interface;',
s * 78, s * 78, '', 'Cloud Digital Interface', null, null, this.getTagsForStencil(gn, 'cloud digital interface', dt).join(' '))
s * 78, s * 78, '', 'Cloud Digital Interface', null, null, this.getTagsForStencil(gn, 'cloud digital interface', dt).join(' ')),
this.createVertexTemplateEntry(n + 'mediaconnect_gateway;',
s * 78, s * 78, '', 'MediaConnect Gateway', null, null, this.getTagsForStencil(gn, 'mediaconnect gateway', dt).join(' '))
]);
};

Expand Down Expand Up @@ -2154,6 +2170,8 @@
w2, w2, '', 'Key Management Service', null, null, this.getTagsForStencil(gn, 'key management service', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.network_firewall;',
w2, w2, '', 'Network Firewall', null, null, this.getTagsForStencil(gn, 'network firewall', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.payment_cryptography;',
w2, w2, '', 'Payment Cryptography', null, null, this.getTagsForStencil(gn, 'payment cryptography', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.private_certificate_authority;',
w2, w2, '', 'Private Certificate Authority', null, null, this.getTagsForStencil(gn, 'private certificate authority', dt).join(' ')),
this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.resource_access_manager;',
Expand Down
Loading

1 comment on commit 62378f1

@vercel
Copy link

@vercel vercel bot commented on 62378f1 Nov 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

drawio – ./

drawio.nines.center
drawio-git-dev-louyongjiu.vercel.app
drawio-louyongjiu.vercel.app

Please sign in to comment.