Merge branch 'NodeLabelPageTest'

tetherless-world · Nov 19, 2020 · 57dc22a · 57dc22a
2 parents 86cad80 + 8c3946d
commit 57dc22a
Show file tree

Hide file tree

Showing 19 changed files with 62,159 additions and 62,293 deletions.
diff --git a/gui/package.json b/gui/package.json
@@ -34,7 +34,7 @@
     "ts-loader": "^8.0.4",
     "tsconfig-paths-webpack-plugin": "^3.3.0",
     "tslint": "^6.1.3",
-    "typescript": "^4.0.3",
+    "typescript": "4.0.5",
     "webpack": "^4.44.2",
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.0",

diff --git a/gui/src/kg/components/kg/search/KgSearchResultsTable.tsx b/gui/src/kg/components/kg/search/KgSearchResultsTable.tsx
@@ -157,8 +157,10 @@ export const KgSearchResultsTable: React.FunctionComponent<{
             return sourceIds
               ? sourceIds
                   .split("|")
-                  .map((sourceId) => resolveSourceId({allSources, sourceId}))
-                  .map((source, sourceIndex) => (
+                  .map((sourceId: string) =>
+                    resolveSourceId({allSources, sourceId})
+                  )
+                  .map((source: KgSource, sourceIndex: number) => (
                     <span data-cy={`source-${sourceIndex}`} key={source.id}>
                       <KgSourcePill
                         idOnly={true}

diff --git a/gui/src/shared/components/kg/node/KgNodeLabelViews.tsx b/gui/src/shared/components/kg/node/KgNodeLabelViews.tsx
@@ -58,7 +58,7 @@ export const KgNodeLabelViews: React.FunctionComponent<{
       </Grid>
       <Grid item container spacing={4}>
         <Grid item xs={10}>
-          <h1 data-cy="node-title">Node label: {nodeLabel.nodeLabel}</h1>
+          <h1 data-cy="node-label-title">Node label: {nodeLabel.nodeLabel}</h1>
           <TabRouteSwitch tabRoutes={Object.values(tabRoutes)} />
         </Grid>
         <Grid item xs={2}>

diff --git a/gui/src/shared/components/kg/node/KgNodeSourcesCard.tsx b/gui/src/shared/components/kg/node/KgNodeSourcesCard.tsx
@@ -23,9 +23,9 @@ export const KgNodeSourcesCard: React.FunctionComponent<{
     <Card>
       <CardHeader title="Source(s)"></CardHeader>
       <CardContent>
-        <List>
+        <List data-cy="node-sources">
           {nodeSources.map((source) => (
-            <ListItemText data-cy="node-source" key={source.id}>
+            <ListItemText data-cy={`node-source-${source.id}`} key={source.id}>
               <KgSourcePill
                 onClick={() => {
                   history.push(

diff --git a/gui/src/shared/components/kg/node/KgNodesTable.tsx b/gui/src/shared/components/kg/node/KgNodesTable.tsx
@@ -62,8 +62,8 @@ export const KgNodesTable: React.FunctionComponent<{
           sort: true,
           customBodyRender(labels, tableMeta) {
             return (
-              <List>
-                {labels.split("|").map((label) => (
+              <List data-cy="node-labels">
+                {labels.split("|").map((label: string) => (
                   <ListItem key={label}>
                     <ListItemText>
                       <Link
@@ -104,8 +104,10 @@ export const KgNodesTable: React.FunctionComponent<{
             return sourceIds
               ? sourceIds
                   .split("|")
-                  .map((sourceId) => resolveSourceId({allSources, sourceId}))
-                  .map((source, sourceIndex) => (
+                  .map((sourceId: string) =>
+                    resolveSourceId({allSources, sourceId})
+                  )
+                  .map((source: KgSource, sourceIndex: number) => (
                     <span data-cy={`source-${sourceIndex}`} key={source.id}>
                       <KgSourcePill
                         onClick={() => {
@@ -153,7 +155,7 @@ export const KgNodesTable: React.FunctionComponent<{
           search: false,
           selectableRows: "none",
           setRowProps(_, rowIndex) {
-            return {"data-cy": "node-" + rowIndex};
+            return {"data-cy": "node-row-" + rowIndex};
           },
         }}
         title={""}