From 494c622cf693bfb52d95eb53e4b253ccd6c9a123 Mon Sep 17 00:00:00 2001
From: Mike Laventure <mlaventure@netflix.com>
Date: Thu, 11 Apr 2024 11:01:50 -0700
Subject: [PATCH 1/8] Adding new project level attribute

---
 src/dispatch/project/models.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/dispatch/project/models.py b/src/dispatch/project/models.py
index 61020475bcea..60cb0e0176fd 100644
--- a/src/dispatch/project/models.py
+++ b/src/dispatch/project/models.py
@@ -40,6 +40,7 @@ class Project(Base):
     )
 
     enabled = Column(Boolean, default=True, server_default="t")
+    allow_self_join = Column(Boolean, default=True, server_default="t")
 
     send_daily_reports = Column(Boolean)
 
@@ -71,6 +72,7 @@ class ProjectBase(DispatchBase):
     color: Optional[str] = Field(None, nullable=True)
     send_daily_reports: Optional[bool] = Field(True, nullable=True)
     enabled: Optional[bool] = Field(True, nullable=True)
+    allow_self_join: Optional[bool] = Field(True, nullable=Tru
 
 
 class ProjectCreate(ProjectBase):

From 60408264ac43771a2fdcc8a9677aef2ce4484efd Mon Sep 17 00:00:00 2001
From: Mike Laventure <mlaventure@netflix.com>
Date: Mon, 29 Apr 2024 10:27:04 -0700
Subject: [PATCH 2/8] adding attribute to project

---
 .devcontainer/docker-compose.yml | 2 +-
 docker/docker-compose.yml        | 2 +-
 src/dispatch/project/models.py   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index c9e650c0ed0f..a9b6932733a6 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -25,7 +25,7 @@ services:
       PGADMIN_DEFAULT_PASSWORD: admin
       PGADMIN_CONFIG_PROXY_X_HOST_COUNT: 1
       PGADMIN_CONFIG_PROXY_X_PREFIX_COUNT: 1
-      PGADMIN_LISTEN_PORT: 80
+      PGADMIN_LISTEN_PORT: 5555
     restart: unless-stopped
     network_mode: service:db
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index a64a05395984..897a5c1a1bed 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.1"
 services:
   postgres:
-    image: postgres:14.6
+    image: postgres:14.11
     hostname: postgres
     ports:
       - "5432:5432"
diff --git a/src/dispatch/project/models.py b/src/dispatch/project/models.py
index 60cb0e0176fd..f42065333f24 100644
--- a/src/dispatch/project/models.py
+++ b/src/dispatch/project/models.py
@@ -72,7 +72,7 @@ class ProjectBase(DispatchBase):
     color: Optional[str] = Field(None, nullable=True)
     send_daily_reports: Optional[bool] = Field(True, nullable=True)
     enabled: Optional[bool] = Field(True, nullable=True)
-    allow_self_join: Optional[bool] = Field(True, nullable=Tru
+    allow_self_join: Optional[bool] = Field(True, nullable=True)
 
 
 class ProjectCreate(ProjectBase):

From 1fa6ca9cdaa65fad488811f3faf3fe11023208ff Mon Sep 17 00:00:00 2001
From: Mike Laventure <mlaventure@netflix.com>
Date: Mon, 29 Apr 2024 11:13:51 -0700
Subject: [PATCH 3/8] Modified UI to show self-join checkbox

---
 .../versions/2024-04-29_a836d4850a75.py       | 27 ++++++
 src/dispatch/incident/models.py               |  1 +
 .../static/dispatch/src/incident/Table.vue    | 58 +++--------
 .../src/incident/status/IncidentStatus.vue    | 25 ++---
 .../dispatch/src/project/NewEditSheet.vue     | 95 +++++--------------
 .../static/dispatch/src/project/store.js      |  1 +
 6 files changed, 75 insertions(+), 132 deletions(-)
 create mode 100644 src/dispatch/database/revisions/tenant/versions/2024-04-29_a836d4850a75.py

diff --git a/src/dispatch/database/revisions/tenant/versions/2024-04-29_a836d4850a75.py b/src/dispatch/database/revisions/tenant/versions/2024-04-29_a836d4850a75.py
new file mode 100644
index 000000000000..c9fb4fdc2873
--- /dev/null
+++ b/src/dispatch/database/revisions/tenant/versions/2024-04-29_a836d4850a75.py
@@ -0,0 +1,27 @@
+"""Adding in "allow_self_join" column to enable self join in dispatch UI
+
+Revision ID: a836d4850a75
+Revises: 3a33bc153e7e
+Create Date: 2024-04-29 10:28:37.777618
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = 'a836d4850a75'
+down_revision = '3a33bc153e7e'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('project', sa.Column('allow_self_join', sa.Boolean(), server_default='t', nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('project', 'allow_self_join')
+    # ### end Alembic commands ###
diff --git a/src/dispatch/incident/models.py b/src/dispatch/incident/models.py
index aac934c31e1c..3ac0bbd74b99 100644
--- a/src/dispatch/incident/models.py
+++ b/src/dispatch/incident/models.py
@@ -250,6 +250,7 @@ class ProjectRead(DispatchBase):
     name: NameStr
     color: Optional[str]
     stable_priority: Optional[IncidentPriorityRead] = None
+    allow_self_join: Optional[bool] = Field(True, nullable=True)
 
 
 class CaseRead(DispatchBase):
diff --git a/src/dispatch/static/dispatch/src/incident/Table.vue b/src/dispatch/static/dispatch/src/incident/Table.vue
index 5c8de6bf3097..3412fdd63c16 100644
--- a/src/dispatch/static/dispatch/src/incident/Table.vue
+++ b/src/dispatch/static/dispatch/src/incident/Table.vue
@@ -18,12 +18,7 @@
           <v-icon start color="white">mdi-fire</v-icon>
           <span class="text-uppercase text-body-2 font-weight-bold">Report incident</span>
         </v-btn>
-        <v-btn
-          v-if="userAdminOrAbove(current_user_role)"
-          color="info"
-          class="ml-2"
-          @click="showNewSheet()"
-        >
+        <v-btn v-if="userAdminOrAbove(current_user_role)" color="info" class="ml-2" @click="showNewSheet()">
           New
         </v-btn>
       </v-col>
@@ -32,34 +27,15 @@
       <v-col>
         <v-card variant="flat">
           <v-card-title>
-            <v-text-field
-              v-model="q"
-              append-inner-icon="mdi-magnify"
-              label="Search"
-              single-line
-              hide-details
-              clearable
-            />
+            <v-text-field v-model="q" append-inner-icon="mdi-magnify" label="Search" single-line hide-details
+              clearable />
           </v-card-title>
-          <v-data-table-server
-            :headers="headers"
-            :items="items"
-            :items-length="total || 0"
-            v-model:page="page"
-            v-model:items-per-page="itemsPerPage"
-            :footer-props="{
+          <v-data-table-server :headers="headers" :items="items" :items-length="total || 0" v-model:page="page"
+            v-model:items-per-page="itemsPerPage" :footer-props="{
               'items-per-page-options': [10, 25, 50, 100],
-            }"
-            v-model:sort-by="sortBy"
-            v-model:sort-desc="descending"
-            :loading="loading"
-            data-testid="incident-data-table"
-            v-model="selected"
-            loading-text="Loading... Please wait"
-            show-select
-            return-object
-            @click:row="showIncidentEditSheet"
-          >
+            }" v-model:sort-by="sortBy" v-model:sort-desc="descending" :loading="loading"
+            data-testid="incident-data-table" v-model="selected" loading-text="Loading... Please wait" show-select
+            return-object @click:row="showIncidentEditSheet">
             <template #item.project.name="{ item, value }">
               <v-chip size="small" :color="item.project.color">
                 {{ value }}
@@ -72,7 +48,7 @@
               <incident-priority :priority="value" />
             </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" />
             </template>
             <template #item.incident_costs="{ value }">
               <incident-cost-card :incident-costs="value" />
@@ -104,22 +80,16 @@
                   </v-btn>
                 </template>
                 <v-list>
-                  <v-list-item
-                    data-testid="incident-table-edit"
-                    :to="{
-                      name: 'IncidentTableEdit',
-                      params: { name: item.name },
-                    }"
-                  >
+                  <v-list-item data-testid="incident-table-edit" :to="{
+                    name: 'IncidentTableEdit',
+                    params: { name: item.name },
+                  }">
                     <v-list-item-title>View / Edit</v-list-item-title>
                   </v-list-item>
                   <v-list-item @click="showReportDialog(item)" :disabled="item.status == 'Closed'">
                     <v-list-item-title>Create Report</v-list-item-title>
                   </v-list-item>
-                  <v-list-item
-                    @click="showRun({ type: 'incident', data: item })"
-                    :disabled="item.status == 'Closed'"
-                  >
+                  <v-list-item @click="showRun({ type: 'incident', data: item })" :disabled="item.status == 'Closed'">
                     <v-list-item-title>Run Workflow</v-list-item-title>
                   </v-list-item>
                   <v-list-item @click="showDeleteDialog(item)">
diff --git a/src/dispatch/static/dispatch/src/incident/status/IncidentStatus.vue b/src/dispatch/static/dispatch/src/incident/status/IncidentStatus.vue
index 1bbf4b7090e5..335338a4c32b 100644
--- a/src/dispatch/static/dispatch/src/incident/status/IncidentStatus.vue
+++ b/src/dispatch/static/dispatch/src/incident/status/IncidentStatus.vue
@@ -4,27 +4,16 @@
       {{ status }}
     </v-badge>
     <template v-if="status === 'Active' || status === 'Stable'">
-      <v-tooltip location="bottom" text="Join">
+      <v-tooltip location="bottom" text="Join" v-if="allowSelfJoin">
         <template #activator="{ props }">
-          <v-btn
-            v-bind="props"
-            icon="mdi-account-plus"
-            variant="text"
-            density="comfortable"
-            class="ml-1"
-            @click.stop="joinIncident(id)"
-          />
+          <v-btn v-bind="props" icon="mdi-account-plus" variant="text" density="comfortable" class="ml-1"
+            @click.stop="joinIncident(id)" />
         </template>
       </v-tooltip>
       <v-tooltip location="bottom" text="Subscribe">
         <template #activator="{ props }">
-          <v-btn
-            v-bind="props"
-            icon="mdi-email-plus"
-            variant="text"
-            density="comfortable"
-            @click.stop="subscribeToIncident(id)"
-          />
+          <v-btn v-bind="props" icon="mdi-email-plus" variant="text" density="comfortable"
+            @click.stop="subscribeToIncident(id)" />
         </template>
       </v-tooltip>
     </template>
@@ -46,6 +35,10 @@ export default {
       type: Number,
       required: true,
     },
+    allowSelfJoin: {
+      type: Boolean,
+      required: true,
+    },
   },
 
   computed: {
diff --git a/src/dispatch/static/dispatch/src/project/NewEditSheet.vue b/src/dispatch/static/dispatch/src/project/NewEditSheet.vue
index 0d40aae7260c..32e576e21911 100644
--- a/src/dispatch/static/dispatch/src/project/NewEditSheet.vue
+++ b/src/dispatch/static/dispatch/src/project/NewEditSheet.vue
@@ -8,14 +8,7 @@
           <v-list-item-subtitle>Project</v-list-item-subtitle>
 
           <template #append>
-            <v-btn
-              icon
-              variant="text"
-              color="info"
-              :loading="loading"
-              :disabled="!isValid.value"
-              @click="save()"
-            >
+            <v-btn icon variant="text" color="info" :loading="loading" :disabled="!isValid.value" @click="save()">
               <v-icon>mdi-content-save</v-icon>
             </v-btn>
             <v-btn icon variant="text" color="secondary" @click="closeCreateEdit()">
@@ -32,85 +25,42 @@
                 <span class="text-subtitle-2">Details</span>
               </v-col>
               <v-col cols="12">
-                <v-text-field
-                  v-model="name"
-                  label="Name"
-                  hint="A name for your project."
-                  clearable
-                  required
-                  name="Name"
-                  :rules="[rules.required]"
-                />
+                <v-text-field v-model="name" label="Name" hint="A name for your project." clearable required name="Name"
+                  :rules="[rules.required]" />
               </v-col>
               <v-col cols="12">
-                <v-text-field
-                  v-model="description"
-                  label="Description"
-                  hint="A description for your project."
-                  clearable
-                  required
-                  name="Description"
-                />
+                <v-text-field v-model="description" label="Description" hint="A description for your project." clearable
+                  required name="Description" />
               </v-col>
               <v-col cols="12">
-                <v-checkbox
-                  v-model="enabled"
-                  label="Enabled"
-                  hint="Whether this project is enabled for new cases and incidents."
-                />
+                <v-checkbox v-model="enabled" label="Enabled"
+                  hint="Whether this project is enabled for new cases and incidents." />
+              </v-col>
+              <v-col cols="12">
+                <v-checkbox v-model="allow_self_join" label="Allow Self Join"
+                  hint="Allow users to self-join an incident from the UI" />
               </v-col>
               <v-col cols="12">
                 <color-picker-input v-model="color" />
               </v-col>
               <v-col cols="12">
-                <v-text-field
-                  v-model.number="annual_employee_cost"
-                  label="Annual Employee Cost"
-                  hint="An annual average cost per employee."
-                  clearable
-                  required
-                  type="number"
-                  min="1"
-                  pattern="\d+"
-                  prefix="$"
-                  placeholder="50000"
-                  name="Employee Cost"
-                />
+                <v-text-field v-model.number="annual_employee_cost" label="Annual Employee Cost"
+                  hint="An annual average cost per employee." clearable required type="number" min="1" pattern="\d+"
+                  prefix="$" placeholder="50000" name="Employee Cost" />
               </v-col>
               <v-col cols="12">
-                <v-text-field
-                  v-model.number="business_year_hours"
-                  label="Business Year Hours"
-                  hint="Number of working hours in a year. Used to calculate hourly rate."
-                  clearable
-                  required
-                  type="number"
-                  min="1"
-                  pattern="\d+"
-                  placeholder="2080"
-                  name="Year Hours"
-                />
+                <v-text-field v-model.number="business_year_hours" label="Business Year Hours"
+                  hint="Number of working hours in a year. Used to calculate hourly rate." clearable required
+                  type="number" min="1" pattern="\d+" placeholder="2080" name="Year Hours" />
               </v-col>
               <v-col cols="12">
-                <v-text-field
-                  v-model="owner_email"
-                  label="Owner Email"
-                  hint="The email account of the project owner."
-                  clearable
-                  required
-                  name="Owner Email"
-                  :rules="[rules.email]"
-                />
+                <v-text-field v-model="owner_email" label="Owner Email" hint="The email account of the project owner."
+                  clearable required name="Owner Email" :rules="[rules.email]" />
               </v-col>
               <v-col cols="12">
-                <v-text-field
-                  v-model="owner_conversation"
-                  label="Owner Conversation"
-                  hint="The conversation of the project owner (e.g. Slack channel)."
-                  clearable
-                  required
-                  name="Owner Conversation"
-                />
+                <v-text-field v-model="owner_conversation" label="Owner Conversation"
+                  hint="The conversation of the project owner (e.g. Slack channel)." clearable required
+                  name="Owner Conversation" />
               </v-col>
             </v-row>
           </v-container>
@@ -152,6 +102,7 @@ export default {
       "selected.owner_conversation",
       "selected.owner_email",
       "selected.enabled",
+      "selected.allow_self_join",
       "dialogs.showCreateEdit",
     ]),
   },
diff --git a/src/dispatch/static/dispatch/src/project/store.js b/src/dispatch/static/dispatch/src/project/store.js
index bff2d8c81e24..e37376467c88 100644
--- a/src/dispatch/static/dispatch/src/project/store.js
+++ b/src/dispatch/static/dispatch/src/project/store.js
@@ -16,6 +16,7 @@ const getDefaultSelectedState = () => {
     owner_email: null,
     owner_conversation: null,
     enabled: null,
+    allow_self_join: null,
   }
 }
 

From 8224bfff0d722048855a8252468a2cb0acca365e Mon Sep 17 00:00:00 2001
From: Mike Laventure <mlaventure@netflix.com>
Date: Tue, 30 Apr 2024 09:40:08 -0700
Subject: [PATCH 4/8] Fixed prettier errors

---
 .../static/dispatch/src/incident/Table.vue    | 62 +++++++++---
 .../src/incident/status/IncidentStatus.vue    | 19 +++-
 .../dispatch/src/project/NewEditSheet.vue     | 97 +++++++++++++++----
 3 files changed, 140 insertions(+), 38 deletions(-)

diff --git a/src/dispatch/static/dispatch/src/incident/Table.vue b/src/dispatch/static/dispatch/src/incident/Table.vue
index 3412fdd63c16..42f085b5b2aa 100644
--- a/src/dispatch/static/dispatch/src/incident/Table.vue
+++ b/src/dispatch/static/dispatch/src/incident/Table.vue
@@ -18,7 +18,12 @@
           <v-icon start color="white">mdi-fire</v-icon>
           <span class="text-uppercase text-body-2 font-weight-bold">Report incident</span>
         </v-btn>
-        <v-btn v-if="userAdminOrAbove(current_user_role)" color="info" class="ml-2" @click="showNewSheet()">
+        <v-btn
+          v-if="userAdminOrAbove(current_user_role)"
+          color="info"
+          class="ml-2"
+          @click="showNewSheet()"
+        >
           New
         </v-btn>
       </v-col>
@@ -27,15 +32,34 @@
       <v-col>
         <v-card variant="flat">
           <v-card-title>
-            <v-text-field v-model="q" append-inner-icon="mdi-magnify" label="Search" single-line hide-details
-              clearable />
+            <v-text-field
+              v-model="q"
+              append-inner-icon="mdi-magnify"
+              label="Search"
+              single-line
+              hide-details
+              clearable
+            />
           </v-card-title>
-          <v-data-table-server :headers="headers" :items="items" :items-length="total || 0" v-model:page="page"
-            v-model:items-per-page="itemsPerPage" :footer-props="{
+          <v-data-table-server
+            :headers="headers"
+            :items="items"
+            :items-length="total || 0"
+            v-model:page="page"
+            v-model:items-per-page="itemsPerPage"
+            :footer-props="{
               'items-per-page-options': [10, 25, 50, 100],
-            }" v-model:sort-by="sortBy" v-model:sort-desc="descending" :loading="loading"
-            data-testid="incident-data-table" v-model="selected" loading-text="Loading... Please wait" show-select
-            return-object @click:row="showIncidentEditSheet">
+            }"
+            v-model:sort-by="sortBy"
+            v-model:sort-desc="descending"
+            :loading="loading"
+            data-testid="incident-data-table"
+            v-model="selected"
+            loading-text="Loading... Please wait"
+            show-select
+            return-object
+            @click:row="showIncidentEditSheet"
+          >
             <template #item.project.name="{ item, value }">
               <v-chip size="small" :color="item.project.color">
                 {{ value }}
@@ -48,7 +72,11 @@
               <incident-priority :priority="value" />
             </template>
             <template #item.status="{ item, value }">
-              <incident-status :status="value" :id="item.id" :allowSelfJoin="item.project.allow_self_join" />
+              <incident-status
+                :status="value"
+                :id="item.id"
+                :allowSelfJoin="item.project.allow_self_join"
+              />
             </template>
             <template #item.incident_costs="{ value }">
               <incident-cost-card :incident-costs="value" />
@@ -80,16 +108,22 @@
                   </v-btn>
                 </template>
                 <v-list>
-                  <v-list-item data-testid="incident-table-edit" :to="{
-                    name: 'IncidentTableEdit',
-                    params: { name: item.name },
-                  }">
+                  <v-list-item
+                    data-testid="incident-table-edit"
+                    :to="{
+                      name: 'IncidentTableEdit',
+                      params: { name: item.name },
+                    }"
+                  >
                     <v-list-item-title>View / Edit</v-list-item-title>
                   </v-list-item>
                   <v-list-item @click="showReportDialog(item)" :disabled="item.status == 'Closed'">
                     <v-list-item-title>Create Report</v-list-item-title>
                   </v-list-item>
-                  <v-list-item @click="showRun({ type: 'incident', data: item })" :disabled="item.status == 'Closed'">
+                  <v-list-item
+                    @click="showRun({ type: 'incident', data: item })"
+                    :disabled="item.status == 'Closed'"
+                  >
                     <v-list-item-title>Run Workflow</v-list-item-title>
                   </v-list-item>
                   <v-list-item @click="showDeleteDialog(item)">
diff --git a/src/dispatch/static/dispatch/src/incident/status/IncidentStatus.vue b/src/dispatch/static/dispatch/src/incident/status/IncidentStatus.vue
index 335338a4c32b..0cb6b65d5675 100644
--- a/src/dispatch/static/dispatch/src/incident/status/IncidentStatus.vue
+++ b/src/dispatch/static/dispatch/src/incident/status/IncidentStatus.vue
@@ -6,14 +6,25 @@
     <template v-if="status === 'Active' || status === 'Stable'">
       <v-tooltip location="bottom" text="Join" v-if="allowSelfJoin">
         <template #activator="{ props }">
-          <v-btn v-bind="props" icon="mdi-account-plus" variant="text" density="comfortable" class="ml-1"
-            @click.stop="joinIncident(id)" />
+          <v-btn
+            v-bind="props"
+            icon="mdi-account-plus"
+            variant="text"
+            density="comfortable"
+            class="ml-1"
+            @click.stop="joinIncident(id)"
+          />
         </template>
       </v-tooltip>
       <v-tooltip location="bottom" text="Subscribe">
         <template #activator="{ props }">
-          <v-btn v-bind="props" icon="mdi-email-plus" variant="text" density="comfortable"
-            @click.stop="subscribeToIncident(id)" />
+          <v-btn
+            v-bind="props"
+            icon="mdi-email-plus"
+            variant="text"
+            density="comfortable"
+            @click.stop="subscribeToIncident(id)"
+          />
         </template>
       </v-tooltip>
     </template>
diff --git a/src/dispatch/static/dispatch/src/project/NewEditSheet.vue b/src/dispatch/static/dispatch/src/project/NewEditSheet.vue
index 32e576e21911..6d4f7803207b 100644
--- a/src/dispatch/static/dispatch/src/project/NewEditSheet.vue
+++ b/src/dispatch/static/dispatch/src/project/NewEditSheet.vue
@@ -8,7 +8,14 @@
           <v-list-item-subtitle>Project</v-list-item-subtitle>
 
           <template #append>
-            <v-btn icon variant="text" color="info" :loading="loading" :disabled="!isValid.value" @click="save()">
+            <v-btn
+              icon
+              variant="text"
+              color="info"
+              :loading="loading"
+              :disabled="!isValid.value"
+              @click="save()"
+            >
               <v-icon>mdi-content-save</v-icon>
             </v-btn>
             <v-btn icon variant="text" color="secondary" @click="closeCreateEdit()">
@@ -25,42 +32,92 @@
                 <span class="text-subtitle-2">Details</span>
               </v-col>
               <v-col cols="12">
-                <v-text-field v-model="name" label="Name" hint="A name for your project." clearable required name="Name"
-                  :rules="[rules.required]" />
+                <v-text-field
+                  v-model="name"
+                  label="Name"
+                  hint="A name for your project."
+                  clearable
+                  required
+                  name="Name"
+                  :rules="[rules.required]"
+                />
               </v-col>
               <v-col cols="12">
-                <v-text-field v-model="description" label="Description" hint="A description for your project." clearable
-                  required name="Description" />
+                <v-text-field
+                  v-model="description"
+                  label="Description"
+                  hint="A description for your project."
+                  clearable
+                  required
+                  name="Description"
+                />
               </v-col>
               <v-col cols="12">
-                <v-checkbox v-model="enabled" label="Enabled"
-                  hint="Whether this project is enabled for new cases and incidents." />
+                <v-checkbox
+                  v-model="enabled"
+                  label="Enabled"
+                  hint="Whether this project is enabled for new cases and incidents."
+                />
               </v-col>
               <v-col cols="12">
-                <v-checkbox v-model="allow_self_join" label="Allow Self Join"
-                  hint="Allow users to self-join an incident from the UI" />
+                <v-checkbox
+                  v-model="allow_self_join"
+                  label="Allow Self Join"
+                  hint="Allow users to self-join an incident from the UI"
+                />
               </v-col>
               <v-col cols="12">
                 <color-picker-input v-model="color" />
               </v-col>
               <v-col cols="12">
-                <v-text-field v-model.number="annual_employee_cost" label="Annual Employee Cost"
-                  hint="An annual average cost per employee." clearable required type="number" min="1" pattern="\d+"
-                  prefix="$" placeholder="50000" name="Employee Cost" />
+                <v-text-field
+                  v-model.number="annual_employee_cost"
+                  label="Annual Employee Cost"
+                  hint="An annual average cost per employee."
+                  clearable
+                  required
+                  type="number"
+                  min="1"
+                  pattern="\d+"
+                  prefix="$"
+                  placeholder="50000"
+                  name="Employee Cost"
+                />
               </v-col>
               <v-col cols="12">
-                <v-text-field v-model.number="business_year_hours" label="Business Year Hours"
-                  hint="Number of working hours in a year. Used to calculate hourly rate." clearable required
-                  type="number" min="1" pattern="\d+" placeholder="2080" name="Year Hours" />
+                <v-text-field
+                  v-model.number="business_year_hours"
+                  label="Business Year Hours"
+                  hint="Number of working hours in a year. Used to calculate hourly rate."
+                  clearable
+                  required
+                  type="number"
+                  min="1"
+                  pattern="\d+"
+                  placeholder="2080"
+                  name="Year Hours"
+                />
               </v-col>
               <v-col cols="12">
-                <v-text-field v-model="owner_email" label="Owner Email" hint="The email account of the project owner."
-                  clearable required name="Owner Email" :rules="[rules.email]" />
+                <v-text-field
+                  v-model="owner_email"
+                  label="Owner Email"
+                  hint="The email account of the project owner."
+                  clearable
+                  required
+                  name="Owner Email"
+                  :rules="[rules.email]"
+                />
               </v-col>
               <v-col cols="12">
-                <v-text-field v-model="owner_conversation" label="Owner Conversation"
-                  hint="The conversation of the project owner (e.g. Slack channel)." clearable required
-                  name="Owner Conversation" />
+                <v-text-field
+                  v-model="owner_conversation"
+                  label="Owner Conversation"
+                  hint="The conversation of the project owner (e.g. Slack channel)."
+                  clearable
+                  required
+                  name="Owner Conversation"
+                />
               </v-col>
             </v-row>
           </v-container>

From d58a48b5fd329c5cc0749aa453b507f966f53efb Mon Sep 17 00:00:00 2001
From: Mike Laventure <mlaventure@netflix.com>
Date: Tue, 7 May 2024 09:12:14 -0700
Subject: [PATCH 5/8] removed config file updates

---
 .devcontainer/docker-compose.yml | 2 +-
 docker/docker-compose.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index a9b6932733a6..c9e650c0ed0f 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -25,7 +25,7 @@ services:
       PGADMIN_DEFAULT_PASSWORD: admin
       PGADMIN_CONFIG_PROXY_X_HOST_COUNT: 1
       PGADMIN_CONFIG_PROXY_X_PREFIX_COUNT: 1
-      PGADMIN_LISTEN_PORT: 5555
+      PGADMIN_LISTEN_PORT: 80
     restart: unless-stopped
     network_mode: service:db
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 897a5c1a1bed..a64a05395984 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.1"
 services:
   postgres:
-    image: postgres:14.11
+    image: postgres:14.6
     hostname: postgres
     ports:
       - "5432:5432"

From 806bc661aa842718eb37a89b6991c14e32603969 Mon Sep 17 00:00:00 2001
From: Mike Laventure <mlaventure@netflix.com>
Date: Wed, 8 May 2024 10:52:20 -0700
Subject: [PATCH 6/8] Updating database revision

---
 src/dispatch/case/flows.py                                    | 2 +-
 .../revisions/tenant/versions/2024-04-29_a836d4850a75.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/dispatch/case/flows.py b/src/dispatch/case/flows.py
index 75e402c6ca76..95c2f1dcab17 100644
--- a/src/dispatch/case/flows.py
+++ b/src/dispatch/case/flows.py
@@ -478,7 +478,7 @@ def case_status_transition_flow_dispatcher(
             )
 
         case (_, CaseStatus.triage):
-            # Any -> Triage
+            # Any -> Triage/
             pass
 
         case (CaseStatus.new, CaseStatus.escalated):
diff --git a/src/dispatch/database/revisions/tenant/versions/2024-04-29_a836d4850a75.py b/src/dispatch/database/revisions/tenant/versions/2024-04-29_a836d4850a75.py
index c9fb4fdc2873..328956d63139 100644
--- a/src/dispatch/database/revisions/tenant/versions/2024-04-29_a836d4850a75.py
+++ b/src/dispatch/database/revisions/tenant/versions/2024-04-29_a836d4850a75.py
@@ -1,7 +1,7 @@
 """Adding in "allow_self_join" column to enable self join in dispatch UI
 
 Revision ID: a836d4850a75
-Revises: 3a33bc153e7e
+Revises: 50e99c66e72f
 Create Date: 2024-04-29 10:28:37.777618
 
 """
@@ -10,7 +10,7 @@
 
 # revision identifiers, used by Alembic.
 revision = 'a836d4850a75'
-down_revision = '3a33bc153e7e'
+down_revision = '50e99c66e72f'
 branch_labels = None
 depends_on = None
 

From cfb99b14a3b19fd2e51b8cb61e3f938e40c8bf47 Mon Sep 17 00:00:00 2001
From: Mike Laventure <mlaventure@netflix.com>
Date: Wed, 29 May 2024 13:36:12 -0700
Subject: [PATCH 7/8] Updating database to support self_join

---
 .../versions/2024-04-29_a836d4850a75.py       | 27 -------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 src/dispatch/database/revisions/tenant/versions/2024-04-29_a836d4850a75.py

diff --git a/src/dispatch/database/revisions/tenant/versions/2024-04-29_a836d4850a75.py b/src/dispatch/database/revisions/tenant/versions/2024-04-29_a836d4850a75.py
deleted file mode 100644
index 328956d63139..000000000000
--- a/src/dispatch/database/revisions/tenant/versions/2024-04-29_a836d4850a75.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""Adding in "allow_self_join" column to enable self join in dispatch UI
-
-Revision ID: a836d4850a75
-Revises: 50e99c66e72f
-Create Date: 2024-04-29 10:28:37.777618
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-# revision identifiers, used by Alembic.
-revision = 'a836d4850a75'
-down_revision = '50e99c66e72f'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('project', sa.Column('allow_self_join', sa.Boolean(), server_default='t', nullable=True))
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('project', 'allow_self_join')
-    # ### end Alembic commands ###

From 9ee576e63c5d5942207fcb06eb6b452746be97e1 Mon Sep 17 00:00:00 2001
From: Mike Laventure <mlaventure@netflix.com>
Date: Wed, 29 May 2024 13:37:58 -0700
Subject: [PATCH 8/8] Adding new revision file

---
 .../versions/2024-05-29_a836d4850a75.py       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 src/dispatch/database/revisions/tenant/versions/2024-05-29_a836d4850a75.py

diff --git a/src/dispatch/database/revisions/tenant/versions/2024-05-29_a836d4850a75.py b/src/dispatch/database/revisions/tenant/versions/2024-05-29_a836d4850a75.py
new file mode 100644
index 000000000000..8661fb076e09
--- /dev/null
+++ b/src/dispatch/database/revisions/tenant/versions/2024-05-29_a836d4850a75.py
@@ -0,0 +1,27 @@
+"""Adding in "allow_self_join" column to enable self join in dispatch UI
+
+Revision ID: a836d4850a75
+Revises: b07bb852fd67
+Create Date: 2024-04-29 10:28:37.777618
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = 'a836d4850a75'
+down_revision = 'b07bb852fd67'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('project', sa.Column('allow_self_join', sa.Boolean(), server_default='t', nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('project', 'allow_self_join')
+    # ### end Alembic commands ###