Merge branch 'main' into 18176-data-grid-files

cityofaustin · Oct 4, 2024 · 610c3c4 · 610c3c4
2 parents 65f27a2 + caa2f0c
commit 610c3c4
Show file tree

Hide file tree

Showing 8 changed files with 1,117 additions and 4 deletions.
diff --git a/moped-database/metadata/tables.yaml b/moped-database/metadata/tables.yaml
@@ -5505,6 +5505,7 @@
           - current_phase_simple
           - date_added
           - ecapris_subproject_id
+          - funding_program_names
           - funding_source_and_program_names
           - funding_source_name
           - interim_project_id
@@ -5557,6 +5558,7 @@
           - current_phase_simple
           - date_added
           - ecapris_subproject_id
+          - funding_program_names
           - funding_source_and_program_names
           - funding_source_name
           - interim_project_id
@@ -5609,6 +5611,7 @@
           - current_phase_simple
           - date_added
           - ecapris_subproject_id
+          - funding_program_names
           - funding_source_and_program_names
           - funding_source_name
           - interim_project_id

diff --git a/moped-database/migrations/1727458564792_add_funding_program_to_project_list_view/down.sql b/moped-database/migrations/1727458564792_add_funding_program_to_project_list_view/down.sql
diff --git a/moped-database/migrations/1727458564792_add_funding_program_to_project_list_view/up.sql b/moped-database/migrations/1727458564792_add_funding_program_to_project_list_view/up.sql
diff --git a/moped-database/views/component_arcgis_online_view.sql b/moped-database/views/component_arcgis_online_view.sql
@@ -1,4 +1,4 @@
--- Most recent migration: moped-database/migrations/1727279529178_update_component_agol_view_school_beacons/up.sql
+-- Most recent migration: moped-database/migrations/1727458564792_add_funding_program_to_project_list_view/up.sql
 
 CREATE OR REPLACE VIEW component_arcgis_online_view AS WITH work_types AS (
     SELECT

diff --git a/moped-database/views/exploded_component_arcgis_online_view.sql b/moped-database/views/exploded_component_arcgis_online_view.sql
@@ -1,4 +1,4 @@
--- Most recent migration: moped-database/migrations/1727279529178_update_component_agol_view_school_beacons/up.sql
+-- Most recent migration: moped-database/migrations/1727458564792_add_funding_program_to_project_list_view/up.sql
 
 CREATE OR REPLACE VIEW exploded_component_arcgis_online_view AS SELECT
     component_arcgis_online_view.project_id,

diff --git a/moped-database/views/project_list_view.sql b/moped-database/views/project_list_view.sql
@@ -1,4 +1,4 @@
--- Most recent migration: moped-database/migrations/1719872865109_add_work_plan_category/up.sql
+-- Most recent migration: moped-database/migrations/1727458564792_add_funding_program_to_project_list_view/up.sql
 
 CREATE OR REPLACE VIEW project_list_view AS WITH project_person_list_lookup AS (
     SELECT
@@ -16,6 +16,7 @@ funding_sources_lookup AS (
     SELECT
         mpf.project_id,
         string_agg(DISTINCT mfs.funding_source_name, ', '::text ORDER BY mfs.funding_source_name) AS funding_source_name,
+        string_agg(DISTINCT mfp.funding_program_name, ', '::text ORDER BY mfp.funding_program_name) AS funding_program_names,
         string_agg(
             DISTINCT
             CASE
@@ -210,6 +211,7 @@ SELECT
         WHERE true AND components.is_deleted = false AND components.project_id = mp.project_id AND feature_signals.signal_id IS NOT null AND feature_signals.is_deleted = false
     ) AS project_feature,
     fsl.funding_source_name,
+    fsl.funding_program_names,
     fsl.funding_source_and_program_names,
     ptl.type_name,
     (
@@ -283,4 +285,4 @@ LEFT JOIN LATERAL (
     LIMIT 1
 ) proj_status_update ON true
 WHERE mp.is_deleted = false
-GROUP BY mp.project_id, mp.project_name, mp.project_description, ppll.project_team_members, mp.ecapris_subproject_id, mp.date_added, mp.is_deleted, me.entity_name, mel.entity_name, mp.updated_at, mp.interim_project_id, mp.parent_project_id, mp.knack_project_id, current_phase.phase_name, current_phase.phase_key, current_phase.phase_name_simple, ptl.type_name, mpcs.components, fsl.funding_source_name, fsl.funding_source_and_program_names, added_by_user.first_name, added_by_user.last_name, mpps.name, cpl.children_project_ids, proj_status_update.project_note, proj_status_update.date_created, work_activities.workgroup_contractors, work_activities.contract_numbers, work_activities.task_order_names, work_activities.task_order_names_short, work_activities.task_orders, districts.project_council_districts, districts.project_and_child_project_council_districts, mepd.min_phase_date, mcpd.min_phase_date;
+GROUP BY mp.project_id, mp.project_name, mp.project_description, ppll.project_team_members, mp.ecapris_subproject_id, mp.date_added, mp.is_deleted, me.entity_name, mel.entity_name, mp.updated_at, mp.interim_project_id, mp.parent_project_id, mp.knack_project_id, current_phase.phase_name, current_phase.phase_key, current_phase.phase_name_simple, ptl.type_name, mpcs.components, fsl.funding_source_name, fsl.funding_program_names, fsl.funding_source_and_program_names, added_by_user.first_name, added_by_user.last_name, mpps.name, cpl.children_project_ids, proj_status_update.project_note, proj_status_update.date_created, work_activities.workgroup_contractors, work_activities.contract_numbers, work_activities.task_order_names, work_activities.task_order_names_short, work_activities.task_orders, districts.project_council_districts, districts.project_and_child_project_council_districts, mepd.min_phase_date, mcpd.min_phase_date;
diff --git a/moped-editor/src/queries/project.js b/moped-editor/src/queries/project.js
@@ -950,6 +950,10 @@ export const LOOKUP_TABLES_QUERY = gql`
       funding_source_id
       funding_source_name
     }
+    moped_fund_programs {
+      funding_program_id
+      funding_program_name
+    }
     moped_types(order_by: { type_name: asc }) {
       type_id
       type_name

diff --git a/moped-editor/src/views/projects/projectsListView/ProjectsListViewFiltersConf.js b/moped-editor/src/views/projects/projectsListView/ProjectsListViewFiltersConf.js
@@ -283,6 +283,23 @@ export const PROJECT_LIST_VIEW_FILTERS_CONFIG = {
       "string_is_not_null",
     ],
   },
+  funding_program_names: {
+    name: "funding_program_names",
+    label: "Funding programs",
+    placeholder: "Funding program",
+    type: "string",
+    lookup: {
+      table_name: "moped_fund_programs",
+      getOptionLabel: (option) => option.funding_program_name,
+      operators: ["string_contains_case_insensitive"],
+    },
+    defaultOperator: "string_contains_case_insensitive",
+    operators: [
+      "string_contains_case_insensitive",
+      "string_is_null",
+      "string_is_not_null",
+    ],
+  },
   project_status_update: {
     name: "project_status_update",
     label: "Status update",