Skip to content

Commit 19d1939

Browse files
authored
Merge pull request #21 from complexdatacollective/feature/min-max-namegenerators
dev protocol with minNodes and maxNodes
2 parents 1908698 + 9339e2c commit 19d1939

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
# Set node version
1414
- uses: actions/setup-node@v2
1515
with:
16-
node-version: '12.14.1'
16+
node-version: "12.14.1"
1717
- name: Set NPM 7
1818
run: npm install -g npm@7.6.3
1919

@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v2
2525
with:
2626
repository: complexdatacollective/protocol-validation
27-
ref: feature/schema-version-6-addendum
27+
ref: feature/schema-version-7
2828
path: protocol-validation
2929

3030
- name: Install protocol validation
@@ -35,4 +35,4 @@ jobs:
3535
- name: Validate protocol
3636
run: |
3737
cd protocol-validation
38-
npm run validate-protocol ../Development.netcanvas
38+
npm run validate-protocol ../Development.netcanvas

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: CI
22
on:
33
push:
4-
branches: [ master ]
4+
branches: [master]
55

66
# Allows you to run this workflow manually from the Actions tab
77
workflow_dispatch:
@@ -14,7 +14,7 @@ jobs:
1414
# Set node version
1515
- uses: actions/setup-node@v2
1616
with:
17-
node-version: '12.14.1'
17+
node-version: "12.14.1"
1818
- name: Set NPM 7
1919
run: npm install -g npm@7.6.3
2020

@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/checkout@v2
2626
with:
2727
repository: complexdatacollective/protocol-validation
28-
ref: feature/schema-version-6-addendum
28+
ref: feature/schema-version-7
2929
path: protocol-validation
3030

3131
- name: Install protocol validation
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
cd protocol-validation
3939
npm run validate-protocol ../Development.netcanvas
40-
40+
4141
- name: Tag release
4242
run: git tag $(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)
4343

@@ -52,4 +52,4 @@ jobs:
5252
name: ${{ steps.getReleaseName.outputs.RELEASE_NAME }}
5353
files: Development.netcanvas
5454
env:
55-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

protocol.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"description": "The Network Canvas development protocol is designed for our team to test new features. It is not intended for general use.",
33
"lastModified": "2021-04-06T11:09:14.146Z",
4-
"schemaVersion": 6,
4+
"schemaVersion": 7,
55
"codebook": {
66
"node": {
77
"4aebf73e-95e3-4fd1-95e7-237dcc4a4466": {
@@ -1156,6 +1156,10 @@
11561156
"dataSource": "existing"
11571157
}
11581158
],
1159+
"behaviours": {
1160+
"minNodes": 1,
1161+
"maxNodes": 8
1162+
},
11591163
"prompts": [
11601164
{
11611165
"id": "6cl",
@@ -1305,6 +1309,10 @@
13051309
"entity": "node",
13061310
"type": "eda5e3bb-8e1c-4216-9e06-adc0ff6b7f73"
13071311
},
1312+
"behaviours": {
1313+
"minNodes": 1,
1314+
"maxNodes": 8
1315+
},
13081316
"dataSource": "HIVServices-csv",
13091317
"prompts": [
13101318
{
@@ -1605,11 +1613,7 @@
16051613
},
16061614
"searchOptions": {
16071615
"fuzziness": 0.4,
1608-
"matchProperties": [
1609-
"variableNotInRegistry",
1610-
"nickname",
1611-
"last_name"
1612-
]
1616+
"matchProperties": ["variableNotInRegistry", "nickname", "last_name"]
16131617
},
16141618
"prompts": [
16151619
{
@@ -1906,13 +1910,9 @@
19061910
"layoutVariable": "e13ca72d-aefe-4f48-841d-09f020e0e987",
19071911
"groupVariable": "e343a91f-628d-4175-870c-957beffa0154",
19081912
"edges": {
1909-
"display": [
1910-
"867127d9-086b-403a-a3e7-2c7d32126546"
1911-
]
1913+
"display": ["867127d9-086b-403a-a3e7-2c7d32126546"]
19121914
},
1913-
"highlight": [
1914-
"03b03617-46ae-41cb-9462-9acd8a17edd6"
1915-
]
1915+
"highlight": ["03b03617-46ae-41cb-9462-9acd8a17edd6"]
19161916
}
19171917
],
19181918
"background": {

0 commit comments

Comments
 (0)