Skip to content

Commit 761e65c

Browse files
briouxbrioux
committed
Signed-off-by: brioux <[email protected]>
2 parents f279d1d + 19b68b2 commit 761e65c

File tree

14 files changed

+172
-262
lines changed

14 files changed

+172
-262
lines changed

‎app/api-oracle/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"express": "^4.18.1",
2424
"node-cache": "^5.1.2",
2525
"node-fetch": "^2.6.1",
26-
"nodemon": "^2.0.19",
26+
"nodemon": "^2.0.20",
2727
"object-hash": "^3.0.0",
2828
"react": "^18.2.0",
2929
"redis": "^4.2.0",

‎app/api-server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@typescript-eslint/parser": "^5.28.0",
5757
"dotenv-cli": "^6.0.0",
5858
"eslint": "^8.17.0",
59-
"nodemon": "^2.0.16",
59+
"nodemon": "^2.0.20",
6060
"ts-node": "^10.8.1",
6161
"typescript": "^4.7.3"
6262
}

‎app/methane/client/src/pages/assets.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ const RegisteredOperator: ForwardRefRenderFunction<AssetsHandle, AssetProps> = (
182182
<div className="mt-4">
183183
<h2 style={{display: 'inline'}}>
184184
Operator: {operator?.name}&nbsp;
185-
{operator?.assetsCount} Assets &nbsp;
185+
{operator?.assetsCount} ({assetCount}) Assets &nbsp;
186186
</h2>
187187
&nbsp;
188188
<Button className="mb-3" onClick={switchQueryBuilder} variant={(showQueryBuilder) ? 'dark' : 'outline-dark'}><BsFunnel /></Button>

‎app/supply-chain/api/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"typescript": "^4.7.3",
2121
"@types/express": "^4.17.13",
2222
"@types/multer": "^1.4.7",
23-
"nodemon": "^2.0.16",
23+
"nodemon": "^2.0.20",
2424
"ts-node": "^10.8.1",
2525
"@types/cors": "^2.8.12"
2626
},

‎data/oil_and_gas/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ Load the product data into postgres db by running the following from `/data` dir
3131
sh loadOGdata.sh
3232
```
3333

34+
Or from project root run
35+
```
36+
npm run loadSeeds:OG
37+
```
38+
3439
## Sources
3540

3641
### [US Oil & Gas Asset Data](https://hifld-geoplatform.opendata.arcgis.com/datasets/geoplatform::oil-and-natural-gas-wells/explore)

‎fabric/chaincode/datalock/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ require (
1414
github.com/golang/protobuf v1.5.2 // indirect
1515
github.com/pmezard/go-difflib v1.0.0 // indirect
1616
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
17-
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
18-
golang.org/x/text v0.3.7 // indirect
17+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
18+
golang.org/x/text v0.3.8 // indirect
1919
google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 // indirect
2020
google.golang.org/grpc v1.46.0 // indirect
2121
google.golang.org/protobuf v1.28.0 // indirect

‎fabric/chaincode/datalock/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
105105
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
106106
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
107107
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
108-
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
109-
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
108+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
109+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
110110
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
111111
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
112112
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
113113
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
114-
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
115-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
114+
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
115+
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
116116
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
117117
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
118118
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

‎fabric/multi-cloud-deployment/chaincode/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ require (
1010
require (
1111
github.com/golang/protobuf v1.5.2 // indirect
1212
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
13-
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
14-
golang.org/x/text v0.3.7 // indirect
13+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
14+
golang.org/x/text v0.3.8 // indirect
1515
google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 // indirect
1616
google.golang.org/grpc v1.46.0 // indirect
1717
google.golang.org/protobuf v1.28.0 // indirect

‎fabric/multi-cloud-deployment/chaincode/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
9898
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
9999
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
100100
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
101-
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
102-
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
101+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
102+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
103103
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
104104
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
105105
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
106106
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
107-
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
108-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
107+
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
108+
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
109109
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
110110
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
111111
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

‎fabric/multi-cloud-deployment/deploy-aws/chaincode/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ require (
1010
require (
1111
github.com/golang/protobuf v1.5.2 // indirect
1212
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
13-
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
14-
golang.org/x/text v0.3.7 // indirect
13+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
14+
golang.org/x/text v0.3.8 // indirect
1515
google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 // indirect
1616
google.golang.org/grpc v1.46.0 // indirect
1717
google.golang.org/protobuf v1.28.0 // indirect

0 commit comments

Comments
 (0)