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.

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

13.06 #107

Merged
merged 2 commits into from
Apr 27, 2022
Merged

13.06 #107

Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "2sxc-ui",
"version": "13.05.00",
"version": "13.06.00",
"description": "2sxc UI - the JS UI of 2sxc",
"scripts": {
"release-all": "npm run js2sxc && npm run inpage && npm run snippets && npm run quickdialog && npm run turn-on",
Expand Down
20 changes: 14 additions & 6 deletions projects/quick-dialog/src/app/installer/installer.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

import { tap, switchMap, map, filter, debounceTime } from 'rxjs/operators';
import { tap, switchMap, map, filter, debounceTime, catchError } from 'rxjs/operators';
import { Component, OnInit, Input } from '@angular/core';
import { InstallerService } from 'app/installer/installer.service';
import { DomSanitizer } from '@angular/platform-browser';
import { fromEvent, Subscription } from 'rxjs';
import { fromEvent, of, Subscription } from 'rxjs';
import { GettingStartedService } from './getting-started.service';
import { Config } from '../config';

Expand Down Expand Up @@ -94,12 +94,20 @@ This takes about 10 seconds per package. Don't reload the page while it's instal
this.showProgress = false;
alert('Installation complete 👍');
window.top.location.reload();
}))
}),

.subscribe(null, () => {
catchError(error => {
console.error('Error: ', error);
this.showProgress = false;
alert('An error occurred.');
alreadyProcessing = false;
}));
var errorMsg = `An error occurred: ${error.error?.Message ?? error.error?.message ?? ''}

${error.message}

Please try again later or check how to manually install content-templates: https://azing.org/2sxc/r/0O4OymoA`;
alert(errorMsg);
return of(error);
}),
).subscribe());
}
}