@plusscommunities/pluss-maintenance-app 3.0.1 → 3.0.3-beta.0

package/src/apis/generalActions.js

@@ -25,6 +25,33 @@ export const generalActions = {
       data: { site, status, type },
     });
   },
+  getJobs2: (site, status, type, lastKey) => {
+    const query = { site };
+    if (status) {
+      query.status = status;
+    }
+    if (type) {
+      query.type = type;
+    }
+    if (lastKey) {
+      query.lastKey = JSON.stringify(lastKey);
+    }
+    return Session.authedFunction({
+      method: 'GET',
+      url: Helper.getUrl('maintenance', 'get/requests', query),
+    });
+  },
+  getJobsRecursive: (site, status, type, lastKey, jobs = []) => {
+    return new Promise(resolve => {
+      generalActions.getJobs2(site, status, type, lastKey).then(jobRes => {
+        const newJobs = [...jobs, ...jobRes.data.Items];
+        if (!jobRes.data.LastKey) {
+          return resolve(newJobs);
+        }
+        return resolve(generalActions.getJobsRecursive(site, status, type, jobRes.data.LastKey, newJobs));
+      });
+    });
+  },
   sendMaintenanceRequest: (userID, userName, phone, room, title, description, date, type, images, location, isHome, homeText) => {
     const request = {
       method: 'POST',

package/src/components/MaintenanceList.js

@@ -40,12 +40,12 @@ class MaintenanceList extends Component {
       try {
         const { selectedStatus, selectedType } = this.state;
         // console.log('filters', { selectedStatus, selectedType });
-        const res = await generalActions.getJobs(this.props.site, selectedStatus, selectedType);
+        const res = await generalActions.getJobsRecursive(this.props.site, selectedStatus, selectedType);
         // console.log('refresh', res?.data);
         if (selectedStatus || selectedType) {
-          this.props.jobsAdded(res.data);
+          this.props.jobsAdded(res);
         } else {
-          this.props.jobsLoaded(res.data);
+          this.props.jobsLoaded(res);
         }
       } catch (error) {
         console.log('refresh error', error);

package/src/components/WidgetSmall.js

@@ -39,9 +39,9 @@ class WidgetSmall extends Component {
   refresh = () => {
     this.onLoadingChanged(true, async () => {
       try {
-        const res = await generalActions.getJobs(this.props.site);
+        const res = await generalActions.getJobsRecursive(this.props.site);
         // console.log('WidgetSmall - refresh', res.data);
-        this.props.jobsLoaded(res.data);
+        this.props.jobsLoaded(res);
       } catch (error) {
         console.log('refresh error', error);
       } finally {