From 5734ae6b6a35fa2585b2bc4270e743afbaa267b6 Mon Sep 17 00:00:00 2001
From: ofirgalcon <ofir@gal.co.uk>
Date: Sat, 1 Feb 2025 23:51:26 +0000
Subject: [PATCH 1/5] buttons, optim, outofdate widget

client tab - add listing and report buttons, optimise
improve out of date widget
---
 js/softwareupdate.js                      |  20 +
 locales/en.json                           |   1 +
 softwareupdate_controller.php             |   3 +
 views/softwareupdate_outofdate_widget.yml |  12 +-
 views/softwareupdate_tab.php              | 426 +++++++++-------------
 5 files changed, 208 insertions(+), 254 deletions(-)

diff --git a/js/softwareupdate.js b/js/softwareupdate.js
index 9bf9dc2..065b9b9 100755
--- a/js/softwareupdate.js
+++ b/js/softwareupdate.js
@@ -62,4 +62,24 @@ var ManagedDeferralCounterFilter = function(colNumber, d){
         // Clear global search
         d.search.value = '';
     }
+}
+
+var uptodateFilter = function(colNumber, d){
+    // Look for 'not_safety_frozen' keyword
+    if(d.search.value.match(/^macos_updtodate$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'safety_frozen' keyword
+    if(d.search.value.match(/^macos_not_updtodate$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '!= 0';
+        // Clear global search
+        d.search.value = '';
+    }
 }
\ No newline at end of file
diff --git a/locales/en.json b/locales/en.json
index 220a24b..1d45d76 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -16,6 +16,7 @@
     "lastfullsuccessfuldate": "Last Full Success Date",
     "lastrecommendedupdatesavailable": "Recommended Available Updates",
     "mac_os_uptodate": "macOS Up-to-date",
+    "lastrecommendedupdatesavailable_widget": "macOS Updates Pending",
     "lastresultcode": "Last Result Code",
     "lastsessionsuccessful": "Session Successful",
     "lastsessionsuccessful_widget": "Last Update Session Successful",
diff --git a/softwareupdate_controller.php b/softwareupdate_controller.php
index 070f03f..75212a2 100644
--- a/softwareupdate_controller.php
+++ b/softwareupdate_controller.php
@@ -76,9 +76,12 @@ public function get_pending_widget($column = '')
         $updates = [];
 
         foreach(Softwareupdate_model::select($column . ' AS label')
+                    ->selectRaw('count(*) AS count')
                     ->whereNotNull($column)
                     ->where($column, '<>', '')
                     ->filter()
+                    ->groupBy($column)
+                    ->orderBy('count', 'desc')
                     ->get()
                     ->toArray() as $update){
             $update_array = explode( ', ', $update['label']);
diff --git a/views/softwareupdate_outofdate_widget.yml b/views/softwareupdate_outofdate_widget.yml
index 8c4e6c9..9a2d9d1 100755
--- a/views/softwareupdate_outofdate_widget.yml
+++ b/views/softwareupdate_outofdate_widget.yml
@@ -1,13 +1,15 @@
 type: button
 widget_id: su_outofdate-widget
 api_url: /module/softwareupdate/get_binary_widgetx/lastrecommendedupdatesavailable
-i18n_title: softwareupdate.mac_os_uptodate
-icon: fa-check-square
+i18n_title: softwareupdate.lastrecommendedupdatesavailable_widget
+icon: fa-apple
 listing_link: /show/listing/softwareupdate/softwareupdate
 buttons:
   - label: 1
-    i18n_label: no
-    class: btn-danger 
-  - label: 0
     i18n_label: yes
+    class: btn-danger
+    search_component: macos_not_updtodate 
+  - label: 0
+    i18n_label: no
     class: btn-success
+    search_component: macos_updtodate 
diff --git a/views/softwareupdate_tab.php b/views/softwareupdate_tab.php
index 232a2cd..bb399a6 100755
--- a/views/softwareupdate_tab.php
+++ b/views/softwareupdate_tab.php
@@ -1,4 +1,15 @@
 <div id="softwareupdate-tab"></div>
+
+<div id="lister" style="font-size: large; float: right;">
+    <a href="/show/listing/softwareupdate/softwareupdate" title="List">
+        <i class="btn btn-default tab-btn fa fa-list"></i>
+    </a>
+</div>
+<div id="report_btn" style="font-size: large; float: right;">
+    <a href="/show/report/softwareupdate/softwareupdate_report" title="Report">
+        <i class="btn btn-default tab-btn fa fa-th"></i>
+    </a>
+</div>
 <h2 data-i18n="softwareupdate.softwareupdate"></h2>
 
 <div id="softwareupdate-msg" data-i18n="listing.loading" class="col-lg-12 text-center"></div>
@@ -6,266 +17,183 @@
 <script>
 $(document).on('appReady', function(){
    $.getJSON(appUrl + '/module/softwareupdate/get_tab_data/' + serialNumber, function(data){
-
-        // Set default badge to be blank
-        $('#softwareupdate-cnt').text('')
-
-        // Check if we have data
-        if( data.length == 0 ){
+        // Reset badge and handle empty data
+        $('#softwareupdate-cnt').text('');
+        
+        if (!data.length) {
             $('#softwareupdate-msg').text(i18n.t('no_data'));
+            return;
+        }
 
-        } else {
-            // Hide loading message
-            $('#softwareupdate-msg').text('');
-
-            $.each(data, function(i,d){
-
-                // Generate rows from data
-                var rows = ''
-                var rows_details = ''
-                var rows_seed = ''
-                var rows_mrt = ''
-                var rows_kext = ''
-                var rows_gatekeeper = ''
-                var rows_xprotect = ''
-                var rows_history = '<tr><td></td><td></td><td></td><td></td><td></td></tr>'
-                for (var prop in d){
-                    if ((d[prop] == '' || d[prop] == null) && d[prop] !== 0){
-                       // Do nothing for empty values to blank them
-
-                    } else if((prop == "lastfullsuccessfuldate" && d[prop] > 100) || (prop == "lastbackgroundsuccessfuldate" && d[prop] > 100) || (prop == "lastsuccessfuldate" && d[prop] > 100)){
-                        var date = new Date(d[prop] * 1000);
-                        rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td><span title="'+moment(date).fromNow()+'">'+moment(date).format('llll')+'</span></td></tr>';
-
-                    } else if((prop == "gatekeeper_disk_last_modified" && d[prop] > 100) || (prop == "gatekeeper_last_modified" && d[prop] > 100)){
-                        var date = new Date(d[prop] * 1000);
-                        rows_gatekeeper = rows_gatekeeper + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td><span title="'+moment(date).fromNow()+'">'+moment(date).format('llll')+'</span></td></tr>';
-
-                    } else if((prop == "mrxprotect" && d[prop] > 100) || (prop == 'xprotect_payloads_last_modified' && d[prop] > 100)){
-                        var date = new Date(d[prop] * 1000);
-                        rows_xprotect = rows_xprotect + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td><span title="'+moment(date).fromNow()+'">'+moment(date).format('llll')+'</span></td></tr>';
-
-                    } else if((prop == "kext_exclude_last_modified" && d[prop] > 100)){
-                        var date = new Date(d[prop] * 1000);
-                        rows_kext = rows_kext + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td><span title="'+moment(date).fromNow()+'">'+moment(date).format('llll')+'</span></td></tr>';
-
-                    } else if((prop == "mrt_last_modified" && d[prop] > 100)){
-                        var date = new Date(d[prop] * 1000);
-                        rows_mrt = rows_mrt + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td><span title="'+moment(date).fromNow()+'">'+moment(date).format('llll')+'</span></td></tr>';
-
-
-                    } else if((prop == 'automaticcheckenabled' || prop == 'automaticdownload' || prop == 'allow_prerelease_installation' || prop == 'configdatainstall' || prop == 'criticalupdateinstall' || prop == 'skiplocalcdn' || prop == 'skip_download_lack_space' || prop == 'eval_critical_if_unchanged' || prop == 'one_time_force_scan_enabled' || prop == 'auto_update' || prop == 'auto_update_restart_required' || prop == 'lastsessionsuccessful' || prop == 'allow_rapid_security_response_installation' || prop == 'allow_rapid_security_response_removal') && d[prop] == 1){
-                        rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+i18n.t('yes')+'</td></tr>';
-
-                    } else if((prop == 'automaticcheckenabled' || prop == 'automaticdownload' || prop == 'allow_prerelease_installation' || prop == 'configdatainstall' || prop == 'criticalupdateinstall' || prop == 'skiplocalcdn' || prop == 'skip_download_lack_space' || prop == 'eval_critical_if_unchanged' || prop == 'one_time_force_scan_enabled' || prop == 'auto_update' || prop == 'auto_update_restart_required' || prop == 'lastsessionsuccessful' || prop == 'allow_rapid_security_response_installation' || prop == 'allow_rapid_security_response_removal') && d[prop] == 0){
-                        rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+i18n.t('no')+'</td></tr>';
-
-                    } else if((prop == 'automaticcheckenabled' || prop == 'automaticdownload' || prop == 'allow_prerelease_installation' || prop == 'configdatainstall' || prop == 'criticalupdateinstall' || prop == 'skiplocalcdn' || prop == 'skip_download_lack_space' || prop == 'eval_critical_if_unchanged' || prop == 'one_time_force_scan_enabled' || prop == 'auto_update' || prop == 'auto_update_restart_required' || prop == 'lastsessionsuccessful' || prop == 'allow_rapid_security_response_installation' || prop == 'allow_rapid_security_response_removal') && d[prop] == -1){
-                        // Do nothing for -1 values because they're empty
-                        rows = rows
-
-                    // Process force_delayed_minor_updates and force_delayed_major_updates
-                    } else if((prop == 'force_delayed_minor_updates' || prop == 'force_delayed_major_updates') && d[prop] == 0){
-                        rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+i18n.t('no')+'</td></tr>';
-                    } else if((prop == 'force_delayed_minor_updates' || prop == 'force_delayed_major_updates') && d[prop] == 1){
-                        if (prop == 'force_delayed_minor_updates' && d['minor_deferred_delay'] == 1){
-                            rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+i18n.t('yes')+' - '+d['minor_deferred_delay']+' '+i18n.t('date.day')+'</td></tr>';
-                        } else if (prop == 'force_delayed_minor_updates' && d['minor_deferred_delay'] > 1){
-                            rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+i18n.t('yes')+' - '+d['minor_deferred_delay']+' '+i18n.t('date.day_plural')+'</td></tr>';
-                        } else {
-                            rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+i18n.t('yes')+'</td></tr>';
-                        }
-
-                        if (prop == 'force_delayed_major_updates' && d['major_deferred_delay'] == 1){
-                            rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+i18n.t('yes')+' - '+d['major_deferred_delay']+' '+i18n.t('date.day')+'</td></tr>';
-                        } else if (prop == 'force_delayed_minor_updates' && d['major_deferred_delay'] > 1){
-                            rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+i18n.t('yes')+' - '+d['major_deferred_delay']+' '+i18n.t('date.day_plural')+'</td></tr>';
+        // Hide loading message
+        $('#softwareupdate-msg').text('');
+
+        // Helper functions
+        const formatDate = timestamp => {
+            const date = new Date(timestamp * 1000);
+            return `<span title="${moment(date).fromNow()}">${moment(date).format('llll')}</span>`;
+        };
+
+        const createSection = (icon, title, content, maxWidth) => {
+            if (!icon && !title) {
+                return `<div style="max-width:${maxWidth}px;">
+                    <table class="table table-striped table-condensed">
+                        <tbody>${content}</tbody>
+                    </table>
+                </div>`;
+            }
+            return `<h4><i class="fa ${icon}"></i> ${i18n.t('softwareupdate.' + title)}</h4>
+                <div style="max-width:${maxWidth}px;">
+                    <table class="table table-striped table-condensed">
+                        <tbody>${content}</tbody>
+                    </table>
+                </div>`;
+        };
+
+        $.each(data, function(i, d){
+            let sections = {
+                main: [],
+                details: [],
+                seed: [],
+                mrt: [],
+                kext: [],
+                gatekeeper: [],
+                xprotect: [],
+                history: []
+            };
+
+            // Initialize history header
+            sections.history.push('<tr>' +
+                '<th>'+i18n.t('softwareupdate.display_name')+'</th>' +
+                '<th>'+i18n.t('softwareupdate.display_version')+'</th>' +
+                '<th>'+i18n.t('softwareupdate.install_date')+'</th>' +
+                '<th>'+i18n.t('softwareupdate.content_type')+'</th>' +
+                '<th>'+i18n.t('softwareupdate.package_identifiers')+'</th>' +
+            '</tr>');
+
+            for (const prop in d) {
+                const value = d[prop];
+                if (!value && value !== 0) continue;
+
+                // Handle dates
+                if (/last.*date/.test(prop) && value > 100) {
+                    sections.main.push(`<tr><th>${i18n.t('softwareupdate.'+prop)}</th><td>${formatDate(value)}</td></tr>`);
+                }
+                // Handle boolean properties
+                else if (['automaticcheckenabled', 'automaticdownload', 'allow_prerelease_installation', 
+                         'configdatainstall', 'criticalupdateinstall', 'skiplocalcdn', 
+                         'skip_download_lack_space', 'eval_critical_if_unchanged', 
+                         'one_time_force_scan_enabled', 'auto_update', 'auto_update_restart_required',
+                         'lastsessionsuccessful', 'allow_rapid_security_response_installation',
+                         'allow_rapid_security_response_removal'].includes(prop)) {
+                    if (value !== -1) {
+                        sections.main.push(`<tr><th>${i18n.t('softwareupdate.'+prop)}</th><td>${i18n.t(value ? 'yes' : 'no')}</td></tr>`);
+                    }
+                }
+                // Handle delayed updates
+                else if (prop === 'force_delayed_minor_updates' || prop === 'force_delayed_major_updates') {
+                    if (value === 0) {
+                        sections.main.push(`<tr><th>${i18n.t('softwareupdate.'+prop)}</th><td>${i18n.t('no')}</td></tr>`);
+                    } else if (value === 1) {
+                        const delayType = prop === 'force_delayed_minor_updates' ? 'minor_deferred_delay' : 'major_deferred_delay';
+                        const delayDays = d[delayType];
+                        const dayText = delayDays === 1 ? 'day' : 'day_plural';
+                        if (delayDays) {
+                            sections.main.push(`<tr><th>${i18n.t('softwareupdate.'+prop)}</th><td>${i18n.t('yes')} - ${delayDays} ${i18n.t('date.'+dayText)}</td></tr>`);
                         } else {
-                            rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+i18n.t('yes')+'</td></tr>';
+                            sections.main.push(`<tr><th>${i18n.t('softwareupdate.'+prop)}</th><td>${i18n.t('yes')}</td></tr>`);
                         }
-
-                    } else if((prop == 'build_is_seed' || prop == 'disable_seed_opt_out' || prop == 'show_feedback_menu') && d[prop] == 1){
-                        rows_seed = rows_seed + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+i18n.t('yes')+'</td></tr>';
-                    } else if((prop == 'build_is_seed' || prop == 'disable_seed_opt_out' || prop == 'show_feedback_menu') && d[prop] == 0){
-                        rows_seed = rows_seed + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+i18n.t('no')+'</td></tr>';
-
-                    } else if(prop == 'lastrecommendedupdatesavailable'){
-                        $('#softwareupdate-cnt').text(d[prop])
-                        rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+d[prop]+'</td></tr>';
-
-                    } else if(prop == 'program_seed' && d[prop] == 0){
-                        rows_seed = rows_seed + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td><span class="label label-success">'+i18n.t('softwareupdate.unenrolled')+'</span></td></tr>';
-                    } else if(prop == 'program_seed' && d[prop] == 1){
-                        rows_seed = rows_seed + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td><span class="label label-warning">'+i18n.t('softwareupdate.customerseed')+'</span></td></tr>';
-                    } else if(prop == 'program_seed' && d[prop] == 2){
-                        rows_seed = rows_seed + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td><span class="label label-danger">'+i18n.t('softwareupdate.developerseed')+'</span></td></tr>';
-                    } else if(prop == 'program_seed' && d[prop] == 3){
-                        rows_seed = rows_seed + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td><span class="label label-warning">'+i18n.t('softwareupdate.publicseed')+'</span></td></tr>';
-                    } else if(prop == 'program_seed'){
-                        rows_seed = rows_seed + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+d[prop]+'</td></tr>';
-                    } else if(prop == 'enrolled_seed'){
-                        rows_seed = rows_seed + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+d[prop]+'</td></tr>';
-
-                    } else if(prop == 'mrt_version'){
-                        rows_mrt = rows_mrt + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+d[prop]+'</td></tr>';
-                    } else if(prop == 'kext_exclude_version'){
-                        rows_kext = rows_kext + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+d[prop]+'</td></tr>';
-                    } else if(prop == 'gatekeeper_version' || prop == 'gatekeeper_disk_version'){
-                        rows_gatekeeper = rows_gatekeeper + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+d[prop]+'</td></tr>';
-                    } else if(prop == 'xprotect_version' || prop == 'xprotect_version' || prop == 'xprotect_payloads_version'){
-                        rows_xprotect = rows_xprotect + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+d[prop]+'</td></tr>';
-
-                    // Else if build out the softwareupdate history table
-                    } else if(prop == "softwareupdate_history"){
-                        var softwareupdate_history_data = JSON.parse(d['softwareupdate_history']);
-                        rows_history = '<tr><th>'+i18n.t('softwareupdate.display_name')+'</th><th>'+i18n.t('softwareupdate.display_version')+'</th><th>'+i18n.t('softwareupdate.install_date')+'</th><th>'+i18n.t('softwareupdate.content_type')+'</th><th>'+i18n.t('softwareupdate.package_identifiers')+'</th></tr>'
-                        $.each(softwareupdate_history_data.reverse(), function(i,d){
-                            if (typeof d['display_name'] !== "undefined") {var display_name = d['display_name']} else {var display_name = ""}
-                            if (typeof d['display_version'] !== "undefined") {var display_version = d['display_version']} else {var display_version = ""}
-                            if (typeof d['date'] !== "undefined") {var date_1 = new Date(d['date'] * 1000); date = '<span title="'+moment(date_1).fromNow()+'">'+moment(date_1).format('llll')} else {var date = ""}
-                            if (typeof d['content_type'] !== "undefined") {var content_type = d['content_type']} else {var content_type = ""}
-                            if (typeof d['package_identifiers'] !== "undefined") {var package_identifiers = d['package_identifiers'].join(", ")} else {var package_identifiers = ""}
-                            // Generate rows from data
-                            rows_history = rows_history + '<tr><td style="min-width:220px;">'+display_name+'</td><td style="min-width:117px;">'+display_version+'</td><td style="min-width:200px;">'+date+'</td><td style="min-width:105px;">'+content_type+'</td><td>'+package_identifiers+'</td></tr>';
-                        })
-                        rows_history = rows_history // Close softwareupdate history table framework
-
-                    } else if(prop == "ddm_info"){
-                        rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+d[prop].replaceAll("\n", "<br>")+'</td></tr>';
-
-                    } else if(prop == "deferred_updates"){
-                        // Build out the software update details table
-                        var softwareupdate_detail_data = JSON.parse(d['deferred_updates']);
-                        rows_details = '<tr><th>'+i18n.t('softwareupdate.name')+'</th><th>'+i18n.t('softwareupdate.version')+'</th><th>'+i18n.t('softwareupdate.build')+'</th><th>'+i18n.t('softwareupdate.deferred')+'</th><th>'+i18n.t('softwareupdate.deferred_until')+'</th><th>'+i18n.t('softwareupdate.major_os_update')+'</th><th>'+i18n.t('softwareupdate.minor_os_update')+'</th><th>'+i18n.t('softwareupdate.download_size')+'</th><th>'+i18n.t('softwareupdate.product_key')+'</th></tr>'
-                        $.each(softwareupdate_detail_data, function(i,d){
-                            if (typeof d['name'] !== "undefined") {var name = d['name']} else {var name = ""}
-                            if (typeof d['version'] !== "undefined") {var version = d['version']} else {var version = ""}
-                            if (typeof d['build'] !== "undefined") {var build = d['build']} else {var build = ""}
-                            if (typeof d['deferred'] !== "undefined" && d['deferred'] == "1") {var deferred = i18n.t('yes')} else {var deferred = i18n.t('no')}
-                            if (typeof d['deferred_until'] !== "undefined" && d['deferred'] !== "" && d['deferred'] > 0) {var date_1 = new Date(d['deferred_until'] * 1000); date = '<span title="'+moment(date_1).fromNow()+'">'+moment(date_1).format('llll')} else {var date = ""}
-                            if (typeof d['major_os_update'] !== "undefined" && d['major_os_update'] == "1") {var major_os_update = i18n.t('yes')} else {var major_os_update = i18n.t('no')}
-                            if (typeof d['minor_os_update'] !== "undefined" && d['minor_os_update'] == "1") {var minor_os_update = i18n.t('yes')} else {var minor_os_update = i18n.t('no')}
-                            if (typeof d['security_response_update'] !== "undefined" && d['security_response_update'] == "1") {var security_response_update = i18n.t('yes')} else {var security_response_update = i18n.t('no')}
-                            if (typeof d['download_size'] !== "undefined") {var download_size = fileSize(d['download_size'], 2)} else {var download_size = ""}
-                            if (typeof d['product_key'] !== "undefined") {var product_key = d['product_key']} else {var product_key = ""}
-                            
-                            // Generate rows from data
-                            rows_details = rows_details + '<tr><td style="min-width:200px;">'+name+'</td><td style="min-width:75px;">'+version+'</td><td style="min-width:75px;">'+build+'</td><td style="min-width:75px;">'+deferred+'</td><td style="min-width:200px;">'+date+'</td><td style="min-width:130px;">'+major_os_update+'</td><td style="min-width:130px;">'+minor_os_update+'</td><td style="min-width:100px;">'+download_size+'</td><td style="min-width:100px;">'+product_key+'</td></tr>';
-                        })
-
-                    } else {
-                        rows = rows + '<tr><th>'+i18n.t('softwareupdate.'+prop)+'</th><td>'+d[prop]+'</td></tr>';
                     }
-
-                    // Update the tab badge count
-                    $('#softwareupdate-cnt').text(data.lastupdatesavailable);
                 }
-                $('#softwareupdate-tab')
-                    .append($('<div style="max-width:850px;">')
-                        .append($('<table>')
-                            .addClass('table table-striped table-condensed')
-                            .append($('<tbody>')
-                                .append(rows))))
-
-                if (rows_details != '<tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>' && rows_details != ""){
-                    $('#softwareupdate-tab')
-                        // Write out software update details table
-                        .append($('<h4>')
-                            .append($('<i>')
-                                .addClass('fa fa-info-circle'))
-                            .append(' '+i18n.t('softwareupdate.deferred_updates')))
-                        .append($('<div style="max-width:1000px;">')
-                            .append($('<table>')
-                                .addClass('table table-striped table-condensed')
-                                .append($('<tbody>')
-                                    .append(rows_details))))
-                }
-
-                if (rows_xprotect != ''){
-                    $('#softwareupdate-tab')
-                        // Write out xprotect table
-                        .append($('<h4>')
-                            .append($('<i>')
-                                .addClass('fa fa-shield'))
-                            .append(' '+i18n.t('softwareupdate.xprotect')))
-                        .append($('<div style="max-width:375px;">')
-                            .append($('<table>')
-                                .addClass('table table-striped table-condensed')
-                                .append($('<tbody>')
-                                    .append(rows_xprotect))))
-                }
-
-                if (rows_gatekeeper != ''){
-                    $('#softwareupdate-tab')
-                        // Write out gatekeeper table
-                        .append($('<h4>')
-                            .append($('<i>')
-                                .addClass('fa fa-fort-awesome'))
-                            .append(' '+i18n.t('softwareupdate.gatekeeper')))
-                        .append($('<div style="max-width:375px;">')
-                            .append($('<table>')
-                                .addClass('table table-striped table-condensed')
-                                .append($('<tbody>')
-                                    .append(rows_gatekeeper))))
+                // Handle seed program
+                else if (prop === 'program_seed') {
+                    const seedLabels = {
+                        0: '<span class="label label-success">'+i18n.t('softwareupdate.unenrolled')+'</span>',
+                        1: '<span class="label label-warning">'+i18n.t('softwareupdate.customerseed')+'</span>',
+                        2: '<span class="label label-danger">'+i18n.t('softwareupdate.developerseed')+'</span>',
+                        3: '<span class="label label-warning">'+i18n.t('softwareupdate.publicseed')+'</span>'
+                    };
+                    sections.seed.push(`<tr><th>${i18n.t('softwareupdate.'+prop)}</th><td>${seedLabels[value] || value}</td></tr>`);
                 }
-
-                if (rows_mrt != ''){
-                    $('#softwareupdate-tab')
-                        // Write out mrt table
-                        .append($('<h4>')
-                            .append($('<i>')
-                                .addClass('fa fa-heartbeat'))
-                            .append(' '+i18n.t('softwareupdate.mrt_info')))
-                        .append($('<div style="max-width:375px;">')
-                            .append($('<table>')
-                                .addClass('table table-striped table-condensed')
-                                .append($('<tbody>')
-                                    .append(rows_mrt))))
+                // Handle history
+                else if (prop === 'softwareupdate_history') {
+                    const history = JSON.parse(value);
+                    history.reverse().forEach(item => {
+                        sections.history.push('<tr>' +
+                            `<td style="min-width:220px;">${item.display_name || ''}</td>` +
+                            `<td style="min-width:117px;">${item.display_version || ''}</td>` +
+                            `<td style="min-width:200px;">${item.date ? formatDate(item.date) : ''}</td>` +
+                            `<td style="min-width:105px;">${item.content_type || ''}</td>` +
+                            `<td>${item.package_identifiers ? item.package_identifiers.join(', ') : ''}</td>` +
+                        '</tr>');
+                    });
                 }
-
-                if (rows_kext != ''){
-                    $('#softwareupdate-tab')
-                        // Write out kext table
-                        .append($('<h4>')
-                            .append($('<i>')
-                                .addClass('fa fa-puzzle-piece'))
-                            .append(' '+i18n.t('softwareupdate.kext_exclude')))
-                        .append($('<div style="max-width:375px;">')
-                            .append($('<table>')
-                                .addClass('table table-striped table-condensed')
-                                .append($('<tbody>')
-                                    .append(rows_kext))))
+                // Handle deferred updates
+                else if (prop === 'deferred_updates') {
+                    sections.details.push('<tr>' +
+                        '<th>'+i18n.t('softwareupdate.name')+'</th>' +
+                        '<th>'+i18n.t('softwareupdate.version')+'</th>' +
+                        '<th>'+i18n.t('softwareupdate.build')+'</th>' +
+                        '<th>'+i18n.t('softwareupdate.deferred')+'</th>' +
+                        '<th>'+i18n.t('softwareupdate.deferred_until')+'</th>' +
+                        '<th>'+i18n.t('softwareupdate.major_os_update')+'</th>' +
+                        '<th>'+i18n.t('softwareupdate.minor_os_update')+'</th>' +
+                        '<th>'+i18n.t('softwareupdate.download_size')+'</th>' +
+                        '<th>'+i18n.t('softwareupdate.product_key')+'</th>' +
+                    '</tr>');
+
+                    JSON.parse(value).forEach(update => {
+                        sections.details.push('<tr>' +
+                            `<td style="min-width:200px;">${update.name || ''}</td>` +
+                            `<td style="min-width:75px;">${update.version || ''}</td>` +
+                            `<td style="min-width:75px;">${update.build || ''}</td>` +
+                            `<td style="min-width:75px;">${update.deferred === '1' ? i18n.t('yes') : i18n.t('no')}</td>` +
+                            `<td style="min-width:200px;">${update.deferred_until ? formatDate(update.deferred_until) : ''}</td>` +
+                            `<td style="min-width:130px;">${update.major_os_update === '1' ? i18n.t('yes') : i18n.t('no')}</td>` +
+                            `<td style="min-width:130px;">${update.minor_os_update === '1' ? i18n.t('yes') : i18n.t('no')}</td>` +
+                            `<td style="min-width:100px;">${update.download_size ? fileSize(update.download_size, 2) : ''}</td>` +
+                            `<td style="min-width:100px;">${update.product_key || ''}</td>` +
+                        '</tr>');
+                    });
                 }
-
-                if (rows_seed != ''){
-                    $('#softwareupdate-tab')
-                        // Write out seed table
-                        .append($('<h4>')
-                            .append($('<i>')
-                                .addClass('fa fa-leaf'))
-                            .append(' '+i18n.t('softwareupdate.beta_program')))
-                        .append($('<div style="max-width:375px;">')
-                            .append($('<table>')
-                                .addClass('table table-striped table-condensed')
-                                .append($('<tbody>')
-                                    .append(rows_seed))))
+                // Update badge count
+                else if (prop === 'lastrecommendedupdatesavailable') {
+                    $('#softwareupdate-cnt').text(value);
+                    sections.main.push(`<tr><th>${i18n.t('softwareupdate.'+prop)}</th><td>${value}</td></tr>`);
                 }
-
-                if (rows_history != '<tr><td></td><td></td><td></td><td></td><td></td></tr>'){
-                    $('#softwareupdate-tab')
-                        // Write out softwareupdate_history table
-                        .append($('<h4>')
-                            .append($('<i>')
-                                .addClass('fa fa-history'))
-                            .append(' '+i18n.t('softwareupdate.softwareupdate_history')))
-                        .append($('<div style="max-width:1000px;">')
-                            .append($('<table>')
-                                .addClass('table table-striped table-condensed')
-                                .append($('<tbody>')
-                                    .append(rows_history))))
+                // Handle remaining properties
+                else {
+                    sections.main.push(`<tr><th>${i18n.t('softwareupdate.'+prop)}</th><td>${value}</td></tr>`);
                 }
-            })
-        }
+            }
+
+            // Render all sections
+            const container = $('#softwareupdate-tab');
+            if (sections.main.length) {
+                container.append(createSection('', '', sections.main.join(''), 850));
+            }
+            if (sections.details.length > 1) {
+                container.append(createSection('fa-info-circle', 'deferred_updates', sections.details.join(''), 1000));
+            }
+            if (sections.xprotect.length) {
+                container.append(createSection('fa-shield', 'xprotect', sections.xprotect.join(''), 375));
+            }
+            if (sections.gatekeeper.length) {
+                container.append(createSection('fa-fort-awesome', 'gatekeeper', sections.gatekeeper.join(''), 375));
+            }
+            if (sections.mrt.length) {
+                container.append(createSection('fa-heartbeat', 'mrt_info', sections.mrt.join(''), 375));
+            }
+            if (sections.kext.length) {
+                container.append(createSection('fa-puzzle-piece', 'kext_exclude', sections.kext.join(''), 375));
+            }
+            if (sections.seed.length) {
+                container.append(createSection('fa-leaf', 'beta_program', sections.seed.join(''), 375));
+            }
+            if (sections.history.length > 1) {
+                container.append(createSection('fa-history', 'softwareupdate_history', sections.history.join(''), 1000));
+            }
+        });
    });
 });
 </script>

From 2f22c3292d44842602e4db4b432decc0a5a0609d Mon Sep 17 00:00:00 2001
From: ofirgalcon <ofir@gal.co.uk>
Date: Sat, 15 Feb 2025 01:30:05 +0000
Subject: [PATCH 2/5] Update softwareupdate_tab.php

---
 views/softwareupdate_tab.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/softwareupdate_tab.php b/views/softwareupdate_tab.php
index bb399a6..7d8c2ed 100755
--- a/views/softwareupdate_tab.php
+++ b/views/softwareupdate_tab.php
@@ -147,7 +147,7 @@
                             `<td style="min-width:200px;">${update.name || ''}</td>` +
                             `<td style="min-width:75px;">${update.version || ''}</td>` +
                             `<td style="min-width:75px;">${update.build || ''}</td>` +
-                            `<td style="min-width:75px;">${update.deferred === '1' ? i18n.t('yes') : i18n.t('no')}</td>` +
+                            `<td style="min-width:75px;">${update.deferred === 1 ? i18n.t('yes') : i18n.t('no')}</td>` +
                             `<td style="min-width:200px;">${update.deferred_until ? formatDate(update.deferred_until) : ''}</td>` +
                             `<td style="min-width:130px;">${update.major_os_update === '1' ? i18n.t('yes') : i18n.t('no')}</td>` +
                             `<td style="min-width:130px;">${update.minor_os_update === '1' ? i18n.t('yes') : i18n.t('no')}</td>` +

From 1033c7e28116b5fac915db629fe449a49de1505d Mon Sep 17 00:00:00 2001
From: ofirgalcon <ofir@gal.co.uk>
Date: Sat, 15 Feb 2025 01:33:38 +0000
Subject: [PATCH 3/5] Update softwareupdate_tab.php

---
 views/softwareupdate_tab.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/softwareupdate_tab.php b/views/softwareupdate_tab.php
index 7d8c2ed..7dcd0c6 100755
--- a/views/softwareupdate_tab.php
+++ b/views/softwareupdate_tab.php
@@ -149,8 +149,8 @@
                             `<td style="min-width:75px;">${update.build || ''}</td>` +
                             `<td style="min-width:75px;">${update.deferred === 1 ? i18n.t('yes') : i18n.t('no')}</td>` +
                             `<td style="min-width:200px;">${update.deferred_until ? formatDate(update.deferred_until) : ''}</td>` +
-                            `<td style="min-width:130px;">${update.major_os_update === '1' ? i18n.t('yes') : i18n.t('no')}</td>` +
-                            `<td style="min-width:130px;">${update.minor_os_update === '1' ? i18n.t('yes') : i18n.t('no')}</td>` +
+                            `<td style="min-width:130px;">${update.major_os_update === 1 ? i18n.t('yes') : i18n.t('no')}</td>` +
+                            `<td style="min-width:130px;">${update.minor_os_update === 1 ? i18n.t('yes') : i18n.t('no')}</td>` +
                             `<td style="min-width:100px;">${update.download_size ? fileSize(update.download_size, 2) : ''}</td>` +
                             `<td style="min-width:100px;">${update.product_key || ''}</td>` +
                         '</tr>');

From 96fba078628a9a2444958adaa267e626a9419444 Mon Sep 17 00:00:00 2001
From: ofirgalcon <ofir@gal.co.uk>
Date: Sat, 15 Feb 2025 03:27:30 +0000
Subject: [PATCH 4/5] widget filters and bug fixes

---
 js/softwareupdate.js                          | 207 ++++++++++++++++++
 locales/en.json                               |   1 -
 provides.yml                                  |   2 +-
 scripts/softwareupdate                        |   2 +-
 ...e_allow_prerelease_installation_widget.yml |   2 +
 ...reupdate_allow_rsr_installation_widget.yml |   2 +
 ...oftwareupdate_allow_rsr_removal_widget.yml |   2 +
 ...te_auto_update_restart_required_widget.yml |   2 +
 views/softwareupdate_auto_update_widget.yml   |   4 +-
 ...areupdate_automaticcheckenabled_widget.yml |   2 +
 ...oftwareupdate_automaticdownload_widget.yml |   2 +
 ...oftwareupdate_configdatainstall_widget.yml |   2 +
 ...areupdate_criticalupdateinstall_widget.yml |   2 +
 ...wareupdate_force_major_deferred_widget.yml |   2 +
 ...wareupdate_force_minor_deferred_widget.yml |   2 +
 views/softwareupdate_listing.yml              |  52 +++--
 views/softwareupdate_report.yml               |  14 +-
 views/softwareupdate_tab.php                  |   2 +-
 18 files changed, 275 insertions(+), 29 deletions(-)

diff --git a/js/softwareupdate.js b/js/softwareupdate.js
index 065b9b9..174591c 100755
--- a/js/softwareupdate.js
+++ b/js/softwareupdate.js
@@ -82,4 +82,211 @@ var uptodateFilter = function(colNumber, d){
         // Clear global search
         d.search.value = '';
     }
+}
+
+var allow_prerelease_installation_filter = function(colNumber, d){
+    // Look for 'prerelease_off' keyword
+    if(d.search.value.match(/^prerelease_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'prerelease_on' keyword
+    if(d.search.value.match(/^prerelease_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var softwareUpdateYesNo = function(colNumber, row){
+    var col = $('td:eq('+colNumber+')', row),
+        colvar = col.text();
+    colvar = colvar != '1' ? '<span class="label label-danger">'+i18n.t('No')+'</span>' :
+    colvar = (colvar == '1' ? '<span class="label label-success">'+i18n.t('Yes')+'</span>' : colvar)
+    col.html(colvar)
+}
+
+var allow_rsr_installation_filter = function(colNumber, d){
+    // Look for 'rsr_off' keyword
+    if(d.search.value.match(/^rsr_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'rsr_on' keyword
+    if(d.search.value.match(/^rsr_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var allow_rsr_removal_filter = function(colNumber, d){
+    // Look for 'rsr_removal_off' keyword
+    if(d.search.value.match(/^rsr_removal_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'rsr_removal_on' keyword
+    if(d.search.value.match(/^rsr_removal_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var auto_update_restart_required_filter = function(colNumber, d){
+    // Look for 'restart_required_off' keyword
+    if(d.search.value.match(/^restart_required_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'restart_required_on' keyword
+    if(d.search.value.match(/^restart_required_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var auto_update_filter = function(colNumber, d){
+    // Look for 'auto_update_off' keyword
+    if(d.search.value.match(/^auto_update_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'auto_update_on' keyword
+    if(d.search.value.match(/^auto_update_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var automaticcheckenabled_filter = function(colNumber, d){
+    // Look for 'autocheck_off' keyword
+    if(d.search.value.match(/^autocheck_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'autocheck_on' keyword
+    if(d.search.value.match(/^autocheck_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var automaticdownload_filter = function(colNumber, d){
+    // Look for 'autodownload_off' keyword
+    if(d.search.value.match(/^autodownload_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'autodownload_on' keyword
+    if(d.search.value.match(/^autodownload_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var force_major_deferred_filter = function(colNumber, d){
+    if(d.search.value.match(/^major_deferred_off$/))
+    {
+        d.columns[colNumber].search.value = '= 0';
+        d.search.value = '';
+    }
+    if(d.search.value.match(/^major_deferred_on$/))
+    {
+        d.columns[colNumber].search.value = '= 1';
+        d.search.value = '';
+    }
+}
+
+var criticalupdateinstall_filter = function(colNumber, d){
+    if(d.search.value.match(/^critical_install_off$/))
+    {
+        d.columns[colNumber].search.value = '= 0';
+        d.search.value = '';
+    }
+    if(d.search.value.match(/^critical_install_on$/))
+    {
+        d.columns[colNumber].search.value = '= 1';
+        d.search.value = '';
+    }
+}
+
+var configdatainstall_filter = function(colNumber, d){
+    if(d.search.value.match(/^config_install_off$/))
+    {
+        d.columns[colNumber].search.value = '= 0';
+        d.search.value = '';
+    }
+    if(d.search.value.match(/^config_install_on$/))
+    {
+        d.columns[colNumber].search.value = '= 1';
+        d.search.value = '';
+    }
+}
+
+var force_minor_deferred_filter = function(colNumber, d){
+    // Look for 'minor_deferred_off' keyword
+    if(d.search.value.match(/^minor_deferred_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'minor_deferred_on' keyword
+    if(d.search.value.match(/^minor_deferred_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
 }
\ No newline at end of file
diff --git a/locales/en.json b/locales/en.json
index 1d45d76..0da41e1 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -15,7 +15,6 @@
     "lastbackgroundsuccessfuldate": "Background Success Date",
     "lastfullsuccessfuldate": "Last Full Success Date",
     "lastrecommendedupdatesavailable": "Recommended Available Updates",
-    "mac_os_uptodate": "macOS Up-to-date",
     "lastrecommendedupdatesavailable_widget": "macOS Updates Pending",
     "lastresultcode": "Last Result Code",
     "lastsessionsuccessful": "Session Successful",
diff --git a/provides.yml b/provides.yml
index 3b997c2..2d29c86 100755
--- a/provides.yml
+++ b/provides.yml
@@ -61,4 +61,4 @@ widgets:
 reports:
     softwareupdate_report:
         view: softwareupdate_report
-        i18n: softwareupdate.reporttitle
\ No newline at end of file
+        i18n: softwareupdate.reporttitle
diff --git a/scripts/softwareupdate b/scripts/softwareupdate
index 5c2278c..da7e102 100755
--- a/scripts/softwareupdate
+++ b/scripts/softwareupdate
@@ -303,7 +303,7 @@ def get_ddm_info():
     if os.path.isfile("/private/var/db/softwareupdate/SoftwareUpdateDDMStatePersistence.plist"):
         plist = FoundationPlist.readPlist("/private/var/db/softwareupdate/SoftwareUpdateDDMStatePersistence.plist")
 
-        if plist["SUCorePersistedStatePolicyFields"] and plist["SUCorePersistedStatePolicyFields"]["Declarations"]:
+        if "SUCorePersistedStatePolicyFields" in plist and plist["SUCorePersistedStatePolicyFields"] and "Declarations" in plist["SUCorePersistedStatePolicyFields"]:
             key_index = 1
             ddm_info = ""
             for declaration in plist["SUCorePersistedStatePolicyFields"]["Declarations"]:
diff --git a/views/softwareupdate_allow_prerelease_installation_widget.yml b/views/softwareupdate_allow_prerelease_installation_widget.yml
index 97b0865..7020ef6 100755
--- a/views/softwareupdate_allow_prerelease_installation_widget.yml
+++ b/views/softwareupdate_allow_prerelease_installation_widget.yml
@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: prerelease_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: prerelease_on
\ No newline at end of file
diff --git a/views/softwareupdate_allow_rsr_installation_widget.yml b/views/softwareupdate_allow_rsr_installation_widget.yml
index 79c6cd2..ff76396 100755
--- a/views/softwareupdate_allow_rsr_installation_widget.yml
+++ b/views/softwareupdate_allow_rsr_installation_widget.yml
@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: rsr_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: rsr_on
diff --git a/views/softwareupdate_allow_rsr_removal_widget.yml b/views/softwareupdate_allow_rsr_removal_widget.yml
index a90ac86..59c4842 100755
--- a/views/softwareupdate_allow_rsr_removal_widget.yml
+++ b/views/softwareupdate_allow_rsr_removal_widget.yml
@@ -8,6 +8,8 @@ buttons:
   - label: 1
     i18n_label: yes
     class: btn-danger 
+    search_component: rsr_removal_on
   - label: 0
     i18n_label: no
     class: btn-success
+    search_component: rsr_removal_off
diff --git a/views/softwareupdate_auto_update_restart_required_widget.yml b/views/softwareupdate_auto_update_restart_required_widget.yml
index 80060a1..71c5525 100755
--- a/views/softwareupdate_auto_update_restart_required_widget.yml
+++ b/views/softwareupdate_auto_update_restart_required_widget.yml
@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: restart_required_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: restart_required_on
diff --git a/views/softwareupdate_auto_update_widget.yml b/views/softwareupdate_auto_update_widget.yml
index f60d503..8a3aca7 100755
--- a/views/softwareupdate_auto_update_widget.yml
+++ b/views/softwareupdate_auto_update_widget.yml
@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: auto_update_off
   - label: 1
     i18n_label: yes
-    class: btn-success
\ No newline at end of file
+    class: btn-success
+    search_component: auto_update_on
\ No newline at end of file
diff --git a/views/softwareupdate_automaticcheckenabled_widget.yml b/views/softwareupdate_automaticcheckenabled_widget.yml
index a5b65e7..b57107f 100755
--- a/views/softwareupdate_automaticcheckenabled_widget.yml
+++ b/views/softwareupdate_automaticcheckenabled_widget.yml
@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: autocheck_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: autocheck_on
diff --git a/views/softwareupdate_automaticdownload_widget.yml b/views/softwareupdate_automaticdownload_widget.yml
index 900042b..c993379 100755
--- a/views/softwareupdate_automaticdownload_widget.yml
+++ b/views/softwareupdate_automaticdownload_widget.yml
@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: autodownload_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: autodownload_on
diff --git a/views/softwareupdate_configdatainstall_widget.yml b/views/softwareupdate_configdatainstall_widget.yml
index fc9566e..8db41ed 100755
--- a/views/softwareupdate_configdatainstall_widget.yml
+++ b/views/softwareupdate_configdatainstall_widget.yml
@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: config_install_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: config_install_on
diff --git a/views/softwareupdate_criticalupdateinstall_widget.yml b/views/softwareupdate_criticalupdateinstall_widget.yml
index 677da1e..2557953 100755
--- a/views/softwareupdate_criticalupdateinstall_widget.yml
+++ b/views/softwareupdate_criticalupdateinstall_widget.yml
@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: critical_install_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: critical_install_on
diff --git a/views/softwareupdate_force_major_deferred_widget.yml b/views/softwareupdate_force_major_deferred_widget.yml
index bfd6c21..b567cbe 100755
--- a/views/softwareupdate_force_major_deferred_widget.yml
+++ b/views/softwareupdate_force_major_deferred_widget.yml
@@ -8,6 +8,8 @@ buttons:
   - label: 1
     i18n_label: yes
     class: btn-info 
+    search_component: major_deferred_on
   - label: 0
     i18n_label: no
     class: btn-success
+    search_component: major_deferred_off
diff --git a/views/softwareupdate_force_minor_deferred_widget.yml b/views/softwareupdate_force_minor_deferred_widget.yml
index 9959833..1f85755 100755
--- a/views/softwareupdate_force_minor_deferred_widget.yml
+++ b/views/softwareupdate_force_minor_deferred_widget.yml
@@ -8,6 +8,8 @@ buttons:
   - label: 1
     i18n_label: yes
     class: btn-info 
+    search_component: minor_deferred_on
   - label: 0
     i18n_label: no
     class: btn-success
+    search_component: minor_deferred_off
diff --git a/views/softwareupdate_listing.yml b/views/softwareupdate_listing.yml
index 92d2c45..edf96ac 100755
--- a/views/softwareupdate_listing.yml
+++ b/views/softwareupdate_listing.yml
@@ -1,5 +1,5 @@
 i18n_title: softwareupdate.reporttitle
-not_null_column: lastsuccessfuldate
+# not_null_column: lastsuccessfuldate
 js_link: module/softwareupdate/js/softwareupdate
 table:
     -
@@ -22,9 +22,10 @@ table:
         i18n_header: softwareupdate.lastbackgroundsuccessfuldate
         formatter: timestampToMoment
     -
-        column: softwareupdate.lastupdatesavailable
-        i18n_header: softwareupdate.lastupdatesavailable
+        column: softwareupdate.lastrecommendedupdatesavailable
+        i18n_header: softwareupdate.lastrecommendedupdatesavailable
         formatter: format_softwareupdate_updates_available
+        filter: uptodateFilter        
     -
         column: softwareupdate.program_seed
         i18n_header: softwareupdate.program_seed
@@ -36,22 +37,27 @@ table:
     -
         column: softwareupdate.allow_prerelease_installation
         i18n_header: softwareupdate.allow_prerelease_installation
-        formatter: format_softwareupdate_yes_no
+        filter: allow_prerelease_installation_filter
+        formatter: softwareUpdateYesNo
     -
         column: softwareupdate.automaticcheckenabled
         i18n_header: softwareupdate.automaticcheckenabled
+        filter: automaticcheckenabled_filter
         formatter: format_softwareupdate_yes_no_rev
     -
         column: softwareupdate.automaticdownload
         i18n_header: softwareupdate.automaticdownload
+        filter: automaticdownload_filter
         formatter: format_softwareupdate_yes_no_rev
     -
         column: softwareupdate.configdatainstall
         i18n_header: softwareupdate.configdatainstall
+        filter: configdatainstall_filter
         formatter: format_softwareupdate_yes_no_rev
     -
         column: softwareupdate.criticalupdateinstall
         i18n_header: softwareupdate.criticalupdateinstall
+        filter: criticalupdateinstall_filter
         formatter: format_softwareupdate_yes_no_rev
     -
         column: softwareupdate.xprotect_version
@@ -71,32 +77,46 @@ table:
     -
         column: softwareupdate.force_delayed_minor_updates
         i18n_header: softwareupdate.force_delayed_minor_updates
+        filter: force_minor_deferred_filter
         formatter: format_softwareupdate_yes_no
     -
         column: softwareupdate.force_delayed_major_updates
         i18n_header: softwareupdate.force_delayed_major_updates
+        filter: force_major_deferred_filter
         formatter: format_softwareupdate_yes_no
     -
         column: softwareupdate.allow_rapid_security_response_installation
         i18n_header: softwareupdate.allow_rapid_security_response_installation
-        formatter: format_softwareupdate_yes_no_rev
+        filter: allow_rsr_installation_filter
+        formatter: softwareUpdateYesNo
     -
         column: softwareupdate.allow_rapid_security_response_removal
         i18n_header: softwareupdate.allow_rapid_security_response_removal
-        formatter: format_softwareupdate_yes_no 
-    -
-        column: softwareupdate.managed_do_it_later_deferral_count
-        i18n_header: softwareupdate.managed_do_it_later_deferral_count
-        filter: ManagedDeferralCounterFilter
-    -
-        column: softwareupdate.maximum_managed_do_it_later_deferral_count
-        i18n_header: softwareupdate.maximum_managed_do_it_later_deferral_count
-    -
-        column: softwareupdate.managed_product_keys
-        i18n_header: softwareupdate.managed_product_keys
+        filter: allow_rsr_removal_filter
+        formatter: softwareUpdateYesNo
+    # -
+    #     column: softwareupdate.managed_do_it_later_deferral_count
+    #     i18n_header: softwareupdate.managed_do_it_later_deferral_count
+    #     filter: ManagedDeferralCounterFilter
+    # -
+    #     column: softwareupdate.maximum_managed_do_it_later_deferral_count
+    #     i18n_header: softwareupdate.maximum_managed_do_it_later_deferral_count
+    # -
+    #     column: softwareupdate.managed_product_keys
+    #     i18n_header: softwareupdate.managed_product_keys
     -
         column: softwareupdate.ddm_info
         i18n_header: softwareupdate.ddm_info
     -
         column: softwareupdate.catalogurl
         i18n_header: softwareupdate.catalogurl
+    -
+        column: softwareupdate.auto_update_restart_required
+        i18n_header: softwareupdate.auto_update_restart_required
+        filter: auto_update_restart_required_filter
+        formatter: softwareUpdateYesNo
+    -
+        column: softwareupdate.auto_update
+        i18n_header: softwareupdate.auto_update
+        filter: auto_update_filter
+        formatter: softwareUpdateYesNo
diff --git a/views/softwareupdate_report.yml b/views/softwareupdate_report.yml
index ec6b134..f24d685 100755
--- a/views/softwareupdate_report.yml
+++ b/views/softwareupdate_report.yml
@@ -13,22 +13,20 @@ row3:
 row4:
   softwareupdate_force_major_deferred:
   softwareupdate_force_minor_deferred:
-  softwareupdate_outofdate:
-row5:
   softwareupdate_allow_rsr_removal:
-  softwareupdate_allow_rsr_installation:
-row6:
+row5:
   softwareupdate_ignored_updates:
   softwareupdate_pending_recommended_updates:
   softwareupdate_mrt_version:
-row7:
+row6:
   softwareupdate_gatekeeper_disk_version:
   softwareupdate_gatekeeper_version:
   softwareupdate_kext_exclude_version:
-row8:
+row7:
   softwareupdate_xprotect_version:
   softwareupdate_xprotect_payloads_version:
-row9:
+  softwareupdate_allow_rsr_installation:
+row8:
   softwareupdate_managed_updates_deferrals:
   softwareupdate_managed_max_deferrals:
-  softwareupdate_managed_product_keys:
\ No newline at end of file
+  softwareupdate_managed_product_keys:
diff --git a/views/softwareupdate_tab.php b/views/softwareupdate_tab.php
index 7dcd0c6..20f1f2a 100755
--- a/views/softwareupdate_tab.php
+++ b/views/softwareupdate_tab.php
@@ -87,7 +87,7 @@
                          'lastsessionsuccessful', 'allow_rapid_security_response_installation',
                          'allow_rapid_security_response_removal'].includes(prop)) {
                     if (value !== -1) {
-                        sections.main.push(`<tr><th>${i18n.t('softwareupdate.'+prop)}</th><td>${i18n.t(value ? 'yes' : 'no')}</td></tr>`);
+                        sections.main.push(`<tr><th>${i18n.t('softwareupdate.'+prop)}</th><td>${i18n.t(parseInt(value) === 1 ? 'yes' : 'no')}</td></tr>`);
                     }
                 }
                 // Handle delayed updates

From 535f3a04ec124bacccdbb58029ca0976754f0a08 Mon Sep 17 00:00:00 2001
From: ofirgalcon <ofir@gal.co.uk>
Date: Sat, 15 Feb 2025 15:09:46 +0000
Subject: [PATCH 5/5] more widget fixes

---
 js/softwareupdate.js                          | 20 +++++++++++++++++++
 ...eupdate_last_session_successful_widget.yml |  2 ++
 views/softwareupdate_listing.yml              |  5 +++++
 views/softwareupdate_seed_widget.yml          |  3 +++
 4 files changed, 30 insertions(+)

diff --git a/js/softwareupdate.js b/js/softwareupdate.js
index 174591c..df1cebd 100755
--- a/js/softwareupdate.js
+++ b/js/softwareupdate.js
@@ -289,4 +289,24 @@ var force_minor_deferred_filter = function(colNumber, d){
         // Clear global search
         d.search.value = '';
     }
+}
+
+var lastsessionsuccessful_filter = function(colNumber, d){
+    // Look for 'last_session_off' keyword
+    if(d.search.value.match(/^last_session_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'last_session_on' keyword
+    if(d.search.value.match(/^last_session_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
 }
\ No newline at end of file
diff --git a/views/softwareupdate_last_session_successful_widget.yml b/views/softwareupdate_last_session_successful_widget.yml
index b7d3aa6..6465b7f 100755
--- a/views/softwareupdate_last_session_successful_widget.yml
+++ b/views/softwareupdate_last_session_successful_widget.yml
@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: last_session_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: last_session_on
diff --git a/views/softwareupdate_listing.yml b/views/softwareupdate_listing.yml
index edf96ac..54aee5d 100755
--- a/views/softwareupdate_listing.yml
+++ b/views/softwareupdate_listing.yml
@@ -120,3 +120,8 @@ table:
         i18n_header: softwareupdate.auto_update
         filter: auto_update_filter
         formatter: softwareUpdateYesNo
+    -
+        column: softwareupdate.lastsessionsuccessful
+        i18n_header: softwareupdate.lastsessionsuccessful
+        filter: lastsessionsuccessful_filter
+        formatter: format_softwareupdate_yes_no_rev
diff --git a/views/softwareupdate_seed_widget.yml b/views/softwareupdate_seed_widget.yml
index 94e3110..70cc13e 100755
--- a/views/softwareupdate_seed_widget.yml
+++ b/views/softwareupdate_seed_widget.yml
@@ -9,14 +9,17 @@ buttons:
     i18n_label: softwareupdate.developerseed
     class: btn-danger 
     hide_when_zero: true
+    search_component: Developer Beta
   - label: "3"
     i18n_label: softwareupdate.publicseed
     class: btn-warning
     hide_when_zero: true
+    search_component: Public Beta
   - label: "1"
     i18n_label: softwareupdate.customerseed
     class: btn-warning
     hide_when_zero: true
+    search_component: AppleSeed Beta
   - label: "0"
     i18n_label: softwareupdate.unenrolled
     class: btn-success