From 3892edec39aa2c49a240915ca45f53a736472500 Mon Sep 17 00:00:00 2001 From: QuCMGisaia Date: Fri, 25 Oct 2024 16:11:44 +0200 Subject: [PATCH 1/2] fix: allow import of dashboard before v25 --- .../components/landing-page/landing-page-dialog.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/landing-page/landing-page-dialog.component.ts b/src/app/components/landing-page/landing-page-dialog.component.ts index 2090fd14..23afe099 100644 --- a/src/app/components/landing-page/landing-page-dialog.component.ts +++ b/src/app/components/landing-page/landing-page-dialog.component.ts @@ -180,7 +180,7 @@ export class LandingPageDialogComponent implements OnInit, OnDestroy { ]).then(values => { const configJson = values[0] as Config; // Delete existing previewID to avoid right access problem on erase existing resource - if(!!configJson.resources.previewId){ + if(!!configJson.resources?.previewId){ delete configJson.resources.previewId; } const configMapJson = values[1] as MapConfig; From c0dbea43936b42f7445e7d4f2c3094feaee0f136 Mon Sep 17 00:00:00 2001 From: QuCMGisaia Date: Fri, 25 Oct 2024 17:26:34 +0200 Subject: [PATCH 2/2] build(deps): bump toolkit to 26.0.8 --- package-lock.json | 48 +++++++++---------- package.json | 2 +- .../config-form-control.component.ts | 8 ++-- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3650c4bc..706c8272 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "ajv": "8.8.2", "ajv-keywords": "5.1.0", "ang-jsoneditor": "1.10.5", - "arlas-wui-toolkit": "~26.0.6", + "arlas-wui-toolkit": "~26.0.8", "file-saver": "^2.0.2", "jsoneditor": "9.5.6", "moment": "^2.29.4", @@ -4795,9 +4795,9 @@ } }, "node_modules/@types/d3-selection": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.10.tgz", - "integrity": "sha512-cuHoUgS/V3hLdjJOLTT691+G2QoqAjCVLmr4kJXR4ha56w1Zdu8UUQ5TxLRqudgNjwXeQxKMq4j+lyf9sWuslg==" + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz", + "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==" }, "node_modules/@types/d3-shape": { "version": "3.1.6", @@ -4818,9 +4818,9 @@ "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==" }, "node_modules/@types/d3-transition": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.8.tgz", - "integrity": "sha512-ew63aJfQ/ms7QQ4X7pk5NxQ9fZH/z+i24ZfJ6tJSfqxJMrYLiK01EAs2/Rtw/JreGUsS3pLPNV644qXFGnoZNQ==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz", + "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==", "dependencies": { "@types/d3-selection": "*" } @@ -6087,9 +6087,9 @@ } }, "node_modules/arlas-d3": { - "version": "11.2.4", - "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.4.tgz", - "integrity": "sha512-XxQHLabDNfZy3QvRpNzRvogStcLQKwr5Qvhkn2VUlsEGv/V/lIbhAar/AfwQTTEqxmgIuk8Fg7yts1Eb4Pm9cg==", + "version": "11.2.5", + "resolved": "https://registry.npmjs.org/arlas-d3/-/arlas-d3-11.2.5.tgz", + "integrity": "sha512-qoHcTJ/nWPwZ5mNAu1VccyXjfqoI8diSXQGuAaVU18T5stceMlWewAWsUBnJbk/j4LIrIO/tIVT5BvaY+RV4zQ==", "dependencies": { "@types/d3-array": "^3.0.3", "@types/d3-axis": "^3.0.1", @@ -6157,9 +6157,9 @@ } }, "node_modules/arlas-web-components": { - "version": "26.0.3", - "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.3.tgz", - "integrity": "sha512-SOKnlG0exI3uJIx0FlC7iBeCnts5JlhX4vrh9bG3S5lBtaPgRSjAJn4Q1aHVpZYQ754SjA5h9GavNMUS0d1pAg==", + "version": "26.0.5", + "resolved": "https://registry.npmjs.org/arlas-web-components/-/arlas-web-components-26.0.5.tgz", + "integrity": "sha512-ZrWmYp25TgeZYokcQMtNmDv7ZRz/XWiTWDIwun/k41YPj32Klma9sJQK3sUoqGSNNY8tfu4YDa/Wbw+6NwpZhg==", "dependencies": { "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "^1.0.1", @@ -6177,7 +6177,7 @@ "@turf/rhumb-destination": "^6.5.0", "@turf/transform-rotate": "^6.5.0", "@types/mapbox-gl": "^1.6.3", - "arlas-d3": "~11.2.4", + "arlas-d3": "~11.2.5", "geojson-polygon-self-intersections": "1.2.1", "geojson-validation": "0.2.1", "iv-viewer": "~2.0.1", @@ -6269,9 +6269,9 @@ } }, "node_modules/arlas-wui-toolkit": { - "version": "26.0.6", - "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.6.tgz", - "integrity": "sha512-6qytbxqKommePQVM5AS0gBamgjaDa8xQxSOKAOAEMIX3ORK1STNDv7rZ7ibQ9EepiRFw+TNnUOHYLowvsjVWAw==", + "version": "26.0.8", + "resolved": "https://registry.npmjs.org/arlas-wui-toolkit/-/arlas-wui-toolkit-26.0.8.tgz", + "integrity": "sha512-VSDfDNWmjSxY8lixgyaqdsdMVXyQl4e/sk+HbVAIW6iLr6CfWIkzWUGNOGslI/9UlI+CqzOH5IDJlkkZmdukNw==", "dependencies": { "@danielmoncada/angular-datetime-picker": "14.2.0", "@danielmoncada/angular-datetime-picker-moment-adapter": "~2.2.0", @@ -6283,7 +6283,7 @@ "arlas-permissions-api": "26.0.0", "arlas-persistence-api": "26.0.0", "arlas-tagger-api": "26.0.0", - "arlas-web-components": "~26.0.3", + "arlas-web-components": "~26.0.5", "arlas-web-contributors": "~26.0.3", "cli-color": "^1.2.0", "fetch-intercept": "^2.3.1", @@ -17152,9 +17152,9 @@ "integrity": "sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==" }, "node_modules/proj4": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.12.1.tgz", - "integrity": "sha512-vmhP3hmstjXjzFwg8QXJwpoj4n7GVrXk3ZW3DzNK/Ur4cuwXq7ZiMXaWYvLYLQbX8n4MXgbwTr4lthOUZltBpA==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.13.1.tgz", + "integrity": "sha512-jtP/8HwhWTESBjLPpRiIfesFXQnjuufwkiUsDNbdngzD+UrU00svBrEs0bDYnsHp/4p/z8QBw0JMXlOI3tsNZw==", "dependencies": { "mgrs": "1.0.0", "wkt-parser": "^1.3.3" @@ -20139,9 +20139,9 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/traverse": { - "version": "0.6.9", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.9.tgz", - "integrity": "sha512-7bBrcF+/LQzSgFmT0X5YclVqQxtv7TDJ1f8Wj7ibBu/U6BMLeOpUxuZjV7rMc44UtKxlnMFigdhFAIszSX1DMg==", + "version": "0.6.10", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.10.tgz", + "integrity": "sha512-hN4uFRxbK+PX56DxYiGHsTn2dME3TVr9vbNqlQGcGcPhJAn+tdP126iA+TArMpI4YSgnTkMWyoLl5bf81Hi5TA==", "dependencies": { "gopd": "^1.0.1", "typedarray.prototype.slice": "^1.0.3", diff --git a/package.json b/package.json index 504ff7bf..84b13407 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "ajv": "8.8.2", "ajv-keywords": "5.1.0", "ang-jsoneditor": "1.10.5", - "arlas-wui-toolkit": "~26.0.6", + "arlas-wui-toolkit": "~26.0.8", "file-saver": "^2.0.2", "jsoneditor": "9.5.6", "moment": "^2.29.4", diff --git a/src/app/shared/components/config-form-control/config-form-control.component.ts b/src/app/shared/components/config-form-control/config-form-control.component.ts index 0c2a5037..d2fdaafa 100644 --- a/src/app/shared/components/config-form-control/config-form-control.component.ts +++ b/src/app/shared/components/config-form-control/config-form-control.component.ts @@ -106,9 +106,11 @@ export class ConfigFormControlComponent implements OnInit, AfterViewInit, AfterV Object.keys(componentFormControl.inputs).forEach(c => { componentRef.instance[c] = componentFormControl.inputs[c](); }); - Object.keys(componentFormControl.outputs).forEach(c => { - componentRef.instance[c].subscribe(val => componentFormControl.outputs[c](val)); - }); + if (!!componentFormControl.outputs) { + Object.keys(componentFormControl.outputs).forEach(c => { + componentRef.instance[c].subscribe(val => componentFormControl.outputs[c](val)); + }); + } } }