Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: allow import of dashboard before v25 #1001

Merged
merged 2 commits into from
Oct 25, 2024
Merged

fix: allow import of dashboard before v25 #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3892ede
fix: allow import of dashboard before v25
QuCMGisaia Oct 25, 2024
c0dbea4
build(deps): bump toolkit to 26.0.8
QuCMGisaia Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/landing-page/landing-page-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 5 additions & 3 deletions src/app/shared/components/config-form-control/config-form-control.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
});
}
}
}

Expand Down
Loading