Fixed vis-2 links in intro

ioBroker · Jul 18, 2024 · 12902d7 · 12902d7
1 parent 41e5414
commit 12902d7
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 6 deletions.
diff --git a/packages/iobroker.vis-2/io-package.json b/packages/iobroker.vis-2/io-package.json
@@ -141,7 +141,34 @@
       "bluefox <[email protected]>"
     ],
     "localLinks": {
-      "_default": "%web_protocol%://%ip%:%web_port%/vis-2/edit.html"
+      "_default": {
+        "link": "%web_protocol%://%ip%:%web_port%/vis-2/edit.html",
+        "icon": "vis-2/img/faviconEdit.png",
+        "name": {
+          "en": "vis-2 Editor",
+          "de": "vis-2 Editor",
+          "ru": "vis-2 редактор",
+          "pt": "Editor vis-2",
+          "nl": "vis-2 Editor",
+          "fr": "Éditeur vis-2",
+          "it": "Editor vis-2",
+          "es": "Editor vis-2",
+          "pl": "Edytor vis-2",
+          "uk": "Редактор vis-2",
+          "zh-cn": "vis-2 编辑器"
+        },
+        "color": "#c8ffe1",
+        "pro": "vis-2/edit.html",
+        "intro": true
+      },
+      "Runtime": {
+        "link": "%web_protocol%://%ip%:%web_port%/vis-2/index.html",
+        "icon": "vis-2/img/favicon.png",
+        "color": "#ffe9c8",
+        "pro": "vis-2/index.htm",
+        "cloud": "vis-2/index.html",
+        "intro": true
+      }
     },
     "license": "CC-BY-NC-4.0",
     "dependencies": [

diff --git a/packages/iobroker.vis-2/main.js b/packages/iobroker.vis-2/main.js
@@ -12,7 +12,8 @@ const path = require('node:path');
 const https = require('node:https');
 const utils = require('@iobroker/adapter-core'); // Get common adapter utils
 const jwt = require('jsonwebtoken');
-const adapterName = require('./package.json').name.split('.').pop();
+const ioPack = require('./io-package.json');
+const adapterName = require('./package.json').split('.').pop();
 const syncWidgetSets = require('./lib/install');
 const cert = fs.readFileSync(`${__dirname}/lib/cloudCert.crt`);
 
@@ -978,7 +979,7 @@ async function main() {
     }
 
     // create a vis "meta" object if not exists
-    if (!visObj || visObj.type !== 'meta') {
+    if (visObj?.type !== 'meta') {
         await adapter.setForeignObjectAsync(adapterName, {
             type: 'meta',
             common: {
@@ -991,7 +992,7 @@ async function main() {
 
     // create a vis-2.0 "meta" object, if not exists
     const visObjNS = await adapter.getForeignObjectAsync(adapter.namespace);
-    if (!visObjNS || visObjNS.type !== 'meta') {
+    if (visObjNS?.type !== 'meta') {
         await adapter.setForeignObjectAsync(adapter.namespace, {
             type: 'meta',
             common: {
@@ -1011,11 +1012,18 @@ async function main() {
         await adapter.setForeignObjectAsync(systemView._id, systemView);
     }
 
-    // Change running mode to daemon
+    // Change running mode to daemon, enable messagebox and correct the local links
     const instanceObj = await adapter.getForeignObjectAsync(`system.adapter.${adapter.namespace}`);
-    if (instanceObj && instanceObj.common && (instanceObj.common.mode !== 'daemon' || !instanceObj.common.messagebox)) {
+    if (instanceObj?.common &&
+        (
+            instanceObj.common.mode !== 'daemon' || // mode must be "daemon"
+            !instanceObj.common.messagebox || // messagebox must be enabled
+            JSON.stringify(instanceObj.common.localLinks) !== JSON.stringify(ioPack.common.localLinks)
+        )
+    ) {
         instanceObj.common.mode = 'daemon';
         instanceObj.common.messagebox = true;
+        instanceObj.common.localLinks = ioPack.common.localLinks;
 
         await adapter.setForeignObjectAsync(instanceObj._id, instanceObj);
         // controller will do restart