fix: minor layout improvements

cznethub · Aug 24, 2024 · 660148f · 660148f
1 parent 1d6a07e
commit 660148f
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 54 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cznethub/cznet-vue-core",
-  "version": "0.2.20",
+  "version": "0.2.21",
   "private": false,
   "keywords": [
     "cznet",

diff --git a/src/renderers/controls/ObjectArrayVocabularyRenderer.vue b/src/renderers/controls/ObjectArrayVocabularyRenderer.vue
@@ -15,6 +15,7 @@
       :title="control.schema.title"
       :computedLabel="computedLabel"
       @show="noData && control.enabled ? addButtonClick() : null"
+      class="cz-fieldset"
       ref="fieldset"
     >
       <template #actions>
@@ -50,13 +51,11 @@
               :class="styles.arrayList.item"
               :key="index"
             >
-              <v-expansion-panel-title :class="styles.arrayList.itemHeader">
-                <div
-                  v-if="!hideAvatar"
-                  align-self="center"
-                  px-0
-                  class="flex-grow-0"
-                >
+              <v-expansion-panel-title
+                :class="styles.arrayList.itemHeader"
+                class="text-body-2"
+              >
+                <div v-if="!hideAvatar" class="flex-grow-0">
                   <v-chip aria-label="Index" class="bg-primary">
                     <span class="primary--text text--lighten-5">
                       {{ index + 1 }}
@@ -66,10 +65,8 @@
 
                 <div
                   v-if="appliedOptions.elementLabelProp"
-                  :title="getItemLabel(element)"
-                  align-self="center"
-                  justify-self="start"
                   class="text-truncate flex-grow-1"
+                  :title="getItemLabel(element)"
                 >
                   {{ getItemLabel(element) }}
                 </div>
@@ -518,7 +515,6 @@ export default defineComponent({
   methods: {
     getDisplayElements(index: number) {
       return this.displayProps.map(prop => {
-        console.log(this.deepValue(this.control.data[index], prop));
         return {
           label:
             this.deepValue(
@@ -753,4 +749,14 @@ export default defineComponent({
   padding: 4rem;
   background: #efefef;
 }
+
+.cz-fieldset {
+  :deep(.v-field__field) {
+    width: 0;
+  }
+
+  :deep(.v-expansion-panel-title__overlay) {
+    display: none;
+  }
+}
 </style>
diff --git a/src/renderers/layouts/ArrayLayoutRenderer.vue b/src/renderers/layouts/ArrayLayoutRenderer.vue
@@ -54,7 +54,10 @@
               :class="styles.arrayList.item"
               :key="index"
             >
-              <v-expansion-panel-title :class="styles.arrayList.itemHeader">
+              <v-expansion-panel-title
+                :class="styles.arrayList.itemHeader"
+                class="text-body-2"
+              >
                 <div
                   v-if="!hideAvatar"
                   align-self="center"

diff --git a/src/schemas/schema.json b/src/schemas/schema.json
@@ -220,34 +220,17 @@
           "id": {
             "type": "string"
           },
-          "funder": {
-            "title": "Funding Organization",
-            "type": "object",
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "name": {
-                "title": "Funding Organization",
-                "type": "string"
-              }
-            }
+          "number": {
+            "title": "Award Number",
+            "type": "string"
           },
-          "award": {
-            "title": "Award",
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "number": {
-                "type": "string",
-                "title": "Award/Grant Number"
-              },
-              "title": {
-                "type": "string",
-                "title": "Award/Grant Title"
-              }
-            }
+          "title": {
+            "title": "Award Title",
+            "type": "string"
+          },
+          "fundingAgency": {
+            "title": "Funding Agency Name",
+            "type": "string"
           }
         }
       }

diff --git a/src/schemas/test-dataset.json b/src/schemas/test-dataset.json
@@ -1,10 +1,16 @@
 {
   "grants": [
     {
-      "id": "10.13039/100000001::650S652"
+      "id": "021nxhr62::1331846",
+      "title": "Human and Natural Forcings of Critical Zone Dynamics and Evolution at the Calhoun Critical Zone Observatory",
+      "number": "1331846",
+      "fundingAgency": "National Science Foundation"
     },
     {
-      "id": "10.13039/100000001::67S1465"
+      "id": "021nxhr62::1037387",
+      "title": "RAPID: Susquehanna Shale Hills Critical Zone Observatory - The Critical Zone in the Susquehanna River Basin: The Shale Experiment",
+      "number": "1037387",
+      "fundingAgency": "National Science Foundation"
     }
   ]
 }
diff --git a/src/schemas/uischema.json b/src/schemas/uischema.json
@@ -3,7 +3,7 @@
   "scope": "#/properties/grants",
   "options": {
     "showSortButtons": true,
-    "elementLabelProp": "award.title",
+    "elementLabelProp": "title",
     "childLabelProp": "-",
     "vocabulary": {
       "jsonUrl": "https://zenodo.org/api/awards?page=1&size=5000000",
@@ -13,23 +13,16 @@
       "items": "hits.hits",
       "value": {
         "id": {
-          "contents": "id"
-        },
-        "award.id": {
           "contents": "id",
           "hidden": true
         },
-        "award.title": {
+        "title": {
           "contents": "title.en"
         },
-        "award.number": {
+        "number": {
           "contents": "number"
         },
-        "funder.id": {
-          "contents": "funder.id",
-          "hidden": true
-        },
-        "funder.name": {
+        "fundingAgency": {
           "contents": "funder.name"
         }
       }

diff --git a/stats.html b/stats.html