Merge pull request #612 from jembi/TB-84-update-packages

bradsawadye · web-flow · commit 41a88a256617 · 2023-06-12T13:18:25.000+02:00
TB-84 Update packages and lint
diff --git a/app/scripts/controllers/auditDetails.js b/app/scripts/controllers/auditDetails.js
@@ -60,7 +60,7 @@ export function AuditDetailsCtrl ($scope, $uibModal, $location, $routeParams, Ap
       controller: AuditsContentModalCtrl,
       resolve: {
         auditData: function () {
-          return { type: type, content: content }
+          return { type, content }
         }
       }
     })
diff --git a/app/scripts/controllers/audits.js b/app/scripts/controllers/audits.js
@@ -235,7 +235,7 @@ export function AuditsCtrl ($scope, $uibModal, $location, $interval, Api, Alerti
 
       // if patientID set then update query to include 'AND' operator
       if (valueNotEmpty(patientID) === true) {
-        filtersObject.filters['participantObjectIdentification.participantObjectID'] = { type: 'AND', patientID: participantPatientID, objectID: objectID }
+        filtersObject.filters['participantObjectIdentification.participantObjectID'] = { type: 'AND', patientID: participantPatientID, objectID }
       } else {
         filtersObject.filters['participantObjectIdentification.participantObjectID'] = JSON.stringify(objectID)
       }
diff --git a/app/scripts/controllers/channel-tabs/routes.js b/app/scripts/controllers/channel-tabs/routes.js
@@ -19,7 +19,7 @@ export function channelRoutesCtrl ($scope, $timeout, Api, Alerting) {
     angular.forEach(mediators, function (mediator) {
       // foreach endpoint in the mediator
       angular.forEach(mediator.endpoints, function (endpoint) {
-        $scope.mediatorRoutes.push({ fullName: mediator.name + ' - ' + endpoint.name, mediator: mediator.urn, endpoint: endpoint })
+        $scope.mediatorRoutes.push({ fullName: mediator.name + ' - ' + endpoint.name, mediator: mediator.urn, endpoint })
       })
     })
   }, function () { /* server error - could not connect to API to get Mediators */ })
@@ -109,7 +109,7 @@ export function channelRoutesCtrl ($scope, $timeout, Api, Alerting) {
         port: '',
         path: '',
         pathTransform: '',
-        primary: primary,
+        primary,
         username: '',
         password: '',
         type: 'http',
@@ -168,18 +168,18 @@ export function channelRoutesCtrl ($scope, $timeout, Api, Alerting) {
 
     // add mediator to channel.routes array
     $scope.channel.routes.push({
-      name: name,
-      secured: secured,
-      host: host,
-      port: port,
-      path: path,
-      pathTransform: pathTransform,
-      primary: primary,
-      username: username,
-      password: password,
+      name,
+      secured,
+      host,
+      port,
+      path,
+      pathTransform,
+      primary,
+      username,
+      password,
       type: routeType,
       status: 'enabled',
-      forwardAuthHeader: forwardAuthHeader
+      forwardAuthHeader
     })
   }
 
diff --git a/app/scripts/controllers/channelMonitoring.js b/app/scripts/controllers/channelMonitoring.js
@@ -87,31 +87,31 @@ export function ChannelMonitoringCtrl ($scope, $uibModal, $interval, $location,
       if (parseInt(channelsResults[0].processing) !== 0) {
         value = parseInt(channelsResults[0].processing)
         percent = (100 / totalTransactions * value).toFixed(2)
-        channelsData.push({ label: 'Processing', value: value, percent: percent, color: '#777777' })
+        channelsData.push({ label: 'Processing', value, percent, color: '#777777' })
       }
 
       if (parseInt(channelsResults[0].failed) !== 0) {
         value = parseInt(channelsResults[0].failed)
         percent = (100 / totalTransactions * value).toFixed(2)
-        channelsData.push({ label: 'Failed', value: value, percent: percent, color: '#d9534f' })
+        channelsData.push({ label: 'Failed', value, percent, color: '#d9534f' })
       }
 
       if (parseInt(channelsResults[0].completed) !== 0) {
         value = parseInt(channelsResults[0].completed)
         percent = (100 / totalTransactions * value).toFixed(2)
-        channelsData.push({ label: 'Completed', value: value, percent: percent, color: '#EFC300' })
+        channelsData.push({ label: 'Completed', value, percent, color: '#EFC300' })
       }
 
       if (parseInt(channelsResults[0].completedWErrors) !== 0) {
         value = parseInt(channelsResults[0].completedWErrors)
         percent = (100 / totalTransactions * value).toFixed(2)
-        channelsData.push({ label: 'Completed With Error (s)', value: value, percent: percent, color: '#FB8B24' })
+        channelsData.push({ label: 'Completed With Error (s)', value, percent, color: '#FB8B24' })
       }
 
       if (parseInt(channelsResults[0].successful) !== 0) {
         value = parseInt(channelsResults[0].successful)
         percent = (100 / totalTransactions * value).toFixed(2)
-        channelsData.push({ label: 'Successful', value: value, percent: percent, color: '#5cb85c' })
+        channelsData.push({ label: 'Successful', value, percent, color: '#5cb85c' })
       }
 
       updateChannelsBarChart(channelsData)
diff --git a/app/scripts/controllers/exportImport.js b/app/scripts/controllers/exportImport.js
@@ -221,7 +221,7 @@ export function ExportImportCtrl ($scope, $uibModal, Api, Alerting) {
       windowClass: 'modal-fullview',
       resolve: {
         bodyData: function () {
-          return { type: type, content: content, headers: { 'content-type': 'application/json' } }
+          return { type, content, headers: { 'content-type': 'application/json' } }
         }
       }
     })
diff --git a/app/scripts/controllers/exportImportModal.js b/app/scripts/controllers/exportImportModal.js
@@ -152,7 +152,7 @@ export function ExportImportModalCtrl ($scope, $uibModalInstance, $uibModal, $ti
       windowClass: 'modal-fullview',
       resolve: {
         bodyData: function () {
-          return { type: type, content: content, headers: { 'content-type': 'application/json' } }
+          return { type, content, headers: { 'content-type': 'application/json' } }
         }
       }
     })
diff --git a/app/scripts/controllers/login.js b/app/scripts/controllers/login.js
@@ -195,11 +195,11 @@ export function LoginCtrl ($scope, login, $window, $location, $timeout, $rootSco
 
         // create session object
         const consoleSessionObject = {
-          sessionID: sessionID,
+          sessionID,
           sessionUser: loginEmail,
-          sessionUserGroups: sessionUserGroups,
-          sessionUserSettings: sessionUserSettings,
-          sessionProvider: sessionProvider
+          sessionUserGroups,
+          sessionUserSettings,
+          sessionProvider
         }
 
         // Put the object into storage
@@ -213,7 +213,7 @@ export function LoginCtrl ($scope, login, $window, $location, $timeout, $rootSco
   $scope.signInWithKeyCloak = function () {
     keycloak.keycloakInstance.login({
       // Must match to the configured value in keycloak
-      redirectUri: $window.location.origin,
+      redirectUri: $window.location.origin
     })
   }
 }
diff --git a/app/scripts/controllers/taskDetails.js b/app/scripts/controllers/taskDetails.js
@@ -54,7 +54,7 @@ export function TaskDetailsCtrl ($scope, $uibModal, $location, $routeParams, Api
       if (showpage === i) {
         status = 'active'
       }
-      $scope.pagesArray.push({ pageNum: i, status: status })
+      $scope.pagesArray.push({ pageNum: i, status })
     }
   }
 
diff --git a/app/scripts/controllers/transactionDetails.js b/app/scripts/controllers/transactionDetails.js
@@ -239,7 +239,7 @@ export function TransactionDetailsCtrl ($scope, $uibModal, $compile, $location,
       windowClass: 'modal-fullview',
       resolve: {
         bodyData: function () {
-          return { type: type, content: content, headers: headers }
+          return { type, content, headers }
         }
       }
     })
diff --git a/app/scripts/controllers/users.js b/app/scripts/controllers/users.js
@@ -51,7 +51,7 @@ export function UsersCtrl ($scope, $uibModal, $window, Api, Alerting, Notify) {
           })
         })
 
-        usersArray.push({ user: user, allowedChannels: allowedChannels, allowedChannelsBody: allowedChannelsBody, allowedChannelsRerun: allowedChannelsRerun })
+        usersArray.push({ user, allowedChannels, allowedChannelsBody, allowedChannelsRerun })
       })
 
       $scope.usersChannelsMatrix = {}
diff --git a/app/scripts/controllers/visualizer.js b/app/scripts/controllers/visualizer.js
@@ -107,22 +107,22 @@ export function VisualizerCtrl ($scope, $http, $interval, $window, $uibModal, lo
     $scope.visualizerData = []
     $scope.visualizerSettings = {
       name: visSettings.name,
-      components: components,
-      channels: channels,
-      mediators: mediators,
-      visResponsive: visResponsive,
-      visW: visW,
-      visH: visH,
-      pad: pad,
-      inactiveColor: inactiveColor,
-      activeColor: activeColor,
-      errorColor: errorColor,
-      textColor: textColor,
-      updatePeriod: updatePeriod,
-      minDisplayPeriod: minDisplayPeriod,
+      components,
+      channels,
+      mediators,
+      visResponsive,
+      visW,
+      visH,
+      pad,
+      inactiveColor,
+      activeColor,
+      errorColor,
+      textColor,
+      updatePeriod,
+      minDisplayPeriod,
       speed: $scope.visualizerSpeed,
-      maxSpeed: maxSpeed,
-      maxTimeout: maxTimeout
+      maxSpeed,
+      maxTimeout
     }
 
     // check if visualizer should be loaded - no errors found
diff --git a/app/scripts/directives/graph-directives-morris.js b/app/scripts/directives/graph-directives-morris.js
@@ -23,7 +23,7 @@ export function morrisLineChart ($parse) {
           } else {
           // create Morris Line Chart if it doesnt yet exist
             scope.morrisLineChart = new Morris.Line({
-              element: element,
+              element,
               data: data.data,
               xkey: data.xkey,
               ykeys: data.ykeys,
@@ -56,7 +56,7 @@ export function morrisBarChart ($parse) {
           } else {
           // create Morris Bar Chart if it doesnt yet exist
             scope.morrisBarChart = new Morris.Bar({
-              element: element,
+              element,
               data: data.data,
               xkey: data.xkey,
               ykeys: data.ykeys,
@@ -98,7 +98,7 @@ export function morrisDonutChart ($parse) {
         elem.empty()
         if (data) {
           scope.morrisDonutChart = new Morris.Donut({
-            element: element,
+            element,
             data: data.data,
             colors: data.colors,
             resize: true,
diff --git a/app/scripts/external/angular-taglist-directive.js b/app/scripts/external/angular-taglist-directive.js
@@ -11,7 +11,7 @@ angular.module(angularTaglist, []).directive('taglist', ['$timeout', function ($
       taglistBlurTimeout: '='
     },
     transclude: true,
-    template: template,
+    template,
     compile: function (tElement, tAttrs, transcludeFn) {
       return function (scope, element, attrs) {
         element.bind('click', function () {
diff --git a/app/scripts/index.js b/app/scripts/index.js
@@ -165,11 +165,11 @@ app.run(function ($rootScope, $location, $anchorScroll, Api) {
 
         // create session object
         const consoleSessionObject = {
-          sessionID: sessionID,
-          sessionUser: sessionUser,
-          sessionUserGroups: sessionUserGroups,
-          sessionUserSettings: sessionUserSettings,
-          sessionProvider: sessionProvider
+          sessionID,
+          sessionUser,
+          sessionUserGroups,
+          sessionUserSettings,
+          sessionProvider
         }
 
         // Put updated object into storage
diff --git a/app/scripts/services/login.js b/app/scripts/services/login.js
@@ -7,7 +7,7 @@ export function login (Api, $rootScope, keycloak) {
       Api.AuthenticateLocal.save({ username: email, password }, function () {
         // on success
         // Verify that you can make authenticated requests
-        Api.Users.get({ email: email }, function (profile) {
+        Api.Users.get({ email }, function (profile) {
           userProfile = profile
           done('Authentication Success')
         }, function () {
diff --git a/app/scripts/services/metrics.js b/app/scripts/services/metrics.js
@@ -59,7 +59,7 @@ export function Metrics () {
           }
         }
 
-        graphData.push({ timestamp: timestamp.format('YYYY-MM-DD HH:mm'), value: value })
+        graphData.push({ timestamp: timestamp.format('YYYY-MM-DD HH:mm'), value })
       }
 
       avgResponseTime = (avgResponseTimeTotal / metrics.length).toFixed(2)
@@ -68,8 +68,8 @@ export function Metrics () {
         xkey: 'timestamp',
         ykeys: ['value'],
         labels: [label],
-        loadTotal: loadTotal,
-        avgResponseTime: avgResponseTime
+        loadTotal,
+        avgResponseTime
       }
     }
   }
diff --git a/app/scripts/utils/utils.js b/app/scripts/utils/utils.js
@@ -62,11 +62,11 @@ export function beautifyIndent (type, content) {
     }
   } catch (err) {
     console.log(err)
-    return { lang: '', content: content }
+    return { lang: '', content }
   }
 
   // if not applicable then return as is
-  return { lang: '', content: content }
+  return { lang: '', content }
 }
 
 export function isCoreVersionCompatible (minVersion, actualVersion) {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/webpack.development.js b/webpack.development.js

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ export function AuditDetailsCtrl ($scope, $uibModal, $location, $routeParams, Ap`
`60`	`60`	`controller: AuditsContentModalCtrl,`
`61`	`61`	`resolve: {`
`62`	`62`	`auditData: function () {`
`63`		`- return { type: type, content: content }`
	`63`	`+ return { type, content }`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`})`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ export function AuditsCtrl ($scope, $uibModal, $location, $interval, Api, Alerti`
`235`	`235`
`236`	`236`	`// if patientID set then update query to include 'AND' operator`
`237`	`237`	`if (valueNotEmpty(patientID) === true) {`
`238`		`- filtersObject.filters['participantObjectIdentification.participantObjectID'] = { type: 'AND', patientID: participantPatientID, objectID: objectID }`
	`238`	`+ filtersObject.filters['participantObjectIdentification.participantObjectID'] = { type: 'AND', patientID: participantPatientID, objectID }`
`239`	`239`	`} else {`
`240`	`240`	`filtersObject.filters['participantObjectIdentification.participantObjectID'] = JSON.stringify(objectID)`
`241`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ export function ExportImportCtrl ($scope, $uibModal, Api, Alerting) {`
`221`	`221`	`windowClass: 'modal-fullview',`
`222`	`222`	`resolve: {`
`223`	`223`	`bodyData: function () {`
`224`		`- return { type: type, content: content, headers: { 'content-type': 'application/json' } }`
	`224`	`+ return { type, content, headers: { 'content-type': 'application/json' } }`
`225`	`225`	`}`
`226`	`226`	`}`
`227`	`227`	`})`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ export function ExportImportModalCtrl ($scope, $uibModalInstance, $uibModal, $ti`
`152`	`152`	`windowClass: 'modal-fullview',`
`153`	`153`	`resolve: {`
`154`	`154`	`bodyData: function () {`
`155`		`- return { type: type, content: content, headers: { 'content-type': 'application/json' } }`
	`155`	`+ return { type, content, headers: { 'content-type': 'application/json' } }`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`	`})`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ export function TaskDetailsCtrl ($scope, $uibModal, $location, $routeParams, Api`
`54`	`54`	`if (showpage === i) {`
`55`	`55`	`status = 'active'`
`56`	`56`	`}`
`57`		`- $scope.pagesArray.push({ pageNum: i, status: status })`
	`57`	`+ $scope.pagesArray.push({ pageNum: i, status })`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ export function TransactionDetailsCtrl ($scope, $uibModal, $compile, $location,`
`239`	`239`	`windowClass: 'modal-fullview',`
`240`	`240`	`resolve: {`
`241`	`241`	`bodyData: function () {`
`242`		`- return { type: type, content: content, headers: headers }`
	`242`	`+ return { type, content, headers }`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`	`})`