From abfa2bc2ba790182350e45856893aca624b8d1e7 Mon Sep 17 00:00:00 2001
From: David Whittaker <dwhittaker@netflix.com>
Date: Fri, 13 Dec 2024 10:40:23 -0800
Subject: [PATCH 1/4] feat(ui): allow project to have a display name separate
 from its key

---
 src/dispatch/case/models.py                   |  1 +
 .../versions/2024-12-12_2d9e4d392ea4.py       | 33 +++++++++++++++++++
 src/dispatch/incident/models.py               |  1 +
 src/dispatch/incident/priority/models.py      |  1 +
 .../dispatch_slack/case/interactive.py        | 10 +++---
 src/dispatch/plugins/dispatch_slack/fields.py |  2 +-
 .../dispatch_slack/incident/interactive.py    | 18 ++--------
 src/dispatch/project/models.py                |  3 ++
 .../dispatch/src/case/CaseSummaryTable.vue    |  4 +--
 .../dispatch/src/case/ReportReceiptCard.vue   |  2 +-
 .../src/case/ReportSubmissionCard.vue         |  2 +-
 .../static/dispatch/src/case/Table.vue        |  6 ++--
 .../case/priority/CasePriorityCombobox.vue    |  4 +--
 .../case/severity/CaseSeverityCombobox.vue    |  4 +--
 .../src/case/type/CaseTypeCombobox.vue        |  4 +--
 .../incident/IncidentDrillDownTable.vue       |  4 +--
 .../src/data/query/QuerySummaryTable.vue      |  4 +--
 .../static/dispatch/src/data/query/Table.vue  |  6 ++--
 .../src/data/source/SourceSummaryTable.vue    |  4 +--
 .../static/dispatch/src/data/source/Table.vue |  6 ++--
 .../src/document/DocumentSummaryTable.vue     |  4 +--
 .../dispatch/src/feedback/incident/Table.vue  |  6 ++--
 .../dispatch/src/feedback/service/Table.vue   |  6 ++--
 .../static/dispatch/src/forms/table/Table.vue |  2 +-
 .../src/incident/IncidentSummaryTable.vue     |  4 +--
 .../src/incident/ReportReceiptCard.vue        |  2 +-
 .../static/dispatch/src/incident/Table.vue    |  4 +--
 .../priority/IncidentPriorityCombobox.vue     |  4 +--
 .../severity/IncidentSeverityCombobox.vue     |  4 +--
 .../incident/type/IncidentTypeCombobox.vue    |  4 +--
 .../src/incident/type/IncidentTypeSelect.vue  |  2 +-
 .../dispatch/src/project/NewEditSheet.vue     | 18 ++++++++--
 .../dispatch/src/project/ProjectCombobox.vue  |  4 +--
 .../dispatch/src/project/ProjectSelect.vue    |  7 ++--
 .../static/dispatch/src/project/Table.vue     |  3 +-
 .../static/dispatch/src/signal/Table.vue      |  4 +--
 .../dispatch/src/signal/TableInstance.vue     |  4 +--
 .../src/tag/TagFilterAutoComplete.vue         |  7 ++--
 .../dispatch/src/tag/TagSummaryTable.vue      |  4 +--
 .../src/tag_type/TagTypeFilterCombobox.vue    |  6 ++--
 .../static/dispatch/src/task/Table.vue        |  6 ++--
 .../dispatch/src/task/TaskSummaryTable.vue    |  4 +--
 42 files changed, 135 insertions(+), 93 deletions(-)
 create mode 100644 src/dispatch/database/revisions/tenant/versions/2024-12-12_2d9e4d392ea4.py

diff --git a/src/dispatch/case/models.py b/src/dispatch/case/models.py
index 7405bd194282..f227d8f6430d 100644
--- a/src/dispatch/case/models.py
+++ b/src/dispatch/case/models.py
@@ -230,6 +230,7 @@ class SignalInstanceRead(DispatchBase):
 class ProjectRead(DispatchBase):
     id: Optional[PrimaryKey]
     name: NameStr
+    display_name: Optional[str]
     color: Optional[str]
     allow_self_join: Optional[bool] = Field(True, nullable=True)
 
diff --git a/src/dispatch/database/revisions/tenant/versions/2024-12-12_2d9e4d392ea4.py b/src/dispatch/database/revisions/tenant/versions/2024-12-12_2d9e4d392ea4.py
new file mode 100644
index 000000000000..f54a1fadb877
--- /dev/null
+++ b/src/dispatch/database/revisions/tenant/versions/2024-12-12_2d9e4d392ea4.py
@@ -0,0 +1,33 @@
+"""Adding display name to the projct model
+
+Revision ID: 2d9e4d392ea4
+Revises: 575ca7d954a8
+Create Date: 2024-12-12 16:34:58.098426
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "2d9e4d392ea4"
+down_revision = "575ca7d954a8"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("project", sa.Column("display_name", sa.String(), nullable=True))
+
+    # Copy data from 'name' column to 'display_name' column
+    op.execute("UPDATE project SET display_name = name")
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("project", "display_name")
+    # ### end Alembic commands ###
diff --git a/src/dispatch/incident/models.py b/src/dispatch/incident/models.py
index d5e727d6ecd6..4094ee820550 100644
--- a/src/dispatch/incident/models.py
+++ b/src/dispatch/incident/models.py
@@ -242,6 +242,7 @@ class ProjectRead(DispatchBase):
     color: Optional[str]
     stable_priority: Optional[IncidentPriorityRead] = None
     allow_self_join: Optional[bool] = Field(True, nullable=True)
+    display_name: Optional[str] = Field(None, nullable=True)
 
 
 class CaseRead(DispatchBase):
diff --git a/src/dispatch/incident/priority/models.py b/src/dispatch/incident/priority/models.py
index 4920201e7281..da088f6993d2 100644
--- a/src/dispatch/incident/priority/models.py
+++ b/src/dispatch/incident/priority/models.py
@@ -38,6 +38,7 @@ class IncidentPriority(Base, ProjectMixin):
 class ProjectRead(DispatchBase):
     id: Optional[PrimaryKey]
     name: NameStr
+    display_name: Optional[str]
 
 
 # Pydantic models...
diff --git a/src/dispatch/plugins/dispatch_slack/case/interactive.py b/src/dispatch/plugins/dispatch_slack/case/interactive.py
index 5343a4b51b8c..6708b06ca037 100644
--- a/src/dispatch/plugins/dispatch_slack/case/interactive.py
+++ b/src/dispatch/plugins/dispatch_slack/case/interactive.py
@@ -184,7 +184,7 @@ def handle_escalate_case_command(
 
     default_title = case.name
     default_description = case.description
-    default_project = {"text": case.project.name, "value": case.project.id}
+    default_project = {"text": case.project.display_name, "value": case.project.id}
 
     blocks = [
         Context(elements=[MarkdownText(text="Accept the defaults or adjust as needed.")]),
@@ -1303,7 +1303,7 @@ def escalate_button_click(
         description_input(initial_value=case.description),
         project_select(
             db_session=db_session,
-            initial_option={"text": case.project.name, "value": case.project.id},
+            initial_option={"text": case.project.display_name, "value": case.project.id},
             action_id=CaseEscalateActions.project_select,
             dispatch_action=True,
         ),
@@ -1358,7 +1358,7 @@ def handle_project_select_action(
         description_input(),
         project_select(
             db_session=db_session,
-            initial_option={"text": project.name, "value": project.id},
+            initial_option={"text": project.display_name, "value": project.id},
             action_id=CaseEscalateActions.project_select,
             dispatch_action=True,
         ),
@@ -2138,7 +2138,7 @@ def handle_report_project_select_action(
         description_input(),
         project_select(
             db_session=db_session,
-            initial_option={"text": project.name, "value": project.id},
+            initial_option={"text": project.display_name, "value": project.id},
             action_id=CaseReportActions.project_select,
             dispatch_action=True,
         ),
@@ -2243,7 +2243,7 @@ def handle_report_case_type_select_action(
         description_input(),
         project_select(
             db_session=db_session,
-            initial_option={"text": project.name, "value": project.id},
+            initial_option={"text": project.display_name, "value": project.id},
             action_id=CaseReportActions.project_select,
             dispatch_action=True,
         ),
diff --git a/src/dispatch/plugins/dispatch_slack/fields.py b/src/dispatch/plugins/dispatch_slack/fields.py
index 2c4541db4c12..2dc9c956c542 100644
--- a/src/dispatch/plugins/dispatch_slack/fields.py
+++ b/src/dispatch/plugins/dispatch_slack/fields.py
@@ -301,7 +301,7 @@ def project_select(
 ):
     """Creates a project select."""
     projects = [
-        {"text": p.name, "value": p.id}
+        {"text": p.display_name, "value": p.id}
         for p in project_service.get_all(db_session=db_session)
         if p.enabled
     ]
diff --git a/src/dispatch/plugins/dispatch_slack/incident/interactive.py b/src/dispatch/plugins/dispatch_slack/incident/interactive.py
index a27253e04600..33068ffda671 100644
--- a/src/dispatch/plugins/dispatch_slack/incident/interactive.py
+++ b/src/dispatch/plugins/dispatch_slack/incident/interactive.py
@@ -309,7 +309,7 @@ def handle_update_incident_project_select_action(
         incident_status_select(initial_option={"text": incident.status, "value": incident.status}),
         project_select(
             db_session=db_session,
-            initial_option={"text": project.name, "value": project.id},
+            initial_option={"text": project.display_name, "value": project.id},
             action_id=IncidentUpdateActions.project_select,
             dispatch_action=True,
         ),
@@ -2114,20 +2114,8 @@ def handle_update_incident_command(
         description_input(initial_value=incident.description),
         resolution_input(initial_value=incident.resolution),
         incident_status_select(initial_option={"text": incident.status, "value": incident.status}),
-        project_select(
-            db_session=db_session,
-            initial_option={"text": incident.project.name, "value": incident.project.id},
-            action_id=IncidentUpdateActions.project_select,
-            dispatch_action=True,
-        ),
-        incident_type_select(
-            db_session=db_session,
-            initial_option={
-                "text": incident.incident_type.name,
-                "value": incident.incident_type.id,
-            },
-            project_id=incident.project.id,
-        ),
+        Section(text=f"*Project*: {incident.project.display_name}"),
+        Context(elements=[MarkdownText(text="Project is read-only")]),
         incident_severity_select(
             db_session=db_session,
             initial_option={
diff --git a/src/dispatch/project/models.py b/src/dispatch/project/models.py
index b6620c8a7fe0..b50210e977b4 100644
--- a/src/dispatch/project/models.py
+++ b/src/dispatch/project/models.py
@@ -40,6 +40,8 @@ class Project(Base):
         cascade="all, delete-orphan",
     )
 
+    display_name = Column(String, nullable=True)
+
     enabled = Column(Boolean, default=True, server_default="t")
     allow_self_join = Column(Boolean, default=True, server_default="t")
 
@@ -82,6 +84,7 @@ def slug(self):
 class ProjectBase(DispatchBase):
     id: Optional[PrimaryKey]
     name: NameStr
+    display_name: Optional[str] = Field(None, nullable=True)
     owner_email: Optional[EmailStr] = Field(None, nullable=True)
     owner_conversation: Optional[str] = Field(None, nullable=True)
     annual_employee_cost: Optional[int]
diff --git a/src/dispatch/static/dispatch/src/case/CaseSummaryTable.vue b/src/dispatch/static/dispatch/src/case/CaseSummaryTable.vue
index e6a186679bca..d0a780ba702b 100644
--- a/src/dispatch/static/dispatch/src/case/CaseSummaryTable.vue
+++ b/src/dispatch/static/dispatch/src/case/CaseSummaryTable.vue
@@ -6,7 +6,7 @@
     <template #item.status="{ item, value }">
       <case-status :status="value" :id="item.id" />
     </template>
-    <template #item.project.name="{ item, value }">
+    <template #item.project.display_name="{ item, value }">
       <v-chip size="small" :color="item.project.color">
         {{ value }}
       </v-chip>
@@ -55,7 +55,7 @@ export default {
         { title: "Status", key: "status", sortable: false },
         { title: "Type", key: "case_type.name", sortable: false },
         { title: "Priority", key: "case_priority.name", sortable: false, width: "10%" },
-        { title: "Project", key: "project.name", sortable: false },
+        { title: "Project", key: "project.display_name", sortable: false },
         { title: "Reported At", key: "reported_at", sortable: false },
         { title: "Assignee", key: "assignee.email", sortable: false },
         { title: "", key: "data-table-actions", sortable: false, align: "end" },
diff --git a/src/dispatch/static/dispatch/src/case/ReportReceiptCard.vue b/src/dispatch/static/dispatch/src/case/ReportReceiptCard.vue
index e08b6fb82e12..34bc89f11ed1 100644
--- a/src/dispatch/static/dispatch/src/case/ReportReceiptCard.vue
+++ b/src/dispatch/static/dispatch/src/case/ReportReceiptCard.vue
@@ -40,7 +40,7 @@
           <v-divider />
           <v-list-item>
             <v-list-item-title>Project</v-list-item-title>
-            <v-list-item-subtitle>{{ project.name }}</v-list-item-subtitle>
+            <v-list-item-subtitle>{{ project.display_name }}</v-list-item-subtitle>
           </v-list-item>
           <v-divider />
           <v-list-item>
diff --git a/src/dispatch/static/dispatch/src/case/ReportSubmissionCard.vue b/src/dispatch/static/dispatch/src/case/ReportSubmissionCard.vue
index 77d46bdcd8b0..f8eb295de93e 100644
--- a/src/dispatch/static/dispatch/src/case/ReportSubmissionCard.vue
+++ b/src/dispatch/static/dispatch/src/case/ReportSubmissionCard.vue
@@ -179,7 +179,7 @@ export default {
                 model: "Project",
                 field: "name",
                 op: "==",
-                value: this.project.name,
+                value: this.project.display_name,
               },
             ],
           }),
diff --git a/src/dispatch/static/dispatch/src/case/Table.vue b/src/dispatch/static/dispatch/src/case/Table.vue
index 3485aeb1f0d9..52ab6ff29fb8 100644
--- a/src/dispatch/static/dispatch/src/case/Table.vue
+++ b/src/dispatch/static/dispatch/src/case/Table.vue
@@ -79,9 +79,9 @@
                 :dedicatedChannel="item.dedicated_channel"
               />
             </template>
-            <template #item.project.name="{ item }">
+            <template #item.project.display_name="{ item }">
               <v-chip size="small" :color="item.project.color">
-                {{ item.project.name }}
+                {{ item.project.display_name }}
               </v-chip>
             </template>
             <template #item.case_costs="{ value }" v-if="auth.currentUser.experimental_features">
@@ -228,7 +228,7 @@ function loadHeaders() {
     { title: "Type", value: "case_type.name", sortable: true },
     { title: "Severity", value: "case_severity.name", sortable: true },
     { title: "Priority", value: "case_priority.name", sortable: true },
-    { title: "Project", value: "project.name", sortable: true },
+    { title: "Project", value: "project.display_name", sortable: true },
     { title: "Assignee", value: "assignee", sortable: false },
     { title: "Cost", key: "case_costs", sortable: false, experimental_features: true },
     { title: "Reported At", value: "reported_at", sortable: true },
diff --git a/src/dispatch/static/dispatch/src/case/priority/CasePriorityCombobox.vue b/src/dispatch/static/dispatch/src/case/priority/CasePriorityCombobox.vue
index 6b17c25e0bb2..2da677f866d7 100644
--- a/src/dispatch/static/dispatch/src/case/priority/CasePriorityCombobox.vue
+++ b/src/dispatch/static/dispatch/src/case/priority/CasePriorityCombobox.vue
@@ -25,13 +25,13 @@
     </template>
     <template #chip="{ item, props }">
       <v-chip v-bind="props">
-        <span>{{ item.raw.project.name }}/</span>{{ item.raw.name }}
+        <span>{{ item.raw.project.display_name }}/</span>{{ item.raw.name }}
       </v-chip>
     </template>
     <template #item="data">
       <v-list-item v-bind="data.props" :title="null">
         <v-list-item-title>
-          <span>{{ data.item.raw.project.name }}/</span>{{ data.item.raw.name }}
+          <span>{{ data.item.raw.project.display_name }}/</span>{{ data.item.raw.name }}
         </v-list-item-title>
         <v-list-item-subtitle :title="data.item.raw.description">
           {{ data.item.raw.description }}
diff --git a/src/dispatch/static/dispatch/src/case/severity/CaseSeverityCombobox.vue b/src/dispatch/static/dispatch/src/case/severity/CaseSeverityCombobox.vue
index eca0133bf9d2..78daeef429b1 100644
--- a/src/dispatch/static/dispatch/src/case/severity/CaseSeverityCombobox.vue
+++ b/src/dispatch/static/dispatch/src/case/severity/CaseSeverityCombobox.vue
@@ -25,13 +25,13 @@
     </template>
     <template #chip="{ item, props }">
       <v-chip v-bind="props">
-        <span>{{ item.raw.project.name }}/</span>{{ item.raw.name }}
+        <span>{{ item.raw.project.display_name }}/</span>{{ item.raw.name }}
       </v-chip>
     </template>
     <template #item="data">
       <v-list-item v-bind="data.props" :title="null">
         <v-list-item-title>
-          <span>{{ data.item.raw.project.name }}/</span>{{ data.item.raw.name }}
+          <span>{{ data.item.raw.project.display_name }}/</span>{{ data.item.raw.name }}
         </v-list-item-title>
         <v-list-item-subtitle :title="data.item.raw.description">
           {{ data.item.raw.description }}
diff --git a/src/dispatch/static/dispatch/src/case/type/CaseTypeCombobox.vue b/src/dispatch/static/dispatch/src/case/type/CaseTypeCombobox.vue
index eafd0859c1c3..09ef99672932 100644
--- a/src/dispatch/static/dispatch/src/case/type/CaseTypeCombobox.vue
+++ b/src/dispatch/static/dispatch/src/case/type/CaseTypeCombobox.vue
@@ -25,13 +25,13 @@
     </template>
     <template #chip="{ item, props }">
       <v-chip v-bind="props">
-        <span>{{ item.raw.project.name }}/</span>{{ item.raw.name }}
+        <span>{{ item.raw.project.display_name }}/</span>{{ item.raw.name }}
       </v-chip>
     </template>
     <template #item="data">
       <v-list-item v-bind="data.props" :title="null">
         <v-list-item-title>
-          <span>{{ data.item.raw.project.name }}/</span>{{ data.item.raw.name }}
+          <span>{{ data.item.raw.project.display_name }}/</span>{{ data.item.raw.name }}
         </v-list-item-title>
         <v-list-item-subtitle :title="data.item.raw.description">
           {{ data.item.raw.description }}
diff --git a/src/dispatch/static/dispatch/src/dashboard/incident/IncidentDrillDownTable.vue b/src/dispatch/static/dispatch/src/dashboard/incident/IncidentDrillDownTable.vue
index b26636d2c31f..d9c1cfa1d925 100644
--- a/src/dispatch/static/dispatch/src/dashboard/incident/IncidentDrillDownTable.vue
+++ b/src/dispatch/static/dispatch/src/dashboard/incident/IncidentDrillDownTable.vue
@@ -13,7 +13,7 @@
       </v-card-title>
     </v-card>
     <v-data-table :headers="headers" :items="items" :loading="loading" :search="search">
-      <template #item.project.name="{ item, value }">
+      <template #item.project.display_name="{ item, value }">
         <v-chip size="small" :color="item.project.color">
           {{ value }}
         </v-chip>
@@ -45,7 +45,7 @@ export default {
       headers: [
         { title: "Name", key: "name", align: "left", width: "10%" },
         { title: "Title", key: "title", sortable: false },
-        { title: "Project", key: "project.name", sortable: true },
+        { title: "Project", key: "project.display_name", sortable: true },
         { title: "", key: "data-table-actions", sortable: false, align: "end" },
       ],
     }
diff --git a/src/dispatch/static/dispatch/src/data/query/QuerySummaryTable.vue b/src/dispatch/static/dispatch/src/data/query/QuerySummaryTable.vue
index aed408507eb2..e9f27444acb8 100644
--- a/src/dispatch/static/dispatch/src/data/query/QuerySummaryTable.vue
+++ b/src/dispatch/static/dispatch/src/data/query/QuerySummaryTable.vue
@@ -1,6 +1,6 @@
 <template>
   <v-data-table :headers="headers" :items="items">
-    <template #item.project.name="{ item, value }">
+    <template #item.project.display_name="{ item, value }">
       <v-chip size="small" :color="item.project.color">
         {{ value }}
       </v-chip>
@@ -29,7 +29,7 @@ export default {
     return {
       headers: [
         { title: "Name", key: "name", sortable: true },
-        { title: "Project", key: "project.name", sortable: false },
+        { title: "Project", key: "project.display_name", sortable: false },
         { title: "Description", key: "description", sortable: false },
         { title: "Language", key: "language", sortable: true },
         {
diff --git a/src/dispatch/static/dispatch/src/data/query/Table.vue b/src/dispatch/static/dispatch/src/data/query/Table.vue
index 9059d50d0358..29a916ea511b 100644
--- a/src/dispatch/static/dispatch/src/data/query/Table.vue
+++ b/src/dispatch/static/dispatch/src/data/query/Table.vue
@@ -35,9 +35,9 @@
             :loading="loading"
             loading-text="Loading... Please wait"
           >
-            <template #item.project.name="{ item }">
+            <template #item.project.display_name="{ item }">
               <v-chip size="small" :color="item.project.color">
-                {{ item.project.name }}
+                {{ item.project.display_name }}
               </v-chip>
             </template>
             <template #item.data-table-actions="{ item }">
@@ -86,7 +86,7 @@ export default {
     return {
       headers: [
         { title: "Name", value: "name", sortable: true },
-        { title: "Project", value: "project.name", sortable: false },
+        { title: "Project", value: "project.display_name", sortable: false },
         { title: "Description", value: "description", sortable: false },
         { title: "Language", value: "language", sortable: true },
         {
diff --git a/src/dispatch/static/dispatch/src/data/source/SourceSummaryTable.vue b/src/dispatch/static/dispatch/src/data/source/SourceSummaryTable.vue
index 494ee2c8fb7d..dbb89b257527 100644
--- a/src/dispatch/static/dispatch/src/data/source/SourceSummaryTable.vue
+++ b/src/dispatch/static/dispatch/src/data/source/SourceSummaryTable.vue
@@ -10,7 +10,7 @@
         <b>{{ value }}</b>
       </router-link>
     </template>
-    <template #item.project.name="{ item, value }">
+    <template #item.project.display_name="{ item, value }">
       <v-chip size="small" :color="item.project.color">
         {{ value }}
       </v-chip>
@@ -67,7 +67,7 @@ export default {
     return {
       headers: [
         { title: "Name", key: "name", sortable: true },
-        { title: "Project", key: "project.name", sortable: false },
+        { title: "Project", key: "project.display_name", sortable: false },
         { title: "Environment", key: "source_environment.name", sortable: true },
         { title: "Owner", key: "owner" },
         { title: "Status", key: "source_status", sortable: true },
diff --git a/src/dispatch/static/dispatch/src/data/source/Table.vue b/src/dispatch/static/dispatch/src/data/source/Table.vue
index 645a1e78010e..e554076870e9 100644
--- a/src/dispatch/static/dispatch/src/data/source/Table.vue
+++ b/src/dispatch/static/dispatch/src/data/source/Table.vue
@@ -45,9 +45,9 @@
                 <b>{{ item.name }}</b>
               </router-link>
             </template>
-            <template #item.project.name="{ item }">
+            <template #item.project.display_name="{ item }">
               <v-chip size="small" :color="item.project.color">
-                {{ item.project.name }}
+                {{ item.project.display_name }}
               </v-chip>
             </template>
             <template #item.source_status="{ item }">
@@ -120,7 +120,7 @@ export default {
     return {
       headers: [
         { title: "Name", value: "name", sortable: true },
-        { title: "Project", value: "project.name", sortable: false },
+        { title: "Project", value: "project.display_name", sortable: false },
         { title: "Environment", value: "source_environment.name", sortable: true },
         { title: "Owner", value: "owner" },
         { title: "Status", value: "source_status", sortable: true },
diff --git a/src/dispatch/static/dispatch/src/document/DocumentSummaryTable.vue b/src/dispatch/static/dispatch/src/document/DocumentSummaryTable.vue
index 89264207f54c..a4fcaef6aa1d 100644
--- a/src/dispatch/static/dispatch/src/document/DocumentSummaryTable.vue
+++ b/src/dispatch/static/dispatch/src/document/DocumentSummaryTable.vue
@@ -6,7 +6,7 @@
         <v-icon size="small">mdi-open-in-new</v-icon>
       </a>
     </template>
-    <template #item.project.name="{ item, value }">
+    <template #item.project.display_name="{ item, value }">
       <v-chip size="small" :color="item.project.color">
         {{ value }}
       </v-chip>
@@ -39,7 +39,7 @@ export default {
       headers: [
         { title: "Name", key: "name", sortable: false },
         { title: "Description", key: "description", sortable: false },
-        { title: "Project", key: "project.name", sortable: true },
+        { title: "Project", key: "project.display_name", sortable: true },
         { title: "", key: "data-table-actions", sortable: false, align: "end" },
       ],
     }
diff --git a/src/dispatch/static/dispatch/src/feedback/incident/Table.vue b/src/dispatch/static/dispatch/src/feedback/incident/Table.vue
index d6b4184a063c..172ef9bec3d7 100644
--- a/src/dispatch/static/dispatch/src/feedback/incident/Table.vue
+++ b/src/dispatch/static/dispatch/src/feedback/incident/Table.vue
@@ -44,9 +44,9 @@
                 <span>{{ formatDate(item.created_at) }}</span>
               </v-tooltip>
             </template>
-            <template #item.project.name="{ item }">
+            <template #item.project.display_name="{ item }">
               <v-chip size="small" :color="item.project.color">
-                {{ item.project.name }}
+                {{ item.project.display_name }}
               </v-chip>
             </template>
             <template #item.name="{ item }">
@@ -110,7 +110,7 @@ export default {
         { title: "Participant", value: "participant", sortable: true },
         { title: "Rating", value: "rating", sortable: true },
         { title: "Feedback", value: "feedback", sortable: true },
-        { title: "Project", value: "project.name", sortable: false },
+        { title: "Project", value: "project.display_name", sortable: false },
         { title: "Created At", value: "created_at", sortable: true },
         { title: "", key: "data-table-actions", sortable: false, align: "end" },
       ],
diff --git a/src/dispatch/static/dispatch/src/feedback/service/Table.vue b/src/dispatch/static/dispatch/src/feedback/service/Table.vue
index 557f8e52a205..5daf3df7391b 100644
--- a/src/dispatch/static/dispatch/src/feedback/service/Table.vue
+++ b/src/dispatch/static/dispatch/src/feedback/service/Table.vue
@@ -65,9 +65,9 @@
                 Participants: {{ item.details[0].num_participants }}<br />
               </span>
             </template>
-            <template #item.project.name="{ item }">
+            <template #item.project.display_name="{ item }">
               <v-chip size="small" :color="item.project.color">
-                {{ item.project.name }}
+                {{ item.project.display_name }}
               </v-chip>
             </template>
             <template #item.service="{ item }">
@@ -125,7 +125,7 @@ export default {
         { title: "Feedback", value: "feedback", sortable: true },
         { title: "Details", value: "details", sortable: true },
         { title: "Service", value: "service", sortable: false },
-        { title: "Project", value: "project.name", sortable: false },
+        { title: "Project", value: "project.display_name", sortable: false },
         { title: "Created At", value: "created_at", sortable: true },
         { title: "", key: "data-table-actions", sortable: false, align: "end" },
       ],
diff --git a/src/dispatch/static/dispatch/src/forms/table/Table.vue b/src/dispatch/static/dispatch/src/forms/table/Table.vue
index bb42276a0d7a..50e6b4bd24da 100644
--- a/src/dispatch/static/dispatch/src/forms/table/Table.vue
+++ b/src/dispatch/static/dispatch/src/forms/table/Table.vue
@@ -59,7 +59,7 @@
             </template>
             <template #item.project="{ item }">
               <v-chip size="small" :color="item.project.color">
-                {{ item.project.name }}
+                {{ item.project.display_name }}
               </v-chip>
             </template>
             <template #item.score="{ item }">
diff --git a/src/dispatch/static/dispatch/src/incident/IncidentSummaryTable.vue b/src/dispatch/static/dispatch/src/incident/IncidentSummaryTable.vue
index 4dbbf869c940..be58863c90e6 100644
--- a/src/dispatch/static/dispatch/src/incident/IncidentSummaryTable.vue
+++ b/src/dispatch/static/dispatch/src/incident/IncidentSummaryTable.vue
@@ -12,7 +12,7 @@
     <template #item.reporter="{ value }">
       <incident-participant :participant="value" />
     </template>
-    <template #item.project.name="{ item, value }">
+    <template #item.project.display_name="{ item, value }">
       <v-chip size="small" :color="item.project.color">
         {{ value }}
       </v-chip>
@@ -64,7 +64,7 @@ export default {
         { title: "Status", key: "status" },
         { title: "Type", key: "incident_type.name" },
         { title: "Priority", key: "incident_priority.name", width: "10%" },
-        { title: "Project", key: "project.name", sortable: true },
+        { title: "Project", key: "project.display_name", sortable: true },
         { title: "Commander", key: "commander", sortable: false },
         { title: "", key: "data-table-actions", sortable: false, align: "end" },
       ],
diff --git a/src/dispatch/static/dispatch/src/incident/ReportReceiptCard.vue b/src/dispatch/static/dispatch/src/incident/ReportReceiptCard.vue
index 3bca2bb9ed9c..b29c8fc31acd 100644
--- a/src/dispatch/static/dispatch/src/incident/ReportReceiptCard.vue
+++ b/src/dispatch/static/dispatch/src/incident/ReportReceiptCard.vue
@@ -32,7 +32,7 @@
           <v-divider />
           <v-list-item>
             <v-list-item-title>Project</v-list-item-title>
-            <v-list-item-subtitle>{{ project.name }}</v-list-item-subtitle>
+            <v-list-item-subtitle>{{ project.display_name }}</v-list-item-subtitle>
           </v-list-item>
           <v-divider />
           <v-list-item>
diff --git a/src/dispatch/static/dispatch/src/incident/Table.vue b/src/dispatch/static/dispatch/src/incident/Table.vue
index 090e93c7b273..b2764da8d981 100644
--- a/src/dispatch/static/dispatch/src/incident/Table.vue
+++ b/src/dispatch/static/dispatch/src/incident/Table.vue
@@ -60,7 +60,7 @@
             return-object
             @click:row="showIncidentEditSheet"
           >
-            <template #item.project.name="{ item, value }">
+            <template #item.project.display_name="{ item, value }">
               <v-chip size="small" :color="item.project.color">
                 {{ value }}
               </v-chip>
@@ -192,7 +192,7 @@ export default {
         { title: "Type", key: "incident_type.name" },
         { title: "Severity", key: "incident_severity.name", width: "10%" },
         { title: "Priority", key: "incident_priority.name", width: "10%" },
-        { title: "Project", key: "project.name", sortable: true },
+        { title: "Project", key: "project.display_name", sortable: true },
         { title: "Commander", key: "commander", sortable: false },
         { title: "Cost", key: "incident_costs", sortable: false },
         { title: "Reported At", key: "reported_at" },
diff --git a/src/dispatch/static/dispatch/src/incident/priority/IncidentPriorityCombobox.vue b/src/dispatch/static/dispatch/src/incident/priority/IncidentPriorityCombobox.vue
index eea5ff507232..3ae69bcdc315 100644
--- a/src/dispatch/static/dispatch/src/incident/priority/IncidentPriorityCombobox.vue
+++ b/src/dispatch/static/dispatch/src/incident/priority/IncidentPriorityCombobox.vue
@@ -25,13 +25,13 @@
     </template>
     <template #chip="{ item, props }">
       <v-chip v-bind="props">
-        <span>{{ item.raw.project.name }}/</span>{{ item.raw.name }}
+        <span>{{ item.raw.project.display_name }}/</span>{{ item.raw.name }}
       </v-chip>
     </template>
     <template #item="{ props, item }">
       <v-list-item v-bind="props" :title="null">
         <v-list-item-title>
-          <span>{{ item.raw.project.name }}/</span>{{ item.raw.name }}
+          <span>{{ item.raw.project.display_name }}/</span>{{ item.raw.name }}
         </v-list-item-title>
         <v-list-item-subtitle :title="item.raw.description">
           {{ item.raw.description }}
diff --git a/src/dispatch/static/dispatch/src/incident/severity/IncidentSeverityCombobox.vue b/src/dispatch/static/dispatch/src/incident/severity/IncidentSeverityCombobox.vue
index fa5c6adc3eff..a76cf7c6ab59 100644
--- a/src/dispatch/static/dispatch/src/incident/severity/IncidentSeverityCombobox.vue
+++ b/src/dispatch/static/dispatch/src/incident/severity/IncidentSeverityCombobox.vue
@@ -25,13 +25,13 @@
     </template>
     <template #chip="{ item, props }">
       <v-chip v-bind="props">
-        <span>{{ item.raw.project.name }}/</span>{{ item.raw.name }}
+        <span>{{ item.raw.project.display_name }}/</span>{{ item.raw.name }}
       </v-chip>
     </template>
     <template #item="{ props, item }">
       <v-list-item v-bind="props" :title="null">
         <v-list-item-title>
-          <span>{{ item.raw.project.name }}/</span>{{ item.raw.name }}
+          <span>{{ item.raw.project.display_name }}/</span>{{ item.raw.name }}
         </v-list-item-title>
         <v-list-item-subtitle :title="item.raw.description">
           {{ item.raw.description }}
diff --git a/src/dispatch/static/dispatch/src/incident/type/IncidentTypeCombobox.vue b/src/dispatch/static/dispatch/src/incident/type/IncidentTypeCombobox.vue
index defb51c76764..dd307d1d3268 100644
--- a/src/dispatch/static/dispatch/src/incident/type/IncidentTypeCombobox.vue
+++ b/src/dispatch/static/dispatch/src/incident/type/IncidentTypeCombobox.vue
@@ -28,7 +28,7 @@
     <template #chip="{ item, props }">
       <v-chip v-bind="props">
         <span>
-          <span v-if="item.raw.project">{{ item.raw.project.name }}/</span>
+          <span v-if="item.raw.project">{{ item.raw.project.display_name }}/</span>
         </span>
         {{ item.raw.name }}
       </v-chip>
@@ -37,7 +37,7 @@
       <v-list-item v-bind="props" :title="null">
         <v-list-item-title>
           <span>
-            <span v-if="item.raw.project">{{ item.raw.project.name }}/</span>
+            <span v-if="item.raw.project">{{ item.raw.project.display_name }}/</span>
           </span>
           {{ item.raw.name }}
         </v-list-item-title>
diff --git a/src/dispatch/static/dispatch/src/incident/type/IncidentTypeSelect.vue b/src/dispatch/static/dispatch/src/incident/type/IncidentTypeSelect.vue
index 199cc4c2f642..b6f79a85c9cc 100644
--- a/src/dispatch/static/dispatch/src/incident/type/IncidentTypeSelect.vue
+++ b/src/dispatch/static/dispatch/src/incident/type/IncidentTypeSelect.vue
@@ -12,7 +12,7 @@
     <template #item="{ props, item }">
       <v-list-item v-bind="props" :title="null">
         <v-list-item-title v-if="!project">
-          {{ item.raw.project.name }}/{{ item.raw.name }}
+          {{ item.raw.project.display_name }}/{{ item.raw.name }}
         </v-list-item-title>
         <v-list-item-title v-else>
           {{ item.raw.name }}
diff --git a/src/dispatch/static/dispatch/src/project/NewEditSheet.vue b/src/dispatch/static/dispatch/src/project/NewEditSheet.vue
index 650d93ee4af2..33ffcb963cc6 100644
--- a/src/dispatch/static/dispatch/src/project/NewEditSheet.vue
+++ b/src/dispatch/static/dispatch/src/project/NewEditSheet.vue
@@ -34,11 +34,22 @@
               <v-col cols="12">
                 <v-text-field
                   v-model="name"
-                  label="Name"
-                  hint="A name for your project."
+                  label="Key"
+                  hint="A key for your project."
                   clearable
                   required
-                  name="Name"
+                  name="Key"
+                  :rules="[rules.required]"
+                />
+              </v-col>
+              <v-col cols="12">
+                <v-text-field
+                  v-model="display_name"
+                  label="Display Name"
+                  hint="A display name for your project (used on forms)."
+                  clearable
+                  required
+                  name="Display Name"
                   :rules="[rules.required]"
                 />
               </v-col>
@@ -225,6 +236,7 @@ export default {
       "selected.business_year_hours",
       "selected.color",
       "selected.description",
+      "selected.display_name",
       "selected.id",
       "selected.loading",
       "selected.name",
diff --git a/src/dispatch/static/dispatch/src/project/ProjectCombobox.vue b/src/dispatch/static/dispatch/src/project/ProjectCombobox.vue
index 2179d8cc1022..ab2a7d0b2225 100644
--- a/src/dispatch/static/dispatch/src/project/ProjectCombobox.vue
+++ b/src/dispatch/static/dispatch/src/project/ProjectCombobox.vue
@@ -10,7 +10,7 @@
     closable-chips
     hide-selected
     :hide-no-data="!search"
-    item-title="name"
+    item-title="display_name"
     item-value="id"
     multiple
     no-filter
@@ -108,7 +108,7 @@ export default {
       let filterOptions = {
         q: this.search,
         itemsPerPage: this.numItems,
-        sortBy: ["name"],
+        sortBy: ["display_name"],
         descending: [false],
       }
 
diff --git a/src/dispatch/static/dispatch/src/project/ProjectSelect.vue b/src/dispatch/static/dispatch/src/project/ProjectSelect.vue
index 16bdb52ceb6d..797e41caf564 100644
--- a/src/dispatch/static/dispatch/src/project/ProjectSelect.vue
+++ b/src/dispatch/static/dispatch/src/project/ProjectSelect.vue
@@ -4,7 +4,7 @@
     :label="label"
     :loading="loading"
     :menu-props="{ maxHeight: '400' }"
-    item-title="name"
+    item-title="display_name"
     item-value="id"
     v-model="project"
     return-object
@@ -19,7 +19,7 @@
     </template>
     <template #item="data">
       <v-list-item v-bind="data.props" :title="null">
-        <v-list-item-title>{{ data.item.raw.name }}</v-list-item-title>
+        <v-list-item-title>{{ data.item.raw.display_name }}</v-list-item-title>
         <v-list-item-subtitle :title="data.item.raw.description">
           {{ data.item.raw.description }}
         </v-list-item-subtitle>
@@ -77,6 +77,7 @@ export default {
             return project.enabled
           })
         }
+        console.log(`**** the projects json is: ${JSON.stringify(projects)}`)
         return projects
       },
       set(value) {
@@ -96,7 +97,7 @@ export default {
       let filterOptions = {
         q: "",
         itemsPerPage: this.numItems,
-        sortBy: ["name"],
+        sortBy: ["display_name"],
         descending: [false],
       }
 
diff --git a/src/dispatch/static/dispatch/src/project/Table.vue b/src/dispatch/static/dispatch/src/project/Table.vue
index a5856e4ee126..8c7e9fee4927 100644
--- a/src/dispatch/static/dispatch/src/project/Table.vue
+++ b/src/dispatch/static/dispatch/src/project/Table.vue
@@ -84,7 +84,8 @@ export default {
   data() {
     return {
       headers: [
-        { title: "Name", value: "name", sortable: true },
+        { title: "Key", value: "name", sortable: true },
+        { title: "Display Name", value: "display_name", sortable: true },
         { title: "Description", value: "description", sortable: false },
         { title: "Annual Employee Cost", value: "annual_employee_cost", sortable: false },
         { title: "Business Year Hours", value: "business_year_hours", sortable: false },
diff --git a/src/dispatch/static/dispatch/src/signal/Table.vue b/src/dispatch/static/dispatch/src/signal/Table.vue
index 6e9fad4cac41..dc65ad395e70 100644
--- a/src/dispatch/static/dispatch/src/signal/Table.vue
+++ b/src/dispatch/static/dispatch/src/signal/Table.vue
@@ -50,9 +50,9 @@
             <template #item.status="{ item, value }">
               <case-status :status="value" :id="item.id" />
             </template>
-            <template #item.project.name="{ item }">
+            <template #item.project.display_name="{ item }">
               <v-chip size="small" :color="item.project.color">
-                {{ item.project.name }}
+                {{ item.project.display_name }}
               </v-chip>
             </template>
             <template #item.case_type="{ item }">
diff --git a/src/dispatch/static/dispatch/src/signal/TableInstance.vue b/src/dispatch/static/dispatch/src/signal/TableInstance.vue
index a002968d289c..78f5ff401e6e 100644
--- a/src/dispatch/static/dispatch/src/signal/TableInstance.vue
+++ b/src/dispatch/static/dispatch/src/signal/TableInstance.vue
@@ -41,7 +41,7 @@
             <template #item.signal="{ value }">
               <signal-popover :value="value" />
             </template>
-            <template #item.signal.project.name="{ item, value }">
+            <template #item.signal.project.display_name="{ item, value }">
               <v-chip size="small" :color="item.signal.project.color">
                 {{ value }}
               </v-chip>
@@ -109,7 +109,7 @@ export default {
         { title: "Case", value: "case", sortable: false },
         { title: "Signal Definition", value: "signal", sortable: false },
         { title: "Filter Action", value: "filter_action", sortable: true },
-        { title: "Project", value: "signal.project.name", sortable: true },
+        { title: "Project", value: "signal.project.display_name", sortable: true },
         { title: "Created At", value: "created_at" },
         { title: "", value: "data-table-actions", sortable: false, align: "end" },
       ],
diff --git a/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue b/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue
index 24e7a9073003..10d2bea94d85 100644
--- a/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue
+++ b/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue
@@ -27,7 +27,7 @@
     <template #chip="{ item, props }">
       <v-chip v-bind="props">
         <span v-if="item.raw.tag_type">
-          <span v-if="!project">{{ item.raw.project.name }}/</span>{{ item.raw.tag_type.name }}/
+          <span v-if="!project">{{ item.raw.project.display_name }}/</span>{{ item.raw.tag_type.name }}/
         </span>
         <a :href="item.raw.uri" target="_blank" :title="item.raw.description">
           {{ item.raw.name }}
@@ -37,9 +37,8 @@
     <template #item="{ props, item }">
       <v-list-item v-bind="props" :title="null">
         <v-list-item-title>
-          <span v-if="!project">{{ item.raw.project.name }}/</span>{{ item.raw.tag_type.name }}/{{
-            item.raw.name
-          }}
+          <span v-if="!project">{{ item.raw.project.display_name }}/</span
+          >{{ item.raw.tag_type.name }}/{{ item.raw.name }}
         </v-list-item-title>
         <v-list-item-subtitle :title="item.raw.description">
           {{ item.raw.description }}
diff --git a/src/dispatch/static/dispatch/src/tag/TagSummaryTable.vue b/src/dispatch/static/dispatch/src/tag/TagSummaryTable.vue
index d6e8ceb823a4..7077fdc50cf2 100644
--- a/src/dispatch/static/dispatch/src/tag/TagSummaryTable.vue
+++ b/src/dispatch/static/dispatch/src/tag/TagSummaryTable.vue
@@ -4,7 +4,7 @@
     <template #item.discoverable="{ value }">
       <v-checkbox-btn :model-value="value" disabled />
     </template>
-    <template #item.project.name="{ item, value }">
+    <template #item.project.display_name="{ item, value }">
       <v-chip size="small" :color="item.project.color">
         {{ value }}
       </v-chip>
@@ -45,7 +45,7 @@ export default {
         { title: "Description", value: "description", sortable: false },
         { title: "Type", value: "tag_type.name", sortable: true },
         { title: "Source", value: "source", sortable: true },
-        { title: "Project", value: "project.name", sortable: true },
+        { title: "Project", value: "project.display_name", sortable: true },
         { title: "Discoverable", value: "discoverable", sortable: true },
         { title: "", key: "data-table-actions", sortable: false, align: "end" },
       ],
diff --git a/src/dispatch/static/dispatch/src/tag_type/TagTypeFilterCombobox.vue b/src/dispatch/static/dispatch/src/tag_type/TagTypeFilterCombobox.vue
index b31f33826174..bd94134269d3 100644
--- a/src/dispatch/static/dispatch/src/tag_type/TagTypeFilterCombobox.vue
+++ b/src/dispatch/static/dispatch/src/tag_type/TagTypeFilterCombobox.vue
@@ -27,12 +27,14 @@
     </template>
     <template #chip="{ item, props }">
       <v-chip v-bind="props">
-        <span v-if="item.raw.tag_type"> {{ item.raw.project.name }}/ </span>{{ item.raw.name }}
+        <span v-if="item.raw.tag_type"> {{ item.raw.project.display_name }}/ </span>{{ item.raw.name }}
       </v-chip>
     </template>
     <template #item="{ props, item }">
       <v-list-item v-bind="props" :title="null">
-        <v-list-item-title> {{ item.raw.project.name }}/{{ item.raw.name }} </v-list-item-title>
+        <v-list-item-title>
+          {{ item.raw.project.display_name }}/{{ item.raw.name }}
+        </v-list-item-title>
         <v-list-item-subtitle :title="item.raw.description">
           {{ item.raw.description }}
         </v-list-item-subtitle>
diff --git a/src/dispatch/static/dispatch/src/task/Table.vue b/src/dispatch/static/dispatch/src/task/Table.vue
index ac943ea1791a..a4703b64beb0 100644
--- a/src/dispatch/static/dispatch/src/task/Table.vue
+++ b/src/dispatch/static/dispatch/src/task/Table.vue
@@ -45,9 +45,9 @@
                 {{ item.description }}
               </div>
             </template>
-            <template #item.project.name="{ item }">
+            <template #item.project.display_name="{ item }">
               <v-chip size="small" :color="item.project.color">
-                {{ item.project.name }}
+                {{ item.project.display_name }}
               </v-chip>
             </template>
             <template #item.incident_priority.name="{ item }">
@@ -160,7 +160,7 @@ export default {
         { title: "Assignee", value: "assignees", sortable: false },
         { title: "Description", value: "description", sortable: false },
         { title: "Source", value: "source", sortable: true },
-        { title: "Project", value: "project.name", sortable: false },
+        { title: "Project", value: "project.display_name", sortable: false },
         { title: "Due By", value: "resolve_by", sortable: true },
         { title: "Created At", value: "created_at", sortable: true },
         { title: "Resolved At", value: "resolved_at", sortable: true },
diff --git a/src/dispatch/static/dispatch/src/task/TaskSummaryTable.vue b/src/dispatch/static/dispatch/src/task/TaskSummaryTable.vue
index 2d4cad9a5652..ebc95adebbce 100644
--- a/src/dispatch/static/dispatch/src/task/TaskSummaryTable.vue
+++ b/src/dispatch/static/dispatch/src/task/TaskSummaryTable.vue
@@ -6,7 +6,7 @@
         {{ value }}
       </div>
     </template>
-    <template #item.project.name="{ item, value }">
+    <template #item.project.display_name="{ item, value }">
       <v-chip size="small" :color="item.project.color">
         {{ value }}
       </v-chip>
@@ -66,7 +66,7 @@ export default {
         { title: "Owner", key: "owner", sortable: false },
         { title: "Assignees", key: "assignees", sortable: false },
         { title: "Description", key: "description", sortable: false },
-        { title: "Project", key: "project.name", sortable: true },
+        { title: "Project", key: "project.display_name", sortable: true },
         { title: "", key: "data-table-actions", sortable: false, align: "end" },
       ],
     }

From ed94ee33fefebb74639ad070cc82651a9f83d924 Mon Sep 17 00:00:00 2001
From: David Whittaker <dwhittaker@netflix.com>
Date: Fri, 13 Dec 2024 10:42:23 -0800
Subject: [PATCH 2/4] correction to query attribute

---
 src/dispatch/static/dispatch/src/case/ReportSubmissionCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dispatch/static/dispatch/src/case/ReportSubmissionCard.vue b/src/dispatch/static/dispatch/src/case/ReportSubmissionCard.vue
index f8eb295de93e..77d46bdcd8b0 100644
--- a/src/dispatch/static/dispatch/src/case/ReportSubmissionCard.vue
+++ b/src/dispatch/static/dispatch/src/case/ReportSubmissionCard.vue
@@ -179,7 +179,7 @@ export default {
                 model: "Project",
                 field: "name",
                 op: "==",
-                value: this.project.display_name,
+                value: this.project.name,
               },
             ],
           }),

From 540f3b866b78607660f269cf8d4b361f8f6ca298 Mon Sep 17 00:00:00 2001
From: David Whittaker <dwhittaker@netflix.com>
Date: Fri, 13 Dec 2024 10:54:42 -0800
Subject: [PATCH 3/4] fixing lint errors

---
 src/dispatch/static/dispatch/src/project/ProjectSelect.vue     | 1 -
 src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue | 3 ++-
 .../static/dispatch/src/tag_type/TagTypeFilterCombobox.vue     | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/dispatch/static/dispatch/src/project/ProjectSelect.vue b/src/dispatch/static/dispatch/src/project/ProjectSelect.vue
index 797e41caf564..dcbafb1361bd 100644
--- a/src/dispatch/static/dispatch/src/project/ProjectSelect.vue
+++ b/src/dispatch/static/dispatch/src/project/ProjectSelect.vue
@@ -77,7 +77,6 @@ export default {
             return project.enabled
           })
         }
-        console.log(`**** the projects json is: ${JSON.stringify(projects)}`)
         return projects
       },
       set(value) {
diff --git a/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue b/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue
index 10d2bea94d85..96fdbf235603 100644
--- a/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue
+++ b/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue
@@ -27,7 +27,8 @@
     <template #chip="{ item, props }">
       <v-chip v-bind="props">
         <span v-if="item.raw.tag_type">
-          <span v-if="!project">{{ item.raw.project.display_name }}/</span>{{ item.raw.tag_type.name }}/
+          <span v-if="!project">{{ item.raw.project.display_name }}/</span
+          >{{ item.raw.tag_type.name }}/
         </span>
         <a :href="item.raw.uri" target="_blank" :title="item.raw.description">
           {{ item.raw.name }}
diff --git a/src/dispatch/static/dispatch/src/tag_type/TagTypeFilterCombobox.vue b/src/dispatch/static/dispatch/src/tag_type/TagTypeFilterCombobox.vue
index bd94134269d3..fff65168c1e8 100644
--- a/src/dispatch/static/dispatch/src/tag_type/TagTypeFilterCombobox.vue
+++ b/src/dispatch/static/dispatch/src/tag_type/TagTypeFilterCombobox.vue
@@ -27,7 +27,8 @@
     </template>
     <template #chip="{ item, props }">
       <v-chip v-bind="props">
-        <span v-if="item.raw.tag_type"> {{ item.raw.project.display_name }}/ </span>{{ item.raw.name }}
+        <span v-if="item.raw.tag_type"> {{ item.raw.project.display_name }}/ </span
+        >{{ item.raw.name }}
       </v-chip>
     </template>
     <template #item="{ props, item }">

From 1e1d8c214d60f675b96c60e585e40d5dbd67f739 Mon Sep 17 00:00:00 2001
From: David Whittaker <dwhittaker@netflix.com>
Date: Fri, 13 Dec 2024 16:31:07 -0800
Subject: [PATCH 4/4] make display_name not nullable

---
 .../revisions/tenant/versions/2024-12-12_2d9e4d392ea4.py      | 4 +++-
 src/dispatch/project/models.py                                | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/dispatch/database/revisions/tenant/versions/2024-12-12_2d9e4d392ea4.py b/src/dispatch/database/revisions/tenant/versions/2024-12-12_2d9e4d392ea4.py
index f54a1fadb877..01c33a2ed21e 100644
--- a/src/dispatch/database/revisions/tenant/versions/2024-12-12_2d9e4d392ea4.py
+++ b/src/dispatch/database/revisions/tenant/versions/2024-12-12_2d9e4d392ea4.py
@@ -19,7 +19,9 @@
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column("project", sa.Column("display_name", sa.String(), nullable=True))
+    op.add_column(
+        "project", sa.Column("display_name", sa.String(), server_default="", nullable=False)
+    )
 
     # Copy data from 'name' column to 'display_name' column
     op.execute("UPDATE project SET display_name = name")
diff --git a/src/dispatch/project/models.py b/src/dispatch/project/models.py
index b50210e977b4..d7d974d3848a 100644
--- a/src/dispatch/project/models.py
+++ b/src/dispatch/project/models.py
@@ -40,7 +40,7 @@ class Project(Base):
         cascade="all, delete-orphan",
     )
 
-    display_name = Column(String, nullable=True)
+    display_name = Column(String, nullable=False, server_default="")
 
     enabled = Column(Boolean, default=True, server_default="t")
     allow_self_join = Column(Boolean, default=True, server_default="t")
@@ -84,7 +84,7 @@ def slug(self):
 class ProjectBase(DispatchBase):
     id: Optional[PrimaryKey]
     name: NameStr
-    display_name: Optional[str] = Field(None, nullable=True)
+    display_name: Optional[str] = Field("", nullable=False)
     owner_email: Optional[EmailStr] = Field(None, nullable=True)
     owner_conversation: Optional[str] = Field(None, nullable=True)
     annual_employee_cost: Optional[int]