Resolve display issue for DRG when it is not connected to a VCN

okitweb/static/okit/view/designer/js/artefacts/dynamic_routing_gateway.js

@@ -12,10 +12,11 @@ class DynamicRoutingGatewayView extends OkitDesignerArtefactView {
         super(artefact, json_view);
     }
 
-    get parent_id() {return this.artefact.vcn_id;}
+    get parent_id() {return this.artefact.vcn_id && this.artefact.vcn_id !== '' ? this.artefact.vcn_id : this.artefact.compartment_id;}
+    get parent() {return this.artefact.vcn_id && this.artefact.vcn_id !== '' ? this.getJsonView().getVirtualCloudNetwork(this.parent_id) : this.getJsonView().getCompartment(this.parent_id);}
 
     getParent() {
-        return this.getJsonView().getVirtualCloudNetwork(this.parent_id);
+        return this.parent;
     }
 
     getParentId() {

sonar-project.properties

@@ -1,4 +1,4 @@
-sonar.projectKey=a-team:oci-designer-toolkit
+sonar.projectKey=oci-designer-toolkit
 sonar.projectName=OCI Designer Toolkit 
 sonar.projectVersion=1.0
 

visualiser/generators/okitGenerator.py

@@ -409,7 +409,10 @@ def renderDynamicRoutingGateway(self, dynamic_routing_gateway):
         # ---- Compartment Id
         self.jinja2_variables["compartment_id"] = self.formatJinja2IdReference(self.standardiseResourceName(self.id_name_map[dynamic_routing_gateway['compartment_id']]))
         # ---- Virtual Cloud Network OCID
-        self.jinja2_variables["vcn_id"] = self.formatJinja2IdReference(self.standardiseResourceName(self.id_name_map[dynamic_routing_gateway['vcn_id']]))
+        if dynamic_routing_gateway.get('vcn_id', '') != '':
+            self.jinja2_variables["vcn_id"] = self.formatJinja2IdReference(self.standardiseResourceName(self.id_name_map[dynamic_routing_gateway['vcn_id']]))
+        else:
+            self.removeJinja2Variable('vcn_id')
         # ---- Display Name
         self.addJinja2Variable("display_name", dynamic_routing_gateway["display_name"], standardisedName)
         # --- Optional

visualiser/templates/terraform/dynamic_routing_gateway.jinja2

@@ -18,9 +18,11 @@ locals {
     {{ resource_name }}_id = oci_core_drg.{{ resource_name }}.id
 }
 
+{% if vcn_id is defined %}
 # ------ Create DRG Attachment
 resource "oci_core_drg_attachment" "{{ resource_name }}DRGAttachment" {
     drg_id        = local.{{ resource_name }}_id
     vcn_id        = {{ vcn_id }}
     display_name   = {{ display_name | safe }}
 }
+{% endif %}