Merge pull request #423 from oracle/v0.24.4-patch

V0.24.4 patch
oracle · Jul 15, 2021 · f43de81 · f43de81
2 parents f897c38 + 0baba07
commit f43de81
Show file tree

Hide file tree

Showing 23 changed files with 107 additions and 111 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Release Notes
 
 
+## Version 0.24.4
+**Release Date**: 15th July 2021
+### Bug Fixes
+1. Resolve issue with dropping NAT Gateways on canvas
+2. Resolve issue with Dropping MySQL Database Systems on canvas
+3. Resolve issue with dropping IPSec Connection on canvas
+
+
 ## Version 0.24.3
 **Release Date**: 13th July 2021
 ### Bug Fixes

diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@
 FROM oraclelinux:7-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.24.3" \
+      "version"="0.24.4" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, 2021, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.24.3](CHANGELOG.md#version-0.24.3)
+# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.24.4](CHANGELOG.md#version-0.24.4)
 
 OCI designer and visualisation toolKIT (OKIT) is a browser based tool that allows the user to [design](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit), 
 [deploy](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit) and visualise ([introspect/query](https://www.ateam-oracle.com/the-oci-designer-toolkit-query-feature)) 

diff --git a/containers/docker/Dockerfile b/containers/docker/Dockerfile
@@ -5,7 +5,7 @@
 FROM oraclelinux:7-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.24.3" \
+      "version"="0.24.4" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, 2021, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]

diff --git a/okitweb/package.json b/okitweb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okitweb",
-  "version": "0.24.3",
+  "version": "0.24.4",
   "description": "OKIT Web application",
   "scripts": {},
   "author": "Oracle",

diff --git a/okitweb/static/okit/js/okit_console.js b/okitweb/static/okit/js/okit_console.js
@@ -4,8 +4,8 @@
 */
 console.info('Loaded Console Javascript');
 
-const okitVersion = '0.24.3';
-const okitReleaseDate = '13th July 2021';
+const okitVersion = '0.24.4';
+const okitReleaseDate = '15th July 2021';
 // Validation
 const validate_error_colour = "#ff4d4d";
 const validate_warning_colour = "#ffd633";

diff --git a/okitweb/static/okit/json/release.json b/okitweb/static/okit/json/release.json
@@ -1,4 +1,4 @@
 {
-  "release": "0.24.3",
-  "tag": "v0.24.3"
+  "release": "0.24.4",
+  "tag": "v0.24.4"
 }
diff --git a/okitweb/static/okit/model/js/artefacts/ipsec_connection.js b/okitweb/static/okit/model/js/artefacts/ipsec_connection.js
@@ -2,12 +2,12 @@
 ** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
-console.info('Loaded IPSecConnection Javascript');
+console.info('Loaded IpsecConnection Javascript');
 
 /*
 ** Define Block Storage Volume Class
  */
-class IPSecConnection extends OkitArtifact {
+class IpsecConnection extends OkitArtifact {
     /*
     ** Create
      */
@@ -31,7 +31,7 @@ class IPSecConnection extends OkitArtifact {
     ** Clone Functionality
      */
     clone() {
-        return new IPSecConnection(JSON.clone(this), this.getOkitJson());
+        return new IpsecConnection(JSON.clone(this), this.getOkitJson());
     }
 
 

diff --git a/okitweb/static/okit/model/js/artefacts/mysql_database_system.js b/okitweb/static/okit/model/js/artefacts/mysql_database_system.js
@@ -7,7 +7,7 @@ console.info('Loaded Database System Javascript');
 /*
 ** Define Autonomous Database Class
  */
-class MySQLDatabaseSystem extends OkitArtifact {
+class MysqlDatabaseSystem extends OkitArtifact {
     /*
     ** Create
      */
@@ -45,7 +45,7 @@ class MySQLDatabaseSystem extends OkitArtifact {
     ** Clone Functionality
      */
     clone() {
-        return new MySQLDatabaseSystem(JSON.clone(this), this.getOkitJson());
+        return new MysqlDatabaseSystem(JSON.clone(this), this.getOkitJson());
     }
 
 

diff --git a/okitweb/static/okit/model/js/artefacts/nat_gateway.js b/okitweb/static/okit/model/js/artefacts/nat_gateway.js
@@ -7,7 +7,7 @@ console.info('Loaded NAT Gateway Javascript');
 /*
 ** Define NAT Gateway Class
  */
-class NATGateway extends OkitArtifact {
+class NatGateway extends OkitArtifact {
     /*
     ** Create
      */
@@ -28,7 +28,7 @@ class NATGateway extends OkitArtifact {
     ** Clone Functionality
      */
     clone() {
-        return new NATGateway(JSON.clone(this), this.getOkitJson());
+        return new NatGateway(JSON.clone(this), this.getOkitJson());
     }
 
 

diff --git a/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js b/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js
@@ -159,7 +159,7 @@ class VirtualCloudNetwork extends OkitArtifact {
         // Internet Gateways
         gateways.push(...this.getInternetGateways());
         // NAT Gateways
-        gateways.push(...this.getNATGateways());
+        gateways.push(...this.getNatGateways());
         // Local Peering Gateways
         gateways.push(...this.getLocalPeeringGateways());
         // Service Gateways
@@ -180,7 +180,7 @@ class VirtualCloudNetwork extends OkitArtifact {
         return gateways;
     }
 
-    getNATGateways() {
+    getNatGateways() {
         let gateways = [];
         // NAT Gateways
         for (let gateway of this.getOkitJson().nat_gateways) {

diff --git a/okitweb/static/okit/model/js/okit_model.js b/okitweb/static/okit/model/js/okit_model.js
@@ -172,7 +172,7 @@ class OkitJson {
         // IPSec Connections
         if (okit_json.hasOwnProperty('ipsec_connections')) {
             for (let artefact of okit_json['ipsec_connections']) {
-                let obj = this.newIPSecConnection(artefact);
+                let obj = this.newIpsecConnection(artefact);
             }
         }
         // RemotePeering Connections
@@ -192,7 +192,7 @@ class OkitJson {
         // NAT Gateway
         if (okit_json.hasOwnProperty('nat_gateways')) {
             for (let artefact of okit_json['nat_gateways']) {
-                let obj = this.newNATGateway(artefact);
+                let obj = this.newNatGateway(artefact);
             }
         }
         // Route Tables
@@ -254,7 +254,7 @@ class OkitJson {
         // MySQL Database Systems
         if (okit_json.hasOwnProperty('mysql_database_systems')) {
             for (let artefact of okit_json['mysql_database_systems']) {
-                let obj = this.newMySQLDatabaseSystem(artefact);
+                let obj = this.newMysqlDatabaseSystem(artefact);
             }
         }
         // Instances
@@ -630,24 +630,21 @@ class OkitJson {
     }
 
     // IPSec Connection
-    newIpsecConnection(data) {return this.newIPSecConnection(data)}
-    newIPSecConnection(data) {
+    newIpsecConnection(data) {
         console.info('New IPSec Connection');
-        this.ipsec_connections.push(new IPSecConnection(data, this));
+        this.ipsec_connections.push(new IpsecConnection(data, this));
         return this.ipsec_connections[this.ipsec_connections.length - 1];
     }
     getIpsecConnections() {return this.ipsec_connections;}
-    getIpsecConnection(id='') {return this.getIPSecConnection(id)}
-    getIPSecConnections() {return this.ipsec_connections;}
-    getIPSecConnection(id='') {
-        for (let artefact of this.getIPSecConnections()) {
+    getIpsecConnection(id='') {
+        for (let artefact of this.getIpsecConnections()) {
             if (artefact.id === id) {
                 return artefact;
             }
         }
         return undefined;
     }
-    deleteIPSecConnection(id) {
+    deleteIpsecConnection(id) {
         for (let i = 0; i < this.ipsec_connections.length; i++) {
             if (this.ipsec_connections[i].id === id) {
                 this.ipsec_connections[i].delete();
@@ -712,24 +709,21 @@ class OkitJson {
     }
 
     // MySQL Database System
-    newMysqlDatabaseSystem(data) {return this.newMySQLDatabaseSystem(data)}
-    newMySQLDatabaseSystem(data) {
+    newMysqlDatabaseSystem(data) {
         console.info('New MySQL Database System');
-        this.mysql_database_systems.push(new MySQLDatabaseSystem(data, this));
+        this.mysql_database_systems.push(new MysqlDatabaseSystem(data, this));
         return this.mysql_database_systems[this.mysql_database_systems.length - 1];
     }
     getMysqlDatabaseSystems() {return this.mysql_database_systems;}
-    getMysqlDatabaseSystem(id='') {return this.getMySQLDatabaseSystem(id)}
-    getMySQLDatabaseSystems() {return this.mysql_database_systems;}
-    getMySQLDatabaseSystem(id='') {
-        for (let artefact of this.getMySQLDatabaseSystems()) {
+    getMysqlDatabaseSystem(id='') {
+        for (let artefact of this.getMysqlDatabaseSystems()) {
             if (artefact.id === id) {
                 return artefact;
             }
         }
         return undefined;
     }
-    deleteMySQLDatabaseSystem(id) {
+    deleteMysqlDatabaseSystem(id) {
         for (let i = 0; i < this.mysql_database_systems.length; i++) {
             if (this.mysql_database_systems[i].id === id) {
                 this.mysql_database_systems[i].delete();
@@ -740,24 +734,21 @@ class OkitJson {
     }
 
     // NAT Gateway
-    newNatGateway(data) {return this.newNATGateway(data)}
-    newNATGateway(data) {
+    newNatGateway(data) {
         console.info('New NAT Gateway');
-        this.nat_gateways.push(new NATGateway(data, this));
+        this.nat_gateways.push(new NatGateway(data, this));
         return this.nat_gateways[this.nat_gateways.length - 1];
     }
     getNatGateways() {return this.nat_gateways;}
-    getNatGateway(id='') {return this.getNATGateway(id)}
-    getNATGateways() {return this.nat_gateways;}
-    getNATGateway(id='') {
-        for (let artefact of this.getNATGateways()) {
+    getNatGateway(id='') {
+        for (let artefact of this.getNatGateways()) {
             if (artefact.id === id) {
                 return artefact;
             }
         }
         return undefined;
     }
-    deleteNATGateway(id) {
+    deleteNatGateway(id) {
         for (let i = 0; i < this.nat_gateways.length; i++) {
             if (this.nat_gateways[i].id === id) {
                 this.nat_gateways[i].delete();

diff --git a/okitweb/static/okit/query/oci/js/okit_query.js b/okitweb/static/okit/query/oci/js/okit_query.js
@@ -238,10 +238,10 @@ class OkitOCIQuery {
         this.queryFastConnects(request);
         this.queryInstances(request);
         this.queryInstancePools(request);
-        this.queryIPSecConnections(request);
+        this.queryIpsecConnections(request);
         this.queryRemotePeeringConnections(request);
         this.queryDatabaseSystems(request);
-        this.queryMySQLDatabaseSystems(request);
+        this.queryMysqlDatabaseSystems(request);
         this.queryFileStorageSystems(request);
         this.queryOkeClusters(request);
     }
@@ -579,7 +579,7 @@ class OkitOCIQuery {
         });
     }
 
-    queryIPSecConnections(request) {
+    queryIpsecConnections(request) {
         console.info('------------- Autonomous IPSec Connection Query --------------------');
         console.info('------------- Compartment : ' + request.compartment_id);
         let me = this;
@@ -659,7 +659,7 @@ class OkitOCIQuery {
         });
     }
 
-    queryMySQLDatabaseSystems(request) {
+    queryMysqlDatabaseSystems(request) {
         console.info('------------- Autonomous Database Query --------------------');
         console.info('------------- Compartment : ' + request.compartment_id);
         let me = this;
@@ -685,7 +685,7 @@ class OkitOCIQuery {
         });
     }
 
-    queryNATGateways(request) {
+    queryNatGateways(request) {
         console.info('------------- NAT Gateway Query --------------------');
         console.info('------------- Compartment           : ' + request.compartment_id);
         console.info('------------- Virtual Cloud Network : ' + request.vcn_id);
@@ -965,7 +965,7 @@ class OkitOCIQuery {
     }
     queryVirtualCLoudNetworkSubComponents(request) {
         this.queryInternetGateways(request);
-        this.queryNATGateways(request);
+        this.queryNatGateways(request);
         this.queryNetworkSecurityGroups(request);
         this.queryServiceGateways(request);
         this.queryLocalPeeringGateways(request);

diff --git a/okitweb/static/okit/view/designer/js/artefacts/compartment.js b/okitweb/static/okit/view/designer/js/artefacts/compartment.js
@@ -24,7 +24,7 @@ class CompartmentView extends OkitContainerDesignerArtefactView {
         ...this.json_view.getBlockStorageVolumes(), ...this.json_view.getDynamicRoutingGateways(),
         ...this.json_view.getAutonomousDatabases(), ...this.json_view.getCustomerPremiseEquipments(),
         ...this.json_view.getObjectStorageBuckets(), ...this.json_view.getFastConnects(),
-        ...this.json_view.getIPSecConnections(), ...this.json_view.getRemotePeeringConnections(),
+        ...this.json_view.getIpsecConnections(), ...this.json_view.getRemotePeeringConnections(),
         ...this.json_view.getInstances()].filter(child => child.parent_id === this.artefact.id);}
     get minimum_dimensions() {
         if (this.isTopLevel()) {
@@ -88,7 +88,7 @@ class CompartmentView extends OkitContainerDesignerArtefactView {
     getRightArtifacts() {
         return [DynamicRoutingGateway.getArtifactReference(), AutonomousDatabase.getArtifactReference(),
             ObjectStorageBucket.getArtifactReference(), FastConnect.getArtifactReference(),
-            IPSecConnection.getArtifactReference(), RemotePeeringConnection.getArtifactReference()];
+            IpsecConnection.getArtifactReference(), RemotePeeringConnection.getArtifactReference()];
     }
 
     getRightEdgeArtifacts() {

diff --git a/okitweb/static/okit/view/designer/js/artefacts/fragment.js b/okitweb/static/okit/view/designer/js/artefacts/fragment.js
@@ -79,7 +79,7 @@ class FragmentView extends OkitContainerDesignerArtefactView {
         this.mergeInternetGateways(root_compartment_id);
         this.mergeLoadBalancers(root_compartment_id);
         this.mergeLocalPeeringGateways(root_compartment_id);
-        this.mergeNATGateways(root_compartment_id);
+        this.mergeNatGateways(root_compartment_id);
         this.mergeNetworkSecurityGroups(root_compartment_id);
         this.mergeObjectStorageBuckets(root_compartment_id);
         this.mergeOkeClusters(root_compartment_id);
@@ -108,7 +108,7 @@ class FragmentView extends OkitContainerDesignerArtefactView {
             this.mergeInternetGateways(root_compartment_id, root_vcn_id);
             this.mergeLoadBalancers(root_compartment_id, root_vcn_id);
             this.mergeLocalPeeringGateways(root_compartment_id, root_vcn_id);
-            this.mergeNATGateways(root_compartment_id, root_vcn_id);
+            this.mergeNatGateways(root_compartment_id, root_vcn_id);
             this.mergeNetworkSecurityGroups(root_compartment_id, root_vcn_id);
             this.mergeOkeClusters(root_compartment_id, root_vcn_id);
             this.mergeSecurityLists(root_compartment_id, root_vcn_id);
@@ -317,21 +317,21 @@ class FragmentView extends OkitContainerDesignerArtefactView {
         }
     }
 
-    mergeNATGateways(root_compartment_id, root_vcn_id = null) {
-        for (let artefact of this.artefact.getNATGateways()) {
+    mergeNatGateways(root_compartment_id, root_vcn_id = null) {
+        for (let artefact of this.artefact.getNatGateways()) {
             // Remove existing reference to fragment OKIT Json so it can be replaced with the Json View version.
             delete artefact.getOkitJson;
             if (artefact.vcn_id === root_vcn_id) {
-                let clone = this.json_view.getOkitJson().newNATGateway(artefact);
+                let clone = this.json_view.getOkitJson().newNatGateway(artefact);
                 clone.vcn_id = this.target_id;
                 clone.compartment_id = this.json_view.getOkitJson().getVirtualCloudNetwork(this.target_id).compartment_id;
-                this.json_view.newNATGateway(clone);
+                this.json_view.newNatGateway(clone);
             } else {
-                let clone = this.json_view.getOkitJson().newNATGateway(artefact);
+                let clone = this.json_view.getOkitJson().newNatGateway(artefact);
                 if (clone.compartment_id === root_compartment_id) {
                     clone.compartment_id = this.target_id;
                 }
-                this.json_view.newNATGateway(clone);
+                this.json_view.newNatGateway(clone);
             }
         }
     }

diff --git a/okitweb/static/okit/view/designer/js/artefacts/ipsec_connection.js b/okitweb/static/okit/view/designer/js/artefacts/ipsec_connection.js
@@ -2,12 +2,12 @@
 ** Copyright (c) 2020, 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
-console.info('Loaded Designer IPSecConnection View Javascript');
+console.info('Loaded Designer IpsecConnection View Javascript');
 
 /*
-** Define IPSecConnection View Artifact Class
+** Define IpsecConnection View Artifact Class
  */
-class IPSecConnectionView extends OkitDesignerArtefactView {
+class IpsecConnectionView extends OkitDesignerArtefactView {
     constructor(artefact=null, json_view) {
         super(artefact, json_view);
     }
@@ -65,7 +65,7 @@ class IPSecConnectionView extends OkitDesignerArtefactView {
     ** Static Functionality
      */
     static getArtifactReference() {
-        return IPSecConnection.getArtifactReference();
+        return IpsecConnection.getArtifactReference();
     }
 
     static getDropTargets() {