aboutsummaryrefslogtreecommitdiffstats
path: root/sdnr/wt/odlux/apps/mediatorApp/src
diff options
context:
space:
mode:
authorHerbert Eiselt <herbert.eiselt@highstreet-technologies.com>2019-03-28 19:00:35 +0100
committerHerbert Eiselt <herbert.eiselt@highstreet-technologies.com>2019-03-28 19:01:01 +0100
commit62e834802dae0bd15504785503060d7875c7b4ad (patch)
tree0b3d3ae0c62b279773a2aea3daebcad5f8ad78a2 /sdnr/wt/odlux/apps/mediatorApp/src
parentf2bb490d9c82decbdb50c1e4db1be2f34b28d097 (diff)
Add SDN-R odlux performance
A UI displaying performance monitoring data Change-Id: I2a9c28549aee1bcac366354c343a63f884bf09e0 Issue-ID: SDNC-585 Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
Diffstat (limited to 'sdnr/wt/odlux/apps/mediatorApp/src')
-rw-r--r--sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorConfigActions.ts16
-rw-r--r--sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts6
-rw-r--r--sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx22
-rw-r--r--sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx34
-rw-r--r--sdnr/wt/odlux/apps/mediatorApp/src/handlers/avaliableMediatorServersHandler.ts4
-rw-r--r--sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorAppRootHandler.ts2
-rw-r--r--sdnr/wt/odlux/apps/mediatorApp/src/plugin.tsx14
-rw-r--r--sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx14
-rw-r--r--sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx10
9 files changed, 60 insertions, 62 deletions
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorConfigActions.ts b/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorConfigActions.ts
index fcfc63e22..058110614 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorConfigActions.ts
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorConfigActions.ts
@@ -38,11 +38,11 @@ export class RemoveMediatorConfig extends BaseAction {
export const startMediatorByNameAsyncActionCreator = (name: string) => (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
dispatch(new SetMediatorBusyByName(name, true));
- const { mediatorApp: { mediatorServerState: { url } } } = getState();
+ const { mediator: { mediatorServerState: { url } } } = getState();
if (url) {
mediatorService.startMediatorByName(url, name).then(msg => {
dispatch(new AddSnackbarNotification({ message: msg + ' ' + name, options: { variant: 'info' } }));
- // since there is no notification, a timeout will be need here
+ // since there is no notification, a timeout will be need here
window.setTimeout(() => {
mediatorService.getMediatorServerConfigByName(url, name).then(config => {
if (config) {
@@ -62,11 +62,11 @@ export const startMediatorByNameAsyncActionCreator = (name: string) => (dispatch
export const stopMediatorByNameAsyncActionCreator = (name: string) => (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
dispatch(new SetMediatorBusyByName(name, true));
- const { mediatorApp: { mediatorServerState: { url } } } = getState();
+ const { mediator: { mediatorServerState: { url } } } = getState();
if (url) {
mediatorService.stopMediatorByName(url, name).then(msg => {
dispatch(new AddSnackbarNotification({ message: msg + ' ' + name, options: { variant: 'info' } }));
- // since there is no notification, a timeout will be need here
+ // since there is no notification, a timeout will be need here
window.setTimeout(() => {
mediatorService.getMediatorServerConfigByName(url, name).then(config => {
if (config) {
@@ -86,11 +86,11 @@ export const stopMediatorByNameAsyncActionCreator = (name: string) => (dispatch:
export const addMediatorConfigAsyncActionCreator = (config: MediatorConfig) => (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
const { Name: name } = config;
- const { mediatorApp: { mediatorServerState: { url } } } = getState();
+ const { mediator: { mediatorServerState: { url } } } = getState();
if (url) {
mediatorService.createMediatorConfig(url, config).then(msg => {
dispatch(new AddSnackbarNotification({ message: msg + ' ' + name, options: { variant: 'info' } }));
- // since there is no notification, a timeout will be need here
+ // since there is no notification, a timeout will be need here
window.setTimeout(() => {
mediatorService.getMediatorServerConfigByName(url, name).then(config => {
if (config) {
@@ -112,11 +112,11 @@ export const updateMediatorConfigAsyncActionCreator = (config: MediatorConfig) =
export const removeMediatorConfigAsyncActionCreator = (config: MediatorConfig) => (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
const { Name: name } = config;
- const { mediatorApp: { mediatorServerState: { url } } } = getState();
+ const { mediator: { mediatorServerState: { url } } } = getState();
if (url) {
mediatorService.deleteMediatorConfigByName(url, name).then(msg => {
dispatch(new AddSnackbarNotification({ message: msg + ' ' + name, options: { variant: 'info' } }));
- // since there is no notification, a timeout will be need here
+ // since there is no notification, a timeout will be need here
window.setTimeout(() => {
mediatorService.getMediatorServerConfigByName(url, config.Name).then(config => {
if (!config) {
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts b/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts
index b8e8c7e94..e7719aac5 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/actions/mediatorServerActions.ts
@@ -62,11 +62,11 @@ export const initializeMediatorServerAsyncActionCreator = (serverId: string) =>
if (!mediatorServer) {
dispatch(new SetMediatorServerBusy(false));
dispatch(new AddSnackbarNotification({ message: `Error loading mediator server [${serverId}]`, options: { variant: 'error' } }));
- dispatch(new NavigateToApplication("mediatorApp"));
- return;
+ dispatch(new NavigateToApplication("mediator"));
+ return;
}
dispatch(new SetMediatorServerInfo(mediatorServer.name, mediatorServer.url));
-
+
mediatorService.getMediatorServerVersion(mediatorServer.url).then(versionInfo => {
dispatch(new SetMediatorServerVersion(versionInfo));
});
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx
index c1167c4a7..ef12ee253 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorConfigDialog.tsx
@@ -78,7 +78,7 @@ export enum EditMediatorConfigDialogMode {
}
const mapProps = (state: IApplicationStoreState) => ({
- supportedDevices: state.mediatorApp.mediatorServerState.supportedDevices
+ supportedDevices: state.mediator.mediatorServerState.supportedDevices
});
const mapDispatch = (dispatcher: IDispatcher) => ({
@@ -182,7 +182,7 @@ class EditMediatorConfigDialogComponent extends React.Component<EditMediatorConf
<Tab label="Config" />
<Tab label="ODL AutoConnect" />
</Tabs>
- { this.state.activeTab === 0 ? <TabContainer >
+ {this.state.activeTab === 0 ? <TabContainer >
<TextField disabled={setting.readonly || setting.readonlyName} spellCheck={false} autoFocus margin="dense" id="name" label="Name" type="text" fullWidth value={this.state.Name} onChange={(event) => { this.setState({ Name: event.target.value }); }} />
<FormControl fullWidth disabled={setting.readonly}>
<InputLabel htmlFor="deviceType">Device</InputLabel>
@@ -204,15 +204,15 @@ class EditMediatorConfigDialogComponent extends React.Component<EditMediatorConf
{this.props.supportedDevices.map(device => (<MenuItem key={device.id} value={device.id} >{`${device.vendor} - ${device.device} (${device.version || '0.0.0'}) `}</MenuItem>))}
</Select>
</FormControl>
- <TextField disabled={setting.readonly} spellCheck={false} autoFocus margin="dense" id="ipAddress" label="IP Address" type="text" fullWidth value={this.state.DeviceIp} onChange={(event) => { this.setState({ DeviceIp: event.target.value }); }} />
- <TextField disabled={setting.readonly} spellCheck={false} autoFocus margin="dense" id="devicePort" label="Port" type="number" fullWidth value={this.state.DevicePort || ""} onChange={(event) => { this.setState({ DevicePort: +event.target.value }); }} />
+ <TextField disabled={setting.readonly} spellCheck={false} autoFocus margin="dense" id="ipAddress" label="Device IP" type="text" fullWidth value={this.state.DeviceIp} onChange={(event) => { this.setState({ DeviceIp: event.target.value }); }} />
+ <TextField disabled={setting.readonly} spellCheck={false} autoFocus margin="dense" id="devicePort" label="Device SNMP Port" type="number" fullWidth value={this.state.DevicePort || ""} onChange={(event) => { this.setState({ DevicePort: +event.target.value }); }} />
<TextField disabled={setting.readonly} spellCheck={false} autoFocus margin="dense" id="trapsPort" label="TrapsPort" type="number" fullWidth value={this.state.TrapPort || ""} onChange={(event) => { this.setState({ TrapPort: +event.target.value }); }} />
<TextField disabled={setting.readonly} spellCheck={false} autoFocus margin="dense" id="ncUser" label="Netconf User" type="text" fullWidth value={this.state.NcUsername} onChange={(event) => { this.setState({ NcUsername: event.target.value }); }} />
<TextField disabled={setting.readonly} spellCheck={false} autoFocus margin="dense" id="ncPassword" label="Netconf Password" type="password" fullWidth value={this.state.NcPassword} onChange={(event) => { this.setState({ NcPassword: event.target.value }); }} />
<TextField disabled={setting.readonly} spellCheck={false} autoFocus margin="dense" id="ncPort" label="Netconf Port" type="number" fullWidth value={this.state.NcPort || ""} onChange={(event) => { this.setState({ NcPort: +event.target.value }); }} />
</TabContainer> : null}
- { this.state.activeTab === 1 ? <TabContainer >
- { this.state.ODLConfig && this.state.ODLConfig.length > 0
+ {this.state.activeTab === 1 ? <TabContainer >
+ {this.state.ODLConfig && this.state.ODLConfig.length > 0
? this.state.ODLConfig.map((cfg, ind) => {
const panelId = `panel-${ind}`;
const deleteButton = (<IconButton onClick={() => {
@@ -227,15 +227,15 @@ class EditMediatorConfigDialogComponent extends React.Component<EditMediatorConf
<Panel title={cfg.Server && `${cfg.User ? `${cfg.User}@` : ''}${cfg.Protocol}://${cfg.Server}:${cfg.Port}` || "new odl config"} key={panelId} panelId={panelId} activePanel={this.state.activeOdlConfig} customActionButtons={[deleteButton]}
onToggle={(id) => this.setState({ activeOdlConfig: (this.state.activeOdlConfig === id) ? "" : (id || "") })} >
<div className={classes.alignInOneLine}>
- <FormControl className={classes.left} margin={"dense"} >
+ <FormControl className={classes.left} margin={"dense"} >
<InputLabel htmlFor={`protocol-${ind}`}>Protocoll</InputLabel>
- <Select value={cfg.Protocol} onChange={ this.odlConfigValueChangeHandlerCreator(ind, "Protocol", e => (e.target.value)) } inputProps={{ name: `protocol-${ind}`, id: `protocol-${ind}` }} fullWidth >
+ <Select value={cfg.Protocol} onChange={this.odlConfigValueChangeHandlerCreator(ind, "Protocol", e => (e.target.value))} inputProps={{ name: `protocol-${ind}`, id: `protocol-${ind}` }} fullWidth >
<MenuItem value={"http"}>http</MenuItem>
<MenuItem value={"https"}>https</MenuItem>
</Select>
</FormControl>
<TextField className={classes.left} spellCheck={false} margin="dense" id="hostname" label="Hostname" type="text" value={cfg.Server} onChange={this.odlConfigValueChangeHandlerCreator(ind, "Server", e => e.target.value)} />
- <TextField className={classes.right} style={{ maxWidth: "65px"}} spellCheck={false} margin="dense" id="port" label="Port" type="number" value={cfg.Port|| ""} onChange={this.odlConfigValueChangeHandlerCreator(ind, "Port", e => +e.target.value)} />
+ <TextField className={classes.right} style={{ maxWidth: "65px" }} spellCheck={false} margin="dense" id="port" label="Port" type="number" value={cfg.Port || ""} onChange={this.odlConfigValueChangeHandlerCreator(ind, "Port", e => +e.target.value)} />
</div>
<div className={classes.alignInOneLine}>
<TextField className={classes.left} spellCheck={false} margin="dense" id="username" label="Username" type="text" value={cfg.User} onChange={this.odlConfigValueChangeHandlerCreator(ind, "User", e => e.target.value)} />
@@ -310,6 +310,4 @@ class EditMediatorConfigDialogComponent extends React.Component<EditMediatorConf
}
export const EditMediatorConfigDialog = withStyles(styles)(connect(mapProps, mapDispatch)(EditMediatorConfigDialogComponent));
-export default EditMediatorConfigDialog;
-
-
+export default EditMediatorConfigDialog; \ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx
index 3937e9731..39f9036a6 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/components/editMediatorServerDialog.tsx
@@ -49,14 +49,14 @@ const settings: { [key: string]: DialogSettings } = {
readonly: true,
},
[EditMediatorServerDialogMode.AddMediatorServer]: {
- dialogTitle: "Add Medator Server",
+ dialogTitle: "Add Mediator Server",
dialogDescription: "",
applyButtonText: "Add",
cancelButtonText: "Cancel",
readonly: false,
},
[EditMediatorServerDialogMode.EditMediatorServer]: {
- dialogTitle: "Edit Medator Server",
+ dialogTitle: "Edit Mediator Server",
dialogDescription: "",
applyButtonText: "Update",
cancelButtonText: "Cancel",
@@ -71,18 +71,18 @@ const settings: { [key: string]: DialogSettings } = {
},
};
-type EditMediatorServerDialogComponentProps = Connect<undefined,typeof mapDispatch> & {
+type EditMediatorServerDialogComponentProps = Connect<undefined, typeof mapDispatch> & {
mode: EditMediatorServerDialogMode;
mediatorServer: MediatorServer;
onClose: () => void;
};
-type EditMediatorServerDialogComponentState = MediatorServer ;
+type EditMediatorServerDialogComponentState = MediatorServer;
class EditMediatorServerDialogComponent extends React.Component<EditMediatorServerDialogComponentProps, EditMediatorServerDialogComponentState> {
- constructor(props: EditMediatorServerDialogComponentProps) {
+ constructor (props: EditMediatorServerDialogComponentProps) {
super(props);
-
+
this.state = {
...this.props.mediatorServer
};
@@ -91,18 +91,18 @@ class EditMediatorServerDialogComponent extends React.Component<EditMediatorServ
render(): JSX.Element {
const setting = settings[this.props.mode];
return (
- <Dialog open={ this.props.mode !== EditMediatorServerDialogMode.None }>
- <DialogTitle id="form-dialog-title">{ setting.dialogTitle }</DialogTitle>
+ <Dialog open={this.props.mode !== EditMediatorServerDialogMode.None}>
+ <DialogTitle id="form-dialog-title">{setting.dialogTitle}</DialogTitle>
<DialogContent>
<DialogContentText>
- { setting.dialogDescription }
+ {setting.dialogDescription}
</DialogContentText>
- <TextField disabled spellCheck={false} autoFocus margin="dense" id="id" label="Id" type="text" fullWidth value={ this.state._id } onChange={(event)=>{ this.setState({_id: event.target.value}); } } />
- <TextField disabled={ setting.readonly } spellCheck={false} margin="dense" id="name" label="Name" type="text" fullWidth value={ this.state.name } onChange={(event)=>{ this.setState({name: event.target.value}); } }/>
- <TextField disabled={ setting.readonly } spellCheck={false} margin="dense" id="url" label="Url" type="text" fullWidth value={ this.state.url } onChange={(event)=>{ this.setState({url: event.target.value}); } }/>
- </DialogContent>
+ {/* <TextField disabled spellCheck={false} autoFocus margin="dense" id="id" label="Id" type="text" fullWidth value={ this.state._id } onChange={(event)=>{ this.setState({_id: event.target.value}); } } /> */}
+ <TextField disabled={setting.readonly} spellCheck={false} margin="dense" id="name" label="Name" type="text" fullWidth value={this.state.name} onChange={(event) => { this.setState({ name: event.target.value }); }} />
+ <TextField disabled={setting.readonly} spellCheck={false} margin="dense" id="url" label="Url" type="text" fullWidth value={this.state.url} onChange={(event) => { this.setState({ url: event.target.value }); }} />
+ </DialogContent>
<DialogActions>
- <Button onClick={ (event) => {
+ <Button onClick={(event) => {
this.onApply({
_id: this.state._id,
name: this.state.name,
@@ -110,12 +110,12 @@ class EditMediatorServerDialogComponent extends React.Component<EditMediatorServ
});
event.preventDefault();
event.stopPropagation();
- } } > { setting.applyButtonText } </Button>
- <Button onClick={ (event) => {
+ }} > {setting.applyButtonText} </Button>
+ <Button onClick={(event) => {
this.onCancel();
event.preventDefault();
event.stopPropagation();
- } } color="secondary"> { setting.cancelButtonText } </Button>
+ }} color="secondary"> {setting.cancelButtonText} </Button>
</DialogActions>
</Dialog>
)
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/handlers/avaliableMediatorServersHandler.ts b/sdnr/wt/odlux/apps/mediatorApp/src/handlers/avaliableMediatorServersHandler.ts
index 447e5e5bd..244a9d185 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/handlers/avaliableMediatorServersHandler.ts
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/handlers/avaliableMediatorServersHandler.ts
@@ -15,5 +15,5 @@ export const {
createProperties: createAvaliableMediatorServersProperties,
reloadAction: avaliableMediatorServersReloadAction,
- // set value action, to change a value
-} = createExternal<MediatorServer>(avaliableMediatorServersSearchHandler, appState => appState.mediatorApp.avaliableMediatorServers); \ No newline at end of file
+ // set value action, to change a value
+} = createExternal<MediatorServer>(avaliableMediatorServersSearchHandler, appState => appState.mediator.avaliableMediatorServers); \ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorAppRootHandler.ts b/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorAppRootHandler.ts
index bfebbdf5d..b64c0a72a 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorAppRootHandler.ts
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/handlers/mediatorAppRootHandler.ts
@@ -13,7 +13,7 @@ export interface IMediatorAppStoreState {
declare module '../../../../framework/src/store/applicationStore' {
interface IApplicationStoreState {
- mediatorApp: IMediatorAppStoreState
+ mediator: IMediatorAppStoreState
}
}
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/plugin.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/plugin.tsx
index 0878fee65..7f440a2ae 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/plugin.tsx
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/plugin.tsx
@@ -16,7 +16,7 @@ import { MediatorApplication } from "./views/mediatorApplication";
import { MediatorServerSelection } from "./views/mediatorServerSelection";
import { initializeMediatorServerAsyncActionCreator } from "./actions/mediatorServerActions";
-let currentMediatorServerId: string | undefined = undefined;
+let currentMediatorServerId: string | undefined = undefined;
const mapDisp = (dispatcher: IDispatcher) => ({
loadMediatorServer : (mediatorServerId: string) => dispatcher.dispatch(initializeMediatorServerAsyncActionCreator(mediatorServerId)),
@@ -24,7 +24,7 @@ const mapDisp = (dispatcher: IDispatcher) => ({
const MediatorServerRouteAdapter = connect(undefined, mapDisp)((props: RouteComponentProps<{ mediatorServerId: string }> & Connect<undefined, typeof mapDisp>) => {
if (currentMediatorServerId !== props.match.params.mediatorServerId) {
- // route parameter has changed
+ // route parameter has changed
currentMediatorServerId = props.match.params.mediatorServerId || undefined;
// Hint: This timeout is need, since it is not recommended to change the state while rendering is in progress !
window.setTimeout(() => {
@@ -42,21 +42,21 @@ type AppProps = RouteComponentProps & Connect;
const App = (props: AppProps) => (
<Switch>
- <Route exact path={ `${ props.match.path }` } component={ MediatorServerSelection } />
- <Route path={ `${ props.match.path }/:mediatorServerId` } component={ MediatorServerRouteAdapter } />
+ <Route exact path={ `${ props.match.path }` } component={ MediatorServerSelection } />
+ <Route path={ `${ props.match.path }/:mediatorServerId` } component={ MediatorServerRouteAdapter } />
<Redirect to={ `${ props.match.path }` } />
</Switch>
-);
+);
const FinalApp = withRouter(connect()(App));
export function register() {
const applicationApi = applicationManager.registerApplication({
- name: "mediatorApp",
+ name: "mediator",
icon: faGlobe,
rootComponent: FinalApp,
rootActionHandler: mediatorAppRootHandler,
- menuEntry: "Mediator App"
+ menuEntry: "Mediator"
});
// prefetch all avaliable mediator servers
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx
index 6b1532cc8..95dee8df7 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorApplication.tsx
@@ -50,13 +50,13 @@ const styles = (theme: Theme) => createStyles({
});
const mapProps = (state: IApplicationStoreState) => ({
- serverName: state.mediatorApp.mediatorServerState.name,
- serverUrl: state.mediatorApp.mediatorServerState.url,
- serverVersion: state.mediatorApp.mediatorServerState.serverVersion,
- mediatorVersion: state.mediatorApp.mediatorServerState.mediatorVersion,
- configurations: state.mediatorApp.mediatorServerState.configurations,
- supportedDevices: state.mediatorApp.mediatorServerState.supportedDevices,
- busy: state.mediatorApp.mediatorServerState.busy,
+ serverName: state.mediator.mediatorServerState.name,
+ serverUrl: state.mediator.mediatorServerState.url,
+ serverVersion: state.mediator.mediatorServerState.serverVersion,
+ mediatorVersion: state.mediator.mediatorServerState.mediatorVersion,
+ configurations: state.mediator.mediatorServerState.configurations,
+ supportedDevices: state.mediator.mediatorServerState.supportedDevices,
+ busy: state.mediator.mediatorServerState.busy,
});
const mapDispatch = (dispatcher: IDispatcher) => ({
diff --git a/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx b/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx
index 38bbdecb4..4e221b613 100644
--- a/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx
+++ b/sdnr/wt/odlux/apps/mediatorApp/src/views/mediatorServerSelection.tsx
@@ -37,7 +37,7 @@ const mapProps = (state: IApplicationStoreState) => ({
const mapDispatch = (dispatcher: IDispatcher) => ({
mediatorServersActions: createAvaliableMediatorServersActions(dispatcher.dispatch),
- selectMediatorServer: (mediatorServerId: string) => mediatorServerId && dispatcher.dispatch(new NavigateToApplication("mediatorApp", mediatorServerId)),
+ selectMediatorServer: (mediatorServerId: string) => mediatorServerId && dispatcher.dispatch(new NavigateToApplication("mediator", mediatorServerId)),
});
const emptyMediatorServer: MediatorServer = {
@@ -77,7 +77,7 @@ class MediatorServerSelectionComponent extends React.Component<MediatorServerSel
};
return (
<>
- <MediatorServersTable customActionButtons={[addMediatorServerActionButton]} idProperty={"_id"}
+ <MediatorServersTable customActionButtons={[addMediatorServerActionButton]} idProperty={"_id"}
{...this.props.mediatorServersActions} {...this.props.mediatorServersProperties} columns={[
{ property: "name", title: "Name", type: ColumnType.text },
{ property: "url", title: "Url", type: ColumnType.text },
@@ -90,7 +90,7 @@ class MediatorServerSelectionComponent extends React.Component<MediatorServerSel
)
}
]} onHandleClick={ this.onSelectMediatorServer } />
- <EditMediatorServerDialog
+ <EditMediatorServerDialog
mediatorServer={ this.state.mediatorServerToEdit }
mode={ this.state.mediatorServerEditorMode }
onClose={ this.onCloseEditMediatorServerDialog } />
@@ -103,7 +103,7 @@ class MediatorServerSelectionComponent extends React.Component<MediatorServerSel
event.stopPropagation();
this.props.selectMediatorServer(server && server._id);
- }
+ }
private onEditMediatorServer = (event: React.MouseEvent<HTMLElement>, server: MediatorServer) => {
event.preventDefault();
@@ -121,7 +121,7 @@ class MediatorServerSelectionComponent extends React.Component<MediatorServerSel
mediatorServerEditorMode: EditMediatorServerDialogMode.RemoveMediatorServer,
mediatorServerToEdit: server,
});
- }
+ }
private onCloseEditMediatorServerDialog = () => {
this.setState({