#354 Add MAIN_MISSION ENV (#355)

configuration/env.js

@@ -99,6 +99,7 @@ function getClientEnvironment(publicUrl) {
         }),
         PORT: process.env.PORT,
         ENABLE_MMGIS_WEBSOCKETS: process.env.ENABLE_MMGIS_WEBSOCKETS,
+        MAIN_MISSION: process.env.MAIN_MISSION,
       }
     );
   // Stringify all values so we can feed into webpack DefinePlugin

docker-compose-env.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 services:
   mmgis:
     image: mmgis:development
@@ -23,13 +23,16 @@ services:
       - FRAME_SRC=
       - LEADS=["ADMIN"]
       - ENABLE_MMGIS_WEBSOCKETS=true
+      - ENABLE_CONFIG_WEBSOCKETS=true
+      - ENABLE_CONFIG_OVERRIDE=false
+      - MAIN_MISSION=
     volumes:
       - /var/www/html/Missions/:/usr/src/app/Missions
   mmgis.db:
-      image: postgis/postgis:10-2.5-alpine
-      env_file: .env
-      ports:
-        - 5432:5432
-      restart: on-failure
-      volumes:
-        - mmgis-db:/var/lib/postgresql/data
+    image: postgis/postgis:10-2.5-alpine
+    env_file: .env
+    ports:
+      - 5432:5432
+    restart: on-failure
+    volumes:
+      - mmgis-db:/var/lib/postgresql/data

docs/pages/Setup/ENVs/ENVs.md

@@ -123,3 +123,7 @@ If true, notifications are sent to /configure users whenever the current mission
 #### `ENABLE_CONFIG_OVERRIDE=`
 
 For use when `ENABLE_CONFIG_WEBSOCKETS=true` (if `ENABLE_CONFIG_WEBSOCKETS=false`, all saves will freely overwrite already). If true, gives /configure users the ability to override changes made to the configuration while they were working on it with their own. | boolean | default `false`
+
+#### `MAIN_MISSION=`
+
+If the new MAIN_MISSION ENV is set to a valid mission, skip the landing page and go straight to that mission. Other missions will still be accessible by either forcing the landing page (clicking the top-left M logo) or by going to a link directly. | string | default `''`

public/index.html

@@ -337,6 +337,7 @@
           mmgisglobal.PORT = "#{PORT}";
           mmgisglobal.ROOT_PATH = "#{ROOT_PATH}";
           mmgisglobal.ENABLE_MMGIS_WEBSOCKETS = "#{ENABLE_MMGIS_WEBSOCKETS}";
+          mmgisglobal.MAIN_MISSION = "#{MAIN_MISSION};"
           mmgisglobal.THIRD_PARTY_COOKIES = "#{THIRD_PARTY_COOKIES}";
           break;
         default:
@@ -351,7 +352,8 @@
           mmgisglobal.PORT = "%PORT%";
           mmgisglobal.ROOT_PATH = "%ROOT_PATH%";
           mmgisglobal.ENABLE_MMGIS_WEBSOCKETS = "%ENABLE_MMGIS_WEBSOCKETS%";
-          mmgisglobal.THIRD_PARTY_COOKIES = "#{THIRD_PARTY_COOKIES}";
+          mmgisglobal.MAIN_MISSION = "%MAIN_MISSION%";
+          mmgisglobal.THIRD_PARTY_COOKIES = "%THIRD_PARTY_COOKIES%";
           // eslint-disable-next-line
           mmgisglobal.HOSTS = %HOSTS%;
           break;

run/server.js

@@ -742,6 +742,7 @@ setups.getBackendSetups(function (setups) {
             FORCE_CONFIG_PATH: process.env.FORCE_CONFIG_PATH,
             CLEARANCE_NUMBER: process.env.CLEARANCE_NUMBER,
             ENABLE_MMGIS_WEBSOCKETS: process.env.ENABLE_MMGIS_WEBSOCKETS,
+            MAIN_MISSION: process.env.MAIN_MISSION,
             THIRD_PARTY_COOKIES: process.env.THIRD_PARTY_COOKIES,
             PORT: process.env.PORT,
             ROOT_PATH: ROOT_PATH,

sample.env

@@ -66,3 +66,7 @@ ENABLE_MMGIS_WEBSOCKETS=false
 ENABLE_CONFIG_WEBSOCKETS=false
 # For use when ENABLE_CONFIG_WEBSOCKETS=true (if ENABLE_CONFIG_WEBSOCKETS=false, all saves will freely overwrite already). If true, gives /configure users the ability to override changes made to the configuration while they were working on it with their own.
 ENABLE_CONFIG_OVERRIDE=false
+
+# If the new MAIN_MISSION ENV is set to a valid mission, skip the landing page and go straight to that mission.
+# Other missions will still be accessible by either forcing the landing page (clicking the top-left M logo) or by going to a link directly.
+MAIN_MISSION=

src/essence/LandingPage/LandingPage.js

@@ -24,6 +24,16 @@ export default {
             if (missions.length == 1 && !forceLanding) missionUrl = missions[0]
         }
 
+        if (
+            missionUrl == false &&
+            !forceLanding &&
+            mmgisglobal.MAIN_MISSION != null &&
+            typeof mmgisglobal.MAIN_MISSION === 'string' &&
+            mmgisglobal.MAIN_MISSION.length > 0
+        ) {
+            missionUrl = mmgisglobal.MAIN_MISSION
+        }
+
         if (missionUrl == false && !forceConfig) {
             var background = d3
                 .select('body')