@plusscommunities/pluss-maintenance-app-a 7.0.21 → 8.0.1-auth.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/module/apis/maintenanceActions.js +12 -4
- package/dist/module/apis/maintenanceActions.js.map +1 -1
- package/dist/module/components/FilterPopupMenu.js +30 -14
- package/dist/module/components/FilterPopupMenu.js.map +1 -1
- package/dist/module/components/MaintenanceList.js +199 -25
- package/dist/module/components/MaintenanceList.js.map +1 -1
- package/dist/module/components/MaintenanceListItem.js +2 -1
- package/dist/module/components/MaintenanceListItem.js.map +1 -1
- package/dist/module/components/MaintenanceWidgetItem.js +2 -1
- package/dist/module/components/MaintenanceWidgetItem.js.map +1 -1
- package/dist/module/components/PrioritySelectorPopup.js +2 -1
- package/dist/module/components/PrioritySelectorPopup.js.map +1 -1
- package/dist/module/components/StatusSelectorPopup.js +2 -1
- package/dist/module/components/StatusSelectorPopup.js.map +1 -1
- package/dist/module/components/WidgetSmall.js +5 -4
- package/dist/module/components/WidgetSmall.js.map +1 -1
- package/dist/module/core.config.js +1 -2
- package/dist/module/core.config.js.map +1 -1
- package/dist/module/screens/JobTypePicker.js +2 -1
- package/dist/module/screens/JobTypePicker.js.map +1 -1
- package/dist/module/screens/MaintenanceUserPicker.js +73 -91
- package/dist/module/screens/MaintenanceUserPicker.js.map +1 -1
- package/dist/module/screens/RequestDetail.js +76 -29
- package/dist/module/screens/RequestDetail.js.map +1 -1
- package/dist/module/screens/RequestNotes.js +11 -7
- package/dist/module/screens/RequestNotes.js.map +1 -1
- package/dist/module/screens/ServiceRequest.js +43 -42
- package/dist/module/screens/ServiceRequest.js.map +1 -1
- package/dist/module/values.config.a.js +1 -2
- package/dist/module/values.config.a.js.map +1 -1
- package/dist/module/values.config.default.js +1 -2
- package/dist/module/values.config.default.js.map +1 -1
- package/dist/module/values.config.enquiry.js +1 -2
- package/dist/module/values.config.enquiry.js.map +1 -1
- package/dist/module/values.config.feedback.js +1 -2
- package/dist/module/values.config.feedback.js.map +1 -1
- package/dist/module/values.config.food.js +1 -2
- package/dist/module/values.config.food.js.map +1 -1
- package/dist/module/values.config.js +1 -2
- package/dist/module/values.config.js.map +1 -1
- package/package.json +18 -14
- package/src/apis/maintenanceActions.js +17 -7
- package/src/components/FilterPopupMenu.js +67 -40
- package/src/components/MaintenanceList.js +234 -40
- package/src/components/MaintenanceListItem.js +2 -1
- package/src/components/MaintenanceWidgetItem.js +2 -1
- package/src/components/PrioritySelectorPopup.js +2 -1
- package/src/components/StatusSelectorPopup.js +2 -1
- package/src/components/WidgetSmall.js +12 -4
- package/src/core.config.js +0 -2
- package/src/screens/JobTypePicker.js +2 -1
- package/src/screens/MaintenanceUserPicker.js +77 -114
- package/src/screens/RequestDetail.js +88 -32
- package/src/screens/RequestNotes.js +17 -10
- package/src/screens/ServiceRequest.js +85 -44
- package/src/values.config.a.js +0 -1
- package/src/values.config.default.js +0 -1
- package/src/values.config.enquiry.js +0 -1
- package/src/values.config.feedback.js +0 -1
- package/src/values.config.food.js +0 -1
- package/src/values.config.js +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","screenUserPicker","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields","stringConfigJobStatus","stringConfigHideSeen"
|
|
1
|
+
{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","screenUserPicker","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\tfeatureKey: \"maintenance\",\n\taliases: [\"maintenanceRequest\"],\n\treducerKey: \"jobs\",\n\tserviceKey: \"maintenance\",\n\tupdateKey: \"jobs\",\n\tcommentKey: \"maintenancerequest\",\n\tactionJobsLoaded: \"JOBS_LOADED\",\n\tactionJobAdded: \"JOB_ADDED\",\n\tactionJobsAdded: \"JOBS_ADDED\",\n\tactionJobsStatusesLoaded: \"JOBS_STATUSES_LOADED\",\n\tactionJobsHideSeen: \"JOBS_HIDE_SEEN\",\n\tactionJobFilterLoaded: \"JOBS_FILTER_LOADED\",\n\tscreenMaintenance: \"maintenance\",\n\tscreenRequestDetail: \"requestDetail\",\n\tscreenServiceRequest: \"serviceRequest\",\n\tscreenJobTypePicker: \"jobTypePicker\",\n\tscreenRequestNotes: \"requestNotes\",\n\tscreenUserPicker: \"maintenanceUserPicker\",\n\tpermissionMaintenanceTracking: \"maintenanceTracking\",\n\tpermissionMaintenanceAssignment: \"maintenanceAssignment\",\n\ticonGridMenu: \"maintenance\",\n\tgridViewBox: \"0 0 30 30\",\n\ticonAddMenu: \"request\",\n\ticonKioskAction: \"wrench\",\n\thasMoreOption: true,\n\torderAddMenu: 5,\n\torderMoreMenu: 4,\n\torderKioskAction: 1,\n\ttextFeatureTitle: \"Request\",\n\ttextAddMenuTitle: \"Request\",\n\ttextMoreMenuTitle: \"Request\",\n\ttextKioskActionTitle: \"Request\",\n\ttextEntityName: \"Job\",\n\ttextJobType: \"Request Type\",\n\temptyRequestsStaff: \"No active Requests\",\n\temptyRequestsUser: \"Your Requests will show here\",\n\tforceCustomFields: false,\n\tstringConfigJobStatus: \"maintenanceJobStatus\",\n\tstringConfigHideSeen: \"maintenanceDisableSeen\",\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACdC,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,gBAAgB,EAAE,uBAAuB;EACzCC,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;AACvB,CAAC;AAED,SAASvC,MAAM","ignoreList":[]}
|
|
@@ -37,8 +37,7 @@ const values = {
|
|
|
37
37
|
emptyRequestsUser: "Your Enquiry will show here",
|
|
38
38
|
forceCustomFields: true,
|
|
39
39
|
stringConfigJobStatus: "maintenanceJobStatusEnquiry",
|
|
40
|
-
stringConfigHideSeen: "maintenanceDisableSeenEnquiry"
|
|
41
|
-
optionOnlyForResidents: "onlyForResidentsMaintenanceEnquiry"
|
|
40
|
+
stringConfigHideSeen: "maintenanceDisableSeenEnquiry"
|
|
42
41
|
};
|
|
43
42
|
export { values };
|
|
44
43
|
//# sourceMappingURL=values.config.enquiry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","screenUserPicker","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields","stringConfigJobStatus","stringConfigHideSeen"
|
|
1
|
+
{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","screenUserPicker","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields","stringConfigJobStatus","stringConfigHideSeen"],"sources":["values.config.enquiry.js"],"sourcesContent":["const values = {\n\tfeatureKey: \"maintenanceEnquiry\",\n\taliases: [\"maintenanceRequest\"],\n\treducerKey: \"jobsEnquiry\",\n\tserviceKey: \"maintenanceEnquiry\",\n\tupdateKey: \"jobsEnquiry\",\n\tcommentKey: \"maintenancerequestEnquiry\",\n\tactionJobsLoaded: \"JOBS_LOADEDEnquiry\",\n\tactionJobAdded: \"JOB_ADDEDEnquiry\",\n\tactionJobsAdded: \"JOBS_ADDEDEnquiry\",\n\tactionJobsStatusesLoaded: \"JOBS_STATUSES_LOADEDEnquiry\",\n\tactionJobsHideSeen: \"JOBS_HIDE_SEENEnquiry\",\n\tactionJobFilterLoaded: \"JOBS_FILTER_LOADEDEnquiry\",\n\tscreenMaintenance: \"maintenanceEnquiry\",\n\tscreenRequestDetail: \"requestDetailEnquiry\",\n\tscreenServiceRequest: \"serviceRequestEnquiry\",\n\tscreenJobTypePicker: \"jobTypePickerEnquiry\",\n\tscreenRequestNotes: \"requestNotesEnquiry\",\n\tscreenUserPicker: \"maintenanceUserPickerEnquiry\",\n\tpermissionMaintenanceTracking: \"maintenanceTrackingEnquiry\",\n\tpermissionMaintenanceAssignment: \"maintenanceAssignmentEnquiry\",\n\ticonGridMenu: \"form\",\n\tgridViewBox: \"0 0 256 256\",\n\ticonAddMenu: \"form\",\n\ticonKioskAction: \"form\",\n\thasMoreOption: false,\n\torderAddMenu: 5,\n\torderMoreMenu: 4,\n\torderKioskAction: 1,\n\ttextFeatureTitle: \"Enquiry\",\n\ttextAddMenuTitle: \"New Enquiry\",\n\ttextMoreMenuTitle: \"Enquiry\",\n\ttextKioskActionTitle: \"Enquiry\",\n\ttextEntityName: \"Enquiry\",\n\ttextJobType: \"Enquiry Type\",\n\temptyRequestsStaff: \"No active Enquiry\",\n\temptyRequestsUser: \"Your Enquiry will show here\",\n\tforceCustomFields: true,\n\tstringConfigJobStatus: \"maintenanceJobStatusEnquiry\",\n\tstringConfigHideSeen: \"maintenanceDisableSeenEnquiry\",\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACdC,UAAU,EAAE,oBAAoB;EAChCC,OAAO,EAAE,CAAC,oBAAoB,CAAC;EAC/BC,UAAU,EAAE,aAAa;EACzBC,UAAU,EAAE,oBAAoB;EAChCC,SAAS,EAAE,aAAa;EACxBC,UAAU,EAAE,2BAA2B;EACvCC,gBAAgB,EAAE,oBAAoB;EACtCC,cAAc,EAAE,kBAAkB;EAClCC,eAAe,EAAE,mBAAmB;EACpCC,wBAAwB,EAAE,6BAA6B;EACvDC,kBAAkB,EAAE,uBAAuB;EAC3CC,qBAAqB,EAAE,2BAA2B;EAClDC,iBAAiB,EAAE,oBAAoB;EACvCC,mBAAmB,EAAE,sBAAsB;EAC3CC,oBAAoB,EAAE,uBAAuB;EAC7CC,mBAAmB,EAAE,sBAAsB;EAC3CC,kBAAkB,EAAE,qBAAqB;EACzCC,gBAAgB,EAAE,8BAA8B;EAChDC,6BAA6B,EAAE,4BAA4B;EAC3DC,+BAA+B,EAAE,8BAA8B;EAC/DC,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,SAAS;EAC3BC,gBAAgB,EAAE,aAAa;EAC/BC,iBAAiB,EAAE,SAAS;EAC5BC,oBAAoB,EAAE,SAAS;EAC/BC,cAAc,EAAE,SAAS;EACzBC,WAAW,EAAE,cAAc;EAC3BC,kBAAkB,EAAE,mBAAmB;EACvCC,iBAAiB,EAAE,6BAA6B;EAChDC,iBAAiB,EAAE,IAAI;EACvBC,qBAAqB,EAAE,6BAA6B;EACpDC,oBAAoB,EAAE;AACvB,CAAC;AAED,SAASvC,MAAM","ignoreList":[]}
|
|
@@ -37,8 +37,7 @@ const values = {
|
|
|
37
37
|
emptyRequestsUser: "Your Feedback will show here",
|
|
38
38
|
forceCustomFields: true,
|
|
39
39
|
stringConfigJobStatus: "maintenanceJobStatusFeedback",
|
|
40
|
-
stringConfigHideSeen: "maintenanceDisableSeenFeedback"
|
|
41
|
-
optionOnlyForResidents: "onlyForResidentsMaintenanceFeedback"
|
|
40
|
+
stringConfigHideSeen: "maintenanceDisableSeenFeedback"
|
|
42
41
|
};
|
|
43
42
|
export { values };
|
|
44
43
|
//# sourceMappingURL=values.config.feedback.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","screenUserPicker","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields","stringConfigJobStatus","stringConfigHideSeen"
|
|
1
|
+
{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","screenUserPicker","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields","stringConfigJobStatus","stringConfigHideSeen"],"sources":["values.config.feedback.js"],"sourcesContent":["const values = {\n\tfeatureKey: \"maintenanceFeedback\",\n\taliases: [\"maintenanceRequest\"],\n\treducerKey: \"jobsFeedback\",\n\tserviceKey: \"maintenanceFeedback\",\n\tupdateKey: \"jobsFeedback\",\n\tcommentKey: \"maintenancerequestFeedback\",\n\tactionJobsLoaded: \"JOBS_LOADEDFeedback\",\n\tactionJobAdded: \"JOB_ADDEDFeedback\",\n\tactionJobsAdded: \"JOBS_ADDEDFeedback\",\n\tactionJobsStatusesLoaded: \"JOBS_STATUSES_LOADEDFeedback\",\n\tactionJobsHideSeen: \"JOBS_HIDE_SEENFeedback\",\n\tactionJobFilterLoaded: \"JOBS_FILTER_LOADEDFeedback\",\n\tscreenMaintenance: \"maintenanceFeedback\",\n\tscreenRequestDetail: \"requestDetailFeedback\",\n\tscreenServiceRequest: \"serviceRequestFeedback\",\n\tscreenJobTypePicker: \"jobTypePickerFeedback\",\n\tscreenRequestNotes: \"requestNotesFeedback\",\n\tscreenUserPicker: \"maintenanceUserPickerFeedback\",\n\tpermissionMaintenanceTracking: \"maintenanceTrackingFeedback\",\n\tpermissionMaintenanceAssignment: \"maintenanceAssignmentFeedback\",\n\ticonGridMenu: \"form\",\n\tgridViewBox: \"0 0 256 256\",\n\ticonAddMenu: \"form\",\n\ticonKioskAction: \"form\",\n\thasMoreOption: false,\n\torderAddMenu: 5,\n\torderMoreMenu: 4,\n\torderKioskAction: 1,\n\ttextFeatureTitle: \"Feedback\",\n\ttextAddMenuTitle: \"New Feedback\",\n\ttextMoreMenuTitle: \"Feedback\",\n\ttextKioskActionTitle: \"Feedback\",\n\ttextEntityName: \"Feedback\",\n\ttextJobType: \"Feedback Type\",\n\temptyRequestsStaff: \"No active Feedback\",\n\temptyRequestsUser: \"Your Feedback will show here\",\n\tforceCustomFields: true,\n\tstringConfigJobStatus: \"maintenanceJobStatusFeedback\",\n\tstringConfigHideSeen: \"maintenanceDisableSeenFeedback\",\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACdC,UAAU,EAAE,qBAAqB;EACjCC,OAAO,EAAE,CAAC,oBAAoB,CAAC;EAC/BC,UAAU,EAAE,cAAc;EAC1BC,UAAU,EAAE,qBAAqB;EACjCC,SAAS,EAAE,cAAc;EACzBC,UAAU,EAAE,4BAA4B;EACxCC,gBAAgB,EAAE,qBAAqB;EACvCC,cAAc,EAAE,mBAAmB;EACnCC,eAAe,EAAE,oBAAoB;EACrCC,wBAAwB,EAAE,8BAA8B;EACxDC,kBAAkB,EAAE,wBAAwB;EAC5CC,qBAAqB,EAAE,4BAA4B;EACnDC,iBAAiB,EAAE,qBAAqB;EACxCC,mBAAmB,EAAE,uBAAuB;EAC5CC,oBAAoB,EAAE,wBAAwB;EAC9CC,mBAAmB,EAAE,uBAAuB;EAC5CC,kBAAkB,EAAE,sBAAsB;EAC1CC,gBAAgB,EAAE,+BAA+B;EACjDC,6BAA6B,EAAE,6BAA6B;EAC5DC,+BAA+B,EAAE,+BAA+B;EAChEC,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,UAAU;EAC5BC,gBAAgB,EAAE,cAAc;EAChCC,iBAAiB,EAAE,UAAU;EAC7BC,oBAAoB,EAAE,UAAU;EAChCC,cAAc,EAAE,UAAU;EAC1BC,WAAW,EAAE,eAAe;EAC5BC,kBAAkB,EAAE,oBAAoB;EACxCC,iBAAiB,EAAE,8BAA8B;EACjDC,iBAAiB,EAAE,IAAI;EACvBC,qBAAqB,EAAE,8BAA8B;EACrDC,oBAAoB,EAAE;AACvB,CAAC;AAED,SAASvC,MAAM","ignoreList":[]}
|
|
@@ -37,8 +37,7 @@ const values = {
|
|
|
37
37
|
emptyRequestsUser: "Your Food Orders will show here",
|
|
38
38
|
forceCustomFields: true,
|
|
39
39
|
stringConfigJobStatus: "maintenanceJobStatusFood",
|
|
40
|
-
stringConfigHideSeen: "maintenanceDisableSeenFood"
|
|
41
|
-
optionOnlyForResidents: "onlyForResidentsMaintenanceFood"
|
|
40
|
+
stringConfigHideSeen: "maintenanceDisableSeenFood"
|
|
42
41
|
};
|
|
43
42
|
export { values };
|
|
44
43
|
//# sourceMappingURL=values.config.food.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","screenUserPicker","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields","stringConfigJobStatus","stringConfigHideSeen"
|
|
1
|
+
{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","screenUserPicker","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields","stringConfigJobStatus","stringConfigHideSeen"],"sources":["values.config.food.js"],"sourcesContent":["const values = {\n\tfeatureKey: \"maintenanceFood\",\n\taliases: [\"maintenanceRequest\"],\n\treducerKey: \"jobsFood\",\n\tserviceKey: \"maintenanceFood\",\n\tupdateKey: \"jobsFood\",\n\tcommentKey: \"maintenancerequestFood\",\n\tactionJobsLoaded: \"JOBS_LOADEDFood\",\n\tactionJobAdded: \"JOB_ADDEDFood\",\n\tactionJobsAdded: \"JOBS_ADDEDFood\",\n\tactionJobsStatusesLoaded: \"JOBS_STATUSES_LOADEDFood\",\n\tactionJobsHideSeen: \"JOBS_HIDE_SEENFood\",\n\tactionJobFilterLoaded: \"JOBS_FILTER_LOADEDFood\",\n\tscreenMaintenance: \"maintenanceFood\",\n\tscreenRequestDetail: \"requestDetailFood\",\n\tscreenServiceRequest: \"serviceRequestFood\",\n\tscreenJobTypePicker: \"jobTypePickerFood\",\n\tscreenRequestNotes: \"requestNotesFood\",\n\tscreenUserPicker: \"maintenanceUserPickerFood\",\n\tpermissionMaintenanceTracking: \"maintenanceTrackingFood\",\n\tpermissionMaintenanceAssignment: \"maintenanceAssignmentFood\",\n\ticonGridMenu: \"form\",\n\tgridViewBox: \"0 0 256 256\",\n\ticonAddMenu: \"form\",\n\ticonKioskAction: \"form\",\n\thasMoreOption: false,\n\torderAddMenu: 5,\n\torderMoreMenu: 4,\n\torderKioskAction: 1,\n\ttextFeatureTitle: \"Food Ordering\",\n\ttextAddMenuTitle: \"New Food Order\",\n\ttextMoreMenuTitle: \"Food Ordering\",\n\ttextKioskActionTitle: \"Food Ordering\",\n\ttextEntityName: \"Food Order\",\n\ttextJobType: \"Food Order Type\",\n\temptyRequestsStaff: \"No active Food Orders\",\n\temptyRequestsUser: \"Your Food Orders will show here\",\n\tforceCustomFields: true,\n\tstringConfigJobStatus: \"maintenanceJobStatusFood\",\n\tstringConfigHideSeen: \"maintenanceDisableSeenFood\",\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACdC,UAAU,EAAE,iBAAiB;EAC7BC,OAAO,EAAE,CAAC,oBAAoB,CAAC;EAC/BC,UAAU,EAAE,UAAU;EACtBC,UAAU,EAAE,iBAAiB;EAC7BC,SAAS,EAAE,UAAU;EACrBC,UAAU,EAAE,wBAAwB;EACpCC,gBAAgB,EAAE,iBAAiB;EACnCC,cAAc,EAAE,eAAe;EAC/BC,eAAe,EAAE,gBAAgB;EACjCC,wBAAwB,EAAE,0BAA0B;EACpDC,kBAAkB,EAAE,oBAAoB;EACxCC,qBAAqB,EAAE,wBAAwB;EAC/CC,iBAAiB,EAAE,iBAAiB;EACpCC,mBAAmB,EAAE,mBAAmB;EACxCC,oBAAoB,EAAE,oBAAoB;EAC1CC,mBAAmB,EAAE,mBAAmB;EACxCC,kBAAkB,EAAE,kBAAkB;EACtCC,gBAAgB,EAAE,2BAA2B;EAC7CC,6BAA6B,EAAE,yBAAyB;EACxDC,+BAA+B,EAAE,2BAA2B;EAC5DC,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,eAAe;EACjCC,gBAAgB,EAAE,gBAAgB;EAClCC,iBAAiB,EAAE,eAAe;EAClCC,oBAAoB,EAAE,eAAe;EACrCC,cAAc,EAAE,YAAY;EAC5BC,WAAW,EAAE,iBAAiB;EAC9BC,kBAAkB,EAAE,uBAAuB;EAC3CC,iBAAiB,EAAE,iCAAiC;EACpDC,iBAAiB,EAAE,IAAI;EACvBC,qBAAqB,EAAE,0BAA0B;EACjDC,oBAAoB,EAAE;AACvB,CAAC;AAED,SAASvC,MAAM","ignoreList":[]}
|
|
@@ -31,8 +31,7 @@ const values = {
|
|
|
31
31
|
textKioskActionTitle: "Request A",
|
|
32
32
|
textEntityName: "Job",
|
|
33
33
|
stringConfigJobStatus: "maintenanceJobStatusA",
|
|
34
|
-
stringConfigHideSeen: "maintenanceDisableSeenA"
|
|
35
|
-
optionOnlyForResidents: "onlyForResidentsMaintenanceA"
|
|
34
|
+
stringConfigHideSeen: "maintenanceDisableSeenA"
|
|
36
35
|
};
|
|
37
36
|
export { values };
|
|
38
37
|
//# sourceMappingURL=values.config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","screenUserPicker","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","iconAddMenu","iconKioskAction","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","stringConfigJobStatus","stringConfigHideSeen"
|
|
1
|
+
{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","screenUserPicker","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","iconAddMenu","iconKioskAction","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","stringConfigJobStatus","stringConfigHideSeen"],"sources":["values.config.js"],"sourcesContent":["const values = {\n\tfeatureKey: \"maintenanceA\",\n\taliases: [\"maintenanceRequestA\"],\n\treducerKey: \"jobsA\",\n\tserviceKey: \"maintenanceA\",\n\tupdateKey: \"jobsA\",\n\tcommentKey: \"maintenanceA\",\n\tactionJobsLoaded: \"JOBS_LOADEDA\",\n\tactionJobAdded: \"JOB_ADDEDA\",\n\tactionJobsAdded: \"JOBS_ADDEDA\",\n\tactionJobsStatusesLoaded: \"JOBS_STATUSES_LOADEDA\",\n\tactionJobsHideSeen: \"JOBS_HIDE_SEENA\",\n\tactionJobFilterLoaded: \"JOBS_FILTER_LOADEDA\",\n\tscreenMaintenance: \"maintenanceA\",\n\tscreenRequestDetail: \"requestDetailA\",\n\tscreenServiceRequest: \"serviceRequestA\",\n\tscreenJobTypePicker: \"jobTypePickerA\",\n\tscreenRequestNotes: \"requestNotesA\",\n\tscreenUserPicker: \"maintenanceUserPickerA\",\n\tpermissionMaintenanceTracking: \"maintenanceTrackingA\",\n\tpermissionMaintenanceAssignment: \"maintenanceAssignmentA\",\n\ticonGridMenu: \"maintenance\",\n\ticonAddMenu: \"request\",\n\ticonKioskAction: \"wrench\",\n\torderAddMenu: 5,\n\torderMoreMenu: 4,\n\torderKioskAction: 1,\n\ttextFeatureTitle: \"Request A\",\n\ttextAddMenuTitle: \"Request A\",\n\ttextMoreMenuTitle: \"Request A\",\n\ttextKioskActionTitle: \"Request A\",\n\ttextEntityName: \"Job\",\n\tstringConfigJobStatus: \"maintenanceJobStatusA\",\n\tstringConfigHideSeen: \"maintenanceDisableSeenA\",\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACdC,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,gBAAgB,EAAE,wBAAwB;EAC1CC,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;AACvB,CAAC;AAED,SAASjC,MAAM","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@plusscommunities/pluss-maintenance-app-a",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.1-auth.0",
|
|
4
4
|
"description": "Extension package to enable maintenance on Pluss Communities Platform",
|
|
5
5
|
"main": "dist/module/index.js",
|
|
6
6
|
"module": "dist/module/index.js",
|
|
@@ -15,6 +15,9 @@
|
|
|
15
15
|
"patch": "npm version patch",
|
|
16
16
|
"betaupload": "npm run build && npm publish --access public --tag beta",
|
|
17
17
|
"betaupload:p": "npm run betapatch && npm run betaupload",
|
|
18
|
+
"authpatch": "npm version prepatch --preid=auth",
|
|
19
|
+
"authupload": "npm run build && npm publish --access public --tag auth",
|
|
20
|
+
"authupload:p": "npm run authpatch && npm run authupload",
|
|
18
21
|
"upload": "npm run build && npm publish --access public",
|
|
19
22
|
"upload:p": "npm run patch && npm run upload",
|
|
20
23
|
"copy:add": "run(){ ext=${1:-default}; test -f src/values.config.$ext.js || cp src/values.config.default.js src/values.config.$ext.js; }; run",
|
|
@@ -22,24 +25,25 @@
|
|
|
22
25
|
"copy:set": "run(){ target='\\@plusscommunities\\/pluss-maintenance-app'; ext=${1:-default}; [ $ext == 'default' ] && replace=$target || replace=$target'-'$ext; echo 'Setting target to '$replace; test -f src/values.config.$ext.js && cp -f src/values.config.$ext.js src/values.config.js; sed -i '' -e 's/'$target'.*\"/'$replace'\"/g' package.json; }; run",
|
|
23
26
|
"copy:uploadnopatch": "for file in `ls ./src/values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run upload; done; npm run copy:set;",
|
|
24
27
|
"copy:upload": "npm run patch; npm run copy:uploadnopatch;",
|
|
25
|
-
"copy:betaupload": "npm run betapatch; for file in `ls ./src/values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run betaupload; done; npm run copy:set;"
|
|
28
|
+
"copy:betaupload": "npm run betapatch; for file in `ls ./src/values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run betaupload; done; npm run copy:set;",
|
|
29
|
+
"copy:authupload": "npm run authpatch; for file in `ls ./src/values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run authupload; done; npm run copy:set;"
|
|
26
30
|
},
|
|
27
31
|
"author": "Thorbjorn Kappel Davis",
|
|
28
32
|
"license": "ISC",
|
|
29
33
|
"dependencies": {},
|
|
30
34
|
"peerDependencies": {
|
|
31
|
-
"@plusscommunities/pluss-core-app": "
|
|
32
|
-
"axios": "
|
|
33
|
-
"lodash": "
|
|
34
|
-
"moment": "
|
|
35
|
-
"react": "
|
|
36
|
-
"react-native": "
|
|
37
|
-
"@rneui/base": "
|
|
38
|
-
"@rneui/themed": "
|
|
39
|
-
"react-native-iphone-x-helper": "
|
|
40
|
-
"react-native-webview": "
|
|
41
|
-
"react-redux": "
|
|
42
|
-
"redux-persist": "
|
|
35
|
+
"@plusscommunities/pluss-core-app": "*",
|
|
36
|
+
"axios": "*",
|
|
37
|
+
"lodash": "*",
|
|
38
|
+
"moment": "*",
|
|
39
|
+
"react": "*",
|
|
40
|
+
"react-native": "*",
|
|
41
|
+
"@rneui/base": "*",
|
|
42
|
+
"@rneui/themed": "*",
|
|
43
|
+
"react-native-iphone-x-helper": "*",
|
|
44
|
+
"react-native-webview": "*",
|
|
45
|
+
"react-redux": "*",
|
|
46
|
+
"redux-persist": "*"
|
|
43
47
|
},
|
|
44
48
|
"devDependencies": {
|
|
45
49
|
"react-native-builder-bob": "^0.18.2"
|
|
@@ -23,7 +23,7 @@ export const maintenanceActions = {
|
|
|
23
23
|
data: { site, status, type },
|
|
24
24
|
});
|
|
25
25
|
},
|
|
26
|
-
getJobs2: (site, status, priority, type, lastKey) => {
|
|
26
|
+
getJobs2: (site, status, priority, type, lastKey, assignee) => {
|
|
27
27
|
const query = { site };
|
|
28
28
|
if (status) {
|
|
29
29
|
query.status = status;
|
|
@@ -37,13 +37,21 @@ export const maintenanceActions = {
|
|
|
37
37
|
if (lastKey) {
|
|
38
38
|
query.lastKey = JSON.stringify(lastKey);
|
|
39
39
|
}
|
|
40
|
+
if (assignee) {
|
|
41
|
+
query.assignee = assignee;
|
|
42
|
+
}
|
|
40
43
|
return Session.authedFunction({
|
|
41
44
|
method: "GET",
|
|
42
45
|
url: Helper.getUrl(values.serviceKey, "get/requests", query),
|
|
43
46
|
});
|
|
44
47
|
},
|
|
48
|
+
/**
|
|
49
|
+
* @deprecated Use getJobs2 with pagination instead.
|
|
50
|
+
* This method recursively fetches ALL pages which can be slow for large datasets.
|
|
51
|
+
* For better performance, use getJobs2 directly and implement pagination in the UI.
|
|
52
|
+
*/
|
|
45
53
|
getJobsRecursive: (site, status, priority, type, lastKey, jobs = []) => {
|
|
46
|
-
return new Promise((resolve) => {
|
|
54
|
+
return new Promise((resolve, reject) => {
|
|
47
55
|
maintenanceActions
|
|
48
56
|
.getJobs2(site, status, priority, type, lastKey)
|
|
49
57
|
.then((jobRes) => {
|
|
@@ -51,17 +59,19 @@ export const maintenanceActions = {
|
|
|
51
59
|
if (!jobRes.data.LastKey) {
|
|
52
60
|
return resolve(newJobs);
|
|
53
61
|
}
|
|
54
|
-
|
|
55
|
-
|
|
62
|
+
maintenanceActions
|
|
63
|
+
.getJobsRecursive(
|
|
56
64
|
site,
|
|
57
65
|
status,
|
|
58
66
|
priority,
|
|
59
67
|
type,
|
|
60
68
|
jobRes.data.LastKey,
|
|
61
69
|
newJobs,
|
|
62
|
-
)
|
|
63
|
-
|
|
64
|
-
|
|
70
|
+
)
|
|
71
|
+
.then(resolve)
|
|
72
|
+
.catch(reject);
|
|
73
|
+
})
|
|
74
|
+
.catch(reject);
|
|
65
75
|
});
|
|
66
76
|
},
|
|
67
77
|
sendMaintenanceRequest: (
|
|
@@ -1,19 +1,21 @@
|
|
|
1
1
|
import React, { Component } from "react";
|
|
2
|
+
import { Text } from "@plusscommunities/pluss-core-app/components";
|
|
2
3
|
import {
|
|
3
4
|
View,
|
|
4
|
-
Text,
|
|
5
5
|
TouchableOpacity,
|
|
6
6
|
Modal,
|
|
7
7
|
ScrollView,
|
|
8
8
|
Dimensions,
|
|
9
|
+
Platform,
|
|
9
10
|
} from "react-native";
|
|
11
|
+
import { SafeAreaProvider, SafeAreaView } from "react-native-safe-area-context";
|
|
10
12
|
import { connect } from "react-redux";
|
|
13
|
+
import { withSafeAreaInsets } from "react-native-safe-area-context";
|
|
11
14
|
import _ from "lodash";
|
|
12
15
|
import { maintenanceActions } from "../apis";
|
|
13
16
|
import { Colours, Helper } from "../core.config";
|
|
14
17
|
import {
|
|
15
18
|
getJobStatusOptions,
|
|
16
|
-
getIncompleteJobStatuses,
|
|
17
19
|
jobPriorityOptions,
|
|
18
20
|
getDefaultJobPriority,
|
|
19
21
|
} from "../helper";
|
|
@@ -32,6 +34,7 @@ class FilterPopupMenu extends Component {
|
|
|
32
34
|
selectedType: props.type || "",
|
|
33
35
|
selectedAssignee: props.assignee || "",
|
|
34
36
|
assignees: [],
|
|
37
|
+
loadingAssignees: true,
|
|
35
38
|
};
|
|
36
39
|
}
|
|
37
40
|
|
|
@@ -55,9 +58,7 @@ class FilterPopupMenu extends Component {
|
|
|
55
58
|
},
|
|
56
59
|
{
|
|
57
60
|
label: "Incomplete",
|
|
58
|
-
value:
|
|
59
|
-
.map((s) => s.text)
|
|
60
|
-
.join("|")}`,
|
|
61
|
+
value: "Incomplete",
|
|
61
62
|
},
|
|
62
63
|
...statusOptions.map((s) => ({
|
|
63
64
|
label: s.text,
|
|
@@ -89,6 +90,7 @@ class FilterPopupMenu extends Component {
|
|
|
89
90
|
getAssignees = async () => {
|
|
90
91
|
try {
|
|
91
92
|
const res = await maintenanceActions.getAssignees(this.props.site);
|
|
93
|
+
const newState = { loadingAssignees: false };
|
|
92
94
|
let assignees = res.data.Users.map((t) => {
|
|
93
95
|
return { label: t.displayName, value: t.id };
|
|
94
96
|
});
|
|
@@ -96,15 +98,15 @@ class FilterPopupMenu extends Component {
|
|
|
96
98
|
|
|
97
99
|
assignees.splice(0, 0, { label: "All", value: "" });
|
|
98
100
|
|
|
99
|
-
const newState = { assignees };
|
|
100
|
-
|
|
101
101
|
if (!assignees.some((a) => a.value === this.state.selectedAssignee)) {
|
|
102
102
|
newState.selectedAssignee = "";
|
|
103
103
|
}
|
|
104
|
+
newState.assignees = assignees;
|
|
104
105
|
// console.log('refreshassignees', assignees);
|
|
105
106
|
this.setState(newState);
|
|
106
107
|
} catch (error) {
|
|
107
108
|
console.error("getAssignees", error);
|
|
109
|
+
this.setState({ loadingAssignees: false });
|
|
108
110
|
}
|
|
109
111
|
};
|
|
110
112
|
|
|
@@ -159,9 +161,16 @@ class FilterPopupMenu extends Component {
|
|
|
159
161
|
|
|
160
162
|
renderCancel() {
|
|
161
163
|
const { colourBrandingMain, cancelText } = this.props;
|
|
164
|
+
const bottom =
|
|
165
|
+
Platform.OS === "android" ? (this.props.insets?.bottom ?? 0) : 0;
|
|
162
166
|
return (
|
|
163
167
|
<TouchableOpacity onPress={this.onDone}>
|
|
164
|
-
<View
|
|
168
|
+
<View
|
|
169
|
+
style={[
|
|
170
|
+
styles.cancelContainer,
|
|
171
|
+
bottom > 0 && { paddingBottom: 16 + bottom },
|
|
172
|
+
]}
|
|
173
|
+
>
|
|
165
174
|
<Text style={[styles.cancelText, { color: colourBrandingMain }]}>
|
|
166
175
|
{cancelText || "Done"}
|
|
167
176
|
</Text>
|
|
@@ -205,10 +214,17 @@ class FilterPopupMenu extends Component {
|
|
|
205
214
|
render() {
|
|
206
215
|
// console.log('FilterPopupMenu', JSON.stringify({ category: this.props.user.category, permissions: this.props.user.permissions }, null, 2))
|
|
207
216
|
const isStaff = this.props.user.category === "staff";
|
|
208
|
-
const canFilterAssignee =
|
|
209
|
-
this.props.user.
|
|
210
|
-
|
|
211
|
-
|
|
217
|
+
const canFilterAssignee =
|
|
218
|
+
this.props.user.category === "master" ||
|
|
219
|
+
this.props.user.category === "staff" ||
|
|
220
|
+
_.includes(
|
|
221
|
+
this.props.user.permissions,
|
|
222
|
+
values.permissionMaintenanceTracking,
|
|
223
|
+
) ||
|
|
224
|
+
_.includes(
|
|
225
|
+
this.props.user.permissions,
|
|
226
|
+
values.permissionMaintenanceAssignment,
|
|
227
|
+
);
|
|
212
228
|
|
|
213
229
|
return (
|
|
214
230
|
<Modal
|
|
@@ -217,34 +233,42 @@ class FilterPopupMenu extends Component {
|
|
|
217
233
|
animationType="slide"
|
|
218
234
|
onRequestClose={this.onDone}
|
|
219
235
|
>
|
|
220
|
-
<
|
|
221
|
-
<View style={styles.
|
|
222
|
-
{
|
|
223
|
-
|
|
224
|
-
{
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
this.
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
236
|
+
<SafeAreaProvider>
|
|
237
|
+
<View style={styles.container}>
|
|
238
|
+
<SafeAreaView style={styles.menu} edges={["bottom"]}>
|
|
239
|
+
{this.renderTitle()}
|
|
240
|
+
<ScrollView style={styles.optionContent}>
|
|
241
|
+
{this.renderOptions(
|
|
242
|
+
"Status",
|
|
243
|
+
this.getStatusOptions(),
|
|
244
|
+
"selectedStatus",
|
|
245
|
+
)}
|
|
246
|
+
{isStaff
|
|
247
|
+
? this.renderOptions(
|
|
248
|
+
"Priority",
|
|
249
|
+
this.getPriorityOptions(),
|
|
250
|
+
"selectedPriority",
|
|
251
|
+
)
|
|
252
|
+
: null}
|
|
253
|
+
{this.renderOptions("Type", this.state.types, "selectedType")}
|
|
254
|
+
{canFilterAssignee
|
|
255
|
+
? this.state.loadingAssignees
|
|
256
|
+
? this.renderOptions(
|
|
257
|
+
"Assigned To",
|
|
258
|
+
[{ label: "Loading...", value: "" }],
|
|
259
|
+
"selectedAssignee",
|
|
260
|
+
)
|
|
261
|
+
: this.renderOptions(
|
|
262
|
+
"Assigned To",
|
|
263
|
+
this.state.assignees,
|
|
264
|
+
"selectedAssignee",
|
|
265
|
+
)
|
|
266
|
+
: null}
|
|
267
|
+
</ScrollView>
|
|
268
|
+
{this.renderCancel()}
|
|
269
|
+
</SafeAreaView>
|
|
246
270
|
</View>
|
|
247
|
-
</
|
|
271
|
+
</SafeAreaProvider>
|
|
248
272
|
</Modal>
|
|
249
273
|
);
|
|
250
274
|
}
|
|
@@ -339,4 +363,7 @@ const mapStateToProps = (state) => {
|
|
|
339
363
|
};
|
|
340
364
|
};
|
|
341
365
|
|
|
342
|
-
export default connect(
|
|
366
|
+
export default connect(
|
|
367
|
+
mapStateToProps,
|
|
368
|
+
{},
|
|
369
|
+
)(withSafeAreaInsets(FilterPopupMenu));
|