Changes as requested

.github/workflows/tests.yml

@@ -95,15 +95,15 @@ jobs:
         # TODO: Delete the line below and uncomment the line beneath that
         run: prove -lmrsv webdriver/t/login.t
         #run: prove -lmrsv webdriver/t
-  
+
   js_tests:
     runs-on: ubuntu-latest
-    
+
     strategy:
       matrix:
         node-version: [16.x, 18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-      
+
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}

lib/GADS.pm

@@ -2894,7 +2894,7 @@ prefix '/:layout_name' => sub {
 
             my $report_id = param('id');
 
-            my $result = schema->resultset('Report')->find ({id => $report_id}) 
+            my $result = schema->resultset('Report')->find ({id => $report_id})
                 or error 'No report found for ' . $report_id;
 
                 my $lo = param 'layout_name';

src/frontend/components/button/lib/create-report-button.js

@@ -31,7 +31,7 @@ class CreateReportButtonComponent extends Component {
   submitReport(ev) {
     const $button = $(ev.target).closest('button');
     const $form = $button.closest("form");
-    
+
     if (!this.canSubmitRecordForm) {
       ev.preventDefault();
 

src/frontend/components/button/lib/create-report-button.test.js

@@ -10,7 +10,7 @@ describe('create-report-button', () => {
       <form id="myform">
         <input class="form-control " id="report_name" name="report_name" value="Something" data-restore-value="" required="" aria-required="true">
         <input class="form-control " id="report_description" name="report_description" placeholder="New Report Description" value="" data-restore-value="">
-        <fieldset class="fieldset fieldset--required fieldset--report" id="report_fields">
+        <fieldset class="fieldset fieldset--required" id="report_fields">
           <input id="1" type="checkbox">
           <input id="8" type="checkbox">
           <input id="2" type="checkbox">
@@ -40,7 +40,7 @@ describe('create-report-button', () => {
           <input required="" aria-required="true">
         </div>
         <input>
-        <fieldset class="fieldset fieldset--required fieldset--report" id="report_fields">
+        <fieldset class="fieldset fieldset--required" id="report_fields">
           <input id="1" type="checkbox">
           <input id="8" type="checkbox" checked="checked">
           <input id="2" type="checkbox">
@@ -70,7 +70,7 @@ describe('create-report-button', () => {
           <input required="" aria-required="true" value = "boop">
         </div>
         <input>
-        <fieldset class="fieldset fieldset--required fieldset--report" id="report_fields">
+        <fieldset class="fieldset fieldset--required" id="report_fields">
           <input id="1" type="checkbox">
           <input id="8" type="checkbox" checked="checked">
           <input id="2" type="checkbox">
@@ -101,7 +101,7 @@ describe('create-report-button', () => {
   it('Validates checkboxes correctly', () => {
     document.body.innerHTML = `
       <form>
-        <fieldset class="fieldset fieldset--required fieldset--report">
+        <fieldset class="fieldset fieldset--required">
           <div class="fieldset__legend">
             <legend id="-label">
               Columns to show in report:
@@ -172,6 +172,6 @@ describe('create-report-button', () => {
       expect(input.checked).toBe(false);
     });
 
-    expect(validateRequiredFields($('form'))).toBe(false); 
+    expect(validateRequiredFields($('form'))).toBe(false);
   });
 });

views/reports/edit.tt

@@ -33,27 +33,27 @@
             <div class="hidden alert__no__select" aria-hidden="true">
               <p class="alert__message">Please select at least one item to add to the report!</p>
             </div>
-            [%  
-              report_items = [];  
+            [%
+              report_items = [];
 
-              FOREACH field IN fields;  
-                report_items.push({  
-                  field_id   = field.id,  
-                  name       = field.name,  
-                  id         = field.id,  
-                  is_checked = field.is_checked ? 1 : 0  
-                });  
-              END;  
+              FOREACH field IN fields;
+                report_items.push({
+                  field_id   = field.id,
+                  name       = field.name,
+                  id         = field.id,
+                  is_checked = field.is_checked ? 1 : 0
+                });
+              END;
 
-              INCLUDE fields/checkbox_list.tt  
-                list_class        = "list--vertical list--checkboxes"  
-                name              = "checkboxes" 
-                label             = "Columns to show in report:"  
-                items             = report_items 
-                fieldset_required = 1  
-                fieldset_classes  = "fieldset--report"  
-                filter            = "html";  
-            %]  
+              INCLUDE fields/checkbox_list.tt
+                list_class        = "list--vertical list--checkboxes"
+                name              = "checkboxes"
+                label             = "Columns to show in report:"
+                items             = report_items
+                fieldset_required = 1
+                fieldset_classes  = ""
+                filter            = "html";
+            %]
           </div>
         </div>
       </div>

views/reports/view.tt

@@ -1,22 +1,29 @@
 [%
   table_dom = "t";
   table_show_all_records = "true";
+  table_width = 85;
+  table_class = "table-striped";
 
   table_caption = "Reports";
-  table_width = 85;
 
+  table_buttons = [
+    {
+        label  = "Edit",
+        filter = "html",
+        link   = "report/edit" _ report.id
+      },{
+        label  = "Delete",
+        filter = "html",
+        link   = "report/delete" _ report.id
+    }    
+  ]
+
   table_columns = [{
     name      = "Name",
     orderable = 0,
-  }, {
-    name      = "Actions",
-    orderable = 0
-  }, {
-    orderable = 0
+    width     = table_width _ "%"
   }];
 
-  table_buttons = [];
-
   rows = [];
 
   FOREACH report IN reports;
@@ -26,18 +33,7 @@
         label = report.name
       }]
     };
-    IF user.permission.superadmin;
-      data.fields.push({
-        type  = "link",
-        label = "Edit",
-        link  = "report/edit" _ report.id
-      },{
-        type  = "link",
-        label = "Delete",
-        link  = "report/delete" _ report.id
-    });
-
-    END; #if
+
     rows.push(data);
   END; #foreach
 %]

views/snippets/header_table_form.tt

@@ -49,18 +49,18 @@
 
               FOREACH report IN reports;
                 links.push({
-                  name  = report.name,
+                  name     = report.name,
                   target   = url.page _ '/' _ layout.identifier _ '/report/render' _ report.id _ '/' _ record.current_id,
                 });
               END;
 
               record_edit_buttons.push({
-                type = "button_list",
-                target = url.page _ '/' _ layout.identifier _ '/report/render' _ report.id _ '/' _ record.current_id,
-                class = "link link--plain dropdown-toggle",
-                label = report.name _ " Report",
+                type          = "button_list",
+                target        = url.page _ '/' _ layout.identifier _ '/report/render' _ report.id _ '/' _ record.current_id,
+                class         = "link link--plain dropdown-toggle",
+                label         = report.name _ " Report",
                 label_in_span = 1,
-                links = links,
+                links         = links,
               });
             END;