Allow for hiding fields via secondary configuration file

dainst · Mar 6, 2018 · b184854 · b184854
1 parent 4e424cb
commit b184854
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 76 deletions.
diff --git a/app/app.module.ts b/app/app.module.ts
@@ -79,7 +79,8 @@ let pconf: any = undefined;
 
                 return() => {
                     const PROJECT_CONFIGURATION_PATH = remote.getGlobal('configurationPath');
-                    appConfigurator.go(PROJECT_CONFIGURATION_PATH);
+                    const HIDDEN_CONFIGURATION_PATH = remote.getGlobal('hiddenConfigurationPath');
+                    appConfigurator.go(PROJECT_CONFIGURATION_PATH, HIDDEN_CONFIGURATION_PATH);
 
                     return (configLoader.getProjectConfiguration() as any).then((pc: any) => {
                         pconf = pc as any;

diff --git a/config/.gitignore b/config/.gitignore
@@ -3,5 +3,6 @@
 # Explicitely mention files which should be part of the repo.
 
 !Configuration.json.template
+!Hidden.json.template
 !README.md
 
diff --git a/config/Hidden.json.template b/config/Hidden.json.template
diff --git a/gulpfile.js b/gulpfile.js
@@ -45,4 +45,14 @@ gulp.task('create-configs', function (callback) {
             console.log('Will not create ' + path + ' from template because file already exists.');
         }
     });
+
+    var hpath = './config/Hidden.json';
+
+    fs.access(hpath, fs.F_OK, function(err) {
+        if (err) {
+            fs.createReadStream(hpath + '.template').pipe(fs.createWriteStream(hpath));
+        } else {
+            console.log('Will not create ' + hpath + ' from template because file already exists.');
+        }
+    });
 });
diff --git a/main.js b/main.js
@@ -23,6 +23,7 @@ if (process.argv && process.argv.length > 2) {
 }
 if (env) { // is environment 'dev' (npm start) or 'test' (npm run e2e)
     global.configurationPath = 'config/Configuration.json';
+    global.hiddenConfigurationPath = 'config/Hidden.json';
 }
 
 
@@ -34,7 +35,8 @@ if (!env || // is environment 'production' (packaged app)
     global.configPath = global.appDataPath + '/config.json';
 
     if (!env) { // is environment 'production' (packaged app)
-        global.configurationPath = '../config/Configuration.json'
+        global.configurationPath = '../config/Configuration.json';
+        global.hiddenConfigurationPath = '../config/Hidden.json';
     }
 
 } else { // is environment 'test' (npm run e2e)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
     "systemjs": "0.19.31",
     "zone.js": "0.8.11",
     "express-pouchdb-dainst": "1000.0.3",
-    "idai-components-2": "1.6.2",
+    "idai-components-2": "1.7.1",
     "tsfun": "1.7.0"
   },
   "devDependencies": {