Merge 0312c85 into 8e2bba7

CometVisu · May 7, 2020 · ec0c130 · ec0c130
2 parents 8e2bba7 + 0312c85
commit ec0c130
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
   ],
   "devDependencies": {
     "@babel/polyfill": "^7.8.7",
-    "@qooxdoo/compiler": "^1.0.0-beta.20200502-0822",
+    "@qooxdoo/compiler": "^1.0.0-beta.20200507-1713",
     "csso": "^3.5.1",
     "easyimage": "^3.1.1",
     "fast-glob": "^3.2.2",

diff --git a/source/class/cv/ui/manager/editor/Config.js b/source/class/cv/ui/manager/editor/Config.js
@@ -61,7 +61,9 @@ qx.Class.define('cv.ui.manager.editor.Config', {
     },
 
     _onModelValueChange: function (ev) {
-      this.setContent(ev.getData());
+      if (this.getFile()) {
+        this.setContent(ev.getData());
+      }
     },
 
     // overridden

diff --git a/source/class/cv/ui/manager/editor/Source.js b/source/class/cv/ui/manager/editor/Source.js
@@ -47,9 +47,7 @@ qx.Class.define('cv.ui.manager.editor.Source', {
     COUNTER: 0,
     MONACO_EXTENSION_REGEX: null,
     SUPPORTED_FILES: function (file) {
-      if (file.getName() === 'hidden.php') {
-        return false
-      } else if (window.monaco && window.monaco.languages) {
+      if (window.monaco && window.monaco.languages) {
         if (!cv.ui.manager.editor.Source.MONACO_EXTENSION_REGEX) {
           // monaco has already been loaded, we can use its languages configuration to check if this file is supported
           var extensions = []
@@ -131,6 +129,7 @@ qx.Class.define('cv.ui.manager.editor.Source', {
     _basePath: null,
     _workerWrapper: null,
     _currentDecorations: null,
+    _configClient: null,
 
     _initWorker: function () {
       this._workerWrapper = cv.ui.manager.editor.Worker.getInstance();
@@ -166,6 +165,27 @@ qx.Class.define('cv.ui.manager.editor.Source', {
             },
             theme: 'vs-dark'
           });
+          var baseVersion = cv.Version.VERSION.split('-')[0];
+          var xhr = new qx.io.request.Xhr(qx.util.ResourceManager.getInstance().toUri("hidden-schema.json"));
+          xhr.set({
+            method: "GET",
+            accept: "application/json"
+          });
+          xhr.addListenerOnce("success", function (e) {
+            var req = e.getTarget();
+            var schema = req.getResponse();
+            window.monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
+              validate: true,
+              allowComments: true,
+              schemas: [{
+                uri: "https://www.cometvisu.org/CometVisu/schemas/" + baseVersion + "/hidden-schema.json",
+                fileMatch: ["hidden.php"],
+                schema: schema
+              }]
+            })
+          }, this);
+          xhr.send();
+
           if (this.getFile()) {
             this._loadFile(this.getFile());
           }
@@ -208,6 +228,51 @@ qx.Class.define('cv.ui.manager.editor.Source', {
       }
     },
 
+    _loadFromFs: function () {
+      if (this.getFile().getName() === 'hidden.php') {
+        if (!this._configClient) {
+          this._configClient = cv.io.rest.Client.getConfigClient();
+          this._configClient.addListener('getSuccess', function (ev) {
+            this.setContent(JSON.stringify(ev.getData(), null, 2));
+          }, this);
+          this._configClient.addListener('updateSuccess', this._onSaved, this);
+        }
+        this._configClient.get({section: '*', key: '*'});
+      } else {
+        this.base(arguments);
+      }
+    },
+
+    save: function (callback, overrideHash) {
+      if (this.getFile().getName() === 'hidden.php') {
+        if (!this.getFile().isValid()) {
+          cv.ui.manager.snackbar.Controller.error(this.tr('Hidden config is invalid, please correct the errors'));
+        } else if (this.getFile().getHasWarnings()) {
+          // ask user if he really want to save a file with warnings
+          dialog.Dialog.confirm(this.tr("Hidden config content has some warnings! It is recommended to fix the warnings before saving. Save anyways?"), function (confirmed) {
+            if (confirmed) {
+              this.__saveHiddenConfig();
+            }
+          }, this, qx.locale.Manager.tr('Confirm saving with warnings'));
+        } else {
+          this.__saveHiddenConfig();
+        }
+      } else {
+        this.base(arguments, callback, overrideHash);
+      }
+    },
+
+    __saveHiddenConfig: function () {
+      this._configClient.saveSync(null, JSON.parse(this.getCurrentContent()), function (err) {
+        if (err) {
+          cv.ui.manager.snackbar.Controller.error(this.tr('Saving hidden config failed with error %1 (%2)', err.status, err.statusText));
+        } else {
+          cv.ui.manager.snackbar.Controller.info(this.tr('Hidden config has been saved'));
+          this._onSaved();
+        }
+      }, this);
+    },
+
     _applyContent: function(value) {
       var file = this.getFile();
       if (!file) {
@@ -224,6 +289,23 @@ qx.Class.define('cv.ui.manager.editor.Source', {
           value = value.documentElement.outerHTML;
         }
         newModel = window.monaco.editor.createModel(value, this._getLanguage(file), file.getUri());
+        newModel.onDidChangeDecorations(function (ev) {
+          var errors = false;
+          var warnings = false;
+          monaco.editor.getModelMarkers({
+            owner: newModel.getModeId(),
+            resource: file.getUri()
+          }).some(function (marker) {
+            if (marker.severity === monaco.MarkerSeverity.Warning) {
+              warnings = true;
+            } else if (marker.severity === monaco.MarkerSeverity.Error) {
+              errors = true;
+            }
+            return warnings && errors;
+          }, this);
+          file.setValid(!errors);
+          file.setHasWarnings(warnings);
+        })
       }
 
       if (model !== newModel) {
@@ -327,6 +409,10 @@ qx.Class.define('cv.ui.manager.editor.Source', {
     },
 
     _getLanguage: function (file) {
+      if (file.getName() === 'hidden.php') {
+        // override this setting as we are loading the hidden config from its REST endpoint as JSON
+        return 'json';
+      }
       var type = file.getName().split('.').pop();
       switch (type) {
         case 'svg':
@@ -363,6 +449,7 @@ qx.Class.define('cv.ui.manager.editor.Source', {
       this._editor.dispose();
       this._editor = null;
     }
+    this._configClient = null;
     qx.ui.core.FocusHandler.getInstance().setUseTabNavigation(true);
   }
 });
diff --git a/source/class/cv/ui/manager/model/FileItem.js b/source/class/cv/ui/manager/model/FileItem.js
@@ -205,6 +205,15 @@ qx.Class.define('cv.ui.manager.model.FileItem', {
       event: 'changeValid'
     },
 
+    /**
+     * The validation of this files content found some warnings
+     */
+    hasWarnings: {
+      check: 'Boolean',
+      init: false,
+      event: 'changeHasWarnings'
+    },
+
     /**
      * Temporary content to show, e.g. for new files, when there is no 'real' file with content yet to request from the backend
      * this content should be shown

diff --git a/source/resource/hidden-schema.json b/source/resource/hidden-schema.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "$id": "https://www.cometvisu.org/CometVisu/schemas/0.12/hidden-schema.json",
+
+  "type": "object",
+  "patternProperties": {
+    "^fritzbox(\\..*)?$": { "$ref": "#/definitions/login" },
+    "^influx(\\..*)?$": { "$ref": "#/definitions/login" },
+    "^tr064(\\..*)?$": { "$ref": "#/definitions/login" }
+  },
+  "definitions": {
+    "login": {
+      "type": "object",
+      "properties": {
+        "uri":  { "type": "string", "format": "uri" },
+        "user": { "type": "string" },
+        "pass": { "type": "string" },
+        "selfsigned": { "type": "string", "enum": ["true", "false"] }
+      },
+      "required": ["uri", "user", "pass"],
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/source/rest/manager/src/Api/ConfigApi.php b/source/rest/manager/src/Api/ConfigApi.php
@@ -32,8 +32,7 @@ protected function load()
   }
 
   protected function dump() {
-    $out =  '
-<?php
+    $out =  '<?php
 // File for configurations that shouldn\'t be shared with the user
 $data = \'' . json_encode($this->hidden, JSON_PRETTY_PRINT) . '\';
 $hidden = json_decode($data, true);
@@ -130,6 +129,8 @@ public function getHiddenConfig(ServerRequestInterface $request, ResponseInterfa
   public function saveHiddenConfig(ServerRequestInterface $request, ResponseInterface $response, array $args)
   {
     $this->hidden = $request->getParsedBody();
+    var_dump($request->getParsedBody());
+    var_dump($request->getBody());
     try {
       $this->dump();
     } catch (Exception $e) {

diff --git a/utils/compile/cv/CompileHandler.js b/utils/compile/cv/CompileHandler.js
@@ -11,6 +11,7 @@ const { CvBuildTarget } = require('./BuildTarget')
 // we add them here
 const additionalResources = [
   'visu_config.xsd',
+  'hidden-schema.json',
   'cometvisu_management.css',
   'config/visu_config*.xml',
   'config/hidden.php'
@@ -38,7 +39,7 @@ class CvCompileHandler extends AbstractCompileHandler {
   onLoad() {
     super.onLoad();
     const command = this._compilerApi.getCommand();
-    if (this._config.targetType === 'build' || command instanceof qx.tool.cli.commands.Deploy) {
+    if (this._config.targetType === 'build') {// || command instanceof qx.tool.cli.commands.Deploy) {
       this._config.targets.some(target => {
         if (target.type === 'build') {
           target.targetClass = CvBuildTarget

diff --git a/utils/travis/deploy.sh b/utils/travis/deploy.sh
@@ -102,6 +102,10 @@ grunt update-demo-config
 rm -rf out/de/$VERSION_PATH/demo
 mv compiled/build out/de/$VERSION_PATH/demo
 
+echo "copying JSON schema for hidden configuration"
+mkdir -p out/schemas/$VERSION_PATH/
+cp source/resource/hidden-schema.json out/schemas/$VERSION_PATH/
+
 # Copy demo-mode to default config
 cp out/de/$VERSION_PATH/demo/resource/demo/visu_config_demo_testmode.xml out/de/$VERSION_PATH/demo/resource/config/visu_config.xml