From 7d6b4e908d72b909511a14a307db4a7d0061ee97 Mon Sep 17 00:00:00 2001 From: Bishwas Praveen Date: Thu, 25 Jul 2024 12:07:52 -0500 Subject: [PATCH 01/10] point the edit image to the right static file --- .../sde_collections/collection_detail.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sde_indexing_helper/templates/sde_collections/collection_detail.html b/sde_indexing_helper/templates/sde_collections/collection_detail.html index c57ab212..9646811d 100644 --- a/sde_indexing_helper/templates/sde_collections/collection_detail.html +++ b/sde_indexing_helper/templates/sde_collections/collection_detail.html @@ -26,7 +26,7 @@
-

{{ collection.name }}

+

{{ collection.name }}

@@ -78,7 +78,7 @@

{{ colle
{% for stage in timeline_history %} -
{% if stage.created_at %} @@ -346,10 +346,10 @@
Rename Collection
- +
- - + +
@@ -374,8 +374,8 @@
Are you sure?
- - + +
@@ -399,8 +399,8 @@
Are you sure?
- - + +
From 5822808475a99984b06856e6ed438fb2be975426 Mon Sep 17 00:00:00 2001 From: Bishwas Praveen Date: Thu, 25 Jul 2024 12:08:05 -0500 Subject: [PATCH 02/10] add an image for the edit icon --- sde_indexing_helper/static/images/edit.png | Bin 0 -> 1872 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 sde_indexing_helper/static/images/edit.png diff --git a/sde_indexing_helper/static/images/edit.png b/sde_indexing_helper/static/images/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..f0805a01c78a01d5efb37c12bd1946ec5b25d231 GIT binary patch literal 1872 zcmV-W2e0^vP)ON7=SSSeu;Hro^6 zRS^!_!JZY#1S6M&EV3h;n_RNUr(GtAD?(8=`#>;K+ShrmZ~?do!3_~u7M)Bx5#&wqwqs|Z zXJAnk;8lqr6WVRDSau6~GMO-QwC0%<0C#bFJbWnPn?!J#ToW%MLaB*9!~ZMXOTQ8H zVit@4ZHZKIp!({exQL^7_T7T=!+vlSG{t8^j@lE#sfrNDaV$kL?3ADvvsf&UWRW&TYu^_mLPO24 z(hrU{Lib>NKTvju>Db*Nyp;%Hv;Da&(p9C@T%QYiftN&D!f$M{tGLIC&@;RYO^u__ zGqj{acU@k9Gu4C8)xVgs2sk+w61o<-WAqAogrDvof|;QZ6z90P2;R~T=nXB$MI7NP zemTRhqX-+Buu%@qEZ0=52vcSU6p2iUyhvM0OeOE=5`O*hJa-hKB#8*v2=RLq0mX?tw*co@iFK$WUS?7%uYbQNPy@Yl{sq-TfyNXR(A#K*z>t zJ9?I1!#N@Lnvw|~MFf!^(qH5Uwug^;G7*}a#`$+;`L)p5JD-ppwa$zDdLf~K9fy|* zE#>ez?iYgB5+S-p_J)?Av2KJ9OR-sT#y0?dcR$D`rH4pj)gJvs{z@YJ;`k^u+gstm zjb2T7RfM2N?Frt}_Jp2*@Q#A!xCbaZI`Tpak-sx`9jyDke6eHaYm>r1oAtue@zXHX zVuRxBNG6nZ#MQm0Bp44b(&PGp9}FeH-<=$TaoVRb<}@~g9+ICw1)urb!x3`1e0=5-Ih{&*gi!ehKAwAqrwZ;pJd-|ejg z>wfjguW=&3`e;t=_W#anr+g~##Eq*r7@R|-vRO%mB*UBfSqkHYDE9|WAqJN*m7 zx68Ty_wcuObkc)O@H0u^qusvKU7c9#3k}d;R|6Am+BJ{9*ke=SWx~!|zGv_57qY8Wz@?OU$GGWSl zcP0j|Bel?MYlXp>pd%SbQdw0#6kKWG{)~btxN-dKKwc#SK1uttp(yIQwo4;cj0d`~q)y>Q>jN%g9F!&(m)`N?^ zef^rI0Dmn^LA$#hJipaJQREaCU8~zKbYaa$(_Sa1wA-0P=makK{_I5ZW2}fjy?+xt z1RJS73HclLA8 zHmj4vzPPen6Q6 zqVN`r1MyhIq4L@MEXI5J^B zp8TomQ^Dv~Xrf=sgf-)dk0dft66se(+3aK8y<(oRjAcxCMfN{_b)p31Uh&fa0000< KMNUMnLSTY&N|4?F literal 0 HcmV?d00001 From ec0d2b7682569229612ad559803b778cab160e24 Mon Sep 17 00:00:00 2001 From: Bishwas Praveen Date: Thu, 25 Jul 2024 12:08:39 -0500 Subject: [PATCH 03/10] delete the pre existing edit icon --- sde_indexing_helper/static/images/Task.png | Bin 333 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 sde_indexing_helper/static/images/Task.png diff --git a/sde_indexing_helper/static/images/Task.png b/sde_indexing_helper/static/images/Task.png deleted file mode 100644 index 89c8d561fd1d5d66a6ec2bb8cf937baecf232450..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4foCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{v%Hp$B+ufw^Q;34;kMuULKNO$9x5(p#%fYu2w{sm Date: Fri, 26 Jul 2024 17:58:54 -0500 Subject: [PATCH 04/10] adding css styling for universal search --- .../static/css/collections_list.css | 67 ++++++++++++++----- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/sde_indexing_helper/static/css/collections_list.css b/sde_indexing_helper/static/css/collections_list.css index 2d5e5193..e374eef1 100644 --- a/sde_indexing_helper/static/css/collections_list.css +++ b/sde_indexing_helper/static/css/collections_list.css @@ -32,7 +32,7 @@ body { color:black; } -.dtsp-name { +.dtsp-name { margin-left:40px; } @@ -83,11 +83,11 @@ body { border-color: #fafafa; font-size: 0.6875rem; box-shadow: 0 2px 2px 0 rgba(153, 153, 153, 0.14), 0 3px 1px -2px rgba(153, 153, 153, 0.2), 0 1px 5px 0 rgba(153, 153, 153, 0.12); } - + .select-dropdown:hover { box-shadow: 0 14px 26px -12px rgba(250, 250, 250, 0.42), 0 4px 23px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(250, 250, 250, 0.2); } - + .select-dropdown:focus, .select-dropdown.focus { box-shadow: none, 0 0 0 0.2rem rgba(76, 175, 80, 0.5); @@ -104,7 +104,7 @@ body { max-width: 400px; width: 400px; } - + .url-cell { display:flex; align-items: center; @@ -116,7 +116,7 @@ body { text-overflow: ellipsis; max-width: calc(100% - 30px); display: inline-block; - width: 400px; + width: 400px; padding-right: 10px; } @@ -140,7 +140,7 @@ text-align: left; color: rgba(255, 255, 255, 1); margin-bottom: 0 !important; } - + .tableHeader{ background-color:#15232E !important; } @@ -197,7 +197,7 @@ margin-bottom: 0 !important; .table tbody tr:nth-child(odd) { background-color: #050E19 !important; } - + .table tbody tr:nth-child(even) { background-color: #3F4A58 !important; } @@ -209,7 +209,7 @@ margin-bottom: 0 !important; line-height: 36px; letter-spacing: -0.03em; } - + #hideShowColumnsModal { position: fixed; top: 0; @@ -219,19 +219,19 @@ margin-bottom: 0 !important; width: 30vw; z-index: 2000; } - + #subTitle { font-size: 14px; font-weight: 400; line-height: 21px; letter-spacing: -0.02em; } - + .checkbox-wrapper { display: flex; align-items: baseline; } - + .checkbox-wrapper label { font-weight: 600; font-size: 16px; @@ -240,7 +240,7 @@ margin-bottom: 0 !important; color: rgba(31, 41, 53, 1); padding-left: 10px; } - + .modalFooter { position: sticky; bottom: 0; @@ -275,10 +275,41 @@ margin-bottom: 0 !important; } .custom-pane-title { -font-size: 16px; -font-weight: 500; -line-height: 24px; -letter-spacing: -0.02em; -color: rgba(255, 255, 255, 1); -padding-left: 9px; + font-size: 16px; + font-weight: 500; + line-height: 24px; + letter-spacing: -0.02em; + color: rgba(255, 255, 255, 1); + padding-left: 9px; + } + + .search-container { + display: flex; + flex-direction: column; + align-items: flex-end; + margin-bottom: 20px; + } + + .search-container label { + margin-right: 10px; + font-weight: bold; + font-size: 18px; + margin-top: 5px; + align-items: center; + } + + .search-container input { + flex: 1; + max-width: 400px; + } + + .search-container input { + max-width: 400px; + padding: 5px; + border-radius: 8px; /* Rounded corners */ + border: 1px solid #ccc; + } + + .search-container input:focus { + font-style: italic; } From bd4d07b07a10835f6f34fa16c2a2f31dd311bdbd Mon Sep 17 00:00:00 2001 From: Bishwas Praveen Date: Fri, 26 Jul 2024 17:59:35 -0500 Subject: [PATCH 05/10] adding script to execute filtering based on typed text --- .../static/js/collection_list.js | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sde_indexing_helper/static/js/collection_list.js b/sde_indexing_helper/static/js/collection_list.js index 5a00c1a4..31074a18 100644 --- a/sde_indexing_helper/static/js/collection_list.js +++ b/sde_indexing_helper/static/js/collection_list.js @@ -405,6 +405,28 @@ $(document).ready(function () { "Connector Type", ]; + // Event listener for the collection search input + $('#collectionSearch').on('keyup', function () { + // Get the search query + let query = $(this).val().toLowerCase(); + + // Clear previous search + table.search('').columns().search(''); + + // Filter the table based on the query in the collection name and config folder data attribute + table.rows().every(function () { + let row = $(this.node()); + let name = row.find('td').first().text().toLowerCase(); + let configFolder = row.data('config-folder').toLowerCase(); + + if (name.includes(query) || configFolder.includes(query)) { + row.show(); + } else { + row.hide(); + } + }); + }); + $(".dtsp-searchPane").each(function (index) { if ($(this).hasClass("dtsp-hidden")) { return; From 0eee5e9b6f3ee3c92feb77ac3e5f9b90a6f45578 Mon Sep 17 00:00:00 2001 From: Bishwas Praveen Date: Fri, 26 Jul 2024 18:00:12 -0500 Subject: [PATCH 06/10] added a search box on html page --- .../templates/sde_collections/collection_list.html | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sde_indexing_helper/templates/sde_collections/collection_list.html b/sde_indexing_helper/templates/sde_collections/collection_list.html index 1edf71a1..e638fa02 100644 --- a/sde_indexing_helper/templates/sde_collections/collection_list.html +++ b/sde_indexing_helper/templates/sde_collections/collection_list.html @@ -48,10 +48,15 @@

Welcome back!

- + +
+ + +
+ {% for collection in collections %} - + {{ collection.name }} chevron_right @@ -73,7 +78,7 @@

Welcome back!

data-match-pattern remove_protocol row - url> + url>