Rule: Remove column is_active and its usage

Icinga · Jul 4, 2024 · 195ca73 · 195ca73
1 parent dfc17ee
commit 195ca73
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 69 deletions.
diff --git a/application/controllers/EventRuleController.php b/application/controllers/EventRuleController.php
@@ -150,7 +150,7 @@ public function indexAction(): void
     public function fromDb(int $ruleId): array
     {
         $query = Rule::on(Database::get())
-            ->columns(['id', 'name', 'object_filter', 'is_active'])
+            ->columns(['id', 'name', 'object_filter'])
             ->filter(Filter::all(
                 Filter::equal('id', $ruleId),
                 Filter::equal('deleted', 'n')
@@ -260,7 +260,6 @@ public function editAction(): void
             ->setAction(Url::fromRequest()->getAbsoluteUrl())
             ->on(Form::ON_SUCCESS, function ($form) use ($ruleId, $cache, $config) {
                 $config['name'] = $form->getValue('name');
-                $config['is_active'] = $form->getValue('is_active');
 
                 if ($cache || $ruleId === '-1') {
                     $this->sessionNamespace->set($ruleId, $config);

diff --git a/application/forms/EventRuleForm.php b/application/forms/EventRuleForm.php
@@ -27,15 +27,6 @@ protected function assemble()
             ]
         );
 
-        $this->addElement(
-            'checkbox',
-            'is_active',
-            [
-                'label'  => $this->translate('Event Rule is active'),
-                'value'  => 'y'
-            ]
-        );
-
         $this->addElement('submit', 'btn_submit', [
             'label' => $this->translate('Save')
         ]);

diff --git a/application/forms/SaveEventRuleForm.php b/application/forms/SaveEventRuleForm.php
@@ -245,8 +245,7 @@ public function addRule(array $config): int
         $db->insert('rule', [
             'name' => $config['name'],
             'timeperiod_id' => $config['timeperiod_id'] ?? null,
-            'object_filter' => $config['object_filter'] ?? null,
-            'is_active' => $config['is_active'] ?? 'n'
+            'object_filter' => $config['object_filter'] ?? null
         ]);
         $ruleId = $db->lastInsertId();
 
@@ -411,8 +410,7 @@ public function editRule(int $id, array $config): void
         $values = $this->getChanges($storedValues, $config);
 
         $data = array_filter([
-            'name'      => $values['name'] ?? null,
-            'is_active' => $values['is_active'] ?? null
+            'name'      => $values['name'] ?? null
         ]);
 
         if (array_key_exists('object_filter', $values)) {
@@ -537,7 +535,7 @@ protected function onError()
     private function fetchDbValues(): array
     {
         $query = Rule::on(Database::get())
-            ->columns(['id', 'name', 'object_filter', 'is_active'])
+            ->columns(['id', 'name', 'object_filter'])
             ->filter(Filter::all(
                 Filter::equal('id', $this->ruleId),
                 Filter::equal('deleted', 'n')
@@ -595,10 +593,6 @@ public function getChanges(array $storedValues, array $formValues): array
                 unset($formValues['object_filter']);
             }
 
-            if ($formValues['is_active'] === $dbValuesToCompare['is_active']) {
-                unset($formValues['is_active']);
-            }
-
             return $formValues;
         }
 

diff --git a/library/Notifications/Model/Rule.php b/library/Notifications/Model/Rule.php
@@ -17,7 +17,6 @@
  * @property string $name
  * @property ?int $timeperiod_id
  * @property ?string $object_filter
- * @property string $is_active
  * @property DateTime $changed_at
  * @property bool $deleted
  *
@@ -43,7 +42,6 @@ public function getColumns(): array
             'name',
             'timeperiod_id',
             'object_filter',
-            'is_active',
             'changed_at',
             'deleted'
         ];
@@ -55,7 +53,6 @@ public function getColumnDefinitions(): array
             'name'          => t('Name'),
             'timeperiod_id' => t('Timeperiod ID'),
             'object_filter' => t('Object Filter'),
-            'is_active'     => t('Is Active'),
             'changed_at'    => t('Changed At')
         ];
     }

diff --git a/library/Notifications/Widget/CheckboxIcon.php b/library/Notifications/Widget/CheckboxIcon.php
diff --git a/library/Notifications/Widget/ItemList/EventRuleListItem.php b/library/Notifications/Widget/ItemList/EventRuleListItem.php
@@ -6,7 +6,6 @@
 
 use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Model\Rule;
-use Icinga\Module\Notifications\Widget\CheckboxIcon;
 use Icinga\Module\Notifications\Widget\RuleEscalationRecipientBadge;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
@@ -31,11 +30,6 @@ protected function init(): void
             ->set('data-action-item', true);
     }
 
-    protected function assembleVisual(BaseHtmlElement $visual): void
-    {
-        $visual->add(new CheckboxIcon($this->item->is_active === 'y'));
-    }
-
     protected function assembleFooter(BaseHtmlElement $footer): void
     {
         $meta = Html::tag('span', ['class' => 'meta']);