Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3227 bugfix title patterns selecting multi url pattern does nothing #1230

Merged
merged 3 commits into from
Feb 21, 2025
Merged

3227 bugfix title patterns selecting multi url pattern does nothing #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c170afe
corrected column refernce in js file
bishwaspraveen Feb 20, 2025
2d7aa81
made changes on all the tables for consistency
bishwaspraveen Feb 21, 2025
d7c05e2
added achnage log
bishwaspraveen Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,10 @@ For each PR made, an entry should be added to this changelog. It should contain
- Defined a class `HTMLFreeCharField` which inherits `serializers.CharField`
- Used regex to catch any HTML content comming in as an input to form fields
- Called this class within the serializer for necessary fields

- 3227-bugfix-title-patterns-selecting-multi-url-pattern-does-nothing
- Description: When selecting options from the match pattern type filter, the system does not filter the results as expected. Instead of displaying only the chosen variety of patterns, it continues to show all patterns.
- Changes:
- In `title_patterns_table` definition, corrected the column reference
- Made `match_pattern_type` searchable
- Corrected the column references and made code consistent on all the other tables, i.e., `exclude_patterns_table`, `include_patterns_table`, `division_patterns_table` and `document_type_patterns_table`
151 changes: 43 additions & 108 deletions sde_indexing_helper/static/js/delta_url_list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,12 +578,10 @@ function initializeDataTable() {
$("#exclude-patterns-dropdown-1").prop("disabled", true);
} else if (index === 1) {
$("#exclude-patterns-dropdown-1").on("change", function () {
if ($(this).val() === "") table.columns(6).search("").draw();
if ($(this).val() === "") table.columns(7).search("").draw();
else {
table
.column(6)
.search(matchPatternTypeMap[$(this).val()])
.draw();
const patternType = matchPatternTypeMap[$(this).val()];
table.column(7).search(patternType).draw();
}
});
}
Expand Down Expand Up @@ -621,7 +619,7 @@ function initializeDataTable() {
},
},
{ data: "id", visible: false, searchable: false },
{ data: "match_pattern_type", visible: false },
{ data: "match_pattern_type", visible: false, searchable: true },
],
});

Expand Down Expand Up @@ -671,11 +669,11 @@ function initializeDataTable() {
} else {
if (index === 1) {
$("#include-patterns-dropdown-1").on("change", function () {
if ($(this).val() === "") table.columns(5).search("").draw();
table
.column(5)
.search(matchPatternTypeMap[$(this).val()])
.draw();
if ($(this).val() === "") table.columns(6).search("").draw();
else {
const patternType = matchPatternTypeMap[$(this).val()];
table.column(6).search(patternType).draw();
}
});
}
}
Expand Down Expand Up @@ -707,7 +705,7 @@ function initializeDataTable() {
},
},
{ data: "id", visible: false, searchable: false },
{ data: "match_pattern_type", visible: false },
{ data: "match_pattern_type", visible: false, searchable: true },
],
});

Expand Down Expand Up @@ -754,12 +752,10 @@ function initializeDataTable() {
$("#title-patterns-dropdown-1").prop("disabled", true);
} else if (index === 1) {
$("#title-patterns-dropdown-1").on("change", function () {
if ($(this).val() === "") table.columns(6).search("").draw();
if ($(this).val() === "") table.columns(7).search("").draw();
else {
table
.column(6)
.search(matchPatternTypeMap[$(this).val()])
.draw();
const patternType = matchPatternTypeMap[$(this).val()];
table.column(7).search(patternType).draw();
}
});
}
Expand Down Expand Up @@ -792,7 +788,7 @@ function initializeDataTable() {
},
},
{ data: "id", visible: false, searchable: false },
{ data: "match_pattern_type", visible: false },
{ data: "match_pattern_type", visible: false, searchable: true },
],
});

Expand Down Expand Up @@ -833,53 +829,19 @@ function initializeDataTable() {
pageLength: 100,
ajax: `/api/document-type-patterns/?format=datatables&collection_id=${collection_id}`,
initComplete: function (data) {
this.api()
.columns()
.every(function (index) {
var table = $("#document_type_patterns_table").DataTable();

let addDropdownSelect = {
1: {
columnToSearch: 6,
matchPattern: {
"Individual URL Pattern": 1,
"Multi-URL Pattern": 2,
},
},
2: {
columnToSearch: 7,
matchPattern: {
Images: 1,
Data: 2,
Documentation: 3,
"Software and Tools": 4,
"Missions and Instruments": 5,
},
},
};

let column = this;
if (column.data().length === 0) {
$(`#document-type-patterns-dropdown-${index}`).prop(
"disabled",
true
);
} else if (index in addDropdownSelect) {
$("#document-type-patterns-dropdown-" + index).on(
"change",
function () {
let col = addDropdownSelect[index].columnToSearch;
let searchInput =
addDropdownSelect[index].matchPattern[$(this).val()];
if ($(this).val() === "" || $(this).val() === undefined)
table.columns(col).search("").draw();
else {
table.columns(col).search(searchInput).draw();
}
}
);
}
});
var table = $("#document_type_patterns_table").DataTable();
this.api().columns().every(function (index) {
if (index === 1) {
$("#document-type-patterns-dropdown-1").on("change", function () {
if ($(this).val() === "") {
table.column(7).search("").draw();
} else {
const patternType = matchPatternTypeMap[$(this).val()];
table.column(7).search(patternType).draw();
}
});
}
});
},

columns: [
Expand Down Expand Up @@ -909,7 +871,7 @@ function initializeDataTable() {
},
},
{ data: "id", visible: false, searchable: false },
{ data: "match_pattern_type", visible: false },
{ data: "match_pattern_type", visible: false, searchable: true },
{ data: "document_type", visible: false },
],
});
Expand Down Expand Up @@ -945,47 +907,20 @@ var division_patterns_table = $("#division_patterns_table").DataTable({
pageLength: 100,
ajax: `/api/division-patterns/?format=datatables&collection_id=${collection_id}`,
initComplete: function (data) {
this.api()
.columns()
.every(function (index) {
var table = $("#division_patterns_table").DataTable();

let addDropdownSelect = {
1: {
columnToSearch: 6,
matchPattern: {
"Individual URL Pattern": 1,
"Multi-URL Pattern": 2,
},
},
2: {
columnToSearch: 7,
matchPattern: {
"Astrophysics": 1,
"Biological and Physical Sciences": 2,
"Earth Science": 3,
"Heliophysics": 4,
"Planetary Science": 5,
},
},
};

let column = this;
if (column.data().length === 0) {
$(`#division-patterns-dropdown-${index}`).prop("disabled", true);
} else if (index in addDropdownSelect) {
$("#division-patterns-dropdown-" + index).on("change", function () {
let col = addDropdownSelect[index].columnToSearch;
let searchInput =
addDropdownSelect[index].matchPattern[$(this).val()];
if ($(this).val() === "" || $(this).val() === undefined)
table.columns(col).search("").draw();
else {
table.columns(col).search(searchInput).draw();
}
});
}
});
var table = $("#division_patterns_table").DataTable();
this.api().columns().every(function (index) {
if (index === 1) {
// Updated pattern type dropdown handler
$("#division-patterns-dropdown-1").on("change", function () {
if ($(this).val() === "") {
table.column(7).search("").draw();
} else {
const patternType = matchPatternTypeMap[$(this).val()];
table.column(7).search(patternType).draw();
}
});
}
});
},

columns: [
Expand Down Expand Up @@ -1015,7 +950,7 @@ var division_patterns_table = $("#division_patterns_table").DataTable({
},
},
{ data: "id", visible: false, searchable: false },
{ data: "match_pattern_type", visible: false },
{ data: "match_pattern_type", visible: false, searchable: true },
{ data: "division", visible: false },
],
});
Expand Down