Skip to content

Commit

Permalink
* fixed issue with addons loading when DSW uses authentication (#331)
Browse files Browse the repository at this point in the history
* typo fix in world map addon
  • Loading branch information
agnybida committed Sep 9, 2024
1 parent 06818e0 commit 69e11a8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "deep-see-web",
"version": "4.0.9",
"version": "4.0.10",
"scripts": {
"ng": "ng",
"start": "ng serve --proxy-config=proxy.conf.samples-bi.js",
Expand Down
2 changes: 1 addition & 1 deletion src/addons/worldMap.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***
* Highcharts map widget
* MDX should return data in format:
* ['Iceland', 1000, 'Madagascar', 2000, 'Venezuela': 500]
* ['Iceland', 1000, 'Madagascar', 2000, 'Venezuela', 500]
* Names should be equal to GeoJSON `name` field
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {StorageService} from "../../../services/storage.service";
import {FocusNextDirective} from '../../../directives/focus-next.directive';
import {AutoFocusDirective} from '../../../directives/auto-focus.directive';
import {FormsModule} from '@angular/forms';
import {StartupService} from '../../../services/startup.service';

declare var cordova: any;

Expand All @@ -29,6 +30,7 @@ export class LoginScreenComponent implements OnInit {
private i18n: I18nService,
private hs: HeaderService,
private ss: SidebarService,
private start: StartupService,
private ns: NamespaceService,
private st: StorageService,
private route: ActivatedRoute,
Expand Down Expand Up @@ -224,7 +226,7 @@ export class LoginScreenComponent implements OnInit {
/**
* Callback for success login
*/
onSuccess(res, namespace: string) {
async onSuccess(res, namespace: string) {
if (!res) {
return;
}
Expand All @@ -237,6 +239,12 @@ export class LoginScreenComponent implements OnInit {
// Storage.loadServerSettings(res);
localStorage.userName = this.ds.username;

try {
await this.start.initialize();
} catch (e) {
console.error(e);
}

// Set namespaces
this.ns.setNamespaces(res.Mappings.Mapped);
this.ns.setCurrent(namespace);
Expand Down
3 changes: 3 additions & 0 deletions src/changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#### 4.0.10
* fixed issue with addons loading when DSW uses authentication (#331)

#### 4.0.9
* internal build with dev feature for oAuth

Expand Down

0 comments on commit 69e11a8

Please sign in to comment.