From ad7094e32a6a406e1e84ad0597faaa15d2fe530e Mon Sep 17 00:00:00 2001
From: Chris Jordan <chris.jordan@schrodinger.com>
Date: Mon, 29 Apr 2024 21:03:34 -0400
Subject: [PATCH 1/2] Small filter improvements

Remove Unlabeled filter whenever adding another filter
Filter out backlog labeled items in all Workflow Contexts
---
 ui/js/src/redux/workspaceSlice.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ui/js/src/redux/workspaceSlice.ts b/ui/js/src/redux/workspaceSlice.ts
index 340417e7..fc5e4bb5 100644
--- a/ui/js/src/redux/workspaceSlice.ts
+++ b/ui/js/src/redux/workspaceSlice.ts
@@ -16,29 +16,34 @@ export const workContexts: { [key: string]: WorkContext } = {
     displayName: 'Urgent',
     labels: {
       urgent: FILTER_STATUS.Active,
+      backlog: FILTER_STATUS.Inverted,
     },
   },
   quickFixes: {
     displayName: 'Quick Fixes',
     labels: {
       '5 minutes': FILTER_STATUS.Active,
+      backlog: FILTER_STATUS.Inverted,
     },
   },
   upNext: {
     displayName: 'Up Next',
     labels: {
+      backlog: FILTER_STATUS.Inverted,
       'up next': FILTER_STATUS.Active,
     },
   },
   work: {
     displayName: 'Work',
     labels: {
+      backlog: FILTER_STATUS.Inverted,
       work: FILTER_STATUS.Active,
     },
   },
   shopping: {
     displayName: 'Shopping',
     labels: {
+      backlog: FILTER_STATUS.Inverted,
       Shopping: FILTER_STATUS.Active,
     },
   },
@@ -86,6 +91,10 @@ export default createSlice({
       const newLabels = Object.assign({}, state.filterLabels);
 
       const toggledLabel = action.payload;
+      if (toggledLabel !== 'Unlabeled') {
+        delete newLabels['Unlabeled'];
+      }
+
       const prevStatus = newLabels[toggledLabel];
       if (prevStatus === FILTER_STATUS.Active) {
         // Invert existing item

From 75631b14988d5da0d9eecf0c62ac0f138c79e5a7 Mon Sep 17 00:00:00 2001
From: Chris Jordan <chris.jordan@schrodinger.com>
Date: Sat, 4 May 2024 16:47:20 -0400
Subject: [PATCH 2/2] Fixes to dev env / db restorer from updating CloudSQL
 proxy setup to match latest Google documentation

---
 helm/templates/db-config.yaml             | 1 +
 misc_containers/db_restorer/entrypoint.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/helm/templates/db-config.yaml b/helm/templates/db-config.yaml
index 842b1f89..1ab6c8a2 100644
--- a/helm/templates/db-config.yaml
+++ b/helm/templates/db-config.yaml
@@ -47,6 +47,7 @@ spec:
       - name: cloud-sql-proxy
         image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:latest
         args:
+        - "--exit-zero-on-sigterm"
         - "--structured-logs"
         - "--port=5432"
         - {{ printf "%s:us-east4:%s" .Values.gcpProject (include "..dbInstanceName" .) | quote }}
diff --git a/misc_containers/db_restorer/entrypoint.sh b/misc_containers/db_restorer/entrypoint.sh
index 2fcc42af..5421808e 100755
--- a/misc_containers/db_restorer/entrypoint.sh
+++ b/misc_containers/db_restorer/entrypoint.sh
@@ -35,5 +35,5 @@ else
     psql < ./backup_to_restore.sql
 fi
 
-# Kill cloud_sql_proxy so the job will complete
-kill -INT $(pgrep cloud_sql_proxy)
+# Kill cloud-sql-proxy so the job will complete
+kill -SIGTERM -INT $(pgrep cloud-sql-proxy)