Fix various issues

2025-05-16 17:36:45 +02:00
parent 96ce402f9f
commit 6daceef913
13 changed files with 608 additions and 519 deletions
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/client.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/client.html.j2
@ -5,33 +5,33 @@
  <td
    class="p-4 text-sm font-normal text-gray-500 whitespace-nowrap dark:text-gray-400"
  >
-    {{ client.name }}
+    {{-client.name -}}
  </td>
  <td
    class="p-4 text-base font-medium text-gray-900 whitespace-nowrap dark:text-white"
  >
-    {{ client.id }}
+    {{- client.id -}}
  </td>
  <td
    class="max-w-sm p-4 overflow-hidden text-base font-normal text-gray-500 truncate xl:max-w-xs dark:text-gray-400"
  >
-    {{ client.description }}
+    {{- client.description -}}
  </td>
  <td
    class="max-w-sm p-4 text-base font-normal text-gray-500 truncate xl:max-w-xs dark:text-gray-400"
  >
-    {{ client.secrets|length }}
+    {{- client.secrets|length -}}
  </td>
  <td
    class="max-w-sm p-4 text-base font-normal text-gray-500 truncate xl:max-w-xs dark:text-gray-400"
  >
-    {{ client.policies|join(', ') }}
+    {{- client.policies|join(', ') -}}
  </td>

  <td class="p-4 space-x-2 whitespace-nowrap">
    <button
      type="button"
-      id="updateClientButton"
+      id="updateClientButton-{{ client.id }}"
      data-drawer-target="drawer-update-client-{{ client.id }}"
      data-drawer-show="drawer-update-client-{{ client.id }}"
      aria-controls="drawer-update-client-{{ client.id }}"
@ -57,7 +57,7 @@
    </button>
    <button
      type="button"
-      id="deleteClientButton"
+      id="deleteClientButton-{{ client.id }}"
      data-drawer-target="drawer-delete-client-{{ client.id }}"
      data-drawer-show="drawer-delete-client-{{ client.id }}"
      aria-controls="drawer-delete-client-{{ client.id }}"
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/drawer_client_create.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/drawer_client_create.html.j2
@ -33,113 +33,6 @@
    <span class="sr-only">Close menu</span>
  </button>
  <form hx-post="/clients/" hx-target="#clientContent">
-    <div class="space-y-4">
-      <div>
-        <label
-          for="name"
-          class="block mb-2 text-sm font-medium text-gray-900 dark:text-white"
-          >Name</label
-        >
-        <input
-          type="text"
-          name="name"
-          id="name"
-          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
-          placeholder="Client name"
-          required=""
-        />
-      </div>
-
-      <div>
-        <label
-          for="description"
-          class="block mb-2 text-sm font-medium text-gray-900 dark:text-white"
-          >Description</label
-        >
-        <input
-          type="text"
-          name="description"
-          id="description"
-          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
-          placeholder="Client description"
-        />
-      </div>
-      <div>
-        <label
-          for="sources"
-          class="block mb-2 text-sm font-medium text-gray-900 dark:text-white"
-          >Allowed subnets or IPs</label
-        >
-        <p
-          id="helper-text-explanation"
-          class="mt-2 text-sm text-gray-500 dark:text-gray-400"
-        >
-          Separate multiple entries with comma.
-        </p>
-
-        <input
-          type="text"
-          name="sources"
-          id="sources"
-          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
-          placeholder="0.0.0.0/0"
-          value="0.0.0.0/0"
-          hx-post="/clients/validate/source"
-          hx-target="#clientSourceValidation"
-        />
-        <span id="clientSourceValidation"></span>
-      </div>
-
-      <div>
-        <label
-          for="public_key"
-          class="block mb-2 text-sm font-medium text-gray-900 dark:text-white"
-          >Public Key</label
-        >
-        <textarea
-          id="public_key"
-          name="public_key"
-          rows="4"
-          class="block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border border-gray-300 focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
-          placeholder="Enter RSA SSH Public Key here"
-          hx-post="/clients/validate/public_key"
-          hx-target="#clientPublicKeyValidation"
-        ></textarea>
-        <span id="clientPublicKeyValidation"></span>
-      </div>
-      <div
-        class="bottom-0 left-0 flex justify-center w-full pb-4 space-x-4 md:px-4 md:absolute"
-      >
-        <button
-          type="submit"
-          class="text-white w-full justify-center bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:outline-none focus:ring-primary-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"
-        >
-          Add Client
-        </button>
-        <button
-          type="button"
-          data-drawer-dismiss="drawer-create-client-default"
-          aria-controls="drawer-create-client-default"
-          class="inline-flex w-full justify-center text-gray-500 items-center bg-white hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-primary-300 rounded-lg border border-gray-200 text-sm font-medium px-5 py-2.5 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600"
-        >
-          <svg
-            aria-hidden="true"
-            class="w-5 h-5 -ml-1 sm:mr-1"
-            fill="none"
-            stroke="currentColor"
-            viewBox="0 0 24 24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              stroke-width="2"
-              d="M6 18L18 6M6 6l12 12"
-            ></path>
-          </svg>
-          Cancel
-        </button>
-      </div>
-    </div>
+    {% include '/clients/drawer_client_create_inner.html.j2' %}
  </form>
 </div>
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/drawer_client_create_inner.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/drawer_client_create_inner.html.j2
@ -0,0 +1,108 @@
+<div class="space-y-4">
+  <div>
+    <label
+      for="name"
+      class="block mb-2 text-sm font-medium text-gray-900 dark:text-white"
+      >Name</label
+      >
+      <input
+        type="text"
+        name="name"
+        id="name"
+        class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
+        placeholder="Client name"
+        required=""
+        />
+  </div>
+
+  <div>
+    <label
+      for="description"
+      class="block mb-2 text-sm font-medium text-gray-900 dark:text-white"
+      >Description</label
+      >
+      <input
+        type="text"
+        name="description"
+        id="description"
+        class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
+        placeholder="Client description"
+        />
+  </div>
+  <div>
+    <label
+      for="sources"
+      class="block mb-2 text-sm font-medium text-gray-900 dark:text-white"
+      >Allowed subnets or IPs</label
+      >
+      <p
+        id="helper-text-explanation"
+        class="mt-2 text-sm text-gray-500 dark:text-gray-400"
+        >
+        Separate multiple entries with comma.
+      </p>
+
+      <input
+        type="text"
+        name="sources"
+        id="sources"
+        class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
+        placeholder="0.0.0.0/0"
+        value="0.0.0.0/0"
+        hx-post="/clients/validate/source"
+        hx-target="#clientSourceValidation"
+        />
+        <span id="clientSourceValidation"></span>
+  </div>
+
+  <div>
+    <label
+      for="public_key"
+      class="block mb-2 text-sm font-medium text-gray-900 dark:text-white"
+      >Public Key</label
+      >
+      <textarea
+        id="public_key"
+        name="public_key"
+        rows="4"
+        class="block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border border-gray-300 focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
+        placeholder="Enter RSA SSH Public Key here"
+        hx-post="/clients/validate/public_key"
+        hx-target="#clientPublicKeyValidation"
+        ></textarea>
+        <span id="clientPublicKeyValidation"></span>
+  </div>
+  <div
+    class="bottom-0 left-0 flex justify-center w-full pb-4 space-x-4 md:px-4 md:absolute"
+    >
+    <button
+      type="submit"
+      class="text-white w-full justify-center bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:outline-none focus:ring-primary-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"
+      >
+      Add Client
+    </button>
+    <button
+      type="button"
+      data-drawer-dismiss="drawer-create-client-default"
+      aria-controls="drawer-create-client-default"
+      class="inline-flex w-full justify-center text-gray-500 items-center bg-white hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-primary-300 rounded-lg border border-gray-200 text-sm font-medium px-5 py-2.5 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600"
+      >
+      <svg
+        aria-hidden="true"
+        class="w-5 h-5 -ml-1 sm:mr-1"
+        fill="none"
+        stroke="currentColor"
+        viewBox="0 0 24 24"
+        xmlns="http://www.w3.org/2000/svg"
+        >
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M6 18L18 6M6 6l12 12"
+          ></path>
+      </svg>
+      Cancel
+    </button>
+  </div>
+</div>
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/drawer_client_update.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/drawer_client_update.html.j2
@ -150,6 +150,7 @@
          hx-delete="/clients/{{ client.id }}"
          hx-confirm="Are you sure?"
          hx-target="#clientContent"
+          id="delete-button-{{ client.id }}"

          >
          <svg
--- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/inner.html.j2
+++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/inner.html.j2
@ -4,7 +4,7 @@
    <div class="overflow-x-auto">
      <div class="inline-block min-w-full align-middle">
        <div class="overflow-hidden shadow">
-          <table class="min-w-full divide-y divide-gray-200 table-fixed dark:divide-gray-600">
+          <table class="min-w-full divide-y divide-gray-200 table-fixed dark:divide-gray-600" id="clientListTable">
            <thead class="bg-gray-100 dark:bg-gray-700">
              <tr>