From e33426bc5c1ba55a52a5b92b013a2f831688d756 Mon Sep 17 00:00:00 2001 From: Kshaw362 Date: Tue, 28 May 2024 17:17:59 -0400 Subject: [PATCH 1/6] 88: Added definitions for the collection list table --- .../static/js/candidate_url_list.js | 2 ++ .../static/js/collection_list.js | 6 ++-- sde_indexing_helper/static/js/project.js | 35 +++++++++++++++++++ .../sde_collections/collection_list.html | 1 + 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/sde_indexing_helper/static/js/candidate_url_list.js b/sde_indexing_helper/static/js/candidate_url_list.js index d918991d..ec1053fc 100644 --- a/sde_indexing_helper/static/js/candidate_url_list.js +++ b/sde_indexing_helper/static/js/candidate_url_list.js @@ -59,6 +59,8 @@ function modalContents(tableName) { .attr("for", "checkbox_" + columnName.replace(/\s+/g, "_")) .text(columnName); + console.log(columnName); + var $caption = $("

") .text( "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore." diff --git a/sde_indexing_helper/static/js/collection_list.js b/sde_indexing_helper/static/js/collection_list.js index 2da20cef..14373e6d 100644 --- a/sde_indexing_helper/static/js/collection_list.js +++ b/sde_indexing_helper/static/js/collection_list.js @@ -1,5 +1,6 @@ var uniqueId; //used for logic related to contents on column customization modal + function modalContents(tableName) { var checkboxCount = $("#modalBody input[type='checkbox']").length; @@ -29,10 +30,11 @@ function modalContents(tableName) { var $label = $("

") .text( - "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore." + tableHeaderDefinitions[columnName] + // "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore." ) .attr({ id: "caption", diff --git a/sde_indexing_helper/static/js/project.js b/sde_indexing_helper/static/js/project.js index 773c74e6..61cb6cc0 100644 --- a/sde_indexing_helper/static/js/project.js +++ b/sde_indexing_helper/static/js/project.js @@ -1,3 +1,38 @@ /* Project specific Javascript goes here. */ + const tableHeaderDefinitions = { + "Name": "The designated name of the collection.", + "URL": "The primary URL of the collection from which the scraping process begins.", + "Division": "The specific division to which the collection belongs. It can be one of: Astrophysics, Heliophysics, Biological and Physical Sciences, Earth Science, or Planetary Science.", + "Candidate URLs" : "The URLs crawled from the base URL by Sinequa. These are curated and sent for indexing.", + "Workflow Status": "The current stage of the collection within the workflow.", + "Curator": "The individual responsible for curating this collection.", + "Connector Type": "Indicates whether the connector is a web crawler or API-based." +} + + +const candidateTableHeaderDefinitons = { + "URL": "{insert description here}", + "Exclude": "{insert description here}", + "Scraped Title": "{insert description here}", + "New Title" : "{insert description here}", + "Document Type": "{insert description here}", + "Match Pattern" : "", + "Match Pattern Type": "", + "Reason": "", + "Affected URLs": "", + "Actions": "" +}; + + +URL +candidate_url_list.js:62 Exclude +candidate_url_list.js:62 Scraped Title +candidate_url_list.js:62 New Title +candidate_url_list.js:62 Document Type +Match Pattern +candidate_url_list.js:62 Match Pattern Type +candidate_url_list.js:62 Reason +candidate_url_list.js:62 Affected URLs +candidate_url_list.js:62 Actions \ No newline at end of file diff --git a/sde_indexing_helper/templates/sde_collections/collection_list.html b/sde_indexing_helper/templates/sde_collections/collection_list.html index c40f254b..df8a0f5d 100644 --- a/sde_indexing_helper/templates/sde_collections/collection_list.html +++ b/sde_indexing_helper/templates/sde_collections/collection_list.html @@ -140,4 +140,5 @@

Customize Columns
+ {% endblock javascripts %} From eee1c6d80ad2fe8eafb75644fd271e8e1ee3c733 Mon Sep 17 00:00:00 2001 From: Kshaw362 Date: Wed, 29 May 2024 09:46:58 -0400 Subject: [PATCH 2/6] 88: adding descriptions for the candidate url page --- .../static/js/candidate_url_list.js | 3 +- .../static/js/collection_list.js | 1 - sde_indexing_helper/static/js/project.js | 30 ++++++------------- .../sde_collections/candidate_urls_list.html | 1 + 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/sde_indexing_helper/static/js/candidate_url_list.js b/sde_indexing_helper/static/js/candidate_url_list.js index ec1053fc..924bde4d 100644 --- a/sde_indexing_helper/static/js/candidate_url_list.js +++ b/sde_indexing_helper/static/js/candidate_url_list.js @@ -63,7 +63,8 @@ function modalContents(tableName) { var $caption = $("

") .text( - "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore." + // "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore." + candidateTableHeaderDefinitons[columnName] ) .attr({ id: "caption", diff --git a/sde_indexing_helper/static/js/collection_list.js b/sde_indexing_helper/static/js/collection_list.js index 14373e6d..4e87e8e2 100644 --- a/sde_indexing_helper/static/js/collection_list.js +++ b/sde_indexing_helper/static/js/collection_list.js @@ -34,7 +34,6 @@ console.log(columnName); var $caption = $("

") .text( tableHeaderDefinitions[columnName] - // "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore." ) .attr({ id: "caption", diff --git a/sde_indexing_helper/static/js/project.js b/sde_indexing_helper/static/js/project.js index 61cb6cc0..83b55278 100644 --- a/sde_indexing_helper/static/js/project.js +++ b/sde_indexing_helper/static/js/project.js @@ -13,26 +13,14 @@ const candidateTableHeaderDefinitons = { - "URL": "{insert description here}", - "Exclude": "{insert description here}", - "Scraped Title": "{insert description here}", - "New Title" : "{insert description here}", + "URL": "A scraped URL.", + "Exclude": "Whether or not this URL is excluded from the collection.", + "Scraped Title": "Title scraped from the document.", + "New Title" : "New title set by a user.", "Document Type": "{insert description here}", - "Match Pattern" : "", - "Match Pattern Type": "", - "Reason": "", - "Affected URLs": "", - "Actions": "" + "Match Pattern" : "Pattern that is used to match against URLs in the collection.", + "Match Pattern Type": "{Insert explanation here}", + "Reason": "{Insert explanation here}", + "Affected URLs": "The URLs that match the pattern.", + "Actions": "Delete a pattern." }; - - -URL -candidate_url_list.js:62 Exclude -candidate_url_list.js:62 Scraped Title -candidate_url_list.js:62 New Title -candidate_url_list.js:62 Document Type -Match Pattern -candidate_url_list.js:62 Match Pattern Type -candidate_url_list.js:62 Reason -candidate_url_list.js:62 Affected URLs -candidate_url_list.js:62 Actions \ No newline at end of file diff --git a/sde_indexing_helper/templates/sde_collections/candidate_urls_list.html b/sde_indexing_helper/templates/sde_collections/candidate_urls_list.html index e8296f35..3d7dee94 100644 --- a/sde_indexing_helper/templates/sde_collections/candidate_urls_list.html +++ b/sde_indexing_helper/templates/sde_collections/candidate_urls_list.html @@ -20,6 +20,7 @@ + {% endblock javascripts %} {% block content %} From ba1caf4ce230344928ebad57094c8fbba913e231 Mon Sep 17 00:00:00 2001 From: Kshaw362 Date: Wed, 29 May 2024 09:50:13 -0400 Subject: [PATCH 3/6] 88: removing print statements --- sde_indexing_helper/static/js/candidate_url_list.js | 4 ---- sde_indexing_helper/static/js/collection_list.js | 1 - 2 files changed, 5 deletions(-) diff --git a/sde_indexing_helper/static/js/candidate_url_list.js b/sde_indexing_helper/static/js/candidate_url_list.js index 924bde4d..fcab6217 100644 --- a/sde_indexing_helper/static/js/candidate_url_list.js +++ b/sde_indexing_helper/static/js/candidate_url_list.js @@ -58,12 +58,8 @@ function modalContents(tableName) { var $label = $("

") .text( - // "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore." candidateTableHeaderDefinitons[columnName] ) .attr({ diff --git a/sde_indexing_helper/static/js/collection_list.js b/sde_indexing_helper/static/js/collection_list.js index 4e87e8e2..d4ac2399 100644 --- a/sde_indexing_helper/static/js/collection_list.js +++ b/sde_indexing_helper/static/js/collection_list.js @@ -30,7 +30,6 @@ function modalContents(tableName) { var $label = $("

") .text( tableHeaderDefinitions[columnName] From a51501e3b2233553638e013afb2d0f5e5389bada Mon Sep 17 00:00:00 2001 From: Kshaw362 Date: Wed, 29 May 2024 10:15:39 -0400 Subject: [PATCH 4/6] 65: active tab now has grey background and correct bottom border color --- sde_indexing_helper/static/css/collection_detail.css | 9 +++++---- sde_indexing_helper/static/css/project.css | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sde_indexing_helper/static/css/collection_detail.css b/sde_indexing_helper/static/css/collection_detail.css index affcf945..0cddd906 100644 --- a/sde_indexing_helper/static/css/collection_detail.css +++ b/sde_indexing_helper/static/css/collection_detail.css @@ -61,13 +61,14 @@ color: #0066CA; font-weight: 700; border-bottom: 2px solid #FF3D57; - padding-bottom: 30px; + padding-bottom: 20px; } /* line under the tab options */ div > .nav { - padding-bottom: 30px; - border-bottom: 1px solid rgba(0, 0, 0, 0.3); + padding-bottom: 20px; + border-bottom: 1px solid; + border-bottom-color:rgba(167, 186, 205, 1); } /* badge container to fix size of div and prevent hugging single line titles */ @@ -191,4 +192,4 @@ color:black; .tableHeaderRow{ background-color:#050E19 - } + } \ No newline at end of file diff --git a/sde_indexing_helper/static/css/project.css b/sde_indexing_helper/static/css/project.css index e628000f..abf68486 100644 --- a/sde_indexing_helper/static/css/project.css +++ b/sde_indexing_helper/static/css/project.css @@ -214,11 +214,12 @@ body { .tabStyle{ color:#8697A8 !important; + padding-top:10px; } .nav-item .active{ color:#65B1EF !important; - + background-color:rgba(255, 255, 255, 0.07); } .buttonColor{ From 2c0175c8cfbd675a54f3c53fad10ffe38e1935b7 Mon Sep 17 00:00:00 2001 From: Kshaw362 Date: Wed, 29 May 2024 10:34:54 -0400 Subject: [PATCH 5/6] 68: moving workflow dropdown to the right side of candidate url page --- .../static/css/candidate_url_list.css | 7 +++++ .../sde_collections/candidate_urls_list.html | 27 ++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/sde_indexing_helper/static/css/candidate_url_list.css b/sde_indexing_helper/static/css/candidate_url_list.css index 26d92a04..6cd79cac 100644 --- a/sde_indexing_helper/static/css/candidate_url_list.css +++ b/sde_indexing_helper/static/css/candidate_url_list.css @@ -224,6 +224,8 @@ letter-spacing: -0.02em; .title-dropdown { width: fit-content !important; + margin-top:20px; + margin-bottom:20px; } .table tbody tr:nth-child(odd) { background-color: #050E19 !important; @@ -278,4 +280,9 @@ letter-spacing: -0.02em; div.dt-container div.dt-info { padding-top: 0; white-space: normal; +} + +.headerDiv{ + display: flex; + justify-content: space-between; } \ No newline at end of file diff --git a/sde_indexing_helper/templates/sde_collections/candidate_urls_list.html b/sde_indexing_helper/templates/sde_collections/candidate_urls_list.html index e8296f35..e63b0a71 100644 --- a/sde_indexing_helper/templates/sde_collections/candidate_urls_list.html +++ b/sde_indexing_helper/templates/sde_collections/candidate_urls_list.html @@ -24,29 +24,30 @@ {% block content %} {% csrf_token %} +

Candidate URLs

+ +
+{% for choice in workflow_status_choices %} +{{ choice.label }} +{% endfor %} +
+

{{ candidate_urls.count|intcomma }} Candidate URLs for {{ collection.name }} - -
- {% for choice in workflow_status_choices %} - {{ choice.label }} - {% endfor %} -

-
  • From d7c0a13662952f7022c0147d2cc1957248d750f9 Mon Sep 17 00:00:00 2001 From: 635487 <635487@bah.com> Date: Wed, 29 May 2024 15:14:52 -0700 Subject: [PATCH 6/6] 64-remove-search: change dom property in datatables --- sde_indexing_helper/static/js/collection_list.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sde_indexing_helper/static/js/collection_list.js b/sde_indexing_helper/static/js/collection_list.js index 2da20cef..f77c4d3a 100644 --- a/sde_indexing_helper/static/js/collection_list.js +++ b/sde_indexing_helper/static/js/collection_list.js @@ -70,7 +70,7 @@ let table = $("#collection_table").DataTable({ layout: { topStart: "searchPanes", }, - dom: "PiBf", + dom: "PiB", buttons: [ { text: "Customize Columns", @@ -85,8 +85,7 @@ let table = $("#collection_table").DataTable({ targets: 8, visible: false, }, - { width: "200px", targets: 1 }, - { + { width: "200px", targets: 1 }, { searchPanes: { options: [ {