use deploy mode env variable

ITPNYU · Mar 16, 2024 · 252fe34 · 252fe34
1 parent c0e30e5
commit 252fe34
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 14 deletions.
diff --git a/.github/workflows/deploy_development.yml b/.github/workflows/deploy_development.yml
@@ -3,7 +3,7 @@ name: Deploy DEVELOPMENT to Google Apps Script
 on:
   push:
     branches:
-      - prod_dev
+      - main
 
 jobs:
   deploy:
@@ -18,6 +18,9 @@ jobs:
         with:
           node-version: "18"
 
+      - name: Set deploy mode environment variable
+        run: echo "REACT_APP_ENVIRONMENT=development" >> $GITHUB_ENV
+
       - name: Install dependencies
         run: |
           cd media_commons_booking_app

diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
@@ -3,7 +3,7 @@ name: Deploy to PRODUCTION to Google Apps Script
 on:
   push:
     branches:
-      - main
+      - prod
 
 jobs:
   deploy:
@@ -18,6 +18,9 @@ jobs:
         with:
           node-version: "18"
 
+      - name: Set deploy mode environment variable
+        run: echo "REACT_APP_ENVIRONMENT=production" >> $GITHUB_ENV
+
       - name: Install dependencies
         run: |
           cd media_commons_booking_app

diff --git a/media_commons_booking_app/package-lock.json b/media_commons_booking_app/package-lock.json
diff --git a/media_commons_booking_app/package.json b/media_commons_booking_app/package.json
@@ -70,6 +70,7 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@types/expect-puppeteer": "^5.0.0",
     "@types/jest-environment-puppeteer": "^5.0.2",
+    "@types/node": "^20.11.28",
     "@types/puppeteer": "^5.4.6",
     "@types/react": "^18.0.14",
     "autoprefixer": "10.4.5",

diff --git a/media_commons_booking_app/src/client/booking/components/SheetEditor.tsx b/media_commons_booking_app/src/client/booking/components/SheetEditor.tsx
@@ -50,16 +50,18 @@ const SAFTY_TRAINING_SHEET_NAME = 'safety_training_users';
 const INSTANT_APPROVAL_ROOMS = ['220', '221', '222', '223', '224', '233'];
 
 const SheetEditor = () => {
-  //PRODUCTION
   const roomCalendarId = (room) => {
-    return findByRoomId(mappingRoomSettings, room.roomId)?.calendarIdProd;
+    const roomById = findByRoomId(mappingRoomSettings, room.roomId);
+    if (roomById) {
+      console.log('ENVIRONMENT:', process.env.REACT_APP_ENVIRONMENT);
+      if (process.env.REACT_APP_ENVIRONMENT === 'production') {
+        return roomById.calendarIdProd;
+      } else {
+        return roomById.calendarId;
+      }
+    }
   };
 
-  //DEV
-  //const roomCalendarId = (room) => {
-  //  return findByRoomId(mappingRoomSettings, room.roomId)?.calendarId;
-  //};
-
   const getActiveUserEmail = () => {
     serverFunctions.getActiveUserEmail().then((response) => {
       console.log('userEmail response', response);

diff --git a/media_commons_booking_app/tsconfig.json b/media_commons_booking_app/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "types": ["gas-types-detailed"],
+    "types": ["gas-types-detailed", "node"],
     "jsx": "react",
     "esModuleInterop": true,
     "lib": ["esnext", "dom"]