Skip to content

Commit 4053928

Browse files
dhanur-sharmadhanur-sharma
committed
Match type pattern input added
1 parent 7348a76 commit 4053928

File tree

3 files changed

+135
-9
lines changed

3 files changed

+135
-9
lines changed

‎sde_indexing_helper/static/css/collections_list.css‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,3 +313,50 @@ margin-bottom: 0 !important;
313313
.search-container input:focus {
314314
font-style: italic;
315315
}
316+
317+
.pattern-dropdown {
318+
width: 100%;
319+
background: #A7BACD !important;
320+
font-size: 15px;
321+
font-weight: 500;
322+
line-height: 17.58px;
323+
color: #1F2935;
324+
display: flex;
325+
justify-content: space-between;
326+
align-items: center;
327+
text-transform: capitalize;
328+
border-radius: 4px;
329+
margin-bottom: 0;
330+
}
331+
332+
.pattern-dropdown-input {
333+
flex-direction: column;
334+
width: 100%;
335+
}
336+
337+
.pattern-type-form {
338+
width: 100%;
339+
background: #15232E;
340+
color: white;
341+
border: 1px solid white;
342+
padding: 24px 15px;
343+
border-radius: 4px;
344+
}
345+
346+
.pattern-form-group {
347+
margin-top: 40px;
348+
}
349+
350+
.form-label {
351+
color: white;
352+
display: flex;
353+
font-size: 12px;
354+
font-weight: 500;
355+
letter-spacing: -0.02em;
356+
margin-bottom: 8px;
357+
}
358+
359+
.form-label .asterik {
360+
color: #C3001A;
361+
margin-left: 4px;
362+
}

‎sde_indexing_helper/static/js/delta_url_list.js‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,6 +1097,8 @@ function handleDivisionSelect() {
10971097
$("body").on("click", ".division_select", function () {
10981098
var match_pattern = $(this).closest(".document_type_dropdown").data("match-pattern");
10991099
var division = $(this).attr("value");
1100+
// var match_pattern_type = $(this).attr("match-pattern-type");
1101+
// postDivisionPatterns(match_pattern, match_pattern_type, division);
11001102
postDivisionPatterns(match_pattern, 1, division);
11011103
});
11021104
}
@@ -1130,7 +1132,7 @@ $("#division_pattern_form").on("submit", function (e) {
11301132

11311133
console.log("Form Inputs:", inputs); // Debugging line to check inputs
11321134

1133-
postDivisionPatterns(inputs.match_pattern, 2, inputs.division_pattern);
1135+
postDivisionPatterns(inputs.match_pattern, inputs.match_pattern_type, inputs.division_pattern);
11341136

11351137
// Close the modal if it is open
11361138
$("#divisionPatternModal").modal("hide");
@@ -1975,6 +1977,12 @@ $(".custom-menu li").click(function () {
19751977
$(".custom-menu").hide(100);
19761978
});
19771979

1980+
$(".pattern_type_form_select").on("click", function (e) {
1981+
e.preventDefault();
1982+
$('input[name="match_pattern_type"]').val($(this).attr("value"));
1983+
$(".pattern-dropdown").text($(this).text());
1984+
});
1985+
19781986
$("#exclude_pattern_form").on("submit", function (e) {
19791987
e.preventDefault();
19801988

@@ -1996,7 +2004,7 @@ $("#exclude_pattern_form").on("submit", function (e) {
19962004

19972005
postExcludePatterns(
19982006
(match_pattern = inputs.match_pattern),
1999-
(match_pattern_type = 2)
2007+
(match_pattern_type = inputs.match_pattern_type)
20002008
);
20012009

20022010
// close the modal if it is open
@@ -2024,7 +2032,7 @@ $("#include_pattern_form").on("submit", function (e) {
20242032

20252033
postIncludePatterns(
20262034
(match_pattern = inputs.match_pattern),
2027-
(match_pattern_type = 2)
2035+
(match_pattern_type = inputs.match_pattern_type)
20282036
);
20292037

20302038
// close the modal if it is open
@@ -2042,7 +2050,7 @@ $("#title_pattern_form").on("submit", function (e) {
20422050
postTitlePatterns(
20432051
(match_pattern = inputs.match_pattern),
20442052
(title_pattern = inputs.title_pattern),
2045-
(match_pattern_type = 2)
2053+
(match_pattern_type = inputs.match_pattern_type)
20462054
);
20472055

20482056
// close the modal if it is open
@@ -2059,7 +2067,7 @@ $("#document_type_pattern_form").on("submit", function (e) {
20592067

20602068
postDocumentTypePatterns(
20612069
inputs.match_pattern,
2062-
2,
2070+
inputs.match_pattern_type,
20632071
inputs.document_type_pattern
20642072
);
20652073

‎sde_indexing_helper/templates/sde_collections/delta_urls_list.html‎

Lines changed: 75 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -425,15 +425,30 @@ <h5 class="modal-title" id="excludePatternModalLabel">Exclude Pattern Form</h5>
425425
<form id="exclude_pattern_form">
426426
<div class="modal-body">
427427
<div class="form-group">
428-
<label for="match_pattern_input" class="form-label">Match Pattern <div class="asterik">*</div></label>
428+
<label for="match_pattern_input" class="form-label">Match Pattern<span class="asterik">*</span></label>
429429
<input type="text" class="form-control" id="match_pattern_input" required name="match_pattern">
430430
</div>
431+
<div class="form-group pattern-form-group">
432+
<label for="pattern_type_input" class="form-label">Pattern Type<span class="asterik">*</span></label>
433+
<div class="input-group">
434+
<input type="hidden" name="match_pattern_type" class="form-control" id="pattern_type_input" required>
435+
<div class="input-group-append pattern-dropdown-input">
436+
<button class="btn btn-secondary btn-block dropdown-toggle pattern-dropdown" type="button"
437+
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Select Pattern Type</button>
438+
<div class="pattern-type-form dropdown-menu">
439+
<a class="dropdown-item pattern_type_form_select" value="1">Individual URL Pattern</a>
440+
<a class="dropdown-item pattern_type_form_select" value="2">Multi-URL Pattern</a>
441+
</div>
442+
</div>
443+
</div>
444+
</div>
431445
</div>
432446
<div class="modal-footer">
433447
<div class="button-wrapper">
434-
<button type="button" class="btn btn-secondary modal-button-1" data-dismiss="modal">Close</button>
435-
<button type="submit" class="btn btn-primary modal-button-2">Submit</button>
436-
</div></div>
448+
<button type="button" class="btn btn-secondary modal-button-1" data-dismiss="modal">Close</button>
449+
<button type="submit" class="btn btn-primary modal-button-2">Submit</button>
450+
</div>
451+
</div>
437452
</form>
438453
</div>
439454
</div>
@@ -454,6 +469,20 @@ <h5 class="modal-title" id="includePatternModalLabel">Include Pattern Form</h5>
454469
<label for="match_pattern_input" class="form-label">Match Pattern <div class="asterik">*</div></label>
455470
<input type="text" class="form-control" id="match_pattern_input" required name="match_pattern">
456471
</div>
472+
<div class="form-group pattern-form-group">
473+
<label for="pattern_type_input" class="form-label">Pattern Type<span class="asterik">*</span></label>
474+
<div class="input-group">
475+
<input type="hidden" name="match_pattern_type" class="form-control" id="pattern_type_input" required>
476+
<div class="input-group-append pattern-dropdown-input">
477+
<button class="btn btn-secondary btn-block dropdown-toggle pattern-dropdown" type="button"
478+
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Select Pattern Type</button>
479+
<div class="pattern-type-form dropdown-menu">
480+
<a class="dropdown-item pattern_type_form_select" value="1">Individual URL Pattern</a>
481+
<a class="dropdown-item pattern_type_form_select" value="2">Multi-URL Pattern</a>
482+
</div>
483+
</div>
484+
</div>
485+
</div>
457486
</div>
458487
<div class="modal-footer">
459488
<div class="button-wrapper">
@@ -484,6 +513,20 @@ <h5 class="modal-title" id="titlePatternModalLabel">Title Pattern Form</h5>
484513
<label for="title_pattern_input" class="form-label">Title Pattern <div class="asterik">*</div></label>
485514
<input type="text" class="form-control" id="title_pattern_input" required name="title_pattern">
486515
</div>
516+
<div class="form-group pattern-form-group">
517+
<label for="pattern_type_input" class="form-label">Pattern Type<span class="asterik">*</span></label>
518+
<div class="input-group">
519+
<input type="hidden" name="match_pattern_type" class="form-control" id="pattern_type_input" required>
520+
<div class="input-group-append pattern-dropdown-input">
521+
<button class="btn btn-secondary btn-block dropdown-toggle pattern-dropdown" type="button"
522+
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Select Pattern Type</button>
523+
<div class="pattern-type-form dropdown-menu">
524+
<a class="dropdown-item pattern_type_form_select" value="1">Individual URL Pattern</a>
525+
<a class="dropdown-item pattern_type_form_select" value="2">Multi-URL Pattern</a>
526+
</div>
527+
</div>
528+
</div>
529+
</div>
487530
</div>
488531
<div class="modal-footer">
489532
<div class="button-wrapper">
@@ -529,6 +572,20 @@ <h5 class="modal-title" id="documentTypePatternModalLabel">Document Type Pattern
529572
</div>
530573
</div>
531574
</div>
575+
<div class="form-group pattern-form-group">
576+
<label for="pattern_type_input" class="form-label">Pattern Type<span class="asterik">*</span></label>
577+
<div class="input-group">
578+
<input type="hidden" name="match_pattern_type" class="form-control" id="pattern_type_input" required>
579+
<div class="input-group-append pattern-dropdown-input">
580+
<button class="btn btn-secondary btn-block dropdown-toggle pattern-dropdown" type="button"
581+
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Select Pattern Type</button>
582+
<div class="pattern-type-form dropdown-menu">
583+
<a class="dropdown-item pattern_type_form_select" value="1">Individual URL Pattern</a>
584+
<a class="dropdown-item pattern_type_form_select" value="2">Multi-URL Pattern</a>
585+
</div>
586+
</div>
587+
</div>
588+
</div>
532589
</div>
533590
<div class="modal-footer">
534591
<div class="button-wrapper">
@@ -573,6 +630,20 @@ <h5 class="modal-title" id="divisionPatternModalLabel">Division Pattern Form</h5
573630
</div>
574631
</div>
575632
</div>
633+
<div class="form-group pattern-form-group">
634+
<label for="pattern_type_input" class="form-label">Pattern Type<span class="asterik">*</span></label>
635+
<div class="input-group">
636+
<input type="hidden" name="match_pattern_type" class="form-control" id="pattern_type_input" required>
637+
<div class="input-group-append pattern-dropdown-input">
638+
<button class="btn btn-secondary btn-block dropdown-toggle pattern-dropdown" type="button"
639+
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Select Pattern Type</button>
640+
<div class="pattern-type-form dropdown-menu">
641+
<a class="dropdown-item pattern_type_form_select" value="1">Individual URL Pattern</a>
642+
<a class="dropdown-item pattern_type_form_select" value="2">Multi-URL Pattern</a>
643+
</div>
644+
</div>
645+
</div>
646+
</div>
576647
</div>
577648
<div class="modal-footer">
578649
<div class="button-wrapper">

0 commit comments

Comments
 (0)