revert(d3): Revert to d3.v5 because breaking change in d3.v7 more sig…

…nificant thatn originally thought

okitweb/static/okit/js/okit_designer.js

@@ -345,6 +345,7 @@ function displaySaveAsDialog(title, callback, root_dir='templates/user', placeho
         .attr('type', 'text')
         .attr('placeholder', placeholder)
         .on('keydown', (event) => {
+            event = d3.event // Temp Work around for v0.67.0 release
             if (event.keyCode == 220) { // event replaces d3.event
                 event.preventDefault()
             } else if (event.keyCode == 32) {
@@ -392,6 +393,7 @@ function displaySaveAsDialog(title, callback, root_dir='templates/user', placeho
         .attr('readonly', true)
         .attr('placeholder', '<Directory Path>')
         .on('keydown', (event) => {
+            event = d3.event // Temp Work around for v0.67.0 release
             if (event.keyCode == 220) { // event replaces d3.event
                 event.preventDefault()
             } else if (event.keyCode == 32) {
@@ -768,6 +770,7 @@ function loadGlobalTags() {
             tr.append('div').attr('class', 'td delete-tag action-button-background delete').on('click', (event) => {
                 delete okitJsonModel.freeform_tags[key];
                 loadGlobalTags()
+                event = d3.event // Temp Work around for v0.67.0 release
                 event.stopPropagation() // event replaces d3.event
             })
         }
@@ -784,6 +787,7 @@ function loadGlobalTags() {
                     delete okitJsonModel.defined_tags[namespace][key];
                     if (Object.keys(okitJsonModel.defined_tags[namespace]).length === 0) {delete okitJsonModel.defined_tags[namespace];}
                     loadGlobalTags()
+                    event = d3.event // Temp Work around for v0.67.0 release
                     event.stopPropagation() // event replaces d3.event
                 })
             }

okitweb/static/okit/js/okit_designer_drag_drop.js

@@ -65,10 +65,12 @@ function dragFragmentStart(evt, artefact, title) {
 }
 
 function dragEnter(event) {
+    event = d3.event // Temp Work around for v0.67.0 release
     dragEnterOverLeave(event); // event replaces d3.event
 }
 
 function dragOver(event) {
+    event = d3.event // Temp Work around for v0.67.0 release
     if (event.preventDefault) { // event replaces d3.event
         event.preventDefault(); // Necessary. Allows us to drop.
     }
@@ -89,6 +91,7 @@ function dragEnterOverLeave(event) {
 }
 
 function dragDrop(event) {
+    event = d3.event // Temp Work around for v0.67.0 release
     if (event.stopPropagation) { // event replaces d3.event
         event.stopPropagation(); // Stops some browsers from redirecting.
     }
@@ -128,6 +131,7 @@ function dragEnd(event) {
  */
 
 function handleConnectorDrag(event) {
+    event = d3.event // Temp Work around for v0.67.0 release
     if (connectorStartElement) {
         let mousePos = getMousePosition(event); // event replaces d3.event
         d3.select("#Connector")
@@ -142,6 +146,7 @@ const right_click = 3;
 
 function handleConnectorDragStart(event) {
     console.info('Connector Drag Start');
+    event = d3.event // Temp Work around for v0.67.0 release
     if (event.which == left_click) { // event replaces d3.event
         let thisid = d3.select(this).attr('id');
         console.info('This Id : ' + thisid);
@@ -258,6 +263,7 @@ function handleContextMenu(event) {
     let okit_id = d3.select(this).attr('data-okit-id');
     let artefact = d3.select(this).attr('data-type');
     console.info('Right Click on ' + thisid);
+    event = d3.event // Temp Work around for v0.67.0 release
     event.preventDefault(); // event replaces d3.event
     event.stopPropagation();
     let element = document.getElementById("context-menu");

okitweb/static/okit/js/okit_designer_properties.js

@@ -196,6 +196,7 @@ function loadTags(json_element) {
             tr.append('div').attr('class', 'td delete-tag action-button-background delete').on('click', (event) => {
                 delete json_element.freeform_tags[key];
                 loadTags(json_element)
+                event = d3.event // Temp Work around for v0.67.0 release
                 event.stopPropagation() // event replaces d3.event
             })
         }
@@ -212,6 +213,7 @@ function loadTags(json_element) {
                     delete json_element.defined_tags[namespace][key];
                     if (Object.keys(json_element.defined_tags[namespace]).length === 0) {delete json_element.defined_tags[namespace];}
                     loadTags(json_element)
+                    event = d3.event // Temp Work around for v0.67.0 release
                     event.stopPropagation() // event replaces d3.event
                 })
             }

okitweb/static/okit/properties/js/okit_properties.js

@@ -267,6 +267,7 @@ class OkitResourceProperties {
             tr.append('div').attr('class', 'td delete-tag action-button-background delete').on('click', (event) => {
                 delete this.resource.freeform_tags[key];
                 self.loadFreeformTags()
+                event = d3.event // Temp Work around for v0.67.0 release
                 event.stopPropagation() // event replaces d3.event
             })
         }
@@ -285,6 +286,7 @@ class OkitResourceProperties {
                     delete this.resource.defined_tags[namespace][key];
                     if (Object.keys(this.resource.defined_tags[namespace]).length === 0) {delete this.resource.defined_tags[namespace];}
                     self.loadDefinedTags()
+                    event = d3.event // Temp Work around for v0.67.0 release
                     event.stopPropagation() // event replaces d3.event
                 })
             }

okitweb/static/okit/view/js/okit_view.js

@@ -707,12 +707,14 @@ class OkitArtefactView {
     addClickEvent(svg) {
         const self = this;
         svg.on("click", function(event) {
+            event = d3.event // Temp Work around for v0.67.0 release
             event.preventDefault(); // event replaces d3.event
             event.stopPropagation();
             self.loadSlidePanels();
             $(jqId("context-menu")).addClass("hidden");
         });
         svg.on("dblclick", (event) => {
+            event = d3.event // Temp Work around for v0.67.0 release
             event.preventDefault(); // event replaces d3.event
             event.stopPropagation();
             // self.loadSlidePanels();
@@ -729,13 +731,15 @@ class OkitArtefactView {
         const self = this;
         const display_mouseover_links = okitSettings.show_connections_on_mouseover && !okitSettings.show_all_connections && !this.resource.show_connections
         svg.on('mouseenter', (event) => {
+            event = d3.event // Temp Work around for v0.67.0 release
             event.stopPropagation(); // event replaces d3.event
             event.preventDefault();
             if (okitSettings.highlight_association) {self.addAssociationHighlighting();}
             if (display_mouseover_links) {this.getLinks().forEach((id) => this.drawConnection(this.id, id))}
             $(jqId(self.id)).addClass('highlight-rect');
         })
         svg.on('mouseleave', (event) => {
+            event = d3.event // Temp Work around for v0.67.0 release
             event.stopPropagation(); // event replaces d3.event
             event.preventDefault();
             if (okitSettings.highlight_association) {self.removeAssociationHighlighting();}
@@ -771,6 +775,7 @@ class OkitArtefactView {
     addContextMenu(svg) {
         const self = this;
         svg.on("contextmenu", function (event) {
+            event = d3.event // Temp Work around for v0.67.0 release
             event.preventDefault(); // event replaces d3.event
             event.stopPropagation();
             const canvas_position = $(jqId("canvas-div")).offset();

okitweb/static/okit/views/compartment/js/okit_compartment_view.js

@@ -119,7 +119,10 @@ class OkitCompartmentJsonView extends OkitJsonView {
         canvas_div.selectAll('*').remove();
         // Zoom & Pan SVG
         // Zoom function associated with Canvas SVG but acts on the first <g> tag
-        const zoom = d3.zoom().scaleExtent([0.1, 3]).on("zoom", (event) => transform_group.attr("transform", event.transform)); // event replaces d3.event
+        const zoom = d3.zoom().scaleExtent([0.1, 3]).on("zoom", (event) => {
+            event = d3.event // Temp Work around for v0.67.0 release
+            transform_group.attr("transform", event.transform)
+        }); // event replaces d3.event
         const canvas_root_svg = canvas_div.append("svg")
         .attr("id", 'canvas_root_svg')
         .attr("width", "100%")

okitweb/static/okit/views/identity/js/okit_identity_view.js

@@ -36,6 +36,7 @@ class OkitIdentityView extends OkitJsonView {
         const user_div = parent.append('div').attr('class', 'oci-user okit-user')
             .attr('title', `${user.display_name}`)
             .on('click', (event) => {
+                event = d3.event // Temp Work around for v0.67.0 release
                 event.stopPropagation();  // event replaces d3.event
                 $(jqId(PROPERTIES_PANEL)).load("propertysheets/user.html", () => {loadPropertiesSheet(user);})
             });
@@ -53,6 +54,7 @@ class OkitIdentityView extends OkitJsonView {
             .on('click', () => {group ? self.deleteUserFromGroup(user, group) : self.deleteUser(user.id)})
         if (!group) {
             user_div.attr('draggable', 'true').on('dragstart', (event) => {
+                event = d3.event // Temp Work around for v0.67.0 release
                 event.dataTransfer.setData('text/plain', user.id) // event replaces d3.event
             })
         }
@@ -101,6 +103,7 @@ class OkitIdentityView extends OkitJsonView {
             .on('click', () => {self.deleteUserGroup(group.id)})
         group_div.on('dragover', (event) => {event.preventDefault()})
             .on('drop', (event) => { // event replaces d3.event
+                event = d3.event // Temp Work around for v0.67.0 release
                 const user_id = event.dataTransfer.getData('text/plain') // event replaces d3.event
                 if (!group.user_ids.includes(user_id)) group.user_ids.push(user_id)
                 self.draw()

okitweb/static/okit/views/relationship/js/okit_relationship_view.js

@@ -68,9 +68,10 @@ class OkitRelationshipJsonView extends OkitJsonView {
                 const resource_div = this.selection_div.append('div')
                 const cb = resource_div.append('input').attr('type', 'checkbox')
                     .attr('id', `${k}_relationship_cb`)
-                cb.on('input', (event, d) => { // event replaces d3.event
-                    const n = cb.nodes()
-                    const i = 0 // n.indexOf(this)
+                // cb.on('input', (event, d) => { // event replaces d3.event
+                cb.on('input', (d, i, n) => { // event replaces d3.event
+                    // const n = cb.nodes()
+                    // const i = 0 // n.indexOf(event.currentTarget)
                     console.debug('Draw Resource Selection (d)', d)
                     console.debug('Draw Resource Selection (n)', n)
                     console.debug('Draw Resource Selection (i)', i)
@@ -101,7 +102,10 @@ class OkitRelationshipJsonView extends OkitJsonView {
             .attr("id", 'relationship-svg')
             .attr("width", '100%')
             .attr("height", "100%")
-            .call(d3.zoom().scaleExtent([0.1, 3]).on("zoom", function (event) {d3.select("#relationship-svg g").attr("transform", event.transform)})) // event replaces d3.event
+            .call(d3.zoom().scaleExtent([0.1, 3]).on("zoom", function (event) {
+                event = d3.event // Temp Work around for v0.67.0 release
+                d3.select("#relationship-svg g").attr("transform", event.transform)
+            })) // event replaces d3.event
             .append("g")
             // .attr('transform', function(d) {return 'translate(' + [width / 2, height / 2] + ')'});
 
@@ -167,18 +171,24 @@ class OkitRelationshipJsonView extends OkitJsonView {
           .attr("transform", function(d) {return "translate(" + d.x + "," + d.y + ")";});
     }
 
-    dragstarted(event, d) {
+    // dragstarted(event, d) {
+    dragstarted(d) {
+        let event = d3.event // Temp Work around for v0.67.0 release
         if (!event.active) relationship_simulation.alphaTarget(0.3).restart(); // event replaces d3.event
         d.fx = d.x;
         d.fy = d.y;
     }
 
-    dragged(event, d) {
+    // dragged(event, d) {
+    dragged(d) {
+        let event = d3.event // Temp Work around for v0.67.0 release
         d.fx = event.x; // event replaces d3.event
         d.fy = event.y;
     }
 
-    dragended(event, d) {
+    // dragended(event, d) {
+    dragended(d) {
+        let event = d3.event // Temp Work around for v0.67.0 release
         if (!event.active) relationship_simulation.alphaTarget(0); // event replaces d3.event
         d.fx = null;
         d.fy = null;

okitweb/static/okit/views/tabular/js/okit_tabular_view.js

@@ -311,6 +311,7 @@ class OkitTabularJsonView extends OkitJsonView {
     addContextMenu(tr, resource_type, resource) {
         const self = this;
         tr.on("contextmenu", function (event) {
+            event = d3.event // Temp Work around for v0.67.0 release
             event.preventDefault(); // event replaces d3.event
             event.stopPropagation();
             const canvas_position = $(jqId("canvas-div")).offset();

okitweb/templates/okit/okit_console.html

@@ -7,7 +7,7 @@
 <head>
     <meta charset="UTF-8">
     <title>OKIT - {{ target | upper }} By Design</title>
-    <script type="text/javascript" src="{{ url_for('static', filename='js/d3.v7.js') }}"></script>
+    <script type="text/javascript" src="{{ url_for('static', filename='js/d3.v5.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/jquery-3.7.1.js') }}"></script>
     <script type="text/javascript">const developer_mode = {{ developer_mode | lower }};</script>
     <script type="text/javascript">const a2c_mode = {{ a2c_mode | lower }};</script>