From b5a51b4fceace211d10d6dd4accd5545e48824f1 Mon Sep 17 00:00:00 2001
From: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Date: Fri, 4 Sep 2020 14:11:52 +0200
Subject: odlux bugfixes

fix info, guiguttrough not working

fix aria-labels placed wrong

Issue-ID: CCSDK-2732
Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Change-Id: Ic2aafa796fd2471160fa269974aef7767dad6a5c
---
 .../apps/connectApp/src/models/topologyNetconf.ts  |  2 +-
 .../apps/connectApp/src/services/connectService.ts | 28 ++++------------------
 sdnr/wt/odlux/framework/pom.xml                    |  2 +-
 sdnr/wt/odlux/framework/src/assets/version.json    |  4 ++++
 .../src/components/material-ui/listItemLink.tsx    |  5 ++--
 5 files changed, 13 insertions(+), 28 deletions(-)
 create mode 100644 sdnr/wt/odlux/framework/src/assets/version.json

(limited to 'sdnr')

diff --git a/sdnr/wt/odlux/apps/connectApp/src/models/topologyNetconf.ts b/sdnr/wt/odlux/apps/connectApp/src/models/topologyNetconf.ts
index 694009d1b..ef22aab43 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/models/topologyNetconf.ts
+++ b/sdnr/wt/odlux/apps/connectApp/src/models/topologyNetconf.ts
@@ -32,5 +32,5 @@ export interface TopologyNode {
 
 export interface Topology {
   "topology-id": string;
-  node: TopologyNode[];
+  "network-topology:node": TopologyNode[];
 }
diff --git a/sdnr/wt/odlux/apps/connectApp/src/services/connectService.ts b/sdnr/wt/odlux/apps/connectApp/src/services/connectService.ts
index 2aa9e3958..fbbfa68d9 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/services/connectService.ts
+++ b/sdnr/wt/odlux/apps/connectApp/src/services/connectService.ts
@@ -126,11 +126,11 @@ class ConnectService {
 
   /** Yang capabilities of the selected network elements. */
   public async infoNetworkElement(nodeId: string): Promise<TopologyNode | null> {
-    const path = '/rests/operational/network-topology:network-topology/topology=topology-netconf/node=' + nodeId;
+    const path = '/rests/data/network-topology:network-topology/topology=topology-netconf/node=' + nodeId;
     const topologyRequestPomise = requestRest<Topology>(path, { method: "GET" });
 
     return topologyRequestPomise && topologyRequestPomise.then(result => {
-      return result && result.node && result.node[0] || null;
+      return result && result["network-topology:node"] && result["network-topology:node"][0] || null;
     });
   }
 
@@ -157,25 +157,6 @@ class ConnectService {
     })) || null;
   }
 
-  public async getWebUriExtensionForNetworkElementAsync(ne: string) {
-    const path = '/rests/data/network-topology:network-topology/topology=topology-netconf/node=' + ne + '/yang-ext:mount/core-model:network-element';
-    try {
-      const result = await requestRest<any>(path, { method: "GET" });
-
-      if (result['network-element'].extension) {
-        const webUri = result['network-element'].extension.find((item: any) => item['value-name'] === "webUri")
-        if (webUri) {
-          return webUri.value as string;
-        }
-      }
-    } catch (error) {
-      console.log(ne + ' unrechable: ' + error)
-    }
-
-    return undefined;
-
-  }
-
   public getAllWebUriExtensionsForNetworkElementListAsync(ne: string[]) {
 
     let promises: any[] = [];
@@ -187,9 +168,8 @@ class ConnectService {
       // add search request to array
       promises.push(requestRest<any>(path, { method: "GET" })
         .then(result => {
-
-          if (result != null && result['network-element'] && result['network-element'].extension) {
-            const webUri = result['network-element'].extension.find((item: any) => item['value-name'] === "webUri")
+          if (result != null && result['core-model:network-element'] && result['core-model:network-element'].extension) {
+            const webUri = result['core-model:network-element'].extension.find((item: any) => item['value-name'] === "webUri")
             if (webUri) {
               webUris.push({ webUri: webUri.value, nodeId: nodeId });
             } else {
diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml
index a8630ae23..5239b2bf4 100644
--- a/sdnr/wt/odlux/framework/pom.xml
+++ b/sdnr/wt/odlux/framework/pom.xml
@@ -46,7 +46,7 @@
     <properties>
         <buildtime>${maven.build.timestamp}</buildtime>
         <distversion>ONAP Frankfurt (Neon, mdsal ${odl.mdsal.version})</distversion>
-        <buildno>66.be51a7d(20/09/03)</buildno>
+        <buildno>68.d7886ce(20/09/04)</buildno>
         <odlux.version>ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version}</odlux.version>
     </properties>
 
diff --git a/sdnr/wt/odlux/framework/src/assets/version.json b/sdnr/wt/odlux/framework/src/assets/version.json
new file mode 100644
index 000000000..6311e1094
--- /dev/null
+++ b/sdnr/wt/odlux/framework/src/assets/version.json
@@ -0,0 +1,4 @@
+{
+    "version":"68.d7886ce(20/09/04)",
+    "build":"2020-09-04T12:31:19Z"
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx b/sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx
index 23bad66ea..8c4b740a0 100644
--- a/sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx
+++ b/sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx
@@ -42,15 +42,16 @@ export const ListItemLink = withStyles(styles)((props: IListItemLinkProps) => {
   const { icon, primary: Primary, secondary: Secondary, classes, to, exact = false } = props;
   const renderLink = (itemProps: any): JSX.Element => (<NavLink exact={ exact } to={ to } activeClassName={ classes.active } { ...itemProps } />);
 
+  const ariaLabel = typeof Primary === 'string' ? "link-to-"+Primary.toLowerCase().replace(/\s/g, "-") : "link-to-"+Primary.displayName?.toLowerCase();
   return (
        <>
-        <ListItem button component={ renderLink }>
+        <ListItem button component={ renderLink } aria-label={ariaLabel}>
           { icon
             ? <ListItemIcon>{ icon }</ListItemIcon>
             : null
           }
         { typeof Primary === 'string'
-          ? <ListItemText aria-label={"link-to-"+Primary.toLowerCase()} primary={ Primary } style={{ padding: 0 }} /> 
+          ? <ListItemText primary={ Primary } style={{ padding: 0 }} /> 
           : <Primary />
           }
         </ListItem>
-- 
cgit 1.2.3-korg