diff --git a/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/hierarchicalgraph/Dependency.java b/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/hierarchicalgraph/Dependency.java index 07444be..e3adf43 100644 --- a/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/hierarchicalgraph/Dependency.java +++ b/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/hierarchicalgraph/Dependency.java @@ -21,6 +21,7 @@ import io.codekontor.slizaa.hierarchicalgraph.core.model.AbstractHGDependency; import io.codekontor.slizaa.hierarchicalgraph.core.model.HGAggregatedDependency; import io.codekontor.slizaa.hierarchicalgraph.core.model.HGCoreDependency; +import io.codekontor.slizaa.hierarchicalgraph.core.model.HGProxyDependency; /** * @@ -54,4 +55,8 @@ public String getType() { ((HGCoreDependency) _hgDependency).getType() : AGGREGATED_DEPENDENCY_TYPE; } + + public boolean isProxyDependency() { + return _hgDependency instanceof HGProxyDependency; + } } diff --git a/slizaa-server/slizaa-server-graphql/src/main/resources/slizaa-hierachicalgraph.graphqls b/slizaa-server/slizaa-server-graphql/src/main/resources/slizaa-hierachicalgraph.graphqls index 366e142..8b4f59b 100644 --- a/slizaa-server/slizaa-server-graphql/src/main/resources/slizaa-hierachicalgraph.graphqls +++ b/slizaa-server/slizaa-server-graphql/src/main/resources/slizaa-hierachicalgraph.graphqls @@ -72,7 +72,8 @@ type Dependency { sourceNode: Node! targetNode: Node! type: String! - weight: Int + weight: Int! + isProxyDependency: Boolean! } type DependencyMatrix { diff --git a/slizaa-web/app/schema/graphql-schema.json b/slizaa-web/app/schema/graphql-schema.json index 0e18b01..e3160e3 100644 --- a/slizaa-web/app/schema/graphql-schema.json +++ b/slizaa-web/app/schema/graphql-schema.json @@ -14,8 +14,8 @@ "description": "The Query type", "fields": [ { - "name": "availableServerExtensions", - "description": "Returns the available server extensions", + "name": "contentDefinitionTypes", + "description": "", "args": [], "type": { "kind": "NON_NULL", @@ -24,9 +24,13 @@ "kind": "LIST", "name": null, "ofType": { - "kind": "OBJECT", - "name": "ServerExtension", - "ofType": null + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "ContentDefinitionType", + "ofType": null + } } } }, @@ -34,7 +38,7 @@ "deprecationReason": null }, { - "name": "contentDefinitionTypes", + "name": "graphDatabases", "description": "", "args": [], "type": { @@ -48,7 +52,7 @@ "name": null, "ofType": { "kind": "OBJECT", - "name": "ContentDefinitionType", + "name": "GraphDatabase", "ofType": null } } @@ -84,30 +88,6 @@ "isDeprecated": false, "deprecationReason": null }, - { - "name": "graphDatabases", - "description": "", - "args": [], - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "LIST", - "name": null, - "ofType": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "OBJECT", - "name": "GraphDatabase", - "ofType": null - } - } - } - }, - "isDeprecated": false, - "deprecationReason": null - }, { "name": "hierarchicalGraph", "description": "", @@ -149,22 +129,6 @@ "isDeprecated": false, "deprecationReason": null }, - { - "name": "serverConfiguration", - "description": "Returns the server configuration", - "args": [], - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "OBJECT", - "name": "ServerConfiguration", - "ofType": null - } - }, - "isDeprecated": false, - "deprecationReason": null - }, { "name": "svg", "description": "", @@ -195,6 +159,22 @@ }, "isDeprecated": false, "deprecationReason": null + }, + { + "name": "serverConfiguration", + "description": "Returns the server configuration", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "ServerConfiguration", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null } ], "inputFields": null, @@ -204,12 +184,12 @@ }, { "kind": "OBJECT", - "name": "ServerExtension", - "description": "Represents a server extension", + "name": "ContentDefinitionType", + "description": "", "fields": [ { - "name": "symbolicName", - "description": "the symbolic name of the extension", + "name": "identifier", + "description": "", "args": [], "type": { "kind": "NON_NULL", @@ -224,8 +204,8 @@ "deprecationReason": null }, { - "name": "version", - "description": "the version of the extension", + "name": "name", + "description": "", "args": [], "type": { "kind": "NON_NULL", @@ -238,6 +218,18 @@ }, "isDeprecated": false, "deprecationReason": null + }, + { + "name": "description", + "description": "", + "args": [], + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null } ], "inputFields": null, @@ -267,21 +259,9 @@ }, { "kind": "OBJECT", - "name": "ContentDefinitionType", + "name": "GraphDatabase", "description": "", "fields": [ - { - "name": "description", - "description": "", - "args": [], - "type": { - "kind": "SCALAR", - "name": "String", - "ofType": null - }, - "isDeprecated": false, - "deprecationReason": null - }, { "name": "identifier", "description": "", @@ -299,7 +279,7 @@ "deprecationReason": null }, { - "name": "name", + "name": "state", "description": "", "args": [], "type": { @@ -313,18 +293,7 @@ }, "isDeprecated": false, "deprecationReason": null - } - ], - "inputFields": null, - "interfaces": [], - "enumValues": null, - "possibleTypes": null - }, - { - "kind": "OBJECT", - "name": "GraphDatabase", - "description": "", - "fields": [ + }, { "name": "availableActions", "description": "", @@ -350,39 +319,28 @@ "deprecationReason": null }, { - "name": "contentDefinition", + "name": "port", "description": "", "args": [], "type": { - "kind": "OBJECT", - "name": "ContentDefinition", - "ofType": null + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "Int", + "ofType": null + } }, "isDeprecated": false, "deprecationReason": null }, { - "name": "hierarchicalGraph", + "name": "contentDefinition", "description": "", - "args": [ - { - "name": "identifier", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null - } - }, - "defaultValue": null - } - ], + "args": [], "type": { "kind": "OBJECT", - "name": "HierarchicalGraph", + "name": "ContentDefinition", "ofType": null }, "isDeprecated": false, @@ -413,31 +371,63 @@ "deprecationReason": null }, { - "name": "identifier", + "name": "hierarchicalGraph", "description": "", - "args": [], - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null + "args": [ + { + "name": "identifier", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "ID", + "ofType": null + } + }, + "defaultValue": null } + ], + "type": { + "kind": "OBJECT", + "name": "HierarchicalGraph", + "ofType": null }, "isDeprecated": false, "deprecationReason": null - }, + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "SCALAR", + "name": "Int", + "description": "The `Int` scalar type represents non-fractional signed whole numeric values. Int can represent values between -(2^31) and 2^31 - 1.", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "ContentDefinition", + "description": "", + "fields": [ { - "name": "port", + "name": "type", "description": "", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "SCALAR", - "name": "Int", + "kind": "OBJECT", + "name": "ContentDefinitionType", "ofType": null } }, @@ -445,7 +435,7 @@ "deprecationReason": null }, { - "name": "state", + "name": "definition", "description": "", "args": [], "type": { @@ -468,19 +458,19 @@ }, { "kind": "OBJECT", - "name": "ContentDefinition", + "name": "HierarchicalGraph", "description": "", "fields": [ { - "name": "definition", - "description": "", + "name": "identifier", + "description": "Returns the identifier", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { "kind": "SCALAR", - "name": "String", + "name": "ID", "ofType": null } }, @@ -488,42 +478,109 @@ "deprecationReason": null }, { - "name": "type", - "description": "", + "name": "globalIdentifier", + "description": "Returns the identifier", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "OBJECT", - "name": "ContentDefinitionType", + "kind": "SCALAR", + "name": "ID", "ofType": null } }, "isDeprecated": false, "deprecationReason": null - } - ], - "inputFields": null, - "interfaces": [], - "enumValues": null, - "possibleTypes": null - }, - { - "kind": "OBJECT", - "name": "HierarchicalGraph", - "description": "", - "fields": [ + }, { - "name": "dependencySetForAggregatedDependency", - "description": "Returns a dependency set based on an aggregated dependency", - "args": [ - { - "name": "sourceNodeId", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, + "name": "rootNode", + "description": "Returns the root node", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "Node", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "node", + "description": "Returns the node with the given id", + "args": [ + { + "name": "id", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "ID", + "ofType": null + } + }, + "defaultValue": null + } + ], + "type": { + "kind": "OBJECT", + "name": "Node", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "nodes", + "description": "Returns the nodes with the given ids", + "args": [ + { + "name": "ids", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "ID", + "ofType": null + } + } + }, + "defaultValue": null + } + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "NodeSet", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "dependencySetForAggregatedDependency", + "description": "Returns a dependency set based on an aggregated dependency", + "args": [ + { + "name": "sourceNodeId", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, "ofType": { "kind": "SCALAR", "name": "ID", @@ -554,10 +611,21 @@ }, "isDeprecated": false, "deprecationReason": null - }, + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "Node", + "description": "", + "fields": [ { - "name": "globalIdentifier", - "description": "Returns the identifier", + "name": "id", + "description": "The symbolicName for this node", "args": [], "type": { "kind": "NON_NULL", @@ -572,15 +640,15 @@ "deprecationReason": null }, { - "name": "identifier", - "description": "Returns the identifier", + "name": "text", + "description": "The text label", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { "kind": "SCALAR", - "name": "ID", + "name": "String", "ofType": null } }, @@ -588,24 +656,25 @@ "deprecationReason": null }, { - "name": "node", - "description": "Returns the node with the given id", - "args": [ - { - "name": "id", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null - } - }, - "defaultValue": null + "name": "iconIdentifier", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "String", + "ofType": null } - ], + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "parent", + "description": "The parent node", + "args": [], "type": { "kind": "OBJECT", "name": "Node", @@ -615,34 +684,39 @@ "deprecationReason": null }, { - "name": "nodes", - "description": "Returns the nodes with the given ids", - "args": [ - { - "name": "ids", - "description": "", - "type": { + "name": "predecessors", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "LIST", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null - } + "kind": "OBJECT", + "name": "Node", + "ofType": null } - }, - "defaultValue": null + } } - ], + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hasChildren", + "description": "", + "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "OBJECT", - "name": "NodeSet", + "kind": "SCALAR", + "name": "Boolean", "ofType": null } }, @@ -650,34 +724,23 @@ "deprecationReason": null }, { - "name": "rootNode", - "description": "Returns the root node", + "name": "children", + "description": "The children", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { "kind": "OBJECT", - "name": "Node", + "name": "NodeSet", "ofType": null } }, "isDeprecated": false, "deprecationReason": null - } - ], - "inputFields": null, - "interfaces": [], - "enumValues": null, - "possibleTypes": null - }, - { - "kind": "OBJECT", - "name": "DependencySet", - "description": "", - "fields": [ + }, { - "name": "dependencies", + "name": "properties", "description": "", "args": [], "type": { @@ -691,7 +754,7 @@ "name": null, "ofType": { "kind": "OBJECT", - "name": "Dependency", + "name": "MapEntry", "ofType": null } } @@ -701,33 +764,27 @@ "deprecationReason": null }, { - "name": "filteredChildren", - "description": "Returns a set of nodes filtered by the specified node type.", + "name": "dependenciesTo", + "description": "", "args": [ { - "name": "parentNode", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null - } - }, - "defaultValue": null - }, - { - "name": "parentNodeType", + "name": "targetNodes", "description": "", "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "ENUM", - "name": "NodeType", - "ofType": null + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "ID", + "ofType": null + } + } } }, "defaultValue": null @@ -744,7 +801,7 @@ "name": null, "ofType": { "kind": "OBJECT", - "name": "Node", + "name": "Dependency", "ofType": null } } @@ -754,33 +811,27 @@ "deprecationReason": null }, { - "name": "filteredChildrenIds", + "name": "dependenciesFrom", "description": "", "args": [ { - "name": "parentNode", + "name": "sourceNodes", "description": "", "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null - } - }, - "defaultValue": null - }, - { - "name": "parentNodeType", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "ENUM", - "name": "NodeType", - "ofType": null + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "ID", + "ofType": null + } + } } }, "defaultValue": null @@ -796,8 +847,8 @@ "kind": "NON_NULL", "name": null, "ofType": { - "kind": "SCALAR", - "name": "String", + "kind": "OBJECT", + "name": "Dependency", "ofType": null } } @@ -805,54 +856,86 @@ }, "isDeprecated": false, "deprecationReason": null - }, + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "SCALAR", + "name": "Boolean", + "description": "The `Boolean` scalar type represents `true` or `false`.", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "NodeSet", + "description": "", + "fields": [ { - "name": "filteredDependencies", - "description": "", - "args": [ - { - "name": "selectedNodes", - "description": "", - "type": { + "name": "nodes", + "description": "contained nodes as node array", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "LIST", - "name": null, - "ofType": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null - } - } + "kind": "OBJECT", + "name": "Node", + "ofType": null } - }, - "defaultValue": null - }, - { - "name": "selectedNodesType", - "description": "", - "type": { + } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "nodeIds", + "description": "the node ids as an array", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "ENUM", - "name": "NodeType", + "kind": "SCALAR", + "name": "ID", "ofType": null } - }, - "defaultValue": null + } } - ], + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "dependencyMatrix", + "description": "the dependency matrix", + "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { "kind": "OBJECT", - "name": "DependencySet", + "name": "DependencyMatrix", "ofType": null } }, @@ -860,11 +943,11 @@ "deprecationReason": null }, { - "name": "nodeIds", + "name": "referencedNodes", "description": "", "args": [ { - "name": "includedPredecessors", + "name": "includePredecessors", "description": "", "type": { "kind": "SCALAR", @@ -872,22 +955,35 @@ "ofType": null }, "defaultValue": null - }, - { - "name": "nodeType", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "ENUM", - "name": "NodeType", - "ofType": null - } - }, - "defaultValue": null } ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "NodeSet", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "DependencyMatrix", + "description": "", + "fields": [ + { + "name": "orderedNodes", + "description": "", + "args": [], "type": { "kind": "NON_NULL", "name": null, @@ -898,8 +994,8 @@ "kind": "NON_NULL", "name": null, "ofType": { - "kind": "SCALAR", - "name": "String", + "kind": "OBJECT", + "name": "Node", "ofType": null } } @@ -909,34 +1005,9 @@ "deprecationReason": null }, { - "name": "nodes", + "name": "cells", "description": "", - "args": [ - { - "name": "includedPredecessors", - "description": "", - "type": { - "kind": "SCALAR", - "name": "Boolean", - "ofType": null - }, - "defaultValue": null - }, - { - "name": "nodeType", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "ENUM", - "name": "NodeType", - "ofType": null - } - }, - "defaultValue": null - } - ], + "args": [], "type": { "kind": "NON_NULL", "name": null, @@ -948,7 +1019,7 @@ "name": null, "ofType": { "kind": "OBJECT", - "name": "Node", + "name": "Cell", "ofType": null } } @@ -958,56 +1029,9 @@ "deprecationReason": null }, { - "name": "referencedNodeIds", + "name": "stronglyConnectedComponents", "description": "", - "args": [ - { - "name": "includedPredecessors", - "description": "", - "type": { - "kind": "SCALAR", - "name": "Boolean", - "ofType": null - }, - "defaultValue": null - }, - { - "name": "selectedNodes", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "LIST", - "name": null, - "ofType": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null - } - } - } - }, - "defaultValue": null - }, - { - "name": "selectedNodesType", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "ENUM", - "name": "NodeType", - "ofType": null - } - }, - "defaultValue": null - } - ], + "args": [], "type": { "kind": "NON_NULL", "name": null, @@ -1018,8 +1042,8 @@ "kind": "NON_NULL", "name": null, "ofType": { - "kind": "SCALAR", - "name": "String", + "kind": "OBJECT", + "name": "StronglyConnectedComponent", "ofType": null } } @@ -1027,93 +1051,6 @@ }, "isDeprecated": false, "deprecationReason": null - }, - { - "name": "referencedNodes", - "description": "", - "args": [ - { - "name": "includedPredecessors", - "description": "", - "type": { - "kind": "SCALAR", - "name": "Boolean", - "ofType": null - }, - "defaultValue": null - }, - { - "name": "selectedNodes", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "LIST", - "name": null, - "ofType": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null - } - } - } - }, - "defaultValue": null - }, - { - "name": "selectedNodesType", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "ENUM", - "name": "NodeType", - "ofType": null - } - }, - "defaultValue": null - } - ], - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "LIST", - "name": null, - "ofType": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "OBJECT", - "name": "Node", - "ofType": null - } - } - } - }, - "isDeprecated": false, - "deprecationReason": null - }, - { - "name": "size", - "description": "", - "args": [], - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "Int", - "ofType": null - } - }, - "isDeprecated": false, - "deprecationReason": null } ], "inputFields": null, @@ -1123,19 +1060,19 @@ }, { "kind": "OBJECT", - "name": "Dependency", + "name": "Cell", "description": "", "fields": [ { - "name": "sourceNode", + "name": "row", "description": "", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "OBJECT", - "name": "Node", + "kind": "SCALAR", + "name": "Int", "ofType": null } }, @@ -1143,15 +1080,15 @@ "deprecationReason": null }, { - "name": "targetNode", + "name": "column", "description": "", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "OBJECT", - "name": "Node", + "kind": "SCALAR", + "name": "Int", "ofType": null } }, @@ -1159,13 +1096,17 @@ "deprecationReason": null }, { - "name": "weight", + "name": "value", "description": "", "args": [], "type": { - "kind": "SCALAR", - "name": "Int", - "ofType": null + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "Int", + "ofType": null + } }, "isDeprecated": false, "deprecationReason": null @@ -1178,52 +1119,37 @@ }, { "kind": "OBJECT", - "name": "Node", + "name": "StronglyConnectedComponent", "description": "", "fields": [ { - "name": "children", - "description": "The children", + "name": "nodes", + "description": "contained nodes as node array", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "OBJECT", - "name": "NodeSet", - "ofType": null + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "Node", + "ofType": null + } + } } }, "isDeprecated": false, "deprecationReason": null }, { - "name": "dependenciesFrom", - "description": "", - "args": [ - { - "name": "sourceNodes", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "LIST", - "name": null, - "ofType": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null - } - } - } - }, - "defaultValue": null - } - ], + "name": "nodeIds", + "description": "the node ids as an array", + "args": [], "type": { "kind": "NON_NULL", "name": null, @@ -1234,8 +1160,8 @@ "kind": "NON_NULL", "name": null, "ofType": { - "kind": "OBJECT", - "name": "Dependency", + "kind": "SCALAR", + "name": "ID", "ofType": null } } @@ -1245,32 +1171,9 @@ "deprecationReason": null }, { - "name": "dependenciesTo", + "name": "nodePositions", "description": "", - "args": [ - { - "name": "targetNodes", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "LIST", - "name": null, - "ofType": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null - } - } - } - }, - "defaultValue": null - } - ], + "args": [], "type": { "kind": "NON_NULL", "name": null, @@ -1281,8 +1184,8 @@ "kind": "NON_NULL", "name": null, "ofType": { - "kind": "OBJECT", - "name": "Dependency", + "kind": "SCALAR", + "name": "Int", "ofType": null } } @@ -1290,9 +1193,20 @@ }, "isDeprecated": false, "deprecationReason": null - }, + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "MapEntry", + "description": "", + "fields": [ { - "name": "hasChildren", + "name": "key", "description": "", "args": [], "type": { @@ -1300,7 +1214,7 @@ "name": null, "ofType": { "kind": "SCALAR", - "name": "Boolean", + "name": "String", "ofType": null } }, @@ -1308,15 +1222,38 @@ "deprecationReason": null }, { - "name": "iconIdentifier", + "name": "value", + "description": "", + "args": [], + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "Dependency", + "description": "", + "fields": [ + { + "name": "sourceNode", "description": "", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "SCALAR", - "name": "String", + "kind": "OBJECT", + "name": "Node", "ofType": null } }, @@ -1324,15 +1261,15 @@ "deprecationReason": null }, { - "name": "id", - "description": "The symbolicName for this node", + "name": "targetNode", + "description": "", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "SCALAR", - "name": "ID", + "kind": "OBJECT", + "name": "Node", "ofType": null } }, @@ -1340,75 +1277,47 @@ "deprecationReason": null }, { - "name": "parent", - "description": "The parent node", - "args": [], - "type": { - "kind": "OBJECT", - "name": "Node", - "ofType": null - }, - "isDeprecated": false, - "deprecationReason": null - }, - { - "name": "predecessors", - "description": "", + "name": "type", + "description": "", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "LIST", - "name": null, - "ofType": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "OBJECT", - "name": "Node", - "ofType": null - } - } + "kind": "SCALAR", + "name": "String", + "ofType": null } }, "isDeprecated": false, "deprecationReason": null }, { - "name": "properties", + "name": "weight", "description": "", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "LIST", - "name": null, - "ofType": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "OBJECT", - "name": "MapEntry", - "ofType": null - } - } + "kind": "SCALAR", + "name": "Int", + "ofType": null } }, "isDeprecated": false, "deprecationReason": null }, { - "name": "text", - "description": "The text label", + "name": "isProxyDependency", + "description": "", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { "kind": "SCALAR", - "name": "String", + "name": "Boolean", "ofType": null } }, @@ -1423,28 +1332,12 @@ }, { "kind": "OBJECT", - "name": "NodeSet", + "name": "DependencySet", "description": "", "fields": [ { - "name": "dependencyMatrix", - "description": "the dependency matrix", - "args": [], - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "OBJECT", - "name": "DependencyMatrix", - "ofType": null - } - }, - "isDeprecated": false, - "deprecationReason": null - }, - { - "name": "nodeIds", - "description": "the node ids as an array", + "name": "dependencies", + "description": "", "args": [], "type": { "kind": "NON_NULL", @@ -1456,8 +1349,8 @@ "kind": "NON_NULL", "name": null, "ofType": { - "kind": "SCALAR", - "name": "ID", + "kind": "OBJECT", + "name": "Dependency", "ofType": null } } @@ -1467,25 +1360,58 @@ "deprecationReason": null }, { - "name": "nodes", - "description": "contained nodes as node array", + "name": "size", + "description": "", "args": [], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "LIST", - "name": null, - "ofType": { + "kind": "SCALAR", + "name": "Int", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "dependencyPage", + "description": "Returns a dependency page with with the specified size", + "args": [ + { + "name": "pageNumber", + "description": "", + "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "OBJECT", - "name": "Node", + "kind": "SCALAR", + "name": "Int", "ofType": null } - } + }, + "defaultValue": null + }, + { + "name": "pageSize", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "Int", + "ofType": null + } + }, + "defaultValue": null } + ], + "type": { + "kind": "OBJECT", + "name": "DependencyPage", + "ofType": null }, "isDeprecated": false, "deprecationReason": null @@ -1495,7 +1421,43 @@ "description": "", "args": [ { - "name": "includePredecessors", + "name": "selectedNodes", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "ID", + "ofType": null + } + } + } + }, + "defaultValue": null + }, + { + "name": "selectedNodesType", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "ENUM", + "name": "NodeType", + "ofType": null + } + }, + "defaultValue": null + }, + { + "name": "includedPredecessors", "description": "", "type": { "kind": "SCALAR", @@ -1505,33 +1467,6 @@ "defaultValue": null } ], - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "OBJECT", - "name": "NodeSet", - "ofType": null - } - }, - "isDeprecated": false, - "deprecationReason": null - } - ], - "inputFields": null, - "interfaces": [], - "enumValues": null, - "possibleTypes": null - }, - { - "kind": "OBJECT", - "name": "DependencyMatrix", - "description": "", - "fields": [ - { - "name": "cells", - "description": "", - "args": [], "type": { "kind": "NON_NULL", "name": null, @@ -1543,7 +1478,7 @@ "name": null, "ofType": { "kind": "OBJECT", - "name": "Cell", + "name": "Node", "ofType": null } } @@ -1553,9 +1488,56 @@ "deprecationReason": null }, { - "name": "orderedNodes", + "name": "referencedNodeIds", "description": "", - "args": [], + "args": [ + { + "name": "selectedNodes", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "ID", + "ofType": null + } + } + } + }, + "defaultValue": null + }, + { + "name": "selectedNodesType", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "ENUM", + "name": "NodeType", + "ofType": null + } + }, + "defaultValue": null + }, + { + "name": "includedPredecessors", + "description": "", + "type": { + "kind": "SCALAR", + "name": "Boolean", + "ofType": null + }, + "defaultValue": null + } + ], "type": { "kind": "NON_NULL", "name": null, @@ -1566,8 +1548,8 @@ "kind": "NON_NULL", "name": null, "ofType": { - "kind": "OBJECT", - "name": "Node", + "kind": "SCALAR", + "name": "String", "ofType": null } } @@ -1577,50 +1559,52 @@ "deprecationReason": null }, { - "name": "stronglyConnectedComponents", + "name": "filteredDependencies", "description": "", - "args": [], - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "LIST", - "name": null, - "ofType": { + "args": [ + { + "name": "selectedNodes", + "description": "", + "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "OBJECT", - "name": "StronglyConnectedComponent", + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "ID", + "ofType": null + } + } + } + }, + "defaultValue": null + }, + { + "name": "selectedNodesType", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "ENUM", + "name": "NodeType", "ofType": null } - } + }, + "defaultValue": null } - }, - "isDeprecated": false, - "deprecationReason": null - } - ], - "inputFields": null, - "interfaces": [], - "enumValues": null, - "possibleTypes": null - }, - { - "kind": "OBJECT", - "name": "Cell", - "description": "", - "fields": [ - { - "name": "column", - "description": "", - "args": [], + ], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "SCALAR", - "name": "Int", + "kind": "OBJECT", + "name": "DependencySet", "ofType": null } }, @@ -1628,62 +1612,91 @@ "deprecationReason": null }, { - "name": "row", - "description": "", - "args": [], + "name": "filteredChildren", + "description": "Returns a set of nodes filtered by the specified node type.", + "args": [ + { + "name": "parentNode", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "ID", + "ofType": null + } + }, + "defaultValue": null + }, + { + "name": "parentNodeType", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "ENUM", + "name": "NodeType", + "ofType": null + } + }, + "defaultValue": null + } + ], "type": { "kind": "NON_NULL", "name": null, "ofType": { - "kind": "SCALAR", - "name": "Int", - "ofType": null + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "Node", + "ofType": null + } + } } }, "isDeprecated": false, "deprecationReason": null }, { - "name": "value", + "name": "filteredChildrenIds", "description": "", - "args": [], - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "Int", - "ofType": null - } - }, - "isDeprecated": false, - "deprecationReason": null - } - ], - "inputFields": null, - "interfaces": [], - "enumValues": null, - "possibleTypes": null - }, - { - "kind": "SCALAR", - "name": "Int", - "description": "The `Int` scalar type represents non-fractional signed whole numeric values. Int can represent values between -(2^31) and 2^31 - 1.", - "fields": null, - "inputFields": null, - "interfaces": null, - "enumValues": null, - "possibleTypes": null - }, - { - "kind": "OBJECT", - "name": "StronglyConnectedComponent", - "description": "", - "fields": [ - { - "name": "nodeIds", - "description": "the node ids as an array", - "args": [], + "args": [ + { + "name": "parentNode", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "ID", + "ofType": null + } + }, + "defaultValue": null + }, + { + "name": "parentNodeType", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "ENUM", + "name": "NodeType", + "ofType": null + } + }, + "defaultValue": null + } + ], "type": { "kind": "NON_NULL", "name": null, @@ -1695,7 +1708,7 @@ "name": null, "ofType": { "kind": "SCALAR", - "name": "ID", + "name": "String", "ofType": null } } @@ -1703,34 +1716,33 @@ }, "isDeprecated": false, "deprecationReason": null - }, + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "DependencyPage", + "description": "", + "fields": [ { - "name": "nodePositions", + "name": "pageInfo", "description": "", "args": [], "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "LIST", - "name": null, - "ofType": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "Int", - "ofType": null - } - } - } + "kind": "OBJECT", + "name": "PageInfo", + "ofType": null }, "isDeprecated": false, "deprecationReason": null }, { - "name": "nodes", - "description": "contained nodes as node array", + "name": "dependencies", + "description": "", "args": [], "type": { "kind": "NON_NULL", @@ -1743,7 +1755,7 @@ "name": null, "ofType": { "kind": "OBJECT", - "name": "Node", + "name": "Dependency", "ofType": null } } @@ -1758,23 +1770,13 @@ "enumValues": null, "possibleTypes": null }, - { - "kind": "SCALAR", - "name": "Boolean", - "description": "The `Boolean` scalar type represents `true` or `false`.", - "fields": null, - "inputFields": null, - "interfaces": null, - "enumValues": null, - "possibleTypes": null - }, { "kind": "OBJECT", - "name": "MapEntry", + "name": "PageInfo", "description": "", "fields": [ { - "name": "key", + "name": "pageNumber", "description": "", "args": [], "type": { @@ -1782,7 +1784,7 @@ "name": null, "ofType": { "kind": "SCALAR", - "name": "String", + "name": "Int", "ofType": null } }, @@ -1790,13 +1792,49 @@ "deprecationReason": null }, { - "name": "value", + "name": "maxPages", "description": "", "args": [], "type": { - "kind": "SCALAR", - "name": "String", - "ofType": null + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "Int", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "pageSize", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "Int", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "totalCount", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "Int", + "ofType": null + } }, "isDeprecated": false, "deprecationReason": null @@ -1877,6 +1915,49 @@ "enumValues": null, "possibleTypes": null }, + { + "kind": "OBJECT", + "name": "ServerExtension", + "description": "Represents a server extension", + "fields": [ + { + "name": "symbolicName", + "description": "the symbolic name of the extension", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "ID", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "version", + "description": "the version of the extension", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "String", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, { "kind": "OBJECT", "name": "Mutation", @@ -1914,7 +1995,7 @@ "deprecationReason": null }, { - "name": "createHierarchicalGraph", + "name": "parseGraphDatabase", "description": "", "args": [ { @@ -1930,20 +2011,6 @@ } }, "defaultValue": null - }, - { - "name": "hierarchicalGraphId", - "description": "", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null - } - }, - "defaultValue": null } ], "type": { @@ -1959,7 +2026,7 @@ "deprecationReason": null }, { - "name": "deleteGraphDatabase", + "name": "startGraphDatabase", "description": "", "args": [ { @@ -1990,18 +2057,18 @@ "deprecationReason": null }, { - "name": "installServerExtensions", - "description": "Installs the specified server extensions.", + "name": "stopGraphDatabase", + "description": "", "args": [ { - "name": "extensions", + "name": "databaseId", "description": "", "type": { - "kind": "LIST", + "kind": "NON_NULL", "name": null, "ofType": { - "kind": "INPUT_OBJECT", - "name": "ServerExtensionIdentifier", + "kind": "SCALAR", + "name": "ID", "ofType": null } }, @@ -2012,20 +2079,16 @@ "kind": "NON_NULL", "name": null, "ofType": { - "kind": "LIST", - "name": null, - "ofType": { - "kind": "OBJECT", - "name": "ServerExtension", - "ofType": null - } + "kind": "OBJECT", + "name": "GraphDatabase", + "ofType": null } }, "isDeprecated": false, "deprecationReason": null }, { - "name": "parseGraphDatabase", + "name": "deleteGraphDatabase", "description": "", "args": [ { @@ -2060,14 +2123,14 @@ "description": "", "args": [ { - "name": "contentDefinition", + "name": "databaseId", "description": "", "type": { "kind": "NON_NULL", "name": null, "ofType": { "kind": "SCALAR", - "name": "String", + "name": "ID", "ofType": null } }, @@ -2088,14 +2151,14 @@ "defaultValue": null }, { - "name": "databaseId", + "name": "contentDefinition", "description": "", "type": { "kind": "NON_NULL", "name": null, "ofType": { "kind": "SCALAR", - "name": "ID", + "name": "String", "ofType": null } }, @@ -2115,7 +2178,7 @@ "deprecationReason": null }, { - "name": "startGraphDatabase", + "name": "createHierarchicalGraph", "description": "", "args": [ { @@ -2131,26 +2194,9 @@ } }, "defaultValue": null - } - ], - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "OBJECT", - "name": "GraphDatabase", - "ofType": null - } - }, - "isDeprecated": false, - "deprecationReason": null - }, - { - "name": "stopGraphDatabase", - "description": "", - "args": [ + }, { - "name": "databaseId", + "name": "hierarchicalGraphId", "description": "", "type": { "kind": "NON_NULL", @@ -2182,45 +2228,6 @@ "enumValues": null, "possibleTypes": null }, - { - "kind": "INPUT_OBJECT", - "name": "ServerExtensionIdentifier", - "description": "The input type to specify server extensions", - "fields": null, - "inputFields": [ - { - "name": "symbolicName", - "description": "the symbolic name of the extension", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "ID", - "ofType": null - } - }, - "defaultValue": null - }, - { - "name": "version", - "description": "the version of the extension", - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "String", - "ofType": null - } - }, - "defaultValue": null - } - ], - "interfaces": null, - "enumValues": null, - "possibleTypes": null - }, { "kind": "OBJECT", "name": "__Schema", @@ -3068,14 +3075,6 @@ "defaultValue": null } ] - }, - { - "name": "defer", - "description": "This directive allows results to be deferred during execution", - "locations": [ - "FIELD" - ], - "args": [] } ] } diff --git a/slizaa-web/app/src/components/slizaadependencylist/ISlizaaDependencyListProps.ts b/slizaa-web/app/src/components/slizaadependencylist/ISlizaaDependencyListProps.ts new file mode 100644 index 0000000..dc297bc --- /dev/null +++ b/slizaa-web/app/src/components/slizaadependencylist/ISlizaaDependencyListProps.ts @@ -0,0 +1,27 @@ +/* + * slizaa-web - Slizaa Static Software Analysis Tools + * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +import ApolloClient from 'apollo-client'; + +export interface ISlizaaDependencyListProps { + client: ApolloClient, + databaseId: string, + hierarchicalGraphId: string, + sourceNodeId: string, + targetNodeId: string +} \ No newline at end of file diff --git a/slizaa-web/app/src/components/slizaadependencylist/ISlizaaDependencyListState.ts b/slizaa-web/app/src/components/slizaadependencylist/ISlizaaDependencyListState.ts new file mode 100644 index 0000000..89e6cb9 --- /dev/null +++ b/slizaa-web/app/src/components/slizaadependencylist/ISlizaaDependencyListState.ts @@ -0,0 +1,21 @@ +/* + * slizaa-web - Slizaa Static Software Analysis Tools + * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +export interface ISlizaaDependencyListState { + pageNumber: number +} \ No newline at end of file diff --git a/slizaa-web/app/src/components/slizaadependencylist/SlizaaDependencyList.tsx b/slizaa-web/app/src/components/slizaadependencylist/SlizaaDependencyList.tsx new file mode 100644 index 0000000..5759ab5 --- /dev/null +++ b/slizaa-web/app/src/components/slizaadependencylist/SlizaaDependencyList.tsx @@ -0,0 +1,56 @@ +/* + * slizaa-web - Slizaa Static Software Analysis Tools + * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +import {Table} from "antd"; +import * as React from "react"; +import {ISlizaaDependencyListProps} from "./ISlizaaDependencyListProps"; +import {ISlizaaDependencyListState} from "./ISlizaaDependencyListState"; + +export class SlizaaDependencyList extends React.Component { + + constructor(props: ISlizaaDependencyListProps) { + super(props); + + this.state = { + pageNumber: 1, + }; + } + + public render() { + const dataSource = [ + { + index: "2" + }, + { + index: "4" + }, + { + index: "6" + } + ] + + const columns = [ + { + dataIndex: 'index', + key: 'index', + title: 'Hurra', + } + ] + return + } +} \ No newline at end of file diff --git a/slizaa-web/app/src/components/slizaadependencytree/SlizaaDependencyTree.tsx b/slizaa-web/app/src/components/slizaadependencytree/SlizaaDependencyTree.tsx index 5a6425b..364a8f7 100644 --- a/slizaa-web/app/src/components/slizaadependencytree/SlizaaDependencyTree.tsx +++ b/slizaa-web/app/src/components/slizaadependencytree/SlizaaDependencyTree.tsx @@ -52,9 +52,6 @@ export class SlizaaDependencyTree extends React.Component p.id); const targetPredecessors: string[] = !data || !data.hierarchicalGraph || data.hierarchicalGraph.targetPredecessors == null ? [] : data.hierarchicalGraph.targetPredecessors.predecessors.map((p) => p.id); @@ -163,8 +154,6 @@ export class SlizaaDependencyTree extends React.Component { - // tslint:disable-next-line:no-console - console.log("expand: " + expandedItems) this.setState({ expandedSourceNodeIds: expandedItems, }) @@ -178,8 +167,6 @@ export class SlizaaDependencyTree extends React.Component { - // tslint:disable-next-line:no-console - console.log("expand: " + expandedItems) this.setState({ expandedTargetNodeIds: expandedItems, }) diff --git a/slizaa-web/app/src/gqlqueries/GqlQueries.ts b/slizaa-web/app/src/gqlqueries/GqlQueries.ts index f2879e0..3fe7d7a 100644 --- a/slizaa-web/app/src/gqlqueries/GqlQueries.ts +++ b/slizaa-web/app/src/gqlqueries/GqlQueries.ts @@ -90,28 +90,103 @@ export const GQ_GRAPH_DATABASES_WITH_HIERARCHICAL_GRAPHS = gql`query GraphDataba } }` -export const GQ_HAS_INSTALLED_EXTENSIONS = gql` - query HasInstalledExtensions { - serverConfiguration { - hasInstalledExtensions +export const GQ_REFERENCED_NODES_FOR_AGGREGATED_DEPENDENCY = gql` + query ReferencedNodesForAggregatedDependencies($databaseId: ID!, $hierarchicalGraphId: ID!, $dependencySourceNodeId: ID!, $dependencyTargetNodeId: ID!, $selectedNodeIds: [ID!]!, $selectedNodesType: NodeType!) { + hierarchicalGraph(databaseIdentifier: $databaseId, hierarchicalGraphIdentifier: $hierarchicalGraphId) { + dependencySetForAggregatedDependency(sourceNodeId: $dependencySourceNodeId, targetNodeId: $dependencyTargetNodeId) { + size + referencedNodeIds(selectedNodes: $selectedNodeIds, selectedNodesType: $selectedNodesType, includedPredecessors: true) + } + sourcePredecessors: node(id: $dependencySourceNodeId) { + id + predecessors { + id + } + } + targetPredecessors: node(id: $dependencyTargetNodeId) { + id + predecessors { + id + } + } } - } -`; + }` -export const GQ_AVAILABLE_SERVER_EXTENSIONS = gql` - query AvailableServerExtensions { - availableServerExtensions { - symbolicName - version +export const GQ_CORE_DEPENDENCIES_FOR_AGGREGATED_DEPENDENCY = gql` + query ReferencedNodesForAggregatedDependencies( + $databaseId: ID!, + $hierarchicalGraphId: ID!, + $dependencySourceNodeId: ID!, + $dependencyTargetNodeId: ID!, + $pageSize: Int!, + $pageNumber: Int!, + ) { + hierarchicalGraph(databaseIdentifier: $databaseId, hierarchicalGraphIdentifier: $hierarchicalGraphId) { + dependencySetForAggregatedDependency(sourceNodeId: $dependencySourceNodeId, targetNodeId: $dependencyTargetNodeId) { + size + dependencyPage(pageNumber: $pageSize, pageSize: $pageNumber) { + pageInfo { + pageNumber + maxPages + pageSize + totalCount + } + dependencies { + type + weight + sourceNode { + id + text + iconIdentifier + } + targetNode { + id + text + iconIdentifier + } + } + } + } } - }`; + }` -export const GQ_REFERENCED_NODES_FOR_AGGREGATED_DEPENDENCY = gql` - query ReferencedNodesForAggregatedDependencies($databaseId: ID!, $hierarchicalGraphId: ID!, $dependencySourceNodeId: ID!, $dependencyTargetNodeId: ID!, $selectedNodeIds: [ID!]!, $selectedNodesType: NodeType!) { +export const GQ_AGGREGATED_DEPENDENCY_DETAILS = gql` + query DependenciesForAggregatedDependencies( + $databaseId: ID!, + $hierarchicalGraphId: ID!, + $dependencySourceNodeId: ID!, + $dependencyTargetNodeId: ID!, + $selectedNodeIds: [ID!]!, + $selectedNodesType: NodeType! + $pageSize: Int!, + $pageNumber: Int!, + ) { hierarchicalGraph(databaseIdentifier: $databaseId, hierarchicalGraphIdentifier: $hierarchicalGraphId) { dependencySetForAggregatedDependency(sourceNodeId: $dependencySourceNodeId, targetNodeId: $dependencyTargetNodeId) { size referencedNodeIds(selectedNodes: $selectedNodeIds, selectedNodesType: $selectedNodesType, includedPredecessors: true) + dependencyPage(pageNumber: $pageNumber, pageSize: $pageSize) { + pageInfo { + pageNumber + maxPages + pageSize + totalCount + } + dependencies { + type + weight + sourceNode { + id + text + iconIdentifier + } + targetNode { + id + text + iconIdentifier + } + } + } } sourcePredecessors: node(id: $dependencySourceNodeId) { id diff --git a/slizaa-web/app/src/gqlqueries/__generated__/DependenciesForAggregatedDependencies.ts b/slizaa-web/app/src/gqlqueries/__generated__/DependenciesForAggregatedDependencies.ts new file mode 100644 index 0000000..d0f4c82 --- /dev/null +++ b/slizaa-web/app/src/gqlqueries/__generated__/DependenciesForAggregatedDependencies.ts @@ -0,0 +1,132 @@ +/* tslint:disable */ +/* eslint-disable */ +// This file was automatically generated and should not be edited. + +import { NodeType } from "./../query-types"; + +// ==================================================== +// GraphQL query operation: DependenciesForAggregatedDependencies +// ==================================================== + +export interface DependenciesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_pageInfo { + __typename: "PageInfo"; + pageNumber: number; + maxPages: number; + pageSize: number; + totalCount: number; +} + +export interface DependenciesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_dependencies_sourceNode { + __typename: "Node"; + /** + * The symbolicName for this node + */ + id: string; + /** + * The text label + */ + text: string; + iconIdentifier: string; +} + +export interface DependenciesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_dependencies_targetNode { + __typename: "Node"; + /** + * The symbolicName for this node + */ + id: string; + /** + * The text label + */ + text: string; + iconIdentifier: string; +} + +export interface DependenciesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_dependencies { + __typename: "Dependency"; + type: string; + weight: number; + sourceNode: DependenciesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_dependencies_sourceNode; + targetNode: DependenciesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_dependencies_targetNode; +} + +export interface DependenciesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage { + __typename: "DependencyPage"; + pageInfo: DependenciesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_pageInfo | null; + dependencies: DependenciesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_dependencies[]; +} + +export interface DependenciesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency { + __typename: "DependencySet"; + size: number; + referencedNodeIds: string[]; + /** + * Returns a dependency page with with the specified size + */ + dependencyPage: DependenciesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage | null; +} + +export interface DependenciesForAggregatedDependencies_hierarchicalGraph_sourcePredecessors_predecessors { + __typename: "Node"; + /** + * The symbolicName for this node + */ + id: string; +} + +export interface DependenciesForAggregatedDependencies_hierarchicalGraph_sourcePredecessors { + __typename: "Node"; + /** + * The symbolicName for this node + */ + id: string; + predecessors: DependenciesForAggregatedDependencies_hierarchicalGraph_sourcePredecessors_predecessors[]; +} + +export interface DependenciesForAggregatedDependencies_hierarchicalGraph_targetPredecessors_predecessors { + __typename: "Node"; + /** + * The symbolicName for this node + */ + id: string; +} + +export interface DependenciesForAggregatedDependencies_hierarchicalGraph_targetPredecessors { + __typename: "Node"; + /** + * The symbolicName for this node + */ + id: string; + predecessors: DependenciesForAggregatedDependencies_hierarchicalGraph_targetPredecessors_predecessors[]; +} + +export interface DependenciesForAggregatedDependencies_hierarchicalGraph { + __typename: "HierarchicalGraph"; + /** + * Returns a dependency set based on an aggregated dependency + */ + dependencySetForAggregatedDependency: DependenciesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency | null; + /** + * Returns the node with the given id + */ + sourcePredecessors: DependenciesForAggregatedDependencies_hierarchicalGraph_sourcePredecessors | null; + /** + * Returns the node with the given id + */ + targetPredecessors: DependenciesForAggregatedDependencies_hierarchicalGraph_targetPredecessors | null; +} + +export interface DependenciesForAggregatedDependencies { + hierarchicalGraph: DependenciesForAggregatedDependencies_hierarchicalGraph | null; +} + +export interface DependenciesForAggregatedDependenciesVariables { + databaseId: string; + hierarchicalGraphId: string; + dependencySourceNodeId: string; + dependencyTargetNodeId: string; + selectedNodeIds: string[]; + selectedNodesType: NodeType; + pageSize: number; + pageNumber: number; +} diff --git a/slizaa-web/app/src/gqlqueries/__generated__/DsmForNodeChildren.ts b/slizaa-web/app/src/gqlqueries/__generated__/DsmForNodeChildren.ts index 054b704..4657dc3 100644 --- a/slizaa-web/app/src/gqlqueries/__generated__/DsmForNodeChildren.ts +++ b/slizaa-web/app/src/gqlqueries/__generated__/DsmForNodeChildren.ts @@ -1,20 +1,3 @@ -/* - * slizaa-web - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ /* tslint:disable */ /* eslint-disable */ // This file was automatically generated and should not be edited. diff --git a/slizaa-web/app/src/gqlqueries/__generated__/GraphDatabasesWithHierarchicalGraphs.ts b/slizaa-web/app/src/gqlqueries/__generated__/GraphDatabasesWithHierarchicalGraphs.ts index 9a1617f..f06e9c0 100644 --- a/slizaa-web/app/src/gqlqueries/__generated__/GraphDatabasesWithHierarchicalGraphs.ts +++ b/slizaa-web/app/src/gqlqueries/__generated__/GraphDatabasesWithHierarchicalGraphs.ts @@ -1,20 +1,3 @@ -/* - * slizaa-web - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ /* tslint:disable */ /* eslint-disable */ // This file was automatically generated and should not be edited. diff --git a/slizaa-web/app/src/gqlqueries/__generated__/NodeChildren.ts b/slizaa-web/app/src/gqlqueries/__generated__/NodeChildren.ts index 7b128ae..3144ef8 100644 --- a/slizaa-web/app/src/gqlqueries/__generated__/NodeChildren.ts +++ b/slizaa-web/app/src/gqlqueries/__generated__/NodeChildren.ts @@ -1,20 +1,3 @@ -/* - * slizaa-web - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ /* tslint:disable */ /* eslint-disable */ // This file was automatically generated and should not be edited. diff --git a/slizaa-web/app/src/gqlqueries/__generated__/NodeChildrenFilteredByDependencySet.ts b/slizaa-web/app/src/gqlqueries/__generated__/NodeChildrenFilteredByDependencySet.ts index 7eced3e..3e43cdb 100644 --- a/slizaa-web/app/src/gqlqueries/__generated__/NodeChildrenFilteredByDependencySet.ts +++ b/slizaa-web/app/src/gqlqueries/__generated__/NodeChildrenFilteredByDependencySet.ts @@ -1,20 +1,3 @@ -/* - * slizaa-web - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ /* tslint:disable */ /* eslint-disable */ // This file was automatically generated and should not be edited. diff --git a/slizaa-web/app/src/gqlqueries/__generated__/ReferencedNodesForAggregatedDependencies.ts b/slizaa-web/app/src/gqlqueries/__generated__/ReferencedNodesForAggregatedDependencies.ts index 3211d11..5625f15 100644 --- a/slizaa-web/app/src/gqlqueries/__generated__/ReferencedNodesForAggregatedDependencies.ts +++ b/slizaa-web/app/src/gqlqueries/__generated__/ReferencedNodesForAggregatedDependencies.ts @@ -1,68 +1,66 @@ -/* - * slizaa-web - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ /* tslint:disable */ /* eslint-disable */ // This file was automatically generated and should not be edited. -import { NodeType } from "./../query-types"; - // ==================================================== // GraphQL query operation: ReferencedNodesForAggregatedDependencies // ==================================================== -export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency { - __typename: "DependencySet"; - size: number; - referencedNodeIds: string[]; +export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_pageInfo { + __typename: "PageInfo"; + pageNumber: number; + maxPages: number; + pageSize: number; + totalCount: number; } -export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph_sourcePredecessors_predecessors { +export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_dependencies_sourceNode { __typename: "Node"; /** * The symbolicName for this node */ id: string; -} - -export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph_sourcePredecessors { - __typename: "Node"; /** - * The symbolicName for this node + * The text label */ - id: string; - predecessors: ReferencedNodesForAggregatedDependencies_hierarchicalGraph_sourcePredecessors_predecessors[]; + text: string; + iconIdentifier: string; } -export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph_targetPredecessors_predecessors { +export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_dependencies_targetNode { __typename: "Node"; /** * The symbolicName for this node */ id: string; + /** + * The text label + */ + text: string; + iconIdentifier: string; } -export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph_targetPredecessors { - __typename: "Node"; +export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_dependencies { + __typename: "Dependency"; + type: string; + weight: number; + sourceNode: ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_dependencies_sourceNode; + targetNode: ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_dependencies_targetNode; +} + +export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage { + __typename: "DependencyPage"; + pageInfo: ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_pageInfo | null; + dependencies: ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage_dependencies[]; +} + +export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency { + __typename: "DependencySet"; + size: number; /** - * The symbolicName for this node + * Returns a dependency page with with the specified size */ - id: string; - predecessors: ReferencedNodesForAggregatedDependencies_hierarchicalGraph_targetPredecessors_predecessors[]; + dependencyPage: ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency_dependencyPage | null; } export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph { @@ -71,14 +69,6 @@ export interface ReferencedNodesForAggregatedDependencies_hierarchicalGraph { * Returns a dependency set based on an aggregated dependency */ dependencySetForAggregatedDependency: ReferencedNodesForAggregatedDependencies_hierarchicalGraph_dependencySetForAggregatedDependency | null; - /** - * Returns the node with the given id - */ - sourcePredecessors: ReferencedNodesForAggregatedDependencies_hierarchicalGraph_sourcePredecessors | null; - /** - * Returns the node with the given id - */ - targetPredecessors: ReferencedNodesForAggregatedDependencies_hierarchicalGraph_targetPredecessors | null; } export interface ReferencedNodesForAggregatedDependencies { @@ -90,6 +80,6 @@ export interface ReferencedNodesForAggregatedDependenciesVariables { hierarchicalGraphId: string; dependencySourceNodeId: string; dependencyTargetNodeId: string; - selectedNodeIds: string[]; - selectedNodesType: NodeType; + pageSize: number; + pageNumber: number; } diff --git a/slizaa-web/app/src/gqlqueries/__generated__/Svg.ts b/slizaa-web/app/src/gqlqueries/__generated__/Svg.ts index d1a4841..1aa8bf3 100644 --- a/slizaa-web/app/src/gqlqueries/__generated__/Svg.ts +++ b/slizaa-web/app/src/gqlqueries/__generated__/Svg.ts @@ -1,20 +1,3 @@ -/* - * slizaa-web - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ /* tslint:disable */ /* eslint-disable */ // This file was automatically generated and should not be edited. diff --git a/slizaa-web/app/src/gqlqueries/query-types.ts b/slizaa-web/app/src/gqlqueries/query-types.ts index 340f480..e2a3727 100644 --- a/slizaa-web/app/src/gqlqueries/query-types.ts +++ b/slizaa-web/app/src/gqlqueries/query-types.ts @@ -1,20 +1,3 @@ -/* - * slizaa-web - Slizaa Static Software Analysis Tools - * Copyright © 2019 Code-Kontor GmbH and others (slizaa@codekontor.io) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ /* tslint:disable */ /* eslint-disable */ // This file was automatically generated and should not be edited. diff --git a/slizaa-web/app/src/views/dependenciesview/DependenciesView.tsx b/slizaa-web/app/src/views/dependenciesview/DependenciesView.tsx index 942ce35..3b8113d 100644 --- a/slizaa-web/app/src/views/dependenciesview/DependenciesView.tsx +++ b/slizaa-web/app/src/views/dependenciesview/DependenciesView.tsx @@ -25,6 +25,7 @@ import {HierarchicalGraphTree} from 'src/components/hierarchicalgraphtree'; import {HorizontalSplitLayout, VerticalSplitLayout} from 'src/components/layout'; import {IAppState} from 'src/redux/IAppState'; import {IDsmSelection} from "../../components/dsm/IDsmProps"; +import {SlizaaDependencyList} from "../../components/slizaadependencylist/SlizaaDependencyList"; import {SlizaaDependencyTree} from "../../components/slizaadependencytree"; import {DsmForNodeChildren, DsmForNodeChildrenVariables} from "../../gqlqueries/__generated__/DsmForNodeChildren"; import {GQ_DSM_FOR_NODE_CHILDREN} from "../../gqlqueries/GqlQueries"; @@ -66,7 +67,8 @@ export class DependenciesView extends React.Component {this.hierarchicalGraph(cl)} @@ -119,9 +121,22 @@ export class DependenciesView extends React.Component } bottom={ - - {this.dependenciesDetails(cl)} - + + {this.dependenciesList(cl)} + + } + right={ + + {this.dependenciesTree(cl)} + + } + /> }/> } @@ -192,7 +207,7 @@ export class DependenciesView extends React.Component): React.ReactNode { + private dependenciesTree(client: ApolloClient): React.ReactNode { // return empty div if selected dependency is undefined if (this.state.mainDependencySelection === undefined) { @@ -223,6 +238,25 @@ export class DependenciesView extends React.Component } + private dependenciesList(client: ApolloClient): React.ReactNode { + + // return empty div if selected dependency is undefined + if (this.state.mainDependencySelection === undefined) { + return
; + } + + // + return + } + + private onDependencyTreeNodesSelected = (aSelectedNodeIds: string[], aSelectedNodesType: NodeType): void => { const expandedSourceNodeIds: string[] = this.state.dependenciesTree ? this.state.dependenciesTree.sourceTreeNodeSelection.selectedNodeIds : []; @@ -301,15 +335,25 @@ export class DependenciesView extends React.Component { + private onUpperSplitLayoutWidthChanged = (id: string, newWidth: number): void => { this.setState({ layout: { ...this.state.layout, - treeWidth: newWidth, + upperDividerPosition: newWidth, } }); } + private onLowerSplitLayoutWidthChanged = (id: string, newWidth: number): void => { + this.setState({ + layout: { + ...this.state.layout, + lowerDividerPosition: newWidth, + } + }); + } + + private updateWindowDimensions = (): void => { const HEADER_SIZE_WITH_MARGIN = 80; diff --git a/slizaa-web/app/src/views/dependenciesview/IDependenciesViewState.ts b/slizaa-web/app/src/views/dependenciesview/IDependenciesViewState.ts index 1e0535d..af3c5b2 100644 --- a/slizaa-web/app/src/views/dependenciesview/IDependenciesViewState.ts +++ b/slizaa-web/app/src/views/dependenciesview/IDependenciesViewState.ts @@ -45,7 +45,8 @@ export interface IDependencySelection { } export interface IIDependenciesViewLayout { - treeWidth: number + upperDividerPosition: number + lowerDividerPosition: number horizontalRatio: number height: number dsmSetting: IDsmSettings