Merge pull request #14 from molgenis/fix/small-issues

feature: do not display empty rows and columns
molgenis · Jun 23, 2020 · a43e3af · a43e3af
2 parents 801b0a5 + 1bdd53f
commit a43e3af
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/src/components/RecordInfoDetails.vue b/src/components/RecordInfoDetails.vue
@@ -2,10 +2,10 @@
     <div>
         <RecordInfoUnnestedDetails :metadata="unnestedMetadata" :info="info" />
         <div v-for="metadata in nestedMetadata" :key="metadata.key">
-            <h5>
+            <h4>
                 {{ metadata.id }}
                 <InfoButton :info="metadata.description" />
-            </h5>
+            </h4>
             <RecordInfoNestedDetails :metadata="metadata.nested" :info="getNestedInfo(metadata)" />
         </div>
     </div>

diff --git a/src/components/RecordInfoNestedDetails.vue b/src/components/RecordInfoNestedDetails.vue
@@ -40,7 +40,10 @@
                 const fields = []
                 let index = 0
                 for (const info of this.metadata) {
-                    fields.push({key: info.id, label: info.description, index: index, metadata: info})
+                    // @ts-ignore
+                    if(this.hasData(index)) {
+                        fields.push({key: info.id, label: info.description, index: index, metadata: info})
+                    }
                     ++index
                 }
                 return fields
@@ -50,12 +53,15 @@
             }
         },
         methods: {
-            getInfoMetadata(key: string): InfoMetadata {
-                const infoMetadata = this.metadata.find(item => item.id === key)
-                if (infoMetadata === undefined) {
-                    throw new Error('missing info metadata for \'' + key + '\'')
+            hasData(index: number): boolean {
+                for (let item of this.info) {
+                    // @ts-ignore
+                    if(!(item[index] === null || (Array.isArray(item[index]) && item[index].length === 0))) {
+                        return true
+                    }
                 }
-                return infoMetadata
+
+                return false
             }
         }
     })

diff --git a/src/components/RecordInfoUnnestedDetails.vue b/src/components/RecordInfoUnnestedDetails.vue
@@ -47,8 +47,11 @@
                 const items: object[] = []
                 for (let metadata of this.metadata) {
                     // @ts-ignore
-                    const item = {key: metadata.id, val: this.info[metadata.id], metadata: metadata}
-                    items.push(item)
+                    if(this.info[metadata.id] !== undefined) {
+                        // @ts-ignore
+                        const item = {key: metadata.id, val: this.info[metadata.id], metadata: metadata}
+                        items.push(item)
+                    }
                 }
                 items.sort(function (thisItem, thatItem) {
                     // @ts-ignore