ui fixes

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

ui/public/locales/en.json

@@ -518,6 +518,7 @@
 "label.clear.list": "Clear list",
 "label.clear.notification": "Clear notification",
 "label.clientid": "Provider Client ID",
+"label.clientaddress": "Client Address",
 "label.close": "Close",
 "label.cloud.managed": "CloudManaged",
 "label.cloudian.admin.password": "Admin Service Password",
@@ -582,6 +583,7 @@
 "label.confirmdeclineinvitation": "Are you sure you want to decline this project invitation?",
 "label.confirmpassword": "Confirm password",
 "label.confirmpassword.description": "Please type the same password again.",
+"label.connected": "Connected Clients",
 "label.connected.agents": "Connected Agents",
 "label.connect": "Connect",
 "label.connectiontimeout": "Connection timeout",
@@ -723,6 +725,7 @@
 "label.delete.internal.lb": "Delete internal LB",
 "label.delete.ipv4.subnet": "Delete IPv4 subnet",
 "label.delete.ip.v6.prefix": "Delete IPv6 prefix",
+"label.delete.logs.web.sessions": "Delete Logs Web Session",
 "label.delete.netscaler": "Delete NetScaler",
 "label.delete.niciranvp": "Remove Nvp controller",
 "label.delete.opendaylight.device": "Delete OpenDaylight controller",
@@ -999,6 +1002,7 @@
 "label.shared.filesystems": "Shared FileSystems",
 "label.filesystem": "Filesystem",
 "label.filter": "Filter",
+"label.filters": "Filters",
 "label.filter.annotations.all": "All comments",
 "label.filter.annotations.self": "Created by me",
 "label.filterby": "Filter by",
@@ -1373,6 +1377,7 @@
 "label.login.portal": "Portal login",
 "label.login.single.signon": "Single sign-on",
 "label.logout": "Logout",
+"label.logs.web.sessions": "Logs Web Sessions",
 "label.lun": "LUN",
 "label.lun.number": "LUN #",
 "label.lxc": "LXC",
@@ -2990,6 +2995,7 @@
 "message.delete.failed": "Delete fail",
 "message.delete.gateway": "Please confirm you want to delete the gateway.",
 "message.delete.ip.v6.prefix.processing": "Deleting IPv6 prefix...",
+"message.delete.logs.web.session": "Deleting logs web session...",
 "message.delete.port.forward.processing": "Deleting port forwarding rule...",
 "message.delete.project": "Are you sure you want to delete this project?",
 "message.delete.rule.processing": "Deleting rule...",

ui/src/components/view/ListView.vue

@@ -128,6 +128,15 @@
           @exec-action="$parent.execAction"/>
         <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
       </template>
+      <template v-if="column.key === 'filters'">
+        <QuickView
+          style="margin-left: 5px"
+          :actions="actions"
+          :resource="record"
+          :enabled="quickViewEnabled() && actions.length > 0 && columns && columns[0].dataIndex === 'filters' "
+          @exec-action="$parent.execAction"/>
+        <router-link :to="{ path: $route.path + '/' + record.id }">{{ record.filters.join(', ') }}</router-link>
+      </template>
       <template v-if="column.key === 'username'">
         <span v-if="$showIcon() && !['vm', 'vnfapp'].includes($route.path.split('/')[1])" style="margin-right: 5px">
           <resource-icon v-if="$showIcon() && record.icon && record.icon.base64image" :image="record.icon.base64image" size="2x"/>

ui/src/components/view/LogsConsole.vue

@@ -38,7 +38,7 @@
         <!-- Container that holds both the scrollable content and the fixed footer -->
         <div class="drawer-container">
           <div class="tabs-wrapper">
-            <a-tabs :activeKey="activeTabKey">
+            <a-tabs v-model:activeKey="activeTabKey">
               <a-tab-pane
                 v-for="tab in tabs"
                 :key="tab.key"
@@ -176,7 +176,7 @@ export default {
           this.prepareTabsAndOpenWebSockets(session.websocket)
         }
       }).catch(error => {
-        console.log(error)
+        this.$notifyError(error)
       }).finally(() => {
         this.loading = false
         if (this.tabsValid) {
@@ -185,7 +185,7 @@ export default {
       })
     },
     prepareTabsAndOpenWebSockets (webSocketsDetails) {
-      this.tabs = []
+      var wsTabs = []
       for (var webSocketDetails of webSocketsDetails) {
         var tab = {
           key: webSocketDetails.managementserverid,
@@ -196,16 +196,17 @@ export default {
           logsErrorCount: 0,
           logsWarningCount: 0
         }
-        this.tabs.push(tab)
+        wsTabs.push(tab)
       }
+      this.tabs = wsTabs.sort((a, b) => a.title.localeCompare(b.title))
       this.openWebSockets()
     },
     openWebSockets () {
       this.closeWebSockets()
       if (!this.tabsValid) {
         return
       }
-      for (var tab of this.tabs) {
+      for (const tab of this.tabs) {
         tab.webSocket = new WebSocket(tab.webSocketUrl)
 
         tab.webSocket.addEventListener('message', (event) => {
@@ -264,7 +265,7 @@ export default {
       tempDiv.innerHTML = htmlString
       const plainTextData = tempDiv.textContent || tempDiv.innerText || ''
       var blob = new Blob([plainTextData], { type: 'text/plain' })
-      var filename = this.filters.join('-') + '.log'
+      var filename = this.currentTab.title + '-' + this.filters.join('-') + '.log'
       if (window.navigator.msSaveOrOpenBlob) {
         window.navigator.msSaveBlob(blob, filename)
       } else {

ui/src/config/section/tools.js

@@ -234,6 +234,32 @@ export default {
           groupMap: (selection) => { return selection.map(x => { return { id: x } }) }
         }
       ]
+    },
+    {
+      name: 'listLogsWebSessions',
+      title: 'label.logs.web.sessions',
+      icon: 'gateway-outlined',
+      permission: ['listLogsWebSessions'],
+      columns: () => {
+        const cols = ['filters', 'account', 'clientaddress', 'connected']
+        return cols
+      },
+      details: () => {
+        const fields = ['id', 'account', 'filters', 'clientaddress', 'connected']
+        return fields
+      },
+      actions: [
+        {
+          api: 'deleteLogsWebSessions',
+          icon: 'delete-outlined',
+          label: 'label.delete.logs.web.session',
+          message: 'message.delete.logs.web.session',
+          dataView: true,
+          groupAction: true,
+          popup: true,
+          groupMap: (selection) => { return selection.map(x => { return { id: x } }) }
+        }
+      ]
     }
   ]
 }

ui/src/utils/plugins.js

@@ -97,6 +97,12 @@ export const pollJobPlugin = {
       if (contextId) {
         contexts.push(contextId)
       }
+      if (jobId) {
+        const jobIdFirstPart = jobId.split('-')[0]
+        if (!contexts.includes(jobIdFirstPart)) {
+          contexts.push(jobIdFirstPart)
+        }
+      }
 
       eventBus.on('update-job-details', (args) => {
         const { jobId, resourceId } = args