Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small filter improvements #137

Closed
wants to merge 2 commits into from
Closed

Small filter improvements #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad7094e
Small filter improvements
wcjordan Apr 30, 2024
75631b1
Fixes to dev env / db restorer from updating CloudSQL proxy setup to …
wcjordan May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions helm/templates/db-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions misc_containers/db_restorer/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
9 changes: 9 additions & 0 deletions ui/js/src/redux/workspaceSlice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
},
Expand Down Expand Up @@ -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
Expand Down
Loading