From 3f8797d6738c9eb78ed3efad362dee0b7c8abac3 Mon Sep 17 00:00:00 2001
From: Jon <jon@daily.co>
Date: Tue, 6 Jul 2021 12:04:28 +0100
Subject: [PATCH] added default props util

---
 dailyjs/basic-call/pages/index.js | 22 +++++++---------------
 dailyjs/shared/lib/demoProps.js   |  9 +++++++++
 dailyjs/text-chat/pages/index.js  | 10 +++-------
 3 files changed, 19 insertions(+), 22 deletions(-)
 create mode 100644 dailyjs/shared/lib/demoProps.js

diff --git a/dailyjs/basic-call/pages/index.js b/dailyjs/basic-call/pages/index.js
index 5db117c..7122881 100644
--- a/dailyjs/basic-call/pages/index.js
+++ b/dailyjs/basic-call/pages/index.js
@@ -5,6 +5,8 @@ import { ParticipantsProvider } from '@dailyjs/shared/contexts/ParticipantsProvi
 import { TracksProvider } from '@dailyjs/shared/contexts/TracksProvider';
 import { UIStateProvider } from '@dailyjs/shared/contexts/UIStateProvider';
 import { WaitingRoomProvider } from '@dailyjs/shared/contexts/WaitingRoomProvider';
+import getDemoProps from '@dailyjs/shared/lib/demoProps';
+
 import PropTypes from 'prop-types';
 import App from '../components/App';
 import { Intro, NotConfigured } from '../components/Intro';
@@ -20,12 +22,12 @@ import { Intro, NotConfigured } from '../components/Intro';
 export default function Index({
   domain,
   isConfigured = false,
-  predefinedRoom = false,
+  predefinedRoom = '',
   asides,
   customTrayComponent,
   customAppComponent,
 }) {
-  const [roomName, setRoomName] = useState(predefinedRoom || '');
+  const [roomName, setRoomName] = useState(predefinedRoom);
   const [fetchingToken, setFetchingToken] = useState(false);
   const [token, setToken] = useState();
   const [tokenError, setTokenError] = useState();
@@ -117,7 +119,7 @@ export default function Index({
 
 Index.propTypes = {
   isConfigured: PropTypes.bool.isRequired,
-  predefinedRoom: PropTypes.bool,
+  predefinedRoom: PropTypes.string,
   domain: PropTypes.string,
   asides: PropTypes.arrayOf(PropTypes.func),
   customTrayComponent: PropTypes.node,
@@ -125,19 +127,9 @@ Index.propTypes = {
 };
 
 export async function getStaticProps() {
-  // Check that both domain and key env vars are set
-  const isConfigured =
-    !!process.env.DAILY_DOMAIN && !!process.env.DAILY_API_KEY;
+  const defaultProps = getDemoProps();
 
-  // Have we predefined a room to use?
-  const predefinedRoom = process.env.DAILY_ROOM || false;
-
-  // Pass through domain as prop
   return {
-    props: {
-      domain: process.env.DAILY_DOMAIN || null,
-      isConfigured,
-      predefinedRoom,
-    },
+    props: defaultProps,
   };
 }
diff --git a/dailyjs/shared/lib/demoProps.js b/dailyjs/shared/lib/demoProps.js
new file mode 100644
index 0000000..240b904
--- /dev/null
+++ b/dailyjs/shared/lib/demoProps.js
@@ -0,0 +1,9 @@
+export default function getDemoProps() {
+  return {
+    domain: process.env.DAILY_DOMAIN || null,
+    // Check that both domain and key env vars are set
+    isConfigured: !!process.env.DAILY_DOMAIN && !!process.env.DAILY_API_KEY,
+    // Have we predefined a room to use?
+    predefinedRoom: process.env.DAILY_ROOM || '',
+  };
+}
diff --git a/dailyjs/text-chat/pages/index.js b/dailyjs/text-chat/pages/index.js
index 5f31f95..d25e77e 100644
--- a/dailyjs/text-chat/pages/index.js
+++ b/dailyjs/text-chat/pages/index.js
@@ -1,16 +1,12 @@
 import Index from '@dailyjs/basic-call/pages';
+import getDemoProps from '@dailyjs/shared/lib/demoProps';
 
 export async function getStaticProps() {
-  // Check that both domain and key env vars are set
-  const isConfigured =
-    !!process.env.DAILY_DOMAIN && !!process.env.DAILY_API_KEY;
+  const defaultProps = getDemoProps();
 
   // Pass through domain as prop
   return {
-    props: {
-      domain: process.env.DAILY_DOMAIN || null,
-      isConfigured,
-    },
+    props: defaultProps,
   };
 }