aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--graphgraph-fe/src/GraphInfoMenu.js18
-rw-r--r--graphgraph-fe/src/GraphSettingsMenu.js2
-rw-r--r--src/main/java/org/onap/aai/graphgraph/reader/BasicSchemaReader.java3
3 files changed, 12 insertions, 11 deletions
diff --git a/graphgraph-fe/src/GraphInfoMenu.js b/graphgraph-fe/src/GraphInfoMenu.js
index 3f21194..d001d50 100644
--- a/graphgraph-fe/src/GraphInfoMenu.js
+++ b/graphgraph-fe/src/GraphInfoMenu.js
@@ -6,9 +6,6 @@ import ReactTable from "react-table";
import "react-table/react-table.css";
class GraphInfoMenu extends React.Component {
- constructor (props) {
- super(props)
- }
render () {
var paths = this.props.paths
@@ -27,30 +24,35 @@ class GraphInfoMenu extends React.Component {
{
Header: "Attribute",
accessor: "propertyName",
- minWidth: 50
+ minWidth: 40
+ },
+ {
+ Header: "Type",
+ accessor: "type",
+ minWidth: 70
},
{
Header: "Description",
accessor: "description",
- minWidth: 300
+ minWidth: 260
},
{
id: "Key",
Header: "Key",
accessor: p => p.key ? "yes" : "",
- minWidth: 30
+ minWidth: 20
},
{
id: "Index",
Header: "Index",
accessor: p => p.index ? "yes" : "",
- minWidth: 30
+ minWidth: 20
},
{
id: "Required",
Header: "Required",
accessor: p => p.required ? "yes" : "",
- minWidth: 30
+ minWidth: 20
}
]}
defaultPageSize={4}
diff --git a/graphgraph-fe/src/GraphSettingsMenu.js b/graphgraph-fe/src/GraphSettingsMenu.js
index 819537d..5ce1e12 100644
--- a/graphgraph-fe/src/GraphSettingsMenu.js
+++ b/graphgraph-fe/src/GraphSettingsMenu.js
@@ -1,6 +1,6 @@
import React from 'react'
import GraphSettings from './GraphSettings'
-import { Navbar, FormGroup, Nav } from 'react-bootstrap'
+import { Navbar, Nav } from 'react-bootstrap'
import './GraphSettingsMenu.css'
class GraphSettingsMenu extends React.Component {
diff --git a/src/main/java/org/onap/aai/graphgraph/reader/BasicSchemaReader.java b/src/main/java/org/onap/aai/graphgraph/reader/BasicSchemaReader.java
index a52a297..1c58550 100644
--- a/src/main/java/org/onap/aai/graphgraph/reader/BasicSchemaReader.java
+++ b/src/main/java/org/onap/aai/graphgraph/reader/BasicSchemaReader.java
@@ -157,7 +157,6 @@ public class BasicSchemaReader implements SchemaReader {
Introspector introspector = allEntities.get(nodeName);
List<String> properties = introspector.getProperties().stream()
- .filter(p -> !allEntities.containsKey(p))
.sorted()
.collect(Collectors.toList());
@@ -166,7 +165,7 @@ public class BasicSchemaReader implements SchemaReader {
p,
introspector.getPropertyMetadata(p)
.getOrDefault(PropertyMetadata.DESCRIPTION,"no description available"),
- "I don't know", //TODO how to get this information????
+ introspector.getType(p),
introspector.getAllKeys().contains(p),
introspector.getIndexedProperties().contains(p),
introspector.getRequiredProperties().contains(p))