1 files changed, 95 insertions, 89 deletions
diff --git a/sdnr/wt/odlux/apps/connectApp/src/components/editNetworkElementDialog.tsx b/sdnr/wt/odlux/apps/connectApp/src/components/editNetworkElementDialog.tsx
index 32b23a41e..1e1f11523 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/components/editNetworkElementDialog.tsx
+++ b/sdnr/wt/odlux/apps/connectApp/src/components/editNetworkElementDialog.tsx
@@ -24,46 +24,47 @@ import DialogActions from '@material-ui/core/DialogActions';
 import DialogContent from '@material-ui/core/DialogContent';
 import DialogContentText from '@material-ui/core/DialogContentText';
 import DialogTitle from '@material-ui/core/DialogTitle';
+import { FormControl, InputLabel, Select, MenuItem } from '@material-ui/core';
 
 import { IDispatcher, connect, Connect } from '../../../../framework/src/flux/connect';
 
 import {
-  addToRequiredNetworkElementsAsyncActionCreator,
-  removeFromRequiredNetworkElementsAsyncActionCreator
-} from '../actions/requiredNetworkElementsActions';
+  editNetworkElementAsyncActionCreator,
+  addNewNetworkElementAsyncActionCreator,
+  removeNetworkElementAsyncActionCreator
+} from '../actions/networkElementsActions';
 
 import { unmountNetworkElementAsyncActionCreator, mountNetworkElementAsyncActionCreator } from '../actions/mountedNetworkElementsActions';
-import { RequiredNetworkElementType } from '../models/requiredNetworkElements';
+import { NetworkElementConnection, UpdateNetworkElement } from '../models/networkElementConnection';
+import { removeWebUriAction } from '../actions/commonNetworkElementsActions';
 
 export enum EditNetworkElementDialogMode {
   None = "none",
-  UnknownNetworkElementToRequiredNetworkElements = "unknownNetworkElementToRequiredNetworkElements",
-  RequiredNetworkElementToUnknownNetworkElements = "requiredNetworkElementToUnknownNetworkElements",
-  MountNetworkElementToRequiredNetworkElements = "mountNetworkElementToRequiredNetworkElements",
-  MountNetworkElementToUnknonwNetworkElements = "mountNetworkElementToRequiredUnknownElements",
+  EditNetworkElement = "editNetworkElement",
+  RemoveNetworkElement = "removeNetworkElement",
+  AddNewNetworkElement = "addNewNetworkElement",
   MountNetworkElement = "mountNetworkElement",
   UnmountNetworkElement = "unmountNetworkElement",
 }
 
 const mapDispatch = (dispatcher: IDispatcher) => ({
-  addToRequiredNetworkElements: (element: RequiredNetworkElementType) => {
-    dispatcher.dispatch(addToRequiredNetworkElementsAsyncActionCreator(element));
+  addNewNetworkElement: async (element: NetworkElementConnection) => {
+    await dispatcher.dispatch(addNewNetworkElementAsyncActionCreator(element));
+    await dispatcher.dispatch(mountNetworkElementAsyncActionCreator(element));
   },
-  removeFromRequiredNetworkElements: (element: RequiredNetworkElementType) => {
-    dispatcher.dispatch(removeFromRequiredNetworkElementsAsyncActionCreator(element));
+  mountNetworkElement: (element: NetworkElementConnection) => dispatcher.dispatch(mountNetworkElementAsyncActionCreator(element)),
+  unmountNetworkElement: (element: NetworkElementConnection) => {
+    dispatcher.dispatch(unmountNetworkElementAsyncActionCreator(element && element.nodeId));
   },
-  mountNetworkElement: (element: RequiredNetworkElementType) => {
-    dispatcher.dispatch(mountNetworkElementAsyncActionCreator(element));
+  editNetworkElement: async (element: UpdateNetworkElement, mountElement: NetworkElementConnection) => {
+    await dispatcher.dispatch(editNetworkElementAsyncActionCreator(element));
+    await dispatcher.dispatch(mountNetworkElementAsyncActionCreator(mountElement));
   },
-  mountAndRquireNetworkElement: (element: RequiredNetworkElementType) => {
-    dispatcher.dispatch(addToRequiredNetworkElementsAsyncActionCreator(element));
-    dispatcher.dispatch(mountNetworkElementAsyncActionCreator(element));
-  },
-  unmountNetworkElement: (element: RequiredNetworkElementType) => {
-    dispatcher.dispatch(unmountNetworkElementAsyncActionCreator(element && element.mountId));
+  removeNetworkElement: (element: UpdateNetworkElement) => {
+    dispatcher.dispatch(removeNetworkElementAsyncActionCreator(element));
+    dispatcher.dispatch(removeWebUriAction(element.id));
   }
-}
-);
+});
 
 type DialogSettings = {
   dialogTitle: string,
@@ -85,37 +86,11 @@ const settings: { [key: string]: DialogSettings } = {
     enableUsernameEditor: false,
     enableExtendedEditor: false,
   },
-  [EditNetworkElementDialogMode.UnknownNetworkElementToRequiredNetworkElements] : {
-    dialogTitle: "Add to required network elements" ,
-    dialogDescription: "Create a new NetworkElement in planning database as clone of existing real NetworkElement." ,
-    applyButtonText: "Add to required network elements" ,
-    cancelButtonText: "Cancel",
-    enableMountIdEditor: false,
-    enableUsernameEditor: true,
-    enableExtendedEditor: false,
-  },
-  [EditNetworkElementDialogMode.RequiredNetworkElementToUnknownNetworkElements]: {
-    dialogTitle: "Remove from required network elements",
-    dialogDescription: "Do you really want to remove the required element:",
-    applyButtonText: "Remove network element",
-    cancelButtonText: "Cancel",
-    enableMountIdEditor: false,
-    enableUsernameEditor: false,
-    enableExtendedEditor: false,
-  },
-  [EditNetworkElementDialogMode.MountNetworkElementToUnknonwNetworkElements]: {
-    dialogTitle: "Mount to unknown network elements",
-    dialogDescription: "Mount this network element:",
-    applyButtonText: "Mount network element",
-    cancelButtonText: "Cancel",
-    enableMountIdEditor: true,
-    enableUsernameEditor: true,
-    enableExtendedEditor: true,
-  },
-  [EditNetworkElementDialogMode.MountNetworkElementToRequiredNetworkElements]: {
-    dialogTitle: "Mount to required network elements",
-    dialogDescription: "Mount this network element:",
-    applyButtonText: "Mount network element",
+
+  [EditNetworkElementDialogMode.AddNewNetworkElement]: {
+    dialogTitle: "Add new network element",
+    dialogDescription: "Add this new network element:",
+    applyButtonText: "Add network element",
     cancelButtonText: "Cancel",
     enableMountIdEditor: true,
     enableUsernameEditor: true,
@@ -139,83 +114,102 @@ const settings: { [key: string]: DialogSettings } = {
     enableUsernameEditor: false,
     enableExtendedEditor: false,
   },
+  [EditNetworkElementDialogMode.EditNetworkElement]: {
+    dialogTitle: "Modify the network elements",
+    dialogDescription: "Modify this network element",
+    applyButtonText: "Modify",
+    cancelButtonText: "Cancel",
+    enableMountIdEditor: false,
+    enableUsernameEditor: true,
+    enableExtendedEditor: false,
+  },
+  [EditNetworkElementDialogMode.RemoveNetworkElement]: {
+    dialogTitle: "Remove network element",
+    dialogDescription: "Do you really want to remove this network element:",
+    applyButtonText: "Remove network element",
+    cancelButtonText: "Cancel",
+    enableMountIdEditor: false,
+    enableUsernameEditor: false,
+    enableExtendedEditor: false,
+  }
 }
 
-type EditNetworkElementDialogComponentProps = Connect<undefined,typeof mapDispatch> & {
+type EditNetworkElementDialogComponentProps = Connect<undefined, typeof mapDispatch> & {
   mode: EditNetworkElementDialogMode;
-  initialNetworkElement: RequiredNetworkElementType;
+  initialNetworkElement: NetworkElementConnection;
   onClose: () => void;
 };
 
-type EditNetworkElementDialogComponentState = RequiredNetworkElementType & {
-  required: boolean;
-};
+type EditNetworkElementDialogComponentState = NetworkElementConnection;
 
 class EditNetworkElementDialogComponent extends React.Component<EditNetworkElementDialogComponentProps, EditNetworkElementDialogComponentState> {
   constructor(props: EditNetworkElementDialogComponentProps) {
     super(props);
 
     this.state = {
-      mountId: this.props.initialNetworkElement.mountId,
+      nodeId: this.props.initialNetworkElement.nodeId,
+      isRequired: false,
       host: this.props.initialNetworkElement.host,
       port: this.props.initialNetworkElement.port,
-      password: this.props.initialNetworkElement.password,
-      username: this.props.initialNetworkElement.username,
-      required: false
     };
   }
 
   render(): JSX.Element {
     const setting = settings[this.props.mode];
     return (
-      <Dialog open={ this.props.mode !== EditNetworkElementDialogMode.None }>
-        <DialogTitle id="form-dialog-title">{ setting.dialogTitle }</DialogTitle>
+      <Dialog open={this.props.mode !== EditNetworkElementDialogMode.None}>
+        <DialogTitle id="form-dialog-title">{setting.dialogTitle}</DialogTitle>
         <DialogContent>
           <DialogContentText>
-            { setting.dialogDescription }
+            {setting.dialogDescription}
           </DialogContentText>
-          <TextField disabled={ !setting.enableMountIdEditor } spellCheck={false} autoFocus margin="dense" id="name" label="Name" type="text" fullWidth value={ this.state.mountId } onChange={(event)=>{ this.setState({mountId: event.target.value}); } } />
-          <TextField disabled={ !setting.enableMountIdEditor } spellCheck={false} margin="dense" id="ipaddress" label="IP address" type="text" fullWidth value={ this.state.host } onChange={(event)=>{ this.setState({host: event.target.value}); } }/>
-          <TextField disabled={ !setting.enableMountIdEditor } spellCheck={false} margin="dense" id="netconfport" label="NetConf port" type="number" fullWidth value={ this.state.port.toString() } onChange={(event)=>{ this.setState({port: +event.target.value}); } }/>
-          { setting.enableUsernameEditor && <TextField disabled={ !setting.enableUsernameEditor } spellCheck={ false } margin="dense" id="username" label="Username" type="text" fullWidth value={ this.state.username } onChange={ (event) => { this.setState({ username: event.target.value }); } } /> || null }
-          { setting.enableUsernameEditor && <TextField disabled={ !setting.enableUsernameEditor } spellCheck={ false } margin="dense" id="password" label="Password" type="password" fullWidth value={ this.state.password } onChange={ (event) => { this.setState({ password: event.target.value }); } } /> || null }
+          <TextField disabled={!setting.enableMountIdEditor} spellCheck={false} autoFocus margin="dense" id="name" label="Name" aria-label="name" type="text" fullWidth value={this.state.nodeId} onChange={(event) => { this.setState({ nodeId: event.target.value }); }} />
+          <TextField disabled={!setting.enableMountIdEditor} spellCheck={false} margin="dense" id="ipaddress" label="IP address" aria-label="ip adress" type="text" fullWidth value={this.state.host} onChange={(event) => { this.setState({ host: event.target.value }); }} />
+          <TextField disabled={!setting.enableMountIdEditor} spellCheck={false} margin="dense" id="netconfport" label="NetConf port" aria-label="netconf port" type="number" fullWidth value={this.state.port.toString()} onChange={(event) => { this.setState({ port: +event.target.value }); }} />
+          {setting.enableUsernameEditor && <TextField disabled={!setting.enableUsernameEditor} spellCheck={false} margin="dense" id="username" label="Username" aria-label="username" type="text" fullWidth value={this.state.username} onChange={(event) => { this.setState({ username: event.target.value }); }} /> || null}
+          {setting.enableUsernameEditor && <TextField disabled={!setting.enableUsernameEditor} spellCheck={false} margin="dense" id="password" label="Password" aria-label="password" type="password" fullWidth value={this.state.password} onChange={(event) => { this.setState({ password: event.target.value }); }} /> || null}
+          <FormControl fullWidth disabled={!setting.enableUsernameEditor}>
+            <InputLabel htmlFor="active">Required</InputLabel>
+            <Select value={this.state.isRequired || false} onChange={(event) => {
+              this.setState({ isRequired: event.target.value as any as boolean });
+            }} inputProps={{ name: 'required', id: 'required' }} fullWidth >
+              <MenuItem value={true as any as string} >True</MenuItem>
+              <MenuItem value={false as any as string} >False</MenuItem>
+            </Select>
+          </FormControl>
         </DialogContent>
         <DialogActions>
-          <Button onClick={ (event) => {
+          <Button onClick={(event) => {
             this.onApply({
-              mountId: this.state.mountId,
+              isRequired: this.state.isRequired,
+              id: this.state.nodeId,
+              nodeId: this.state.nodeId,
               host: this.state.host,
               port: this.state.port,
               username: this.state.username,
-              password: this.state.password
+              password: this.state.password,
             });
             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>
     )
   }
 
-  private onApply = (element: RequiredNetworkElementType) => {
+  private onApply = (element: NetworkElementConnection) => {
     this.props.onClose && this.props.onClose();
+    let updateElement: UpdateNetworkElement = {
+      id: this.state.nodeId
+    }
     switch (this.props.mode) {
-      case EditNetworkElementDialogMode.UnknownNetworkElementToRequiredNetworkElements:
-        element && this.props.addToRequiredNetworkElements(element);
-        break;
-      case EditNetworkElementDialogMode.RequiredNetworkElementToUnknownNetworkElements:
-        element && this.props.removeFromRequiredNetworkElements(element);
-        break;
-      case EditNetworkElementDialogMode.MountNetworkElementToUnknonwNetworkElements:
-        element && this.props.mountNetworkElement(element);
-        break;
-      case EditNetworkElementDialogMode.MountNetworkElementToRequiredNetworkElements:
-        element && this.props.mountAndRquireNetworkElement(element);
+      case EditNetworkElementDialogMode.AddNewNetworkElement:
+        element && this.props.addNewNetworkElement(element);
         break;
       case EditNetworkElementDialogMode.MountNetworkElement:
         element && this.props.mountNetworkElement(element);
@@ -223,6 +217,18 @@ class EditNetworkElementDialogComponent extends React.Component<EditNetworkEleme
       case EditNetworkElementDialogMode.UnmountNetworkElement:
         element && this.props.unmountNetworkElement(element);
         break;
+      case EditNetworkElementDialogMode.EditNetworkElement:
+        if (this.props.initialNetworkElement.isRequired !== this.state.isRequired)
+          updateElement.isRequired = this.state.isRequired;
+        if (this.props.initialNetworkElement.username !== this.state.username)
+          updateElement.username = this.state.username;
+        if (this.props.initialNetworkElement.password !== this.state.password)
+          updateElement.password = this.state.password;
+        element && this.props.editNetworkElement(updateElement, element);
+        break;
+      case EditNetworkElementDialogMode.RemoveNetworkElement:
+        element && this.props.removeNetworkElement(updateElement);
+        break;
     }
   };
 
@@ -230,7 +236,7 @@ class EditNetworkElementDialogComponent extends React.Component<EditNetworkEleme
     this.props.onClose && this.props.onClose();
   }
 
-  static getDerivedStateFromProps(props: EditNetworkElementDialogComponentProps, state: EditNetworkElementDialogComponentState & { _initialNetworkElement: RequiredNetworkElementType }): EditNetworkElementDialogComponentState & { _initialNetworkElement: RequiredNetworkElementType } {
+  static getDerivedStateFromProps(props: EditNetworkElementDialogComponentProps, state: EditNetworkElementDialogComponentState & { _initialNetworkElement: NetworkElementConnection }): EditNetworkElementDialogComponentState & { _initialNetworkElement: NetworkElementConnection } {
     if (props.initialNetworkElement !== state._initialNetworkElement) {
       state = {
         ...state,