From 30491a307c4bea4596da2728a5230a6457b069de Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Wed, 24 Jul 2019 16:36:49 +0200 Subject: [PATCH] Bugfixes --- .../javascript/pandora_visual_console.js | 13 +++-- .../models/VisualConsole/Container.php | 2 +- visual_console_client/global.d.ts | 8 +++ visual_console_client/package-lock.json | 53 ++++++------------- 4 files changed, 33 insertions(+), 43 deletions(-) create mode 100644 visual_console_client/global.d.ts diff --git a/pandora_console/include/javascript/pandora_visual_console.js b/pandora_console/include/javascript/pandora_visual_console.js index cb1403d081..ff888fe1d9 100755 --- a/pandora_console/include/javascript/pandora_visual_console.js +++ b/pandora_console/include/javascript/pandora_visual_console.js @@ -82,9 +82,8 @@ function createVisualConsole( // Emit the VC update event. if (onUpdate) onUpdate(prevProps, visualConsole.props); } catch (ignored) {} // eslint-disable-line no-empty - - done(); } + done(); } ); @@ -141,7 +140,8 @@ function createVisualConsole( data.linkedLayoutId > 0 && data.link != null && data.link.length > 0 && - (data.linkedLayoutAgentId == null || data.linkedLayoutAgentId === 0) + (data.linkedLayoutAgentId == null || data.linkedLayoutAgentId === 0) && + e.nativeEvent.metaKey === false ) { // Override the link to another VC if it isn't on remote console. // Stop the current link behavior. @@ -164,6 +164,9 @@ function createVisualConsole( visualConsole.selectItem(props.id, true); var formContainer = item.getFormContainer(); + // var formContainer = VisualConsole.items[props.type].getFormContainer( + // props + // ); var formElement = formContainer.getFormElement(); var $formElement = jQuery(formElement); @@ -532,8 +535,8 @@ function updateVisualConsoleItem(baseUrl, vcId, vcItemId, data, callback) { // Visual Console container request. jqXHR = jQuery - // .get(apiPath + "/visual-consoles/" + vcId, null, "json") - .get( + // .post(apiPath + "/visual-consoles/" + vcId, null, "json") + .post( apiPath, { page: "include/rest-api/index", diff --git a/pandora_console/include/rest-api/models/VisualConsole/Container.php b/pandora_console/include/rest-api/models/VisualConsole/Container.php index 4aff86f066..c35bf5f710 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Container.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Container.php @@ -254,7 +254,7 @@ final class Container extends Model $backgroundImage = static::extractBackgroundImage($row); if ($backgroundUrl === null && $backgroundImage !== null) { - $row['backgroundURL'] = ui_get_full_url( + $row['backgroundURL'] = \ui_get_full_url( 'images/console/background/'.$backgroundImage, false, false, diff --git a/visual_console_client/global.d.ts b/visual_console_client/global.d.ts new file mode 100644 index 0000000000..8640f167d2 --- /dev/null +++ b/visual_console_client/global.d.ts @@ -0,0 +1,8 @@ +declare module "*.png"; +declare module "*.jpg"; +declare module "*.gif"; +declare module "*.svg"; +declare module "*.eot"; +declare module "*.ttf"; +declare module "*.woff"; +declare module "*.woff2"; diff --git a/visual_console_client/package-lock.json b/visual_console_client/package-lock.json index c5a4da6f7a..2d6aa65d7d 100644 --- a/visual_console_client/package-lock.json +++ b/visual_console_client/package-lock.json @@ -4842,9 +4842,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.14", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", + "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==" }, "lodash.sortby": { "version": "4.7.0", @@ -5096,9 +5096,9 @@ } }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -6428,9 +6428,9 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -7289,35 +7289,14 @@ } }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "uniq": { @@ -7427,9 +7406,9 @@ }, "dependencies": { "mime": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", - "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==" + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", + "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==" } } },