finalise the affected urls page for all the pattern types

Author: Kirandawadi

sde_collections/models/candidate_url.py

@@ -11,14 +11,6 @@
 
 class CandidateURLQuerySet(models.QuerySet):
     def with_exclusion_status(self):
-        # currently this is only handling the exclude_patterns
-        # need to add functionality of including include_patterns
-        # exclude=false
-        # if some_include_pattern exists which matches this url:
-        #     then exclude = false
-        # else
-        #     if some_exclude_pattern exists which matches this url:
-        #         exclude = true
         return self.annotate(
             excluded=models.Exists(
                 ExcludePattern.candidate_urls.through.objects.filter(candidateurl=models.OuterRef("pk"))

sde_collections/views.py

@@ -239,73 +239,32 @@ class AffectedURLsListView(LoginRequiredMixin, ListView):
     def get_queryset(self):
 
         if 'exclude-pattern' in self.request.path:
-            print("Going with exclude patterns......")
-            # Get the exclude pattern based on the ID from the URL kwargs
             self.pattern = ExcludePattern.objects.get(id=self.kwargs["id"])
-            
-            # Get excluded URLs
-            excluded_urls = self.pattern.matched_urls().annotate(is_included=Value(False, output_field=BooleanField()))
-
-            # Get included URLs for the same collection
-            include_patterns = IncludePattern.objects.filter(collection=self.pattern.collection)
-            included_urls = CandidateURL.objects.filter(
-                collection=self.pattern.collection,
-                id__in=include_patterns.values_list('candidate_urls__id', flat=True)
-            ).distinct()
-
-            # Annotate excluded URLs with is_included if they are also in included_urls
-            queryset = excluded_urls.annotate(
-                is_included=Case(
-                    When(id__in=included_urls.values('id'), then=Value(True)),
-                    default=Value(False),
-                    output_field=BooleanField()
-                )
-            )
-
+            self.pattern_type = "Exclude"
         elif 'include-pattern' in self.request.path:
-            print("Going with include patterns......")
-            # Get the include pattern based on the ID from the URL kwargs
             self.pattern = IncludePattern.objects.get(id=self.kwargs["id"])
-
-            # Get included URLs for the pattern
-            included_urls = self.pattern.matched_urls().annotate(is_excluded=Value(False, output_field=BooleanField()))
-
-            # Get excluded URLs for the same collection
-            exclude_patterns = ExcludePattern.objects.filter(collection=self.pattern.collection)
-            excluded_urls = CandidateURL.objects.filter(
-                collection=self.pattern.collection,
-                id__in=exclude_patterns.values_list('candidate_urls__id', flat=True)
-            ).distinct()
-
-            # Annotate included URLs with is_excluded if they are also in excluded_urls
-            queryset = included_urls.annotate(
-                is_excluded=Case(
-                    When(id__in=excluded_urls.values('id'), then=Value(True)),
-                    default=Value(False),
-                    output_field=BooleanField()
-                )
-            )
-
+            self.pattern_type = "Include"
+        elif 'title-pattern' in self.request.path:
+            self.pattern = TitlePattern.objects.get(id=self.kwargs["id"])
+            self.pattern_type = "Title"
+        elif 'document-type-pattern' in self.request.path:
+            self.pattern = DocumentTypePattern.objects.get(id=self.kwargs["id"])
+            self.pattern_type = "Document Type"
+        else:
+            return super().get_queryset()
+    
+        queryset = self.pattern.matched_urls()
         return queryset
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["pattern"] = self.pattern
         context["url_count"] = self.pattern.matched_urls().count()
         context["collection"] = self.pattern.collection
-        context["pattern_type"] = "Exclude" if 'exclude-pattern' in self.request.path else "Include"
-
-
-        # print(self.pattern.collection.id)
-
-        # affected_urls = self.pattern.matched_urls()
-        # for url in affected_urls:
-        #     print(url.collection)
-        # Your affected_urls is a list of CandidateURL model objects.
+        context["pattern_type"] = self.pattern_type
 
         return context
 
-
 class SdeDashboardView(LoginRequiredMixin, ListView):
     model = Collection
     template_name = "sde_collections/sde_dashboard.html"

sde_indexing_helper/static/js/affected_urls.js

@@ -4,7 +4,6 @@ var MULTI_URL_PATTERN = 2;
 collection_id = getCollectionId();
 
 $(document).ready(function () {
-    // handleAjaxStartAndStop();
     initializeDataTable();
     setupClickHandlers();
 });
@@ -14,7 +13,6 @@ function initializeDataTable() {
       pageLength: 100,
       colReorder: true,
       stateSave: true,
-      searching: true,
       layout: {
         bottomEnd: "inputPaging",
         topEnd: null,
@@ -32,16 +30,6 @@ function initializeDataTable() {
       pagingType: "input",
       rowId: "url"
   },
-    // createdRow: function (row, data, dataIndex) {
-    //     // Assuming the 'Include URL' column is at index 3
-    //     let includeUrlCell = $(row).find('td').eq(2);
-
-    //     // Check if the cell has the cross-mark
-    //     if (includeUrlCell.find('i.cross-mark').length > 0) {
-    //         // Highlight the row if it contains a cross-mark
-    //         $(row).css('background-color', 'rgba(255, 61, 87, 0.36)'); // Light red background
-    //     }
-    // }
 
   })
 
@@ -85,7 +73,6 @@ function handleIncludeIndividualUrlClick() {
 
 
     } else {
-        // Handle the functionality of excluding that URL again (maybe delete that include pattern which was just created)
         var url = $(this).attr("value");
         console.log("url", url);
         getCorrespondingIncludePattern(url).then(function(patternId) {
@@ -240,21 +227,6 @@ function postExcludePatterns(match_pattern, match_pattern_type = 0, force) {
   });
 }
 
-function deleteRowById(rowId) {
-    // Find the DataTable instance
-    var affected_urls_table = $("#affectedURLsTable").DataTable();
-  
-    // Find the row with ID 1
-    var rowToDelete = affected_urls_table.row(rowId); // Adjust based on 0-indexing
-  
-    if (rowToDelete.length) {
-      rowToDelete.remove(); // Remove the row
-      affected_urls_table.draw(); // Redraw the table
-    } else {
-      console.log("Row not found.");
-    }
-  }
-
 function deletePattern(
   url,
   data_type,
@@ -273,6 +245,10 @@ function deletePattern(
         success: function (data) {
           console.log("Successfully deleted.")
         },
+        error: function (xhr, status, error) {
+            var errorMessage = xhr.responseText;
+            toastr.error(errorMessage);
+        },      
       });
 }
 

sde_indexing_helper/templates/sde_collections/affected_urls.html

@@ -2,15 +2,15 @@
 {% load static i18n %}
 {% load humanize %}
 {% block title %}
-Affected URLs
+Affected URLs for {{pattern_type}} Pattern
 {% endblock title %}
 
 {% block stylesheets %}
     {{ block.super }}
     <link href="//cdn.datatables.net/v/bs4/jszip-3.10.1/dt-2.0.5/af-2.7.0/b-3.0.2/b-colvis-3.0.2/b-html5-3.0.2/b-print-3.0.2/cr-2.0.1/fc-5.0.0/fh-4.0.1/kt-2.12.0/r-3.0.2/rg-1.5.0/rr-1.5.0/sc-2.4.1/sp-2.3.1/sl-2.0.1/datatables.min.css" rel="stylesheet">
     <link href="https://cdn.datatables.net/plug-ins/2.0.8/features/inputPaging/dist/dataTables.inputPaging.min.css" rel="stylesheet" />
-    <link href="{% static 'css/project.css' %}" rel="stylesheet">
     <link rel="stylesheet" href="{% static 'css/affected_urls.css' %}" />
+    <link href="{% static 'css/project.css' %}" rel="stylesheet">
 {% endblock stylesheets %}
 
 {% block content %}
@@ -19,14 +19,16 @@
         <h1 class="pageTitle">Affected URLs</h1>
     </div>
 
+    <div class="candidateUrlContainer">
+
     <h3 class="whiteText candidateTitle">
         {{ url_count|intcomma }} affected URLs for {{ pattern_type | lower }} pattern: 
         <span style="color: #65B1EF;">{{ pattern.match_pattern }}</span>
     </h3>
 
     <div class="container mt-4">
         <!-- Table to display the URLs -->
-        <table id="affectedURLsTable" class="table table-striped table-bordered" style="width:100%">
+        <table id="affectedURLsTable" class="table" style="width:100%">
             <thead class="tableHeader">
                 <tr>
                     <th scope="col" class="text-center col-1">#</th>
@@ -39,7 +41,7 @@ <h3 class="whiteText candidateTitle">
                         {% endif %}
                     </th> -->
                 </tr>
-                <tr>
+                <tr class="filter-row">
                     <td> </td>
                     <td ><input type="text" class="table_filter_row_input textBoxStyling" id="affectedURLsFilter" placeholder="URL" /></td>
                 </tr>
@@ -79,7 +81,8 @@ <h3 class="whiteText candidateTitle">
                 {% endfor %}
             </tbody>
         </table>
-
+    </div>
+    </div>
 {% endblock content %}
 
 {% block javascripts %}