fix(plugins/plugin-client-common): add support for iterating the subtask hoisting algo

We deferred this in the first work. The algorithm needs to iterate till convergence.

Author: starpit

plugins/plugin-client-common/src/components/Content/Markdown/components/Imports.tsx

@@ -21,6 +21,7 @@ import { encodeComponent, pexecInCurrentTab } from '@kui-shell/core'
 import { TreeView, TreeViewProps } from '@patternfly/react-core'
 
 import {
+  isEmpty,
   isSequence,
   isParallel,
   isTitledSteps,
@@ -195,6 +196,10 @@ class ImportsImpl extends React.PureComponent<Props, State> {
         .flatMap(_ => _.data)
     )
 
+    if (children.length === 0) {
+      return
+    }
+
     const hasAction = !!filepath
     const hasBadge = hasAction && rollupStatus.nDone > 0
 
@@ -330,6 +335,7 @@ class ImportsImpl extends React.PureComponent<Props, State> {
     depth = 0
   ) {
     const _children = graph.choices
+      .filter(_ => !isEmpty(_.graph))
       .map(_ =>
         this.treeModelForLeaf(
           _.graph,

plugins/plugin-client-common/src/components/Content/Markdown/components/code/graph.ts

@@ -177,25 +177,25 @@ export type OrderedGraph = Graph<Ordered>
 export type OrderedCodeBlock = CodeBlockProps & Ordered
 
 export function isChoice<T extends Unordered | Ordered = Unordered>(graph: Graph<T>): graph is Choice<T> {
-  return Array.isArray((graph as Choice).choices)
+  return graph && Array.isArray((graph as Choice).choices)
 }
 
 export function isSequence<T extends Unordered | Ordered = Unordered>(graph: Graph<T>): graph is Sequence<T> {
-  return Array.isArray((graph as Sequence).sequence)
+  return graph && Array.isArray((graph as Sequence).sequence)
 }
 
 export function isParallel<T extends Unordered | Ordered = Unordered>(graph: Graph<T>): graph is Parallel<T> {
-  return Array.isArray((graph as Parallel).parallel)
+  return graph && Array.isArray((graph as Parallel).parallel)
 }
 
 export function isTitledSteps<T extends Unordered | Ordered = Unordered>(graph: Graph<T>): graph is TitledSteps<T> {
   const ts = graph as TitledSteps<T>
-  return typeof ts.title === 'string' && Array.isArray(ts.steps)
+  return ts && typeof ts.title === 'string' && Array.isArray(ts.steps)
 }
 
 export function isSubTask<T extends Unordered | Ordered = Unordered>(graph: Graph<T>): graph is SubTask<T> {
   const subtask = graph as SubTask
-  return typeof subtask.key === 'string' && typeof subtask.filepath === 'string'
+  return subtask && typeof subtask.key === 'string' && typeof subtask.filepath === 'string'
 }
 
 function sameCodeBlock(a: CodeBlockProps, b: CodeBlockProps) {
@@ -208,6 +208,15 @@ function sameCodeBlock(a: CodeBlockProps, b: CodeBlockProps) {
   )
 }
 
+export function isEmpty(A: Graph): boolean {
+  return (
+    (isSequence(A) && A.sequence.length === 0) ||
+    (isParallel(A) && A.parallel.length === 0) ||
+    (isTitledSteps(A) && A.steps.length === 0) ||
+    (isChoice(A) && A.choices.length === 0)
+  )
+}
+
 export function sameGraph(A: Graph, B: Graph) {
   if (isChoice(A)) {
     return isChoice(B) && sameChoice(A, B)