From 87cf54fe85cf69e7d1249c1aab3c42c28ce46381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Fri, 4 Oct 2024 16:47:54 +0200
Subject: [PATCH] Add a filter to exclude applications
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: #1092
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 changelog.d/1092.added                        |   1 +
 fmn/api/api_models.py                         |   1 +
 fmn/rules/filter.py                           |   9 +
 frontend/src/api/generated.ts                 | 426 +++++++++++++++---
 .../generation-rule/BaseFilterApplication.vue |  37 ++
 .../generation-rule/FilterApplication.vue     |  22 +-
 .../FilterExcludedApplication.vue             |  17 +
 .../rule-edit/generation-rule/FilterList.vue  |   6 +-
 pyproject.toml                                |   1 +
 tests/api/handlers/test_admin.py              |   2 +
 tests/api/handlers/test_users.py              |   1 +
 tests/rules/test_filter.py                    |  17 +-
 12 files changed, 464 insertions(+), 76 deletions(-)
 create mode 100644 changelog.d/1092.added
 create mode 100644 frontend/src/components/rule-edit/generation-rule/BaseFilterApplication.vue
 create mode 100644 frontend/src/components/rule-edit/generation-rule/FilterExcludedApplication.vue

diff --git a/changelog.d/1092.added b/changelog.d/1092.added
new file mode 100644
index 000000000..ad42ee70e
--- /dev/null
+++ b/changelog.d/1092.added
@@ -0,0 +1 @@
+Add a filter to exclude applications
diff --git a/fmn/api/api_models.py b/fmn/api/api_models.py
index d229458fd..8fc1360e6 100644
--- a/fmn/api/api_models.py
+++ b/fmn/api/api_models.py
@@ -68,6 +68,7 @@ def address_format(cls, v, info: FieldValidationInfo):
 
 class Filters(BaseModel):
     applications: list[str] = []
+    excluded_applications: list[str] = []
     severities: list[str] = []
     topic: str | None = None
     my_actions: bool = False
diff --git a/fmn/rules/filter.py b/fmn/rules/filter.py
index 8edfec098..6ad0c5407 100644
--- a/fmn/rules/filter.py
+++ b/fmn/rules/filter.py
@@ -35,6 +35,15 @@ def matches(self, message):
         return message.app_name.lower() in self.params
 
 
+class ExcludedApplications(Applications):
+    name = "excluded_applications"
+
+    def matches(self, message):
+        if not self.params:
+            return True
+        return message.app_name.lower() not in self.params
+
+
 class Severities(Filter):
     name = "severities"
     default = (message.INFO, message.WARNING, message.ERROR)
diff --git a/frontend/src/api/generated.ts b/frontend/src/api/generated.ts
index 0cc90dde7..af9a44f69 100644
--- a/frontend/src/api/generated.ts
+++ b/frontend/src/api/generated.ts
@@ -5,83 +5,260 @@
 
 export interface paths {
   "/api/v1/users/me": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /** Get Me */
     get: operations["get_me_api_v1_users_me_get"];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/users": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /** Get Users */
     get: operations["get_users_api_v1_users_get"];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/users/{username}/info": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /** Get User Info */
     get: operations["get_user_info_api_v1_users__username__info_get"];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/users/{username}/groups": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /** Get User Groups */
     get: operations["get_user_groups_api_v1_users__username__groups_get"];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/users/{username}/destinations": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /** Get User Destinations */
     get: operations["get_user_destinations_api_v1_users__username__destinations_get"];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/users/{username}/rules": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /** Get User Rules */
     get: operations["get_user_rules_api_v1_users__username__rules_get"];
+    put?: never;
     /** Create User Rule */
     post: operations["create_user_rule_api_v1_users__username__rules_post"];
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/users/{username}/rules/{id}": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /** Get User Rule */
     get: operations["get_user_rule_api_v1_users__username__rules__id__get"];
     /** Edit User Rule */
     put: operations["edit_user_rule_api_v1_users__username__rules__id__put"];
+    post?: never;
     /** Delete User Rule */
     delete: operations["delete_user_rule_api_v1_users__username__rules__id__delete"];
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/applications": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /** Get Applications */
     get: operations["get_applications_api_v1_applications_get"];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/artifacts": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /**
      * Get Artifacts
      * @description This handler queries artifacts from Pagure
      *
-     * Proxying Pagure queries lets the API cache results to reduce load on the
-     * backend service.
+     *     Proxying Pagure queries lets the API cache results to reduce load on the
+     *     backend service.
      *
-     * :param names: Name patterns of artifacts which should be returned
+     *     :param names: Name patterns of artifacts which should be returned
      *
-     * :param users: Names of users whose artifacts should be returned
+     *     :param users: Names of users whose artifacts should be returned
      *
-     * :param groups: Names of groups whose artifacts should be returned
+     *     :param groups: Names of groups whose artifacts should be returned
      */
     get: operations["get_artifacts_api_v1_artifacts_get"];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/healthz/live": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /** Liveness Check */
     get: operations["liveness_check_api_v1_healthz_live_get"];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/healthz/ready": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /** Readiness Check */
     get: operations["readiness_check_api_v1_healthz_ready_get"];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/admin/rules": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /** Get Rules */
     get: operations["get_rules_api_v1_admin_rules_get"];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/admin/users": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
     /** Get Users */
     get: operations["get_users_api_v1_admin_users_get"];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
   };
   "/api/v1/admin/rules/{id}": {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get?: never;
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
     /** Patch Rule */
     patch: operations["patch_rule_api_v1_admin_rules__id__patch"];
+    trace?: never;
   };
 }
-
 export type webhooks = Record<string, never>;
-
 export interface components {
   schemas: {
     /** Artifact */
@@ -98,8 +275,8 @@ export interface components {
     /** ArtifactsFollowedTrackingRule */
     ArtifactsFollowedTrackingRule: {
       /**
-       * Name
-       * @constant
+       * @description discriminator enum property added by openapi-typescript
+       * @enum {string}
        */
       name: "artifacts-followed";
       /** Params */
@@ -120,19 +297,24 @@ export interface components {
        * Applications
        * @default []
        */
-      applications?: string[];
+      applications: string[];
+      /**
+       * Excluded Applications
+       * @default []
+       */
+      excluded_applications: string[];
       /**
        * Severities
        * @default []
        */
-      severities?: string[];
+      severities: string[];
       /** Topic */
       topic?: string | null;
       /**
        * My Actions
        * @default false
        */
-      my_actions?: boolean;
+      my_actions: boolean;
     };
     /** GenerationRule */
     GenerationRule: {
@@ -150,10 +332,10 @@ export interface components {
     /** ListParamTrackingRule */
     ListParamTrackingRule: {
       /**
-       * Name
+       * @description discriminator enum property added by openapi-typescript
        * @enum {string}
        */
-      name: "artifacts-owned" | "artifacts-group-owned" | "users-followed";
+      name: "artifacts-group-owned" | "artifacts-owned" | "users-followed";
       /** Params */
       params: string[];
     };
@@ -165,7 +347,7 @@ export interface components {
        * Disabled
        * @default false
        */
-      disabled?: boolean;
+      disabled: boolean;
       /** Tracking Rule */
       tracking_rule:
         | components["schemas"]["ListParamTrackingRule"]
@@ -177,8 +359,8 @@ export interface components {
     /** NoParamTrackingRule */
     NoParamTrackingRule: {
       /**
-       * Name
-       * @constant
+       * @description discriminator enum property added by openapi-typescript
+       * @enum {string}
        */
       name: "related-events";
       /** Params */
@@ -192,7 +374,7 @@ export interface components {
        * Disabled
        * @default false
        */
-      disabled?: boolean;
+      disabled: boolean;
       /** Tracking Rule */
       tracking_rule:
         | components["schemas"]["ListParamTrackingRule"]
@@ -207,7 +389,7 @@ export interface components {
        * Generated Last Week
        * @default 0
        */
-      generated_last_week?: number;
+      generated_last_week: number;
     };
     /** Rule */
     "Rule-Output": {
@@ -217,7 +399,7 @@ export interface components {
        * Disabled
        * @default false
        */
-      disabled?: boolean;
+      disabled: boolean;
       /** Tracking Rule */
       tracking_rule:
         | components["schemas"]["ListParamTrackingRule"]
@@ -232,7 +414,7 @@ export interface components {
        * Generated Last Week
        * @default 0
        */
-      generated_last_week?: number;
+      generated_last_week: number;
     };
     /** RulePatch */
     RulePatch: {
@@ -249,7 +431,7 @@ export interface components {
        * Is Admin
        * @default false
        */
-      is_admin?: boolean;
+      is_admin: boolean;
     };
     /** ValidationError */
     ValidationError: {
@@ -267,139 +449,191 @@ export interface components {
   headers: never;
   pathItems: never;
 }
-
 export type $defs = Record<string, never>;
-
-export type external = Record<string, never>;
-
 export interface operations {
-  /** Get Me */
   get_me_api_v1_users_me_get: {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["User"];
         };
       };
     };
   };
-  /** Get Users */
   get_users_api_v1_users_get: {
     parameters: {
       query?: {
         search?: string | null;
       };
+      header?: never;
+      path?: never;
+      cookie?: never;
     };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": string[];
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
       };
     };
   };
-  /** Get User Info */
   get_user_info_api_v1_users__username__info_get: {
     parameters: {
+      query?: never;
+      header?: never;
       path: {
         username: unknown;
       };
+      cookie?: never;
     };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": unknown;
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
       };
     };
   };
-  /** Get User Groups */
   get_user_groups_api_v1_users__username__groups_get: {
     parameters: {
+      query?: never;
+      header?: never;
       path: {
         username: unknown;
       };
+      cookie?: never;
     };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": string[];
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
       };
     };
   };
-  /** Get User Destinations */
   get_user_destinations_api_v1_users__username__destinations_get: {
     parameters: {
+      query?: never;
+      header?: never;
       path: {
         username: unknown;
       };
+      cookie?: never;
     };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["Destination"][];
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
       };
     };
   };
-  /** Get User Rules */
   get_user_rules_api_v1_users__username__rules_get: {
     parameters: {
+      query?: never;
+      header?: never;
       path: {
         username: unknown;
       };
+      cookie?: never;
     };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["Rule-Output"][];
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
       };
     };
   };
-  /** Create User Rule */
   create_user_rule_api_v1_users__username__rules_post: {
     parameters: {
+      query?: never;
+      header?: never;
       path: {
         username: unknown;
       };
+      cookie?: never;
     };
     requestBody: {
       content: {
@@ -409,48 +643,65 @@ export interface operations {
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["Rule-Output"];
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
       };
     };
   };
-  /** Get User Rule */
   get_user_rule_api_v1_users__username__rules__id__get: {
     parameters: {
+      query?: never;
+      header?: never;
       path: {
         username: string;
         id: number;
       };
+      cookie?: never;
     };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["Rule-Output"];
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
       };
     };
   };
-  /** Edit User Rule */
   edit_user_rule_api_v1_users__username__rules__id__put: {
     parameters: {
+      query?: never;
+      header?: never;
       path: {
         username: string;
         id: number;
       };
+      cookie?: never;
     };
     requestBody: {
       content: {
@@ -460,65 +711,76 @@ export interface operations {
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["Rule-Output"];
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
       };
     };
   };
-  /** Delete User Rule */
   delete_user_rule_api_v1_users__username__rules__id__delete: {
     parameters: {
+      query?: never;
+      header?: never;
       path: {
         username: string;
         id: number;
       };
+      cookie?: never;
     };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": unknown;
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
       };
     };
   };
-  /** Get Applications */
   get_applications_api_v1_applications_get: {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": string[];
         };
       };
     };
   };
-  /**
-   * Get Artifacts
-   * @description This handler queries artifacts from Pagure
-   *
-   * Proxying Pagure queries lets the API cache results to reduce load on the
-   * backend service.
-   *
-   * :param names: Name patterns of artifacts which should be returned
-   *
-   * :param users: Names of users whose artifacts should be returned
-   *
-   * :param groups: Names of groups whose artifacts should be returned
-   */
   get_artifacts_api_v1_artifacts_get: {
     parameters: {
       query?: {
@@ -526,95 +788,143 @@ export interface operations {
         users?: string[];
         groups?: string[];
       };
+      header?: never;
+      path?: never;
+      cookie?: never;
     };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["Artifact"][];
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
       };
     };
   };
-  /** Liveness Check */
   liveness_check_api_v1_healthz_live_get: {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": unknown;
         };
       };
     };
   };
-  /** Readiness Check */
   readiness_check_api_v1_healthz_ready_get: {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": unknown;
         };
       };
     };
   };
-  /** Get Rules */
   get_rules_api_v1_admin_rules_get: {
     parameters: {
       query?: {
         disabled?: boolean | null;
         username?: string | null;
       };
+      header?: never;
+      path?: never;
+      cookie?: never;
     };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["Rule-Output"][];
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
       };
     };
   };
-  /** Get Users */
   get_users_api_v1_admin_users_get: {
     parameters: {
       query?: {
         search?: string | null;
       };
+      header?: never;
+      path?: never;
+      cookie?: never;
     };
+    requestBody?: never;
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["User"][];
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
       };
     };
   };
-  /** Patch Rule */
   patch_rule_api_v1_admin_rules__id__patch: {
     parameters: {
+      query?: never;
+      header?: never;
       path: {
         id: number;
       };
+      cookie?: never;
     };
     requestBody: {
       content: {
@@ -624,12 +934,18 @@ export interface operations {
     responses: {
       /** @description Successful Response */
       200: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["Rule-Output"];
         };
       };
       /** @description Validation Error */
       422: {
+        headers: {
+          [name: string]: unknown;
+        };
         content: {
           "application/json": components["schemas"]["HTTPValidationError"];
         };
diff --git a/frontend/src/components/rule-edit/generation-rule/BaseFilterApplication.vue b/frontend/src/components/rule-edit/generation-rule/BaseFilterApplication.vue
new file mode 100644
index 000000000..5435cf491
--- /dev/null
+++ b/frontend/src/components/rule-edit/generation-rule/BaseFilterApplication.vue
@@ -0,0 +1,37 @@
+<!--
+SPDX-FileCopyrightText: Contributors to the Fedora Project
+
+SPDX-License-Identifier: MIT
+-->
+
+<script setup lang="ts">
+import { apiGet } from "@/api";
+
+const props = defineProps<{
+  name: string;
+  label: string;
+  placeholder?: string;
+}>();
+
+const url = "/api/v1/applications";
+
+const getApplications = async () => {
+  const results = await apiGet<string[]>({
+    queryKey: [url],
+  });
+  return results;
+};
+</script>
+
+<template>
+  <p class="mb-0 fw-bold">{{ props.label }}:</p>
+  <FormKit
+    type="multiselect"
+    :name="props.name"
+    :placeholder="props.placeholder"
+    mode="tags"
+    :msOptions="getApplications"
+    searchable
+    :close-on-select="false"
+  />
+</template>
diff --git a/frontend/src/components/rule-edit/generation-rule/FilterApplication.vue b/frontend/src/components/rule-edit/generation-rule/FilterApplication.vue
index 469c3e765..2b94a36e0 100644
--- a/frontend/src/components/rule-edit/generation-rule/FilterApplication.vue
+++ b/frontend/src/components/rule-edit/generation-rule/FilterApplication.vue
@@ -5,29 +5,13 @@ SPDX-License-Identifier: MIT
 -->
 
 <script setup lang="ts">
-import { apiGet } from "@/api";
-
-// const props = defineProps<{ value: string | null }>();
-
-const url = "/api/v1/applications";
-
-const getApplications = async () => {
-  const results = await apiGet<string[]>({
-    queryKey: [url],
-  });
-  return results;
-};
+import BaseFilterApplication from "./BaseFilterApplication.vue";
 </script>
 
 <template>
-  <p class="mb-0 fw-bold">Applications:</p>
-  <FormKit
-    type="multiselect"
+  <BaseFilterApplication
     name="applications"
+    label="Applications"
     placeholder="Choose applications"
-    mode="tags"
-    :msOptions="getApplications"
-    searchable
-    :close-on-select="false"
   />
 </template>
diff --git a/frontend/src/components/rule-edit/generation-rule/FilterExcludedApplication.vue b/frontend/src/components/rule-edit/generation-rule/FilterExcludedApplication.vue
new file mode 100644
index 000000000..8ae95f7c4
--- /dev/null
+++ b/frontend/src/components/rule-edit/generation-rule/FilterExcludedApplication.vue
@@ -0,0 +1,17 @@
+<!--
+SPDX-FileCopyrightText: Contributors to the Fedora Project
+
+SPDX-License-Identifier: MIT
+-->
+
+<script setup lang="ts">
+import BaseFilterApplication from "./BaseFilterApplication.vue";
+</script>
+
+<template>
+  <BaseFilterApplication
+    name="excluded_applications"
+    label="Excluded Applications"
+    placeholder="Choose applications to ignore"
+  />
+</template>
diff --git a/frontend/src/components/rule-edit/generation-rule/FilterList.vue b/frontend/src/components/rule-edit/generation-rule/FilterList.vue
index 92bb47980..e57f1ff05 100644
--- a/frontend/src/components/rule-edit/generation-rule/FilterList.vue
+++ b/frontend/src/components/rule-edit/generation-rule/FilterList.vue
@@ -7,6 +7,7 @@ SPDX-License-Identifier: MIT
 <script setup lang="ts">
 import { CCol, CRow } from "@coreui/vue";
 import FilterApplication from "./FilterApplication.vue";
+import FilterExcludedApplication from "./FilterExcludedApplication.vue";
 import FilterMyActions from "./FilterMyActions.vue";
 import FilterSeverity from "./FilterSeverity.vue";
 import FilterTopic from "./FilterTopic.vue";
@@ -36,11 +37,14 @@ const props = defineProps<{
       <CCol xs="12" sm="6">
         <FilterSeverity />
       </CCol>
+      <CCol xs="12" sm="6">
+        <FilterMyActions />
+      </CCol>
       <CCol xs="12" sm="6">
         <FilterApplication />
       </CCol>
       <CCol xs="12" sm="6">
-        <FilterMyActions />
+        <FilterExcludedApplication />
       </CCol>
       <CCol xs="12" sm="6">
         <FilterTopic />
diff --git a/pyproject.toml b/pyproject.toml
index 0e4c5fe3b..c9fa35ada 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -201,6 +201,7 @@ schemas = [
 
 [tool.poetry.plugins."fmn.filters"]
 "applications" = "fmn.rules.filter:Applications"
+"excluded_applications" = "fmn.rules.filter:ExcludedApplications"
 "severities" = "fmn.rules.filter:Severities"
 "my_actions" = "fmn.rules.filter:MyActions"
 "topic" = "fmn.rules.filter:Topic"
diff --git a/tests/api/handlers/test_admin.py b/tests/api/handlers/test_admin.py
index 772d44304..28558f445 100644
--- a/tests/api/handlers/test_admin.py
+++ b/tests/api/handlers/test_admin.py
@@ -55,6 +55,7 @@ def test_list_rules(self, with_disabled, client, api_identity, db_rule, db_rule_
                     "destinations": [{"protocol": "email", "address": "dude@mcpants"}],
                     "filters": {
                         "applications": [],
+                        "excluded_applications": [],
                         "severities": [],
                         "topic": None,
                         "my_actions": False,
@@ -86,6 +87,7 @@ def test_list_rules_username(self, client, api_identity, db_rule, db_rule_disabl
                     "destinations": [{"protocol": "email", "address": "dude@mcpants"}],
                     "filters": {
                         "applications": [],
+                        "excluded_applications": [],
                         "severities": [],
                         "topic": None,
                         "my_actions": False,
diff --git a/tests/api/handlers/test_users.py b/tests/api/handlers/test_users.py
index 72b1ca132..a55e2812d 100644
--- a/tests/api/handlers/test_users.py
+++ b/tests/api/handlers/test_users.py
@@ -381,6 +381,7 @@ async def test_create_user_rule(
                     "destinations": [{"protocol": "irc", "address": "dummynick"}],
                     "filters": {
                         "applications": [],
+                        "excluded_applications": [],
                         "severities": [],
                         "topic": None,
                         "my_actions": False,
diff --git a/tests/rules/test_filter.py b/tests/rules/test_filter.py
index 4d0ac3acd..8f6067bd0 100644
--- a/tests/rules/test_filter.py
+++ b/tests/rules/test_filter.py
@@ -7,7 +7,7 @@
 import pytest
 from fedora_messaging import message
 
-from fmn.rules.filter import Applications, MyActions, Severities, Topic
+from fmn.rules.filter import Applications, ExcludedApplications, MyActions, Severities, Topic
 
 
 @pytest.fixture
@@ -30,6 +30,21 @@ def test_applications(requester, make_mocked_message, received, filtered, expect
     assert f.matches(msg) is expected
 
 
+@pytest.mark.parametrize(
+    "received,filtered,expected",
+    [
+        ("app1", ["app1", "app2"], False),
+        ("app3", ["app1", "app2"], True),
+        ("app1", None, True),
+        ("App1", ["aPP1"], False),
+    ],
+)
+def test_excluded_applications(requester, make_mocked_message, received, filtered, expected):
+    msg = make_mocked_message(topic="dummy", body={"app": received})
+    f = ExcludedApplications(requester, filtered, username="testuser")
+    assert f.matches(msg) is expected
+
+
 @pytest.mark.parametrize(
     "received,filtered,expected",
     [