Final bugfixes before release

Author: DmitryMK

app/constants/action-types.js

@@ -206,4 +206,5 @@ export const actionLabels = {
     'DUMMY_ACTION': 'Technical action',
     'DEL_DUPLICATECOMMENTS': 'Remove duplicate comments',
     'DEL_DUPLICATEMETHODS': 'Remove duplicate methods',
+    'DEFINE_UPD': 'Update Define-XML properties',
 };

app/core/settings.js

@@ -20,6 +20,7 @@ import clone from 'clone';
 import SettingTabs from 'components/settings/tabs.js';
 import CdiscLibraryContext from 'constants/cdiscLibraryContext.js';
 import { initCdiscLibrary, updateCdiscLibrarySettings, dummyRequest } from 'utils/cdiscLibraryUtils.js';
+import saveState from 'utils/saveState.js';
 import { updateSettings, openModal, openSnackbar } from 'actions/index.js';
 import { encrypt, decrypt } from 'utils/encryptDecrypt.js';
 
@@ -106,6 +107,8 @@ class ConnectedSettings extends React.Component {
     };
 
     makeBackup = () => {
+        // Save state without writing any current Define-XML changes
+        saveState('noWrite');
         ipcRenderer.send('makeBackup', this.state.settings.backup);
     };
 

app/main/validateState.js

@@ -39,18 +39,24 @@ const validateState = async (options = {}) => {
         let fileData = await readFile(pathToState);
         let state = JSON.parse(fileData);
 
+        let ctPathUpdated = false;
         let missingFiles = { defines: [], ct: [] };
 
         // Check for missing CT
         if (state && state.controlledTerminology && state.controlledTerminology.byId) {
             await Promise.all(Object.values(state.controlledTerminology.byId).map(async (ct) => {
                 // Check if file exists;
-                if (!await isAccessible(path.join(pathToUserData, 'controlledTerminology', ct.id + '.nogz'))) {
+                let pathToCurrentCt = path.join(pathToUserData, 'controlledTerminology', path.basename(ct.pathToFile));
+                if (!await isAccessible(pathToCurrentCt)) {
                     missingFiles.ct.push(ct.id);
                     if (cleanCodeLists) {
                         delete state.controlledTerminology.byId[ct.id];
                         state.controlledTerminology.allIds.splice(state.controlledTerminology.allIds.indexOf(ct.id), 1);
                     }
+                } else if (ct.pathToFile !== pathToCurrentCt) {
+                    // Path can change if loading for a different user/computer
+                    ct.pathToFile = pathToCurrentCt;
+                    ctPathUpdated = true;
                 }
             }));
         } else {
@@ -88,8 +94,8 @@ const validateState = async (options = {}) => {
             }
         }
 
-        if ((cleanCodeLists && missingFiles.ct.length > 0) || (cleanDefines && missingFiles.defines.length > 0)) {
-            await writeFile(pathToState, JSON.stringify(state));
+        if ((cleanCodeLists && missingFiles.ct.length > 0) || (cleanDefines && missingFiles.defines.length > 0) || ctPathUpdated) {
+            await writeFile(pathToState, JSON.stringify(state, null, 4));
         }
         return { passed: true, issues: missingFiles.defines.concat(missingFiles.ct) };
     } catch (error) {