@plusscommunities/pluss-maintenance-app 6.0.11 → 6.0.12-beta.0

package/dist/module/values.config.a.js.map

@@ -1 +1 @@
-{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","iconAddMenu","iconKioskAction","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName"],"sources":["values.config.a.js"],"sourcesContent":["const values = {\n  featureKey: 'maintenanceA',\n  aliases: ['maintenanceRequestA'],\n  reducerKey: 'jobsA',\n  serviceKey: 'maintenanceA',\n  updateKey: 'jobsA',\n  commentKey: 'maintenanceA',\n  actionJobsLoaded: 'JOBS_LOADEDA',\n  actionJobAdded: 'JOB_ADDEDA',\n  actionJobsAdded: 'JOBS_ADDEDA',\n  screenMaintenance: 'maintenanceA',\n  screenRequestDetail: 'requestDetailA',\n  screenServiceRequest: 'serviceRequestA',\n  screenJobTypePicker: 'jobTypePickerA',\n  screenRequestNotes: 'requestNotesA',\n  permissionMaintenanceTracking: 'maintenanceTrackingA',\n  permissionMaintenanceAssignment: 'maintenanceAssignmentA',\n  iconGridMenu: 'maintenance',\n  iconAddMenu: 'request',\n  iconKioskAction: 'wrench',\n  orderAddMenu: 5,\n  orderMoreMenu: 4,\n  orderKioskAction: 1,\n  textFeatureTitle: 'Request A',\n  textAddMenuTitle: 'Request A',\n  textMoreMenuTitle: 'Request A',\n  textKioskActionTitle: 'Request A',\n  textEntityName: 'Job',\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACbC,UAAU,EAAE,cAAc;EAC1BC,OAAO,EAAE,CAAC,qBAAqB,CAAC;EAChCC,UAAU,EAAE,OAAO;EACnBC,UAAU,EAAE,cAAc;EAC1BC,SAAS,EAAE,OAAO;EAClBC,UAAU,EAAE,cAAc;EAC1BC,gBAAgB,EAAE,cAAc;EAChCC,cAAc,EAAE,YAAY;EAC5BC,eAAe,EAAE,aAAa;EAC9BC,iBAAiB,EAAE,cAAc;EACjCC,mBAAmB,EAAE,gBAAgB;EACrCC,oBAAoB,EAAE,iBAAiB;EACvCC,mBAAmB,EAAE,gBAAgB;EACrCC,kBAAkB,EAAE,eAAe;EACnCC,6BAA6B,EAAE,sBAAsB;EACrDC,+BAA+B,EAAE,wBAAwB;EACzDC,YAAY,EAAE,aAAa;EAC3BC,WAAW,EAAE,SAAS;EACtBC,eAAe,EAAE,QAAQ;EACzBC,YAAY,EAAE,CAAC;EACfC,aAAa,EAAE,CAAC;EAChBC,gBAAgB,EAAE,CAAC;EACnBC,gBAAgB,EAAE,WAAW;EAC7BC,gBAAgB,EAAE,WAAW;EAC7BC,iBAAiB,EAAE,WAAW;EAC9BC,oBAAoB,EAAE,WAAW;EACjCC,cAAc,EAAE;AAClB,CAAC;AAED,SAAS3B,MAAM","ignoreList":[]}
+{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","iconAddMenu","iconKioskAction","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","stringConfigJobStatus","stringConfigHideSeen"],"sources":["values.config.a.js"],"sourcesContent":["const values = {\n  featureKey: 'maintenanceA',\n  aliases: ['maintenanceRequestA'],\n  reducerKey: 'jobsA',\n  serviceKey: 'maintenanceA',\n  updateKey: 'jobsA',\n  commentKey: 'maintenanceA',\n  actionJobsLoaded: 'JOBS_LOADEDA',\n  actionJobAdded: 'JOB_ADDEDA',\n  actionJobsAdded: 'JOBS_ADDEDA',\n  actionJobsStatusesLoaded: 'JOBS_STATUSES_LOADEDA',\n  actionJobsHideSeen: 'JOBS_HIDE_SEENA',\n  actionJobFilterLoaded: 'JOBS_FILTER_LOADEDA',\n  screenMaintenance: 'maintenanceA',\n  screenRequestDetail: 'requestDetailA',\n  screenServiceRequest: 'serviceRequestA',\n  screenJobTypePicker: 'jobTypePickerA',\n  screenRequestNotes: 'requestNotesA',\n  permissionMaintenanceTracking: 'maintenanceTrackingA',\n  permissionMaintenanceAssignment: 'maintenanceAssignmentA',\n  iconGridMenu: 'maintenance',\n  iconAddMenu: 'request',\n  iconKioskAction: 'wrench',\n  orderAddMenu: 5,\n  orderMoreMenu: 4,\n  orderKioskAction: 1,\n  textFeatureTitle: 'Request A',\n  textAddMenuTitle: 'Request A',\n  textMoreMenuTitle: 'Request A',\n  textKioskActionTitle: 'Request A',\n  textEntityName: 'Job',\n  stringConfigJobStatus: 'maintenanceJobStatusA',\n  stringConfigHideSeen: 'maintenanceDisableSeenA',\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACbC,UAAU,EAAE,cAAc;EAC1BC,OAAO,EAAE,CAAC,qBAAqB,CAAC;EAChCC,UAAU,EAAE,OAAO;EACnBC,UAAU,EAAE,cAAc;EAC1BC,SAAS,EAAE,OAAO;EAClBC,UAAU,EAAE,cAAc;EAC1BC,gBAAgB,EAAE,cAAc;EAChCC,cAAc,EAAE,YAAY;EAC5BC,eAAe,EAAE,aAAa;EAC9BC,wBAAwB,EAAE,uBAAuB;EACjDC,kBAAkB,EAAE,iBAAiB;EACrCC,qBAAqB,EAAE,qBAAqB;EAC5CC,iBAAiB,EAAE,cAAc;EACjCC,mBAAmB,EAAE,gBAAgB;EACrCC,oBAAoB,EAAE,iBAAiB;EACvCC,mBAAmB,EAAE,gBAAgB;EACrCC,kBAAkB,EAAE,eAAe;EACnCC,6BAA6B,EAAE,sBAAsB;EACrDC,+BAA+B,EAAE,wBAAwB;EACzDC,YAAY,EAAE,aAAa;EAC3BC,WAAW,EAAE,SAAS;EACtBC,eAAe,EAAE,QAAQ;EACzBC,YAAY,EAAE,CAAC;EACfC,aAAa,EAAE,CAAC;EAChBC,gBAAgB,EAAE,CAAC;EACnBC,gBAAgB,EAAE,WAAW;EAC7BC,gBAAgB,EAAE,WAAW;EAC7BC,iBAAiB,EAAE,WAAW;EAC9BC,oBAAoB,EAAE,WAAW;EACjCC,cAAc,EAAE,KAAK;EACrBC,qBAAqB,EAAE,uBAAuB;EAC9CC,oBAAoB,EAAE;AACxB,CAAC;AAED,SAAShC,MAAM","ignoreList":[]}

package/dist/module/values.config.default.js

@@ -8,6 +8,9 @@ const values = {
   actionJobsLoaded: 'JOBS_LOADED',
   actionJobAdded: 'JOB_ADDED',
   actionJobsAdded: 'JOBS_ADDED',
+  actionJobsStatusesLoaded: 'JOBS_STATUSES_LOADED',
+  actionJobsHideSeen: 'JOBS_HIDE_SEEN',
+  actionJobFilterLoaded: 'JOBS_FILTER_LOADED',
   screenMaintenance: 'maintenance',
   screenRequestDetail: 'requestDetail',
   screenServiceRequest: 'serviceRequest',
@@ -31,7 +34,9 @@ const values = {
   textJobType: 'Request Type',
   emptyRequestsStaff: 'No active Requests',
   emptyRequestsUser: 'Your Requests will show here',
-  forceCustomFields: false
+  forceCustomFields: false,
+  stringConfigJobStatus: 'maintenanceJobStatus',
+  stringConfigHideSeen: 'maintenanceDisableSeen'
 };
 export { values };
 //# sourceMappingURL=values.config.default.js.map

package/dist/module/values.config.default.js.map

@@ -1 +1 @@
-{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields"],"sources":["values.config.default.js"],"sourcesContent":["const values = {\n  featureKey: 'maintenance',\n  aliases: ['maintenanceRequest'],\n  reducerKey: 'jobs',\n  serviceKey: 'maintenance',\n  updateKey: 'jobs',\n  commentKey: 'maintenancerequest',\n  actionJobsLoaded: 'JOBS_LOADED',\n  actionJobAdded: 'JOB_ADDED',\n  actionJobsAdded: 'JOBS_ADDED',\n  screenMaintenance: 'maintenance',\n  screenRequestDetail: 'requestDetail',\n  screenServiceRequest: 'serviceRequest',\n  screenJobTypePicker: 'jobTypePicker',\n  screenRequestNotes: 'requestNotes',\n  permissionMaintenanceTracking: 'maintenanceTracking',\n  permissionMaintenanceAssignment: 'maintenanceAssignment',\n  iconGridMenu: 'maintenance',\n  gridViewBox: '0 0 30 30',\n  iconAddMenu: 'request',\n  iconKioskAction: 'wrench',\n  hasMoreOption: true,\n  orderAddMenu: 5,\n  orderMoreMenu: 4,\n  orderKioskAction: 1,\n  textFeatureTitle: 'Request',\n  textAddMenuTitle: 'Request',\n  textMoreMenuTitle: 'Request',\n  textKioskActionTitle: 'Request',\n  textEntityName: 'Job',\n  textJobType: 'Request Type',\n  emptyRequestsStaff: 'No active Requests',\n  emptyRequestsUser: 'Your Requests will show here',\n  forceCustomFields: false,\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACbC,UAAU,EAAE,aAAa;EACzBC,OAAO,EAAE,CAAC,oBAAoB,CAAC;EAC/BC,UAAU,EAAE,MAAM;EAClBC,UAAU,EAAE,aAAa;EACzBC,SAAS,EAAE,MAAM;EACjBC,UAAU,EAAE,oBAAoB;EAChCC,gBAAgB,EAAE,aAAa;EAC/BC,cAAc,EAAE,WAAW;EAC3BC,eAAe,EAAE,YAAY;EAC7BC,iBAAiB,EAAE,aAAa;EAChCC,mBAAmB,EAAE,eAAe;EACpCC,oBAAoB,EAAE,gBAAgB;EACtCC,mBAAmB,EAAE,eAAe;EACpCC,kBAAkB,EAAE,cAAc;EAClCC,6BAA6B,EAAE,qBAAqB;EACpDC,+BAA+B,EAAE,uBAAuB;EACxDC,YAAY,EAAE,aAAa;EAC3BC,WAAW,EAAE,WAAW;EACxBC,WAAW,EAAE,SAAS;EACtBC,eAAe,EAAE,QAAQ;EACzBC,aAAa,EAAE,IAAI;EACnBC,YAAY,EAAE,CAAC;EACfC,aAAa,EAAE,CAAC;EAChBC,gBAAgB,EAAE,CAAC;EACnBC,gBAAgB,EAAE,SAAS;EAC3BC,gBAAgB,EAAE,SAAS;EAC3BC,iBAAiB,EAAE,SAAS;EAC5BC,oBAAoB,EAAE,SAAS;EAC/BC,cAAc,EAAE,KAAK;EACrBC,WAAW,EAAE,cAAc;EAC3BC,kBAAkB,EAAE,oBAAoB;EACxCC,iBAAiB,EAAE,8BAA8B;EACjDC,iBAAiB,EAAE;AACrB,CAAC;AAED,SAASjC,MAAM","ignoreList":[]}
+{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields","stringConfigJobStatus","stringConfigHideSeen"],"sources":["values.config.default.js"],"sourcesContent":["const values = {\n  featureKey: 'maintenance',\n  aliases: ['maintenanceRequest'],\n  reducerKey: 'jobs',\n  serviceKey: 'maintenance',\n  updateKey: 'jobs',\n  commentKey: 'maintenancerequest',\n  actionJobsLoaded: 'JOBS_LOADED',\n  actionJobAdded: 'JOB_ADDED',\n  actionJobsAdded: 'JOBS_ADDED',\n  actionJobsStatusesLoaded: 'JOBS_STATUSES_LOADED',\n  actionJobsHideSeen: 'JOBS_HIDE_SEEN',\n  actionJobFilterLoaded: 'JOBS_FILTER_LOADED',\n  screenMaintenance: 'maintenance',\n  screenRequestDetail: 'requestDetail',\n  screenServiceRequest: 'serviceRequest',\n  screenJobTypePicker: 'jobTypePicker',\n  screenRequestNotes: 'requestNotes',\n  permissionMaintenanceTracking: 'maintenanceTracking',\n  permissionMaintenanceAssignment: 'maintenanceAssignment',\n  iconGridMenu: 'maintenance',\n  gridViewBox: '0 0 30 30',\n  iconAddMenu: 'request',\n  iconKioskAction: 'wrench',\n  hasMoreOption: true,\n  orderAddMenu: 5,\n  orderMoreMenu: 4,\n  orderKioskAction: 1,\n  textFeatureTitle: 'Request',\n  textAddMenuTitle: 'Request',\n  textMoreMenuTitle: 'Request',\n  textKioskActionTitle: 'Request',\n  textEntityName: 'Job',\n  textJobType: 'Request Type',\n  emptyRequestsStaff: 'No active Requests',\n  emptyRequestsUser: 'Your Requests will show here',\n  forceCustomFields: false,\n  stringConfigJobStatus: 'maintenanceJobStatus',\n  stringConfigHideSeen: 'maintenanceDisableSeen',\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACbC,UAAU,EAAE,aAAa;EACzBC,OAAO,EAAE,CAAC,oBAAoB,CAAC;EAC/BC,UAAU,EAAE,MAAM;EAClBC,UAAU,EAAE,aAAa;EACzBC,SAAS,EAAE,MAAM;EACjBC,UAAU,EAAE,oBAAoB;EAChCC,gBAAgB,EAAE,aAAa;EAC/BC,cAAc,EAAE,WAAW;EAC3BC,eAAe,EAAE,YAAY;EAC7BC,wBAAwB,EAAE,sBAAsB;EAChDC,kBAAkB,EAAE,gBAAgB;EACpCC,qBAAqB,EAAE,oBAAoB;EAC3CC,iBAAiB,EAAE,aAAa;EAChCC,mBAAmB,EAAE,eAAe;EACpCC,oBAAoB,EAAE,gBAAgB;EACtCC,mBAAmB,EAAE,eAAe;EACpCC,kBAAkB,EAAE,cAAc;EAClCC,6BAA6B,EAAE,qBAAqB;EACpDC,+BAA+B,EAAE,uBAAuB;EACxDC,YAAY,EAAE,aAAa;EAC3BC,WAAW,EAAE,WAAW;EACxBC,WAAW,EAAE,SAAS;EACtBC,eAAe,EAAE,QAAQ;EACzBC,aAAa,EAAE,IAAI;EACnBC,YAAY,EAAE,CAAC;EACfC,aAAa,EAAE,CAAC;EAChBC,gBAAgB,EAAE,CAAC;EACnBC,gBAAgB,EAAE,SAAS;EAC3BC,gBAAgB,EAAE,SAAS;EAC3BC,iBAAiB,EAAE,SAAS;EAC5BC,oBAAoB,EAAE,SAAS;EAC/BC,cAAc,EAAE,KAAK;EACrBC,WAAW,EAAE,cAAc;EAC3BC,kBAAkB,EAAE,oBAAoB;EACxCC,iBAAiB,EAAE,8BAA8B;EACjDC,iBAAiB,EAAE,KAAK;EACxBC,qBAAqB,EAAE,sBAAsB;EAC7CC,oBAAoB,EAAE;AACxB,CAAC;AAED,SAAStC,MAAM","ignoreList":[]}

package/dist/module/values.config.forms.js

@@ -8,6 +8,9 @@ const values = {
   actionJobsLoaded: 'JOBS_LOADEDForms',
   actionJobAdded: 'JOB_ADDEDForms',
   actionJobsAdded: 'JOBS_ADDEDForms',
+  actionJobsStatusesLoaded: 'JOBS_STATUSES_LOADEDForms',
+  actionJobsHideSeen: 'JOBS_HIDE_SEENForms',
+  actionJobFilterLoaded: 'JOBS_FILTER_LOADEDForms',
   screenMaintenance: 'maintenanceForms',
   screenRequestDetail: 'requestDetailForms',
   screenServiceRequest: 'serviceRequestForms',
@@ -31,7 +34,9 @@ const values = {
   textJobType: 'Form',
   emptyRequestsStaff: 'No active Form Submissions',
   emptyRequestsUser: 'Your Form Submissions will show here',
-  forceCustomFields: true
+  forceCustomFields: true,
+  stringConfigJobStatus: 'maintenanceJobStatusForms',
+  stringConfigHideSeen: 'maintenanceDisableSeenForms'
 };
 export { values };
 //# sourceMappingURL=values.config.forms.js.map

package/dist/module/values.config.forms.js.map

@@ -1 +1 @@
-{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields"],"sources":["values.config.forms.js"],"sourcesContent":["const values = {\n  featureKey: 'maintenanceForms',\n  aliases: ['maintenanceRequest'],\n  reducerKey: 'maintenanceForms',\n  serviceKey: 'maintenanceForms',\n  updateKey: 'jobsForms',\n  commentKey: 'maintenanceForms',\n  actionJobsLoaded: 'JOBS_LOADEDForms',\n  actionJobAdded: 'JOB_ADDEDForms',\n  actionJobsAdded: 'JOBS_ADDEDForms',\n  screenMaintenance: 'maintenanceForms',\n  screenRequestDetail: 'requestDetailForms',\n  screenServiceRequest: 'serviceRequestForms',\n  screenJobTypePicker: 'jobTypePickerForms',\n  screenRequestNotes: 'requestNotesForms',\n  permissionMaintenanceTracking: 'maintenanceTrackingForms',\n  permissionMaintenanceAssignment: 'maintenanceAssignmentForms',\n  iconGridMenu: 'form',\n  gridViewBox: '0 0 256 256',\n  iconAddMenu: 'form',\n  iconKioskAction: 'form',\n  hasMoreOption: false,\n  orderAddMenu: 5,\n  orderMoreMenu: 4,\n  orderKioskAction: 1,\n  textFeatureTitle: 'Forms',\n  textAddMenuTitle: 'Form Submission',\n  textMoreMenuTitle: 'Forms',\n  textKioskActionTitle: 'Forms',\n  textEntityName: 'Form',\n  textJobType: 'Form',\n  emptyRequestsStaff: 'No active Form Submissions',\n  emptyRequestsUser: 'Your Form Submissions will show here',\n  forceCustomFields: true,\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACbC,UAAU,EAAE,kBAAkB;EAC9BC,OAAO,EAAE,CAAC,oBAAoB,CAAC;EAC/BC,UAAU,EAAE,kBAAkB;EAC9BC,UAAU,EAAE,kBAAkB;EAC9BC,SAAS,EAAE,WAAW;EACtBC,UAAU,EAAE,kBAAkB;EAC9BC,gBAAgB,EAAE,kBAAkB;EACpCC,cAAc,EAAE,gBAAgB;EAChCC,eAAe,EAAE,iBAAiB;EAClCC,iBAAiB,EAAE,kBAAkB;EACrCC,mBAAmB,EAAE,oBAAoB;EACzCC,oBAAoB,EAAE,qBAAqB;EAC3CC,mBAAmB,EAAE,oBAAoB;EACzCC,kBAAkB,EAAE,mBAAmB;EACvCC,6BAA6B,EAAE,0BAA0B;EACzDC,+BAA+B,EAAE,4BAA4B;EAC7DC,YAAY,EAAE,MAAM;EACpBC,WAAW,EAAE,aAAa;EAC1BC,WAAW,EAAE,MAAM;EACnBC,eAAe,EAAE,MAAM;EACvBC,aAAa,EAAE,KAAK;EACpBC,YAAY,EAAE,CAAC;EACfC,aAAa,EAAE,CAAC;EAChBC,gBAAgB,EAAE,CAAC;EACnBC,gBAAgB,EAAE,OAAO;EACzBC,gBAAgB,EAAE,iBAAiB;EACnCC,iBAAiB,EAAE,OAAO;EAC1BC,oBAAoB,EAAE,OAAO;EAC7BC,cAAc,EAAE,MAAM;EACtBC,WAAW,EAAE,MAAM;EACnBC,kBAAkB,EAAE,4BAA4B;EAChDC,iBAAiB,EAAE,sCAAsC;EACzDC,iBAAiB,EAAE;AACrB,CAAC;AAED,SAASjC,MAAM","ignoreList":[]}
+{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields","stringConfigJobStatus","stringConfigHideSeen"],"sources":["values.config.forms.js"],"sourcesContent":["const values = {\n  featureKey: 'maintenanceForms',\n  aliases: ['maintenanceRequest'],\n  reducerKey: 'maintenanceForms',\n  serviceKey: 'maintenanceForms',\n  updateKey: 'jobsForms',\n  commentKey: 'maintenanceForms',\n  actionJobsLoaded: 'JOBS_LOADEDForms',\n  actionJobAdded: 'JOB_ADDEDForms',\n  actionJobsAdded: 'JOBS_ADDEDForms',\n  actionJobsStatusesLoaded: 'JOBS_STATUSES_LOADEDForms',\n  actionJobsHideSeen: 'JOBS_HIDE_SEENForms',\n  actionJobFilterLoaded: 'JOBS_FILTER_LOADEDForms',\n  screenMaintenance: 'maintenanceForms',\n  screenRequestDetail: 'requestDetailForms',\n  screenServiceRequest: 'serviceRequestForms',\n  screenJobTypePicker: 'jobTypePickerForms',\n  screenRequestNotes: 'requestNotesForms',\n  permissionMaintenanceTracking: 'maintenanceTrackingForms',\n  permissionMaintenanceAssignment: 'maintenanceAssignmentForms',\n  iconGridMenu: 'form',\n  gridViewBox: '0 0 256 256',\n  iconAddMenu: 'form',\n  iconKioskAction: 'form',\n  hasMoreOption: false,\n  orderAddMenu: 5,\n  orderMoreMenu: 4,\n  orderKioskAction: 1,\n  textFeatureTitle: 'Forms',\n  textAddMenuTitle: 'Form Submission',\n  textMoreMenuTitle: 'Forms',\n  textKioskActionTitle: 'Forms',\n  textEntityName: 'Form',\n  textJobType: 'Form',\n  emptyRequestsStaff: 'No active Form Submissions',\n  emptyRequestsUser: 'Your Form Submissions will show here',\n  forceCustomFields: true,\n  stringConfigJobStatus: 'maintenanceJobStatusForms',\n  stringConfigHideSeen: 'maintenanceDisableSeenForms',\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACbC,UAAU,EAAE,kBAAkB;EAC9BC,OAAO,EAAE,CAAC,oBAAoB,CAAC;EAC/BC,UAAU,EAAE,kBAAkB;EAC9BC,UAAU,EAAE,kBAAkB;EAC9BC,SAAS,EAAE,WAAW;EACtBC,UAAU,EAAE,kBAAkB;EAC9BC,gBAAgB,EAAE,kBAAkB;EACpCC,cAAc,EAAE,gBAAgB;EAChCC,eAAe,EAAE,iBAAiB;EAClCC,wBAAwB,EAAE,2BAA2B;EACrDC,kBAAkB,EAAE,qBAAqB;EACzCC,qBAAqB,EAAE,yBAAyB;EAChDC,iBAAiB,EAAE,kBAAkB;EACrCC,mBAAmB,EAAE,oBAAoB;EACzCC,oBAAoB,EAAE,qBAAqB;EAC3CC,mBAAmB,EAAE,oBAAoB;EACzCC,kBAAkB,EAAE,mBAAmB;EACvCC,6BAA6B,EAAE,0BAA0B;EACzDC,+BAA+B,EAAE,4BAA4B;EAC7DC,YAAY,EAAE,MAAM;EACpBC,WAAW,EAAE,aAAa;EAC1BC,WAAW,EAAE,MAAM;EACnBC,eAAe,EAAE,MAAM;EACvBC,aAAa,EAAE,KAAK;EACpBC,YAAY,EAAE,CAAC;EACfC,aAAa,EAAE,CAAC;EAChBC,gBAAgB,EAAE,CAAC;EACnBC,gBAAgB,EAAE,OAAO;EACzBC,gBAAgB,EAAE,iBAAiB;EACnCC,iBAAiB,EAAE,OAAO;EAC1BC,oBAAoB,EAAE,OAAO;EAC7BC,cAAc,EAAE,MAAM;EACtBC,WAAW,EAAE,MAAM;EACnBC,kBAAkB,EAAE,4BAA4B;EAChDC,iBAAiB,EAAE,sCAAsC;EACzDC,iBAAiB,EAAE,IAAI;EACvBC,qBAAqB,EAAE,2BAA2B;EAClDC,oBAAoB,EAAE;AACxB,CAAC;AAED,SAAStC,MAAM","ignoreList":[]}

package/dist/module/values.config.js

@@ -8,6 +8,9 @@ const values = {
   actionJobsLoaded: 'JOBS_LOADED',
   actionJobAdded: 'JOB_ADDED',
   actionJobsAdded: 'JOBS_ADDED',
+  actionJobsStatusesLoaded: 'JOBS_STATUSES_LOADED',
+  actionJobsHideSeen: 'JOBS_HIDE_SEEN',
+  actionJobFilterLoaded: 'JOBS_FILTER_LOADED',
   screenMaintenance: 'maintenance',
   screenRequestDetail: 'requestDetail',
   screenServiceRequest: 'serviceRequest',
@@ -31,7 +34,9 @@ const values = {
   textJobType: 'Request Type',
   emptyRequestsStaff: 'No active Requests',
   emptyRequestsUser: 'Your Requests will show here',
-  forceCustomFields: false
+  forceCustomFields: false,
+  stringConfigJobStatus: 'maintenanceJobStatus',
+  stringConfigHideSeen: 'maintenanceDisableSeen'
 };
 export { values };
 //# sourceMappingURL=values.config.js.map

package/dist/module/values.config.js.map

@@ -1 +1 @@
-{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields"],"sources":["values.config.js"],"sourcesContent":["const values = {\n  featureKey: 'maintenance',\n  aliases: ['maintenanceRequest'],\n  reducerKey: 'jobs',\n  serviceKey: 'maintenance',\n  updateKey: 'jobs',\n  commentKey: 'maintenancerequest',\n  actionJobsLoaded: 'JOBS_LOADED',\n  actionJobAdded: 'JOB_ADDED',\n  actionJobsAdded: 'JOBS_ADDED',\n  screenMaintenance: 'maintenance',\n  screenRequestDetail: 'requestDetail',\n  screenServiceRequest: 'serviceRequest',\n  screenJobTypePicker: 'jobTypePicker',\n  screenRequestNotes: 'requestNotes',\n  permissionMaintenanceTracking: 'maintenanceTracking',\n  permissionMaintenanceAssignment: 'maintenanceAssignment',\n  iconGridMenu: 'maintenance',\n  gridViewBox: '0 0 30 30',\n  iconAddMenu: 'request',\n  iconKioskAction: 'wrench',\n  hasMoreOption: true,\n  orderAddMenu: 5,\n  orderMoreMenu: 4,\n  orderKioskAction: 1,\n  textFeatureTitle: 'Request',\n  textAddMenuTitle: 'Request',\n  textMoreMenuTitle: 'Request',\n  textKioskActionTitle: 'Request',\n  textEntityName: 'Job',\n  textJobType: 'Request Type',\n  emptyRequestsStaff: 'No active Requests',\n  emptyRequestsUser: 'Your Requests will show here',\n  forceCustomFields: false,\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACbC,UAAU,EAAE,aAAa;EACzBC,OAAO,EAAE,CAAC,oBAAoB,CAAC;EAC/BC,UAAU,EAAE,MAAM;EAClBC,UAAU,EAAE,aAAa;EACzBC,SAAS,EAAE,MAAM;EACjBC,UAAU,EAAE,oBAAoB;EAChCC,gBAAgB,EAAE,aAAa;EAC/BC,cAAc,EAAE,WAAW;EAC3BC,eAAe,EAAE,YAAY;EAC7BC,iBAAiB,EAAE,aAAa;EAChCC,mBAAmB,EAAE,eAAe;EACpCC,oBAAoB,EAAE,gBAAgB;EACtCC,mBAAmB,EAAE,eAAe;EACpCC,kBAAkB,EAAE,cAAc;EAClCC,6BAA6B,EAAE,qBAAqB;EACpDC,+BAA+B,EAAE,uBAAuB;EACxDC,YAAY,EAAE,aAAa;EAC3BC,WAAW,EAAE,WAAW;EACxBC,WAAW,EAAE,SAAS;EACtBC,eAAe,EAAE,QAAQ;EACzBC,aAAa,EAAE,IAAI;EACnBC,YAAY,EAAE,CAAC;EACfC,aAAa,EAAE,CAAC;EAChBC,gBAAgB,EAAE,CAAC;EACnBC,gBAAgB,EAAE,SAAS;EAC3BC,gBAAgB,EAAE,SAAS;EAC3BC,iBAAiB,EAAE,SAAS;EAC5BC,oBAAoB,EAAE,SAAS;EAC/BC,cAAc,EAAE,KAAK;EACrBC,WAAW,EAAE,cAAc;EAC3BC,kBAAkB,EAAE,oBAAoB;EACxCC,iBAAiB,EAAE,8BAA8B;EACjDC,iBAAiB,EAAE;AACrB,CAAC;AAED,SAASjC,MAAM","ignoreList":[]}
+{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields","stringConfigJobStatus","stringConfigHideSeen"],"sources":["values.config.js"],"sourcesContent":["const values = {\n  featureKey: 'maintenance',\n  aliases: ['maintenanceRequest'],\n  reducerKey: 'jobs',\n  serviceKey: 'maintenance',\n  updateKey: 'jobs',\n  commentKey: 'maintenancerequest',\n  actionJobsLoaded: 'JOBS_LOADED',\n  actionJobAdded: 'JOB_ADDED',\n  actionJobsAdded: 'JOBS_ADDED',\n  actionJobsStatusesLoaded: 'JOBS_STATUSES_LOADED',\n  actionJobsHideSeen: 'JOBS_HIDE_SEEN',\n  actionJobFilterLoaded: 'JOBS_FILTER_LOADED',\n  screenMaintenance: 'maintenance',\n  screenRequestDetail: 'requestDetail',\n  screenServiceRequest: 'serviceRequest',\n  screenJobTypePicker: 'jobTypePicker',\n  screenRequestNotes: 'requestNotes',\n  permissionMaintenanceTracking: 'maintenanceTracking',\n  permissionMaintenanceAssignment: 'maintenanceAssignment',\n  iconGridMenu: 'maintenance',\n  gridViewBox: '0 0 30 30',\n  iconAddMenu: 'request',\n  iconKioskAction: 'wrench',\n  hasMoreOption: true,\n  orderAddMenu: 5,\n  orderMoreMenu: 4,\n  orderKioskAction: 1,\n  textFeatureTitle: 'Request',\n  textAddMenuTitle: 'Request',\n  textMoreMenuTitle: 'Request',\n  textKioskActionTitle: 'Request',\n  textEntityName: 'Job',\n  textJobType: 'Request Type',\n  emptyRequestsStaff: 'No active Requests',\n  emptyRequestsUser: 'Your Requests will show here',\n  forceCustomFields: false,\n  stringConfigJobStatus: 'maintenanceJobStatus',\n  stringConfigHideSeen: 'maintenanceDisableSeen',\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACbC,UAAU,EAAE,aAAa;EACzBC,OAAO,EAAE,CAAC,oBAAoB,CAAC;EAC/BC,UAAU,EAAE,MAAM;EAClBC,UAAU,EAAE,aAAa;EACzBC,SAAS,EAAE,MAAM;EACjBC,UAAU,EAAE,oBAAoB;EAChCC,gBAAgB,EAAE,aAAa;EAC/BC,cAAc,EAAE,WAAW;EAC3BC,eAAe,EAAE,YAAY;EAC7BC,wBAAwB,EAAE,sBAAsB;EAChDC,kBAAkB,EAAE,gBAAgB;EACpCC,qBAAqB,EAAE,oBAAoB;EAC3CC,iBAAiB,EAAE,aAAa;EAChCC,mBAAmB,EAAE,eAAe;EACpCC,oBAAoB,EAAE,gBAAgB;EACtCC,mBAAmB,EAAE,eAAe;EACpCC,kBAAkB,EAAE,cAAc;EAClCC,6BAA6B,EAAE,qBAAqB;EACpDC,+BAA+B,EAAE,uBAAuB;EACxDC,YAAY,EAAE,aAAa;EAC3BC,WAAW,EAAE,WAAW;EACxBC,WAAW,EAAE,SAAS;EACtBC,eAAe,EAAE,QAAQ;EACzBC,aAAa,EAAE,IAAI;EACnBC,YAAY,EAAE,CAAC;EACfC,aAAa,EAAE,CAAC;EAChBC,gBAAgB,EAAE,CAAC;EACnBC,gBAAgB,EAAE,SAAS;EAC3BC,gBAAgB,EAAE,SAAS;EAC3BC,iBAAiB,EAAE,SAAS;EAC5BC,oBAAoB,EAAE,SAAS;EAC/BC,cAAc,EAAE,KAAK;EACrBC,WAAW,EAAE,cAAc;EAC3BC,kBAAkB,EAAE,oBAAoB;EACxCC,iBAAiB,EAAE,8BAA8B;EACjDC,iBAAiB,EAAE,KAAK;EACxBC,qBAAqB,EAAE,sBAAsB;EAC7CC,oBAAoB,EAAE;AACxB,CAAC;AAED,SAAStC,MAAM","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-app",
-  "version": "6.0.11",
+  "version": "6.0.12-beta.0",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "main": "dist/module/index.js",
   "module": "dist/module/index.js",

package/src/actions/JobActions.js

@@ -1,4 +1,7 @@
-import { JOBS_LOADED, JOB_ADDED, JOBS_ADDED } from './types';
+import { JOBS_LOADED, JOB_ADDED, JOBS_ADDED, JOBS_STATUSES_LOADED, JOBS_HIDE_SEEN, JOB_FILTER_LOADED } from './types';
+import { stringActions } from '../apis';
+import { values } from '../values.config';
+import { jobStatusOptions } from '../helper';
 
 export const jobsLoaded = jobs => {
   return {
@@ -20,3 +23,52 @@ export const jobsAdded = jobs => {
     payload: jobs,
   };
 };
+
+export const jobStatusesUpdate = (site, callback = null) => {
+  return dispatch => {
+    stringActions
+      .getString(site, values.stringConfigJobStatus)
+      .then(res => {
+        dispatch({
+          type: JOBS_STATUSES_LOADED,
+          payload: res.data,
+        });
+        if (callback) callback(res.data);
+      })
+      .catch(() => {
+        dispatch({
+          type: JOBS_STATUSES_LOADED,
+          payload: jobStatusOptions,
+        });
+        if (callback) callback(jobStatusOptions);
+      });
+  };
+};
+
+export const jobHideSeenUpdate = (site, callback = null) => {
+  return (dispatch) => {
+    stringActions
+      .getString(site, values.stringConfigHideSeen)
+      .then((res) => {
+        dispatch({
+          type: JOBS_HIDE_SEEN,
+          payload: res.data,
+        });
+        if (callback) callback(res.data);
+      })
+      .catch((_error) => {
+        dispatch({
+          type: JOBS_HIDE_SEEN,
+          payload: false,
+        });
+        if (callback) callback(false);
+      });
+  };
+};
+
+export const jobsFilterLoaded = filters => {
+  return {
+    type: JOB_FILTER_LOADED,
+    payload: filters,
+  };
+};

package/src/actions/types.js

@@ -3,3 +3,7 @@ import { values } from '../values.config';
 export const JOBS_LOADED = values.actionJobsLoaded;
 export const JOB_ADDED = values.actionJobAdded;
 export const JOBS_ADDED = values.actionJobsAdded;
+export const JOBS_STATUSES_LOADED = values.actionJobsStatusesLoaded;
+export const JOBS_HIDE_SEEN = values.actionJobsHideSeen;
+export const JOB_FILTER_LOADED = values.actionJobFilterLoaded;
+

package/src/apis/index.js

@@ -1 +1,5 @@
+import { Apis } from '../core.config';
+
+export const stringActions = Apis.stringActions;
+
 export * from './maintenanceActions';

package/src/apis/maintenanceActions.js

@@ -23,11 +23,14 @@ export const maintenanceActions = {
       data: { site, status, type },
     });
   },
-  getJobs2: (site, status, type, lastKey) => {
+  getJobs2: (site, status, priority, type, lastKey) => {
     const query = { site };
     if (status) {
       query.status = status;
     }
+    if (priority) {
+      query.priority = priority;
+    }
     if (type) {
       query.type = type;
     }
@@ -39,14 +42,14 @@ export const maintenanceActions = {
       url: Helper.getUrl(values.serviceKey, 'get/requests', query),
     });
   },
-  getJobsRecursive: (site, status, type, lastKey, jobs = []) => {
+  getJobsRecursive: (site, status, priority, type, lastKey, jobs = []) => {
     return new Promise(resolve => {
-      maintenanceActions.getJobs2(site, status, type, lastKey).then(jobRes => {
+      maintenanceActions.getJobs2(site, status, priority, type, lastKey).then(jobRes => {
         const newJobs = [...jobs, ...jobRes.data.Items];
         if (!jobRes.data.LastKey) {
           return resolve(newJobs);
         }
-        return resolve(maintenanceActions.getJobsRecursive(site, status, type, jobRes.data.LastKey, newJobs));
+        return resolve(maintenanceActions.getJobsRecursive(site, status, priority, type, jobRes.data.LastKey, newJobs));
       });
     });
   },
@@ -100,6 +103,13 @@ export const maintenanceActions = {
       data: { id, status },
     });
   },
+  editJobPriority: (id, priority) => {
+    return Session.authedFunction({
+      method: 'POST',
+      url: Helper.getUrl(values.serviceKey, 'update/priority'),
+      data: { id, priority },
+    });
+  },
   assignJob: (jobId, userId) => {
     return Session.authedFunction({
       method: 'POST',
@@ -116,7 +126,7 @@ export const maintenanceActions = {
       url: Helper.getUrl(values.serviceKey, 'get/assignees', { site }),
     });
   },
-  addNote: (jobId, note, attachments) => {
+  addNote: (jobId, note, attachments, images) => {
     return Session.authedFunction({
       method: 'POST',
       url: Helper.getUrl(values.serviceKey, 'requests/note'),
@@ -124,11 +134,12 @@ export const maintenanceActions = {
         id: jobId,
         note,
         attachments,
+        images,
         action: 'AddNote',
       },
     });
   },
-  editNote: (jobId, noteId, note, attachments) => {
+  editNote: (jobId, noteId, note, attachments, images) => {
     return Session.authedFunction({
       method: 'POST',
       url: Helper.getUrl(values.serviceKey, 'requests/note'),
@@ -136,6 +147,7 @@ export const maintenanceActions = {
         id: jobId,
         note,
         attachments,
+        images,
         noteId,
         action: 'EditNote',
       },

package/src/components/FilterPopupMenu.js

@@ -4,6 +4,8 @@ import { connect } from 'react-redux';
 import _ from 'lodash';
 import { maintenanceActions } from '../apis';
 import { Colours, Helper } from '../core.config';
+import { getJobStatusOptions, getIncompleteJobStatuses, jobPriorityOptions } from '../helper';
+import { values } from '../values.config';
 
 const SCREEN_HEIGHT = Dimensions.get('window').height;
 
@@ -14,31 +16,20 @@ class FilterPopupMenu extends Component {
     this.state = {
       types: props.types || [],
       selectedStatus: props.status || '',
+      selectedPriority: props.priority || '',
       selectedType: props.type || '',
       selectedAssignee: props.assignee || '',
       assignees: [],
     };
-    this.statusOptions = [
+    this.priorityOptions = [
       {
         label: 'All',
         value: '',
       },
-      {
-        label: 'Incomplete',
-        value: 'Unassigned|In Progress',
-      },
-      {
-        label: 'Open',
-        value: 'Unassigned',
-      },
-      {
-        label: 'In Progress',
-        value: 'In Progress',
-      },
-      {
-        label: 'Completed',
-        value: 'Completed',
-      },
+      ...jobPriorityOptions.map(p => ({
+        label: p.label,
+        value: p.label,
+      }))
     ];
   }
 
@@ -53,6 +44,26 @@ class FilterPopupMenu extends Component {
     }
   }
 
+  getStatusOptions = () => {
+    const statusOptions = getJobStatusOptions(this.props);
+    const options = [
+      {
+        label: 'All',
+        value: '',
+      },
+      {
+        label: 'Incomplete',
+        value: `Unassigned|${getIncompleteJobStatuses(this.props).map(s => s.text).join('|')}`,
+      },
+      ...statusOptions.map(s => ({
+        label: s.text,
+        value: s.text,
+      })),
+    ];
+    // console.log('getStatusOptions', options);
+    return options;
+  }
+
   getAssignees = async () => {
     try {
       const res = await maintenanceActions.getAssignees(this.props.site);
@@ -93,11 +104,12 @@ class FilterPopupMenu extends Component {
 
   onDone = () => {
     const { onClose } = this.props;
-    const { selectedStatus, selectedType, selectedAssignee } = this.state;
+    const { selectedStatus, selectedPriority, selectedType, selectedAssignee } = this.state;
     if (onClose)
       onClose({
         status: selectedStatus,
-        statusText: this.statusOptions.find(o => o.value === selectedStatus)?.label,
+        statusText: this.getStatusOptions().find(o => o.value === selectedStatus)?.label,
+        priority: selectedPriority,
         type: selectedType,
         assignee: selectedAssignee,
         assigneeName: this.state.assignees.find(a => a.value === selectedAssignee)?.label,
@@ -148,15 +160,20 @@ class FilterPopupMenu extends Component {
   }
 
   render() {
+    // console.log('FilterPopupMenu', JSON.stringify({ category: this.props.user.category, permissions: this.props.user.permissions }, null, 2))
+    const isStaff = this.props.user.category === 'staff'
+    const canFilterAssignee = !_.includes(this.props.user.permissions, values.permissionMaintenanceAssignment);
+
     return (
       <Modal visible transparent animationType="slide" onRequestClose={this.onDone}>
         <View style={styles.container}>
           <View style={styles.menu}>
             {this.renderTitle()}
             <ScrollView style={styles.optionContent}>
-              {this.renderOptions('Status', this.statusOptions, 'selectedStatus')}
+              {this.renderOptions('Status', this.getStatusOptions(), 'selectedStatus')}
+              {isStaff ? this.renderOptions('Priority', this.priorityOptions, 'selectedPriority') : null}
               {this.renderOptions('Type', this.state.types, 'selectedType')}
-              {this.renderOptions('Assigned To', this.state.assignees, 'selectedAssignee')}
+              {canFilterAssignee ? this.renderOptions('Assigned To', this.state.assignees, 'selectedAssignee') : null}
             </ScrollView>
             {this.renderCancel()}
           </View>
@@ -248,8 +265,10 @@ const mapStateToProps = state => {
   const { user } = state;
 
   return {
+    user,
     site: user.site,
     colourBrandingMain: Colours.getMainBrandingColourFromState(state),
+    statusTypes: state[values.reducerKey].jobstatuses,
   };
 };
 

package/src/components/MaintenanceList.js

@@ -3,53 +3,45 @@ import { View, StyleSheet, FlatList, TouchableOpacity, Text } from 'react-native
 import _ from 'lodash';
 import { connect } from 'react-redux';
 import { maintenanceActions } from '../apis';
-import { jobsLoaded, jobAdded, jobsAdded } from '../actions';
+import { jobsLoaded, jobAdded, jobsAdded, jobStatusesUpdate, jobHideSeenUpdate, jobsFilterLoaded } from '../actions';
 import MaintenanceListItem from '../components/MaintenanceListItem';
 import FilterPopupMenu from './FilterPopupMenu';
-import { Components, Colours, Config, Helper } from '../core.config';
+import { Components, Colours, Helper } from '../core.config';
 import { values } from '../values.config';
 
 class MaintenanceList extends Component {
   constructor(props) {
     super(props);
 
-    this.initialStatus = props.hasPermission ? 'Unassigned|In Progress' : '';
-    this.initialStatusText = props.hasPermission ? 'Incomplete' : '';
-
     this.state = {
       types: [],
       filteredList: props.jobs,
       loading: false,
       searchText: '',
       showFilterPopup: false,
-      selectedStatus: this.initialStatus,
-      selectedStatusText: this.initialStatusText,
-      selectedType: '',
-      selectedAssignee: '',
-      selectedAssigneeName: '',
     };
   }
 
   componentDidMount() {
+    this.props.jobStatusesUpdate(this.props.site);
+    this.props.jobHideSeenUpdate(this.props.site);
     this.refresh();
     this.refreshTypes();
-
     this.resetDataSource();
   }
 
   componentDidUpdate(prevProps) {
     if (!prevProps.dataUpdated && this.props.dataUpdated) this.refresh();
-    if (!_.isEqual(prevProps.jobs, this.props.jobs)) this.resetDataSource();
+    if (!_.isEqual(prevProps.jobs, this.props.jobs) || !_.isEqual(prevProps.jobfilters, this.props.jobfilters)) this.resetDataSource();
   }
 
   refresh = () => {
     this.onLoadingChanged(true, async () => {
       try {
-        const { selectedStatus, selectedType } = this.state;
-        // console.log('filters', { selectedStatus, selectedType });
-        const res = await maintenanceActions.getJobsRecursive(this.props.site, selectedStatus, selectedType);
-        // console.log('refresh', res?.data);
-        if (selectedStatus !== this.initialStatus || !_.isEmpty(selectedType)) {
+        const { jobfilters } = this.props;
+        const res = await maintenanceActions.getJobsRecursive(this.props.site, jobfilters.status, jobfilters.priority, jobfilters.type);
+        // console.log('refresh', res ? JSON.stringify(res[0], null, 2) : null);
+        if (!_.isEmpty(jobfilters.status) || !_.isEmpty(jobfilters.priority) || !_.isEmpty(jobfilters.type)) {
           this.props.jobsAdded(res);
         } else {
           this.props.jobsLoaded(res);
@@ -96,7 +88,8 @@ class MaintenanceList extends Component {
   }
 
   resetDataSource = (source = '') => {
-    const { searchText, selectedStatus, selectedType, selectedAssignee } = this.state;
+    const { jobfilters } = this.props;
+    const { searchText } = this.state;
     const { jobs } = this.props;
 
     let filteredList = jobs;
@@ -111,9 +104,10 @@ class MaintenanceList extends Component {
       });
       if (!jobIdMatch) this.fetchJob(searchText);
     }
-    if (selectedStatus) filteredList = filteredList.filter(j => selectedStatus.includes(j.status));
-    if (selectedType) filteredList = filteredList.filter(j => selectedType.includes(j.type));
-    if (selectedAssignee) filteredList = filteredList.filter(j => selectedAssignee.includes(j.AssigneeId));
+    if (jobfilters.status) filteredList = filteredList.filter(j => jobfilters.status.includes(j.status));
+    if (jobfilters.priority) filteredList = filteredList.filter(j => jobfilters.priority.includes(j.priority));
+    if (jobfilters.type) filteredList = filteredList.filter(j => jobfilters.type.includes(j.type));
+    if (jobfilters.assignee) filteredList = filteredList.filter(j => jobfilters.assignee.includes(j.AssigneeId));
     if (jobIdMatch) {
       const jobIndex = filteredList.indexOf(jobIdMatch);
       if (jobIndex > -1) {
@@ -148,33 +142,24 @@ class MaintenanceList extends Component {
   };
 
   onSelectFilter = selected => {
-    this.setState(
-      {
-        selectedStatus: selected.status,
-        selectedStatusText: selected.statusText,
-        selectedType: selected.type,
-        selectedAssignee: selected.assignee,
-        selectedAssigneeName: selected.assigneeName,
-      },
-      () => {
-        this.resetDataSource();
-        this.onToggleFilter();
-      },
-    );
+    this.props.jobsFilterLoaded(selected);
+    this.onToggleFilter();
   };
 
   getFilterButtonText = () => {
-    const { selectedStatus, selectedStatusText, selectedType, selectedAssignee, selectedAssigneeName } = this.state;
+    const { jobfilters } = this.props;
     const filterTexts = [];
-    if (!_.isEmpty(selectedStatus)) {
-      filterTexts.push(selectedStatusText);
+    if (!_.isEmpty(jobfilters.status)) {
+      filterTexts.push(jobfilters.statusText);
     }
-
-    if (!_.isEmpty(selectedType)) {
-      filterTexts.push(selectedType);
+    if (!_.isEmpty(jobfilters.priority)) {
+      filterTexts.push(jobfilters.priority);
+    }
+    if (!_.isEmpty(jobfilters.type)) {
+      filterTexts.push(jobfilters.type);
     }
-    if (!_.isEmpty(selectedAssignee)) {
-      filterTexts.push(selectedAssigneeName);
+    if (!_.isEmpty(jobfilters.assignee)) {
+      filterTexts.push(jobfilters.assigneeName);
     }
     if (_.isEmpty(filterTexts)) {
       return 'Filter';
@@ -244,16 +229,18 @@ class MaintenanceList extends Component {
   }
 
   renderFilterPopup() {
-    const { showFilterPopup, types, selectedStatus, selectedType, selectedAssignee } = this.state;
+    const { jobfilters } = this.props;
+    const { showFilterPopup, types } = this.state;
     if (!showFilterPopup) return null;
 
     return (
       <FilterPopupMenu
         site={this.props.site}
         types={types}
-        status={selectedStatus}
-        assignee={selectedAssignee}
-        type={selectedType}
+        status={jobfilters.status}
+        priority={jobfilters.priority}
+        assignee={jobfilters.assignee}
+        type={jobfilters.type}
         onClose={this.onSelectFilter}
       />
     );
@@ -329,7 +316,11 @@ const mapStateToProps = state => {
     userCategory: user.category,
     colourBrandingMain: Colours.getMainBrandingColourFromState(state),
     dataUpdated: notifications.dataUpdated[values.updateKey],
+    statusTypes: state[values.reducerKey].jobstatuses,
+    jobfilters: state[values.reducerKey].jobfilters,
   };
 };
 
-export default connect(mapStateToProps, { jobsLoaded, jobAdded, jobsAdded }, null, { forwardRef: true })(MaintenanceList);
+export default connect(mapStateToProps, { jobsLoaded, jobAdded, jobsAdded, jobStatusesUpdate, jobHideSeenUpdate, jobsFilterLoaded }, null, { forwardRef: true })(
+  MaintenanceList,
+);