From b76f18bbba2251b91fc4d4ed2dd4032dbc8e956d Mon Sep 17 00:00:00 2001
From: Sherfin Shamsudeen <sherfin94@gmail.com>
Date: Tue, 24 Aug 2021 15:57:48 +0530
Subject: [PATCH] Fix issue where the client crashes when goto app action is
 selected

This commit supplies the missing prop 'apps' to Table component
and EventSelector component so that they can properly display the
apps.

This commit also modifies the get-all-apps query logic such that
if the queried page is 0, it fetches all the apps.

It adds a filtering logic such that presently only the apps with
slugs are listed as targets for goto app action.
---
 frontend/src/Editor/Inspector/Components/Table.jsx | 1 +
 frontend/src/Editor/Inspector/EventSelector.jsx    | 2 +-
 frontend/src/Editor/Inspector/Inspector.jsx        | 1 +
 frontend/src/_services/app.service.js              | 5 ++++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/Editor/Inspector/Components/Table.jsx b/frontend/src/Editor/Inspector/Components/Table.jsx
index e45b99bbb5..7680bf0d91 100644
--- a/frontend/src/Editor/Inspector/Components/Table.jsx
+++ b/frontend/src/Editor/Inspector/Components/Table.jsx
@@ -230,6 +230,7 @@ class Table extends React.Component {
             eventOptionUpdated={this.actionButtonEventOptionUpdated}
             currentState={this.state.currentState}
             extraData={{ actionButton: action, index: index }} // This data is returned in the callbacks
+            apps={this.props.apps}
           />
           <button className="btn btn-sm btn-outline-danger col" onClick={() => this.removeAction(index)}>
             Remove
diff --git a/frontend/src/Editor/Inspector/EventSelector.jsx b/frontend/src/Editor/Inspector/EventSelector.jsx
index 54be16fc2f..394aeb38dd 100644
--- a/frontend/src/Editor/Inspector/EventSelector.jsx
+++ b/frontend/src/Editor/Inspector/EventSelector.jsx
@@ -51,7 +51,7 @@ export const EventSelector = ({
 
   function getAllApps() {
     let appsOptionsList = [];
-    apps.map((item) => {
+    apps.filter(item => item.slug != undefined).map((item) => {
       appsOptionsList.push({
         name: item.name,
         value: item.slug
diff --git a/frontend/src/Editor/Inspector/Inspector.jsx b/frontend/src/Editor/Inspector/Inspector.jsx
index 089178b1b8..714f638190 100644
--- a/frontend/src/Editor/Inspector/Inspector.jsx
+++ b/frontend/src/Editor/Inspector/Inspector.jsx
@@ -191,6 +191,7 @@ export const Inspector = ({
           components={components}
           currentState={currentState}
           darkMode={darkMode}
+          apps={apps}
         />
       }
 
diff --git a/frontend/src/_services/app.service.js b/frontend/src/_services/app.service.js
index a0a491359d..03b408f7e9 100644
--- a/frontend/src/_services/app.service.js
+++ b/frontend/src/_services/app.service.js
@@ -16,7 +16,10 @@ export const appService = {
 
 function getAll(page, folder) {
   const requestOptions = { method: 'GET', headers: authHeader() };
-  return fetch(`${config.apiUrl}/apps?page=${page}&folder=${folder || ''}`, requestOptions).then(handleResponse);
+  if (page === 0)
+    return fetch(`${config.apiUrl}/apps`, requestOptions).then(handleResponse);
+  else
+    return fetch(`${config.apiUrl}/apps?page=${page}&folder=${folder || ''}`, requestOptions).then(handleResponse);
 }
 
 function createApp() {