Revert "Removes option to delete a signal definition (#5471)" (#5483)

This reverts commit a557071.

src/dispatch/signal/service.py

@@ -536,6 +536,14 @@ def update(*, db_session: Session, signal: Signal, signal_in: SignalUpdate) -> S
     return signal
 
 
+def delete(*, db_session: Session, signal_id: int):
+    """Deletes a signal definition."""
+    signal = db_session.query(Signal).filter(Signal.id == signal_id).one()
+    db_session.delete(signal)
+    db_session.commit()
+    return signal_id
+
+
 def is_valid_uuid(val):
     try:
         uuid.UUID(str(val), version=4)

src/dispatch/signal/views.py

@@ -36,6 +36,7 @@
     create,
     create_signal_engagement,
     create_signal_filter,
+    delete,
     delete_signal_filter,
     get,
     get_by_primary_or_external_id,
@@ -329,3 +330,19 @@ def update_signal(
         ) from None
 
     return signal
+
+
+@router.delete(
+    "/{signal_id}",
+    response_model=None,
+    dependencies=[Depends(PermissionsDependency([SensitiveProjectActionPermission]))],
+)
+def delete_signal(db_session: DbSession, signal_id: Union[str, PrimaryKey]):
+    """Deletes a signal."""
+    signal = get_by_primary_or_external_id(db_session=db_session, signal_id=signal_id)
+    if not signal:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=[{"msg": "A signal with this id does not exist."}],
+        )
+    delete(db_session=db_session, signal_id=signal.id)

src/dispatch/static/dispatch/src/signal/DeleteDialog.vue

@@ -0,0 +1,35 @@
+<template>
+  <v-dialog v-model="showRemove" persistent max-width="800px">
+    <v-card>
+      <v-card-title>
+        <span class="text-h5">Delete Signal Definition?</span>
+      </v-card-title>
+      <v-card-text>
+        <v-container> Are you sure you would like to delete this Signal Definition? </v-container>
+      </v-card-text>
+      <v-card-actions>
+        <v-spacer />
+        <v-btn color="blue en-1" variant="text" @click="closeRemove()"> Cancel </v-btn>
+        <v-btn color="red en-1" variant="text" @click="remove()"> Delete </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script>
+import { mapActions } from "vuex"
+import { mapFields } from "vuex-map-fields"
+export default {
+  name: "SignalDefinitionDeleteDialog",
+  data() {
+    return {}
+  },
+  computed: {
+    ...mapFields("signal", ["dialogs.showRemove"]),
+  },
+
+  methods: {
+    ...mapActions("signal", ["remove", "closeRemove"]),
+  },
+}
+</script>

src/dispatch/static/dispatch/src/signal/Table.vue

@@ -1,6 +1,7 @@
 <template>
   <v-container fluid>
     <new-edit-dialog />
+    <delete-dialog />
     <v-row no-gutters>
       <v-col>
         <v-alert closable icon="mdi-school" prominent text type="info">
@@ -87,6 +88,9 @@
                   <v-list-item @click="createEditShow(item)">
                     <v-list-item-title>View / Edit</v-list-item-title>
                   </v-list-item>
+                  <v-list-item @click="removeShow(item)">
+                    <v-list-item-title>Delete</v-list-item-title>
+                  </v-list-item>
                 </v-list>
               </v-menu>
             </template>
@@ -100,12 +104,12 @@
 <script>
 import { mapFields } from "vuex-map-fields"
 import { mapActions } from "vuex"
-
 import NewEditDialog from "@/signal/NewEditDialog.vue"
+import DeleteDialog from "@/signal/DeleteDialog.vue"
 
 export default {
   name: "SignalTable",
-  components: { NewEditDialog },
+  components: { NewEditDialog, DeleteDialog },
   props: {
     name: {
       type: String,

tests/signal/test_signal_service.py

@@ -44,7 +44,7 @@ def test_update(session, project, signal):
 
 
 def test_update__add_filter(session, signal, signal_filter):
-    from dispatch.signal.models import SignalFilterRead, SignalUpdate
+    from dispatch.signal.models import SignalUpdate, SignalFilterRead
     from dispatch.signal.service import update
 
     signal_filter.project = signal.project
@@ -91,15 +91,21 @@ def test_update__delete_filter(session, signal, signal_filter):
     assert len(signal.filters) == 0
 
 
-def test_filter_actions_default_deduplicate(session, signal, project):
-    from datetime import datetime, timedelta
+def test_delete(session, signal):
+    from dispatch.signal.service import delete, get
 
-    from dispatch.case.models import Case
-    from dispatch.entity.models import Entity
+    delete(db_session=session, signal_id=signal.id)
+    assert not get(db_session=session, signal_id=signal.id)
+
+
+def test_filter_actions_default_deduplicate(session, signal, project):
+    from dispatch.signal.models import SignalInstance, SignalFilterAction
+    from dispatch.signal.service import filter_signal
     from dispatch.entity_type.models import EntityType
+    from dispatch.entity.models import Entity
     from dispatch.enums import Visibility
-    from dispatch.signal.models import SignalFilterAction, SignalInstance
-    from dispatch.signal.service import filter_signal
+    from dispatch.case.models import Case
+    from datetime import datetime, timedelta
 
     entity_type = EntityType(
         name="default_dedupe",
@@ -157,14 +163,14 @@ def test_filter_actions_default_deduplicate(session, signal, project):
 
 
 def test_filter_actions_deduplicate_different_entities(session, signal, project):
-    from dispatch.entity.models import Entity
-    from dispatch.entity_type.models import EntityType
     from dispatch.signal.models import (
         SignalFilter,
-        SignalFilterAction,
         SignalInstance,
+        SignalFilterAction,
     )
     from dispatch.signal.service import filter_signal
+    from dispatch.entity_type.models import EntityType
+    from dispatch.entity.models import Entity
 
     entity_type_0 = EntityType(
         name="dedupe2-0",
@@ -210,14 +216,14 @@ def test_filter_actions_deduplicate_different_entities(session, signal, project)
 
 
 def test_filter_actions_deduplicate_different_entities_types(session, signal, project):
-    from dispatch.entity.models import Entity
-    from dispatch.entity_type.models import EntityType
     from dispatch.signal.models import (
         SignalFilter,
-        SignalFilterAction,
         SignalInstance,
+        SignalFilterAction,
     )
     from dispatch.signal.service import filter_signal
+    from dispatch.entity_type.models import EntityType
+    from dispatch.entity.models import Entity
 
     entity_type_0 = EntityType(
         name="dedupe0-0",
@@ -268,14 +274,14 @@ def test_filter_actions_deduplicate_different_entities_types(session, signal, pr
 
 
 def test_filter_actions_deduplicate(session, signal, project):
-    from dispatch.entity.models import Entity
-    from dispatch.entity_type.models import EntityType
     from dispatch.signal.models import (
         SignalFilter,
-        SignalFilterAction,
         SignalInstance,
+        SignalFilterAction,
     )
     from dispatch.signal.service import filter_signal
+    from dispatch.entity_type.models import EntityType
+    from dispatch.entity.models import Entity
 
     entity_type = EntityType(
         name="dedupe1",
@@ -319,15 +325,14 @@ def test_filter_actions_deduplicate(session, signal, project):
 
 def test_filter_action_with_dedupe_and_snooze(session, signal, project):
     from datetime import datetime, timedelta, timezone
-
-    from dispatch.entity.models import Entity
-    from dispatch.entity_type.models import EntityType
     from dispatch.signal.models import (
         SignalFilter,
-        SignalFilterAction,
         SignalInstance,
+        SignalFilterAction,
     )
     from dispatch.signal.service import filter_signal
+    from dispatch.entity_type.models import EntityType
+    from dispatch.entity.models import Entity
 
     entity_type = EntityType(
         name="dedupe1+snooze",
@@ -381,14 +386,13 @@ def test_filter_action_with_dedupe_and_snooze(session, signal, project):
 
 def test_filter_actions_snooze(session, entity, signal, project):
     from datetime import datetime, timedelta, timezone
-
-    from dispatch.entity_type.models import EntityType
     from dispatch.signal.models import (
         SignalFilter,
-        SignalFilterAction,
         SignalInstance,
+        SignalFilterAction,
     )
     from dispatch.signal.service import filter_signal
+    from dispatch.entity_type.models import EntityType
 
     entity_type = EntityType(
         name="test",
@@ -426,14 +430,13 @@ def test_filter_actions_snooze(session, entity, signal, project):
 
 def test_filter_actions_snooze_expired(session, entity, signal, project):
     from datetime import datetime, timedelta, timezone
-
-    from dispatch.entity_type.models import EntityType
     from dispatch.signal.models import (
         SignalFilter,
-        SignalFilterAction,
         SignalInstance,
+        SignalFilterAction,
     )
     from dispatch.signal.service import filter_signal
+    from dispatch.entity_type.models import EntityType
 
     entity_type = EntityType(
         name="test",