limiting the dataset name length

uonafya · Jul 9, 2019 · 42140d6 · 42140d6
1 parent a44d086
commit 42140d6
Show file tree

Hide file tree

Showing 21 changed files with 60 additions and 64 deletions.
diff --git a/dhis2App/GOFR.zip b/dhis2App/GOFR.zip
diff --git a/dhis2App/config/config.json b/dhis2App/config/config.json
@@ -1,5 +1,5 @@
 {
   "BACKEND_HOST": ".",
   "BACKEND_PORT": "3000",
-  "BACKEND_PROTOCAL": "http"
+  "BACKEND_PROTOCOL": "http"
 }
diff --git a/dhis2App/index.html b/dhis2App/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>GOFR</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons" rel=stylesheet><link href=static/css/app.05e0d5f39fd1c80eac6b8575798ef273.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.37a2ecbb1d1b7e6c9ada.js></script><script type=text/javascript src=static/js/vendor.a48bd08214a109aa4c96.js></script><script type=text/javascript src=static/js/app.3f20db2e5b44adb9b216.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>GOFR</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons" rel=stylesheet><link href=static/css/app.c5c260c6c77fd58936ed736f87b52faa.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.37a2ecbb1d1b7e6c9ada.js></script><script type=text/javascript src=static/js/vendor.a48bd08214a109aa4c96.js></script><script type=text/javascript src=static/js/app.8049fa39c176a9c3c906.js></script></body></html>
diff --git a/facility-recon-backend/gui/config/config.json b/facility-recon-backend/gui/config/config.json
@@ -1,5 +1,5 @@
 {
   "BACKEND_HOST": ".",
   "BACKEND_PORT": "3000",
-  "BACKEND_PROTOCAL": "http"
+  "BACKEND_PROTOCOL": "http"
 }
diff --git a/facility-recon-backend/gui/index.html b/facility-recon-backend/gui/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>GOFR</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons" rel=stylesheet><link href=static/css/app.05e0d5f39fd1c80eac6b8575798ef273.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.37a2ecbb1d1b7e6c9ada.js></script><script type=text/javascript src=static/js/vendor.a48bd08214a109aa4c96.js></script><script type=text/javascript src=static/js/app.3f20db2e5b44adb9b216.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>GOFR</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons" rel=stylesheet><link href=static/css/app.c5c260c6c77fd58936ed736f87b52faa.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.37a2ecbb1d1b7e6c9ada.js></script><script type=text/javascript src=static/js/vendor.a48bd08214a109aa4c96.js></script><script type=text/javascript src=static/js/app.8049fa39c176a9c3c906.js></script></body></html>
diff --git a/.../app.05e0d5f39fd1c80eac6b8575798ef273.css → .../app.c5c260c6c77fd58936ed736f87b52faa.css b/.../app.05e0d5f39fd1c80eac6b8575798ef273.css → .../app.c5c260c6c77fd58936ed736f87b52faa.css
diff --git a/....05e0d5f39fd1c80eac6b8575798ef273.css.map → ....c5c260c6c77fd58936ed736f87b52faa.css.map b/....05e0d5f39fd1c80eac6b8575798ef273.css.map → ....c5c260c6c77fd58936ed736f87b52faa.css.map
diff --git a/facility-recon-backend/gui/static/js/app.3f20db2e5b44adb9b216.js b/facility-recon-backend/gui/static/js/app.3f20db2e5b44adb9b216.js
diff --git a/facility-recon-backend/gui/static/js/app.3f20db2e5b44adb9b216.js.map b/facility-recon-backend/gui/static/js/app.3f20db2e5b44adb9b216.js.map
diff --git a/facility-recon-backend/gui/static/js/app.8049fa39c176a9c3c906.js b/facility-recon-backend/gui/static/js/app.8049fa39c176a9c3c906.js
diff --git a/facility-recon-backend/gui/static/js/app.8049fa39c176a9c3c906.js.map b/facility-recon-backend/gui/static/js/app.8049fa39c176a9c3c906.js.map
diff --git a/facility-recon-backend/gui/static/js/manifest.37a2ecbb1d1b7e6c9ada.js.map b/facility-recon-backend/gui/static/js/manifest.37a2ecbb1d1b7e6c9ada.js.map
diff --git a/facility-recon-backend/lib/index.js b/facility-recon-backend/lib/index.js
@@ -2208,10 +2208,10 @@ if (cluster.isMaster) {
       const mappingDB = fields.source1DB + userID + fields.source2DB;
       if (!source1Id || !source2Id) {
         winston.error({
-          error: 'Missing either Source1ID or Source2ID or both',
+          error: 'Missing either Source1 ID or Source2 ID or both',
         });
         res.status(400).json({
-          error: 'Missing either Source1ID or Source2ID or both',
+          error: 'Missing either Source1 ID or Source2 ID or both',
         });
         return;
       }
@@ -2327,11 +2327,11 @@ if (cluster.isMaster) {
       const totalLevels = fields.totalLevels;
       if (!source1Id) {
         winston.error({
-          error: 'Missing either Source1ID',
+          error: 'Missing either Source1 ID',
         });
         res.set('Access-Control-Allow-Origin', '*');
         res.status(400).json({
-          error: 'Missing either Source1ID',
+          error: 'Missing either Source1 ID',
         });
         return;
       }

diff --git a/facility-recon-backend/lib/mongo.js b/facility-recon-backend/lib/mongo.js
@@ -242,46 +242,6 @@ module.exports = function () {
       });
     },
 
-    getMappingDBsOld(name, userID, callback) {
-      const mongoose = require('mongoose');
-      mongoose.connect(uri);
-      const dbConn = mongoose.connection;
-      const mappingDBs = [];
-      dbConn.on('error', console.error.bind(console, 'connection error:'));
-      dbConn.once('open', () => {
-        mongoose.connection.db.admin().command({
-          listDatabases: 1,
-        }, (error, results) => {
-          async.eachSeries(results.databases, (database, nxtDB) => {
-            let dbName1 = database.name;
-            if (dbName1.startsWith(name + userID) || dbName1.endsWith(userID + name)) {
-              dbName1 = dbName1.replace(name, '');
-              const splitedDB = dbName1.split(userID);
-              if (!splitedDB[0] == '' && !splitedDB[1] == '') {
-                return nxtDB();
-              }
-              dbName1 = dbName1.replace(userID, '');
-              // const db = results.databases.find(db => db.name === dbName1 + userID);
-              if (dbName1) {
-                mappingDBs.push(database.name);
-                return nxtDB();
-              }
-              return nxtDB();
-            }
-            if (dbName1.includes(name)) {
-              // this checks data source pair created from shared data sources
-              // check the posistion of 'name'
-              let checkingDB;
-              if (dbName1.startsWith(name)) {
-                checkingDB = dbName1.replace(name, '');
-              }
-            }
-            return nxtDB();
-          }, () => callback(mappingDBs));
-        });
-      });
-    },
-
     getMappingDBs(dataSourceID, callback) {
       const mappingDBs = [];
       const mongoose = require('mongoose');
@@ -305,7 +265,7 @@ module.exports = function () {
             if (pairs) {
               pairs = JSON.parse(JSON.stringify(pairs));
               async.eachSeries(pairs, (pair, nxtPair) => {
-                const db = pair.source1.name + pair.userID._id + pair.source2.name;
+                const db = mixin.toTitleCase(pair.source1.name) + pair.userID._id + mixin.toTitleCase(pair.source2.name);
                 mappingDBs.push({
                   source1Name: pair.source1.name,
                   source2Name: pair.source2.name,

diff --git a/facility-recon-gui/config/config.json b/facility-recon-gui/config/config.json
@@ -1,5 +1,5 @@
 {
   "BACKEND_HOST": ".",
   "BACKEND_PORT": "3000",
-  "BACKEND_PROTOCAL": "http"
+  "BACKEND_PROTOCOL": "http"
 }
diff --git a/facility-recon-gui/src/components/DataSources/FacilityReconRemoteSources.vue b/facility-recon-gui/src/components/DataSources/FacilityReconRemoteSources.vue
@@ -46,6 +46,9 @@
               v-model="name"
               box
               required
+              @blur="ensureNameUnique"
+              @input="ensureNameUnique"
+              :error-messages="nameErrors"
               color="deep-purple"
               label="Source Name"
             ></v-text-field>
@@ -145,7 +148,8 @@ export default {
   },
   data () {
     return {
-      datasetLimitWarn: false
+      datasetLimitWarn: false,
+      nameErrors: []
     }
   },
   methods: {
@@ -165,6 +169,26 @@ export default {
           this.datasetLimitWarn = true
         }
       })
+    },
+    ensureNameUnique () {
+      this.nameErrors = []
+      if (this.name === '') {
+        return this.nameErrors.push('Name is required')
+      }
+      if (this.name.length > 35) {
+        return this.nameErrors.push('Name must not exceed 35 characters')
+      }
+      for (let invalidChar of this.invalidCharacters) {
+        if (this.name.indexOf(invalidChar) !== -1) {
+          return this.nameErrors.push('Name is invalid')
+        }
+      }
+      for (let dtSrc of this.$store.state.dataSources) {
+        if (dtSrc.name === this.name) {
+          this.nameErrors.push('This Name Exists')
+          return false
+        }
+      }
     }
   }
 }

diff --git a/facility-recon-gui/src/components/DataSources/FacilityReconUpload.vue b/facility-recon-gui/src/components/DataSources/FacilityReconUpload.vue
@@ -602,6 +602,14 @@ export default {
       if (this.uploadName === '') {
         return this.uploadNameErrors.push('Upload name is required')
       }
+      if (this.uploadName.length > 35) {
+        return this.uploadNameErrors.push('Name must not exceed 35 characters')
+      }
+      for (let invalidChar of this.invalidCharacters) {
+        if (this.uploadName.indexOf(invalidChar) !== -1) {
+          return this.uploadNameErrors.push('Name is invalid')
+        }
+      }
       for (let dtSrc of this.$store.state.dataSources) {
         if (dtSrc.name === this.uploadName) {
           this.uploadNameErrors.push('This Name Exists')

diff --git a/facility-recon-gui/src/components/DataSources/ViewDataSources.vue b/facility-recon-gui/src/components/DataSources/ViewDataSources.vue
@@ -14,7 +14,7 @@
           </v-toolbar-title>
         </v-toolbar>
         <v-card-text>
-          Are you sure you want to delete {{server.name}} {{server.host}} <br> This will also delete the Database
+          This will delete the dataset from the database. Are you sure you want to delete {{server.name}} {{server.host}}
         </v-card-text>
         <v-card-actions>
           <v-btn

diff --git a/facility-recon-gui/src/components/DataSources/dataSourcesMixin.js b/facility-recon-gui/src/components/DataSources/dataSourcesMixin.js
@@ -1,4 +1,6 @@
-import {eventBus} from '../../main'
+import {
+  eventBus
+} from '../../main'
 import axios from 'axios'
 const backendServer = process.env.BACKEND_SERVER
 export const dataSourcesMixin = {
@@ -11,7 +13,8 @@ export const dataSourcesMixin = {
       sourceType: '',
       limitShareByOrgId: false,
       shareWithAll: false,
-      shareToSameOrgid: true
+      shareToSameOrgid: true,
+      invalidCharacters: ['"', '/', '\\', '.']
     }
   },
   methods: {

diff --git a/facility-recon-gui/src/components/FacilityReconScores.vue b/facility-recon-gui/src/components/FacilityReconScores.vue
@@ -267,7 +267,7 @@
                   >
                     <v-icon left>thumb_down</v-icon>No Match
                   </v-btn>
-                  <span>Save this Source 1 location as having no match</span>
+                  <span>Mark this source 1 location as being ignored</span>
                 </v-tooltip>
               </v-flex>
               <v-flex xs2>
@@ -291,7 +291,7 @@
                     slot="activator"
                   >
                     <v-btn
-                      color="teal darken-2"
+                      color="teal darken-6"
                       round
                       style="color: white;"
                       value="all"

diff --git a/facility-recon-gui/src/main.js b/facility-recon-gui/src/main.js
@@ -74,8 +74,9 @@ getDHIS2StoreConfig((storeConfig) => {
   } else {
     if (guiConfig.BACKEND_HOST === '.') {
       guiConfig.BACKEND_HOST = window.location.hostname
+      guiConfig.BACKEND_PROTOCOL = window.location.protocol.replace(':', '')
     }
-    axios.defaults.baseURL = guiConfig.BACKEND_PROTOCAL + '://' + guiConfig.BACKEND_HOST + ':' + guiConfig.BACKEND_PORT
+    axios.defaults.baseURL = guiConfig.BACKEND_PROTOCOL + '://' + guiConfig.BACKEND_HOST + ':' + guiConfig.BACKEND_PORT
   }
   // get general config of App and pass it to the App component as props
   let defaultGenerConfig = JSON.stringify(store.state.config.generalConfig)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>GOFR</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700\|Material+Icons" rel=stylesheet><link href=static/css/app.05e0d5f39fd1c80eac6b8575798ef273.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.37a2ecbb1d1b7e6c9ada.js></script><script type=text/javascript src=static/js/vendor.a48bd08214a109aa4c96.js></script><script type=text/javascript src=static/js/app.3f20db2e5b44adb9b216.js></script></body></html>
		<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>GOFR</title><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700\|Material+Icons" rel=stylesheet><link href=static/css/app.c5c260c6c77fd58936ed736f87b52faa.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.37a2ecbb1d1b7e6c9ada.js></script><script type=text/javascript src=static/js/vendor.a48bd08214a109aa4c96.js></script><script type=text/javascript src=static/js/app.8049fa39c176a9c3c906.js></script></body></html>