From 84b20b209e627c72ece29139682c5e2c091308f6 Mon Sep 17 00:00:00 2001 From: baldo Date: Mon, 17 Dec 2018 20:06:39 +0100 Subject: [PATCH] Splitting site field: Now we track site and domain. --- README.md | 3 ++- admin/js/main.js | 15 +++++++++++++++ config.json.example | 3 ++- server/config.js | 3 ++- server/db/patches/007_add_domain.sql | 1 + server/resources/nodeResource.js | 3 +++ server/services/monitoringService.js | 19 ++++++++++++++++--- shared/validation/constraints.js | 5 +++++ 8 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 server/db/patches/007_add_domain.sql diff --git a/README.md b/README.md index e62481b..a2cbe9a 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,8 @@ Dann die `config.json` anpassen nach belieben. Es gibt die folgenden Konfigurati * **`client.community.name`** Name der Freifunk-Community, z. B.: `"Freifunk Musterstadt"` * **`client.community.domain`** Domain der Freifunk-Community, z. B.: `"musterstadt.freifunk.net"` * **`client.community.contactEmail`** Kontakt-E-Mail-Adresse der Freifunk-Community, z. B.: `"kontakt@musterstadt.freifunk.net"` -* **`client.community.sites`** Liste der gültige Site-Codes in der `nodes.json`, z. B.: `["ffms-domain1", "ffms-domain2"]` +* **`client.community.sites`** Liste der gültige Site-Codes in der `nodes.json`, z. B.: `["ffms-site1", "ffms-site2"]` +* **`client.community.domains`** Liste der gültige Domänen-Codes in der `nodes.json`, z. B.: `["ffms-domain1", "ffms-domain2"]` * **`client.legal.privacyUrl`** optional: URL zum Impressum, z. B.: `"http://map.musterstadt.freifunk.net/impressum"` * **`client.legal.imprintUrl`** optional: URL zur Datenschutzerklärung, z. B.: `"http://map.musterstadt.freifunk.net/datenschutz"` diff --git a/admin/js/main.js b/admin/js/main.js index 7f5c22e..5d408fc 100644 --- a/admin/js/main.js +++ b/admin/js/main.js @@ -55,6 +55,15 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest }); } + var domainChoices = []; + for (var i = 0; i < config.community.domains.length; i++) { + var domain = config.community.domains[i]; + domainChoices.push({ + label: domain, + value: domain + }); + } + var header = '
' + '' + @@ -139,6 +148,7 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest : ''; }), nga.field('site').map(nullable).cssClasses(nodeClasses), + nga.field('domain').map(nullable).cssClasses(nodeClasses), nga.field('coords').label('GPS').cssClasses(nodeClasses).template(function (node) { return node.values.coords ? '' @@ -170,6 +180,10 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest .label('Site') .pinned(false) .choices(siteChoices), + nga.field('domain', 'choice') + .label('Domäne') + .pinned(false) + .choices(domainChoices), nga.field('hasKey', 'choice') .label('VPN key') .pinned(false) @@ -270,6 +284,7 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest nga.field('hostname').cssClasses(monitoringStateClasses), nga.field('mac').cssClasses(monitoringStateClasses), nga.field('site').map(nullable).cssClasses(monitoringStateClasses), + nga.field('domain').map(nullable).cssClasses(monitoringStateClasses), nga.field('monitoring_state').cssClasses(monitoringStateClasses).template(function (monitoringState) { switch (monitoringState.values.monitoring_state) { case 'active': diff --git a/config.json.example b/config.json.example index 824ea4a..370a99a 100644 --- a/config.json.example +++ b/config.json.example @@ -42,7 +42,8 @@ "name": "Freifunk Musterstadt", "domain": "musterstadt.freifunk.net", "contactEmail": "kontakt@musterstadt.freifunk.net", - "sites": ["ffms-domain1", "ffms-domain2"] + "sites": ["ffms-site1", "ffms-site2"], + "domains": ["ffms-domain1", "ffms-domain2"] }, "legal": { "privacyUrl": "http://map.musterstadt.freifunk.net/datenschutz", diff --git a/server/config.js b/server/config.js index c479882..157a948 100644 --- a/server/config.js +++ b/server/config.js @@ -97,7 +97,8 @@ var defaultConfig = { name: 'Freifunk Musterstadt', domain: 'musterstadt.freifunk.net', contactEmail: 'kontakt@musterstadt.freifunk.net', - sites: [] + sites: [], + domains: [] }, legal: { privacyUrl: null, diff --git a/server/db/patches/007_add_domain.sql b/server/db/patches/007_add_domain.sql new file mode 100644 index 0000000..ae91728 --- /dev/null +++ b/server/db/patches/007_add_domain.sql @@ -0,0 +1 @@ +ALTER TABLE node_state ADD COLUMN domain VARCHAR(32); diff --git a/server/resources/nodeResource.js b/server/resources/nodeResource.js index 8dd1fad..f604072 100644 --- a/server/resources/nodeResource.js +++ b/server/resources/nodeResource.js @@ -128,6 +128,7 @@ angular.module('ffffng').factory('NodeResource', function ( if (nodeState) { return deepExtend({}, node, { site: nodeState.site, + domain: nodeState.domain, onlineState: nodeState.state }); } @@ -144,6 +145,7 @@ angular.module('ffffng').factory('NodeResource', function ( 'token', 'mac', 'site', + 'domain', 'key', 'onlineState' ], @@ -161,6 +163,7 @@ angular.module('ffffng').factory('NodeResource', function ( 'mac', 'key', 'site', + 'domain', 'coords', 'onlineState', 'monitoringState' diff --git a/server/services/monitoringService.js b/server/services/monitoringService.js index d987807..7a17039 100644 --- a/server/services/monitoringService.js +++ b/server/services/monitoringService.js @@ -44,12 +44,13 @@ angular.module('ffffng') return Database.run( 'INSERT INTO node_state ' + - '(hostname, mac, site, monitoring_state, state, last_seen, import_timestamp, last_status_mail_sent, last_status_mail_type) ' + - 'VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', + '(hostname, mac, site, domain, monitoring_state, state, last_seen, import_timestamp, last_status_mail_sent, last_status_mail_type) ' + + 'VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', [ node.hostname, node.mac, nodeData.site, + nodeData.domain, node.monitoringState, nodeData.state, nodeData.lastSeen.unix(), @@ -84,6 +85,7 @@ angular.module('ffffng') 'SET ' + 'hostname = ?, ' + 'site = ?, ' + + 'domain = ?, ' + 'monitoring_state = ?, ' + 'state = ?, ' + 'last_seen = ?, ' + @@ -93,6 +95,7 @@ angular.module('ffffng') [ node.hostname, nodeData.site || row.site, + nodeData.domain || row.domain, node.monitoringState, nodeData.state, nodeData.lastSeen.unix(), @@ -119,6 +122,7 @@ angular.module('ffffng') nodeDataForStoring = { mac: node.mac, site: _.isUndefined(row) ? null : row.site, + domain: _.isUndefined(row) ? null : row.domain, state: 'OFFLINE', // jshint -W106 lastSeen: _.isUndefined(row) ? moment() : moment.unix(row.last_seen), @@ -197,12 +201,20 @@ angular.module('ffffng') } // jshint +W106 + var domain = null; + // jshint -W106 + if (_.isPlainObject(nodeData.nodeinfo.system) && _.isString(nodeData.nodeinfo.system.domain_code)) { + domain = nodeData.nodeinfo.system.domain_code; + } + // jshint +W106 + return { mac: mac, importTimestamp: importTimestamp, state: isOnline ? 'ONLINE' : 'OFFLINE', lastSeen: lastSeen, - site: site + site: site, + domain: domain }; } @@ -564,6 +576,7 @@ angular.module('ffffng') 'hostname', 'mac', 'site', + 'domain', 'monitoring_state', 'state', 'last_seen', diff --git a/shared/validation/constraints.js b/shared/validation/constraints.js index 46d3290..f67a111 100644 --- a/shared/validation/constraints.js +++ b/shared/validation/constraints.js @@ -70,6 +70,11 @@ angular.module('ffffng').constant('Constraints', { type: 'string', regex: /^[a-z0-9_-]{1,32}$/, optional: true + }, + domain: { + type: 'string', + regex: /^[a-z0-9_-]{1,32}$/, + optional: true } }, rest: {