Merge branch 'main' into hotfix--ph-view

nysenate · Dec 6, 2023 · 49a89ab · 49a89ab
2 parents 4f9fa72 + 47bd864
commit 49a89ab
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -147,6 +147,7 @@
         "drupal/views_send": "^1.6",
         "drupal/views_year_filter": "^2.1",
         "drupal/votingapi": "^3.0@beta",
+        "drupal/watchdog_prune": "^2.3",
         "drupal/webform": "^6.1",
         "drupal/webform_migrate": "^1.2",
         "drupal/webform_views": "^5.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
@@ -231,6 +231,7 @@ module:
   views_year_filter: 0
   viewsreference: 0
   votingapi: 0
+  watchdog_prune: 0
   webform: 0
   webform_access: 0
   webform_migrate: 0

diff --git a/config/sync/ultimate_cron.job.watchdog_prune_cron.yml b/config/sync/ultimate_cron.job.watchdog_prune_cron.yml
@@ -0,0 +1,17 @@
+uuid: 6e270ca6-d2a8-4c71-bc32-31b4955a6d72
+langcode: en
+status: true
+dependencies:
+  module:
+    - watchdog_prune
+title: 'Default cron handler'
+id: watchdog_prune_cron
+weight: 0
+module: watchdog_prune
+callback: watchdog_prune_cron
+scheduler:
+  id: simple
+launcher:
+  id: serial
+logger:
+  id: database
diff --git a/config/sync/views.view.events.yml b/config/sync/views.view.events.yml
@@ -2441,6 +2441,7 @@ display:
               legislative_correspondent: '0'
               student_programs: '0'
               constituent: '0'
+              comment_moderator: '0'
             min_placeholder: ''
             max_placeholder: ''
             placeholder: ''
@@ -2456,7 +2457,7 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          granularity: month
+          granularity: hour
       filter_groups:
         operator: AND
         groups:

diff --git a/config/sync/watchdog_prune.settings.yml b/config/sync/watchdog_prune.settings.yml
@@ -0,0 +1,2 @@
+watchdog_prune_age: '-2 MONTHS'
+watchdog_prune_age_type: "page not found|-7 DAYS\r\nmedia|-7 DAYS\r\ncron|-7 DAYS"
diff --git a/web/modules/custom/nys_dashboard/nys_dashboard.module b/web/modules/custom/nys_dashboard/nys_dashboard.module
@@ -381,7 +381,7 @@ function nys_dashboard_form_alter(&$form, FormStateInterface $form_state, $form_
     ])) {
       [$start_of_week, $end_of_week] = nys_dashboard_get_date('week');
       if (isset($form['date_wrapper'])) {
-        $form['date'] = $form['date_wrapper']['date'];
+        $form['date'] = $form['date_wrapper']['date_wrapper']['date'];
         unset($form['date_wrapper']);
       }
       $form['date']['min']['#date_format'] = 'm/d/Y';
@@ -394,6 +394,7 @@ function nys_dashboard_form_alter(&$form, FormStateInterface $form_state, $form_
       $form['date']['max']['#placeholder'] = $end_of_week;
       $form['date']['min']['#title'] = [];
       $form['date']['max']['#title'] = [];
+      $form['date']['max']['#access'] = false;
     }
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		watchdog_prune_age: '-2 MONTHS'
		watchdog_prune_age_type: "page not found\|-7 DAYS\r\nmedia\|-7 DAYS\r\ncron\|-7 DAYS"