From 1a868116614dd9996c78e69941b537e9da19460b Mon Sep 17 00:00:00 2001 From: Aijana Schumann Date: Tue, 1 Feb 2022 13:18:42 +0100 Subject: Update ODLUX Updated to Material-ui 5, updated dashboard view, removed NetworkMap, LinkCalculator and LineOfSightApp, small bugfixes Issue-ID: CCSDK-3580 Signed-off-by: Aijana Schumann Change-Id: Id0fc148673e23a755cafc2be1c489248c38ff47c --- .../src/handlers/connectivityReducer.ts | 41 ----------- .../networkMapApp/src/handlers/detailsReducer.ts | 76 -------------------- .../apps/networkMapApp/src/handlers/mapReducer.ts | 81 ---------------------- .../networkMapApp/src/handlers/popupReducer.ts | 51 -------------- .../apps/networkMapApp/src/handlers/rootReducer.ts | 53 -------------- .../networkMapApp/src/handlers/searchReducer.ts | 33 --------- .../networkMapApp/src/handlers/settingsReducer.ts | 61 ---------------- 7 files changed, 396 deletions(-) delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/handlers/connectivityReducer.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/handlers/detailsReducer.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/handlers/mapReducer.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/handlers/popupReducer.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/handlers/rootReducer.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/handlers/searchReducer.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/handlers/settingsReducer.ts (limited to 'sdnr/wt/odlux/apps/networkMapApp/src/handlers') diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/connectivityReducer.ts b/sdnr/wt/odlux/apps/networkMapApp/src/handlers/connectivityReducer.ts deleted file mode 100644 index 8ab82f2e9..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/connectivityReducer.ts +++ /dev/null @@ -1,41 +0,0 @@ -/** - * ============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 { IActionHandler } from "../../../../framework/src/flux/action"; -import { IsTopologyServerReachableAction, IsTileServerReachableAction, IsBusycheckingConnectivityAction } from "../actions/connectivityAction"; - - -export type connectivityState = {isToplogyServerAvailable: boolean, isTileServerAvailable: boolean, isBusy: boolean }; - -const initialState: connectivityState = {isToplogyServerAvailable: true, isTileServerAvailable: true, isBusy: true}; - -export const ConnectivityReducer: IActionHandler =(state=initialState, action)=> { - - if(action instanceof IsTopologyServerReachableAction){ - state = Object.assign({}, state, { isToplogyServerAvailable: action.reachable }); - } - else if (action instanceof IsTileServerReachableAction){ - state = Object.assign({}, state, { isTileServerAvailable: action.reachable }); - - }else if(action instanceof IsBusycheckingConnectivityAction){ - state = {...state, isBusy: action.isBusy} - - } - - return state; -} \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/detailsReducer.ts b/sdnr/wt/odlux/apps/networkMapApp/src/handlers/detailsReducer.ts deleted file mode 100644 index 8a7fc6ada..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/detailsReducer.ts +++ /dev/null @@ -1,76 +0,0 @@ -/** - * ============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 { IActionHandler } from '../../../../framework/src/flux/action'; -import { link } from "../model/link"; -import { Site, Device } from "../model/site"; -import { HistoryEntry } from "../model/historyEntry"; -import { SelectSiteAction, SelectLinkAction, AddToHistoryAction, ClearHistoryAction, IsBusyCheckingDeviceListAction, FinishedLoadingDeviceListAction, ClearLoadedDevicesAction, ClearDetailsAction, InitializeLoadedDevicesAction, IsSitedocReachableAction } from '../actions/detailsAction'; - -export type DetailsStoreState={ - data: Site | link | null, - history: HistoryEntry[], - isBusyCheckingDeviceList: boolean, - checkedDevices: Device[], - isSitedocReachable: boolean - -} - -const initialState: DetailsStoreState = { - data: null, - history:[], - isBusyCheckingDeviceList: false, - checkedDevices: [], - isSitedocReachable: false -} - -export const DetailsReducer:IActionHandler=(state = initialState, action)=>{ - - if(action instanceof SelectSiteAction){ - state= Object.assign({}, state, {data: action.site}); - } - else if(action instanceof SelectLinkAction){ - state = Object.assign({}, state, {data: action.link}); - }else if(action instanceof ClearDetailsAction){ - state = Object.assign({}, state, {data: null}); - } - else if(action instanceof AddToHistoryAction){ - state = Object.assign({}, state, {history: [...state.history, action.entry]}) - - }else if(action instanceof ClearHistoryAction){ - state = Object.assign({}, state, {history: []}); - - }else if(action instanceof IsBusyCheckingDeviceListAction){ - state = Object.assign({}, state, {isBusyCheckingDeviceList: action.isBusy}); - }else if (action instanceof FinishedLoadingDeviceListAction){ - state = Object.assign({}, state, {checkedDevices: action.devices}); - - }else if(action instanceof ClearLoadedDevicesAction){ - state = Object.assign({}, state, {checkedDevices: []}); - - }else if(action instanceof InitializeLoadedDevicesAction){ - state = Object.assign({}, state, {checkedDevices: action.devices}); - }else if(action instanceof IsSitedocReachableAction){ - state = Object.assign({}, state, {isSitedocReachable: action.isReachable}); - } - - - return state; - -} - diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/mapReducer.ts b/sdnr/wt/odlux/apps/networkMapApp/src/handlers/mapReducer.ts deleted file mode 100644 index 442a5083c..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/mapReducer.ts +++ /dev/null @@ -1,81 +0,0 @@ -/** - * ============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 { IActionHandler } from '../../../../framework/src/flux/action'; -import { Feature } from "../model/Feature"; -import { HighlightLinkAction, HighlightSiteAction, ZoomToSearchResultAction, AddAlarmAction, SetCoordinatesAction, SetStatistics, SetIconSwitchAction, RemoveHighlightingAction } from '../actions/mapActions'; - -export type location = {lat: number, lon:number} - -export type mapState = { - selectedLink: Feature | null, - selectedSite: Feature | null, - zoomToElement: location | null, - alarmlement: Feature|null, - lat: number, - lon: number, - zoom: number, - statistics:{links: string, sites: string}, - allowIconSwitch: boolean -} - -const initialState: mapState ={ - selectedLink: null, - selectedSite: null, - zoomToElement: null, - alarmlement: null, - lat: 52.5095, - lon: 13.3290, - zoom: 10, - statistics:{links:"Not counted yet.", sites: "Not counted yet."}, - allowIconSwitch: true -} - -export const MapReducer: IActionHandler = (state=initialState, action: any) => { - - if(action instanceof HighlightLinkAction){ - - state = Object.assign({}, state, {selectedSite: null, selectedLink:{type: "Feature", properties:{id:action.link.id, type: action.link.type}, geometry:{type:"LineString", coordinates:[[action.link.locationA.lon,action.link.locationA.lat ],[action.link.locationB.lon,action.link.locationB.lat ]]}}}) - - - } - else if(action instanceof HighlightSiteAction){ - - state = Object.assign({}, state, {selectedLink: null, selectedSite:{type: "Feature", properties: {id: action.site.id, type:action.site.type}, geometry:{type:"Point", coordinates:[action.site.location.lon,action.site.location.lat ]}}}) - - }else if (action instanceof ZoomToSearchResultAction){ - state = Object.assign({}, state, {zoomToElement:{lat: action.lat, lon: action.lon}}); - }else if (action instanceof AddAlarmAction){ - state = Object.assign({}, state, {alarmlement:{type: "Feature", properties: {id: action.site.id, type:action.site.type}, geometry:{type:"Point", coordinates:[action.site.location.lon,action.site.location.lat ]}}}); - - }else if(action instanceof SetCoordinatesAction){ - state = Object.assign({}, state, {lat:action.lat, lon: action.lon, zoom:action.zoom}); - - }else if(action instanceof SetStatistics){ - state = Object.assign({}, state, {statistics:{sites: action.siteCount, links: action.linkCount}}); - - }else if (action instanceof SetIconSwitchAction){ - state = Object.assign({}, state, {allowIconSwitch: action.enable}); - - }else if(action instanceof RemoveHighlightingAction){ - state = Object.assign({}, state, {selectedLink: null, selectedSite:null}) - - } - - return state; -} \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/popupReducer.ts b/sdnr/wt/odlux/apps/networkMapApp/src/handlers/popupReducer.ts deleted file mode 100644 index deb366e09..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/popupReducer.ts +++ /dev/null @@ -1,51 +0,0 @@ -/** - * ============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 { PopupElement } from 'model/popupElements'; -import { IActionHandler } from '../../../../framework/src/flux/action'; -import { SelectMultipleLinksAction, SelectMultipleSitesAction, SetPopupPositionAction } from "../actions/popupActions"; - -export type popupStoreState = { - selectionPendingForElements: PopupElement[], - pendingDataType: "link"|"site"| "", - position: { top: number, left: number } -}; - -const initialState: popupStoreState = { - selectionPendingForElements: [], - pendingDataType: "", - position: { top: 0, left: 0 } -}; - -export const PopupsReducer: IActionHandler = (state = initialState, action) => { - - if(action instanceof SelectMultipleLinksAction){ - state = Object.assign({}, state, { selectionPendingForElements: action.elements, pendingDataType: "link", isSelectionNeeded: true }); - - }else if(action instanceof SelectMultipleSitesAction){ - state = Object.assign({}, state, { selectionPendingForElements: action.elements, pendingDataType: "site", isSelectionNeeded: true }); - - }else if(action instanceof SetPopupPositionAction){ - state= Object.assign({}, state, {position:{top:action.top, left: action.left}}) - - } - - - return state; - -} \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/rootReducer.ts b/sdnr/wt/odlux/apps/networkMapApp/src/handlers/rootReducer.ts deleted file mode 100644 index 697dbd7a0..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/rootReducer.ts +++ /dev/null @@ -1,53 +0,0 @@ -/** - * ============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 { combineActionHandler } from '../../../../framework/src/flux/middleware'; - -import { DetailsReducer, DetailsStoreState } from "./detailsReducer"; -import { PopupsReducer, popupStoreState } from "./popupReducer"; -import { MapReducer, mapState } from "./mapReducer"; -import { SearchReducer, searchState } from "./searchReducer"; -import { connectivityState, ConnectivityReducer } from './connectivityReducer'; -import { SettingsReducer, SettingsState } from './settingsReducer'; - -export interface INetworkAppStoreState{ - details: DetailsStoreState, - popup: popupStoreState, - map: mapState, - search: searchState, - connectivity: connectivityState, - settings: SettingsState -} - -declare module '../../../../framework/src/store/applicationStore' { - interface IApplicationStoreState { - network: INetworkAppStoreState - } - } - -const appHandler = { - details: DetailsReducer, - popup: PopupsReducer, - map: MapReducer, - search: SearchReducer, - connectivity: ConnectivityReducer, - settings: SettingsReducer}; - -export const networkmapRootHandler = combineActionHandler(appHandler) - -export default networkmapRootHandler; \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/searchReducer.ts b/sdnr/wt/odlux/apps/networkMapApp/src/handlers/searchReducer.ts deleted file mode 100644 index 68aade477..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/searchReducer.ts +++ /dev/null @@ -1,33 +0,0 @@ -/** - * ============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 { IActionHandler } from '../../../../framework/src/flux/action'; -import { SetSearchValueAction } from "../actions/searchAction"; - -export type searchState = {value: string}; - -const initialState: searchState = {value: ''}; - -export const SearchReducer: IActionHandler =(state=initialState, action)=> { - - if(action instanceof SetSearchValueAction){ - state = Object.assign({}, state, { value: action.value }); - } - - return state; -} \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/settingsReducer.ts b/sdnr/wt/odlux/apps/networkMapApp/src/handlers/settingsReducer.ts deleted file mode 100644 index 977a379a0..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/handlers/settingsReducer.ts +++ /dev/null @@ -1,61 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2021 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 { NetworkMapSettings, NetworkMapThemes } from "../model/settings"; -import { IActionHandler } from "../../../../framework/src/flux/action"; -import { SetBusyLoadingAction, SetMapSettingsAction, SetSettingsAction, SetThemeSettingsAction } from "../actions/settingsAction"; - -export type SettingsState = { - mapSettings: NetworkMapSettings|null, - themes: NetworkMapThemes, - isLoadingData: boolean -}; - - -const defaultThemes:NetworkMapThemes = {networkMapThemes:{themes: [ - - {key: "light", site: "#11b4da", selectedSite: "#116bda", fiberLink: "#1154d9", microwaveLink: "#039903"}, - {key: "dark", site: "#000000", selectedSite: "#6e6e6e", fiberLink: "#0a2a6b", microwaveLink: "#005200"}, -]}} - -const initialState: SettingsState = { - mapSettings: null, - themes: defaultThemes, - isLoadingData: true - -}; - -export const SettingsReducer: IActionHandler = (state = initialState, action) => { - - if(action instanceof SetSettingsAction){ - state = { - isLoadingData: false, - mapSettings: {networkMap: action.settings.networkMap}, - themes:{networkMapThemes: {themes: action.settings.networkMapThemes.themes}} - }; - }else if(action instanceof SetMapSettingsAction){ - state={...state, mapSettings: action.settings}; - }else if(action instanceof SetThemeSettingsAction){ - state={...state, themes:{networkMapThemes: {themes: action.settings.networkMapThemes.themes}}}; - }else if(action instanceof SetBusyLoadingAction){ - state={...state, isLoadingData: action.busy}; - } - - return state; - -} \ No newline at end of file -- cgit 1.2.3-korg