From 9d8b8a86651a80cd6973ebf986ce07a6a4908c97 Mon Sep 17 00:00:00 2001
From: Borys_Levytskyi <Borys_Levytskyi@epam.com>
Date: Sat, 16 Jan 2021 11:39:06 +0200
Subject: [PATCH] Forgot to commit before PR merge

---
 src/networking/components/SubnetView.tsx    | 10 +---------
 src/shell/AppState.ts                       |  2 +-
 src/shell/components/DebugIndicators.css    |  3 ++-
 src/shell/components/DisplayResultView.tsx  | 11 +++++++++--
 src/shell/components/HelpResultView.tsx     |  1 +
 src/shell/components/TopLinks.css           |  2 +-
 src/shell/components/WhatsNewResultView.tsx |  5 +++++
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/networking/components/SubnetView.tsx b/src/networking/components/SubnetView.tsx
index 6be3ce2..d4323c5 100644
--- a/src/networking/components/SubnetView.tsx
+++ b/src/networking/components/SubnetView.tsx
@@ -14,15 +14,7 @@ function SubnetView({subnet} : {subnet : SubnetCommand}) {
                     <SubnetRow ip={subnet.input.ipAddress} descr="Address"/>
                     <SubnetRow ip={getNetworkAddress(subnet.input)} descr="Network"/>
                     <SubnetRow ip={createSubnetMaskIp(subnet.input)} descr="Net Mask"/>
-                    <SubnetRow ip={getBroadCastAddress(subnet.input)} descr="Broadcast"/>
-                    <tr>
-                        <td className="description soft">
-                            <span>Mask Length</span>
-                        </td>
-                        <td>
-                            {subnet.input.maskBits}
-                        </td>
-                    </tr>
+                    <SubnetRow ip={getBroadCastAddress(subnet.input)} descr="Broadcast"/>                  
                     <tr>
                         <td className="description soft">
                             <span>Network Size</span>
diff --git a/src/shell/AppState.ts b/src/shell/AppState.ts
index 935ed76..e335178 100644
--- a/src/shell/AppState.ts
+++ b/src/shell/AppState.ts
@@ -1,6 +1,6 @@
 import log from 'loglevel';
 
-const APP_VERSION = 5;
+const APP_VERSION = 6;
 
 export type PersistedAppData = {
     emphasizeBytes: boolean;
diff --git a/src/shell/components/DebugIndicators.css b/src/shell/components/DebugIndicators.css
index 4a28d66..a97b3e9 100644
--- a/src/shell/components/DebugIndicators.css
+++ b/src/shell/components/DebugIndicators.css
@@ -1 +1,2 @@
-.debug-indicators { position: absolute; top: 1em; left: 1em}
\ No newline at end of file
+.debug-indicators { position: absolute; top: 1em; left: 1em}
+.debug-indicators span {display: block;}
\ No newline at end of file
diff --git a/src/shell/components/DisplayResultView.tsx b/src/shell/components/DisplayResultView.tsx
index f055e78..c1b1641 100644
--- a/src/shell/components/DisplayResultView.tsx
+++ b/src/shell/components/DisplayResultView.tsx
@@ -6,14 +6,21 @@ type DisplayResultProps = {
     appState: AppState,
     inputHash: string,
     input: string,
-    key: number
+    key: number,
+    onRemove?: (i: number) => void;
 }
 
 export default class DisplayResultView extends React.Component<DisplayResultProps> {
     render() {
 
         return <div className="result">
-                        <div className="input mono"><span className="cur">&gt;</span>{this.props.input}<a className="hashLink" title="Link for this expression" href={window.location.pathname + '#' + this.props.inputHash}>#</a></div>
+                        <div className="input mono">
+                                <span className="cur">
+                                    &gt;</span>{this.props.input}
+                                    <a className="hashLink" title="Link for this expression" href={window.location.pathname + '#' + this.props.inputHash}>#</a>
+                                    &nbsp;
+                                    <a className="hashLink" title="Remove this result" href="javascript:void(0)">[x]</a>
+                            </div>
                         <div className="content">
                             {this.props.children}
                         </div>
diff --git a/src/shell/components/HelpResultView.tsx b/src/shell/components/HelpResultView.tsx
index 57f81a5..600390a 100644
--- a/src/shell/components/HelpResultView.tsx
+++ b/src/shell/components/HelpResultView.tsx
@@ -19,6 +19,7 @@ function HelpResultView() {
                                 <ul>
                                     <li><code><CommandLink text="127.0.0.1" /></code> — enter single or multiple ip addresses (separated by space) to see their binary represenation</li>
                                     <li><code><CommandLink text="192.168.0.1/8" /></code> — subnet mask notiations are support as well</li>
+                                    <li><code><CommandLink text="subnet 192.168.24.1/14" /></code> — display information about subnet (network address, broadcast address, etc.)</li>
                                 </ul>
                                 </div>
                                 <div className="section">
diff --git a/src/shell/components/TopLinks.css b/src/shell/components/TopLinks.css
index db71256..f08c633 100644
--- a/src/shell/components/TopLinks.css
+++ b/src/shell/components/TopLinks.css
@@ -1,5 +1,5 @@
 
-.top-links { position: absolute; right: 1em; top: 1em; list-style-type: none; margin: 0 }
+.top-links { position: absolute; right: 2em; top: 1em; list-style-type: none; margin: 0 }
 .top-links li { float: left; }
 .top-links a { display: inline-block; padding: 10px 15px}
 .top-links .icon { margin-right: 5px; vertical-align: middle; }
\ No newline at end of file
diff --git a/src/shell/components/WhatsNewResultView.tsx b/src/shell/components/WhatsNewResultView.tsx
index 9d5f615..cdab352 100644
--- a/src/shell/components/WhatsNewResultView.tsx
+++ b/src/shell/components/WhatsNewResultView.tsx
@@ -7,6 +7,11 @@ function WhatsnewResultView() {
         return <div className="changelog">
                     <h3>Changelog</h3>
                     <div className="item item-new">
+                        <p><span className="soft date">Jun 16th, 2021</span> <br/>
+                            Added support of <code>subnet</code> command to display information about subnet ip adress such. Try it out: <CommandLink text="subnet 192.168.24.1/14" />
+                        </p>                       
+                    </div>
+                    <div className="item">
                         <p><span className="soft date">Jun 14th, 2021</span> <br/>
                         Added support of ip addresses and subnet masks notatioans. Try them out: 
                         </p>