Skip to content

Commit 53f97fa

Browse files
michael-conwaymichael-conway
committed
merge develop
2 parents 432aa65 + e96ed14 commit 53f97fa

File tree

130 files changed

+51002
-1602
lines changed

Some content is hidden

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

130 files changed

+51002
-1602
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,11 @@ MigrationBackup/
376376
.venv
377377
*.swp
378378
.idea
379-
pcor_tools/tests/test_resources/*.json
379+
380380
pcor_tools/tests/test_resources/*.properties
381381
pcor_tools/tests/pcor_work_dir
382+
pcor_tools/.newenv/
383+
pcor_tools/.test/
382384

383385
#custom_configs/auto_generated_values.yaml
384386
#custom_configs/auto_generated_values_local.yaml

‎custom_configs/etlMapping.yaml‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ mappings:
1919
- name: temporal_resolution
2020
- name: spatial_resolution
2121
- name: spatial_coverage
22-
- name: spatial_coverage_specific_regions
22+
- name: spatial_bounding_box
2323
- name: exposure_media
2424
parent_props:
25-
- path: resources[resource_name:long_name, resource_short_name:short_name, resource_url, resource_description:description, domain, keywords, access_type, strengths, limitations, example_applications, tools_supporting_uses].projects[project_sponsor, project_sponsor_type]
25+
- path: resources[resource_short_name:short_name, resource_url, resource_description:description, domain, keywords, access_type, strengths, limitations, example_applications, tools_supporting_uses].projects[project_sponsor, project_sponsor_type]
2626
- name: chordstaging_geospatial_tool_resource
2727
doc_type: geospatial_tool_resource
2828
type: aggregator
@@ -35,7 +35,7 @@ mappings:
3535
- name: operating_system
3636
- name: languages
3737
parent_props:
38-
- path: resources[resource_name:long_name, resource_description:description, domain, keywords, access_type, payment_required, strengths, limitations, example_applications, tools_supporting_uses].projects[project_sponsor, project_sponsor_type]
38+
- path: resources[resource_short_name:short_name, resource_description:description, domain, keywords, access_type, payment_required, strengths, limitations, example_applications, tools_supporting_uses].projects[project_sponsor, project_sponsor_type]
3939
- name: chordstaging_population_data_resource
4040
doc_type: population_data_resource
4141
type: aggregator
@@ -56,16 +56,13 @@ mappings:
5656
- name: temporal_resolution
5757
- name: spatial_resolution
5858
- name: spatial_coverage
59-
- name: spatial_coverage_specific_regions
6059
- name: geometry_type
6160
- name: geometry_source
62-
- name: exposures
63-
- name: outcomes
6461
- name: exposure_media
6562
- name: model_methods
6663
- name: population_studied
6764
parent_props:
68-
- path: resources[resource_name:long_name, resource_short_name:short_name, resource_url, resource_description:description, domain, keywords, access_type, strengths, limitations, example_applications, tools_supporting_uses].projects[project_sponsor, project_sponsor_type]
65+
- path: resources[resource_short_name:short_name, resource_url, resource_description:description, domain, keywords, access_type, strengths, limitations, example_applications, tools_supporting_uses].projects[project_sponsor, project_sponsor_type]
6966
- name: chordstaging_key_dataset_resource
7067
doc_type: key_data_resource
7168
type: aggregator
@@ -89,8 +86,7 @@ mappings:
8986
- name: spatial_coverage_specific_regions
9087
- name: geometry_type
9188
- name: model_methods
92-
- name: metrics_derived_from_data_set
9389
- name: data_formats
94-
- name: data_location
90+
- name: data_location_text
9591
parent_props:
96-
- path: resources[resource_name:long_name, resource_short_name:short_name, resource_url, resource_description:description, domain, keywords, access_type, strengths, limitations, example_applications, tools_supporting_uses].projects[project_sponsor, project_sponsor_type]
92+
- path: resources[resource_short_name:short_name, resource_url, resource_description:description, domain, keywords, access_type, strengths, limitations, example_applications, tools_supporting_uses].projects[project_sponsor, project_sponsor_type]

‎custom_configs/gitops.json‎

Lines changed: 62 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
"fields": [
291291
{
292292
"type": "block",
293-
"sourceField": "comment"
293+
"sourceField": "intended_use"
294294
}
295295
]
296296
},
@@ -385,6 +385,12 @@
385385
"sourceField": "domain",
386386
"default": "n/a"
387387
},
388+
{
389+
"type": "text",
390+
"label": "Domain Other",
391+
"sourceField": "domain_other",
392+
"default": "n/a"
393+
},
388394
{
389395
"type": "text",
390396
"label": "Has API",
@@ -439,6 +445,18 @@
439445
"sourceField": "time_available_comment",
440446
"default": ""
441447
},
448+
{
449+
"type": "text",
450+
"label": "Temporal Resolution",
451+
"sourceField": "temporal_resolution",
452+
"default": ""
453+
},
454+
{
455+
"type": "text",
456+
"label": "Temporal Resolution Other",
457+
"sourceField": "temporal_resolution_other",
458+
"default": ""
459+
},
442460
{
443461
"type": "text",
444462
"label": "Spatial Resolution",
@@ -447,8 +465,8 @@
447465
},
448466
{
449467
"type": "text",
450-
"label": "Temporal Resolution",
451-
"sourceField": "temporal_resolution",
468+
"label": "Spatial Resolution Other",
469+
"sourceField": "spatial_resolution_other",
452470
"default": ""
453471
},
454472
{
@@ -457,6 +475,12 @@
457475
"sourceField": "spatial_coverage",
458476
"default": ""
459477
},
478+
{
479+
"type": "text",
480+
"label": "Spatial Coverage Other",
481+
"sourceField": "spatial_coverage_other",
482+
"default": ""
483+
},
460484
{
461485
"type": "text",
462486
"label": "Geometry Type",
@@ -491,27 +515,51 @@
491515
"default": "n/a"
492516
},
493517
{
494-
"type": "link",
518+
"type": "text",
495519
"label": "Resource Use Agreement",
496520
"sourceField": "resource_use_agreement",
497521
"default": "n/a"
498522
},
499-
{
523+
{
500524
"type": "link",
525+
"label": "Resource Use Agreement Link",
526+
"sourceField": "resource_use_agreement_link",
527+
"default": "n/a"
528+
},
529+
{
530+
"type": "text",
501531
"label": "Dataset Location 1",
502-
"sourceField": "data_location_1",
532+
"sourceField": "data_location_text_1",
503533
"default": "n/a"
504534
},
505535
{
506536
"type": "link",
537+
"label": "Dataset Location link 1 ",
538+
"sourceField": "data_location_link_1",
539+
"default": "n/a"
540+
},
541+
{
542+
"type": "text",
507543
"label": "Dataset Location 2",
508-
"sourceField": "data_location_2",
544+
"sourceField": "data_location_text_2",
509545
"default": "n/a"
510546
},
511547
{
512548
"type": "link",
549+
"label": "Dataset Location link 2 ",
550+
"sourceField": "data_location_link_2",
551+
"default": "n/a"
552+
},
553+
{
554+
"type": "text",
513555
"label": "Dataset Location 3",
514-
"sourceField": "data_location_3",
556+
"sourceField": "data_location_text_3",
557+
"default": "n/a"
558+
},
559+
{
560+
"type": "link",
561+
"label": "Dataset Location link 3 ",
562+
"sourceField": "data_location_link_3",
515563
"default": "n/a"
516564
}
517565
]
@@ -586,7 +634,7 @@
586634
"enabled": true,
587635
"fields": [
588636
"project_sponsor",
589-
"resource_name",
637+
"resource_short_name",
590638
"resource_description",
591639
"domain",
592640
"keywords",
@@ -595,7 +643,6 @@
595643
"time_extent_start_year",
596644
"time_extent_end_year",
597645
"spatial_coverage",
598-
"spatial_coverage_specific_regions",
599646
"resource_url"
600647
],
601648
"linkFields": [
@@ -692,7 +739,7 @@
692739
"enabled": true,
693740
"fields": [
694741
"project_sponsor",
695-
"resource_name",
742+
"resource_short_name",
696743
"resource_description",
697744
"domain",
698745
"keywords",
@@ -701,7 +748,6 @@
701748
"time_extent_start_year",
702749
"time_extent_end_year",
703750
"spatial_coverage",
704-
"spatial_coverage_specific_regions",
705751
"resource_url"
706752
],
707753
"linkFields": [
@@ -791,7 +837,7 @@
791837
"enabled": true,
792838
"fields": [
793839
"project_sponsor",
794-
"resource_name",
840+
"resource_short_name",
795841
"resource_description",
796842
"domain",
797843
"keywords",
@@ -892,18 +938,17 @@
892938
"enabled": true,
893939
"fields": [
894940
"project_sponsor",
895-
"resource_name",
941+
"resource_short_name",
896942
"resource_description",
897943
"keywords",
898944
"domain",
899945
"comments",
900-
"metrics_derived_from_data_set",
901946
"data_formats",
902-
"data_location"
947+
"data_location_text"
903948

904949
],
905950
"linkFields": [
906-
"data_location"
951+
"data_location_text"
907952
]
908953
},
909954
"dropdowns": {
@@ -960,7 +1005,6 @@
9601005
"accessibleValidationField": "project_id"
9611006
}
9621007
}
963-
9641008
],
9651009
"connectSrcCSPWhitelist": [
9661010
"https://gen3.niehs.nih.gov", "https://chords.niehs.nih.gov", "https://localhost", "https://chords-health.org", "https://staging.chordshealth.org/", "https://www.niehs.nih.gov", "https://rstudio.niehs.nih.gov"

‎custom_configs/schema.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎custom_configs/user.yaml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,12 @@ authz:
159159
- name: CMAQ-051324
160160
- name: BRFSS-092624
161161
- name: NHIS-092524
162+
- name: ECDS-111524
163+
- name: OSPO-AP-102924
164+
- name: OSPO-AP-110724
165+
- name: OneStop-092624
166+
- name: NIAID-DEP-120124
167+
- name: GRASP-071924
162168
policies:
163169
- id: 'mds_admin'
164170
description: 'be able to use metadata service'
@@ -320,6 +326,13 @@ authz:
320326
- /programs/CHORDS/projects/CMAQ-051324
321327
- /programs/CHORDS/projects/BRFSS-092624
322328
- /programs/CHORDS/projects/NHIS-092524
329+
- /programs/CHORDS/projects/ECDS-111524
330+
- /programs/CHORDS/projects/OSPO-AP-102924
331+
- /programs/CHORDS/projects/OSPO-AP-110724
332+
- /programs/CHORDS/projects/OneStop-092624
333+
- /programs/CHORDS/projects/NIAID-DEP-120124
334+
- /programs/CHORDS/projects/GRASP-071924
335+
323336
- id: all_programs_reader
324337
role_ids:
325338
- 'guppy_reader'
@@ -448,12 +461,20 @@ authz:
448461
- /programs/CHORDS/projects/NRI-070924
449462
- /programs/CHORDS/projects/AgRisk-070924
450463
- /programs/CHORDS/projects/NLCD-TC-071524
464+
- /programs/CHORDS/projects/Landslide-090624
451465
- /programs/CHORDS/projects/CASTNET-052224
452466
- /programs/CHORDS/projects/NEI-052424
453467
- /programs/CHORDS/projects/Landslide-101424
454468
- /programs/CHORDS/projects/CMAQ-051324
455469
- /programs/CHORDS/projects/BRFSS-092624
456470
- /programs/CHORDS/projects/NHIS-092524
471+
- /programs/CHORDS/projects/ECDS-111524
472+
- /programs/CHORDS/projects/OSPO-AP-102924
473+
- /programs/CHORDS/projects/OSPO-AP-110724
474+
- /programs/CHORDS/projects/OneStop-092624
475+
- /programs/CHORDS/projects/NIAID-DEP-120124
476+
- /programs/CHORDS/projects/GRASP-071924
477+
457478
roles:
458479
- id: 'mds_user'
459480
permissions:
@@ -608,4 +629,4 @@ users:
608629
- CHORDS_submitter
609630
- mds_admin
610631
- data_upload
611-
- services.sheepdog-admin
632+
- services.sheepdog-admin

gen3-gitops/aws_values_05_29/etl.yaml renamed to gen3-gitops/aws_values_24_05_29/etl.yaml

File renamed without changes.

gen3-gitops/aws_values_05_29/fence.yaml renamed to gen3-gitops/aws_values_24_05_29/fence.yaml

File renamed without changes.

gen3-gitops/aws_values_05_29/guppy.yaml renamed to gen3-gitops/aws_values_24_05_29/guppy.yaml

File renamed without changes.

gen3-gitops/aws_values_05_29/portal.yaml renamed to gen3-gitops/aws_values_24_05_29/portal.yaml

File renamed without changes.

gen3-gitops/aws_values_05_29/values.yaml renamed to gen3-gitops/aws_values_24_05_29/values.yaml

File renamed without changes.

0 commit comments

Comments
 (0)