Skip to content

Commit 440cd0b

Browse files
Merge pull request #229 from agrifooddatacanada/testing
Sept 12 Prod deploy
2 parents b45c60e + a695abb commit 440cd0b

File tree

130 files changed

+15269
-3111
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

+15269
-3111
lines changed

.babelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["@babel/preset-env"]
3+
}

.github/workflows/azure-static-web-apps-agreeable-mushroom-0ec070a0f.yml

+8
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ jobs:
1818
- uses: actions/checkout@v3
1919
with:
2020
submodules: true
21+
22+
# Add a step to install dependencies and run unit tests
23+
- name: Install Dependencies And Run Unit Tests
24+
run: |
25+
npm install
26+
npm run unittest
27+
2128
- name: Set environment variable
2229
run: echo "CI=false" >> $GITHUB_ENV # Add this step to set CI=false
2330
- name: Build And Deploy
@@ -34,6 +41,7 @@ jobs:
3441
output_location: 'build' # Built app content directory - optional
3542
env:
3643
REACT_APP_GA_ID: ${{ secrets.REACT_APP_GA_ID_DEV }}
44+
REACT_APP_ENV: ${{ secrets.REACT_APP_ENV_DEV }}
3745
###### End of Repository/Build Configurations ######
3846

3947
close_pull_request_job:

.github/workflows/azure-static-web-apps-delightful-sea-0437b660f.yml

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
output_location: 'build' # Built app content directory - optional
3535
env:
3636
REACT_APP_GA_ID: ${{ secrets.REACT_APP_GA_ID_PROD }}
37+
REACT_APP_ENV: ${{ secrets.REACT_APP_ENV_PROD }}
3738
###### End of Repository/Build Configurations ######
3839

3940
close_pull_request_job:

.github/workflows/azure-static-web-apps-wonderful-forest-05321210f.yml

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
output_location: 'build' # Built app content directory - optional
3535
env:
3636
REACT_APP_GA_ID: ${{ secrets.REACT_APP_GA_ID_PROD }}
37+
REACT_APP_ENV: ${{ secrets.REACT_APP_ENV_PROD }}
3738
###### End of Repository/Build Configurations ######
3839

3940
close_pull_request_job:

README.md

+10-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@ The JSON schema bundle can be consumed by several tools within the ADC/OCA ecosy
2323

2424
## Running the app locally
2525

26-
You can clone the project using the git command-line interface or you can download the entire project as a zip using GitHub's user-interface. In the project directory, you can run:
26+
You can clone the project using the git command-line interface or you can download the entire project as a zip using GitHub's user-interface.
27+
28+
Create a `.env` file in the project root directory and add the following environment variable:
29+
30+
```
31+
REACT_APP_GA_ID=0
32+
33+
```
34+
35+
In the project directory, you can run:
2736

2837
### `npm start`
2938

@@ -46,4 +55,3 @@ See the section about [deployment](https://facebook.github.io/create-react-app/d
4655
## Development Status
4756

4857
This code is created with support by [Agri-food Data Canada](https://agrifooddatacanada.ca/), funded by [CFREF](https://www.cfref-apogee.gc.ca/) through the [Food from Thought grant](https://foodfromthought.ca/) held at the [University of Guelph](https://www.uoguelph.ca/). Currently, we do not provide any warranty of any kind regarding the accuracy, security, completeness or reliability of this code or any of its parts.
49-

dummyData/err2_data_entry.csv

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Age,BreastWt,Breed,Farm,Glucose,WtLive,coseGlu,Famr
2+
,,,123456789,4,0,ewq,wq
3+
,,eee,123456789,234516789,5,,3
4+
,,,,234516789,3,,
5+
,,,,234516789,,,
6+
,,,,234516789,3,,
7+
,,,123456789,234516789,Okay,,
8+
,,rr,,,,,

dummyData/err_data_entry.csv

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Bird Age,Breast Weight,Type of breed,Farm Letter Indentifier,Glucose Concentration,Lipase Content,Live Weight
2+
120,123456789,Brahma,123456789,234516789,234516789,234516789
3+
150,123456789,Silkie,123456789,234516789,234516789,234516789
4+
230,123456789,Silkie,123456789,234516789,234516789,234516789
5+
130,123456789,Brahma,123456789,234516789,234516789,234516789
6+
211,123456789,Brahma,123456789,234516789,234516789,234516789

dummyData/err_data_entry.xlsx

13.9 KB
Binary file not shown.
-3.4 KB
Binary file not shown.

dummyData/oca_bundle.json

+169
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
{
2+
"bundle": {
3+
"v": "OCAB10JSON0010eb_",
4+
"d": "EMY8Z5PAJSJ4RknrB4FVHhslCAa2kecE_UuooZXHgocZ",
5+
"capture_base": {
6+
"d": "EK2EbGdxi56FIUqT42NP2wl31eSCld97wJao9dhkDr9O",
7+
"type": "spec/capture_base/1.0",
8+
"classification": "",
9+
"attributes": {
10+
"Age": "Numeric",
11+
"BreastWt": "Numeric",
12+
"Breed": "Text",
13+
"Farm": "Text",
14+
"Glucose": "Numeric",
15+
"Lipase": "Numeric",
16+
"LiveWt": "Numeric"
17+
},
18+
"flagged_attributes": []
19+
},
20+
"overlays": {
21+
"character_encoding": {
22+
"d": "EGVQ6Wfpz_kQx1YgF4VdQEsip-bO3yunh3ABb0O5r4Tp",
23+
"type": "spec/overlays/character_encoding/1.0",
24+
"capture_base": "EK2EbGdxi56FIUqT42NP2wl31eSCld97wJao9dhkDr9O",
25+
"attribute_character_encoding": {
26+
"Age": "utf-8",
27+
"BreastWt": "utf-8",
28+
"Breed": "utf-8",
29+
"Farm": "utf-8",
30+
"Glucose": "utf-8",
31+
"Lipase": "utf-8",
32+
"LiveWt": "utf-8"
33+
}
34+
},
35+
"format": {
36+
"d": "EK_Tm8FZ98uo5VQoTsPJKl4eOQMxbNYOfgSvXiHewy4v",
37+
"type": "spec/overlays/format/1.0",
38+
"capture_base": "EK2EbGdxi56FIUqT42NP2wl31eSCld97wJao9dhkDr9O",
39+
"attribute_formats": {
40+
"Age": "[0-9]{3}",
41+
"BreastWt": "[A-Z0-9]{9}",
42+
"Breed": "[A-Z]{15}",
43+
"Farm": "[A-Z0-9]{9}",
44+
"Glucose": "[A-Z0-9]{9}",
45+
"Lipase": "[A-Z0-9]{9}",
46+
"LiveWt": "[A-Z0-9]{9}"
47+
}
48+
},
49+
"meta": [
50+
{
51+
"d": "EAVr-Ma48cmqvrnGZ4eoIOP03nMLt6NOsZcemcwN7Eht",
52+
"language": "eng",
53+
"type": "spec/overlays/meta/1.0",
54+
"capture_base": "EK2EbGdxi56FIUqT42NP2wl31eSCld97wJao9dhkDr9O",
55+
"description": " Measurements of chicken gut health",
56+
"name": "Chicken gut health"
57+
},
58+
{
59+
"d": "EIoASPl_R8FHv6pophCRBIRF6YPme00Gk1dwc4f7Ovba",
60+
"language": "fra",
61+
"type": "spec/overlays/meta/1.0",
62+
"capture_base": "EK2EbGdxi56FIUqT42NP2wl31eSCld97wJao9dhkDr9O",
63+
"description": "Mesures de la santée intestinale des poulets",
64+
"name": "santée intestinale des poulets"
65+
}
66+
],
67+
"label": [
68+
{
69+
"d": "EHi1TwkHqdMRQoame69YSYAyiwZDvovaPqabqCbHdCSe",
70+
"language": "eng",
71+
"type": "spec/overlays/label/1.0",
72+
"capture_base": "EK2EbGdxi56FIUqT42NP2wl31eSCld97wJao9dhkDr9O",
73+
"attribute_labels": {
74+
"Age": "Bird Age",
75+
"BreastWt": "Breast Weight",
76+
"Breed": "Type of breed",
77+
"Farm": "Farm Letter Indentifier",
78+
"Glucose": "Glucose Concentration",
79+
"Lipase": "Lipase Content",
80+
"LiveWt": "Live Weight"
81+
},
82+
"attribute_categories": [],
83+
"category_labels": {}
84+
},
85+
{
86+
"d": "ENwvm1CyJAmN2UTyz3fbdgRn-ZJ9Jr8opFNZZ9IU-OED",
87+
"language": "fra",
88+
"type": "spec/overlays/label/1.0",
89+
"capture_base": "EK2EbGdxi56FIUqT42NP2wl31eSCld97wJao9dhkDr9O",
90+
"attribute_labels": {
91+
"Age": "Age de l'animal",
92+
"BreastWt": "Poids de la poitrine",
93+
"Breed": "type de race",
94+
"Farm": "Lettre itenditifant la ferme",
95+
"Glucose": "Concentration de glucose",
96+
"Lipase": "Concentration de lipase",
97+
"LiveWt": "Poids vif"
98+
},
99+
"attribute_categories": [],
100+
"category_labels": {}
101+
}
102+
],
103+
"information": [
104+
{
105+
"d": "EEB3Vioix69xnM0wvCtgXgomIRp9IIs4vkGXa5sEDpuy",
106+
"language": "eng",
107+
"type": "spec/overlays/information/1.0",
108+
"capture_base": "EK2EbGdxi56FIUqT42NP2wl31eSCld97wJao9dhkDr9O",
109+
"attribute_information": {
110+
"Age": "age of bird in days",
111+
"BreastWt": "Breast weight in grams",
112+
"Breed": "information on the type of breed",
113+
"Farm": "a letter given to the farm for identification",
114+
"Glucose": "glucose content in mmol/L",
115+
"Lipase": "lipase content in U/L",
116+
"LiveWt": "weight in grams at 28 days"
117+
}
118+
},
119+
{
120+
"d": "EIrCPpZVeuFEt3z9fJr4nkCOhzk6HQHqH3ZktHf-u_xQ",
121+
"language": "fra",
122+
"type": "spec/overlays/information/1.0",
123+
"capture_base": "EK2EbGdxi56FIUqT42NP2wl31eSCld97wJao9dhkDr9O",
124+
"attribute_information": {
125+
"Age": "Age de l'animal compté en jours",
126+
"BreastWt": "Poids de la poitrine en gramme",
127+
"Breed": "informations sur le type de race",
128+
"Farm": "Letter assignee a chaque ferme pour identification",
129+
"Glucose": "Concentration de glucose en mmol/L",
130+
"Lipase": "Concentration de glucose en U/L",
131+
"LiveWt": "Poids vif à 28 jours en gramme"
132+
}
133+
}
134+
],
135+
"conformance": {
136+
"d": "EKzjcqJuiOKTVeSMRYNZsWnUsmnEiyv-8Uj1knydBfbU",
137+
"type": "spec/overlays/conformance/1.0",
138+
"capture_base": "EL4q2aahA0RN-ftw97E_fmbVDVTyDbIaQR2B44HGsqFG",
139+
"attribute_conformance": {
140+
"d": "M",
141+
"i": "M",
142+
"passed": "M"
143+
}
144+
},
145+
"entry_code": {
146+
"d": "EHZvulY_pJ3W9bfIjdzUuHDf04QQkyvN4Dub2NOMWo1G",
147+
"type": "spec/overlays/entry_code/1.0",
148+
"capture_base": "EK2EbGdxi56FIUqT42NP2wl31eSCld97wJao9dhkDr9O",
149+
"attribute_entry_codes": {
150+
"Breed": ["B", "S"]
151+
}
152+
},
153+
"entry": [
154+
{
155+
"d": "EKmiV3-xOJtNDXsXDNE6FpGKl3Yl_UglYpaQnQaseUBU",
156+
"language": "eng",
157+
"type": "spec/overlays/entry/1.0",
158+
"capture_base": "EK2EbGdxi56FIUqT42NP2wl31eSCld97wJao9dhkDr9O",
159+
"attribute_entries": {
160+
"Breed": {
161+
"B": "Brahma",
162+
"S": "Silkie"
163+
}
164+
}
165+
}
166+
]
167+
}
168+
}
169+
}

0 commit comments

Comments
 (0)