fix GladysAssistant#657 - no page on get device

atrovato · Mar 15, 2020 · 0a68e7f · 0a68e7f
1 parent d7070bd
commit 0a68e7f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 32 deletions.
diff --git a/front/src/routes/integration/all/mqtt/device-page/actions.js b/front/src/routes/integration/all/mqtt/device-page/actions.js
@@ -9,29 +9,19 @@ function createActions(store) {
   const houseActions = createActionsHouse(store);
   const integrationActions = createActionsIntegration(store);
   const actions = {
-    async getMqttDevices(state, take, skip) {
+    async getMqttDevices(state) {
       store.setState({
         getMqttDevicesStatus: RequestStatus.Getting
       });
       try {
         const options = {
           service: 'mqtt',
-          order_dir: state.getMqttDeviceOrderDir || 'asc',
-          take,
-          skip
+          order_dir: state.getMqttDeviceOrderDir || 'asc'
         };
         if (state.mqttDeviceSearch && state.mqttDeviceSearch.length) {
           options.search = state.mqttDeviceSearch;
         }
-        const mqttDevicesReceived = await state.httpClient.get('/api/v1/service/mqtt/device', options);
-        let mqttDevices;
-        if (skip === 0) {
-          mqttDevices = mqttDevicesReceived;
-        } else {
-          mqttDevices = update(state.mqttDevices, {
-            $push: mqttDevicesReceived
-          });
-        }
+        const mqttDevices = await state.httpClient.get('/api/v1/service/mqtt/device', options);
         store.setState({
           mqttDevices,
           getMqttDevicesStatus: RequestStatus.Success
@@ -77,13 +67,13 @@ function createActions(store) {
       store.setState({
         mqttDeviceSearch: e.target.value
       });
-      await actions.getMqttDevices(store.getState(), 20, 0);
+      await actions.getMqttDevices(store.getState());
     },
     async changeOrderDir(state, e) {
       store.setState({
         getMqttDeviceOrderDir: e.target.value
       });
-      await actions.getMqttDevices(store.getState(), 20, 0);
+      await actions.getMqttDevices(store.getState());
     },
     addDeviceFeature(state, index, category, type) {
       const uniqueId = uuid.v4();

diff --git a/front/src/routes/integration/all/mqtt/device-page/index.js b/front/src/routes/integration/all/mqtt/device-page/index.js
@@ -7,7 +7,7 @@ import DeviceTab from './DeviceTab';
 @connect('session,user,mqttDevices,houses,getMqttDevicesStatus', actions)
 class MqttDevicePage extends Component {
   componentWillMount() {
-    this.props.getMqttDevices(20, 0);
+    this.props.getMqttDevices();
     this.props.getHouses();
     this.props.getIntegrationByName('mqtt');
   }

diff --git a/front/src/routes/integration/all/zwave/node-page/actions.js b/front/src/routes/integration/all/zwave/node-page/actions.js
@@ -6,29 +6,19 @@ import debounce from 'debounce';
 function createActions(store) {
   const houseActions = createActionsHouse(store);
   const actions = {
-    async getZWaveDevices(state, take, skip) {
+    async getZWaveDevices(state) {
       store.setState({
         getZwaveDevicesStatus: RequestStatus.Getting
       });
       try {
         const options = {
           service: 'zwave',
-          order_dir: state.getZwaveDeviceOrderDir || 'asc',
-          take,
-          skip
+          order_dir: state.getZwaveDeviceOrderDir || 'asc'
         };
         if (state.zwaveDeviceSearch && state.zwaveDeviceSearch.length) {
           options.search = state.zwaveDeviceSearch;
         }
-        const zwaveDevicesReceived = await state.httpClient.get('/api/v1/service/zwave/device', options);
-        let zwaveDevices;
-        if (skip === 0) {
-          zwaveDevices = zwaveDevicesReceived;
-        } else {
-          zwaveDevices = update(state.zwaveDevices, {
-            $push: zwaveDevicesReceived
-          });
-        }
+        const zwaveDevices = await state.httpClient.get('/api/v1/service/zwave/device', options);
         store.setState({
           zwaveDevices,
           getZwaveDevicesStatus: RequestStatus.Success
@@ -67,13 +57,13 @@ function createActions(store) {
       store.setState({
         zwaveDeviceSearch: e.target.value
       });
-      await actions.getZWaveDevices(store.getState(), 20, 0);
+      await actions.getZWaveDevices(store.getState());
     },
     async changeOrderDir(state, e) {
       store.setState({
         getZwaveDeviceOrderDir: e.target.value
       });
-      await actions.getZWaveDevices(store.getState(), 20, 0);
+      await actions.getZWaveDevices(store.getState());
     }
   };
   actions.debouncedSearch = debounce(actions.search, 200);

diff --git a/front/src/routes/integration/all/zwave/node-page/index.js b/front/src/routes/integration/all/zwave/node-page/index.js
@@ -8,7 +8,7 @@ import integrationConfig from '../../../../../config/integrations';
 @connect('session,user,zwaveDevices,houses,getZwaveDevicesStatus', actions)
 class ZwaveNodePage extends Component {
   componentWillMount() {
-    this.props.getZWaveDevices(20, 0);
+    this.props.getZWaveDevices();
     this.props.getHouses();
   }