Merge pull request #1 from ror-community/license_display

License display

.env

@@ -1 +1 @@
-VUE_APP_GENERATE_ID="http://localhost:5000/generateid?mode=dev"
+VUE_APP_GENERATE_ID="http://localhost:5000/generateid"

src/components/CustomRenderer.vue

@@ -52,6 +52,7 @@ import { useVuetifyControl } from '@jsonforms/vue2-vuetify';
 import { VTextField } from 'vuetify/lib';
 import { CoreActions } from '@jsonforms/core';
 import set from 'lodash/fp/set';
+import { env } from '../env';
 
 export const customRenderer = defineComponent({
   name: 'custom-renderer',
@@ -142,8 +143,9 @@ export const customRenderer = defineComponent({
       return data;
     },
     fetchAddress(id: string, path: string) {
-      const url = new URL('http://api.geonames.org/getJSON');
-      const params = { geonameId: id, username: 'roradmin' }; // or:
+      const url = new URL(env().GEONAMES_URL);
+      const username = env().GEONAMES_USERNAME
+      const params = { geonameId: id, username: username }; // or:
       url.search = new URLSearchParams(params).toString();
       const rootData = this.jsonforms?.core?.data;
       fetch(url.toString()).then((response) => {

src/components/NewRecord.vue

@@ -31,6 +31,7 @@ import  { langEntry } from './ShowLanguageRenderer.vue';
 import  { typeEntry } from './ShowTypes.vue';
 import  { genListEntry } from './GenerateListRenderer.vue';
 import { input as rorSchema } from "@/jsonSchema/rorSchema";
+import { env } from '../env';
 
 
 const renderers = [
@@ -56,7 +57,7 @@ export default defineComponent({
   data () {
     const data: Record<string, any> = {};
     const errors: any = ref(undefined)
-    const validForm: boolean = false
+    const validForm: boolean = false  
     return {
       // freeze renderers for performance gains
       renderers: Object.freeze(renderers),
@@ -72,7 +73,7 @@ export default defineComponent({
       this.index++
     },
     getRORId () {
-      const url = new URL(process.env.VUE_APP_GENERATE_ID)
+      const url = new URL(env().GENERATE_ID)
       return new Promise(resolve => { 
         fetch(url.toString()).then((response) => {
           if (response.ok) {

src/env.ts

@@ -0,0 +1,10 @@
+export const env = () => {
+    const {
+      VUE_APP_BASE_ROUTE: BASE_ROUTE = '/',
+      VUE_APP_GENERATE_ID: GENERATE_ID = 'http://localhost:5000/generateid?mode=dev',
+      VUE_APP_GEONAMES_URL: GEONAMES_URL = 'http://api.geonames.org/getJSON',
+      VUE_APP_GEONAMES_USERNAME: GEONAMES_USERNAME = 'roradmin',
+      NODE_ENV
+    } = process.env;
+    return { BASE_ROUTE, GENERATE_ID, GEONAMES_URL, GEONAMES_USERNAME, NODE_ENV };
+  };

src/jsonSchema/rorSchema/schema.json

@@ -82,6 +82,7 @@
               "license": {
                 "type": "object",
                 "additionalProperties": false,
+                "default": {},
                 "properties": {
                   "attribution": {
                     "readOnly": true,

src/jsonSchema/rorSchema/uischema.json

@@ -197,6 +197,27 @@
         }
       }
     },
+    {
+      "type": "HorizontalLayout",
+      "elements": [
+        {
+          "type": "Control",
+          "label": "License Attribution",
+          "scope": "#/properties/addresses/items/properties/geonames_city/properties/license/properties/attribution",
+          "rule": {
+            "effect": "HIDE"
+          }
+        },
+        {
+          "type": "Control",
+          "label": "License URL",
+          "scope": "#/properties/addresses/items/properties/geonames_city/properties/license/properties/license",
+          "rule": {
+            "effect": "HIDE"
+          }
+        }
+      ]
+    },
     {
       "type": "HorizontalLayout",
       "elements": [