add CALENDAR_ENV variable

ITPNYU · Mar 18, 2024 · a0325a2 · a0325a2 · lucia-gomez · Mar 18, 2024
1 parent 66fad71
commit a0325a2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/media_commons_booking_app/package.json b/media_commons_booking_app/package.json
@@ -13,13 +13,13 @@
     "setup": "rimraf .clasp.json && mkdirp dist && clasp create --type sheets --title \"My React Project\" --rootDir ./dist && mv ./dist/.clasp.json ./.clasp.json && rimraf dist",
     "open": "clasp open --addon",
     "setup:https": "mkdirp certs && mkcert -key-file ./certs/key.pem -cert-file ./certs/cert.pem localhost 127.0.0.1",
-    "build:dev": "cross-env NODE_ENV=development webpack",
-    "build:staging": "cross-env NODE_ENV=staging webpack",
-    "build": "cross-env NODE_ENV=production webpack",
+    "build:dev": "cross-env NODE_ENV=development CALENDAR_ENV=development webpack",
+    "build:staging": "cross-env NODE_ENV=production CALENDAR_ENV=development webpack",
+    "build": "cross-env NODE_ENV=production CALENDAR_ENV=production webpack",
     "deploy:dev": "rimraf dist && npm run build:dev && npx clasp push",
     "deploy:staging": "rimraf dist && npm run build:staging && npx clasp push",
     "deploy": "rimraf dist && npm run build && npx clasp push",
-    "serve": "cross-env NODE_ENV=development webpack serve",
+    "serve": "cross-env NODE_ENV=development CALENDAR_ENV=development webpack serve",
     "start": "npm run deploy:dev && npm run serve"
   },
   "keywords": [

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,13 +50,13 @@ const SAFTY_TRAINING_SHEET_NAME = 'safety_training_users';
 const INSTANT_APPROVAL_ROOMS = ['220', '221', '222', '223', '224', '233'];
 
 const SheetEditor = () => {
-  console.log('DEPLOY MODE ENVIRONMENT:', process.env.NODE_ENV);
+  console.log('DEPLOY MODE ENVIRONMENT:', process.env.CALENDAR_ENV);
 
   const roomCalendarId = (room) => {
     const roomById = findByRoomId(mappingRoomSettings, room.roomId);
     if (roomById) {
-      console.log('ENVIRONMENT:', process.env.NODE_ENV);
-      if (process.env.NODE_ENV === 'production') {
+      console.log('ENVIRONMENT:', process.env.CALENDAR_ENV);
+      if (process.env.CALENDAR_ENV === 'production') {
         return roomById.calendarIdProd;
       } else {
         return roomById.calendarId;

diff --git a/media_commons_booking_app/webpack.config.js b/media_commons_booking_app/webpack.config.js
@@ -22,10 +22,10 @@ const parsed = dotenv.error ? {} : dotenv.parsed;
 const envVars = parsed || {};
 const PORT = envVars.PORT || 3000;
 envVars.NODE_ENV = process.env.NODE_ENV;
+envVars.CALENDAR_ENV = process.env.CALENDAR_ENV;
 envVars.PORT = PORT;
 
-const isProd =
-  process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'staging';
+const isProd = process.env.NODE_ENV === 'production';
 const isWebpackServe = process.env.WEBPACK_SERVE === 'true';
 
 const publicPath = process.env.ASSET_PATH || '/';