paulmataruso/tacticalrmm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #743 from bc24fl/develop

Browse Source 
Fixed sorting under Folder View in Script Manager
This commit is contained in:
Dan
2021-10-07 22:42:33 -07:00
committed by GitHub
parent c4ffffeec8 1770549f6c
commit f3754588bd
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
web/src/components/scripts/ScriptManager.vue
View File

@@ -489,9 +489,24 @@ export default {
// add Unassigned category
categoriesTemp.push("Unassigned");
const sorted = categoriesTemp.sort();
const sortedCategories = categoriesTemp.sort();
sorted.forEach(category => {
// sort by name property
const sortedScripts = scriptsTemp.sort(function (a, b) {
const nameA = a.name.toUpperCase();
const nameB = b.name.toUpperCase();
if (nameA < nameB) {
return -1;
}
if (nameA > nameB) {
return 1;
}
// names must be equal
return 0;
});
sortedCategories.forEach(category => {
let temp = {
icon: "folder",
iconColor: "yellow-9",
@@ -500,13 +515,12 @@ export default {
id: category,
children: [],
};
for (var i = scriptsTemp.length - 1; i >= 0; i--) {
if (scriptsTemp[i].category === category) {
temp.children.push({ label: scriptsTemp[i].name, header: "script", ...scriptsTemp[i] });
scriptsTemp.splice(i, 1);
} else if (category === "Unassigned" && !scriptsTemp[i].category) {
temp.children.push({ label: scriptsTemp[i].name, header: "script", ...scriptsTemp[i] });
scriptsTemp.splice(i, 1);
for (let x = 0; x < sortedScripts.length; x++) {
if (sortedScripts[x].category === category) {
temp.children.push({ label: sortedScripts[x].name, header: "script", ...sortedScripts[x] });
} else if (category === "Unassigned" && !sortedScripts[x].category) {
temp.children.push({ label: sortedScripts[x].name, header: "script", ...sortedScripts[x] });
}
}
@@ -633,4 +647,4 @@ export default {
};
},
};
</script>
</script>