Merge git.sila.ru:pub/openbmc/webui-vue into sila-dev

3 files changed, 6 insertions, 5 deletions

diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json
index 61a53843..75ff4c1b 100644
--- a/src/locales/ru-RU.json
+++ b/src/locales/ru-RU.json
@@ -924,6 +924,9 @@
     }
   },
   "pageSerialOverLan": {
+    "alert": {
+      "disconnectedAlertMessage" : "Система должна быть включена для соединения"
+    },
     "connected": "Подключено",
     "disconnected": "Отключено",
     "openNewTab": "Открыть в новом окне",
diff --git a/src/store/modules/HardwareStatus/ChassisStore.js b/src/store/modules/HardwareStatus/ChassisStore.js
index 8a08e370..97930d2e 100644
--- a/src/store/modules/HardwareStatus/ChassisStore.js
+++ b/src/store/modules/HardwareStatus/ChassisStore.js
@@ -22,6 +22,7 @@ const ChassisStore = {
           PowerState,
           LocationIndicatorActive,
           AssetTag,
+          Model,
           MaxPowerWatts,
           MinPowerWatts,
           Name,
@@ -39,6 +40,7 @@ const ChassisStore = {
           statusState: Status.State,
           healthRollup: Status.HealthRollup,
           assetTag: AssetTag,
+          model: Model,
           maxPowerWatts: MaxPowerWatts,
           minPowerWatts: MinPowerWatts,
           name: Name,
diff --git a/src/store/modules/SecurityAndAccess/SessionsStore.js b/src/store/modules/SecurityAndAccess/SessionsStore.js
index 37ba9fc2..54607ab6 100644
--- a/src/store/modules/SecurityAndAccess/SessionsStore.js
+++ b/src/store/modules/SecurityAndAccess/SessionsStore.js
@@ -25,14 +25,10 @@ const SessionsStore = {
         )
         .then((sessionUris) => {
           const allConnectionsData = sessionUris.map((sessionUri) => {
-            //For filtering IP address to IPv4
-            let filteredIPAddress = sessionUri.data?.ClientOriginIPAddress.slice(
-              7
-            );
             return {
               clientID: sessionUri.data?.Oem?.OpenBMC.ClientID,
               username: sessionUri.data?.UserName,
-              ipAddress: filteredIPAddress,
+              ipAddress: sessionUri.data?.ClientOriginIPAddress,
               uri: sessionUri.data['@odata.id'],
             };
           });