Skip to content
This repository was archived by the owner on Sep 3, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/dispatch/case/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ class CaseReadMinimal(CaseBase):
project: ProjectRead
assignee: ParticipantReadMinimal | None = None
case_costs: list[CaseCostReadMinimal] = []
incidents: list[IncidentReadBasic] | None = []


class CaseReadMinimalWithExtras(CaseBase):
Expand Down
7 changes: 4 additions & 3 deletions src/dispatch/incident/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ class ProjectRead(DispatchBase):
display_name: str | None = None


class CaseRead(DispatchBase):
class CaseReadBasic(DispatchBase):
"""Pydantic model for reading a case resource."""

id: PrimaryKey
Expand Down Expand Up @@ -353,12 +353,13 @@ class IncidentReadMinimal(IncidentBase):
tags: list[TagRead] | None = []
tasks: list[TaskReadMinimal] | None = []
total_cost: float | None = None
cases: list[CaseReadBasic] | None = []


class IncidentUpdate(IncidentBase):
"""Pydantic model for updating an incident resource."""

cases: list[CaseRead] | None = []
cases: list[CaseReadBasic] | None = []
commander: ParticipantUpdate | None = None
delay_executive_report_reminder: datetime | None = None
delay_tactical_report_reminder: datetime | None = None
Expand Down Expand Up @@ -396,7 +397,7 @@ class IncidentRead(IncidentBase):
"""Pydantic model for reading an incident resource."""

id: PrimaryKey
cases: list[CaseRead] | None = []
cases: list[CaseReadBasic] | None = []
closed_at: datetime | None = None
commander: ParticipantRead | None = None
commanders_location: str | None = None
Expand Down
25 changes: 25 additions & 0 deletions src/dispatch/static/dispatch/src/case/CaseStatus.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,21 @@
</template>
</v-tooltip>
</template>
<template v-if="incidents && incidents.length > 0">
<v-tooltip location="bottom" :text="`View incident`">
<template #activator="{ props }">
<v-btn
v-bind="props"
icon="mdi-fire"
variant="text"
density="comfortable"
class="ml-1"
color="orange"
@click.stop="navigateToIncident(incidents[0])"
/>
</template>
</v-tooltip>
</template>
</div>
</template>

Expand All @@ -43,6 +58,10 @@ export default {
type: Boolean,
required: true,
},
incidents: {
type: Array,
default: () => [],
},
},

computed: {
Expand All @@ -61,6 +80,12 @@ export default {

methods: {
...mapActions("case_management", ["joinCase"]),
navigateToIncident(incident) {
this.$router.push({
name: "IncidentTableEdit",
params: { name: incident.name },
})
},
},
}
</script>
8 changes: 7 additions & 1 deletion src/dispatch/static/dispatch/src/case/CaseSummaryTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
<case-priority :priority="value" :color="item.case_priority.color" />
</template>
<template #item.status="{ item, value }">
<case-status :status="value" :id="item.id" />
<case-status
:status="value"
:id="item.id"
:allowSelfJoin="item.project?.allow_self_join || false"
:dedicatedChannel="item.dedicated_channel || false"
:incidents="item.incidents"
/>
</template>
<template #item.project.display_name="{ item, value }">
<v-chip size="small" :color="item.project.color">
Expand Down
1 change: 1 addition & 0 deletions src/dispatch/static/dispatch/src/case/Table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
:id="item.id"
:allowSelfJoin="item.project.allow_self_join"
:dedicatedChannel="item.dedicated_channel"
:incidents="item.incidents"
/>
</template>
<template #item.project.display_name="{ item }">
Expand Down
8 changes: 7 additions & 1 deletion src/dispatch/static/dispatch/src/case/TableExportDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,13 @@
/>
</template>
<template #item.status="{ item }">
<case-status :status="item.status" :id="item.id" />
<case-status
:status="item.status"
:id="item.id"
:allowSelfJoin="item.project?.allow_self_join || false"
:dedicatedChannel="item.dedicated_channel || false"
:incidents="item.incidents"
/>
</template>
<template #item.tags="{ item }">
<span v-for="tag in item.tags" :key="tag">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
<incident-priority :priority="value" :color="item.incident_priority.color" />
</template>
<template #item.status="{ item, value }">
<incident-status :status="value" :id="item.id" />
<incident-status
:status="value"
:id="item.id"
:allowSelfJoin="item.project?.allow_self_join || false"
:cases="item.cases || []"
/>
</template>
<template #item.commander="{ value }">
<incident-participant :participant="value" />
Expand Down
1 change: 1 addition & 0 deletions src/dispatch/static/dispatch/src/incident/Table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
:status="value"
:id="item.id"
:allowSelfJoin="item.project.allow_self_join"
:cases="item.cases"
/>
</template>
<template #item.incident_costs="{ value }">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,12 @@
/>
</template>
<template #item.status="{ item }">
<incident-status :status="item.status" :id="item.id" />
<incident-status
:status="item.status"
:id="item.id"
:allowSelfJoin="item.project?.allow_self_join || false"
:cases="item.cases || []"
/>
</template>
<template #item.tags="{ item }">
<span v-for="tag in item.tags" :key="tag">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@
</template>
</v-tooltip>
</template>
<template v-if="cases && cases.length > 0">
<v-tooltip location="bottom" :text="`View case`">
<template #activator="{ props }">
<v-btn
v-bind="props"
icon="mdi-briefcase"
variant="text"
density="comfortable"
class="ml-1"
color="blue"
@click.stop="navigateToCase(cases[0])"
/>
</template>
</v-tooltip>
</template>
</div>
</template>

Expand All @@ -50,6 +65,10 @@ export default {
type: Boolean,
required: true,
},
cases: {
type: Array,
default: () => [],
},
},

computed: {
Expand All @@ -66,6 +85,12 @@ export default {

methods: {
...mapActions("incident", ["joinIncident", "subscribeToIncident"]),
navigateToCase(caseItem) {
this.$router.push({
name: "CaseTableEdit",
params: { name: caseItem.name },
})
},
},
}
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,12 @@
/>
</template>
<template #item.status="{ item }">
<incident-status :status="item.status" :id="item.id" />
<incident-status
:status="item.status"
:id="item.id"
:allowSelfJoin="item.project?.allow_self_join || false"
:cases="item.cases || []"
/>
</template>
</v-data-table>
</v-card-text>
Expand Down
8 changes: 7 additions & 1 deletion src/dispatch/static/dispatch/src/signal/Table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,13 @@
<v-checkbox-btn :model-value="value" disabled />
</template>
<template #item.status="{ item, value }">
<case-status :status="value" :id="item.id" />
<case-status
:status="value"
:id="item.id"
:allowSelfJoin="false"
:dedicatedChannel="false"
:incidents="[]"
/>
</template>
<template #item.project.display_name="{ item }">
<v-chip size="small" :color="item.project.color">
Expand Down
7 changes: 6 additions & 1 deletion src/dispatch/static/dispatch/src/task/TableExportDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,12 @@
</div>
</template>
<template #item.incident.status="{ item }">
<incident-status :status="item.incident.status" :id="item.id" />
<incident-status
:status="item.incident.status"
:id="item.id"
:allowSelfJoin="false"
:cases="[]"
/>
</template>
<template #item.incident_priority.name="{ item }">
<incident-priority
Expand Down
Loading