Merge pull request #30 from ror-community/staging

Merge staging to main: Org status changes

.github/workflows/dev.yml

@@ -5,7 +5,6 @@ on:
       - "dev"
     paths-ignore:
       - '**/README.md'
-      - '**/workflows/**'
 jobs:
   run:
     runs-on: ubuntu-latest
@@ -17,6 +16,11 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install
         run: npm ci
+      - name: Pull ROR Schema
+        run:  |
+          git submodule update --init --recursive;
+          cd ror-schema;
+          git checkout dev
       - name: Build
         run:  |
           cp src/env.dev.ts src/env.ts;

.github/workflows/release.yml

@@ -13,6 +13,11 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install
         run: npm ci
+      - name: Pull ROR Schema
+        run:  |
+          git submodule update --init --recursive;
+          cd ror-schema;
+          git checkout master
       - name: Build
         run:  |
           cp src/env.prod.ts src/env.ts;

.github/workflows/staging.yml

@@ -5,7 +5,6 @@ on:
       - "staging"
     paths-ignore:
       - '**/README.md'
-      - '**/workflows/**'
 jobs:
   run:
     runs-on: ubuntu-latest
@@ -17,6 +16,11 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install
         run: npm ci
+      - name: Pull ROR Schema
+        run:  |
+          git submodule update --init --recursive;
+          cd ror-schema;
+          git checkout master
       - name: Build
         run:  |
           cp src/env.staging.ts src/env.ts;

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ror-schema"]
+	path = ror-schema
+	url = https://github.com/ror-community/ror-schema

src/jsonSchema/rorSchema/index.ts

@@ -1,4 +1,4 @@
-import schema from './schema.json'
+import schema from './ror_schema.json'
 import data from './data.json'
 import uischema from './uischema.json'
 import { UISchemaElement, JsonSchema } from '@jsonforms/core'

src/jsonSchema/rorSchema/ror_schema.json

@@ -0,0 +1 @@
+../../../ror-schema/ror_schema.json