Chore: Add basic screen and toggle

Chore: form skeleton

Feat: wizard step 1 and 2

Feat: toggle button group for formik

Feat: select input type Form and styling

Feat: text entry page

Feat: Choice list and CSS

Fix: scroll to bottom on Add choice button click

Feat: format data at end of wizard

Feat: wizard toggle button and background blur

Feat: data table for custom info requests

Feat: editing and deleting custom info request

Feat: add icons

Fix: Wizard changes

Feat: custom requests migrations

Feat: fetch custom info requests

Feat: add mutations

Feat: add custom request option in trigger wizard

Feat: show customrequests on table

Feat: Triggers page code refactor

Feat: integrate custom info requests on Customer graphql type

Feat: Show custom info requests on user page

Fix: use normal table instead of datatable

Feat: modal for custom information request details

Feat: poller returns custom request information details

Feat: send customer custom info requests to machine

Chore: add field CustomInfoRequestsData on customer updates

Feat: customer custom info request data saving

Chore: variable name changes and lots of fixes

Feat: remove default value in query, sort request on customer profile

Signed-off-by: csrapr <26280794+csrapr@users.noreply.github.com>

Fix: return promise when array of ids is empty

Feat: TitleSection can receive more than one button

lib/routes/customerRoutes.js

@@ -18,6 +18,13 @@ const { getTx } = require('../new-admin/services/transactions.js')
 const { getCustomerById } = require('../customers')
 const machineLoader = require('../machine-loader')
 const { loadLatestConfig } = require('../new-settings-loader')
+const customInfoRequestQueries = require('../new-admin/services/customInfoRequests')
+
+function updateCustomerCustomInfoRequest (customerId, dataToSave, req, res) {
+  return customInfoRequestQueries.setCustomerData(customerId, dataToSave.info_request_id, dataToSave)
+    .then(() => customers.getById(customerId))
+    .then(customer => respond(req, res, { customer }))
+}
 
 function updateCustomer (req, res, next) {
   const id = req.params.id
@@ -27,6 +34,10 @@ function updateCustomer (req, res, next) {
   const triggers = configManager.getTriggers(req.settings.config)
   const compatTriggers = complianceTriggers.getBackwardsCompatibleTriggers(triggers)
 
+  if (patch.customRequestPatch) {
+    return updateCustomerCustomInfoRequest(id, patch.dataToSave, req, res).catch(next)
+  }
+
   customers.getById(id)
     .then(customer => {
       if (!customer) { throw httpError('Not Found', 404) }

lib/routes/pollingRoutes.js

@@ -10,6 +10,7 @@ const plugins = require('../plugins')
 const semver = require('semver')
 const state = require('../middlewares/state')
 const version = require('../../package.json').version
+const customRequestQueries = require('../new-admin/services/customInfoRequests')
 
 const urlsToPing = [
   `us.archive.ubuntu.com`,
@@ -37,6 +38,24 @@ const createTerms = terms => (terms.active && terms.text) ? ({
   cancel: terms.cancelButtonText
 }) : null
 
+const buildTriggers = (allTriggers) => {
+  const normalTriggers = []
+  const customTriggers = _.filter(o => {
+    if (o.customInfoRequestId === '') normalTriggers.push(o)
+    return o.customInfoRequestId !== ''
+  }, allTriggers)
+
+  return _.flow([_.map(_.get('customInfoRequestId')), customRequestQueries.batchGetCustomInfoRequest])(customTriggers)
+    .then(res => {
+      res.forEach((details, index) => {
+        // make sure we aren't attaching the details to the wrong trigger
+        if (customTriggers[index].customInfoRequestId !== details.id) return
+        customTriggers[index] = { ...customTriggers[index], customInfoRequest: details }
+      })
+      return [...normalTriggers, ...customTriggers]
+    })
+}
+
 function poll (req, res, next) {
   const machineVersion = req.query.version
   const machineModel = req.query.model
@@ -54,8 +73,8 @@ function poll (req, res, next) {
   const pi = plugins(settings, deviceId)
   const hasLightning = checkHasLightning(settings)
 
-  const triggers = configManager.getTriggers(settings.config)
   const triggersAutomation = configManager.getTriggersAutomation(settings.config)
+  const triggersPromise = buildTriggers(configManager.getTriggers(settings.config))
 
   const operatorInfo = configManager.getOperatorInfo(settings.config)
   const machineInfo = { deviceId: req.deviceId, deviceName: req.deviceName }
@@ -65,8 +84,8 @@ function poll (req, res, next) {
 
   state.pids[operatorId] = { [deviceId]: { pid, ts: Date.now() } }
 
-  return pi.pollQueries(serialNumber, deviceTime, req.query, machineVersion, machineModel)
-    .then(results => {
+  return Promise.all([pi.pollQueries(serialNumber, deviceTime, req.query, machineVersion, machineModel), triggersPromise])
+    .then(([results, triggers]) => {
       const cassettes = results.cassettes
 
       const reboot = pid && state.reboots?.[operatorId]?.[deviceId] === pid