fix: general cleanup and fixes

tchapi · Sep 3, 2023 · 598d8da · 598d8da
1 parent 2c99add
commit 598d8da
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/public/js/app.js b/public/js/app.js
@@ -87,15 +87,10 @@ deleteModals.forEach(element => {
 const addDelegateModal = document.getElementById('addDelegateModal')
 if (addDelegateModal) {
     addDelegateModal.addEventListener('show.bs.modal', event => {
-        // Button that triggered the modal
-        const button = event.relatedTarget
-
-        // Grab target url
-        let targetUrl = button.getAttribute('data-href');
-
         // When adding the sharee, catch the click to add the query parameter
         const addDelegateButton = document.getElementById('addDelegateModal-cta');
         addDelegateButton.addEventListener("click", function(e) {
+            const targetUrl = addDelegateButton.getAttribute('data-href');
             const writeAccess = document.getElementById('addDelegateModal-writeAccess').checked ? 'true' : 'false';
             const principalId = document.getElementById('addDelegateModal-member').value;
 

diff --git a/templates/_partials/add_delegate_modal.html.twig b/templates/_partials/add_delegate_modal.html.twig
@@ -25,7 +25,7 @@
         </form>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ "cancel"|trans }}</button>
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ "cancel"|trans }}</button>
         <a data-href="{{ path('user_delegate_add', {username: principal.username}) }}" href="#" class="btn btn-primary" id="addDelegateModal-cta">{{ "add"|trans }}</a>
       </div>
     </div>

diff --git a/templates/_partials/delegate_row.html.twig b/templates/_partials/delegate_row.html.twig
@@ -10,7 +10,12 @@
             {% endif %}
         </h5>
         <div class="me-0 text-right d-lg-block d-none">
-            <a href="#" data-href="{{ path('user_delegate_remove',{username: principal.username, principalProxyId: has_write ? principalProxyWrite.id : principalProxyRead.id, delegateId: delegate.id})}}" data-flavour="delegates" class="btn btn-sm btn-outline-danger ms-1 mb-1 delete-modal">⚠&nbsp;{{ "remove"|trans }}</a>
+            <a href="#" 
+                data-bs-toggle="modal" data-bs-target="#deleteModal-delegates"
+                data-href="{{ path('user_delegate_remove',{username: principal.username, principalProxyId: has_write ? principalProxyWrite.id : principalProxyRead.id, delegateId: delegate.id})}}" 
+                data-flavour="delegates" 
+                class="btn btn-sm btn-outline-danger ms-1 mb-1"
+            >⚠&nbsp;{{ "remove"|trans }}</a>
         </div>
     </div>
     <p class="mb-1">{{ "users.username"|trans }} : <code>{{ delegate.username }}</code></p>

diff --git a/templates/_partials/delete_modal.html.twig b/templates/_partials/delete_modal.html.twig
@@ -9,7 +9,7 @@
         <p>{{ (flavour ~ ".modal.text")|trans }}</p>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ "cancel"|trans }}</button>
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ "cancel"|trans }}</button>
         <a href="#" type="button" class="btn btn-primary" id="deleteModal-{{ flavour }}-cta">{{ "yes"|trans }}</a>
       </div>
     </div>

diff --git a/templates/_partials/share_modal.html.twig b/templates/_partials/share_modal.html.twig
@@ -43,7 +43,7 @@
         </form>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ "cancel"|trans }}</button>
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ "cancel"|trans }}</button>
         <a href="#" id="shareModal-addSharee" class="btn btn-primary{% if principals|length == 0 %} disabled{% endif %}">{{ "add"|trans }}</a>
       </div>
     </div>

diff --git a/tests/Functional/DashboardTest.php b/tests/Functional/DashboardTest.php
@@ -14,9 +14,9 @@ public function testIndexPage(): void
         $this->assertResponseIsSuccessful();
         $this->assertSelectorTextContains('h3', 'Davis');
 
-        $this->assertSelectorExists('div.caldav');
-        $this->assertSelectorExists('div.carddav');
-        $this->assertSelectorExists('div.webdav');
+        $this->assertSelectorExists('li.caldav');
+        $this->assertSelectorExists('li.carddav');
+        $this->assertSelectorExists('li.webdav');
     }
 
     public function testDashboardPageUnlogged(): void