diff options
author | Aijana Schumann <aijana.schumann@highstreet-technologies.com> | 2021-02-18 10:55:11 +0100 |
---|---|---|
committer | Aijana Schumann <aijana.schumann@highstreet-technologies.com> | 2021-02-18 10:55:11 +0100 |
commit | f333557c8bf0a74eb7b88d6294dea2a420b1ec61 (patch) | |
tree | 696dabd7e02e97f53ff936e54543a31944696c3d /sdnr/wt/odlux/apps/networkMapApp/src/actions | |
parent | 5cf15b27796b68b3edbfc1e59f258dee1e10b2b9 (diff) |
Update NetworkMap and LinkCalculator
Update NetworkMap and LinkCalculator to use the topology-server-v2 API, minior bugfixes for NetworkMap
Issue-ID: CCSDK-3172
Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Change-Id: Ia5690c5039d7a9431443bc131fe398cc79d08287
Diffstat (limited to 'sdnr/wt/odlux/apps/networkMapApp/src/actions')
3 files changed, 16 insertions, 9 deletions
diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/actions/detailsAction.ts b/sdnr/wt/odlux/apps/networkMapApp/src/actions/detailsAction.ts index afa8ee41e..34cf10915 100644 --- a/sdnr/wt/odlux/apps/networkMapApp/src/actions/detailsAction.ts +++ b/sdnr/wt/odlux/apps/networkMapApp/src/actions/detailsAction.ts @@ -20,14 +20,14 @@ import { Action } from '../../../../framework/src/flux/action'; import { requestRest } from '../../../../framework/src/services/restService'; -import { site, Device } from "../model/site"; +import { Site, Device } from "../model/site"; import { link } from '../model/link'; import { HistoryEntry } from "../model/historyEntry"; import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore'; import { Dispatch } from '../../../../framework/src/flux/store'; export class SelectSiteAction extends Action { - constructor(public site: site){ + constructor(public site: Site){ super() } } @@ -74,6 +74,12 @@ export class ClearLoadedDevicesAction extends Action{ } } +export class InitializeLoadedDevicesAction extends Action{ + constructor(public devices: Device[]){ + super(); + } +} + let running=false; export const UpdateDetailsView = (nodeId: string) =>(dispatcher: Dispatch, getState: () => IApplicationStoreState) =>{ @@ -92,7 +98,6 @@ export const UpdateDetailsView = (nodeId: string) =>(dispatcher: Dispatch, getSt dispatcher(new FinishedLoadingDeviceListAction(checkedDevices)); }); - } } diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/actions/mapActions.ts b/sdnr/wt/odlux/apps/networkMapApp/src/actions/mapActions.ts index b8af40b0c..9830c06e4 100644 --- a/sdnr/wt/odlux/apps/networkMapApp/src/actions/mapActions.ts +++ b/sdnr/wt/odlux/apps/networkMapApp/src/actions/mapActions.ts @@ -21,7 +21,7 @@ import { Dispatch } from '../../../../framework/src/flux/store'; import { link } from "../model/link"; -import { site } from "../model/site"; +import { Site } from "../model/site"; import { Feature } from '../model/Feature'; import { URL_API } from '../config'; @@ -33,7 +33,7 @@ export class HighlightLinkAction extends Action{ } export class HighlightSiteAction extends Action{ - constructor(public site: site){ + constructor(public site: Site){ super(); } } @@ -51,7 +51,7 @@ export class ZoomToSearchResultAction extends Action{ } export class AddAlarmAction extends Action{ - constructor(public element: Feature){ + constructor(public site: Site){ super(); } } @@ -75,7 +75,8 @@ export class SetIconSwitchAction extends Action{ } export const findSiteToAlarm = (alarmedNodeId: string) => (dispatcher: Dispatch) =>{ - fetch(URL_API+"/site/geojson/device/"+alarmedNodeId) + //TODO: fix! + fetch(URL_API+"/sites/devices/"+alarmedNodeId) .then(res => res.json()) .then(result=>{ dispatcher(new AddAlarmAction(result)); diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/actions/popupActions.ts b/sdnr/wt/odlux/apps/networkMapApp/src/actions/popupActions.ts index ff8d07921..a8c54d4df 100644 --- a/sdnr/wt/odlux/apps/networkMapApp/src/actions/popupActions.ts +++ b/sdnr/wt/odlux/apps/networkMapApp/src/actions/popupActions.ts @@ -16,6 +16,7 @@ * ============LICENSE_END========================================================================== */ +import { PopupElement } from '../model/popupElements'; import { Action } from '../../../../framework/src/flux/action'; export class SetPopupPositionAction extends Action { @@ -25,7 +26,7 @@ export class SetPopupPositionAction extends Action { } export class SelectMultipleLinksAction extends Action { - constructor(public ids: string[]) { + constructor(public elements: PopupElement[]) { super(); } } @@ -33,7 +34,7 @@ export class SelectMultipleLinksAction extends Action { export class SelectMultipleSitesAction extends Action { - constructor(public ids: string[]) { + constructor(public elements: PopupElement[]) { super(); } }
\ No newline at end of file |