From 624fcbff8e66fc2e4def7c446376aa1a8afd0a11 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Wed, 22 Nov 2023 09:09:46 -0500
Subject: [PATCH] Flesh out object templates

---
 netbox/templates/vpn/ikepolicy.html     | 26 +++++++-
 netbox/templates/vpn/ikeproposal.html   | 10 ++-
 netbox/templates/vpn/ipsecpolicy.html   | 18 +++++-
 netbox/templates/vpn/ipsecprofile.html  | 84 ++++++++++++++++++++++---
 netbox/templates/vpn/ipsecproposal.html | 10 ++-
 5 files changed, 131 insertions(+), 17 deletions(-)

diff --git a/netbox/templates/vpn/ikepolicy.html b/netbox/templates/vpn/ikepolicy.html
index 1bf49818b..559ba6d17 100644
--- a/netbox/templates/vpn/ikepolicy.html
+++ b/netbox/templates/vpn/ikepolicy.html
@@ -14,6 +14,10 @@
               <th scope="row">{% trans "Name" %}</th>
               <td>{{ object.name }}</td>
             </tr>
+            <tr>
+              <th scope="row">{% trans "Description" %}</th>
+              <td>{{ object.description|placeholder }}</td>
+            </tr>
             <tr>
               <th scope="row">{% trans "IKE Version" %}</th>
               <td>{{ object.get_version_display }}</td>
@@ -23,8 +27,19 @@
               <td>{{ object.get_mode_display }}</td>
             </tr>
             <tr>
-              <th scope="row">{% trans "Description" %}</th>
-              <td>{{ object.description|placeholder }}</td>
+              <th scope="row">{% trans "Pre-Shared Key" %}</th>
+              <td>
+                <span id="secret" class="font-monospace" data-secret="{{ object.preshared_key }}">{{ object.preshared_key|placeholder }}</span>
+                {% if object.preshared_key %}
+                  <button type="button" class="btn btn-sm btn-primary toggle-secret float-end" data-bs-toggle="button">{% trans "Show Secret" %}</button>
+                {% endif %}
+              </td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "IPSec Profiles" %}</th>
+              <td>
+                <a href="{% url 'vpn:ipsecprofile_list' %}?ike_policy_id={{ object.pk }}">{{ object.ipsec_profiles.count }}</a>
+              </td>
             </tr>
           </table>
         </div>
@@ -39,6 +54,13 @@
   </div>
   <div class="row">
     <div class="col col-md-12">
+      <div class="card">
+        <h5 class="card-header">{% trans "Proposals" %}</h5>
+        <div class="card-body htmx-container table-responsive"
+          hx-get="{% url 'vpn:ikeproposal_list' %}?ike_policy_id={{ object.pk }}"
+          hx-trigger="load"
+        ></div>
+      </div>
       {% plugin_full_width_page object %}
     </div>
   </div>
diff --git a/netbox/templates/vpn/ikeproposal.html b/netbox/templates/vpn/ikeproposal.html
index 6079f0771..33cf60c81 100644
--- a/netbox/templates/vpn/ikeproposal.html
+++ b/netbox/templates/vpn/ikeproposal.html
@@ -14,6 +14,10 @@
               <th scope="row">{% trans "Name" %}</th>
               <td>{{ object.name }}</td>
             </tr>
+            <tr>
+              <th scope="row">{% trans "Description" %}</th>
+              <td>{{ object.description|placeholder }}</td>
+            </tr>
             <tr>
               <th scope="row">{% trans "Authentication method" %}</th>
               <td>{{ object.get_authentication_method_display }}</td>
@@ -35,8 +39,10 @@
               <td>{{ object.sa_lifetime|placeholder }}</td>
             </tr>
             <tr>
-              <th scope="row">{% trans "Description" %}</th>
-              <td>{{ object.description|placeholder }}</td>
+              <th scope="row">{% trans "IKE Policies" %}</th>
+              <td>
+                <a href="{% url 'vpn:ikepolicy_list' %}?proposal_id={{ object.pk }}">{{ object.ike_policies.count }}</a>
+              </td>
             </tr>
           </table>
         </div>
diff --git a/netbox/templates/vpn/ipsecpolicy.html b/netbox/templates/vpn/ipsecpolicy.html
index 8b8343876..4960d9dd3 100644
--- a/netbox/templates/vpn/ipsecpolicy.html
+++ b/netbox/templates/vpn/ipsecpolicy.html
@@ -14,13 +14,19 @@
               <th scope="row">{% trans "Name" %}</th>
               <td>{{ object.name }}</td>
             </tr>
+            <tr>
+              <th scope="row">{% trans "Description" %}</th>
+              <td>{{ object.description|placeholder }}</td>
+            </tr>
             <tr>
               <th scope="row">{% trans "PFS group" %}</th>
               <td>{{ object.get_pfs_group_display|placeholder }}</td>
             </tr>
             <tr>
-              <th scope="row">{% trans "Description" %}</th>
-              <td>{{ object.description|placeholder }}</td>
+              <th scope="row">{% trans "IPSec Profiles" %}</th>
+              <td>
+                <a href="{% url 'vpn:ipsecprofile_list' %}?ipsec_policy_id={{ object.pk }}">{{ object.ipsec_profiles.count }}</a>
+              </td>
             </tr>
           </table>
         </div>
@@ -35,6 +41,14 @@
   </div>
   <div class="row">
     <div class="col col-md-12">
+    <div class="col col-md-12">
+      <div class="card">
+        <h5 class="card-header">{% trans "Proposals" %}</h5>
+        <div class="card-body htmx-container table-responsive"
+          hx-get="{% url 'vpn:ipsecproposal_list' %}?ipsec_policy_id={{ object.pk }}"
+          hx-trigger="load"
+        ></div>
+      </div>
       {% plugin_full_width_page object %}
     </div>
   </div>
diff --git a/netbox/templates/vpn/ipsecprofile.html b/netbox/templates/vpn/ipsecprofile.html
index aa65393ae..07d1c15f0 100644
--- a/netbox/templates/vpn/ipsecprofile.html
+++ b/netbox/templates/vpn/ipsecprofile.html
@@ -22,23 +22,89 @@
               <th scope="row">{% trans "Mode" %}</th>
               <td>{{ object.get_mode_display }}</td>
             </tr>
-            <tr>
-              <th scope="row">{% trans "IKE Policy" %}</th>
-              <td>{{ object.ike_policy|linkify }}</td>
-            </tr>
-            <tr>
-              <th scope="row">{% trans "IPSec Policy" %}</th>
-              <td>{{ object.ipsec_policy|linkify }}</td>
-            </tr>
           </table>
         </div>
       </div>
       {% include 'inc/panels/tags.html' %}
+      {% include 'inc/panels/custom_fields.html' %}
       {% include 'inc/panels/comments.html' %}
       {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
-      {% include 'inc/panels/custom_fields.html' %}
+      <div class="card">
+        <h5 class="card-header">{% trans "IKE Policy" %}</h5>
+        <div class="card-body">
+          <table class="table table-hover attr-table">
+            <tr>
+              <th scope="row">{% trans "Name" %}</th>
+              <td>{{ object.ike_policy|linkify }}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Description" %}</th>
+              <td>{{ object.ike_policy.description|placeholder }}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Version" %}</th>
+              <td>{{ object.ike_policy.get_version_display }}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Mode" %}</th>
+              <td>{{ object.ike_policy.get_mode_display }}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Proposals" %}</th>
+              <td>
+                <ul class="list-unstyled mb-0">
+                  {% for proposal in object.ike_policy.proposals.all %}
+                    <li>
+                      <a href="{{ proposal.get_absolute_url }}">{{ proposal }}</a>
+                    </li>
+                  {% endfor %}
+                </ul>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Pre-Shared Key" %}</th>
+              <td>{% checkmark object.ike_policy.preshared_key %}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Certificate" %}</th>
+              <td>{% checkmark object.ike_policy.certificate %}</td>
+            </tr>
+          </table>
+        </div>
+      </div>
+      <div class="card">
+        <h5 class="card-header">{% trans "IPSec Policy" %}</h5>
+        <div class="card-body">
+          <table class="table table-hover attr-table">
+            <tr>
+              <th scope="row">{% trans "Name" %}</th>
+              <td>{{ object.ipsec_policy|linkify }}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Description" %}</th>
+              <td>{{ object.ipsec_policy.description|placeholder }}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Proposals" %}</th>
+              <td>
+                <ul class="list-unstyled mb-0">
+                  {% for proposal in object.ipsec_policy.proposals.all %}
+                    <li>
+                      <a href="{{ proposal.get_absolute_url }}">{{ proposal }}</a>
+                    </li>
+                  {% endfor %}
+                </ul>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "PFS Group" %}</th>
+              <td>{{ object.ipsec_policy.get_pfs_group_display }}</td>
+            </tr>
+          </table>
+        </div>
+      </div>
       {% plugin_right_page object %}
     </div>
   </div>
diff --git a/netbox/templates/vpn/ipsecproposal.html b/netbox/templates/vpn/ipsecproposal.html
index ad375f4e3..7425eef43 100644
--- a/netbox/templates/vpn/ipsecproposal.html
+++ b/netbox/templates/vpn/ipsecproposal.html
@@ -14,6 +14,10 @@
               <th scope="row">{% trans "Name" %}</th>
               <td>{{ object.name }}</td>
             </tr>
+            <tr>
+              <th scope="row">{% trans "Description" %}</th>
+              <td>{{ object.description|placeholder }}</td>
+            </tr>
             <tr>
               <th scope="row">{% trans "Encryption algorithm" %}</th>
               <td>{{ object.get_encryption_algorithm_display }}</td>
@@ -31,8 +35,10 @@
               <td>{{ object.sa_lifetime_data|placeholder }}</td>
             </tr>
             <tr>
-              <th scope="row">{% trans "Description" %}</th>
-              <td>{{ object.description|placeholder }}</td>
+              <th scope="row">{% trans "IPSec Policies" %}</th>
+              <td>
+                <a href="{% url 'vpn:ipsecpolicy_list' %}?proposal_id={{ object.pk }}">{{ object.ipsec_policies.count }}</a>
+              </td>
             </tr>
           </table>
         </div>