Merge pull request #976 from zebrunner/develop

2.7.1
zebrunner · Jun 11, 2024 · 3379432 · 3379432
2 parents 7d19c1d + ed80244
commit 3379432
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 26 deletions.
diff --git a/lib/units/ios-device/plugins/group.js b/lib/units/ios-device/plugins/group.js
@@ -72,9 +72,10 @@ module.exports = syrup.serial()
           }
 
           dbapi.loadDeviceBySerial(options.serial).then((device) => {
-            // No device version = First device session 
-            if (!device.version) {
+            // No device size/type = First device session 
+            if (!device.display.width || !device.display.height || !device.deviceType) {
               // Get device type
+              let deviceType
               handleRequest({
                 method: 'GET',
                 uri: `${baseUrl}/wda/device/info`,
@@ -83,12 +84,12 @@ module.exports = syrup.serial()
                 .then((deviceInfo) => {
                   let deviceInfoModel = deviceInfo.value.model.toLowerCase()
                   let deviceInfoName = deviceInfo.value.name.toLowerCase()
-                  let deviceType
                   if (deviceInfoModel.includes("tv") || deviceInfoName.includes("tv")) {
                     deviceType = "Apple TV"
                   } else {
                     deviceType = "iPhone"
-                  }
+                  }                  
+                  // Store device type
                   log.info('Storing device type value: ' + deviceType)
                   dbapi.setDeviceType(options.serial, deviceType)
                 })
@@ -107,6 +108,45 @@ module.exports = syrup.serial()
               .then((sessionResponse) => {
                 let sessionId = sessionResponse.sessionId
 
+                  // Store device version
+                  log.info('Storing device version')
+                  push.send([
+                    wireutil.global,
+                    wireutil.envelope(new wire.SdkIosVersion(
+                      options.serial,
+                      sessionResponse.value.capabilities.device,
+                      sessionResponse.value.capabilities.sdkVersion,
+                      ))
+                    ])
+
+                  // Store battery info 
+                  if (deviceType !== 'Apple TV') {
+                    handleRequest({
+                    method: 'GET',
+                    uri: `${baseUrl}/session/${sessionId}/wda/batteryInfo`,
+                    json: true,
+                  })
+                  .then((batteryInfoResponse) => {
+                    let batteryState = iosutil.batteryState(batteryInfoResponse.value.state)
+                    let batteryLevel = iosutil.batteryLevel(batteryInfoResponse.value.level)
+
+                    push.send([
+                      wireutil.global,
+                      wireutil.envelope(new wire.BatteryIosEvent(
+                        options.serial,
+                        'good',
+                        'usb',
+                        batteryState,
+                        batteryLevel,
+                        'n/a',
+                        100,
+                      ))
+                    ])
+                  })
+                  .catch((err) => log.error('Error storing battery', err))
+                }
+
+                // Store size info
                 return handleRequest({
                   method: 'GET',
                   uri: `${baseUrl}/session/${sessionId}/window/size`,

diff --git a/lib/units/ios-device/plugins/util/iosutil.js b/lib/units/ios-device/plugins/util/iosutil.js
@@ -142,6 +142,28 @@ let iosutil = {
   },
   getUri: function(host, port) {
     return `http://${host}:${port}`
+  },
+  batteryState: function (state) {
+    switch (state) {
+      case 0:
+        return 'full'
+      case 1:
+        return 'unplugged'  
+      case 2: 
+        return 'charging'
+      case 3:
+        return 'full'
+      default:
+        break;
+    }
+  },
+  batteryLevel: function (level) {
+    switch (level) {
+      case -1:
+        return 100
+      default: 
+        return parseInt(level * 100, 10)
+    }
   }
 }
 

diff --git a/lib/units/ios-device/plugins/wda/WdaClient.js b/lib/units/ios-device/plugins/wda/WdaClient.js
@@ -85,6 +85,7 @@ module.exports = syrup.serial()
                 this.setStatus(3)
                 if (this.deviceType !== 'Apple TV') {
                   this.getOrientation()
+                  this.batteryIosEvent()
                 }
 
                 this.setVersion(sessionResponse)
@@ -505,7 +506,7 @@ module.exports = syrup.serial()
         })
       },
       setVersion: function(currentSession) {
-        log.info('Setting device version: ' + currentSession.value.capabilities.sdkVersion)
+        log.info('Setting current device version: ' + currentSession.value.capabilities.sdkVersion)
 
         push.send([
           wireutil.global,
@@ -592,27 +593,25 @@ module.exports = syrup.serial()
           json: true,
         })
           .then((batteryInfoResponse) => {
-            let status = '-'
-
-            if (batteryInfoResponse.value.state === 3) {
-              status = 'full'
-            }
-            if (batteryInfoResponse.value.state === 2) {
-              status = 'charging'
-            }
+            let batteryState = iosutil.batteryState(batteryInfoResponse.value.state)
+            let batteryLevel = iosutil.batteryLevel(batteryInfoResponse.value.level)
+
             push.send([
               wireutil.global,
               wireutil.envelope(new wire.BatteryIosEvent(
                 options.serial,
                 'good',
                 'usb',
-                status,
-                parseInt(batteryInfoResponse.value.level * 100, 10),
+                batteryState,
+                batteryLevel,
                 'n/a',
                 100,
               ))
             ])
           })
+          .then(() => {
+            log.info('Setting new device battery info')
+          })
           .catch((err) => log.info(err))
       },
       getTreeElements: function() {

diff --git a/res/app/device-list/column/device-column-service.js b/res/app/device-list/column/device-column-service.js
@@ -750,13 +750,13 @@ function DeviceNoteCell(options) {
 
       i.className = 'device-note-edit fa fa-pencil pointer'
 
-      td.appendChild(span)
       td.appendChild(i)
+      td.appendChild(span)
 
       return td
     }
   , update: function(td, item) {
-      var span = td.firstChild
+      var span = td.children[1]
       var t = span.firstChild
 
       t.nodeValue = options.value(item)

diff --git a/res/app/device-list/details/device-list-details-directive.js b/res/app/device-list/details/device-list-details-directive.js
@@ -108,7 +108,7 @@ module.exports = function DeviceListDetailsDirective(
           var i = e.target
           var id = i.parentNode.parentNode.id
           var device = mapping[id]
-          var xeditableWrapper = i.parentNode.firstChild
+          var xeditableWrapper = i.parentNode.querySelector('.xeditable-wrapper')
           var xeditableSpan = document.createElement('span')
           var childScope = scope.$new()
 
@@ -134,11 +134,11 @@ module.exports = function DeviceListDetailsDirective(
         for (var i = 0; i < tr.cells.length; i++) {
           var col = tr.cells[i]
 
-          if (col.firstChild &&
-              col.firstChild.nodeName.toLowerCase() === 'span' &&
-              col.firstChild.classList.contains('xeditable-wrapper')) {
+          if (col.children[1] &&
+            col.children[1].nodeName.toLowerCase() === 'span' &&
+            col.children[1].classList.contains('xeditable-wrapper')) {
 
-            var xeditableWrapper = col.firstChild
+            var xeditableWrapper = col.children[1]
             var children = xeditableWrapper.children
 
             // Remove all childs under xeditablerWrapper

diff --git a/res/app/device-list/device-list.css b/res/app/device-list/device-list.css
@@ -80,7 +80,7 @@ img.device-icon-smallest {
 }
 
 .stf-device-list .device-note-edit {
-  margin-left: 15px;
+  margin-right: 15px;
   visibility: hidden;
 }
 

diff --git a/res/auth/ldap/scripts/signin/signin.pug b/res/auth/ldap/scripts/signin/signin.pug
@@ -11,7 +11,10 @@
       .alert.alert-danger(ng-show='error')
         span(ng-show='error.$invalid', translate) Check errors below
         span(ng-show='error.$incorrect', translate) Incorrect login details
-        span(ng-show='error.$server', translate) Server error. Check log output.
+        span(ng-show='error.$server', translate)
+          | We do not recognize that username or password.
+          br
+          | Please check your spelling and try again or use another login option.
 
       .form-group
         .input-group

diff --git a/res/auth/mock/scripts/signin/signin.pug b/res/auth/mock/scripts/signin/signin.pug
@@ -11,7 +11,10 @@
       .alert.alert-danger(ng-show='error')
         span(ng-show='error.$invalid', translate) Check errors below
         span(ng-show='error.$incorrect', translate) Incorrect login details
-        span(ng-show='error.$server', translate) Server error. Check log output.
+        span(ng-show='error.$server', translate)
+          | We do not recognize that username or password.
+          br
+          | Please check your spelling and try again or use another login option.
 
       .form-group
         .input-group

diff --git a/res/auth/zebrunner/scripts/signin/signin.pug b/res/auth/zebrunner/scripts/signin/signin.pug
@@ -11,7 +11,10 @@
       .alert.alert-danger(ng-show='error')
         span(ng-show='error.$invalid', translate) Check errors below
         span(ng-show='error.$incorrect', translate) Invalid credentials or user has been deactivated
-        span(ng-show='error.$server', translate) Server error. Check log output.
+        span(ng-show='error.$server', translate) 
+          | We do not recognize that username or password.
+          br
+          | Please check your spelling and try again or use another login option.
 
       .form-group
         .input-group