<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
<artifactId>sdnr-wt-odlux-app-configurationApp</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-odlux-app-networkMapApp</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
</dependency>
+
+
</dependencies>
</project>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
},
proxy: {
"/oauth2/": {
- target: "http://10.20.6.29:48181",
+ target: "http://10.20.6.29:28181",
secure: false
},
"/database/": {
- target: "http://10.20.6.29:48181",
+ target: "http://10.20.6.29:28181",
secure: false
},
- "/restconf/": {
- target: "http://10.20.6.29:48181",
+ "/tree/": {
+ target: "http://10.20.6.29:28181",
secure: false
},
"/rests/": {
- target: "http://10.20.6.29:48181",
+ target: "http://10.20.6.29:28181",
secure: false
},
"/help/": {
- target: "http://10.20.6.29:48181",
+ target: "http://10.20.6.29:28181",
secure: false
},
"/websocket": {
- target: "http://10.20.6.29:48181",
+ target: "http://10.20.6.29:28181",
ws: true,
changeOrigin: true,
secure: false
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
<script type="text/javascript" src="./config.js"></script>
<script>
// run the application
- require(["app", "faultApp" ], function (app, faultApp) {
+ require(["app", "faultApp", "connectApp" ], function (app, faultApp, connectApp) {
faultApp.register();
+ connectApp.register();
app("./app.tsx").runApplication();
});
</script>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
},
proxy: {
"/oauth2/": {
- target: "http://10.20.6.29:48181",
+ target: "http://localhost:8181",
secure: false
},
"/database/": {
- target: "http://10.20.6.29:48181",
+ target: "http://localhost:8181",
secure: false
},
"/restconf/": {
- target: "http://10.20.6.29:48181",
+ target: "http://localhost:8181",
secure: false
},
"/rests/": {
- target: "http://10.20.6.29:48181",
+ target: "http://localhost:8181",
secure: false
},
"/help/": {
- target: "http://10.20.6.29:48181",
+ target: "http://localhost:8181",
secure: false
},
"/tree/": {
- target: "http://10.20.6.29:48181",
+ target: "http://localhost:8181",
secure: false
},
"/websocket": {
- target: "http://10.20.6.29:48181",
+ target: "http://localhost:8181",
+ ws: true,
+ changeOrigin: true,
+ secure: false
+ },
+ "/yang-schema": {
+ target: "http://localhost:8181",
ws: true,
changeOrigin: true,
secure: false
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
+++ /dev/null
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-
-import * as React from 'react';
-import Table from '@material-ui/core/Table';
-import TableBody from '@material-ui/core/TableBody';
-import TableCell from '@material-ui/core/TableCell';
-import TableContainer from '@material-ui/core/TableContainer';
-import TableHead from '@material-ui/core/TableHead';
-import TableRow from '@material-ui/core/TableRow';
-import Paper from '@material-ui/core/Paper';
-import { makeStyles, Button, Tooltip } from '@material-ui/core';
-
-type props = { headers: string[], width: number, height:number, navigate?(applicationName: string, path?: string):void, onLinkClick?(id: string): void, data: any[], hover: boolean, onClick?(id: string): void, actions?:boolean };
-
-
-const styles = makeStyles({
- container: {
- overflow:"auto"
- },
- button: {
- margin: 0,
- padding: "6px 6px",
- minWidth: 'unset'
- }
-
- });
-
-
-const DenseTable: React.FunctionComponent<props> = (props) => {
-
- const classes = styles();
-
- const handleClick = (event: any, id: string) =>{
- event.preventDefault();
- props.onClick !== undefined && props.onClick(id);
-
- }
-
- const handleHover = (event: any, id: string) =>{
- event.preventDefault();
-
- }
-
- return (
- <Paper style={{borderRadius:"0px", width:props.width, height:props.height}} className={classes.container}>
-
- <Table stickyHeader size="small" aria-label="a dense table" >
- <TableHead>
- <TableRow>
- {
- props.headers.map((data) => {
- return <TableCell>{data}</TableCell>
- })
- }
- </TableRow>
- </TableHead>
- <TableBody>
- {props.data.map((row, index) => {
-
-
- var filteredRows = Object.keys(row).filter(function(e) { if(e!=="simulatorId") return row });
-
- //var filteredRows = Object.keys(row).filter(function(e) { if(e!=="simulatorId") return row[e] });
- var values = Object.keys(row).map(function(e) { if(e!=="simulatorId"){ return row[e];} else return undefined });
-
-
- return (
- <TableRow key={index} hover={props.hover} onMouseOver={e => handleHover(e,row.name)} onClick={ e => handleClick(e, row.name)}>
-
- {
- values.map((data:any) => {
-
- if(data!== undefined)
- return <TableCell > {data} </TableCell>
- else
- return null;
- })
- }
- {
-
- props.actions && <TableCell >
-<div style={{display:"flex"}}>
- <Tooltip title="Configure">
- <Button className={classes.button} disabled={row.status!=="connected"} onClick={(e: any) =>{ e.preventDefault(); e.stopPropagation(); props.navigate && props.navigate("configuration", row.simulatorId ? row.simulatorId : row.name)}}>C</Button>
- </Tooltip>
- <Tooltip title="Fault">
- <Button className={classes.button} onClick={(e: any) =>{ e.preventDefault(); e.stopPropagation(); props.navigate && props.navigate("fault", row.simulatorId ? row.simulatorId : row.name)}}>F</Button>
- </Tooltip>
- </div>
- </TableCell>
-
- }
- </TableRow>)
- })
- }
-
- </TableBody>
- </Table>
-
- </Paper>
- );
-
-}
-
-export default DenseTable;
\ No newline at end of file
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
{
- "name": "@odlux/networkmap-app",
+ "name": "@odlux/transport-app",
"version": "0.1.0",
"description": "A react based modular UI to display event log from a database.",
"main": "index.js",
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
}
}
-export const setTopologyReachableAction = (error: Error) => (dispatcher: Dispatch, getState: () => IApplicationStoreState)=>{
+export const handleConnectionError = (error: Error) => (dispatcher: Dispatch, getState: () => IApplicationStoreState)=>{
const {network:{connectivity: {isToplogyServerAvailable}}} = getState();
if(isToplogyServerAvailable){
dispatcher(new IsTopologyServerReachableAction(false))
import Paper from '@material-ui/core/Paper';
import { makeStyles, Button, Tooltip } from '@material-ui/core';
-type props = { headers: string[], height:number, navigate?(applicationName: string, path?: string):void, onLinkClick?(id: string): void, data: any[], hover: boolean, ariaLabel: string, onClick?(id: string): void, actions?:boolean };
+type props = { headers: string[], height: number, navigate?(applicationName: string, path?: string): void, onLinkClick?(id: string): void, data: any[], hover: boolean, ariaLabelRow: string, ariaLabelColumn: string[], verticalTable?: boolean, onClick?(id: string): void, actions?: boolean };
const styles = makeStyles({
container: {
- overflow:"auto"
+ overflow: "auto"
},
button: {
margin: 0,
padding: "6px 6px",
minWidth: 'unset'
- }
-
- });
-
+ }
+
+});
+
const DenseTable: React.FunctionComponent<props> = (props) => {
const classes = styles();
- const handleClick = (event: any, id: string) =>{
+ const handleClick = (event: any, id: string) => {
event.preventDefault();
props.onClick !== undefined && props.onClick(id);
}
- const handleHover = (event: any, id: string) =>{
+ const handleHover = (event: any, id: string) => {
event.preventDefault();
}
return (
- <Paper style={{borderRadius:"0px"}}>
- <div style={{ height:props.height, overflow:"auto"}}>
- <Table stickyHeader size="small" aria-label="a dense table" >
- <TableHead>
- <TableRow>
- {
- props.headers.map((data) => {
- return <TableCell>{data}</TableCell>
- })
+ <Paper style={{ borderRadius: "0px" }}>
+ <div style={{ height: props.height, overflow: "auto" }}>
+ <Table stickyHeader size="small" aria-label="a dense table" >
+ <TableHead>
+ <TableRow>
+ {
+ props.headers.map((data) => {
+ return <TableCell>{data}</TableCell>
+ })
+ }
+ </TableRow>
+ </TableHead>
+ <TableBody>
+ {props.data.map((row, index) => {
+ var values = Object.keys(row).map(function (e) { return row[e]; });
+ return (
+ <TableRow aria-label={props.ariaLabelRow} key={index} hover={props.hover} onMouseOver={e => handleHover(e, row.name)} onClick={e => handleClick(e, row.name)}>
+
+ {
+ values.map((data: any, i) => {
+ if (data !== undefined) {
+
+ if (!props.verticalTable) {
+ const ariaLabel = props.ariaLabelColumn[i];
+ if (ariaLabel.length > 0) {
+ return <TableCell aria-label={ariaLabel}>{data}</TableCell>
+ } else {
+ return <TableCell>{data}</TableCell>
+ }
+ }
+ else {
+ // skip adding aria label to 'header' column
+ if (i === 0) {
+ return <TableCell>{data}</TableCell>
+ } else {
+ const ariaLabel = props.ariaLabelColumn[index];
+ return <TableCell aria-label={ariaLabel}>{data}</TableCell>
+ }
+ }
+ }
+ else
+ return null;
+ })
+ }
+ {
+
+ props.actions && <TableCell >
+ <div style={{ display: "flex" }}>
+ <Tooltip title="Configure">
+ <Button className={classes.button} disabled={row.status !== "connected"} onClick={(e: any) => { e.preventDefault(); e.stopPropagation(); props.navigate && props.navigate("configuration", row.simulatorId ? row.simulatorId : row.name) }}>C</Button>
+ </Tooltip>
+ <Tooltip title="Fault">
+ <Button className={classes.button} disabled={row.status !== "connected"} onClick={(e: any) => { e.preventDefault(); e.stopPropagation(); props.navigate && props.navigate("fault", row.simulatorId ? row.simulatorId : row.name) }}>F</Button>
+ </Tooltip>
+ </div>
+ </TableCell>
+ }
+ </TableRow>)
+ })
}
- </TableRow>
- </TableHead>
- <TableBody>
- {props.data.map((row, index) => {
- var values = Object.keys(row).map(function(e) { return row[e] });
- return (
- <TableRow aria-label={props.ariaLabel} key={index} hover={props.hover} onMouseOver={e => handleHover(e,row.name)} onClick={ e => handleClick(e, row.name)}>
-
- {
- values.map((data:any) => {
-
- if(data!== undefined)
- return <TableCell> {data} </TableCell>
- else
- return null;
- })
- }
- {
-
- props.actions && <TableCell >
-<div style={{display:"flex"}}>
- <Tooltip title="Configure">
- <Button className={classes.button} disabled={row.status!=="connected"} onClick={(e: any) =>{ e.preventDefault(); e.stopPropagation(); props.navigate && props.navigate("configuration", row.name)}}>C</Button>
- </Tooltip>
- <Tooltip title="Fault">
- <Button className={classes.button} disabled={row.status!=="connected"} onClick={(e: any) =>{ e.preventDefault(); e.stopPropagation(); props.navigate && props.navigate("fault", row.name)}}>F</Button>
- </Tooltip>
- </div>
- </TableCell>
-
- }
- </TableRow>)
- })
- }
-
- </TableBody>
- </Table>
+
+ </TableBody>
+ </Table>
</div>
</Paper>
);
<AppBar position="static" id="site-tabs" style={{ marginTop: "20px", background: '#2E3B55' }}>
<Typography aria-label="details-of-link-sites" style={{ margin:"5px"}}>SITE DETAILS</Typography>
</AppBar>
- <DenseTable ariaLabel="site-information-table-entry" height={height} hover={false} headers={["", "Site A", "Site B"]} data={data} />
+ <DenseTable ariaLabelRow="site-information-table-entry" ariaLabelColumn={["site-name", "latitude", "longitude", "azimuth"]} verticalTable height={height} hover={false} headers={["", "Site A", "Site B"]} data={data} />
{
props.link.type==="microwave" && <Button style={{marginTop:20}} fullWidth variant="contained" color="primary" onClick={onCalculateLinkClick}>Calculate link</Button>
}
{
props.site.links.length > 0 &&
- <DenseTable ariaLabel="available-links-table-entry" height={height} hover={true} headers={["Link Name", "Azimuth in °"]} data={linkRows} onClick={props.onLinkClick} ></DenseTable>
+ <DenseTable ariaLabelRow="available-links-table" ariaLabelColumn={["link-name", "azimuth"]} height={height} hover={true} headers={["Link Name", "Azimuth in °"]} data={linkRows} onClick={props.onLinkClick} ></DenseTable>
/**
*
* */
{
props.site.devices.length>0 && props.updatedDevices !== null &&
- <DenseTable ariaLabel="available-nodes-table-entry" navigate={props.navigate} height={height} hover={false} headers={["ID","Name","Type", "Manufacturer","Owner","Status", "Ports", "Actions"]} actions={true} data={props.updatedDevices!} />
+ <DenseTable ariaLabelRow="available-nodes-table" ariaLabelColumn={["id","name","type", "manufacturer","owner","status", "ports", "actions"]} navigate={props.navigate} height={height} hover={false} headers={["ID","Name","Type", "Manufacturer","Owner","Status", "Ports", "Actions"]} actions={true} data={props.updatedDevices!} />
}
</>
}
import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
import connect, { IDispatcher, Connect } from '../../../../framework/src/flux/connect';
import SearchBar from './searchBar';
-import { verifyResponse, setTopologyReachableAction, setTileServerReachableAction } from '../actions/connectivityAction';
+import { verifyResponse, IsTileServerReachableAction, handleConnectionError, setTileServerReachableAction } from '../actions/connectivityAction';
import ConnectionInfo from './connectionInfo'
import { showIconLayers, addBaseLayers, addBaseSources, addIconLayers } from '../utils/mapLayers';
+import lamp from '../../icons/lamp.png';
+import apartment from '../../icons/apartment.png';
+import datacenter from '../../icons/datacenter.png';
+import factory from '../../icons/factory.png';
import Statistics from './statistics';
import IconSwitch from './iconSwitch';
import { addImages } from '../services/mapImagesService';
map.on('load', (ev) => {
map.setMaxZoom(18);
+ const bbox = map.getBounds();
+ this.props.updateMapPosition(bbox.getCenter().lat, bbox.getCenter().lng, map.getZoom())
+
addBaseSources(map, this.props.selectedSite, this.props.selectedLink);
addImages(map, (result: boolean)=>{
}
});
- const boundingBox = map.getBounds();
-
+ const boundingBox = increaseBoundingBox(map);
- fetch(`${URL_API}/links/geoJson/${boundingBox.getWest()},${boundingBox.getSouth()},${boundingBox.getEast()},${boundingBox.getNorth()}`)
+ fetch(`${URL_API}/links/geoJson/${boundingBox.west},${boundingBox.south},${boundingBox.east},${boundingBox.north}`)
.then(result => verifyResponse(result))
.then(result => result.json())
.then(features => {
.catch(error => this.props.handleConnectionError(error));
- fetch(`${URL_API}/sites/geoJson/${boundingBox.getWest()},${boundingBox.getSouth()},${boundingBox.getEast()},${boundingBox.getNorth()}`)
+ fetch(`${URL_API}/sites/geoJson/${boundingBox.west},${boundingBox.south},${boundingBox.east},${boundingBox.north}`)
.then(result => verifyResponse(result))
.then(result => result.json())
.then(features => {
componentWillUnmount(){
window.removeEventListener("menu-resized", this.handleResize);
+ lastBoundingBox=null;
}
handleResize = () => {
updateMapPosition: (lat: number, lon: number, zoom: number) => dispatcher.dispatch(new SetCoordinatesAction(lat, lon, zoom)),
setStatistics: (linkCount: string, siteCount: string) => dispatcher.dispatch(new SetStatistics(siteCount, linkCount)),
setTileServerLoaded: (reachable: boolean) => dispatcher.dispatch(setTileServerReachableAction(reachable)),
- handleConnectionError: (error: Error) => dispatcher.dispatch(setTopologyReachableAction(error))
+ handleConnectionError: (error: Error) => dispatcher.dispatch(handleConnectionError(error))
})
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(Map));
\ No newline at end of file
import { HighlightLinkAction, HighlightSiteAction } from '../actions/mapActions';
import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
import connect, { IDispatcher, Connect } from '../../../../framework/src/flux/connect';
-import { verifyResponse, setTopologyReachableAction } from '../actions/connectivityAction';
+import { verifyResponse, handleConnectionError } from '../actions/connectivityAction';
clearDetailsHistory:()=> dispatcher.dispatch(new ClearHistoryAction()),
highlightLink: (link: link) => dispatcher.dispatch(new HighlightLinkAction(link)),
highlightSite: (site: site) => dispatcher.dispatch(new HighlightSiteAction(site)),
- handleConnectionError: (error:Error) => dispatcher.dispatch(setTopologyReachableAction(error)),
+ handleConnectionError: (error:Error) => dispatcher.dispatch(handleConnectionError(error)),
clearDetails: () => dispatcher.dispatch(new ClearDetailsAction()),
});
selectedSite: null,
zoomToElement: null,
alarmlement: null,
- lat: 52,
- lon: 13,
+ lat: 52.5095,
+ lon: 13.3290,
zoom: 10,
statistics:{links:"Not counted yet.", sites: "Not counted yet."},
allowIconSwitch: true
//store && store.dispatch(UpdateDetailsView(msg.nodeName))
}));
-
+*/
subscribe<FaultAlarmNotification & IFormatedMessage>("ProblemNotification", (fault => {
const store = applicationApi && applicationApi.applicationStore;
if (fault && store) {
- // store.dispatch(findSiteToAlarm(fault.nodeName));
+ store.dispatch(findSiteToAlarm(fault.nodeName));
}
}));
-*/
\ No newline at end of file
import datacenter from '../../icons/datacenter.png';
import factory from '../../icons/factory.png';
import lamp from '../../icons/lamp.png';
+import datacenterred from '../../icons/datacenterred.png';
+import factoryred from '../../icons/factoryred.png';
+import lampred from '../../icons/lampred.png';
+
type ImagesLoaded = (allImagesLoaded: boolean) => void;
type MapImages = {name: string, url: string}
-export const Images : MapImages[] = [{name: 'data-center', url: datacenter}, {name: 'house', url: apartment}, {name: 'factory', url: factory},{name: 'lamp', url: lamp}] ;
+export const Images : MapImages[] = [
+ {name: 'data-center', url: datacenter},
+ {name: 'house', url: apartment},
+ {name: 'factory', url: factory},
+ {name: 'lamp', url: lamp},
+ {name: 'data-center-red', url: datacenterred},
+ {name: 'factory-red', url: factoryred},
+ {name: 'lamp-red', url: lampred},
+] ;
export const addImages = (map: mapboxgl.Map, callback?: ImagesLoaded) =>{
}
});
+ //select layers
+
+ map.addLayer({
+ 'id': 'select-point-lamps',
+ 'type': 'symbol',
+ 'source': 'selectedPoints',
+ 'layout': {
+ 'icon-allow-overlap': true,
+ 'icon-image': 'lamp',
+ 'icon-size': 0.15
+
+ },
+ 'filter': ['==', 'type', 'street lamp'],
+ });
+
+ map.addLayer({
+ 'id': 'select-point-buildings',
+ 'type': 'symbol',
+ 'source': 'selectedPoints',
+ 'filter': ['==', 'type', 'high rise building'],
+ 'layout': {
+ 'icon-allow-overlap': true,
+ 'icon-image': 'house',
+ 'icon-size': 0.15
+ }
+ });
+
+ map.addLayer({
+ 'id': 'select-point-data-center',
+ 'type': 'symbol',
+ 'source': 'selectedPoints',
+ 'filter': ['==', 'type', 'data center'],
+ 'layout': {
+ 'icon-allow-overlap': true,
+ 'icon-image': 'data-center',
+ 'icon-size': 0.15
+ }
+ });
+
+ map.addLayer({
+ 'id': 'select-point-factory',
+ 'type': 'symbol',
+ 'source': 'selectedPoints',
+ 'filter': ['==', 'type', 'factory'],
+ 'layout': {
+ 'icon-allow-overlap': true,
+ 'icon-image': 'factory',
+ 'icon-size': 0.3
+ }
+ });
+
//alarm layers
map.addLayer({
'layout': {
'icon-allow-overlap': true,
'icon-image': 'lamp-red',
- 'icon-size': 0.1
+ 'icon-size': 0.15
},
'filter': createFilter("street lamp"),
'layout': {
'icon-allow-overlap': true,
'icon-image': 'house-red',
- 'icon-size': 0.1
+ 'icon-size': 0.15
}
});
'filter': createFilter("data center"),
'layout': {
'icon-allow-overlap': true,
- 'icon-image': 'data-center_red',
- 'icon-size': 0.1
+ 'icon-image': 'data-center-red',
+ 'icon-size': 0.15
} });
map.addLayer({
'layout': {
'icon-allow-overlap': true,
'icon-image': 'factory-red',
- 'icon-size': 0.2
+ 'icon-size': 0.3
}
});
-
-
map.addLayer({
id: 'point-remaining',
source: 'points',
'circle-stroke-color': '#fff'
}
});
-
- map.addLayer({
- 'id': 'select-point-lamps',
- 'type': 'symbol',
- 'source': 'selectedPoints',
- 'layout': {
- 'icon-allow-overlap': true,
- 'icon-image': 'lamp',
- 'icon-size': 0.15
-
- },
- 'filter': ['==', 'type', 'street lamp'],
- });
-
- map.addLayer({
- 'id': 'select-point-buildings',
- 'type': 'symbol',
- 'source': 'selectedPoints',
- 'filter': ['==', 'type', 'high rise building'],
- 'layout': {
- 'icon-allow-overlap': true,
- 'icon-image': 'house',
- 'icon-size': 0.15
- }
- });
-
- map.addLayer({
- 'id': 'select-point-data-center',
- 'type': 'symbol',
- 'source': 'selectedPoints',
- 'filter': ['==', 'type', 'data center'],
- 'layout': {
- 'icon-allow-overlap': true,
- 'icon-image': 'data-center',
- 'icon-size': 0.15
- }
- });
-
-
- map.addLayer({
- 'id': 'select-point-factory',
- 'type': 'symbol',
- 'source': 'selectedPoints',
- 'filter': ['==', 'type', 'factory'],
- 'layout': {
- 'icon-allow-overlap': true,
- 'icon-image': 'factory',
- 'icon-size': 0.3
- }
- });
}
const addCommonLayers = (map: mapboxgl.Map) =>{
target: "http://localhost:3001",
secure: false
},
+ "/tiles/": {
+ target: "http://www.openstreetmap.org",
+ secure: false
+ },
"/help/": {
target: "http://10.20.6.29:8181",
secure: false
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
</licenses>
<dependencies>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-odlux-core-provider</artifactId>
<version>${project.version}</version>
</dependency>
+
</dependencies>
</project>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
</dependencies>
<build>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
- <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+ <artifactId>sdnr-wt-common</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-odlux-core-model</artifactId>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
*/
package org.onap.ccsdk.features.sdnr.odlux.test;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.io.IOException;
-import java.io.StringWriter;
import java.net.HttpURLConnection;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.test.ServletOutputStreamToStringWriter;
import org.onap.ccsdk.features.sdnr.wt.odlux.OdluxBundleLoaderImpl;
import org.onap.ccsdk.features.sdnr.wt.odlux.ResFilesServlet;
import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundle;
HttpServletRequest req = mock(HttpServletRequest.class);
HttpServletResponse resp = mock(HttpServletResponse.class);
when(req.getRequestURI()).thenReturn(res);
- StringWriter out = new StringWriter();
- ServletOutputStream printOut = new ServletOutputStream() {
-
- @Override
- public void write(int arg0) throws IOException {
- out.write(arg0);
- }
-
- @Override
- public boolean isReady() {
- return false;
- }
-
- @Override
- public void setWriteListener(WriteListener writeListener) {
-
- }
- };
+ ServletOutputStreamToStringWriter printOut = new ServletOutputStreamToStringWriter();
try {
when(resp.getOutputStream()).thenReturn(printOut);
servlet.doGet(req, resp);
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<properties>
<buildtime>${maven.build.timestamp}</buildtime>
<distversion>ONAP Frankfurt (Neon, mdsal ${odl.mdsal.version})</distversion>
- <buildno>86.51a94bd(20/11/17)</buildno>
+ <buildno>88.1c38886(20/12/04)</buildno>
<odlux.version>ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version}</odlux.version>
</properties>
<token>##odlux.version##</token>
<value>${odlux.version}</value>
</replacement>
- <replacement>
+ <replacement>
<token>##buildno##</token>
<value>${buildno}</value>
</replacement>
}\r
}\r
\r
+export const transportPCEUrl = "transportPCEUrl";\r
+\r
export const runApplication = () => {\r
const applicationStore = applicationStoreCreator();\r
\r
startHistoryListener(applicationStore);\r
startForceLogoutService(applicationStore);\r
startNotificationService(applicationStore);\r
+ addTransportPCEUrl();\r
\r
const App = (): JSX.Element => (\r
<ApplicationStoreProvider applicationStore={applicationStore} >\r
ReactDOM.render(<App />, document.getElementById('app'));\r
\r
};\r
+\r
+const addTransportPCEUrl = () =>{\r
+ const url = window.localStorage.getItem(transportPCEUrl);\r
+ if(url === null){\r
+ window.localStorage.setItem(transportPCEUrl, "http://10.20.6.32:18082/");\r
+ console.log("set transport url :D")\r
+ }\r
+}\r
{
- "version":"86.51a94bd(20/11/17)",
- "build":"2020-11-17T11:13:24Z"
-
+ "version":"88.1c38886(20/12/04)",
+ "build":"2020-12-04T06:06:24Z"
}
\ No newline at end of file
import Menu from '@material-ui/core/Menu';
import { lighten } from '@material-ui/core/styles/colorManipulator';
import { SvgIconProps } from '@material-ui/core/SvgIcon/SvgIcon';
+import { Button } from '@material-ui/core';
const styles = (theme: Theme) => createStyles({
root: {
secondary?: React.ComponentType;\r
to: string;\r
exact?: boolean;\r
+ external?: boolean;\r
}\r
\r
export const ListItemLink = withStyles(styles)((props: IListItemLinkProps) => {\r
- const { icon, primary: Primary, secondary: Secondary, classes, to, exact = false } = props;\r
- const renderLink = (itemProps: any): JSX.Element => (<NavLink exact={ exact } to={ to } activeClassName={ classes.active } { ...itemProps } />);\r
+ const { icon, primary: Primary, secondary: Secondary, classes, to, exact = false, external=false } = props;\r
+ const renderLink = (itemProps: any): JSX.Element => (\r
+ props.external ? <a target="_blank" href={to} { ...itemProps }></a> :\r
+ <NavLink exact={ exact } to={ to } activeClassName={ classes.active } { ...itemProps } />);\r
\r
const ariaLabel = typeof Primary === 'string' ? "link-to-"+Primary.toLowerCase().replace(/\s/g, "-") : "link-to-"+Primary.displayName?.toLowerCase();\r
return (\r
import Divider from '@material-ui/core/Divider';\r
\r
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';\r
+import { faProjectDiagram } from '@fortawesome/free-solid-svg-icons';\r
\r
import ListItemLink from '../components/material-ui/listItemLink';\r
\r
import connect, { Connect } from '../flux/connect';\r
import { MenuAction } from '../actions/menuAction';\r
import * as classNames from 'classnames';\r
+import { transportPCEUrl } from '../app';\r
\r
\r
const drawerWidth = 240;\r
window.dispatchEvent(new Event('menu-resized'));\r
}, [isOpen])\r
\r
+ let menuItems = state.framework.applicationRegistraion && Object.keys(state.framework.applicationRegistraion).map(key => {\r
+ const reg = state.framework.applicationRegistraion[key];\r
+ return reg && (\r
+ <ListItemLink\r
+ key={reg.name}\r
+ to={reg.path || `/${reg.name}`}\r
+ primary={reg.menuEntry || reg.name}\r
+ secondary={reg.subMenuEntry}\r
+ icon={reg.icon && <FontAwesomeIcon icon={reg.icon} /> || null} />\r
+ ) || null;\r
+ }) || null;\r
+\r
+ const transportPCELink = <ListItemLink\r
+ key={"transportPCE"}\r
+ to={window.localStorage.getItem(transportPCEUrl)!}\r
+ primary={"TransportPCE"}\r
+ icon={<FontAwesomeIcon icon={faProjectDiagram}/>} \r
+ external/>;\r
+\r
+ const linkFound = menuItems.find(obj=>obj.key === "linkCalculation");\r
+ if(linkFound){\r
+ const index = menuItems.indexOf(linkFound);\r
+ menuItems.splice(index+1,0,transportPCELink);\r
+ }else{\r
+ menuItems.push(transportPCELink);\r
+ }\r
+\r
return (\r
<Drawer\r
variant="permanent"\r
<ListItemLink exact to="/" primary="Home" icon={<FontAwesomeIcon icon={faHome} />} />\r
<Divider />\r
{\r
- state.framework.applicationRegistraion && Object.keys(state.framework.applicationRegistraion).map(key => {\r
- const reg = state.framework.applicationRegistraion[key];\r
- return reg && (\r
- <ListItemLink\r
- key={reg.name}\r
- to={reg.path || `/${reg.name}`}\r
- primary={reg.menuEntry || reg.name}\r
- secondary={reg.subMenuEntry}\r
- icon={reg.icon && <FontAwesomeIcon icon={reg.icon} /> || null} />\r
- ) || null;\r
- }) || null\r
+ menuItems\r
}\r
<Divider />\r
<ListItemLink to="/about" primary="About" icon={<FontAwesomeIcon icon={faAddressBook} />} />\r
import { ApplicationStore } from '../store/applicationStore';
import { SetWebsocketAction } from '../actions/websocketAction';
-const socketUrl = [location.protocol === 'https:' ? 'wss://' : 'ws://', 'admin', ':', 'admin', '@', location.hostname, ':', location.port, '/websocket'].join('');
+const socketUrl = [location.protocol === 'https:' ? 'wss://' : 'ws://', location.hostname, ':', location.port, '/websocket'].join('');
const subscriptions: { [scope: string]: SubscriptionCallback[] } = {};
let socketReady: Promise<WebSocket>;
let userLoggedOut = false;
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
<type>jar</type>
<overWrite>false</overWrite>
</artifactItem>
- <!-- networkMapApp-->
+ <!-- networkMapApp-->
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-odlux-app-networkMapApp</artifactId>
<type>jar</type>
<overWrite>false</overWrite>
</artifactItem>
- <!-- linkCalculationApp-->
+ <!-- linkCalculationApp-->
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-odlux-app-linkCalculationApp</artifactId>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<relativePath/>
</parent>
Code Review / ccsdk / features.git / commitdiff