#771 Bug - Mission name and msv.mission sometimes conflict (#772)

* #771 Bug - Mission name and msv.mission sometimes conflict

* #771 minor 1

Author: tariqksoliman

API/Backend/Config/routes/configs.js

@@ -183,24 +183,30 @@ function get(req, res, next, cb) {
           },
         })
           .then((mission) => {
+            // Apply fallback logic for missionFolderName
+            const config = mission.config;
+            if (config.msv && (!config.msv.missionFolderName || config.msv.missionFolderName === "")) {
+              config.msv.missionFolderName = config.msv.mission || "";
+            }
+
             if (req.query.full) {
               if (cb)
                 cb({
                   status: "success",
                   mission: mission.mission,
-                  config: mission.config,
+                  config: config,
                   version: mission.version,
                 });
               else
                 res.send({
                   status: "success",
                   mission: mission.mission,
-                  config: mission.config,
+                  config: config,
                   version: mission.version,
                 });
             } else {
-              if (cb) cb(mission.config);
-              else res.send(mission.config);
+              if (cb) cb(config);
+              else res.send(config);
             }
             return null;
           })
@@ -244,6 +250,8 @@ function add(req, res, next, cb) {
   }
 
   configTemplate.msv.mission = req.body.mission;
+  // Set missionFolderName to match the mission name by default
+  configTemplate.msv.missionFolderName = req.body.mission;
 
   // Fix validation logic: use OR conditions instead of AND
   if (
@@ -729,6 +737,8 @@ if (fullAccess)
     get(req, res, next, function (r) {
       if (r.status == "success") {
         r.config.msv.mission = req.body.cloneMission;
+        // Set missionFolderName to match the new mission name
+        r.config.msv.missionFolderName = req.body.cloneMission;
         req.body.config =
           req.body.hasPaths == "true"
             ? relativizePaths(r.config, req.body.existingMission)

API/templates/config_template.js

@@ -1,6 +1,7 @@
 module.exports = {
   msv: {
     mission: "Test",
+    missionFolderName: "",
     site: "",
     masterdb: false,
     view: ["0", "0", "0"],

configure/src/metaconfigs/tab-home-config.json

@@ -57,6 +57,19 @@
           "units": "meters"
         }
       ]
+    },
+    {
+      "name": "Paths",
+      "components": [
+        {
+          "field": "msv.missionFolderName",
+          "name": "/Missions Folder Name",
+          "description": "The actual folder name in the /Missions directory. This should match the physical folder name to ensure relative links work correctly. If the folder name differs from the mission name in the database, update this value accordingly.",
+          "type": "text",
+          "width": 4,
+          "required": true
+        }
+      ]
     }
   ]
 }

src/essence/Basics/Layers_/Layers_.js

@@ -3659,9 +3659,14 @@ async function parseConfig(configData, urlOnLayers) {
             )
     }
 
-    L_.mission = L_.configData.msv.mission
+    // Use DB mission name for L_.mission (for deeplinks)
+    // This will be set from the API response's mission field
+    // For now, keep backward compatibility
+    L_.mission = L_.configData._dbMissionName || L_.configData.msv.mission
     L_.recentMissions.unshift(L_.mission)
-    L_.missionPath = 'Missions/' + L_.configData.msv.mission + '/'
+    // Use missionFolderName if available, otherwise fallback to msv.mission
+    L_.missionFolderName = L_.configData.msv.missionFolderName || L_.configData.msv.mission
+    L_.missionPath = 'Missions/' + L_.missionFolderName + '/'
     L_.site = L_.configData.msv.site
 
     L_.view = [

src/essence/LandingPage/LandingPage.js

@@ -152,9 +152,15 @@ export default {
                                         'get',
                                         {
                                             mission: missionName,
+                                            full: true,
                                         },
-                                        function (data) {
-                                            s.init(data, missions)
+                                        function (response) {
+                                            // Extract DB mission name and attach to config
+                                            const config = response.config || response
+                                            if (response.mission) {
+                                                config._dbMissionName = response.mission
+                                            }
+                                            s.init(config, missions)
                                         },
                                         function (e) {
                                             console.log(
@@ -330,9 +336,15 @@ export default {
                         'get',
                         {
                             mission: missionUrl,
+                            full: true,
                         },
-                        function (data) {
-                            s.init(data, missions)
+                        function (response) {
+                            // Extract DB mission name and attach to config
+                            const config = response.config || response
+                            if (response.mission) {
+                                config._dbMissionName = response.mission
+                            }
+                            s.init(config, missions)
                         },
                         function (e) {
                             console.error(

src/essence/essence.js

@@ -209,7 +209,8 @@ var essence = {
             if (data.data) {
                 try {
                     const parsed = JSON.parse(data.data)
-                    const mission = essence.configData.msv.mission
+                    // Use DB mission name for comparison (L_.mission now contains DB name)
+                    const mission = L_.mission || essence.configData.msv.mission
 
                     if (
                         !parsed.body.mission ||
@@ -230,8 +231,15 @@ var essence = {
                                 'get',
                                 {
                                     mission,
+                                    full: true,
                                 },
-                                async function (data) {
+                                async function (response) {
+                                    // Extract DB mission name and attach to config
+                                    const data = response.config || response
+                                    if (response.mission) {
+                                        data._dbMissionName = response.mission
+                                    }
+
                                     if (Array.isArray(layerName)) {
                                         // If we're adding an array of new layers, add each layer to the queue individually
                                         for (let layer in layerName) {
@@ -318,10 +326,12 @@ var essence = {
             (urlSplit[1] && urlSplit[1].split('=')[0] === '_preview')
         ) {
             //then no parameters or old ones
+            // Use DB mission name for deeplinks (config._dbMissionName if available)
+            const missionForUrl = config._dbMissionName || config.msv.mission
             url =
                 window.location.href.split('?')[0] +
                 '?mission=' +
-                config.msv.mission
+                missionForUrl
             window.history.replaceState('', '', url)
             L_.url = window.location.href
         }
@@ -427,9 +437,15 @@ var essence = {
                 'get',
                 {
                     mission: to,
+                    full: true,
                 },
-                function (data) {
-                    essence.makeMission(data)
+                function (response) {
+                    // Extract DB mission name and attach to config
+                    const config = response.config || response
+                    if (response.mission) {
+                        config._dbMissionName = response.mission
+                    }
+                    essence.makeMission(config)
                 },
                 function (e) {
                     console.log(