Skip to content

Commit 22160ab

Browse files
mddilleymddilley
committed
Merge branch 'main' into mike/27762_fix_hash_scroll
2 parents 9d9dc98 + 3b6c37b commit 22160ab

64 files changed

Lines changed: 9654 additions & 21077 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎moped-database/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
- HASURA_GRAPHQL_CONSOLE_ASSETS_DIR=/srv/console-assets
1616
- MOPED_API_ACTIONS_URL=http://localhost:5000/actions
1717
- MOPED_API_EVENTS_URL=http://localhost:5000/events
18-
- HASURA_ENDPOINT=http://localhost:8082/v1/graphql
18+
- HASURA_ENDPOINT=http://localhost:8080/v1/graphql
1919
- MOPED_API_APIKEY=DuMmyApiKeyHFVOVto19otC1wX6sP2N0VSKrCD70L10B7Sm525ZR6L672i2F79M9!
2020
- 'HASURA_GRAPHQL_JWT_SECRET={"type":"RS256","jwk_url": "https://cognito-idp.us-east-1.amazonaws.com/us-east-1_U2dzkxfTv/.well-known/jwks.json","claims_format": "stringified_json"}'
2121
- HASURA_GRAPHQL_ADMIN_SECRET=hasurapassword

‎moped-database/metadata/databases/default/tables/public_ecapris_subproject_funding.yaml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,45 @@ select_permissions:
1212
- role: moped-admin
1313
permission:
1414
columns:
15+
- app
16+
- ecapris_subproject_id
1517
- fao_id
1618
- fdu
17-
- id
18-
- unit_long_name
1919
- fdu_status
20-
- ecapris_subproject_id
21-
- app
2220
- funding_program_id
2321
- funding_source_id
22+
- id
23+
- subproject_name
24+
- unit_long_name
2425
filter: {}
2526
comment: ""
2627
- role: moped-editor
2728
permission:
2829
columns:
30+
- app
31+
- ecapris_subproject_id
2932
- fao_id
3033
- fdu
31-
- id
32-
- unit_long_name
3334
- fdu_status
34-
- ecapris_subproject_id
35-
- app
3635
- funding_program_id
3736
- funding_source_id
37+
- id
38+
- subproject_name
39+
- unit_long_name
3840
filter: {}
3941
comment: ""
4042
- role: moped-viewer
4143
permission:
4244
columns:
45+
- app
46+
- ecapris_subproject_id
4347
- fao_id
4448
- fdu
45-
- id
46-
- unit_long_name
4749
- fdu_status
48-
- ecapris_subproject_id
49-
- app
5050
- funding_program_id
5151
- funding_source_id
52+
- id
53+
- subproject_name
54+
- unit_long_name
5255
filter: {}
5356
comment: ""

‎moped-database/migrations/default/1776300831851_alter_table_public_ecapris_subproject_funding_add_column_subproject_name/down.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
alter table "public"."ecapris_subproject_funding" drop column "subproject_name";

‎moped-database/migrations/default/1776300831851_alter_table_public_ecapris_subproject_funding_add_column_subproject_name/up.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
alter table "public"."ecapris_subproject_funding" add column "subproject_name" text
2+
null;

‎moped-database/migrations/default/1778009019612_rename_moped_note_type/down.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
UPDATE moped_note_types
2+
SET name = 'Synced from eCAPRIS'
3+
WHERE slug='ecapris_status_update';

‎moped-database/migrations/default/1778009019612_rename_moped_note_type/up.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
UPDATE moped_note_types
2+
SET name = 'eCAPRIS'
3+
WHERE slug='ecapris_status_update';

‎moped-database/migrations/default/1778009019613_council_dist_reporting/down.sql‎

Lines changed: 629 additions & 0 deletions
Large diffs are not rendered by default.

‎moped-database/migrations/default/1778009019613_council_dist_reporting/up.sql‎

Lines changed: 633 additions & 0 deletions
Large diffs are not rendered by default.

‎moped-database/views/combined_project_funding_view.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- Most recent migration: moped-database/migrations/default/1769119215514_combined_funding_toggle/up.sql
1+
-- Most recent migration: moped-database/migrations/default/1778009019613_council_dist_reporting/up.sql
22

33
CREATE OR REPLACE VIEW combined_project_funding_view AS SELECT
44
'moped_'::text || moped_proj_funding.proj_funding_id AS id,

‎moped-database/views/component_arcgis_online_view.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- Most recent migration: moped-database/migrations/default/1769119215514_combined_funding_toggle/up.sql
1+
-- Most recent migration: moped-database/migrations/default/1778009019613_council_dist_reporting/up.sql
22

33
CREATE OR REPLACE VIEW component_arcgis_online_view AS WITH work_types AS (
44
SELECT

0 commit comments

Comments
 (0)